metanorma-standoc 2.7.5 → 2.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d3fc596438edd06d1a0bbfa6ca008e650e22e9230048259f4b0696bde8a1087
-  data.tar.gz: 3b5c3569a642d7da4b61cb98aa999a2ad526e4f43265489bd99fa59c659e5d48
+  metadata.gz: 6a5e5f1a3e1674d8e9cc0b3cdc0979195595b187e972e498616b30955cbc4512
+  data.tar.gz: 81b45e23e6ece67cd6a6d8d6bd747c439264faca7ee26daf58b6cbdc42dcd93d
 SHA512:
-  metadata.gz: 483f649b259da9b1a6b44736eb78979b3e06ad5ae29f666e0e2416ef3aa2193b22ea13b9aa14f2ac6b249020f6226f8912ab95cd2860458df767be62f6198127
-  data.tar.gz: ba5da0a5a7af09d8da8237fabeeb9bfe813e3d43d21295e04ea0b2f0bc9c0011d52a7da2c55df2a00fad8fe2568bd14e5e57b28fa761c0ed2535d72f0a22eeb4
+  metadata.gz: 33d2ba8ae3a9b5ed18bf30193c507bcc6da280054dcc5c6c22e0f87288e6d229fb2bbcc62175826918d2b25935f1b6fc84f7d68f64e925a438c1d20fe6845f77
+  data.tar.gz: acab296d523a22e518a64ef1d1109706bfe4e3b164366f237b09a42e804ac371bf3387cd40122ea1f9eb0e42f9fa86796140826fd0013b44417b9d792cc3751a

data/lib/metanorma/standoc/anchor.rb

@@ -48,14 +48,14 @@ module Metanorma
         { target: target, hidden: match[:hidden],
           type: match[:fn].nil? ? "inline" : "footnote",
           case: match[:case]&.sub(/%$/, ""),
-          style: match[:style]&.sub(/^style=/, "")&.sub(/%$/, "") || @xrefstyle,
+          style: match[:style] || @xrefstyle,
           droploc: match[:drop].nil? && match[:drop2].nil? ? nil : true,
           text: inline_anchor_xref_text(match, text) }
       end
 
       def inline_anchor_xref_match(text)
         /^(?:hidden%(?<hidden>[^,]+),?)?
-          (?<style>style=[^%]+%)?
+          (?:style=(?<style>[^%]+)%)?
           (?<drop>droploc%)?(?<case>capital%|lowercase%)?(?<drop2>droploc%)?
           (?<fn>fn:?\s*)?(?<text>.*)$/x.match text
       end
@@ -68,11 +68,7 @@ module Metanorma
       end
 
       def inline_anchor_link(node)
-        contents = node.text
-        contents = "" if node.target.gsub(%r{^mailto:}, "") == node.text
-        attributes = { target: node.target, alt: node.attr("title"),
-                       "update-type": node.attr("updatetype") ||
-                         node.attr("update-type") }
+        contents, attributes = inline_anchor_link_attrs(node)
         noko do |xml|
           xml.link **attr_code(attributes) do |l|
             l << contents
@@ -80,10 +76,18 @@ module Metanorma
         end.join
       end
 
+      def inline_anchor_link_attrs(node)
+        contents = node.text
+        contents = "" if node.target.gsub(%r{^mailto:}, "") == node.text
+        attributes = { target: node.target, alt: node.attr("title"),
+                       style: node.attr("style")&.sub(/%$/, ""),
+                       "update-type": node.attr("updatetype") ||
+                         node.attr("update-type") }
+        [contents, attributes]
+      end
+
       def inline_anchor_bibref(node)
-        eref_contents =
-          @c.decode(node.text || node.target || node.id)
-          &.sub(/^\[?([^\[\]]+?)\]?$/, "[\\1]")
+        eref_contents = inline_anchor_bibref_contents(node)
         @refids << (node.target || node.id)
         noko do |xml|
           xml.ref **attr_code(id: node.target || node.id) do |r|
@@ -92,6 +96,11 @@ module Metanorma
         end.join
       end
 
+      def inline_anchor_bibref_contents(node)
+        @c.decode(node.text || node.target || node.id)
+          &.sub(/^\[?([^\[\]]+?)\]?$/, "[\\1]")
+      end
+
       def inline_callout(node)
         noko do |xml|
           xml.callout node.text

data/lib/metanorma/standoc/base.rb

@@ -1,13 +1,11 @@
 require "date"
 require "nokogiri"
 require "htmlentities"
-require "json"
 require "pathname"
 require "isodoc"
 require "relaton"
 require "fileutils"
 require "metanorma-utils"
-require "isodoc/xslfo_convert"
 require_relative "render"
 require_relative "localbib"
 require "mn-requirements"
@@ -80,8 +78,8 @@ module Metanorma
       end
 
       def init_reqt(node)
-        @default_requirement_model = (node.attr("requirements-model") ||
-                                        default_requirement_model)
+        @default_requirement_model = node.attr("requirements-model") ||
+          default_requirement_model
         @reqt_models = requirements_processor
           .new({ default: @default_requirement_model })
       end
@@ -117,9 +115,9 @@ module Metanorma
       end
 
       def init_i18n(node)
-        @lang = (node.attr("language") || "en")
-        @script = (node.attr("script") ||
-                   Metanorma::Utils.default_script(node.attr("language")))
+        @lang = node.attr("language") || "en"
+        @script = node.attr("script") ||
+          Metanorma::Utils.default_script(node.attr("language"))
         @locale = node.attr("locale")
         @isodoc = isodoc(@lang, @script, @locale, node.attr("i18nyaml"))
         @i18n = @isodoc.i18n

data/lib/metanorma/standoc/basicdoc.rng

@@ -95,8 +95,89 @@
       <ref name="pagebreak"/>
       <ref name="hr"/>
       <ref name="bookmark"/>
+      <ref name="amend"/>
     </choice>
   </define>
+  <define name="amend">
+    <element name="amend">
+      <ref name="AmendType"/>
+    </element>
+  </define>
+  <define name="AmendType">
+    <optional>
+      <attribute name="id">
+        <data type="ID"/>
+      </attribute>
+    </optional>
+    <attribute name="change">
+      <choice>
+        <value>add</value>
+        <value>modify</value>
+        <value>delete</value>
+        <value>replace</value>
+      </choice>
+    </attribute>
+    <optional>
+      <attribute name="path"/>
+    </optional>
+    <optional>
+      <attribute name="path_end"/>
+    </optional>
+    <optional>
+      <attribute name="title"/>
+    </optional>
+    <optional>
+      <element name="location">
+        <zeroOrMore>
+          <choice>
+            <ref name="locality"/>
+            <ref name="localityStack"/>
+          </choice>
+        </zeroOrMore>
+      </element>
+    </optional>
+    <optional>
+      <element name="description">
+        <zeroOrMore>
+          <ref name="BasicBlock"/>
+        </zeroOrMore>
+      </element>
+    </optional>
+    <optional>
+      <element name="newcontent">
+        <optional>
+          <attribute name="id">
+            <data type="ID"/>
+          </attribute>
+        </optional>
+        <zeroOrMore>
+          <ref name="BasicBlock"/>
+        </zeroOrMore>
+      </element>
+    </optional>
+    <zeroOrMore>
+      <ref name="classification"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="contributor"/>
+    </zeroOrMore>
+  </define>
+  <define name="classification">
+    <element name="classification">
+      <ref name="classification_tag"/>
+      <ref name="classification_value"/>
+    </element>
+  </define>
+  <define name="classification_tag">
+    <element name="tag">
+      <text/>
+    </element>
+  </define>
+  <define name="classification_value">
+    <element name="value">
+      <text/>
+    </element>
+  </define>
   <define name="paragraph">
     <element name="p">
       <ref name="ParagraphType"/>
@@ -163,6 +244,9 @@
         <data type="ID"/>
       </attribute>
       <attribute name="reviewer"/>
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <optional>
         <attribute name="date">
           <data type="dateTime"/>
@@ -939,18 +1023,12 @@
     </optional>
     <optional>
       <attribute name="width">
-        <choice>
-          <data type="int"/>
-          <value>auto</value>
-        </choice>
+        <ref name="ImageSize"/>
       </attribute>
     </optional>
     <optional>
       <attribute name="height">
-        <choice>
-          <data type="int"/>
-          <value>auto</value>
-        </choice>
+        <ref name="ImageSize"/>
       </attribute>
     </optional>
     <optional>
@@ -965,6 +1043,14 @@
       </attribute>
     </optional>
   </define>
+  <define name="ImageSize">
+    <choice>
+      <data type="string">
+        <param name="pattern">\d+([.]\d+)?(%?)</param>
+      </data>
+      <value>auto</value>
+    </choice>
+  </define>
   <define name="video">
     <element name="video">
       <attribute name="id">

data/lib/metanorma/standoc/biblio-standoc.rng

@@ -9,11 +9,42 @@
   -->
   <include href="biblio.rng">
     <define name="BibData">
-      <ref name="BibliographicItem"/>
+      <ref name="StandardBibliographicItem"/>
       <optional>
         <ref name="ext"/>
       </optional>
     </define>
+    <define name="docrelation">
+      <element name="relation">
+        <attribute name="type">
+          <ref name="DocRelationType"/>
+        </attribute>
+        <optional>
+          <element name="description">
+            <ref name="FormattedString"/>
+          </element>
+        </optional>
+        <element name="bibitem">
+          <ref name="StandardReducedBibliographicItem"/>
+        </element>
+        <choice>
+          <zeroOrMore>
+            <ref name="locality"/>
+          </zeroOrMore>
+          <zeroOrMore>
+            <ref name="localityStack"/>
+          </zeroOrMore>
+        </choice>
+        <choice>
+          <zeroOrMore>
+            <ref name="sourceLocality"/>
+          </zeroOrMore>
+          <zeroOrMore>
+            <ref name="sourceLocalityStack"/>
+          </zeroOrMore>
+        </choice>
+      </element>
+    </define>
   </include>
   <define name="ext">
     <element name="ext">
@@ -161,4 +192,16 @@
       </optional>
     </element>
   </define>
+  <define name="StandardBibliographicItem">
+    <ref name="BibliographicItem"/>
+    <zeroOrMore>
+      <ref name="amend"/>
+    </zeroOrMore>
+  </define>
+  <define name="StandardReducedBibliographicItem">
+    <ref name="ReducedBibliographicItem"/>
+    <zeroOrMore>
+      <ref name="amend"/>
+    </zeroOrMore>
+  </define>
 </grammar>

data/lib/metanorma/standoc/biblio.rng

@@ -241,6 +241,9 @@
     </element>
   </define>
   <define name="FullNameType">
+    <optional>
+      <ref name="name_abbreviation"/>
+    </optional>
     <choice>
       <group>
         <zeroOrMore>
@@ -266,6 +269,11 @@
       <ref name="variantname"/>
     </zeroOrMore>
   </define>
+  <define name="name_abbreviation">
+    <element name="abbreviation">
+      <ref name="LocalizedString"/>
+    </element>
+  </define>
   <define name="prefix">
     <element name="prefix">
       <ref name="LocalizedString"/>
@@ -870,6 +878,9 @@
     <optional>
       <ref name="validity"/>
     </optional>
+    <optional>
+      <ref name="depiction"/>
+    </optional>
   </define>
   <define name="btitle">
     <element name="title">

data/lib/metanorma/standoc/blocks_notes.rb

@@ -22,13 +22,12 @@ module Metanorma
           attr_code(
             from: node.attr("from"),
             to: node.attr("to") || node.attr("from"),
+            type: node.attr("type") || nil,
           ),
         )
       end
 
       def sidebar(node)
-        return unless draft?
-
         noko do |xml|
           xml.review **sidebar_attrs(node) do |r|
             wrap_in_para(node, r)
@@ -42,7 +41,7 @@ module Metanorma
         attr_code(id_attr(node)
           .merge(reviewer: node.attr("reviewer") || node.attr("source") ||
                  "(Unknown)",
-                 date: date))
+                 date: date, type: "todo"))
       end
 
       def todo(node)
@@ -96,10 +95,7 @@ module Metanorma
       end
 
       def admonition(node)
-        return termnote(node) if in_terms? && node.attr("name") == "note"
-        return note(node) if node.attr("name") == "note"
-        return todo(node) if node.attr("name") == "todo"
-
+        ret = admonition_alternatives(node) and return ret
         noko do |xml|
           xml.admonition **admonition_attrs(node) do |a|
             node.title.nil? or a.name { |name| name << node.title }
@@ -107,6 +103,13 @@ module Metanorma
           end
         end.join("\n")
       end
+
+      def admonition_alternatives(node)
+        in_terms? && node.attr("name") == "note" and return termnote(node)
+        node.attr("name") == "note" and return note(node)
+        node.attr("name") == "todo" and return todo(node)
+        nil
+      end
     end
   end
 end

data/lib/metanorma/standoc/cleanup.rb

@@ -29,6 +29,7 @@ module Metanorma
         element_name_cleanup(xmldoc)
         passthrough_cleanup(xmldoc)
         unnumbered_blocks_cleanup(xmldoc)
+        termdocsource_cleanup(xmldoc) # feeds: metadata_cleanup
         metadata_cleanup(xmldoc) # feeds: boilerplate_cleanup
         sections_cleanup(xmldoc) # feeds: obligations_cleanup, toc_cleanup,
         # floatingtitle_cleanup
@@ -71,6 +72,8 @@ module Metanorma
         mathml_cleanup(xmldoc)
         script_cleanup(xmldoc)
         docidentifier_cleanup(xmldoc) # feeds: bibdata_cleanup
+        ext_contributor_cleanup(xmldoc) # feeds: bibdata_cleanup
+        ext_dochistory_cleanup(xmldoc) # feeds: bibdata_cleanup
         bibdata_cleanup(xmldoc)
         svgmap_cleanup(xmldoc) # feeds: img_cleanup
         boilerplate_cleanup(xmldoc)

data/lib/metanorma/standoc/cleanup_amend.rb

@@ -19,9 +19,10 @@ module Metanorma
       def create_amend1(clause, amend)
         create_amend2(clause, amend)
         d = amend.at("./description")
-        d.xpath(".//autonumber").each { |e| d.previous = e }
+        autonum = d.xpath(".//autonumber").map(&:remove)
         d.xpath(".//p[normalize-space(.)='']").each(&:remove)
         move_attrs_to_amend(clause, amend)
+        autonum.each { |a| amend << a }
         amend
       end
 

data/lib/metanorma/standoc/cleanup_bibdata.rb

@@ -46,17 +46,16 @@ module Metanorma
       end
 
       def indirect_eref_to_xref(eref, ident)
-        loc = eref.at("./localityStack[locality[@type = 'anchor']]")
-          &.remove&.text ||
-          eref.at("./locality[@type = 'anchor']")&.remove&.text || ident
+        loc = eref.at("./localityStack[locality[@type = 'anchor']]") ||
+          eref.at("./locality[@type = 'anchor']")
+        loc = loc&.remove&.text || ident
         eref.name = "xref"
         eref.delete("bibitemid")
         eref.delete("citeas")
         eref["target"] = loc
-        unless eref.document.at("//*[@id = '#{loc}']")
-          eref.children = %(** Missing target #{loc})
-          eref["target"] = ident
-        end
+        eref.document.at("//*[@id = '#{loc}']") and return
+        eref.children = %(** Missing target #{loc})
+        eref["target"] = ident
       end
 
       def resolve_local_indirect_erefs(xmldoc, refs, prefix)
@@ -122,6 +121,118 @@ module Metanorma
             .each { |x| x << ident.text }
         end
       end
+
+      def ext_contributor_cleanup(xmldoc)
+        t = xmldoc.xpath("//metanorma-extension/clause/title").detect do |x|
+          x.text.strip.casecmp("contributor metadata").zero?
+        end or return
+        a = t.at("../sourcecode") or return
+        ins = xmldoc.at("//bibdata/contributor[last()]")
+        yaml = YAML.safe_load(a.text, permitted_classes: [Date])
+        ext_contributors_process(yaml, ins)
+      end
+
+      def yaml2relaton(yaml, amend = nil)
+        r = RelatonBib.parse_yaml(yaml.to_yaml, [Date], symbolize_names: true)
+        h = RelatonBib::HashConverter.hash_to_bib(r)
+        b = RelatonBib::BibliographicItem.new(**h).to_xml
+        amend and b.sub!("</bibitem>", "#{amend}</bibitem>")
+        b
+      end
+
+      def ext_contributors_process(yaml, ins)
+        yaml.is_a?(Hash) && !yaml["contributor"] and yaml = [yaml]
+        yaml.is_a?(Array) and yaml = { "contributor" => yaml }
+        r = yaml2relaton(yaml)
+        Nokogiri::XML(r).xpath("//contributor").reverse
+          .each do |c|
+          ins.next = c
+        end
+      end
+
+      def bib_relation_insert_pt(xmldoc)
+        ins = nil
+        %w(relation copyright status abstract script language note version
+           edition contributor).each do |x|
+          ins = xmldoc.at("//bibdata/#{x}[last()]") and break
+        end
+        ins
+      end
+
+      def ext_dochistory_cleanup(xmldoc)
+        t = xmldoc.xpath("//metanorma-extension/clause/title").detect do |x|
+          x.text.strip.casecmp("document history").zero?
+        end or return
+        a = t.at("../sourcecode") or return
+        ins = bib_relation_insert_pt(xmldoc) or return
+        docid = xmldoc.at("//bibdata/docidentifier")
+        yaml = YAML.safe_load(a.text, permitted_classes: [Date])
+        ext_dochistory_process(yaml, ins, docid)
+      end
+
+      def ext_dochistory_process(yaml, ins, docid)
+        yaml.is_a?(Hash) and yaml = [yaml]
+        yaml.reverse.each do |y|
+          type = y["relation.type"] || "updatedBy"
+          docid and
+            y["docid"] ||= [{ "type" => docid["type"], "id" => docid.text }]
+          r = yaml2relaton(y, amend_hash2mn(y["amend"]))
+          ins.next = "<relation type='#{type}'>#{r}</relation>"
+        end
+      end
+
+      def amend_hash2mn(yaml)
+        yaml.nil? and return ""
+        yaml.is_a?(Hash) and yaml = [yaml]
+        yaml.map { |x| amend_hash2mn1(x) }.join("\n")
+      end
+
+      def amend_attrs(yaml)
+        ret = ""
+        yaml["change"] ||= "modify"
+        %w(change path path_end title).each do |x|
+          a = yaml[x] and ret += " #{x}='#{a}'"
+        end
+        ret = "<amend#{ret}>"
+      end
+
+      def amend_hash2mn1(yaml)
+        ret = amend_attrs(yaml)
+        ret += amend_description(yaml)
+        ret += amend_location(yaml)
+        ret += amend_classification(yaml)
+        "#{ret}</amend>"
+      end
+
+      def amend_location(yaml)
+        a = yaml["location"] or return ""
+        a.is_a?(Array) or a = [a]
+        ret = a.map do |x|
+          elem = Nokogiri::XML("<location>#{x}</location>").root
+          extract_localities(elem)
+          elem.children.to_xml
+        end.join("\n")
+        "<location>#{ret}</location>"
+      end
+
+      def amend_description(yaml)
+        a = yaml["description"] or return ""
+        out = adoc2xml(a, backend.to_sym)
+        "<description>#{out.children.to_xml}</description>"
+      end
+
+      def amend_classification(yaml)
+        a = yaml["classification"] or return ""
+        a.is_a?(Array) or a = [a]
+        a.map { |x| amend_classification1(x) }.join("\n")
+      end
+
+      def amend_classification1(yaml)
+        yaml.is_a?(Hash) or yaml = { "tag" => "default", "value" => yaml }
+        <<~OUT
+          <classification><tag>#{yaml['tag']}</tag><value>#{yaml['value']}</value></classification>
+        OUT
+      end
     end
   end
 end

data/lib/metanorma/standoc/cleanup_image.rb

@@ -1,3 +1,5 @@
+require "vectory"
+
 module Metanorma
   module Standoc
     module Cleanup
@@ -5,7 +7,7 @@ module Metanorma
         svg_uniqueids(xmldoc)
         svgmap_moveattrs(xmldoc)
         svgmap_populate(xmldoc)
-        Metanorma::Utils::svgmap_rewrite(xmldoc, @localdir)
+        Vectory::SvgMapping.new(xmldoc, @localdir).call
       end
 
       def guid?(str)
@@ -64,7 +66,7 @@ module Metanorma
           xmldoc.xpath("//image").each do |i|
             # do not datauri encode SVG, we need to deduplicate its IDs
             unless read_in_if_svg(i, @localdir)
-              i["src"] = Metanorma::Utils::datauri(i["src"], @localdir)
+              i["src"] = Vectory::Utils::datauri(i["src"], @localdir)
             end
           end
         end
@@ -75,7 +77,7 @@ module Metanorma
       def read_in_if_svg(img, localdir)
         return false unless img["src"]
 
-        path = Metanorma::Utils::svgmap_rewrite0_path(img["src"], localdir)
+        path = Vectory::Utils.svgmap_rewrite0_path(img["src"], localdir)
         File.file?(path) or return false
         types = MIME::Types.type_for(path) or return false
         types.first == "image/svg+xml" or return false

data/lib/metanorma/standoc/cleanup_inline.rb

@@ -14,11 +14,12 @@ module Metanorma
       end
 
       def strip_initial_space(elem)
-        elem.children[0].text? or return
-        if /\S/.match?(elem.children[0].text)
-          elem.children[0].content = elem.children[0].text.lstrip
+        a = elem.children[0]
+        a.text? or return
+        if /\S/.match?(a.text)
+          a.content = a.text.lstrip
         else
-          elem.children[0].remove
+          a.remove
         end
       end
 
@@ -208,6 +209,10 @@ module Metanorma
       end
 
       def link_cleanup(xmldoc)
+        uri_cleanup(xmldoc)
+      end
+
+      def uri_cleanup(xmldoc)
         xmldoc.xpath("//link[@target]").each do |l|
           l["target"] = Addressable::URI.parse(l["target"]).to_s
         rescue Addressable::URI::InvalidURIError

data/lib/metanorma/standoc/cleanup_terms.rb

@@ -119,7 +119,6 @@ module Metanorma
         termdomain1_cleanup(xmldoc)
         termnote_example_cleanup(xmldoc)
         term_children_cleanup(xmldoc)
-        termdocsource_cleanup(xmldoc)
       end
 
       def term_index_cleanup(xmldoc)

data/lib/metanorma/standoc/cleanup_xref.rb

@@ -2,8 +2,10 @@ module Metanorma
   module Standoc
     module Cleanup
       # extending localities to cover ISO referencing
+      CONN_REGEX_STR = "(?<conn>and|or|from|to)!".freeze
+
       LOCALITY_REGEX_STR = <<~REGEXP.freeze
-        ^(((?<conn>and|or|from|to)!)?
+        ^((#{CONN_REGEX_STR})?
             (?<locality>section|clause|part|paragraph|chapter|page|line|
                       table|annex|figure|example|note|formula|list|time|anchor|
                       locality:[^ \\t\\n\\r:,;=]+)(\\s+|=)
@@ -15,6 +17,15 @@ module Metanorma
       LOCALITY_RE = Regexp.new(LOCALITY_REGEX_STR.gsub(/\s/, ""),
                                Regexp::IGNORECASE | Regexp::MULTILINE)
 
+      LOCALITY_REGEX_VALUE_ONLY_STR = <<~REGEXP.freeze
+        ^(?<conn0>(#{CONN_REGEX_STR}))
+          (?!whole|title|locality:)
+          (?<value>[^=,;:\\t\\n\\r]+)
+          (?<punct>[,;\\t\\n\\r]|$)
+      REGEXP
+      LOCALITY_VAL_ONLY_RE = Regexp.new(LOCALITY_REGEX_VALUE_ONLY_STR
+        .gsub(/\s/, ""), Regexp::IGNORECASE | Regexp::MULTILINE)
+
       def tq(text)
         text.sub(/^"/, "").sub(/"$/, "")
       end
@@ -33,13 +44,22 @@ module Metanorma
         b = elem.add_child("<localityStack/>").first if LOCALITY_RE.match text
         while (m = LOCALITY_RE.match text)
           add_locality(b, m)
-          text = m[:text]
+          text = extract_localities_update_text(m)
           b = elem.add_child("<localityStack/>").first if m[:punct] == ";"
         end
         fill_in_eref_connectives(elem)
         elem.add_child(text) if text
       end
 
+      # clause=3;and!5 => clause=3;and!clause=5
+      def extract_localities_update_text(match)
+        ret = match[:text]
+        if LOCALITY_VAL_ONLY_RE.match?(ret) && match[:punct] == ";"
+          ret.sub!(%r{^(#{CONN_REGEX_STR})}o, "\\1#{match[:locality]}=")
+        end
+        ret
+      end
+
       def add_locality(stack, match)
         stack.children.empty? && match[:conn] and
           stack["connective"] = match[:conn]

data/lib/metanorma/standoc/front_organisation.rb

@@ -29,6 +29,10 @@ module Metanorma
             f << p.gsub(/ \+\n/, "<br/>")
           end
         end
+        org_contact(org, xml)
+      end
+
+      def org_contact(org, xml)
         p = org[:phone] and xml.phone p
         p = org[:fax] and xml.phone p, type: "fax"
         p = org[:email] and xml.email p

data/lib/metanorma/standoc/inline.rb

@@ -124,7 +124,7 @@ module Metanorma
         if Gem.win_platform? && /^\/[a-zA-Z]:/.match?(uri)
           uri = uri[1..-1]
         end
-        types = if /^data:/.match?(uri) then Metanorma::Utils::datauri2mime(uri)
+        types = if /^data:/.match?(uri) then Vectory::Utils::datauri2mime(uri)
                 else MIME::Types.type_for(uri)
                 end
         type = types.first.to_s

data/lib/metanorma/standoc/isodoc.rng

@@ -17,10 +17,19 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
-<!-- VERSION v1.2.9 -->
+<!-- VERSION v1.3.0 -->
 <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <include href="reqt.rng"/>
   <include href="basicdoc.rng">
+    <define name="amend">
+      <element name="amend">
+        <ref name="BlockAttributes"/>
+        <ref name="AmendType"/>
+        <zeroOrMore>
+          <ref name="autonumber"/>
+        </zeroOrMore>
+      </element>
+    </define>
     <define name="admonition">
       <element name="admonition">
         <attribute name="type">
@@ -137,6 +146,9 @@
             <data type="boolean"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="style"/>
+        </optional>
         <oneOrMore>
           <ref name="PureTextElement"/>
         </oneOrMore>
@@ -2319,69 +2331,6 @@
       <ref name="CitationType"/>
     </element>
   </define>
-  <define name="amend">
-    <element name="amend">
-      <optional>
-        <attribute name="id">
-          <data type="ID"/>
-        </attribute>
-      </optional>
-      <attribute name="change">
-        <choice>
-          <value>add</value>
-          <value>modify</value>
-          <value>delete</value>
-          <value>replace</value>
-        </choice>
-      </attribute>
-      <optional>
-        <attribute name="path"/>
-      </optional>
-      <optional>
-        <attribute name="path_end"/>
-      </optional>
-      <optional>
-        <attribute name="title"/>
-      </optional>
-      <ref name="BlockAttributes"/>
-      <optional>
-        <element name="location">
-          <zeroOrMore>
-            <ref name="locality"/>
-          </zeroOrMore>
-        </element>
-      </optional>
-      <zeroOrMore>
-        <ref name="autonumber"/>
-      </zeroOrMore>
-      <optional>
-        <element name="description">
-          <zeroOrMore>
-            <ref name="BasicBlock"/>
-          </zeroOrMore>
-        </element>
-      </optional>
-      <optional>
-        <element name="newcontent">
-          <optional>
-            <attribute name="id">
-              <data type="ID"/>
-            </attribute>
-          </optional>
-          <zeroOrMore>
-            <ref name="BasicBlock"/>
-          </zeroOrMore>
-        </element>
-      </optional>
-      <optional>
-        <element name="description">
-          <zeroOrMore>
-            <ref name="BasicBlock"/>
-          </zeroOrMore>
-        </element>
-      </optional>
-    </element>
-  </define>
   <define name="autonumber">
     <element name="autonumber">
       <attribute name="type">

data/lib/metanorma/standoc/reqt.rng

@@ -207,20 +207,4 @@
       <value>permission</value>
     </choice>
   </define>
-  <define name="classification">
-    <element name="classification">
-      <ref name="classification_tag"/>
-      <ref name="classification_value"/>
-    </element>
-  </define>
-  <define name="classification_tag">
-    <element name="tag">
-      <text/>
-    </element>
-  </define>
-  <define name="classification_value">
-    <element name="value">
-      <text/>
-    </element>
-  </define>
 </grammar>

data/lib/metanorma/standoc/section.rb

@@ -24,10 +24,9 @@ module Metanorma
       def sectiontype(node, level = true)
         ret = sectiontype1(node)
         ret1 = preface_main_filter(sectiontype_streamline(ret), node)
-        return ret1 if ret1 == "symbols and abbreviated terms"
-        return nil unless !level || node.level == 1
-        return nil if @seen_headers.include? ret
-
+        ret1 == "symbols and abbreviated terms" and return ret1
+        !level || node.level == 1 or return nil
+        @seen_headers.include? ret and return nil
         @seen_headers << ret unless ret1.nil?
         @seen_headers_canonical << ret1 unless ret1.nil?
         ret1
@@ -95,8 +94,8 @@ module Metanorma
                 "multilingual-rendering": node&.attr("multilingual-rendering"),
                 colophon: (if node.role == "colophon" ||
                           node.attr("style") == "colophon"
-                            true
-                          end),
+                             true
+                           end),
                 preface: (if node.role == "preface" ||
                           node.attr("style") == "preface"
                             true
@@ -152,13 +151,13 @@ module Metanorma
       end
 
       def set_obligation(attrs, node)
-        attrs[:obligation] = if node.attributes.has_key?("obligation")
-                               node.attr("obligation")
-                             elsif node.parent.attributes.has_key?("obligation")
-                               node.parent.attr("obligation")
-                             else
-                               "normative"
-                             end
+        attrs[:obligation] =
+          if node.attributes.has_key?("obligation")
+            node.attr("obligation")
+          elsif node.parent.attributes.has_key?("obligation")
+            node.parent.attr("obligation")
+          else "normative"
+          end
       end
 
       def preamble(node)
@@ -167,8 +166,7 @@ module Metanorma
             xml_abstract.title do |t|
               t << (node.blocks[0].title || @i18n.foreword)
             end
-            content = node.content
-            xml_abstract << content
+            xml_abstract << node.content
           end
         end.join("\n")
       end
@@ -241,9 +239,9 @@ module Metanorma
       end
 
       def floating_title_attrs(node)
-        attr_code(id_attr(node).merge(align: node.attr("align"),
-                                      depth: node.level,
-                                      type: "floating-title"))
+        attr_code(id_attr(node)
+          .merge(align: node.attr("align"), depth: node.level,
+                 type: "floating-title"))
       end
 
       def floating_title(node)

data/lib/metanorma/standoc/term_lookup_cleanup.rb

@@ -64,9 +64,10 @@ module Metanorma
           lookup = norm_ref_id_text(refterm.text.strip)
           p = @lookup[:sec2prim][lookup] and refterm.children = @c.encode(p)
           p || @lookup[:term][lookup] and
-            refterm.replace("<preferred><expression>" \
-                            "<name>#{refterm.children.to_xml}" \
-                            "</name></expression></preferred>")
+            refterm.replace(<<~XML,
+              <preferred><expression><name>#{refterm.children.to_xml}</name></expression></preferred>
+            XML
+                           )
         end
       end
 

data/lib/metanorma/standoc/validate.rb

@@ -144,8 +144,8 @@ module Metanorma
 
       def image_exists(doc)
         doc.xpath("//image").each do |i|
-          Metanorma::Utils::url?(i["src"]) and next
-          Metanorma::Utils::datauri?(i["src"]) and next
+          Vectory::Utils::url?(i["src"]) and next
+          Vectory::Utils::datauri?(i["src"]) and next
           expand_path(i["src"]) and next
           @log.add("Images", i.parent,
                    "Image not found: #{i['src']}", severity: 0)
@@ -161,9 +161,9 @@ module Metanorma
 
       def png_validate(doc)
         doc.xpath("//image[@mimetype = 'image/png']").each do |i|
-          Metanorma::Utils::url?(i["src"]) and next
-          decoded = if Metanorma::Utils::datauri?(i["src"])
-                      Metanorma::Utils::decode_datauri(i["src"])[:data]
+          Vectory::Utils::url?(i["src"]) and next
+          decoded = if Vectory::Utils::datauri?(i["src"])
+                      Vectory::Utils::decode_datauri(i["src"])[:data]
                     else
                       path = expand_path(i["src"]) or next
                       File.binread(path)

data/lib/metanorma/standoc/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "2.7.5".freeze
+    VERSION = "2.8.1".freeze
   end
 end

data/lib/metanorma-standoc.rb

@@ -4,6 +4,7 @@ require_relative "metanorma/standoc/converter"
 require_relative "metanorma/standoc/version"
 require "asciidoctor/extensions"
 require "metanorma"
+require "vectory"
 
 if defined? Metanorma::Registry
   require_relative "metanorma/standoc"

data/metanorma-standoc.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "addressable", "~> 2.8.0"
   spec.add_dependency "asciidoctor", "~> 2.0.0"
   spec.add_dependency "iev", "~> 0.3.0"
-  spec.add_dependency "isodoc", "~> 2.7.1"
+  spec.add_dependency "isodoc", "~> 2.8.0"
   spec.add_dependency "metanorma", ">= 1.6.0"
   spec.add_dependency "metanorma-plugin-datastruct", "~> 0.2.0"
   spec.add_dependency "metanorma-plugin-glossarist", "~> 0.1.1"
@@ -41,9 +41,10 @@ Gem::Specification.new do |spec|
   spec.add_dependency "asciimath2unitsml", "~> 0.4.0"
   spec.add_dependency "concurrent-ruby"
   spec.add_dependency "pngcheck"
-  spec.add_dependency "relaton-cli", "~> 1.17.0"
+  spec.add_dependency "relaton-cli", "~> 1.18.0"
   spec.add_dependency "relaton-iev", "~> 1.1.5"
   spec.add_dependency "unicode2latex", "~> 0.0.1"
+  spec.add_dependency "vectory", "~> 0.6"
 
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 2.7.5
+  version: 2.8.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-21 00:00:00.000000000 Z
+date: 2024-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.1
+        version: 2.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.1
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: metanorma
   requirement: !ruby/object:Gem::Requirement
@@ -184,14 +184,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.17.0
+        version: 1.18.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.17.0
+        version: 1.18.0
 - !ruby/object:Gem::Dependency
   name: relaton-iev
   requirement: !ruby/object:Gem::Requirement
@@ -220,6 +220,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.1
+- !ruby/object:Gem::Dependency
+  name: vectory
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement