metanorma-standoc 1.7.3 → 1.8.5

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,96 +106,11 @@ 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
 
-      def ref_dl_cleanup(xmldoc)
-        xmldoc.xpath("//clause[@bibitem = 'true']").each do |c|
-          bib = dl_bib_extract(c) or next
-          validate_ref_dl(bib, c)
-          bibitemxml = RelatonBib::BibliographicItem.new(RelatonBib::HashConverter::hash_to_bib(bib)).to_xml or next
-          bibitem = Nokogiri::XML(bibitemxml)
-          bibitem.root["id"] = c["id"] if c["id"] && !/^_/.match(c["id"])
-          c.replace(bibitem.root)
-        end
-      end
-
-      def validate_ref_dl(bib, c)
-        id = bib["id"]
-        id ||= c["id"] unless /^_/.match(c["id"]) # do not accept implicit id
-        unless id
-          @log.add("Anchors", c, "The following reference is missing an anchor:\n" + c.to_xml)
-          return
-        end
-        bib["title"] or @log.add("Bibliography", c, "Reference #{id} is missing a title")
-        bib["docid"] or @log.add("Bibliography", c, "Reference #{id} is missing a document identifier (docid)")
-      end
-
-      def extract_from_p(tag, bib, key)
-        return unless bib[tag]
-        "<#{key}>#{bib[tag].at('p').children}</#{key}>"
-      end
-
-      # if the content is a single paragraph, replace it with its children
-      # single links replaced with uri
-      def p_unwrap(p)
-        elems = p.elements
-        if elems.size == 1 && elems[0].name == "p"
-          link_unwrap(elems[0]).children.to_xml.strip
-        else
-          p.to_xml.strip
-        end
-      end
-
-      def link_unwrap(p)
-        elems = p.elements
-        if elems.size == 1 && elems[0].name == "link"
-          p.at("./link").replace(elems[0]["target"].strip)
-        end
-        p
-      end
-
-      def dd_bib_extract(dtd)
-        return nil if dtd.children.empty?
-        dtd.at("./dl") and return dl_bib_extract(dtd)
-        elems = dtd.remove.elements
-        return p_unwrap(dtd) unless elems.size == 1 && %w(ol ul).include?(elems[0].name)
-        ret = []
-        elems[0].xpath("./li").each do |li|
-          ret << p_unwrap(li)
-        end
-        ret
-      end
-
-      def add_to_hash(bib, key, val)
-        Utils::set_nested_value(bib, key.split(/\./), val)
-      end
-
-      # definition list, with at most one level of unordered lists
-      def dl_bib_extract(c, nested = false)
-        dl = c.at("./dl") or return
-        bib = {}
-        key = ""
-        dl.xpath("./dt | ./dd").each do |dtd|
-          dtd.name == "dt" and key = dtd.text.sub(/:+$/, "") or add_to_hash(bib, key, dd_bib_extract(dtd))
-        end
-        c.xpath("./clause").each do |c1|
-          key = c1&.at("./title")&.text&.downcase&.strip
-          next unless %w(contributor relation series).include? key
-          add_to_hash(bib, key, dl_bib_extract(c1, true))
-        end
-        if !nested and c.at("./title")
-          title = c.at("./title").remove.children.to_xml
-          bib["title"] = [bib["title"]] if bib["title"].is_a? Hash
-          bib["title"] = [bib["title"]] if bib["title"].is_a? String
-          bib["title"] = [] unless bib["title"]
-          bib["title"] << title if !title.empty?
-        end
-        bib
-      end
-
       def fetch_termbase(termbase, id)
         ""
       end

data/lib/asciidoctor/standoc/cleanup_ref_dl.rb

@@ -0,0 +1,94 @@
+require "set"
+require "relaton_bib"
+
+module Asciidoctor
+  module Standoc
+    module Cleanup
+      def ref_dl_cleanup(xmldoc)
+        xmldoc.xpath("//clause[@bibitem = 'true']").each do |c|
+          bib = dl_bib_extract(c) or next
+          validate_ref_dl(bib, c)
+          bibitemxml = RelatonBib::BibliographicItem.new(RelatonBib::HashConverter::hash_to_bib(bib)).to_xml or next
+          bibitem = Nokogiri::XML(bibitemxml)
+          bibitem.root["id"] = c["id"] if c["id"] && !/^_/.match(c["id"])
+          c.replace(bibitem.root)
+        end
+      end
+
+      def validate_ref_dl(bib, c)
+        id = bib["id"]
+        id ||= c["id"] unless /^_/.match(c["id"]) # do not accept implicit id
+        unless id
+          @log.add("Anchors", c, "The following reference is missing an anchor:\n" + c.to_xml)
+          return
+        end
+        @refids << id
+        bib["title"] or @log.add("Bibliography", c, "Reference #{id} is missing a title")
+        bib["docid"] or @log.add("Bibliography", c, "Reference #{id} is missing a document identifier (docid)")
+      end
+
+      def extract_from_p(tag, bib, key)
+        return unless bib[tag]
+        "<#{key}>#{bib[tag].at('p').children}</#{key}>"
+      end
+
+      # if the content is a single paragraph, replace it with its children
+      # single links replaced with uri
+      def p_unwrap(p)
+        elems = p.elements
+        if elems.size == 1 && elems[0].name == "p"
+          link_unwrap(elems[0]).children.to_xml.strip
+        else
+          p.to_xml.strip
+        end
+      end
+
+      def link_unwrap(p)
+        elems = p.elements
+        if elems.size == 1 && elems[0].name == "link"
+          p.at("./link").replace(elems[0]["target"].strip)
+        end
+        p
+      end
+
+      def dd_bib_extract(dtd)
+        return nil if dtd.children.empty?
+        dtd.at("./dl") and return dl_bib_extract(dtd)
+        elems = dtd.remove.elements
+        return p_unwrap(dtd) unless elems.size == 1 && %w(ol ul).include?(elems[0].name)
+        ret = []
+        elems[0].xpath("./li").each do |li|
+          ret << p_unwrap(li)
+        end
+        ret
+      end
+
+      def add_to_hash(bib, key, val)
+        Metanorma::Utils::set_nested_value(bib, key.split(/\./), val)
+      end
+
+      # definition list, with at most one level of unordered lists
+      def dl_bib_extract(c, nested = false)
+        dl = c.at("./dl") or return
+        bib = {}
+        key = ""
+        dl.xpath("./dt | ./dd").each do |dtd|
+          dtd.name == "dt" and key = dtd.text.sub(/:+$/, "") or add_to_hash(bib, key, dd_bib_extract(dtd))
+        end
+        c.xpath("./clause").each do |c1|
+          key = c1&.at("./title")&.text&.downcase&.strip
+          next unless %w(contributor relation series).include? key
+          add_to_hash(bib, key, dl_bib_extract(c1, true))
+        end
+        if !nested and c.at("./title")
+          title = c.at("./title").remove.children.to_xml
+          bib["title"] = [bib["title"]] if bib["title"].is_a? Hash
+          bib["title"] = [bib["title"]] if bib["title"].is_a? String
+          bib["title"] = [] unless bib["title"]
+          bib["title"] << title if !title.empty?
+        end
+        bib
+      end
+    end
+  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/converter.rb

@@ -14,7 +14,6 @@ require "asciidoctor/standoc/utils"
 require "asciidoctor/standoc/cleanup"
 require "asciidoctor/standoc/reqt"
 require_relative "./macros.rb"
-require_relative "./log.rb"
 
 module Asciidoctor
   module Standoc

data/lib/asciidoctor/standoc/front.rb

@@ -93,7 +93,7 @@ module Asciidoctor
       end
 
       def metadata_script(node, xml)
-        xml.script (node.attr("script") || "Latn")
+        xml.script (node.attr("script") || default_script(node.attr("language")))
       end
 
       def relaton_relations
@@ -186,7 +186,7 @@ module Asciidoctor
         ["en"].each do |lang|
           at = { language: lang, format: "text/plain" }
           xml.title **attr_code(at) do |t|
-            t << (Utils::asciidoc_sub(node.attr("title") ||
+            t << (Metanorma::Utils::asciidoc_sub(node.attr("title") ||
                                       node.attr("title-en")) || node.title)
           end
         end

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,26 +180,13 @@ 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,
-                  id: Utils::anchor_or_uuid,
+        attr_code(src: uri, 
+                  id: Metanorma::Utils::anchor_or_uuid,
                   mimetype: type,
                   height: node.attr("height") || "auto",
                   width: node.attr("width") || "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"/>
@@ -789,6 +789,9 @@
       <attribute name="width"/>
     </element>
   </define>
+  <define name="BibItemType" combine="choice">
+    <value>internal</value>
+  </define>
   <define name="TextElement" combine="choice">
     <ref name="concept"/>
   </define>
@@ -809,6 +812,8 @@
       <ref name="requirement"/>
       <ref name="recommendation"/>
       <ref name="permission"/>
+      <ref name="imagemap"/>
+      <ref name="svgmap"/>
     </choice>
   </define>
   <define name="bibliography">
@@ -914,6 +919,9 @@
         </choice>
       </attribute>
       <ref name="bibdata"/>
+      <optional>
+        <ref name="misccontainer"/>
+      </optional>
       <optional>
         <ref name="boilerplate"/>
       </optional>
@@ -924,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>
@@ -952,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>
@@ -1632,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>