metanorma-standoc 2.7.4 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67faf1005268886a18a869cd5cae9b22989946d6999317d446798521bd9b6728
-  data.tar.gz: b3127ed75c593c211bda46f42cb1fe744f59b04337977a71e0213f2b1e6997a8
+  metadata.gz: ed917e2185484c68d9c76b23b7bf977ee03da83204d3ceae22fd4fc893b8dae0
+  data.tar.gz: c1c7af6fd9cb9a958093cb698beb2523d16bee5cdc4b4a06140092690753f44b
 SHA512:
-  metadata.gz: bd52c09a6b065f0d097c277ec332c8d0b4dd9406fb6a71e42dfb514ba35b03b4d6f2316e6f808e55f99249b8b8c7f488fb137c65e044cb5b9abff2b8015d9824
-  data.tar.gz: 61b6e99444cbd529626fcce026356070d5898f9607ef2239bbfd72d9445f15a81f8b06a5801057293d2838af8d300908365d566acd3ef66c3aedab0e9324c6d9
+  metadata.gz: 491207a21d304b30840b19398d547a1eb5e55037bd93c3c39397a9d31a725cde2de5e88348e984958639415f8ea38dcd6091fb5888825775934609e83c79cf53
+  data.tar.gz: aa771efa57e60c94ac9e8e65dc0fd00a6c9280a812ea1ecbc212cecb25547be7b492111a6fdcbfa0118ad855ca775772fbedfc1d83c92fd3d3fff68b89a8f950

data/Gemfile

@@ -4,12 +4,6 @@ Encoding.default_internal = Encoding::UTF_8
 source "https://rubygems.org"
 git_source(:github) { |repo| "https://github.com/#{repo}" }
 
-group :development, :test do
-  gem "rspec"
-end
-
-if File.exist? "Gemfile.devel"
-  eval File.read("Gemfile.devel"), nil, "Gemfile.devel" # rubocop:disable Security/Eval
-end
-
 gemspec
+
+eval_gemfile("Gemfile.devel") rescue nil

data/lib/isodoc/html/htmlstyle.css

@@ -140,6 +140,14 @@ a.FootnoteRef, span.FootnoteRef {
   color: red;
   text-decoration: line-through; }
 
+ruby {
+  ruby-position: over;
+  -webkit-ruby-position: before; }
+
+ruby ruby {
+  ruby-position: under;
+  -webkit-ruby-position: after; }
+
 /* code highlighting with line numbers */
 table.rouge-line-table td.rouge-gutter {
   -moz-user-select: none;

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,25 +78,29 @@ 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
 
       def init_toc(node)
-        @htmltoclevels = node.attr("htmltoclevels") ||
+        @htmltoclevels = node.attr("toclevels-html") ||
+          node.attr("htmltoclevels") ||
           node.attr("toclevels") || toc_default[:html_levels]
-        @doctoclevels = node.attr("doctoclevels") ||
-          node.attr("toclevels") || toc_default[:word_levels]
-        @toclevels = node.attr("toclevels") || toc_default[:word_levels]
+        @doctoclevels = node.attr("toclevels-doc") ||
+          node.attr("doctoclevels") || node.attr("toclevels") ||
+          toc_default[:word_levels]
+        @pdftoclevels = node.attr("toclevels-pdf") ||
+          node.attr("toclevels") || toc_default[:pdf_levels]
+        @toclevels = node.attr("toclevels") || toc_default[:html_levels]
         @tocfigures = node.attr("toc-figures")
         @toctables = node.attr("toc-tables")
         @tocrecommendations = node.attr("toc-recommendations")
       end
 
       def toc_default
-        { word_levels: 2, html_levels: 2 }
+        { word_levels: 2, html_levels: 2, pdf_levels: 2 }
       end
 
       def init_output(node)
@@ -113,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"/>
@@ -715,27 +796,36 @@
   </define>
   <define name="ruby">
     <element name="ruby">
-      <zeroOrMore>
-        <choice>
-          <ref name="PureTextElement"/>
-          <ref name="rp"/>
-          <ref name="rt"/>
-        </choice>
-      </zeroOrMore>
+      <choice>
+        <ref name="ruby_pronunciation"/>
+        <ref name="ruby_annotation"/>
+      </choice>
+      <choice>
+        <text/>
+        <ref name="ruby"/>
+      </choice>
     </element>
   </define>
-  <define name="rp">
-    <element name="rp">
-      <zeroOrMore>
-        <ref name="PureTextElement"/>
-      </zeroOrMore>
+  <define name="ruby_pronunciation">
+    <element name="pronunciation">
+      <attribute name="value"/>
+      <optional>
+        <attribute name="script"/>
+      </optional>
+      <optional>
+        <attribute name="lang"/>
+      </optional>
     </element>
   </define>
-  <define name="rt">
-    <element name="rt">
-      <zeroOrMore>
-        <ref name="PureTextElement"/>
-      </zeroOrMore>
+  <define name="ruby_annotation">
+    <element name="annotation">
+      <attribute name="value"/>
+      <optional>
+        <attribute name="script"/>
+      </optional>
+      <optional>
+        <attribute name="lang"/>
+      </optional>
     </element>
   </define>
   <define name="br">
@@ -930,18 +1020,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>
@@ -956,6 +1040,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/cleanup.rb

@@ -71,6 +71,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_toc.rb

@@ -78,7 +78,7 @@ module Metanorma
       end
 
       def toc_metadata(xmldoc)
-        @htmltoclevels || @doctoclevels || @toclevels or return
+        @htmltoclevels || @doctoclevels || @pdftoclevels || @toclevels or return
         ins = add_misc_container(xmldoc)
         toc_metadata1(ins)
       end
@@ -86,7 +86,8 @@ module Metanorma
       def toc_metadata1(ins)
         [[@toclevels, "TOC Heading Levels"],
          [@htmltoclevels, "HTML TOC Heading Levels"],
-         [@doctoclevels, "DOC TOC Heading Levels"]].each do |n|
+         [@doctoclevels, "DOC TOC Heading Levels"],
+         [@pdftoclevels, "PDF TOC Heading Levels"]].each do |n|
           n[0] and ins << "<presentation-metadata><name>#{n[1]}</name>" \
                           "<value>#{n[0]}</value></presentation-metadata>"
         end

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_contributor.rb

@@ -22,7 +22,12 @@ module Metanorma
 
       def personal_role(node, contrib, suffix)
         type = node.attr("role#{suffix}")&.downcase || "author"
-        contrib.role type: type
+        desc = node.attr("role-description#{suffix}")
+        contrib.role type: type do |r|
+          desc and r.description do |d|
+            d << desc
+          end
+        end
       end
 
       def personal_contact(node, suffix, person)

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.2.12 -->
 <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">
@@ -2319,69 +2328,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/macros_inline.rb

@@ -52,25 +52,32 @@ module Metanorma
       use_dsl
       named :ruby
       parse_content_as :text
-      option :pos_attrs, %w(rpbegin rt rpend)
-
-      # for example, html5ruby:楽聖少女[がくせいしょうじょ]
-      def process(_parent, target, attributes)
-        rpbegin = "("
-        rpend = ")"
-        if (attributes.size == 1) && attributes.key?("text")
-          rt = attributes["text"]
-        elsif (attributes.size == 2) && attributes.key?(1) &&
-            attributes.key?("rpbegin")
-          rt = attributes[1] || ""
-        else
-          rpbegin = attributes["rpbegin"]
-          rt = attributes["rt"]
-          rpend = attributes["rpend"]
+
+      # ruby:{annotation}[lang=ja,script=Hira,type=pronunciation|annotation,text]
+
+      def preprocess_attrs(text)
+        ret = {}
+        while m = /^(?<key>lang|script|type)=(?<val>[^,]+),(?<rest>.+)$/
+            .match(text)
+          text = m[:rest]
+          ret[m[:key].to_sym] = m[:val]
         end
+        ret[:text] = text
+        ret[:type] ||= "pronunciation"
+        ret[:type] == "annotation" or ret[:type] = "pronunciation"
+        ret
+      end
 
-        "<ruby>#{target}<rp>#{rpbegin}</rp><rt>#{rt}</rt>" \
-          "<rp>#{rpend}</rp></ruby>"
+      def process(parent, target, attributes)
+        args = preprocess_attrs(attributes["text"])
+        out = Nokogiri::XML(
+          create_block(parent, :paragraph, [args[:text]], {},
+                       subs: [:macros], content_model: :simple).convert,
+        ).root.children.to_xml # force recurse macros
+        attrs = " value='#{target}'"
+        x = args[:lang] and attrs += " lang='#{x}'"
+        x = args[:script] and attrs += " script='#{x}'"
+        "<ruby><#{args[:type]} #{attrs}/>#{out}</ruby>"
       end
     end
 

data/lib/metanorma/standoc/render.rb

@@ -17,8 +17,9 @@ module Metanorma
           scripts_override: node.attr("scripts-override"),
           scripts_pdf: node.attr("scripts-pdf"),
           datauriimage: node.attr("data-uri-image") != "false",
-          htmltoclevels: node.attr("htmltoclevels") || node.attr("toclevels"),
-          doctoclevels: node.attr("doctoclevels") || node.attr("toclevels"),
+          htmltoclevels: @htmltoclevels,
+          doctoclevels: @doctoclevels,
+          pdftoclevels: @pdftoclevels,
           breakupurlsintables: node.attr("break-up-urls-in-tables"),
           suppressasciimathdup: node.attr("suppress-asciimath-dup") == "true",
           bare: node.attr("bare"),
@@ -62,8 +63,9 @@ module Metanorma
           wordintropage: node.attr("wordintropage"),
           ulstyle: node.attr("ulstyle"),
           olstyle: node.attr("olstyle"),
-          htmltoclevels: node.attr("htmltoclevels") || node.attr("toclevels"),
-          doctoclevels: node.attr("doctoclevels") || node.attr("toclevels"),
+          htmltoclevels: @htmltoclevels,
+          doctoclevels: @doctoclevels,
+          pdftoclevels: @pdftoclevels,
           breakupurlsintables: node.attr("break-up-urls-in-tables"),
           suppressasciimathdup: node.attr("suppress-asciimath-dup"),
           bare: node.attr("bare"),

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/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.4".freeze
+    VERSION = "2.8.0".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.4
+  version: 2.8.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-10 00:00:00.000000000 Z
+date: 2024-01-09 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