metanorma-standoc 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b1329080ec2d0fd0e0a0f14ef3e59ebacf0d3a7eddb0d44510ef16966073705
-  data.tar.gz: 46051f44a1e660df4357ab06e6018d861698d12679f6002cb46f17d9b0b62684
+  metadata.gz: c157670399555bab56fdbdd58841925b41d78286554eed8d9a10ad385d3a17d0
+  data.tar.gz: 2d4cb5ef535eb8b5a6ee8903df46f32a7d35089f7fa682c67a3701e0daa3993c
 SHA512:
-  metadata.gz: f044364c1ac18e56ee6c186c919d0cd332c5253a6e4cc1bb6bc09bbbf5233c74c6f42d10314c4598305d21e5450c5b29ef57d62b6662394c2137d39c965c7d35
-  data.tar.gz: f6806351c9621bfb2bfac2ae868593ce9088c4361d99285495368e3faa6550dbcaa0fa4d88fd3f19238536bd32837182470321f3b9734a33f0807d95ca2719e9
+  metadata.gz: 6ca6acc2a135f1b13d96600e7b02035e4f1f442f272b9cfc48bf2d4c95eec4a79558a212f592a97509449081cbb390aee4f8f14f0255a4761809108975e2fbb2
+  data.tar.gz: 0c94d48235edbdac98bb5dcc5fc8290bf0d0e2a6ea017aa1ac6b496c5b39bf55c3e21265303cd769b85b82cc70a30790d0ede4f5a4b7612fc097d5f5f54da3cc

data/.travis.yml

@@ -9,17 +9,11 @@ rvm:
 - 2.4
 - ruby-head
 before_install:
-- nvm install 8
-- npm install -g puppeteer
-- npm install
 - curl -L https://cpanmin.us | perl - --sudo App::cpanminus
 - sudo cpanm --notest LaTeXML@0.8.4
 - curl -L https://raw.githubusercontent.com/metanorma/metanorma-build-scripts/master/travis.sh | bash
-- plantuml -version
 - gem install bundler -v 2.0.1
 - bundle update
-- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo bash -c "apt-get update && curl -L https://raw.githubusercontent.com/metanorma/metanorma-linux-setup/master/ubuntu.sh | bash" ; fi
-- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then travis_wait brew install --HEAD https://raw.githubusercontent.com/metanorma/homebrew-metanorma/master/Formula/metanorma.rb ; fi
 matrix:
   allow_failures:
     - rvm: ruby-head

data/Gemfile.lock

@@ -7,6 +7,7 @@ PATH
       html2doc (~> 0.8.11)
       iev (~> 0.2.1)
       isodoc (~> 1.0.0)
+      mimemagic
       relaton (~> 0.5.0)
       relaton-iev (~> 0.1.0)
       ruby-jing
@@ -22,7 +23,7 @@ GEM
     asciimath (1.0.8)
     ast (2.4.0)
     byebug (11.0.1)
-    cnccs (0.1.3)
+    cnccs (0.1.4)
     coderay (1.1.2)
     concurrent-ruby (1.1.5)
     crack (0.4.3)
@@ -35,7 +36,7 @@ GEM
       multipart-post (>= 1.2, < 3)
     ffi (1.11.1)
     formatador (0.2.5)
-    gb-agencies (0.0.5)
+    gb-agencies (0.0.6)
     guard (2.15.1)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
@@ -75,7 +76,7 @@ GEM
       sassc (~> 2)
       thread_safe
       uuidtools
-    isoics (0.1.7)
+    isoics (0.1.8)
     json (2.2.0)
     liquid (4.0.3)
     listen (3.1.5)
@@ -90,6 +91,7 @@ GEM
     mime-types (3.3)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2019.0904)
+    mimemagic (0.3.3)
     mini_portile2 (2.4.0)
     multipart-post (2.1.1)
     nenv (0.3.0)
@@ -112,7 +114,7 @@ GEM
     rb-fsevent (0.10.3)
     rb-inotify (0.10.0)
       ffi (~> 1.0)
-    relaton (0.5.4)
+    relaton (0.5.5)
       relaton-gb (~> 0.6.0)
       relaton-iec (~> 0.4.0)
       relaton-ietf (~> 0.6.0)
@@ -120,33 +122,33 @@ GEM
       relaton-itu (~> 0.3.0)
       relaton-nist (~> 0.3.0)
       relaton-ogc (~> 0.1.0)
-    relaton-bib (0.3.6)
+    relaton-bib (0.3.8)
       addressable
       nokogiri
-    relaton-gb (0.6.3)
+    relaton-gb (0.6.4)
       cnccs (~> 0.1.1)
       gb-agencies (~> 0.0.1)
       relaton-iso-bib (~> 0.3.0)
-    relaton-iec (0.4.4)
+    relaton-iec (0.4.6)
       addressable
       relaton-iso-bib (~> 0.3.0)
-    relaton-ietf (0.6.4)
+    relaton-ietf (0.6.5)
       relaton-bib (~> 0.3.0)
     relaton-iev (0.1.1)
       relaton (~> 0.5.0)
-    relaton-iso (0.6.5)
+    relaton-iso (0.6.6)
       relaton-iec (~> 0.4.0)
       relaton-iso-bib (~> 0.3.0)
-    relaton-iso-bib (0.3.5)
+    relaton-iso-bib (0.3.7)
       isoics (~> 0.1.6)
       relaton-bib (~> 0.3.0)
       ruby_deep_clone (~> 0.8.0)
-    relaton-itu (0.3.3)
+    relaton-itu (0.3.4)
       relaton-iso-bib (~> 0.3.0)
-    relaton-nist (0.3.4)
+    relaton-nist (0.3.5)
       relaton-bib (~> 0.3.0)
       rubyzip
-    relaton-ogc (0.1.0)
+    relaton-ogc (0.1.1)
       faraday
       relaton-iso-bib (~> 0.3.0)
     roman-numerals (0.3.0)
@@ -175,12 +177,12 @@ GEM
     ruby-progressbar (1.10.1)
     ruby_deep_clone (0.8.0)
     ruby_dep (1.5.0)
-    rubyzip (1.2.4)
+    rubyzip (2.0.0)
     safe_yaml (1.0.5)
-    sassc (2.2.0)
+    sassc (2.2.1)
       ffi (~> 1.9)
     shellany (0.0.1)
-    simplecov (0.17.0)
+    simplecov (0.17.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
@@ -194,7 +196,7 @@ GEM
     unicode2latex (0.0.2)
     uuidtools (2.1.5)
     vcr (5.0.0)
-    webmock (3.7.2)
+    webmock (3.7.5)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)

data/lib/asciidoctor/standoc/base.rb

@@ -16,6 +16,7 @@ module Asciidoctor
         inline_macro Asciidoctor::Standoc::AltTermInlineMacro
         inline_macro Asciidoctor::Standoc::DeprecatedTermInlineMacro
         inline_macro Asciidoctor::Standoc::DomainTermInlineMacro
+        inline_macro Asciidoctor::Standoc::HTML5RubyMacro
         block Asciidoctor::Standoc::ToDoAdmonitionBlock
         treeprocessor Asciidoctor::Standoc::ToDoInlineAdmonitionBlock
         block Asciidoctor::Standoc::PlantUMLBlockMacro
@@ -120,7 +121,7 @@ module Asciidoctor
       def init_iev_caches(node)
         unless (@no_isobib_cache || @no_isobib)
           node.attr("local-cache-only") or
-            @iev_globalname = global_ievcache_name 
+            @iev_globalname = global_ievcache_name
           @iev_localname = local_ievcache_name(node.attr("local-cache") ||
                                                node.attr("local-cache-only"))
           if node.attr("flush-caches")

data/lib/asciidoctor/standoc/basicdoc.rng

@@ -194,6 +194,14 @@
           <data type="boolean"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="subsequence"/>
+      </optional>
+      <optional>
+        <attribute name="inequality">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
       <ref name="stem"/>
       <optional>
         <ref name="dl"/>
@@ -247,6 +255,9 @@
           <data type="boolean"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="subsequence"/>
+      </optional>
       <optional>
         <attribute name="lang"/>
       </optional>
@@ -291,9 +302,15 @@
           <data type="boolean"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="subsequence"/>
+      </optional>
       <optional>
         <attribute name="alt"/>
       </optional>
+      <optional>
+        <attribute name="summary"/>
+      </optional>
       <optional>
         <attribute name="uri">
           <data type="anyURI"/>
@@ -423,6 +440,9 @@
           <data type="boolean"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="subsequence"/>
+      </optional>
       <oneOrMore>
         <choice>
           <ref name="formula"/>
@@ -486,6 +506,9 @@
           <data type="boolean"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="subsequence"/>
+      </optional>
       <optional>
         <ref name="source"/>
       </optional>
@@ -497,6 +520,8 @@
       </optional>
       <choice>
         <ref name="image"/>
+        <ref name="video"/>
+        <ref name="audio"/>
         <ref name="pre"/>
         <zeroOrMore>
           <ref name="figure"/>
@@ -792,7 +817,7 @@
     </element>
   </define>
   <define name="video">
-    <element name="image">
+    <element name="video">
       <attribute name="id">
         <data type="ID"/>
       </attribute>
@@ -833,7 +858,7 @@
     </element>
   </define>
   <define name="audio">
-    <element name="image">
+    <element name="audio">
       <attribute name="id">
         <data type="ID"/>
       </attribute>

data/lib/asciidoctor/standoc/blocks.rb

@@ -12,7 +12,15 @@ module Asciidoctor
 
       def id_unnum_attr(node)
         attr_code( id: Utils::anchor_or_uuid(node),
-                  unnumbered: node.option?("unnumbered") ? "true" : nil )
+                  unnumbered: node.option?("unnumbered") ? "true" : nil,
+                  subsequence: node.attr("subsequence") )
+      end
+
+      def formula_attr(node)
+        attr_code( id: Utils::anchor_or_uuid(node),
+                  inequality: node.option?("inequality") ? "true" : nil,
+                  unnumbered: node.option?("unnumbered") ? "true" : nil,
+                  subsequence: node.attr("subsequence") )
       end
 
       # open block is a container of multiple blocks,
@@ -42,7 +50,7 @@ module Asciidoctor
       def stem(node)
         stem_content = node.lines.join("\n")
         noko do |xml|
-          xml.formula **id_unnum_attr(node) do |s|
+          xml.formula **formula_attr(node) do |s|
             stem_parse(stem_content, s, node.style.to_sym)
           end
         end
@@ -51,13 +59,11 @@ module Asciidoctor
       def sidebar_attrs(node)
         date = node.attr("date") || Date.today.iso8601.gsub(/\+.*$/, "")
         date += "T00:00:00Z" unless /T/.match date
-        {
-          reviewer: node.attr("reviewer") || node.attr("source") || "(Unknown)",
+        { reviewer: node.attr("reviewer") || node.attr("source") || "(Unknown)",
           id: Utils::anchor_or_uuid(node),
           date: date,
           from: node.attr("from"),
-          to: node.attr("to") || node.attr("from"),
-        }
+          to: node.attr("to") || node.attr("from") }
       end
 
       def sidebar(node)
@@ -72,11 +78,9 @@ module Asciidoctor
       def todo_attrs(node)
         date = node.attr("date") || Date.today.iso8601.gsub(/\+.*$/, "")
         date += "T00:00:00Z" unless /T/.match date
-        {
-          reviewer: node.attr("reviewer") || node.attr("source") || "(Unknown)",
+        { reviewer: node.attr("reviewer") || node.attr("source") || "(Unknown)",
           id: Utils::anchor_or_uuid(node),
-          date: date,
-        }
+          date: date }
       end
 
       def todo(node)
@@ -141,9 +145,8 @@ module Asciidoctor
       def example(node)
         return term_example(node) if in_terms?
         role = node.role || node.attr("style")
-        return requirement(node, "recommendation") if role == "recommendation"
-        return requirement(node, "requirement") if role == "requirement"
-        return requirement(node, "permission") if role == "permission"
+        %w(recommendation requirement permission).include?(role) and
+          return requirement(node, role)
         noko do |xml|
           xml.example **id_unnum_attr(node) do |ex|
             wrap_in_para(node, ex)
@@ -162,6 +165,7 @@ module Asciidoctor
       end
 
       def datauri(uri)
+        return uri if /^data:/.match(uri)
         types = MIME::Types.type_for(@localdir + uri)
         type = types ? types.first.to_s : 'text/plain; charset="utf-8"'
         bin = File.open(@localdir + uri, 'rb') {|io| io.read}
@@ -171,10 +175,12 @@ module Asciidoctor
 
       def image_attributes(node)
         uri = node.image_uri (node.attr("target") || node.target)
-        types = MIME::Types.type_for(uri)
+        types = /^data:/.match(uri) ? datauri2mime(uri) : MIME::Types.type_for(uri)
+        type = types.first.to_s
+        uri = uri.sub(%r{^data:image/\*;}, "data:#{type};")
         { src: @datauriimage ? datauri(uri) : uri,
           id: Utils::anchor_or_uuid,
-          mimetype: types.first.to_s,
+          mimetype: type,
           height: node.attr("height") || "auto",
           width: node.attr("width") || "auto" ,
           filename: node.attr("filename"),
@@ -182,9 +188,8 @@ module Asciidoctor
       end
 
       def figure_title(node, f)
-        unless node.title.nil?
-          f.name { |name| name << node.title }
-        end
+        return if node.title.nil?
+        f.name { |name| name << node.title }
       end
 
       def image(node)
@@ -238,11 +243,9 @@ module Asciidoctor
       end
 
       def listing_attrs(node)
-        {
-          lang: node.attr("language"),
+        { lang: node.attr("language"),
           id: Utils::anchor_or_uuid(node),
-          filename: node.attr("filename")
-        }
+          filename: node.attr("filename") }
       end
 
       # NOTE: html escaping is performed by Nokogiri

data/lib/asciidoctor/standoc/cleanup.rb

@@ -16,7 +16,7 @@ module Asciidoctor
       def textcleanup(result)
         text = result.flatten.map { |l| l.sub(/\s*$/, "") }  * "\n"
         if !@keepasciimath
-          text = text.gsub(%r{<stem type="AsciiMath">(.+?)</stem>},
+          text = text.gsub(%r{<stem type="AsciiMath">(.+?)</stem>}m,
                            '<amathstem>\1</amathstem>')
           text = Html2Doc.
             asciimath_to_mathml(text, ['<amathstem>', "</amathstem>"]).
@@ -243,8 +243,11 @@ module Asciidoctor
         xmldoc.xpath("//stem[@type = 'MathML']").each do |x|
           next if x.children.any? { |y| y.element? }
           math = x.text.gsub(/&lt;/, "<").gsub(/&gt;/, ">").gsub(/&quot;/, '"').
-            gsub(/&amp;/, "&").gsub(/<[^:\/]+:/, "<").gsub(/<\/[^:]+:/, "</").
-            gsub(/ xmlns[^>]+/, "").
+            gsub(/&apos;/, "'").gsub(/&amp;/, "&").
+            gsub(/<[^: \r\n\t\/]+:/, "<").
+            gsub(/<\/[^ \r\n\t:]+:/, "</").
+            gsub(/ xmlns[^>"']+/, "").
+            gsub(/<math /, '<math xmlns="http://www.w3.org/1998/Math/MathML" ').
             gsub(/<math>/, '<math xmlns="http://www.w3.org/1998/Math/MathML">')
           x.children = math
         end

data/lib/asciidoctor/standoc/front.rb

@@ -195,11 +195,12 @@ module Asciidoctor
 
       def metadata_getrelation(node, xml, type)
         docs = node.attr(type) || return
-        docs.split(/,/).each do |d|
+        docs.split(/;\s*/).each do |d|
+          id = d.split(/,\s*/)
           xml.relation **{ type: relation_normalise(type) } do |r|
             fetch_ref(r, d, nil, {}) or r.bibitem do |b|
-              b.title "--"
-              b.docidentifier d
+              b.title id[1] ? id[1] : "--"
+              b.docidentifier id[0]
             end
           end
         end

data/lib/asciidoctor/standoc/macros.rb

@@ -16,8 +16,7 @@ module Asciidoctor
       end
     end
 
-    class DeprecatedTermInlineMacro <
-      Asciidoctor::Extensions::InlineMacroProcessor
+    class DeprecatedTermInlineMacro < Asciidoctor::Extensions::InlineMacroProcessor
       use_dsl
       named :deprecated
       parse_content_as :text
@@ -41,6 +40,32 @@ module Asciidoctor
       end
     end
 
+    class HTML5RubyMacro < Asciidoctor::Extensions::InlineMacroProcessor
+      use_dsl
+      named :ruby
+      parse_content_as :text
+
+      option :pos_attrs, %w(rpbegin rt rpend)
+
+      def process(parent, target, attributes)
+          rpbegin = '('
+          rpend = ')'
+        if attributes.size == 1 and attributes.key?("text")
+          rt = attributes["text"]
+        elsif attributes.size == 2 and attributes.key?(1) and attributes.key?("rpbegin")
+          # for example, html5ruby:楽聖少女[がくせいしょうじょ]
+          rt = attributes[1]
+          rt ||= ""
+        else
+          rpbegin = attributes['rpbegin']
+          rt = attributes['rt']
+          rpend = attributes['rpend']
+        end
+
+        %(<ruby>#{target}<rp>#{rpbegin}</rp><rt>#{rt}</rt><rp>#{rpend}</rp></ruby>)
+      end
+    end
+
     class ToDoAdmonitionBlock < Extensions::BlockProcessor
       use_dsl
       named :TODO
@@ -93,7 +118,7 @@ module Asciidoctor
         # finish erlier then dot, as result png file maybe not created yet after plantuml finish
         sleep(2) if Gem.win_platform?
         outfile = parent.image_uri("#{fn}.png")
-        if outfile == "#{fn}.png" 
+        if outfile == "#{fn}.png"
           (Pathname.new("plantuml") + "#{fn}.png").to_s
         else
           FileUtils.mv (Pathname.new(localdir) + "plantuml" + "#{fn}.png").to_s,