metanorma 0.3.7 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fbe49b657d41e2d71ea35393334a71bf9ae2392b9de90d696cb54783f3fe520e
-  data.tar.gz: 4fd60291f8196e53db4e55c3f33d6fb4705a3984f7c110ad7643997f26a2b8d1
+  metadata.gz: 537c8c191cf1d55b37090f34b5cabd7f5332c0fc38f0378ef38499a2973d2666
+  data.tar.gz: 2bcb82454d81c2bae64dd41e77bd6800f8557974cffa607a3cd709a6e15785c5
 SHA512:
-  metadata.gz: d74a51133af96c89f4c0afd0d4c0c2438865f3d8a93dd4830908fdb462df5ae40edc9c6b1a1e65b94fdb9c7923ec5bea6a9feb5e65f4637a53aba2ef499d510e
-  data.tar.gz: 9b20f7bb1c651caa048207d62bbb800808a71e377a55a7b1c0283861a5b87e4dc6c6df2b2028512cd58f99c838e3ec50d0a99a88d556e1fdaa853bbf6400ff89
+  metadata.gz: 200991c8752ba12ba868a570f86254372e5a4ba35ce0b02c00102d25145ae91cc1e93c6bd81e62836129b8b537d058f67ce52e51b177e3c474366d03080b928a
+  data.tar.gz: 8a94fee5cd05b87190ebecd89b387e63a773f7e6f0c6619d6dddb1fe800b8b05471ea3ec36f286971bc4b19c347aed05aa6a7feacf689ee079168dfea6755744

data/Gemfile.lock

@@ -1,19 +1,19 @@
 PATH
   remote: .
   specs:
-    metanorma (0.3.7)
+    metanorma (0.3.8)
       asciidoctor
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.5.2)
+    addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
     algoliasearch (1.25.2)
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
     asciidoctor (1.5.8)
-    asciimath (1.0.7)
+    asciimath (1.0.8)
     byebug (10.0.2)
     cnccs (0.1.3)
     concurrent-ruby (1.1.4)
@@ -26,7 +26,7 @@ GEM
       cnccs (~> 0.1.1)
       gb-agencies (~> 0.0.1)
       iso-bib-item (~> 0.4.2)
-    html2doc (0.8.8)
+    html2doc (0.8.9)
       asciimath (~> 1.0.7)
       htmlentities (~> 4.3.4)
       image_size
@@ -69,15 +69,16 @@ GEM
     isoics (0.1.7)
     json (2.1.0)
     liquid (4.0.1)
-    metanorma-iso (1.0.14)
+    metanorma-iso (1.1.1)
       asciidoctor (~> 1.5.7)
       iev (~> 0.2.0)
       isodoc (~> 0.9.8)
       metanorma-standoc (~> 1.1.0)
       ruby-jing
-    metanorma-standoc (1.1.0)
+    metanorma-standoc (1.1.2)
       asciidoctor (~> 1.5.7)
       concurrent-ruby
+      html2doc (~> 0.8.0)
       iev (~> 0.2.0)
       isodoc (~> 0.9.0)
       relaton (~> 0.3.1)
@@ -150,7 +151,7 @@ DEPENDENCIES
   equivalent-xml (~> 0.6)
   isodoc (= 0.9.13)
   metanorma!
-  metanorma-iso (~> 1.0.14)
+  metanorma-iso (~> 1.1.0)
   metanorma-standoc (~> 1.1.0)
   rake (~> 12.0)
   rspec (~> 3.0)

data/README.adoc

@@ -141,6 +141,7 @@ Usage: metanorma [options] <file>
   -r, --require LIBRARY            Require LIBRARY prior to execution
   -w, --wrapper                    Create wrapper folder for HTML output
   -d, --data-uri-image             Encode HTML output images as data URIs
+  -a, --asciimath                  Preserve AsciiMath in Metanorma XML, instead of transforming it into MathML
   -R, --relaton FILENAME           Export Relaton XML (bibdata) for this document to FILENAME
       (Also triggered through -x rxl)
   -h, --help                       Show this message
@@ -198,13 +199,15 @@ $ metanorma -t mpfd mpfd-bpn.adoc
 $ metanorma -t mpfd -r metanorma-mpfd mpfd-bpn.adoc
 ----
 
-The `type`, `extension` and `relaton` options can be omitted if the corresponding metanorma directives
+The `asciimath`, `type`, `extension` and `relaton` options can be omitted if the corresponding metanorma directives
 are included in the document as Metanorma directives; for Asciidoctor input, these take the form
-of document attributes `mn-document-class:`, `:mn-output-extensions:` and `:mn-relaton-output-file:`, e.g.
+of document attributes `mn-keep-asciimath:`, `mn-document-class:`, `:mn-output-extensions:` 
+and `:mn-relaton-output-file:`, e.g.
 
 [source,asciidoctor]
 ----
 = My ISO document
+:mn-keep-asciimath:
 :mn-document-class: iso
 :mn-output-extensions: html,xml,pdf
 :mn-relaton-output-file: test.xml
@@ -227,7 +230,8 @@ The options hash has the same structure it does when invoked in metanorma-cli:
 `:format`:: `:asciidoc` is only value currently allowed
 `:extension_keys`:: array of symbols: `:all`, `:xml`:, `:doc` etc.
 `:wrapper`: true/false
-`:darauriimage`: true/false
+`:datauriimage`: true/false
+`:asciimath`: true/false
 `:require`: array of libraries to require
 `:relaton`: exports the bibdata Relaton XML description of the document (which is part of its Metanorma XML)
 to the nominated directory

data/lib/metanorma/compile.rb

@@ -13,7 +13,7 @@ module Metanorma
       require_libraries(options)
       @processor = @registry.find_processor(options[:type].to_sym)
       extensions = get_extensions(options) or return nil
-      (file, isodoc = process_input(filename)) or return nil
+      (file, isodoc = process_input(filename, options)) or return nil
       relaton_export(isodoc, options)
       process_extensions(extensions, file, isodoc, options)
     end
@@ -86,11 +86,14 @@ module Metanorma
       extensions
     end
 
-    def process_input(filename)
+    def process_input(filename, options)
       case extname = File.extname(filename)
       when ".adoc"
         puts "[metanorma] Processing: Asciidoctor input."
         file = File.read(filename, encoding: "utf-8")
+        if options[:asciimath]
+          file.sub!(/^(=[^\n]+\n)/, "\\1:mn-keep-asciimath:\n")
+        end
         [file, @processor.input_to_isodoc(file, filename)]
       when ".xml"
         puts "[metanorma] Processing: Metanorma XML input."

data/lib/metanorma/input/asciidoc.rb

@@ -20,10 +20,15 @@ module Metanorma
         /\n:mn-document-class: (?<type>[^\n]+)\n/ =~ headerextract
         /\n:mn-output-extensions: (?<extensions>[^\n]+)\n/ =~ headerextract
         /\n:mn-relaton-output-file: (?<relaton>[^\n]+)\n/ =~ headerextract
+        /\n(?<asciimath>:mn-keep-asciimath:[^\n]*)\n/ =~ headerextract
+        asciimath = defined?(asciimath) ?
+          (!asciimath.nil? && asciimath != ":mn-keep-asciimath: false") : nil
+        asciimath = nil if asciimath == false
         {
           type: defined?(type) ? type : nil,
           extensions: defined?(extensions) ? extensions : nil,
           relaton: defined?(relaton) ? relaton : nil,
+          asciimath: asciimath,
         }.reject { |_, val| val.nil? }
       end
 

data/lib/metanorma/version.rb

@@ -1,3 +1,3 @@
 module Metanorma
-  VERSION = "0.3.7"
+  VERSION = "0.3.8"
 end

data/metanorma.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "byebug", "~> 10.0"
   spec.add_development_dependency "rspec-command", "~> 1.0.3"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
-  spec.add_development_dependency "metanorma-iso", "~> 1.0.14"
+  spec.add_development_dependency "metanorma-iso", "~> 1.1.0"
   spec.add_development_dependency "metanorma-standoc", "~> 1.1.0"
   spec.add_development_dependency "isodoc", "0.9.13"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-21 00:00:00.000000000 Z
+date: 2019-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.14
+        version: 1.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.14
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
   requirement: !ruby/object:Gem::Requirement