asciidoctor-iso 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1214d438d3c226629a8fff96a4c26c21f20d5bba
-  data.tar.gz: b57913fafdf74be666b2bc5c4a865fb6ac0fc9bc
+  metadata.gz: 2ff009fa5a7024c54efd53fc7e8a353559d1ab6a
+  data.tar.gz: 7bd27462cb448bfb0ce0947ebf60a622b9215a95
 SHA512:
-  metadata.gz: c6fe48101588ebe48a5f8f5d5b6b9486d3cbc8f1616b49259773d17bee1179a9cb0362a7ca4920803f0c22dc9065955e964fc24a6e93e622a64acb064a6074e7
-  data.tar.gz: ef8a83afdfa714b47047e0b12b1aa6590308a6ca30c7d723960cb002708c33382e9dd53e37ecddf4ab0f52eb633e3626497fce6a8b6dd168db4ef682fe4a8ef3
+  metadata.gz: 4f221438783ca673de960d8143f1aa196c8a5748d839cdb048f6ec3d6dd4fe8d0d927f137c8a03e9ac1e7dba47a642ebf77eb643a24a65c148b85c958e83a465
+  data.tar.gz: cd1ae57550314578b6fe0df3d7917c793f273255e248eacb78592f98dc12fb2dc15c06f05c092323230ecf67c360d736953e06fffd9e878a325055a5f23d81df

data/Gemfile.lock

@@ -1,29 +1,30 @@
 GIT
   remote: https://github.com/riboseinc/html2doc.git
-  revision: 3eb26a6807a55abc4b2e35570601618568f12e07
+  revision: 9782088aac279f45a4420e977922ea141bc46a24
   specs:
-    html2doc (0.6.2)
+    html2doc (0.6.7)
       asciimath
       htmlentities (~> 4.3.4)
       image_size
       mime-types
-      nokogiri (~> 1.8.1)
+      nokogiri
       ruby-xslt
       thread_safe
       uuidtools
 
 GIT
   remote: https://github.com/riboseinc/isodoc.git
-  revision: 4fe5f001024f5c1c659c68b6c61a6e54bcc8e444
+  revision: b5db3572f9312f9d54ace3359d22236494584357
   specs:
-    isodoc (0.5.0)
+    isodoc (0.5.5)
       asciimath
       html2doc
       htmlentities (~> 4.3.4)
       image_size
       liquid
       mime-types
-      nokogiri (= 1.8.1)
+      nokogiri
+      roman-numerals
       ruby-xslt
       thread_safe
       uuidtools
@@ -31,12 +32,12 @@ GIT
 PATH
   remote: .
   specs:
-    asciidoctor-iso (0.6.1)
+    asciidoctor-iso (0.7.1)
       asciidoctor (~> 1.5.6)
       html2doc
       htmlentities (~> 4.3.4)
       isodoc
-      nokogiri (= 1.8.1)
+      nokogiri
       ruby-jing
       thread_safe
       uuidtools
@@ -84,7 +85,7 @@ GEM
     mime-types-data (3.2016.0521)
     mini_portile2 (2.3.0)
     nenv (0.3.0)
-    nokogiri (1.8.1)
+    nokogiri (1.8.2)
       mini_portile2 (~> 2.3.0)
     notiffany (0.1.1)
       nenv (~> 0.1)
@@ -102,6 +103,7 @@ GEM
     rb-fsevent (0.10.3)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
+    roman-numerals (0.3.0)
     rspec (3.7.0)
       rspec-core (~> 3.7.0)
       rspec-expectations (~> 3.7.0)
@@ -115,7 +117,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.7.0)
     rspec-support (3.7.1)
-    rubocop (0.53.0)
+    rubocop (0.52.1)
       parallel (~> 1.10)
       parser (>= 2.5)
       powerpack (~> 0.1)

data/asciidoctor-iso.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "asciidoctor", "~> 1.5.6"
   spec.add_dependency "htmlentities", "~> 4.3.4"
-  spec.add_dependency "nokogiri", "= 1.8.1"
+  spec.add_dependency "nokogiri"
   spec.add_dependency "ruby-jing"
   spec.add_dependency "thread_safe"
   spec.add_dependency "uuidtools"

data/lib/asciidoctor/iso/base.rb

@@ -67,12 +67,16 @@ module Asciidoctor
         ret
       end
 
-      def makexml(node)
+      def makexml1(node)
         result = ["<?xml version='1.0' encoding='UTF-8'?>\n<iso-standard>"]
         result << noko { |ixml| front node, ixml }
         result << noko { |ixml| middle node, ixml }
         result << "</iso-standard>"
-        result = textcleanup(result.flatten * "\n")
+        textcleanup(result.flatten * "\n")
+      end
+
+      def makexml(node)
+        result = makexml1(node)
         ret1 = cleanup(Nokogiri::XML(result))
         ret1.root.add_namespace(nil, "http://riboseinc.com/isoxml")
         validate(ret1) unless @novalid
@@ -134,7 +138,6 @@ module Asciidoctor
           xml.termsource **attrs do |xml_t|
             seen_xref = Nokogiri::XML.fragment(matched[:xref])
             add_term_source(xml_t, seen_xref, matched)
-            style(node, matched[:text])
           end
         end.join("\n")
       end

data/lib/asciidoctor/iso/blocks.rb

@@ -28,8 +28,7 @@ module Asciidoctor
         stem_content = node.lines.join("\n")
         noko do |xml|
           xml.formula **id_attr(node) do |s|
-            s.stem stem_content, **{ type: "AsciiMath" }
-            style(node, stem_content)
+            stem_parse(stem_content, s)
           end
         end
       end
@@ -59,7 +58,6 @@ module Asciidoctor
         noko do |xml|
           xml.termnote **id_attr(n) do |ex|
             wrap_in_para(n, ex)
-            style(n, Utils::flatten_rawtext(n.content).join("\n"))
           end
         end.join("\n")
       end
@@ -68,8 +66,6 @@ module Asciidoctor
         noko do |xml|
           xml.note **id_attr(n) do |c|
             wrap_in_para(n, c)
-            text = Utils::flatten_rawtext(n.content).join("\n")
-            note_style(n, text)
           end
         end.join("\n")
       end
@@ -85,7 +81,7 @@ module Asciidoctor
       end
 
       def admonition(node)
-        return termnote(node) if in_terms
+        return termnote(node) if in_terms?
         return note(node) if node.attr("name") == "note"
         noko do |xml|
           xml.admonition **admonition_attrs(node) do |a|
@@ -97,22 +93,17 @@ module Asciidoctor
       def term_example(node)
         noko do |xml|
           xml.termexample **id_attr(node) do |ex|
-            c = node.content
             wrap_in_para(node, ex)
-            text = Utils::flatten_rawtext(c).join("\n")
-            termexample_style(node, text)
           end
         end.join("\n")
       end
 
       def example(node)
-        return term_example(node) if in_terms
+        return term_example(node) if in_terms?
         noko do |xml|
           xml.example **id_attr(node) do |ex|
             content = node.content
             ex << content
-            text = Utils::flatten_rawtext(content).join("\n")
-            termexample_style(node, text)
           end
         end.join("\n")
       end
@@ -123,8 +114,6 @@ module Asciidoctor
             xml_abstract.title { |t| t << "Foreword" }
             content = node.content
             xml_abstract << content
-            text = Utils::flatten_rawtext(content).join("\n")
-            foreword_style(node, text)
           end
         end.join("\n")
       end
@@ -140,9 +129,7 @@ module Asciidoctor
       end
 
       def figure_title(node, f)
-        if node.title.nil?
-          style_warning(node, "Figure should have title", nil)
-        else
+        unless node.title.nil?
           f.name { |name| name << node.title }
         end
       end
@@ -163,7 +150,6 @@ module Asciidoctor
         noko do |xml|
           xml.p **attr_code(attrs) do |xml_t|
             xml_t << node.content
-            style(node, Utils::flatten_rawtext(node).join(" "))
           end
         end.join("\n")
       end

data/lib/asciidoctor/iso/cleanup.rb

@@ -33,6 +33,7 @@ module Asciidoctor
         element_name_cleanup(xmldoc)
         footnote_renumber(xmldoc)
         empty_element_cleanup(xmldoc)
+        mathml_cleanup(xmldoc)
         bookmark_cleanup(xmldoc)
         xmldoc
       end
@@ -66,8 +67,6 @@ module Asciidoctor
           annotations = x.elements.select { |e| e.name == "annotation" }
           if callouts.size == annotations.size
             link_callouts_to_annotations(callouts, annotations)
-          else
-            warn "#{x['id']}: mismatch of callouts and annotations"
           end
         end
       end
@@ -124,9 +123,7 @@ module Asciidoctor
       end
 
       def termdef_boilerplate_cleanup(xmldoc)
-        xmldoc.xpath("//terms/p | //terms/ul").each do |a|
-          a.remove
-        end
+        xmldoc.xpath("//terms/p | //terms/ul").each(&:remove)
       end
 
       def termdef_cleanup(xmldoc)
@@ -138,11 +135,13 @@ module Asciidoctor
       end
 
       ELEMS_ALLOW_NOTES =
-        %w[p formula quote sourcecode example admonition ul ol dl figure].freeze
+        # %w[p formula quote sourcecode example admonition ul ol dl figure]
+        %w[p formula ul ol dl figure].freeze
 
       # if a note is at the end of a section, it is left alone
       # if a note is followed by a non-note block,
-      # it is moved inside its preceding block
+      # it is moved inside its preceding block if it is not delimited
+      # (so there was no way of making that block include the note)
       def note_cleanup(xmldoc)
         q = "//note[following-sibling::*[not(local-name() = 'note')]]"
         xmldoc.xpath(q).each do |n|
@@ -167,22 +166,32 @@ module Asciidoctor
           if !/\S/.match?(x.children[0].text)
             x.children[0].remove
           else
-            x.children[0].content =  x.children[0].text.gsub(/^ /, "")
+            x.children[0].content = x.children[0].text.gsub(/^ /, "")
           end
         end
       end
 
       def bookmark_cleanup(xmldoc)
         xmldoc.xpath("//li[descendant::bookmark]").each do |x|
-          if x&.elements[0]&.name == "p" &&
-              x&.elements[0]&.elements[0]&.name == "bookmark"
+          if x&.elements&.first&.name == "p" &&
+              x&.elements&.first&.elements&.first&.name == "bookmark"
             if empty_text_before_first_element(x.elements[0])
-              x["id"] = (x.elements[0].elements[0].remove)["id"]
+              x["id"] = x.elements[0].elements[0].remove["id"]
               strip_initial_space(x.elements[0])
             end
           end
         end
       end
+
+      def mathml_cleanup(xmldoc)
+        xmldoc.xpath("//stem[@type = 'MathML']").each do |x|
+          math = x.text.gsub(/&lt;/, "<").gsub(/&gt;/, ">").gsub(/&quot;/, '"').
+            gsub(/&amp;/, "&").gsub(/<[^:\/]+:/, "<").gsub(/<\/[^:]+:/, "</").
+            gsub(/ xmlns[^>]+/, "").
+            gsub(/<math>/, '<math xmlns="http://www.w3.org/1998/Math/MathML">')
+          x.children = math
+        end
+      end
     end
   end
 end

data/lib/asciidoctor/iso/cleanup_block.rb

@@ -19,8 +19,8 @@ module Asciidoctor
         end
       end
 
+      # move Key dl after table footer
       def dl_table_cleanup(xmldoc)
-        # move Key dl after table footer
         q = "//table/following-sibling::*[1]"\
           "[self::p and normalize-space() = 'Key']"
         xmldoc.xpath(q).each do |s|
@@ -58,8 +58,8 @@ module Asciidoctor
         header_rows_cleanup(xmldoc)
       end
 
+      # move notes into table
       def notes_table_cleanup(xmldoc)
-        # move notes into table
         nomatches = false
         until nomatches
           q = "//table/following-sibling::*[1][self::note]"
@@ -71,8 +71,8 @@ module Asciidoctor
         end
       end
 
+      # include where definition list inside stem block
       def formula_cleanup(x)
-        # include where definition list inside stem block
         q = "//formula/following-sibling::*[1]"\
           "[self::p and text() = 'where']"
         x.xpath(q).each do |s|
@@ -97,8 +97,8 @@ module Asciidoctor
         end
       end
 
+      # include key definition list inside figure
       def figure_dl_cleanup(xmldoc)
-        # include key definition list inside figure
         q = "//figure/following-sibling::*"\
           "[self::p and normalize-space() = 'Key']"
         xmldoc.xpath(q).each do |s|
@@ -109,8 +109,8 @@ module Asciidoctor
         end
       end
 
+      # examples containing only figures become subfigures of figures
       def subfigure_cleanup(xmldoc)
-        # examples containing only figures become subfigures of figures
         nodes = xmldoc.xpath("//example/figure")
         while !nodes.empty?
           nodes[0].parent.name = "figure"
@@ -124,23 +124,29 @@ module Asciidoctor
         subfigure_cleanup(xmldoc)
       end
 
+      def table_footnote_renumber1(fn, i, seen)
+        if seen[fn.text] then outnum = seen[fn.text]
+        else
+          i += 1
+          outnum = i
+          seen[fn.text] = outnum
+        end
+        fn["reference"] = (outnum - 1 + "a".ord).chr
+        fn["table"] = true
+        [i, seen]
+      end
+
       def table_footnote_renumber(xmldoc)
         xmldoc.xpath("//table | //figure").each do |t|
-          seen, i = {}, 0
+          seen = {}
+          i = 0
           t.xpath(".//fn").each do |fn|
-            if seen[fn.text] then outnum = seen[fn.text]
-            else
-              i += 1
-              outnum = i
-              seen[fn.text] = outnum
-            end
-            fn["reference"] = (outnum - 1 + "a".ord).chr
-            fn["table"] = true
+            i, seen = table_footnote_renumber1(fn, i, seen)
           end
         end
       end
 
-      def other_footnote_renumber1(fn, i, seen, outnum)
+      def other_footnote_renumber1(fn, i, seen)
         unless fn["table"]
           if seen[fn.text] then outnum = seen[fn.text]
           else
@@ -150,7 +156,7 @@ module Asciidoctor
           end
           fn["reference"] = outnum.to_s
         end
-        [i, seen, outnum]
+        [i, seen]
       end
 
       PRE_NORMREF_FOOTNOTES = "//foreword//fn | //introduction//fn |"\
@@ -168,15 +174,14 @@ module Asciidoctor
       def other_footnote_renumber(xmldoc)
         seen = {}
         i = 0
-        outnum = 0
         xmldoc.xpath(PRE_NORMREF_FOOTNOTES).each do |fn|
-          i, seen, outnum = other_footnote_renumber1(fn, i, seen, outnum)
+          i, seen = other_footnote_renumber1(fn, i, seen)
         end
         xmldoc.xpath(NORMREF_FOOTNOTES).each do |fn|
-          i, seen, outnum = other_footnote_renumber1(fn, i, seen, outnum)
+          i, seen = other_footnote_renumber1(fn, i, seen)
         end
         xmldoc.xpath(POST_NORMREF_FOOTNOTES).each do |fn|
-          i, seen, outnum = other_footnote_renumber1(fn, i, seen, outnum)
+          i, seen = other_footnote_renumber1(fn, i, seen)
         end
       end
 
@@ -199,14 +204,26 @@ module Asciidoctor
       end
 
       def obligations_cleanup(x)
+        obligations_cleanup_info(x)
+        obligations_cleanup_norm(x)
+        obligations_cleanup_inherit(x)
+      end
+
+      def obligations_cleanup_info(x)
         (s = x.at("//foreword")) && s["obligation"] = "informative"
         (s = x.at("//introduction")) && s["obligation"] = "informative"
+        x.xpath("//references").each { |r| r["obligation"] = "informative" }
+      end
+
+      def obligations_cleanup_norm(x)
         (s = x.at("//clause[title = 'Scope']")) && s["obligation"] = "normative"
         (s = x.at("//clause[title = 'Symbols and Abbreviated Terms']")) &&
           s["obligation"] = "normative"
-        x.xpath("//references").each { |r| r["obligation"] = "informative" }
         x.xpath("//terms").each { |r| r["obligation"] = "normative" }
         x.xpath("//symbols-abbrevs").each { |r| r["obligation"] = "normative" }
+      end
+
+      def obligations_cleanup_inherit(x)
         x.xpath("//annex | //clause").each do |r|
           r["obligation"] = "normative" unless r["obligation"]
         end

data/lib/asciidoctor/iso/cleanup_ref.rb

@@ -67,8 +67,8 @@ module Asciidoctor
         end
       end
 
+      # move ref before p
       def ref_cleanup(xmldoc)
-        # move ref before p
         xmldoc.xpath("//p/ref").each do |r|
           parent = r.parent
           parent.previous = r.remove
@@ -89,14 +89,27 @@ module Asciidoctor
         ref
       end
 
+      ISO_PUBLISHER_XPATH =
+        "./contributor[role/@type = 'publisher']/"\
+        "organization[abbreviation = 'ISO' or abbreviation = 'IEC' or "\
+        "name = 'International Organization for Standardization' or "\
+        "name = 'International Electrotechnical Commission']".freeze
+
+      def date_range(date)
+        from = date.at("./from")
+        to = date.at("./to")
+        ret = from.text
+        ret += "–#{to.text}" if to
+        ret
+      end
+
       def reference_names(xmldoc)
         xmldoc.xpath("//bibitem").each do |ref|
-          isopub = ref.at("./contributor[role/@type = 'publisher']/"\
-                          "organization[name = 'ISO' or name = 'IEC']")
+          isopub = ref.at(ISO_PUBLISHER_XPATH)
           docid = ref.at("./docidentifier")
           date = ref.at("./date[@type = 'published']")
           reference = format_ref(docid.text, isopub)
-          reference += ": #{date.text}" if date && isopub
+          reference += ": #{date_range(date)}" if date && isopub
           @anchors[ref["id"]] = { xref: reference }
         end
       end