metanorma-standoc 1.8.2 → 1.8.7

data/lib/asciidoctor/standoc/cleanup_boilerplate.rb

@@ -106,7 +106,7 @@ module Asciidoctor
       def bibdata_cleanup(xmldoc)
         bibdata_anchor_cleanup(xmldoc)
         bibdata_docidentifier_cleanup(xmldoc)
-                biblio_indirect_erefs(xmldoc, @internal_eref_namespaces&.uniq)
+        biblio_indirect_erefs(xmldoc, @internal_eref_namespaces&.uniq)
       end
 
       def bibdata_anchor_cleanup(xmldoc)
@@ -124,7 +124,7 @@ module Asciidoctor
         end
       end
 
-       def gather_indirect_erefs(xmldoc, prefix)
+      def gather_indirect_erefs(xmldoc, prefix)
         xmldoc.xpath("//eref[@type = '#{prefix}']").each_with_object({}) do |e, m|
           e.delete("type")
           m[e["bibitemid"]] = true
@@ -160,7 +160,7 @@ module Asciidoctor
       def resolve_local_indirect_erefs(xmldoc, refs, prefix)
         refs.each_with_object([]) do |r, m|
           id = r.sub(/^#{prefix}_/, "")
-          if xmldoc.at("//*[@id = '#{id}'][@type = '#{prefix}']")
+          if n = xmldoc.at("//*[@id = '#{id}']") and n.at("./ancestor-or-self::*[@type = '#{prefix}']")
             xmldoc.xpath("//eref[@bibitemid = '#{r}']").each do |e|
               indirect_eref_to_xref(e, id)
             end

data/lib/asciidoctor/standoc/cleanup_inline.rb

@@ -74,10 +74,11 @@ module Asciidoctor
 
       def xref_to_eref(x)
         x["bibitemid"] = x["target"]
-        x["citeas"] = @anchors&.dig(x["target"], :xref) ||
+        unless x["citeas"] = @anchors&.dig(x["target"], :xref)
+          @internal_eref_namespaces.include?(x["type"]) or
           @log.add("Crossreferences", x,
-                   "#{x['target']} does not have a corresponding anchor ID "\
-                   "in the bibliography!")
+                   "#{x['target']} does not have a corresponding anchor ID in the bibliography!")
+        end
         x.delete("target")
         extract_localities(x) unless x.children.empty?
       end

data/lib/asciidoctor/standoc/cleanup_maths.rb

@@ -2,6 +2,7 @@ require "nokogiri"
 require "pathname"
 require "open-uri"
 require "html2doc"
+require "asciimath2unitsml"
 require_relative "./cleanup_block.rb"
 require_relative "./cleanup_footnotes.rb"
 require_relative "./cleanup_ref.rb"
@@ -73,13 +74,49 @@ module Asciidoctor
         end
       end
 
+      UNITSML_NS = "https://schema.unitsml.org/unitsml/1.0".freeze
+
+      def add_misc_container(xmldoc)
+        unless ins = xmldoc.at("//misc-container")
+          a = xmldoc.at("//termdocsource") || xmldoc.at("//bibdata")
+          a.next = "<misc-container/>"
+          ins = xmldoc.at("//misc-container")
+        end
+        ins
+      end
+
+      def mathml_unitsML(xmldoc)
+        return unless xmldoc.at(".//m:*", "m" => UNITSML_NS)
+        misc = add_misc_container(xmldoc)
+        unitsml = misc.add_child("<UnitsML xmlns='#{UNITSML_NS}'/>").first
+        %w(Unit CountedItem Quantity Dimension Prefix).each do |t|
+          gather_unitsml(unitsml, xmldoc, t)
+        end
+      end
+
+      def gather_unitsml(unitsml, xmldoc, t)
+        tags = xmldoc.xpath(".//m:#{t}", "m" => UNITSML_NS).each_with_object({}) do |x, m|
+          m[x["id"]] = x.remove
+        end
+        return if tags.empty?
+        set = unitsml.add_child("<#{t}Set/>").first
+        tags.values.each { |v| set << v }
+      end
+
+      def asciimath2unitsml_options
+        { multiplier: :space }
+      end
+
       def mathml_cleanup(xmldoc)
+        unitsml = Asciimath2UnitsML::Conv.new(asciimath2unitsml_options)
         xmldoc.xpath("//stem[@type = 'MathML']").each do |x|
           xml_unescape_mathml(x)
           mathml_namespace(x)
           mathml_preserve_space(x)
           mathml_italicise(x)
+          unitsml.MathML2UnitsML(x)
         end
+        mathml_unitsML(xmldoc)
       end
     end
   end

data/lib/asciidoctor/standoc/cleanup_ref.rb

@@ -50,6 +50,7 @@ module Asciidoctor
       def biblio_renumber(xmldoc)
         i = 0
         xmldoc.xpath("//bibliography//references | //clause//references | //annex//references").each do |r|
+          next if r["normative"] == "true"
           r.xpath("./bibitem").each do |b|
             i += 1
             next unless docid = b.at("./docidentifier[@type = 'metanorma']")
@@ -88,18 +89,8 @@ module Asciidoctor
         end
       end
 
-      def docid_prefix(prefix, docid)
-        docid = "#{prefix} #{docid}" unless omit_docid_prefix(prefix)
-        docid
-      end
-
-      def omit_docid_prefix(prefix)
-        return true if prefix.nil? || prefix.empty?
-        %(ISO IEC IEV ITU metanorma).include? prefix
-      end
-
-      def format_ref(ref, type, isopub)
-        return docid_prefix(type, ref) if isopub
+      def format_ref(ref, type)
+        return @isodoc.docid_prefix(type, ref) if type != "metanorma"
         return "[#{ref}]" if /^\d+$/.match(ref) && !/^\[.*\]$/.match(ref)
         ref
       end
@@ -115,7 +106,7 @@ module Asciidoctor
           isopub = ref.at(ISO_PUBLISHER_XPATH)
           docid = ref.at("./docidentifier[@type = 'metanorma']") ||
             ref.at("./docidentifier[not(@type = 'DOI')]") or next
-          reference = format_ref(docid.text, docid["type"], isopub)
+          reference = format_ref(docid.text, docid["type"])
           @anchors[ref["id"]] = { xref: reference }
         end
       end

data/lib/asciidoctor/standoc/cleanup_section.rb

@@ -62,10 +62,15 @@ module Asciidoctor
         end
       end
 
+      def make_indexsect(x, s)
+        x.xpath("//sections/indexsect").reverse_each { |r| s.next = r.remove }
+      end
+
       def sections_order_cleanup(x)
         s = x.at("//sections")
         make_preface(x, s)
         make_annexes(x)
+        make_indexsect(x, s)
         make_bibliography(x, s)
         x.xpath("//sections/annex").reverse_each { |r| s.next = r.remove }
       end

data/lib/asciidoctor/standoc/cleanup_terms.rb

@@ -97,7 +97,7 @@ module Asciidoctor
         termdocsource_cleanup(xmldoc)
       end   
 
-            # Indices sort after letter but before any following
+      # Indices sort after letter but before any following
       # letter (x, x_m, x_1, xa); we use colon to force that sort order.
       # Numbers sort *after* letters; we use thorn to force that sort order.
       def symbol_key(x)
@@ -107,7 +107,7 @@ module Asciidoctor
           n.replace(grkletters(MathML2AsciiMath.m2a(n.to_xml)))
         end
         ret = Nokogiri::XML(key.to_xml)
-        HTMLEntities.new.decode(ret.text).
+        HTMLEntities.new.decode(ret.text.downcase).
           gsub(/[\[\]\{\}<>\(\)]/, "").gsub(/\s/m, "").
           gsub(/[[:punct:]]|[_^]/, ":\\0").gsub(/`/, "").
           gsub(/[0-9]+/, "þ\\0")

data/lib/asciidoctor/standoc/inline.rb

@@ -145,6 +145,10 @@ module Asciidoctor
         end
       end
 
+        def highlight_parse(text, xml)
+          xml << text
+        end
+
       def inline_quoted(node)
         noko do |xml|
           case node.type
@@ -157,6 +161,7 @@ module Asciidoctor
           when :subscript then xml.sub { |s| s << node.text }
           when :asciimath then stem_parse(node.text, xml, :asciimath)
           when :latexmath then stem_parse(node.text, xml, :latexmath)
+          when :mark then highlight_parse(node.text, xml)
           else
             case node.role
               # the following three are legacy, they are now handled by macros
@@ -175,25 +180,12 @@ module Asciidoctor
         end.join
       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"'
-        # FIXME: nested uri path error(
-        #   sources/plantuml/plantuml20200524-90467-1iqek5i.png ->
-        #   sources/sources/plantuml/plantuml20200524-90467-1iqek5i.png)
-        path = File.file?(uri) ? uri : @localdir + uri
-        bin = File.open(path, 'rb', &:read)
-        data = Base64.strict_encode64(bin)
-        "data:#{type};base64,#{data}"
-      end
-
       def image_attributes(node)
         uri = node.image_uri (node.attr("target") || node.target)
-        types = /^data:/.match(uri) ? datauri2mime(uri) : MIME::Types.type_for(uri)
+        types = /^data:/.match(uri) ? Metanorma::Utils::datauri2mime(uri) : MIME::Types.type_for(uri)
         type = types.first.to_s
         uri = uri.sub(%r{^data:image/\*;}, "data:#{type};")
-        attr_code(src: uri, #@datauriimage ? datauri(uri) : uri,
+        attr_code(src: uri, 
                   id: Metanorma::Utils::anchor_or_uuid,
                   mimetype: type,
                   height: node.attr("height") || "auto",

data/lib/asciidoctor/standoc/isodoc.rng

@@ -102,7 +102,7 @@
           </attribute>
         </optional>
         <oneOrMore>
-          <ref name="li"/>
+          <ref name="ul_li"/>
         </oneOrMore>
         <zeroOrMore>
           <ref name="note"/>
@@ -812,6 +812,8 @@
       <ref name="requirement"/>
       <ref name="recommendation"/>
       <ref name="permission"/>
+      <ref name="imagemap"/>
+      <ref name="svgmap"/>
     </choice>
   </define>
   <define name="bibliography">
@@ -917,6 +919,9 @@
         </choice>
       </attribute>
       <ref name="bibdata"/>
+      <optional>
+        <ref name="misccontainer"/>
+      </optional>
       <optional>
         <ref name="boilerplate"/>
       </optional>
@@ -927,11 +932,21 @@
       <zeroOrMore>
         <ref name="annex"/>
       </zeroOrMore>
+      <optional>
+        <ref name="bibliography"/>
+      </optional>
       <zeroOrMore>
-        <ref name="references"/>
+        <ref name="indexsect"/>
       </zeroOrMore>
     </element>
   </define>
+  <define name="misccontainer">
+    <element name="misc-container">
+      <oneOrMore>
+        <ref name="AnyElement"/>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="preface">
     <element name="preface">
       <oneOrMore>
@@ -955,6 +970,11 @@
       <ref name="Content-Section"/>
     </element>
   </define>
+  <define name="indexsect">
+    <element name="indexsect">
+      <ref name="Content-Section"/>
+    </element>
+  </define>
   <define name="boilerplate">
     <element name="boilerplate">
       <optional>
@@ -1635,4 +1655,87 @@
       <text/>
     </element>
   </define>
+  <define name="imagemap">
+    <element name="imagemap">
+      <ref name="figure"/>
+      <zeroOrMore>
+        <element name="area">
+          <attribute name="type">
+            <choice>
+              <value>rect</value>
+              <value>circle</value>
+              <value>ellipse</value>
+              <value>poly</value>
+            </choice>
+          </attribute>
+          <choice>
+            <ref name="xref"/>
+            <ref name="hyperlink"/>
+            <ref name="eref"/>
+          </choice>
+          <oneOrMore>
+            <element name="coords">
+              <attribute name="x">
+                <data type="float"/>
+              </attribute>
+              <attribute name="y">
+                <data type="float"/>
+              </attribute>
+            </element>
+          </oneOrMore>
+          <optional>
+            <element name="radius">
+              <attribute name="x">
+                <data type="float"/>
+              </attribute>
+              <optional>
+                <attribute name="y">
+                  <data type="float"/>
+                </attribute>
+              </optional>
+            </element>
+          </optional>
+        </element>
+      </zeroOrMore>
+    </element>
+  </define>
+  <define name="svgmap">
+    <element name="svgmap">
+      <ref name="figure"/>
+      <zeroOrMore>
+        <element name="target">
+          <attribute name="href">
+            <data type="anyURI"/>
+          </attribute>
+          <choice>
+            <ref name="xref"/>
+            <ref name="hyperlink"/>
+            <ref name="eref"/>
+          </choice>
+        </element>
+      </zeroOrMore>
+    </element>
+  </define>
+  <define name="ul_li">
+    <element name="li">
+      <optional>
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="uncheckedcheckbox">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="checkedcheckbox">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <oneOrMore>
+        <ref name="BasicBlock"/>
+      </oneOrMore>
+    </element>
+  </define>
 </grammar>

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/asciidoctor/standoc/section.rb

@@ -88,6 +88,8 @@ module Asciidoctor
               bibliography_parse(a, xml, node)
             elsif node.attr("style") == "abstract" 
               abstract_parse(a, xml, node)
+            elsif node.attr("style") == "index" 
+              indexsect_parse(a, xml, node)
             elsif node.attr("style") == "appendix" && node.level == 1
               annex_parse(a, xml, node)
             else
@@ -114,6 +116,13 @@ module Asciidoctor
         end.join("\n")
       end
 
+      def indexsect_parse(attrs, xml, node)
+        xml.indexsect **attr_code(attrs) do |xml_section|
+          xml_section.title { |name| name << node.title }
+          xml_section << node.content
+        end
+      end
+
       def abstract_parse(attrs, xml, node)
         xml.abstract **attr_code(attrs) do |xml_section|
           xml_section << node.content

data/lib/asciidoctor/standoc/utils.rb

@@ -5,7 +5,6 @@ require "json"
 require "pathname"
 require "open-uri"
 require "uuidtools"
-require "mimemagic"
 
 module Asciidoctor
   module Standoc
@@ -57,29 +56,6 @@ module Asciidoctor
         end
       end
 
-      def datauri2mime(uri)
-        %r{^data:image/(?<imgtype>[^;]+);base64,(?<imgdata>.+)$} =~ uri
-        type = nil
-        imgtype = "png" unless /^[a-z0-9]+$/.match imgtype
-        Tempfile.open(["imageuri", ".#{imgtype}"]) do |file|
-          type = datauri2mime1(file, imgdata)
-        end
-        [type]
-      end
-
-      def datauri2mime1(file, imgdata)
-        type = nil
-        begin
-          file.binmode
-          file.write(Base64.strict_decode64(imgdata))
-          file.rewind
-          type = MimeMagic.by_magic(file)
-        ensure
-          file.close!
-        end
-        type
-      end
-
       SUBCLAUSE_XPATH = "//clause[not(parent::sections)]"\
         "[not(ancestor::boilerplate)]".freeze