metanorma-standoc 2.6.1 → 2.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42b32b109ae4f5ac4505f2218a4d4c5768ad388ffb29d3ae292b61fab8923030
-  data.tar.gz: aafef4197f9d88913ef52f8effacb515e54e94f456757758e9ac0bfe41b2656d
+  metadata.gz: c8505150e755f57c7d7d9a02212bc3915ee49d8547f4c2143369ea00f4d9b623
+  data.tar.gz: d2dd6aae079a71359d5012f03ea6f937eb998f2a9912d1b5886246de9797d81c
 SHA512:
-  metadata.gz: 13a8345e82e041ebbefecddeea7ba719898b6997877891d76177872b672e9bce7d00c060bf98569b0acd49c0c3ba691a989032e3650066030cf99a86991b5cbb
-  data.tar.gz: 37c1b235d071bb2d7b4f5ff8e73e3f5a3ca668c726245ea75002152bbd9931b07e67869dee8b0b6b8685e4480054f50244ddfa492cdd12275e30d27ec2d389e2
+  metadata.gz: 33a2b3eae8bb5f0092e5bd36ceb05f9a653fb3f5af645d035641f2e64076b2746738bb23dd75d83191a835873aef921a28a2baed313fb1b3fb939c747543acee
+  data.tar.gz: ba20076eab6ecc6a2ffcda225012863094ef6f24abcb85feb7da4f4fd46dd1caa259938a7aa970911841665e7cdce328f95e0e899dc6250ba2c8776eb574895a

data/lib/metanorma/standoc/anchor.rb

@@ -0,0 +1,112 @@
+require "asciidoctor/extensions"
+
+module Metanorma
+  module Standoc
+    module Inline
+      def inline_anchor(node)
+        case node.type
+        when :ref then inline_anchor_ref node
+        when :xref then inline_anchor_xref node
+        when :link then inline_anchor_link node
+        when :bibref then inline_anchor_bibref node
+        end
+      end
+
+      def inline_anchor_ref(node)
+        noko do |xml|
+          xml.bookmark nil, **attr_code(id: node.id)
+        end.join
+      end
+
+      def inline_anchor_xref(node)
+        noko do |xml|
+          attrs = inline_anchor_xref_attrs(node)
+          c = attrs[:text]
+          attrs.delete(:text) unless c.nil?
+          xml.xref **attr_code(attrs) do |x|
+            x << c
+          end
+        end.join
+      end
+
+      def inline_anchor_xref_attrs(node)
+        text = concatenate_attributes_to_xref_text(node)
+        m = inline_anchor_xref_match(text)
+        t = node.target.gsub(/^#/, "").gsub(%r{(\.xml|\.adoc)(#.*$)}, "\\2")
+        m.nil? and return { target: t, type: "inline", text: text }
+        inline_anchor_xref_attrs1(m, t, text)
+      end
+
+      def concatenate_attributes_to_xref_text(node)
+        node.attributes.each_with_object([]) do |(k, v), m|
+          %w(path fragment refid).include?(k) and next
+          m << "#{k}=#{v}%"
+        end.map { |x| x.sub(/%+/, "%") }.join + (node.text || "")
+      end
+
+      def inline_anchor_xref_attrs1(match, target, text)
+        { target: target, hidden: match[:hidden],
+          type: match[:fn].nil? ? "inline" : "footnote",
+          case: match[:case]&.sub(/%$/, ""),
+          style: match[:style]&.sub(/^style=/, "")&.sub(/%$/, "") || @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=[^%]+%)?
+          (?<drop>droploc%)?(?<case>capital%|lowercase%)?(?<drop2>droploc%)?
+          (?<fn>fn:?\s*)?(?<text>.*)$/x.match text
+      end
+
+      def inline_anchor_xref_text(match, text)
+        if %i[case fn drop drop2 hidden style].any? { |x| !match[x].nil? }
+          match[:text]
+        else text
+        end
+      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") }
+        noko do |xml|
+          xml.link **attr_code(attributes) do |l|
+            l << contents
+          end
+        end.join
+      end
+
+      def inline_anchor_bibref(node)
+        eref_contents =
+          @c.decode(node.text || node.target || node.id)
+          &.sub(/^\[?([^\[\]]+?)\]?$/, "[\\1]")
+        @refids << (node.target || node.id)
+        noko do |xml|
+          xml.ref **attr_code(id: node.target || node.id) do |r|
+            r << eref_contents
+          end
+        end.join
+      end
+
+      def inline_callout(node)
+        noko do |xml|
+          xml.callout node.text
+        end.join
+      end
+
+      def inline_footnote(node)
+        @fn_number ||= 0
+        noko do |xml|
+          @fn_number += 1
+          xml.fn reference: @fn_number do |fn|
+            fn.p { |p| p << node.text }
+          end
+        end.join
+      end
+    end
+  end
+end

data/lib/metanorma/standoc/basicdoc.rng

@@ -914,44 +914,47 @@
   -->
   <define name="image">
     <element name="image">
-      <attribute name="id">
-        <data type="ID"/>
+      <ref name="Image"/>
+    </element>
+  </define>
+  <define name="Image">
+    <attribute name="id">
+      <data type="ID"/>
+    </attribute>
+    <attribute name="src">
+      <data type="anyURI"/>
+    </attribute>
+    <attribute name="mimetype"/>
+    <optional>
+      <attribute name="filename"/>
+    </optional>
+    <optional>
+      <attribute name="width">
+        <choice>
+          <data type="int"/>
+          <value>auto</value>
+        </choice>
       </attribute>
-      <attribute name="src">
+    </optional>
+    <optional>
+      <attribute name="height">
+        <choice>
+          <data type="int"/>
+          <value>auto</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="alt"/>
+    </optional>
+    <optional>
+      <attribute name="title"/>
+    </optional>
+    <optional>
+      <attribute name="longdesc">
         <data type="anyURI"/>
       </attribute>
-      <attribute name="mimetype"/>
-      <optional>
-        <attribute name="filename"/>
-      </optional>
-      <optional>
-        <attribute name="width">
-          <choice>
-            <data type="int"/>
-            <value>auto</value>
-          </choice>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="height">
-          <choice>
-            <data type="int"/>
-            <value>auto</value>
-          </choice>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="alt"/>
-      </optional>
-      <optional>
-        <attribute name="title"/>
-      </optional>
-      <optional>
-        <attribute name="longdesc">
-          <data type="anyURI"/>
-        </attribute>
-      </optional>
-    </element>
+    </optional>
   </define>
   <define name="video">
     <element name="video">

data/lib/metanorma/standoc/biblio.rng

@@ -348,6 +348,9 @@
       <zeroOrMore>
         <ref name="contact"/>
       </zeroOrMore>
+      <optional>
+        <ref name="logo"/>
+      </optional>
     </element>
   </define>
   <define name="orgname">
@@ -366,6 +369,11 @@
       </choice>
     </element>
   </define>
+  <define name="logo">
+    <element name="logo">
+      <ref name="image"/>
+    </element>
+  </define>
   <define name="NameWithVariants">
     <element name="primary">
       <ref name="LocalizedString"/>
@@ -942,6 +950,7 @@
       <value>obsoleted</value>
       <value>confirmed</value>
       <value>updated</value>
+      <value>corrected</value>
       <value>issued</value>
       <value>transmitted</value>
       <value>copied</value>

data/lib/metanorma/standoc/blocks.rb

@@ -1,5 +1,6 @@
 require "uri" if /^2\./.match?(RUBY_VERSION)
 require_relative "./blocks_notes"
+require_relative "./blocks_image"
 
 module Metanorma
   module Standoc
@@ -93,10 +94,10 @@ module Metanorma
       end
 
       def example(node)
-        (in_terms? || node.option?("termexample")) and return term_example(node)
         role = node.role || node.attr("style")
         ret = example_to_requirement(node, role) ||
           example_by_role(node, role) and return ret
+        (in_terms? || node.option?("termexample")) and return term_example(node)
         reqt_subpart?(role) and return requirement_subpart(node)
         example_proper(node)
       end
@@ -119,25 +120,6 @@ module Metanorma
                     @reqt_models.requirement_roles[role.to_sym], role)
       end
 
-      def svgmap_attrs(node)
-        attr_code(id_attr(node)
-          .merge(id: node.id, number: node.attr("number"),
-                 unnumbered: node.option?("unnumbered") ? "true" : nil,
-                 subsequence: node.attr("subsequence"))
-        .merge(keep_attrs(node)))
-      end
-
-      def svgmap_example(node)
-        noko do |xml|
-          xml.svgmap **attr_code(svgmap_attrs(node).merge(
-                                   src: node.attr("src"), alt: node.attr("alt"),
-                                 )) do |ex|
-            figure_title(node, ex)
-            ex << node.content
-          end
-        end.join("\n")
-      end
-
       # prevent A's and other subs inappropriate for pseudocode
       def pseudocode_example(node)
         node.blocks.each { |b| b.remove_sub(:replacements) }
@@ -162,34 +144,6 @@ module Metanorma
         end.join("\n")
       end
 
-      def figure_example(node)
-        noko do |xml|
-          xml.figure **figure_attrs(node) do |ex|
-            node.title.nil? or ex.name { |name| name << node.title }
-            wrap_in_para(node, ex)
-          end
-        end.join("\n")
-      end
-
-      def figure_title(node, out)
-        node.title.nil? and return
-        out.name { |name| name << node.title }
-      end
-
-      def figure_attrs(node)
-        attr_code(id_unnum_attrs(node).merge(keep_attrs(node))
-          .merge(class: node.attr("class")))
-      end
-
-      def image(node)
-        noko do |xml|
-          xml.figure **figure_attrs(node) do |f|
-            figure_title(node, f)
-            f.image **image_attributes(node)
-          end
-        end
-      end
-
       def para_attrs(node)
         attr_code(id_attr(node).merge(keep_attrs(node)
           .merge(align: node.attr("align"),

data/lib/metanorma/standoc/blocks_image.rb

@@ -0,0 +1,52 @@
+module Metanorma
+  module Standoc
+    module Blocks
+      def svgmap_attrs(node)
+        attr_code(id_attr(node)
+          .merge(id: node.id, number: node.attr("number"),
+                 unnumbered: node.option?("unnumbered") ? "true" : nil,
+                 subsequence: node.attr("subsequence"))
+        .merge(keep_attrs(node)))
+      end
+
+      def svgmap_example(node)
+        noko do |xml|
+          xml.svgmap **attr_code(svgmap_attrs(node).merge(
+                                   src: node.attr("src"), alt: node.attr("alt"),
+                                 )) do |ex|
+            figure_title(node, ex)
+            ex << node.content
+          end
+        end.join("\n")
+      end
+
+      def figure_example(node)
+        noko do |xml|
+          xml.figure **figure_attrs(node) do |ex|
+            node.title.nil? or ex.name { |name| name << node.title }
+            wrap_in_para(node, ex)
+          end
+        end.join("\n")
+      end
+
+      def figure_title(node, out)
+        node.title.nil? and return
+        out.name { |name| name << node.title }
+      end
+
+      def figure_attrs(node)
+        attr_code(id_unnum_attrs(node).merge(keep_attrs(node))
+          .merge(class: node.attr("class")))
+      end
+
+      def image(node)
+        noko do |xml|
+          xml.figure **figure_attrs(node) do |f|
+            figure_title(node, f)
+            f.image **image_attributes(node)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/metanorma/standoc/cleanup.rb

@@ -45,7 +45,7 @@ module Metanorma
         element_name_cleanup(xmldoc)
         ref_cleanup(xmldoc) # feeds: bibitem_cleanup
         note_cleanup(xmldoc)
-        clausebefore_cleanup(xmldoc)
+        clausebefore_cleanup(xmldoc) # feeeds: floatingtitle_cleanup
         floatingtitle_cleanup(xmldoc)
         bibitem_cleanup(xmldoc) # feeds: normref_cleanup, biblio_cleanup,
         # reference_names, bpart_cleanup
@@ -158,8 +158,7 @@ module Metanorma
       end
 
       def metadata_cleanup(xmldoc)
-        return if @metadata_attrs.nil? || @metadata_attrs.empty?
-
+        (@metadata_attrs.nil? || @metadata_attrs.empty?) and return
         ins = add_misc_container(xmldoc)
         ins << @metadata_attrs
       end

data/lib/metanorma/standoc/cleanup_boilerplate.rb

@@ -86,16 +86,33 @@ module Metanorma
       end
 
       def termdef_boilerplate_insert(xmldoc, isodoc, once = false)
-        xmldoc.xpath(self.class::TERM_CLAUSE).each do |f|
-          f.at("./clause[@type = 'boilerplate'] | " \
-               "./note[@type = 'boilerplate']") and next
-          term_defs_boilerplate(f.at("./title"),
-                                xmldoc.xpath(".//termdocsource"),
-                                f.at(".//term"), f.at(".//p"), isodoc)
-          once and break
+        if once
+          f = termdef_boilerplate_insert_location(xmldoc) and
+            termdef_boilerplate_insert1(f, xmldoc, isodoc)
+        else
+          xmldoc.xpath(self.class::TERM_CLAUSE).each do |f|
+            termdef_boilerplate_insert1(f, xmldoc, isodoc)
+          end
         end
       end
 
+      def termdef_boilerplate_insert_location(xmldoc)
+        f = xmldoc.at(self.class::TERM_CLAUSE)
+        root = xmldoc.at("//sections/terms | //sections/clause[.//terms]")
+        !f || !root and return f || root
+        f.at("./following::terms") and return root
+        f.at("./preceding-sibling::clause") and return root
+        f
+      end
+
+      def termdef_boilerplate_insert1(sect, xmldoc, isodoc)
+        sect.at("./clause[@type = 'boilerplate'] | " \
+                "./note[@type = 'boilerplate']") and return
+        term_defs_boilerplate(sect.at("./title"),
+                              xmldoc.xpath(".//termdocsource"),
+                              sect.at(".//term"), sect.at(".//p"), isodoc)
+      end
+
       def boilerplate_cleanup(xmldoc)
         isodoc = boilerplate_isodoc(xmldoc)
         termdef_boilerplate_cleanup(xmldoc)

data/lib/metanorma/standoc/cleanup_section.rb

@@ -178,8 +178,8 @@ module Metanorma
       end
 
       def clausebefore_cleanup(xmldoc)
-        preface_clausebefore_cleanup(xmldoc)
         sections_clausebefore_cleanup(xmldoc)
+        preface_clausebefore_cleanup(xmldoc)
       end
 
       def preface_clausebefore_cleanup(xmldoc)
@@ -196,10 +196,20 @@ module Metanorma
       end
 
       def sections_clausebefore_cleanup(xmldoc)
-        return unless xmldoc.at("//sections")
-
+        xmldoc.at("//sections") or return
         ins = insert_before(xmldoc, "//sections")
-        xmldoc.xpath("//sections//*[@beforeclauses = 'true']").each do |x|
+        xmldoc.xpath("//sections//*[@beforeclauses = 'true']").reverse.each do |x|
+          x.delete("beforeclauses")
+          ins.previous = x.remove
+        end
+        endofpreface_clausebefore(xmldoc, ins)
+      end
+
+      # only move clausebefore notes at the very end of preface
+      def endofpreface_clausebefore(xmldoc, ins)
+        xmldoc.xpath("//preface//*[@beforeclauses = 'true']").reverse.each do |x|
+          textafternote = xmldoc.xpath("//preface//*") & x.xpath("./following::*")
+          textafternote.text.strip.empty? or break
           x.delete("beforeclauses")
           ins.previous = x.remove
         end
@@ -214,6 +224,7 @@ module Metanorma
       end
 
       def floatingtitle_cleanup(xmldoc)
+        pop_floating_title(xmldoc) # done again, after endofpreface_clausebefore
         floating_title_preface2sections(xmldoc)
       end
 

data/lib/metanorma/standoc/cleanup_section_names.rb

@@ -50,10 +50,30 @@ module Metanorma
                   "[not(.//definitions[@type = 'symbols'])]".freeze
 
       def section_names_terms_cleanup(xml)
-        replace_title(xml, "//definitions[@type = 'symbols']", @i18n&.symbols)
+        section_names_definitions(xml)
+        section_names_terms1_cleanup(xml)
+      end
+
+      def section_names_definitions(xml)
+        auto_name_definitions(xml) or return
+        replace_title(xml, "//definitions[@type = 'symbols']",
+                      @i18n&.symbols)
         replace_title(xml, "//definitions[@type = 'abbreviated_terms']",
                       @i18n&.abbrev)
-        replace_title(xml, "//definitions[not(@type)]", @i18n&.symbolsabbrev)
+        replace_title(xml, "//definitions[not(@type)]",
+                      @i18n&.symbolsabbrev)
+      end
+
+      def auto_name_definitions(xml)
+        xml.xpath("//definitions[@type = 'symbols']").size > 1 and return false
+        xml.xpath("//definitions[@type = 'abbreviated_terms']").size > 1 and
+          return false
+        xml.xpath("//definitions[not(@type)]").size > 1 and return false
+        true
+      end
+
+      def section_names_terms1_cleanup(xml)
+        auto_name_terms(xml) or return
         replace_title(xml, "//terms#{SYMnoABBR} | //clause[.//terms]#{SYMnoABBR}",
                       @i18n&.termsdefsymbols, true)
         replace_title(xml, "//terms#{ABBRnoSYM} | //clause[.//terms]#{ABBRnoSYM}",
@@ -69,6 +89,54 @@ module Metanorma
         )
       end
 
+      # do not auto-name terms sections if there are terms subclauses
+      # not covered by the auto titles,
+      # or if more than one title is covered by an auto title
+      def auto_name_terms(xml)
+        n = xml.at("//terms | //clause[.//terms]")
+        out = terms_subclauses(n)
+          .each_with_object({ term: 0, sna: 0, ans: 0, sa: 0, nsa: 0,
+                              tsna: 0, tans: 0, tsa: 0, tnsa: 0,
+                              termdef: 0, other: 0 }) do |x, m|
+          terms_subclause_type_tally(x, m, n)
+        end
+        out.delete(:parent)
+        !out.values.detect { |x| x > 1 } && out[:other].zero?
+      end
+
+      def terms_subclauses(node)
+        legal = %w(terms definitions clause)
+        [node, node&.elements].compact.flatten
+          .select do |x|
+            legal.include?(x.name) &&
+              !(x.name == "clause" && x["type"] == "boilerplate")
+          end
+      end
+
+      def terms_subclause_type_tally(node, m, parent)
+        sym = if (node.at(".//term") && !node.at(".//definitions")) ||
+            (node.name == "terms" && !node.at(".//term"))
+                unless m[:parent] == :term # don't count Term > Term twice
+                  :term
+                end
+              elsif node.at(".//term") && node.at("./self::*#{SYMnoABBR}") then :tsna
+              elsif node.at(".//term") && node.at("./self::*#{ABBRnoSYM}") then :tans
+              elsif node.at(".//term") && node.at("./self::*#{SYMABBR}") then :tsa
+              elsif node.at(".//term") && node.at("./self::*#{NO_SYMABBR}") then :tnsa
+              elsif node.at("./self::*#{SYMnoABBR}") then :sna
+              elsif node.at("./self::*#{ABBRnoSYM}") then :ans
+              elsif node.at("./self::*#{SYMABBR}") then :sa
+              elsif node.at("./self::*#{NO_SYMABBR}") then :nsa
+              elsif node.name == "definitions" # ignore
+              elsif node == parent && node.at(".//term") &&
+                  node.at(".//definitions")
+                :termdef
+              else :other
+              end
+        node == parent and m[:parent] = sym
+        sym and m[sym] += 1
+      end
+
       SECTION_CONTAINERS = %w(foreword introduction acknowledgements abstract
                               clause clause references terms definitions annex
                               appendix).freeze

data/lib/metanorma/standoc/cleanup_text.rb

@@ -35,12 +35,12 @@ module Metanorma
 
       IGNORE_QUOTES_ELEMENTS =
         %w(pre tt sourcecode stem asciimath figure bibdata passthrough
-           identifier).freeze
+           identifier presentation-metadata semantic-metadata).freeze
 
       def uninterrupt_quotes_around_xml_skip(elem)
         !(/\A['"]/.match?(elem.text) &&
-          elem.previous.path.gsub(/\[\d+\]/, "").split(%r{/})[1..-2]
-          .intersection(IGNORE_QUOTES_ELEMENTS).empty? &&
+          elem.previous.path.gsub(/\[\d+\]/, "").split(%r{/})[1..-2].
+          intersection(IGNORE_QUOTES_ELEMENTS).empty? &&
           ((elem.previous.text.strip.empty? &&
             !empty_tag_with_text_content?(elem.previous)) ||
            ignoretext?(elem.previous)))
@@ -50,8 +50,8 @@ module Metanorma
         prev = elem.at(".//preceding::text()[1]") or return
         /\S\Z/.match?(prev.text) or return
         foll = elem.at(".//following::text()[1]")
-        m = /\A(["'][[:punct:]]*)(\s|\Z)/
-          .match(@c.decode(foll&.text)) or return
+        m = /\A(["'][[:punct:]]*)(\s|\Z)/.
+          match(@c.decode(foll&.text)) or return
         foll.content = foll.text.sub(/\A(["'][[:punct:]]*)/, "")
         prev.content = "#{prev.text}#{m[1]}"
       end
@@ -103,8 +103,8 @@ module Metanorma
           next unless n.text? && /\u2019/.match?(n.text)
 
           n.replace(@c.encode(
-                      @c.decode(n.text)
-            .gsub(/(?<=\p{Alnum})\u2019(?=\p{Alpha})/, "'"),
+                      @c.decode(n.text).
+            gsub(/(?<=\p{Alnum})\u2019(?=\p{Alpha})/, "'"),
                       :basic, :hexadecimal
                     ))
         end

data/lib/metanorma/standoc/cleanup_toc.rb

@@ -78,8 +78,7 @@ module Metanorma
       end
 
       def toc_metadata(xmldoc)
-        return unless @htmltoclevels || @doctoclevels || @toclevels
-
+        @htmltoclevels || @doctoclevels || @toclevels or return
         ins = add_misc_container(xmldoc)
         toc_metadata1(ins)
       end

data/lib/metanorma/standoc/converter.rb

@@ -5,6 +5,7 @@ require_relative "front"
 require_relative "lists"
 require_relative "ref"
 require_relative "inline"
+require_relative "anchor"
 require_relative "blocks"
 require_relative "section"
 require_relative "table"
@@ -21,13 +22,13 @@ module Metanorma
     class Converter
       Asciidoctor::Extensions.register do
         preprocessor Metanorma::Standoc::EmbedIncludeProcessor
-        preprocessor Metanorma::Standoc::NamedEscapePreprocessor
         preprocessor Metanorma::Standoc::LinkProtectPreprocessor
         preprocessor Metanorma::Standoc::Datamodel::AttributesTablePreprocessor
         preprocessor Metanorma::Standoc::Datamodel::DiagramPreprocessor
         preprocessor Metanorma::Plugin::Datastruct::Json2TextPreprocessor
         preprocessor Metanorma::Plugin::Datastruct::Yaml2TextPreprocessor
         preprocessor Metanorma::Plugin::Glossarist::DatasetPreprocessor
+        preprocessor Metanorma::Standoc::NamedEscapePreprocessor
         inline_macro Metanorma::Standoc::PreferredTermInlineMacro
         inline_macro Metanorma::Standoc::DateInlineMacro
         inline_macro Metanorma::Standoc::SpanInlineMacro
@@ -63,6 +64,7 @@ module Metanorma
         treeprocessor Metanorma::Standoc::ToDoInlineAdmonitionBlock
         block Metanorma::Standoc::PlantUMLBlockMacro
         block Metanorma::Standoc::PseudocodeBlockMacro
+        block_macro Metanorma::Standoc::ColumnBreakBlockMacro
       end
 
       include ::Asciidoctor::Converter

data/lib/metanorma/standoc/front.rb

@@ -81,7 +81,7 @@ module Metanorma
 
       def datetypes
         %w{ published accessed created implemented obsoleted
-            confirmed updated issued circulated unchanged received
+            confirmed updated corrected issued circulated unchanged received
             vote-started vote-ended announced }
       end
 

data/lib/metanorma/standoc/inline.rb

@@ -1,4 +1,3 @@
-require "asciidoctor/extensions"
 require "unicode2latex"
 require "mime/types"
 require "base64"
@@ -8,115 +7,6 @@ require "plurimath"
 module Metanorma
   module Standoc
     module Inline
-      def refid?(ref)
-        @refids.include? ref
-      end
-
-      def inline_anchor(node)
-        case node.type
-        when :ref then inline_anchor_ref node
-        when :xref then inline_anchor_xref node
-        when :link then inline_anchor_link node
-        when :bibref then inline_anchor_bibref node
-        end
-      end
-
-      def inline_anchor_ref(node)
-        noko do |xml|
-          xml.bookmark nil, **attr_code(id: node.id)
-        end.join
-      end
-
-      def inline_anchor_xref(node)
-        noko do |xml|
-          attrs = inline_anchor_xref_attrs(node)
-          c = attrs[:text]
-          attrs.delete(:text) unless c.nil?
-          xml.xref **attr_code(attrs) do |x|
-            x << c
-          end
-        end.join
-      end
-
-      def inline_anchor_xref_attrs(node)
-        text = concatenate_attributes_to_xref_text(node)
-        m = inline_anchor_xref_match(text)
-        t = node.target.gsub(/^#/, "").gsub(%r{(\.xml|\.adoc)(#.*$)}, "\\2")
-        m.nil? and return { target: t, type: "inline", text: text }
-        inline_anchor_xref_attrs1(m, t, text)
-      end
-
-      def concatenate_attributes_to_xref_text(node)
-        node.attributes.each_with_object([]) do |(k, v), m|
-          %w(path fragment refid).include?(k) and next
-          m << "#{k}=#{v}%"
-        end.map { |x| x.sub(/%+/, "%") }.join + (node.text || "")
-      end
-
-      def inline_anchor_xref_attrs1(match, target, text)
-        { target: target, hidden: match[:hidden],
-          type: match[:fn].nil? ? "inline" : "footnote",
-          case: match[:case]&.sub(/%$/, ""),
-          style: match[:style]&.sub(/^style=/, "")&.sub(/%$/, "") || @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=[^%]+%)?
-          (?<drop>droploc%)?(?<case>capital%|lowercase%)?(?<drop2>droploc%)?
-          (?<fn>fn:?\s*)?(?<text>.*)$/x.match text
-      end
-
-      def inline_anchor_xref_text(match, text)
-        if %i[case fn drop drop2 hidden style].any? { |x| !match[x].nil? }
-          match[:text]
-        else text
-        end
-      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") }
-        noko do |xml|
-          xml.link **attr_code(attributes) do |l|
-            l << contents
-          end
-        end.join
-      end
-
-      def inline_anchor_bibref(node)
-        eref_contents =
-          @c.decode(node.text || node.target || node.id)
-          &.sub(/^\[?([^\[\]]+?)\]?$/, "[\\1]")
-        @refids << (node.target || node.id)
-        noko do |xml|
-          xml.ref **attr_code(id: node.target || node.id) do |r|
-            r << eref_contents
-          end
-        end.join
-      end
-
-      def inline_callout(node)
-        noko do |xml|
-          xml.callout node.text
-        end.join
-      end
-
-      def inline_footnote(node)
-        @fn_number ||= 0
-        noko do |xml|
-          @fn_number += 1
-          xml.fn reference: @fn_number do |fn|
-            fn.p { |p| p << node.text }
-          end
-        end.join
-      end
-
       def inline_break(node)
         noko do |xml|
           xml << node.text
@@ -137,8 +27,8 @@ module Metanorma
 
       def latex_parse1(text, block)
         lxm_input = Unicode2LaTeX.unicode2latex(@c.decode(text))
-        results = Plurimath::Math.parse(lxm_input, "latex")
-          .to_mathml(display_style: block)
+        results = Plurimath::Math.parse(lxm_input, "latex").
+          to_mathml(display_style: block)
         if results.nil?
           @log.add("Math", nil,
                    "latexmlmath failed to process equation:\n#{lxm_input}")
@@ -164,8 +54,8 @@ module Metanorma
         latex = latex_parse1(text, block) or
           return xml.stem type: "MathML", block: block
         xml.stem type: "MathML", block: block do |s|
-          math = Nokogiri::XML.fragment(latex.sub(/<\?[^>]+>/, ""))
-            .elements[0]
+          math = Nokogiri::XML.fragment(latex.sub(/<\?[^>]+>/, "")).
+            elements[0]
           math.delete("alttext")
           s.parent.children = math
           s << "<latexmath>#{text}</latexmath>"
@@ -202,6 +92,10 @@ module Metanorma
               xml.span style: node.role.sub(/^css /, "") do |s|
                 s << node.text
               end
+            when /:/
+              xml.span **attr_code(hash2styles(node.role)) do |s|
+                s << node.text
+              end
             else
               xml << node.text
             end
@@ -209,6 +103,17 @@ module Metanorma
         end.join
       end
 
+      def hash2styles(role)
+        CSV.parse_line(role, liberal_parsing: true).
+          each_with_object({}) do |r, m|
+          kv = r.split(":", 2).map(&:strip)
+          case kv[0]
+          when "custom-charset"
+            m[kv[0]] = kv[1]
+          end
+        end
+      end
+
       def image_attributes(node)
         nodetarget = node.attr("target") || node.target
         if Gem.win_platform? && /^[a-zA-Z]:/.match?(nodetarget)

data/lib/metanorma/standoc/isodoc.rng

@@ -17,7 +17,7 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
-<!-- VERSION v1.2.5 -->
+<!-- VERSION v1.2.8 -->
 <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">
@@ -1013,6 +1013,14 @@
       </oneOrMore>
     </element>
   </define>
+  <define name="BasicBlock" combine="choice">
+    <ref name="columnbreak"/>
+  </define>
+  <define name="columnbreak">
+    <element name="columnbreak">
+      <empty/>
+    </element>
+  </define>
   <define name="MultilingualRenderingType">
     <choice>
       <value>common</value>
@@ -1046,6 +1054,17 @@
       <ref name="date_inline"/>
     </choice>
   </define>
+  <define name="PureTextElement" combine="choice">
+    <ref name="passthrough_inline"/>
+  </define>
+  <define name="passthrough_inline">
+    <element name="passthrough">
+      <optional>
+        <attribute name="formats"/>
+      </optional>
+      <text/>
+    </element>
+  </define>
   <define name="add">
     <element name="add">
       <choice>
@@ -1084,6 +1103,9 @@
       <optional>
         <attribute name="style"/>
       </optional>
+      <optional>
+        <attribute name="custom-charset"/>
+      </optional>
       <oneOrMore>
         <ref name="TextElement"/>
       </oneOrMore>
@@ -1386,6 +1408,9 @@
       <optional>
         <attribute name="number"/>
       </optional>
+      <optional>
+        <attribute name="branch-number"/>
+      </optional>
       <optional>
         <attribute name="obligation">
           <choice>
@@ -1609,6 +1634,9 @@
     <optional>
       <attribute name="number"/>
     </optional>
+    <optional>
+      <attribute name="branch-number"/>
+    </optional>
     <optional>
       <attribute name="type"/>
     </optional>
@@ -1660,6 +1688,9 @@
     <optional>
       <attribute name="number"/>
     </optional>
+    <optional>
+      <attribute name="branch-number"/>
+    </optional>
     <optional>
       <ref name="section-title"/>
     </optional>
@@ -1757,6 +1788,9 @@
       <optional>
         <attribute name="number"/>
       </optional>
+      <optional>
+        <attribute name="branch-number"/>
+      </optional>
       <optional>
         <attribute name="obligation">
           <choice>

data/lib/metanorma/standoc/macros.rb

@@ -61,6 +61,15 @@ module Metanorma
       end
     end
 
+    class ColumnBreakBlockMacro < Asciidoctor::Extensions::BlockMacroProcessor
+      use_dsl
+      named :columnbreak
+
+      def process(parent, _reader, _attrs)
+        create_pass_block parent, "<columnbreak/>", {}, subs: nil
+      end
+    end
+
     # refer https://github.com/asciidoctor/asciidoctor/blob/main/lib/asciidoctor/substitutors.rb
     # Not using TreeProcessor because that is still too close to
     # inline expressions being processed on access (e.g. titles)
@@ -88,7 +97,8 @@ module Metanorma
 
       def pass_status(status, text)
         text == "++++" && !status[:delimln] and status[:pass] = !status[:pass]
-        if status[:is_delim] && /^(-+|\*+|=+|_+)$/.match?(text)
+        if (status[:is_delim] && /^(-+|\*+|=+|_+)$/.match?(text)) ||
+            (!status[:is_delim] && !status[:delimln] && text == "----")
           status[:delimln] = text
           status[:pass] = true
         elsif status[:pass_delim]

data/lib/metanorma/standoc/processor.rb

@@ -32,6 +32,7 @@ module Metanorma
       end
 
       def output(isodoc_node, inname, outname, format, options = {})
+        options_preprocess(options)
         case format
         when :html
           options = options

data/lib/metanorma/standoc/ref_queue.rb

@@ -142,7 +142,12 @@ module Metanorma
         nil
       end
 
+      def supply_ref_prefix(ret)
+        ret
+      end
+
       def fetch_ref1(code, year, opts)
+        code = supply_ref_prefix(code)
         if opts[:localfile]
           @local_bibdb.get(code, opts[:localfile])
         else @bibdb&.fetch(code, year, opts)
@@ -156,6 +161,7 @@ module Metanorma
       end
 
       def fetch_ref_async(ref, idx, res)
+        ref[:code] &&= supply_ref_prefix(ref[:code])
         if unfetchable_ref_code?(ref)
           res << [ref, idx, nil]
           idx += 1

data/lib/metanorma/standoc/render.rb

@@ -91,7 +91,7 @@ module Metanorma
                          pdf-allow-print pdf-allow-print-hq
                          pdf-allow-access-content pdf-encrypt-metadata fonts
                          font-license-agreement).each_with_object({}) do |x, m|
-          m[x.gsub(/-/, "").to_i] = node.attr(x)
+          m[x.gsub("-", "").to_i] = node.attr(x)
         end
 
         pdf_options.merge(fonts_manifest_option(node) || {})
@@ -102,7 +102,9 @@ module Metanorma
       end
 
       def presentation_xml_converter(node)
-        IsoDoc::PresentationXMLConvert.new(html_extract_attributes(node))
+        IsoDoc::PresentationXMLConvert
+          .new(html_extract_attributes(node)
+          .merge(output_formats: ::Metanorma::Standoc::Processor.new.output_formats)                                )
       end
 
       def default_fonts(node)

data/lib/metanorma/standoc/section.rb

@@ -84,6 +84,7 @@ module Metanorma
                 language: node.attributes["language"],
                 script: node.attributes["script"],
                 number: node.attributes["number"],
+                "branch-number": node.attributes["branch-number"],
                 type: node.attributes["type"],
                 annex: (if (node.attr("style") == "appendix" ||
                             node.role == "appendix") &&

data/lib/metanorma/standoc/utils.rb

@@ -69,11 +69,11 @@ module Metanorma
       end
 
       def xml_encode(text)
-        @c.encode(text, :basic, :hexadecimal)
-          .gsub("&amp;gt;", ">").gsub("&amp;lt;", "<").gsub("&amp;amp;", "&")
-          .gsub("&gt;", ">").gsub("&lt;", "<").gsub("&amp;", "&")
-          .gsub("&quot;", '"').gsub("&#xa;", "\n").gsub("&amp;#", "&#")
-          .gsub("&apos;", "'")
+        @c.encode(text, :basic, :hexadecimal).
+          gsub("&amp;gt;", ">").gsub("&amp;lt;", "<").gsub("&amp;amp;", "&").
+          gsub("&gt;", ">").gsub("&lt;", "<").gsub("&amp;", "&").
+          gsub("&quot;", '"').gsub("&#xa;", "\n").gsub("&amp;#", "&#").
+          gsub("&apos;", "'")
       end
 
       # wrapped in <sections>
@@ -104,6 +104,10 @@ module Metanorma
                       psi|omega)\b/xi, "&\\1;")
       end
 
+      def refid?(ref)
+        @refids.include? ref
+      end
+
       module_function :adoc2xml
 
       class EmptyAttr

data/lib/metanorma/standoc/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "2.6.1".freeze
+    VERSION = "2.6.3".freeze
   end
 end

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.6.3"
+  spec.add_dependency "isodoc", "~> 2.7.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"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 2.6.1
+  version: 2.6.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-09 00:00:00.000000000 Z
+date: 2023-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.3
+        version: 2.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.3
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: metanorma
   requirement: !ruby/object:Gem::Requirement
@@ -466,11 +466,13 @@ files:
 - lib/isodoc/pdf_convert.rb
 - lib/metanorma-standoc.rb
 - lib/metanorma/standoc.rb
+- lib/metanorma/standoc/anchor.rb
 - lib/metanorma/standoc/base.rb
 - lib/metanorma/standoc/basicdoc.rng
 - lib/metanorma/standoc/biblio-standoc.rng
 - lib/metanorma/standoc/biblio.rng
 - lib/metanorma/standoc/blocks.rb
+- lib/metanorma/standoc/blocks_image.rb
 - lib/metanorma/standoc/blocks_notes.rb
 - lib/metanorma/standoc/cleanup.rb
 - lib/metanorma/standoc/cleanup_amend.rb