metanorma-standoc 1.8.6 → 1.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d29f898d11836b1b9ae020605081f35a144ed06406a24776b93841d05cafac62
-  data.tar.gz: 5f47fb98bf9189ab80a18fe9f32150e0cf840f6860ec2317147122583748f162
+  metadata.gz: df453526eab7a001b67712f6f0bd885a9242d5e489e8a0d8f138bb3a2f653f1e
+  data.tar.gz: e632b1a38bff75199ae1047188702e28275ebb3563c921e2a5bc545a5c4ec43f
 SHA512:
-  metadata.gz: 92cf686a035d48f5b0507d0fffa91b2b207f741cc14a939b498330065e204b6a194bab1b7796115ff790ae0f29e046d7bf429da1dd51b554b5251febd9b350eb
-  data.tar.gz: 91a13d5900acf6099186c51e294dd6f441bd298fdafa958bc53d8a0ef95dbfad4427cfad1464cffb1ced2ae840158cb9364c00249a25595b4cfea9a65d4f2136
+  metadata.gz: 44bba71bdd21993acfd38de5d3ae020df5bf569a31c0bd208b223a2bef628093f476ae9bf18e3f8e1f716b898238648a9f14ffe24446148e38e0719340b826ff
+  data.tar.gz: 40a66dea77906193f52dd4fd99023963a1e0ed1f6e584832bef19022e5278933ba28c85e7624feb0282f94f1e95471a13340a189dbd61835129c3f5f8d10f0b4

data/.gitignore

@@ -10,3 +10,5 @@ spec/examples/rice.html
 spec/examples/rice.xml
 spec/examples/rice_files/
 Gemfile.lock
+
+.rubocop-https--*

data/.rubocop.yml

@@ -1,10 +1,14 @@
 # This project follows the Ribose OSS style guide.
 # https://github.com/riboseinc/oss-guides
 # All project-specific additions and overrides should be specified in this file.
-
 inherit_from:
   - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
+
+# local repo-specific modifications
+
 AllCops:
+  DisplayCopNames: false
+  StyleGuideCopsOnly: false
   TargetRubyVersion: 2.4
 Rails:
   Enabled: true

data/lib/asciidoctor/standoc/base.rb

@@ -43,6 +43,7 @@ module Asciidoctor
           i18nyaml: node.attr("i18nyaml"),
           scope: node.attr("scope"),
           htmlstylesheet: node.attr("htmlstylesheet"),
+          htmlstylesheet_override: node.attr("htmlstylesheet-override"),
           htmlcoverpage: node.attr("htmlcoverpage"),
           htmlintropage: node.attr("htmlintropage"),
           scripts: node.attr("scripts"),
@@ -67,6 +68,7 @@ module Asciidoctor
           i18nyaml: node.attr("i18nyaml"),
           scope: node.attr("scope"),
           wordstylesheet: node.attr("wordstylesheet"),
+          wordstylesheet_override: node.attr("wordstylesheet-override"),
           standardstylesheet: node.attr("standardstylesheet"),
           header: node.attr("header"),
           wordcoverpage: node.attr("wordcoverpage"),

data/lib/asciidoctor/standoc/biblio.rng

@@ -124,7 +124,7 @@
           <value>application/tei+xml</value>
           <value>text/x-asciidoc</value>
           <value>text/markdown</value>
-          <value>application/x-isodoc+xml</value>
+          <value>application/x-metanorma+xml</value>
           <text/>
         </choice>
       </attribute>
@@ -452,6 +452,7 @@
       <attribute name="type">
         <choice>
           <value>isni</value>
+          <value>orcid</value>
           <value>uri</value>
         </choice>
       </attribute>
@@ -461,10 +462,7 @@
   <define name="org-identifier">
     <element name="identifier">
       <attribute name="type">
-        <choice>
-          <value>orcid</value>
-          <value>uri</value>
-        </choice>
+        <data type="string" datatypeLibrary=""/>
       </attribute>
       <text/>
     </element>
@@ -1106,7 +1104,7 @@
       <value>complementOf</value>
       <value>obsoletes</value>
       <value>obsoletedBy</value>
-      <value>cited</value>
+      <value>cites</value>
       <value>isCitedIn</value>
     </choice>
   </define>

data/lib/asciidoctor/standoc/blocks.rb

@@ -45,8 +45,9 @@ module Asciidoctor
         noko do |xml|
           xml.figure **literal_attrs(node) do |f|
             figure_title(node, f)
-            f.pre node.lines.join("\n"), **attr_code(id: Metanorma::Utils::anchor_or_uuid,
-                                                     alt: node.attr("alt"))
+            f.pre node.lines.join("\n"),
+              **attr_code(id: Metanorma::Utils::anchor_or_uuid,
+                          alt: node.attr("alt"))
           end
         end
       end
@@ -78,9 +79,19 @@ module Asciidoctor
         example_proper(node)
       end
 
+      def svgmap_attrs(node)
+        attr_code( { id: node.id,
+                     unnumbered: node.option?("unnumbered") ? "true" : nil,
+                     number: node.attr("number"),
+                     subsequence: node.attr("subsequence") }.
+        merge(keep_attrs(node)))
+      end
+
       def svgmap_example(node)
         noko do |xml|
-          xml.svgmap **attr_code(example_attrs(node).merge(src: node.attr("src"), alt: node.attr("alt"))) do |ex|
+          xml.svgmap **attr_code(svgmap_attrs(node).merge(
+            src: node.attr("src"), alt: node.attr("alt"))) do |ex|
+            figure_title(node, ex)
             ex << node.content
           end
         end.join("\n")
@@ -129,8 +140,9 @@ module Asciidoctor
       end
 
       def para_attrs(node)
-        attr_code(keep_attrs(node).merge(align: node.attr("align"), 
-                                         id: Metanorma::Utils::anchor_or_uuid(node)))
+        attr_code(keep_attrs(node).
+                  merge(align: node.attr("align"), 
+                        id: Metanorma::Utils::anchor_or_uuid(node)))
       end
 
       def paragraph(node)
@@ -143,8 +155,9 @@ module Asciidoctor
       end
 
       def quote_attrs(node)
-        attr_code(keep_attrs(node).merge(align: node.attr("align"), 
-                                         id: Metanorma::Utils::anchor_or_uuid(node)))
+        attr_code(keep_attrs(node).
+                  merge(align: node.attr("align"), 
+                        id: Metanorma::Utils::anchor_or_uuid(node)))
       end
 
       def quote_attribution(node, out)
@@ -168,11 +181,12 @@ module Asciidoctor
       end
 
       def listing_attrs(node)
-        attr_code(keep_attrs(node).merge(lang: node.attr("language"),
-                                         id: Metanorma::Utils::anchor_or_uuid(node),
-                                         unnumbered: node.option?("unnumbered") ? "true" : nil,
-                                         number: node.attr("number"),
-                                         filename: node.attr("filename")))
+        attr_code(keep_attrs(node).
+                  merge(lang: node.attr("language"),
+                        id: Metanorma::Utils::anchor_or_uuid(node),
+                        unnumbered: node.option?("unnumbered") ? "true" : nil,
+                        number: node.attr("number"),
+                        filename: node.attr("filename")))
       end
 
       # NOTE: html escaping is performed by Nokogiri

data/lib/asciidoctor/standoc/cleanup_block.rb

@@ -29,7 +29,7 @@ module Asciidoctor
       def dl2_table_cleanup(xmldoc)
         q = "//table/following-sibling::*[1][self::p]"
         xmldoc.xpath(q).each do |s|
-          if s.text =~ /^\s*key[^a-z]*$/i && !s.next_element.nil? && s.next_element.name == "dl"
+          if s.text =~ /^\s*key[^a-z]*$/i && s&.next_element&.name == "dl"
             s.next_element["key"] = "true"
             s.previous_element << s.next_element.remove
             s.remove
@@ -95,7 +95,7 @@ module Asciidoctor
       def formula_cleanup_where2(x)
         q = "//formula/following-sibling::*[1][self::p]"
         x.xpath(q).each do |s|
-          if s.text =~ /^\s*where[^a-z]*$/i && !s.next_element.nil? && s.next_element.name == "dl"
+          if s.text =~ /^\s*where[^a-z]*$/i && s&.next_element&.name == "dl"
             s.next_element["key"] = "true"
             s.previous_element << s.next_element.remove
             s.remove
@@ -114,7 +114,7 @@ module Asciidoctor
       def figure_dl_cleanup2(xmldoc)
         q = "//figure/following-sibling::*[self::p]"
         xmldoc.xpath(q).each do |s|
-          if s.text =~ /^\s*key[^a-z]*$/i && !s.next_element.nil? && s.next_element.name == "dl"
+          if s.text =~ /^\s*key[^a-z]*$/i && s&.next_element&.name == "dl"
             s.next_element["key"] = "true"
             s.previous_element << s.next_element.remove
             s.remove
@@ -125,7 +125,9 @@ module Asciidoctor
       # examples containing only figures become subfigures of figures
       def subfigure_cleanup(xmldoc)
         xmldoc.xpath("//example[figure]").each do |e|
-          next unless e.elements.map { |m| m.name }.reject { |m| %w(name figure).include? m }.empty?
+          next unless e.elements.map { |m| m.name }.reject do |m|
+            %w(name figure).include? m
+          end.empty?
           e.name = "figure"
         end
       end
@@ -140,7 +142,8 @@ module Asciidoctor
       ELEMS_ALLOW_NOTES = %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 if it is not delimited
+      # if a note is followed by a non-note 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')]]"
@@ -150,8 +153,10 @@ module Asciidoctor
           prev = n.previous_element || next
           n.parent = prev if ELEMS_ALLOW_NOTES.include? prev.name
         end
-        xmldoc.xpath("//note[@keep-separate]").each { |n| n.delete("keep-separate") }
-        xmldoc.xpath("//termnote[@keep-separate]").each { |n| n.delete("keep-separate") }
+        xmldoc.xpath("//note[@keep-separate] | "\
+                     "//termnote[@keep-separate]").each do |n|
+          n.delete("keep-separate")
+        end
       end
 
       def requirement_cleanup(x)
@@ -184,18 +189,50 @@ module Asciidoctor
       end
 
       def requirement_cleanup1(r)
-        while d = r.at("./description[following-sibling::*[1][self::description]]")
+        while d = r.at("./description[following-sibling::*[1]"\
+            "[self::description]]")
           n = d.next.remove
           d << n.children
         end
-        r.xpath("./description[normalize-space(.)='']").each { |d| d.replace("\n") }
+        r.xpath("./description[normalize-space(.)='']").each do |d|
+          d.replace("\n")
+        end
       end
 
       def svgmap_cleanup(xmldoc)
+        svgmap_moveattrs(xmldoc)
         svgmap_populate(xmldoc)
         Metanorma::Utils::svgmap_rewrite(xmldoc, @localdir)
       end
 
+      def guid?(x)
+        /^_[0-9A-F]{8}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{12}$/i.
+          match(x)
+      end
+
+      def svgmap_moveattrs(xmldoc)
+        xmldoc.xpath("//svgmap").each do |s|
+          f = s.at(".//figure") or next
+          if t = s.at("./name") and !f.at("./name")
+            f.children.first.previous = t.remove
+          end
+          if s["id"] && guid?(f["id"])
+            f["id"] = s["id"]
+            s.delete("id")
+          end
+          svgmap_moveattrs1(s, f)
+        end
+      end
+
+      def svgmap_moveattrs1(s, f)
+        %w(unnumbered number subsequence keep-with-next
+          keep-lines-together).each do |a|
+            next if f[a] || !s[a]
+            f[a] = s[a]
+            s.delete(a)
+          end
+      end
+
       def svgmap_populate(xmldoc)
         xmldoc.xpath("//svgmap").each do |s|
           s1 = s.dup
@@ -204,8 +241,8 @@ module Asciidoctor
           s1.xpath(".//li").each do |li|
             t = li&.at(".//eref | .//link | .//xref") or next
             href = t.xpath("./following-sibling::node()")
-            next if href.empty?
-            s << %[<target href="#{svgmap_target(href)}">#{t.to_xml}</target>]
+            href.empty? or
+              s << %[<target href="#{svgmap_target(href)}">#{t.to_xml}</target>]
           end
         end
       end

data/lib/asciidoctor/standoc/cleanup_maths.rb

@@ -74,7 +74,7 @@ module Asciidoctor
         end
       end
 
-      UNITSML_NS = "http://unitsml.nist.gov/2005".freeze
+      UNITSML_NS = "https://schema.unitsml.org/unitsml/1.0".freeze
 
       def add_misc_container(xmldoc)
         unless ins = xmldoc.at("//misc-container")

data/lib/asciidoctor/standoc/ref_sect.rb

@@ -20,12 +20,12 @@ module Asciidoctor
         node.attr("style") == "bibliography" or
           @log.add("AsciiDoc Input", node, "Section not marked up as [bibliography]!")
         @biblio = true
-        xml.references **attr_code(attrs.merge(normative: false)) do |xml_section|
-          #title = node.level == 1 ? "Bibliography" : node.title
-          xml_section.title { |t| t << node.title }
-          xml_section << node.content
-        end
-        @biblio = false
+        xml.references **attr_code(attrs.merge(
+          normative: node.attr("normative") || false)) do |xml_section|
+            xml_section.title { |t| t << node.title }
+            xml_section << node.content
+          end
+          @biblio = false
       end
 
       def bibitem_parse(attrs, xml, node)
@@ -43,12 +43,12 @@ module Asciidoctor
         node.attr("style") == "bibliography" or
           @log.add("AsciiDoc Input", node, "Section not marked up as [bibliography]!")
         @norm_ref = true
-        xml.references **attr_code(attrs.merge(normative: true)) do |xml_section|
-          #xml_section.title { |t| t << "Normative References" }
-          xml_section.title { |t| t << node.title }
-          xml_section << node.content
-        end
-        @norm_ref = false
+        xml.references **attr_code(attrs.merge(
+          normative: node.attr("normative") || true)) do |xml_section|
+            xml_section.title { |t| t << node.title }
+            xml_section << node.content
+          end
+          @norm_ref = false
       end
 
       def global_ievcache_name

data/lib/metanorma/standoc/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION= "1.8.6".freeze
+    VERSION= "1.8.7".freeze
   end
 end

data/metanorma-standoc.gemspec

@@ -40,7 +40,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "metanorma-utils", "~> 1.0.2"
   spec.add_dependency "mathml2asciimath"
   spec.add_dependency "latexmath"
-  spec.add_dependency "asciimath2unitsml", "~> 0.2.0"
+  spec.add_dependency "asciimath2unitsml", "~> 0.3.0"
 
   spec.add_development_dependency "byebug"
   spec.add_development_dependency "sassc", "2.4.0"
@@ -49,7 +49,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "guard-rspec", "~> 4.7"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.6"
-  spec.add_development_dependency "rubocop", "= 0.54.0"
+  spec.add_development_dependency "rubocop", "~> 1.5.2"
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
   spec.add_development_dependency "vcr", "~> 5.0.0"

data/spec/asciidoctor/base_spec.rb

@@ -709,6 +709,7 @@ OUTPUT
       :header-font: Comic Sans
       :monospace-font: Andale Mono
       :htmlstylesheet: spec/assets/html.scss
+      :htmlstylesheet-override: spec/assets/html-override.css
       :htmlcoverpage: spec/assets/htmlcover.html
       :htmlintropage: spec/assets/htmlintro.html
       :scripts: spec/assets/scripts.html
@@ -727,6 +728,7 @@ OUTPUT
     expect(html).to match(%r[an empty html cover page])
     expect(html).to match(%r[an empty html intro page])
     expect(html).to match(%r[This is > a script])
+    expect(html).to match(%r[html-override])
   end
 
   it "uses specified fonts and assets in Word" do
@@ -741,6 +743,7 @@ OUTPUT
       :header-font: Comic Sans
       :monospace-font: Andale Mono
       :wordstylesheet: spec/assets/word.scss
+      :wordstylesheet-override: spec/assets/word-override.css
       :wordcoverpage: spec/assets/wordcover.html
       :wordintropage: spec/assets/wordintro.html
       :header: spec/assets/header.html
@@ -758,6 +761,7 @@ OUTPUT
     expect(html).to match(%r[h1[^{]+\{[^{]+font-family: Comic Sans;]m)
     expect(html).to match(%r[an empty word cover page])
     expect(html).to match(%r[an empty word intro page])
+    expect(html).to match(%r[word-override])
     expect(html).to include('\o "1-3"')
     expect(html).to include(%[Content-Location: file:///C:/Doc/test_files/header.html
 Content-Transfer-Encoding: base64

data/spec/asciidoctor/cleanup_sections_spec.rb

@@ -560,15 +560,15 @@ INPUT
 </title>
              <p id='_'>There are no normative references in this document.</p>
            </references>
-           <references id='_' normative='false' obligation='informative'>
-             <title>Bibliography
+           <references id='_' normative='true' obligation='informative'>
+             <title>Normative References 2.
 <fn reference='1'>
   <p id='_'>A</p>
 </fn>
 </title>
            </references>
            <references id='_' normative='false' obligation='informative'>
-             <title>Bibliography.
+             <title>Bibliography
 <fn reference='1'>
   <p id='_'>A</p>
 </fn>
@@ -803,8 +803,8 @@ INPUT
               <title>Normative references</title>
               <p id='_'>There are no normative references in this document.</p>
             </references>
-            <references id='_' normative='false' obligation='informative'>
-              <title>Bibliography</title>
+            <references id='_' normative='true' obligation='informative'>
+              <title>Normative References 2</title>
             </references>
             <references id='_' normative='false' obligation='informative'>
               <title>Bibliography</title>
@@ -1037,11 +1037,11 @@ INPUT
               <title>Références normatives</title>
               <p id='_'>Le présent document ne contient aucune référence normative.</p>
             </references>
-            <references id='_' normative='false' obligation='informative'>
-              <title>Bibliographie</title>
+            <references id='_' normative='true' obligation='informative'>
+              <title>Normative References 2</title>
             </references>
             <references id='_' normative='false' obligation='informative'>
-              <title>Bibliography</title>
+              <title>Bibliographie</title>
             </references>
             <clause id='_' obligation='informative'>
               <title>Bibliography 2</title>
@@ -1268,11 +1268,11 @@ INPUT
               <title>规范性引用文件</title>
               <p id='_'>本文件并没有规范性引用文件。</p>
             </references>
-            <references id='_' normative='false' obligation='informative'>
-              <title>参考文献</title>
+            <references id='_' normative='true' obligation='informative'>
+              <title>Normative References 2</title>
             </references>
             <references id='_' normative='false' obligation='informative'>
-              <title>Bibliography</title>
+              <title>参考文献</title>
             </references>
             <clause id='_' obligation='informative'>
               <title>Bibliography 2</title>
@@ -1499,11 +1499,11 @@ INPUT
               <title>Normaj citaĵoj</title>
               <p id='_'>There are no normative references in this document.</p>
             </references>
-            <references id='_' normative='false' obligation='informative'>
-              <title>Bibliografio</title>
+            <references id='_' normative='true' obligation='informative'>
+              <title>Normative References 2</title>
             </references>
             <references id='_' normative='false' obligation='informative'>
-              <title>Bibliography</title>
+              <title>Bibliografio</title>
             </references>
             <clause id='_' obligation='informative'>
               <title>Bibliography 2</title>