metanorma-standoc 2.8.4 → 2.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77911b09eea6861ff4b3614ba4de12829fd8955161d1aa8b8e917778ed9d3ac4
-  data.tar.gz: 11c749162a35a458a4cfa4c963a68a6e24f535c1fc4e943599966459612078ca
+  metadata.gz: 26ef7eeadddd66ca86125ae72f91a3e920057ad5ed1e8f0e1e5670f831355d0b
+  data.tar.gz: e1d1e42f6d4962d11ab86421fec3fc2877480e33fdac9aabcc4bd478fd3cc2df
 SHA512:
-  metadata.gz: 24a4fb2005f50f620eaba63e869c86939066445938c74ea3c6df18c6b7a18f7d42cf1997b0ae50dd4adbe7d6bd03f2b4bec6270fb9f41676d4e94e97626160da
-  data.tar.gz: 5cb4f03fa198dd33054e7e81cbc8de074b8cd05a73cee3de4e68ec7e596db08ae17d46c2b1dd8837e2959789f9cfbf80c5ba00e1cc2709c30b26703a052eef3e
+  metadata.gz: 4a014a7cbc4f3665f07322713d0edad6dbd42301eb3b0e548a78efd116f7c6da4b7359db4f26e3cbc50315cdbdad99169997493fa792000b6f36e63c49c8ace1
+  data.tar.gz: 25f39be9f0df10ecdfaea29ecdf2e1cf8a50789f80fce1cf6fa71cd23beb1a69f6b890e2ca69527bc486091631281cce5926f3b3ec743bdbbfb24b9c7d195264

data/lib/metanorma/standoc/anchor.rb

@@ -31,10 +31,11 @@ module Metanorma
 
       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)
+        attrs, text = inline_anchor_xref_match(text)
+        attrs.empty? and
+          return { target: t, type: "inline", text: text, style: @xrefstyle }
+        inline_anchor_xref_attrs1(attrs, t, text)
       end
 
       def concatenate_attributes_to_xref_text(node)
@@ -44,20 +45,29 @@ module Metanorma
         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] || @xrefstyle,
-          droploc: match[:drop].nil? && match[:drop2].nil? ? nil : true,
-          text: inline_anchor_xref_text(match, text) }
+      def inline_anchor_xref_attrs1(attrs, target, text)
+        { target: target, hidden: attrs["hidden"],
+          type: attrs.key?("fn") ? "footnote" : "inline",
+          case: %w(capital lowercase).detect { |x| attrs.key?(x) },
+          label: attrs["label"],
+          style: attrs["style"] || @xrefstyle,
+          droploc: attrs.key?("droploc") ? true : nil,
+          text: text }.compact
       end
 
+      XREF_ATTRS = "hidden|style|droploc|capital|lowercase|label".freeze
+
       def inline_anchor_xref_match(text)
-        /^(?:hidden%(?<hidden>[^,]+),?)?
-          (?:style=(?<style>[^%]+)%)?
-          (?<drop>droploc%)?(?<case>capital%|lowercase%)?(?<drop2>droploc%)?
-          (?<fn>fn:?\s*)?(?<text>.*)$/x.match text
+        attrs = {}
+        while m = /^(#{XREF_ATTRS})(=[^%]+)?%(.*)$/o.match(text)
+          text = m[3]
+          attrs[m[1]] = m[2]&.sub(/^=/, "")
+        end
+        if m = /^(fn:?\s*)(\S.*)?$/.match(text)
+          text = m[2]
+          attrs["fn"] = ""
+        end
+        [attrs, text]
       end
 
       def inline_anchor_xref_text(match, text)

data/lib/metanorma/standoc/base.rb

@@ -8,6 +8,7 @@ require "fileutils"
 require "metanorma-utils"
 require_relative "render"
 require_relative "localbib"
+require_relative "init"
 require "mn-requirements"
 
 module Metanorma
@@ -27,115 +28,6 @@ module Metanorma
         self.class::XML_NAMESPACE
       end
 
-      def init(node)
-        init_vars
-        init_misc(node)
-        init_processing(node)
-        init_reqt(node)
-        init_toc(node)
-        init_output(node) # feeds init_biblio
-        init_i18n(node)
-        init_biblio(node)
-        @metadata_attrs = metadata_attrs(node)
-      end
-
-      def init_vars
-        @fn_number ||= 0
-        @refids = Set.new
-        @anchor_alias = {}
-        @anchors = {}
-        @internal_eref_namespaces = []
-        @seen_headers = []
-        @seen_headers_canonical = []
-        @embed_hdr = []
-        @reqt_model = nil
-        @preface = true
-      end
-
-      def init_misc(node)
-        @doctype = doctype(node)
-        @draft = node.attributes.has_key?("draft")
-        @index_terms = node.attr("index-terms")
-        @boilerplateauthority = node.attr("boilerplate-authority")
-        @embed_hdr = node.attr("embed_hdr")
-        @embed_id = node.attr("embed_id")
-        @document_scheme = node.attr("document-scheme")
-        @xrefstyle = node.attr("xrefstyle")
-        @source_linenums = node.attr("source-linenums-option") == "true"
-      end
-
-      def init_processing(node)
-        @novalid = node.attr("novalid")
-        @smartquotes = node.attr("smartquotes") != "false"
-        @keepasciimath = node.attr("mn-keep-asciimath") &&
-          node.attr("mn-keep-asciimath") != "false"
-        @sourcecode_markup_start = node.attr("sourcecode-markup-start") || "{{{"
-        @sourcecode_markup_end = node.attr("sourcecode-markup-end") || "}}}"
-        @datauriimage = node.attr("data-uri-image") != "false"
-        @blockunnumbered = (node.attr("block-unnumbered") || "").split(",")
-          .map(&:strip)
-      end
-
-      def init_reqt(node)
-        @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("toclevels-html") ||
-          node.attr("htmltoclevels") ||
-          node.attr("toclevels") || toc_default[:html_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, pdf_levels: 2 }
-      end
-
-      def init_output(node)
-        @fontheader = default_fonts(node)
-        @files_to_delete = []
-        @filename = if node.attr("docfile")
-                      File.basename(node.attr("docfile"))&.gsub(/\.adoc$/, "")
-                    else ""
-                    end
-        @localdir = Metanorma::Utils::localdir(node)
-        @output_dir = outputdir node
-      end
-
-      def init_i18n(node)
-        @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
-      end
-
-      def init_biblio(node)
-        @no_isobib_cache = node.attr("no-isobib-cache")
-        @no_isobib = node.attr("no-isobib")
-        @bibdb = nil
-        init_bib_caches(node)
-        init_iev_caches(node)
-        @local_bibdb =
-          ::Metanorma::Standoc::LocalBiblio.new(node, @localdir, self)
-      end
-
-      def requirements_processor
-        Metanorma::Requirements
-      end
-
       def document(node)
         ret = document1(node)
         clean_exit
@@ -233,7 +125,7 @@ module Metanorma
       end
 
       def metadata_attrs(node)
-        node.attributes.each_with_object([]) do |(k, v), ret|
+        out = node.attributes.each_with_object([]) do |(k, v), ret|
           %w(presentation semantic).each do |t|
             /^#{t}-metadata-/.match?(k) or next
             k = k.sub(/^#{t}-metadata-/, "")
@@ -242,6 +134,17 @@ module Metanorma
             end
           end
         end.join
+        out + document_scheme_metadata(node)
+      end
+
+      def document_scheme_metadata(node)
+        a = document_scheme(node) or return ""
+        "<presentation-metadata><name>document-scheme</name>" \
+          "<value>#{a}</value></presentation-metadata>"
+      end
+
+      def document_scheme(node)
+        node.attr("document-scheme")
       end
 
       private

data/lib/metanorma/standoc/biblio.rng

@@ -208,7 +208,9 @@
   </define>
   <define name="roledescription">
     <element name="description">
-      <ref name="FormattedString"/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="person">
@@ -333,7 +335,9 @@
   </define>
   <define name="affiliationdescription">
     <element name="description">
-      <ref name="FormattedString"/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="organization">
@@ -897,7 +901,9 @@
   </define>
   <define name="formattedref">
     <element name="formattedref">
-      <ref name="FormattedString"/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="license">
@@ -942,7 +948,9 @@
     <optional>
       <attribute name="type"/>
     </optional>
-    <ref name="FormattedString"/>
+    <zeroOrMore>
+      <ref name="TextElement"/>
+    </zeroOrMore>
   </define>
   <!-- TitleType = ( "alternative" | "original" | "unofficial" | "subtitle" | "main" ) -->
   <define name="TypedUri">
@@ -1042,7 +1050,9 @@
       <optional>
         <attribute name="script"/>
       </optional>
-      <text/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="docnumber">
@@ -1267,12 +1277,16 @@
       <optional>
         <attribute name="type"/>
       </optional>
-      <ref name="FormattedString"/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="bibabstract">
     <element name="abstract">
-      <ref name="FormattedString"/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="copyright">
@@ -1377,7 +1391,9 @@
       </attribute>
       <optional>
         <element name="description">
-          <ref name="FormattedString"/>
+          <oneOrMore>
+            <ref name="TextElement"/>
+          </oneOrMore>
         </element>
       </optional>
       <element name="bibitem">

data/lib/metanorma/standoc/blocks_image.rb

@@ -36,7 +36,8 @@ module Metanorma
 
       def figure_attrs(node)
         attr_code(id_unnum_attrs(node).merge(keep_attrs(node))
-          .merge(class: node.attr("class")))
+          .merge(class: node.attr("class"),
+                 width: node.attr("width")))
       end
 
       def image(node)

data/lib/metanorma/standoc/cleanup_image.rb

@@ -1,10 +1,10 @@
 require "vectory"
+require "crass"
 
 module Metanorma
   module Standoc
     module Cleanup
       def svgmap_cleanup(xmldoc)
-        svg_uniqueids(xmldoc)
         svgmap_moveattrs(xmldoc)
         svgmap_populate(xmldoc)
         Vectory::SvgMapping.new(xmldoc, @localdir).call
@@ -31,8 +31,7 @@ module Metanorma
       def svgmap_moveattrs1(svgmap, figure)
         %w(unnumbered number subsequence keep-with-next
            keep-lines-together tag multilingual-rendering).each do |a|
-          next if figure[a] || !svgmap[a]
-
+          figure[a] || !svgmap[a] and next
           figure[a] = svgmap[a]
           svgmap.delete(a)
         end
@@ -44,7 +43,7 @@ module Metanorma
           s.children.remove
           f = s1.at(".//figure") and s << f
           s1.xpath(".//li").each do |li|
-            t = li&.at(".//eref | .//link | .//xref") or next
+            t = li.at(".//eref | .//link | .//xref") or next
             href = t.xpath("./following-sibling::node()")
             href.empty? or
               s << %[<target href="#{svgmap_target(href)}">#{t.to_xml}</target>]
@@ -54,8 +53,7 @@ module Metanorma
 
       def svgmap_target(nodeset)
         nodeset.each do |n|
-          next unless n.name == "link"
-
+          n.name == "link" or next
           n.children = n["target"]
         end
         nodeset.text.sub(/^[,; ]/, "").strip
@@ -70,22 +68,51 @@ module Metanorma
             end
           end
         end
-        svg_uniqueids(xmldoc)
+        svg_cleanup(xmldoc)
         xmldoc
       end
 
-      def read_in_if_svg(img, localdir)
-        return false unless img["src"]
+      def svg_cleanup(xmldoc)
+        svg_uniqueids(xmldoc)
+        svg_classupdate(xmldoc)
+      end
 
+      def read_in_if_svg(img, localdir)
+        img["src"] or return false
         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
         svg = File.read(path, encoding: "utf-8") or return false
-        img.replace(Nokogiri::XML(svg).root)
+        img.children = (Nokogiri::XML(svg).root)
         true
       end
 
+      def svg_classupdate(xmldoc)
+        xmldoc.xpath("//m:svg[m:style]", "m" => SVG_NS)
+          .each_with_index do |s, i|
+          svg_classupdate1(s, s.at("./m:style", "m" => SVG_NS), i)
+        end
+      end
+
+      def svg_classupdate1(svg, style, idx)
+        tree = Crass.parse(style.text)
+        tree.each { |n| svg_suffix_css_style(n, idx) }
+        style.children = Crass::Parser.stringify(tree)
+        svg.xpath(".//*[@class]").each do |n|
+          n["class"] = n["class"].split(/\s+/)
+            .map { |x| "#{x}_inject_#{idx}" }.join(" ")
+        end
+      end
+
+      def svg_suffix_css_style(node, idx)
+        node[:node] == :style_rule && /\./.match?(node[:selector][:value]) or
+          return
+        v = node[:selector][:value]
+          .gsub(/([^.\s]*\.\S+)/, "\\1_inject_#{idx}")
+        node[:selector] = Crass.parse("#{v} {}").first[:selector]
+      end
+
       IRI_TAG_PROPERTIES_MAP = {
         clipPath: ["clip-path"],
         "color-profile": nil,
@@ -112,13 +139,12 @@ module Metanorma
 
       def svg_iri_properties(id_elems)
         iri_tag_names = id_elems.each_with_object([]) do |e, m|
-          IRI_TAG_PROPERTIES_MAP.key?(e.name.to_sym) and m = m << e.name
+          IRI_TAG_PROPERTIES_MAP.key?(e.name.to_sym) and m << e.name
         end.uniq
         iri_properties = iri_tag_names.each_with_object([]) do |t, m|
           (IRI_TAG_PROPERTIES_MAP[t.to_sym] || [t]).each { |t1| m = m << t1 }
         end.uniq
-        return [] if iri_properties.empty?
-
+        iri_properties.empty? and return []
         iri_properties << "style"
       end
 
@@ -133,8 +159,7 @@ module Metanorma
 
       def svg_uniqueids2(svg, iri_properties, idx, ids)
         svg.traverse do |e|
-          next unless e.element?
-
+          e.element? or next
           if e.name == "style"
             svg_styleupdate(e, idx, ids)
           elsif !e.attributes.empty?
@@ -159,8 +184,7 @@ module Metanorma
 
       def svg_attrupdate(elem, iri_properties, idx, ids)
         iri_properties.each do |p|
-          next unless elem[p]
-
+          elem[p] or next
           elem[p] = svg_update_url(elem[p], idx, ids)
         end
       end
@@ -168,17 +192,15 @@ module Metanorma
       def svg_linkupdate(elem, idx, ids)
         %w(xlink:href href).each do |ref|
           iri = elem[ref]&.strip
-          next unless /^#/.match?(iri)
-          next unless ids[iri.sub(/^#/, "")]
-
+          /^#/.match?(iri) or next
+          ids[iri.sub(/^#/, "")] or next
           elem[ref] += "_inject_#{idx}"
         end
       end
 
       def svg_idupdate(elem, idx, ids)
-        return unless elem["id"]
-        return unless ids[elem["id"]]
-
+        elem["id"] or return
+        ids[elem["id"]] or return
         elem["id"] += "_inject_#{idx}"
       end
     end

data/lib/metanorma/standoc/cleanup_section.rb

@@ -97,8 +97,7 @@ module Metanorma
       def make_annexes(xml)
         xml.xpath("//*[@annex]").each do |y|
           y.delete("annex")
-          next if y.name == "annex" || !y.ancestors("annex").empty?
-
+          y.name == "annex" || !y.ancestors("annex").empty? and next
           y.wrap("<annex/>")
           y.parent["id"] = "_#{UUIDTools::UUID.random_create}"
           y.parent["obligation"] = y["obligation"]
@@ -117,8 +116,7 @@ module Metanorma
 
       def sections_level_cleanup(xml)
         m = maxlevel(xml)
-        return if m < 6
-
+        m < 6 and return
         m.downto(6).each do |l|
           xml.xpath("//clause[@level = '#{l}']").each do |c|
             c.delete("level")
@@ -173,7 +171,7 @@ module Metanorma
           r["obligation"] = "normative" unless r["obligation"]
         end
         xml.xpath(Utils::SUBCLAUSE_XPATH).each do |r|
-          o = r&.at("./ancestor::*/@obligation")&.text and r["obligation"] = o
+          o = r.at("./ancestor::*/@obligation")&.text and r["obligation"] = o
         end
       end
 
@@ -183,8 +181,7 @@ module Metanorma
       end
 
       def preface_clausebefore_cleanup(xmldoc)
-        return unless xmldoc.at("//preface")
-
+        xmldoc.at("//preface") or return
         ins = insert_before(xmldoc, "//preface")
         xmldoc.xpath("//preface//*[@beforeclauses = 'true']").each do |x|
           x.delete("beforeclauses")
@@ -232,9 +229,8 @@ module Metanorma
         loop do
           found = false
           xmldoc.xpath("//floating-title").each do |t|
-            next unless t.next_element.nil?
-            next if %w(sections annex preface).include? t.parent.name
-
+            t.next_element.nil? or next
+            %w(sections annex preface).include? t.parent.name and next
             t.parent.next = t
             found = true
           end

data/lib/metanorma/standoc/cleanup_section_names.rb

@@ -16,22 +16,32 @@ module Metanorma
         text or return
         doc.xpath(xpath).each_with_index do |node, i|
           first && !i.zero? and next
+          node["keeptitle"] == "true" and next
           title = get_or_make_title(node)
-          fn = title.xpath("./fn | ./bookmark")
-          fn.each(&:remove)
-          title.children = text
-          fn.each { |n| title << n }
+          set_title_with_footnotes(title, text)
         end
       end
 
+      def set_title_with_footnotes(title, text)
+        fn = title.xpath("./fn | ./bookmark | ./index")
+        fn.each(&:remove)
+        title.children = text
+        fn.each { |n| title << n }
+      end
+
       def sections_names_cleanup(xml)
         replace_title(xml, "//clause[@type = 'scope']", @i18n&.scope)
+        sections_names_pref_cleanup(xml)
+        section_names_refs_cleanup(xml)
+        section_names_terms_cleanup(xml)
+        xml.xpath("//*[@keeptitle]").each { |s| s.delete("keeptitle") }
+      end
+
+      def sections_names_pref_cleanup(xml)
         replace_title(xml, "//preface//abstract", @i18n&.abstract)
         replace_title(xml, "//foreword", @i18n&.foreword)
         replace_title(xml, "//introduction", @i18n&.introduction)
         replace_title(xml, "//acknowledgements", @i18n&.acknowledgements)
-        section_names_refs_cleanup(xml)
-        section_names_terms_cleanup(xml)
       end
 
       def section_names_refs_cleanup(xml)
@@ -82,11 +92,8 @@ module Metanorma
                       @i18n&.termsdefsymbolsabbrev, true)
         replace_title(xml, "//terms#{NO_SYMABBR} | //clause[.//terms]#{NO_SYMABBR}",
                       @i18n&.termsdefsymbolsabbrev, true)
-        replace_title(
-          xml,
-          "//terms[not(.//definitions)] | //clause[.//terms][not(.//definitions)]",
-          @i18n&.termsdef, true
-        )
+        replace_title(xml, "//terms[not(.//definitions)] | //clause[.//terms][not(.//definitions)]",
+                      @i18n&.termsdef, true)
       end
 
       # do not auto-name terms sections if there are terms subclauses

data/lib/metanorma/standoc/cleanup_xref.rb

@@ -76,9 +76,8 @@ module Metanorma
       def extract_localities_update_text(match)
         ret = match[:text]
         re = to_regex(LOCALITY_REGEX_VALUE_ONLY_STR)
-        if re.match?(ret) && match[:punct] == ";"
+        re.match?(ret) && match[:punct] == ";" and
           ret.sub!(%r{^(#{CONN_REGEX_STR})}o, "\\1#{match[:locality]}=")
-        end
         ret
       end
 
@@ -93,15 +92,13 @@ module Metanorma
       end
 
       def fill_in_eref_connectives(elem)
-        return if elem.xpath("./localityStack").size < 2
-
+        elem.xpath("./localityStack").size < 2 and return
         elem.xpath("./localityStack[not(@connective)]").each do |l|
           n = l.next_element
           l["connective"] = if n && n.name == "localityStack" &&
               n["connective"] == "to"
                               "from"
-                            else "and"
-                            end
+                            else "and" end
         end
       end
 
@@ -193,9 +190,8 @@ module Metanorma
       def xref_parse_compound_locations(locations)
         l = locations.map { |y| y.split("!", 2) }
         l.map.with_index do |y, i|
-          if y.size == 1
+          y.size == 1 and
             y.unshift(l.dig(i + 1, 0) == "to" ? "from" : "and")
-          end
           y
         end
       end
@@ -209,8 +205,7 @@ module Metanorma
       def xref_cleanup1(xmldoc)
         xmldoc.xpath("//xref").each do |x|
           %r{:(?!//)}.match?(x["target"]) and xref_to_internal_eref(x)
-          next unless x.name == "xref"
-
+          x.name == "xref" or next
           if refid? x["target"]
             xref_to_eref(x, "eref")
           elsif @anchor_alias[x["target"]] then xref_alias(x)

data/lib/metanorma/standoc/front.rb

@@ -10,7 +10,7 @@ module Metanorma
     module Front
       def metadata_id(node, xml)
         id = node.attr("docidentifier") || metadata_id_build(node)
-        xml.docidentifier id
+        xml.docidentifier id, primary: "true"
       end
 
       def metadata_id_build(node)

data/lib/metanorma/standoc/init.rb

@@ -0,0 +1,114 @@
+module Metanorma
+  module Standoc
+    module Base
+      def init(node)
+        init_vars
+        init_misc(node)
+        init_processing(node)
+        init_reqt(node)
+        init_toc(node)
+        init_output(node) # feeds init_biblio
+        init_i18n(node)
+        init_biblio(node)
+        @metadata_attrs = metadata_attrs(node)
+      end
+
+      def init_vars
+        @fn_number ||= 0
+        @refids = Set.new
+        @anchor_alias = {}
+        @anchors = {}
+        @internal_eref_namespaces = []
+        @seen_headers = []
+        @seen_headers_canonical = []
+        @embed_hdr = []
+        @reqt_model = nil
+        @preface = true
+      end
+
+      def init_misc(node)
+        @doctype = doctype(node)
+        @draft = node.attributes.has_key?("draft")
+        @index_terms = node.attr("index-terms")
+        @boilerplateauthority = node.attr("boilerplate-authority")
+        @embed_hdr = node.attr("embed_hdr")
+        @embed_id = node.attr("embed_id")
+        @document_scheme = node.attr("document-scheme")
+        @xrefstyle = node.attr("xrefstyle")
+        @source_linenums = node.attr("source-linenums-option") == "true"
+      end
+
+      def init_processing(node)
+        @novalid = node.attr("novalid")
+        @smartquotes = node.attr("smartquotes") != "false"
+        @keepasciimath = node.attr("mn-keep-asciimath") &&
+          node.attr("mn-keep-asciimath") != "false"
+        @sourcecode_markup_start = node.attr("sourcecode-markup-start") || "{{{"
+        @sourcecode_markup_end = node.attr("sourcecode-markup-end") || "}}}"
+        @datauriimage = node.attr("data-uri-image") != "false"
+        @blockunnumbered = (node.attr("block-unnumbered") || "").split(",")
+          .map(&:strip)
+      end
+
+      def init_reqt(node)
+        @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("toclevels-html") ||
+          node.attr("htmltoclevels") ||
+          node.attr("toclevels") || toc_default[:html_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, pdf_levels: 2 }
+      end
+
+      def init_output(node)
+        @fontheader = default_fonts(node)
+        @files_to_delete = []
+        @filename = if node.attr("docfile")
+                      File.basename(node.attr("docfile"))&.gsub(/\.adoc$/, "")
+                    else ""
+                    end
+        @localdir = Metanorma::Utils::localdir(node)
+        @output_dir = outputdir node
+      end
+
+      def init_i18n(node)
+        @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
+      end
+
+      def init_biblio(node)
+        @no_isobib_cache = node.attr("no-isobib-cache")
+        @no_isobib = node.attr("no-isobib")
+        @bibdb = nil
+        init_bib_caches(node)
+        init_iev_caches(node)
+        @local_bibdb =
+          ::Metanorma::Standoc::LocalBiblio.new(node, @localdir, self)
+      end
+
+      def requirements_processor
+        Metanorma::Requirements
+      end
+    end
+  end
+end

data/lib/metanorma/standoc/inline.rb

@@ -30,7 +30,7 @@ module Metanorma
         results = Plurimath::Math.parse(lxm_input, "latex")
           .to_mathml(display_style: block)
         if results.nil?
-          @log.add("Math", nil,
+          @log.add("Maths", nil,
                    "latexmlmath failed to process equation:\n#{lxm_input}",
                    severity: 1)
           return

data/lib/metanorma/standoc/isodoc.rng

@@ -156,44 +156,7 @@
     </define>
     <define name="xref">
       <element name="xref">
-        <attribute name="target">
-          <data type="string">
-            <param name="pattern">\i\c*|\c+#\c+</param>
-          </data>
-        </attribute>
-        <optional>
-          <attribute name="to">
-            <data type="string">
-              <param name="pattern">\i\c*|\c+#\c+</param>
-            </data>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="type">
-            <ref name="ReferenceFormat"/>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="alt"/>
-        </optional>
-        <optional>
-          <attribute name="case">
-            <choice>
-              <value>capital</value>
-              <value>lowercase</value>
-            </choice>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="droploc">
-            <data type="boolean"/>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="style">
-            <ref name="XrefStyleType"/>
-          </attribute>
-        </optional>
+        <ref name="XrefAttributes"/>
         <ref name="XrefBody"/>
       </element>
     </define>
@@ -407,23 +370,7 @@
     </define>
     <define name="figure">
       <element name="figure">
-        <attribute name="id">
-          <data type="ID"/>
-        </attribute>
-        <optional>
-          <attribute name="unnumbered">
-            <data type="boolean"/>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="number"/>
-        </optional>
-        <optional>
-          <attribute name="subsequence"/>
-        </optional>
-        <optional>
-          <attribute name="class"/>
-        </optional>
+        <ref name="FigureAttributes"/>
         <ref name="BlockAttributes"/>
         <optional>
           <ref name="tname"/>
@@ -2450,6 +2397,49 @@
       </zeroOrMore>
     </element>
   </define>
+  <define name="XrefAttributes">
+    <attribute name="target">
+      <data type="string">
+        <param name="pattern">\i\c*|\c+#\c+</param>
+      </data>
+    </attribute>
+    <optional>
+      <attribute name="to">
+        <data type="string">
+          <param name="pattern">\i\c*|\c+#\c+</param>
+        </data>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="type">
+        <ref name="ReferenceFormat"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="alt"/>
+    </optional>
+    <optional>
+      <attribute name="case">
+        <choice>
+          <value>capital</value>
+          <value>lowercase</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="droploc">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="style">
+        <ref name="XrefStyleType"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="label"/>
+    </optional>
+  </define>
   <define name="XrefBody">
     <zeroOrMore>
       <ref name="XrefTarget"/>
@@ -2528,6 +2518,28 @@
       <attribute name="columns"/>
     </optional>
   </define>
+  <define name="FigureAttributes">
+    <attribute name="id">
+      <data type="ID"/>
+    </attribute>
+    <optional>
+      <attribute name="unnumbered">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="number"/>
+    </optional>
+    <optional>
+      <attribute name="subsequence"/>
+    </optional>
+    <optional>
+      <attribute name="class"/>
+    </optional>
+    <optional>
+      <attribute name="width"/>
+    </optional>
+  </define>
   <start>
     <ref name="standard-document"/>
   </start>

data/lib/metanorma/standoc/macros_inline.rb

@@ -27,7 +27,7 @@ module Metanorma
         attrs.size > 1 && attrs.size < 5 and return true
         e = "invalid index \"#{target}\" cross-reference: wrong number of " \
             "attributes in `index:#{target}[#{attrs.values.join(',')}]`"
-        parent.converter.log.add("Index", parent, e, severity: 0)
+        parent.converter.log.add("Crossreferences", parent, e, severity: 0)
         false
       end
 
@@ -201,7 +201,13 @@ module Metanorma
       using_format :short
 
       def process(parent, _target, attrs)
-        create_anchor(parent, "hidden%#{attrs['text']}",
+        t = attrs["text"]
+        t = if /,/.match?(t)
+              t.sub(/,/, "%")
+            else
+              "#{t}%"
+            end
+        create_anchor(parent, "hidden=#{t}",
                       type: :xref, target: "_#{UUIDTools::UUID.random_create}")
       end
     end

data/lib/metanorma/standoc/ref_queue.rb

@@ -213,8 +213,7 @@ module Metanorma
       end
 
       def init_bib_caches(node)
-        return if @no_isobib
-
+        @no_isobib and return
         global = !@no_isobib_cache && !node.attr("local-cache-only")
         local = node.attr("local-cache") || node.attr("local-cache-only")
         local = nil if @no_isobib_cache

data/lib/metanorma/standoc/section.rb

@@ -10,9 +10,8 @@ module Metanorma
       @norm_ref = false
 
       def sectiontype1(node)
-        return "abstract" if node.attr("style") == "abstract"
-
-        node&.attr("heading")&.downcase ||
+        node.attr("style") == "abstract" and return "abstract"
+        node.attr("heading")&.downcase ||
           node.title
             .gsub(%r{<index>.*?</index>}m, "")
             .gsub(%r{<fn[^>]*>.*?</fn>}m, "")
@@ -25,7 +24,7 @@ module Metanorma
         ret = sectiontype1(node)
         ret1 = preface_main_filter(sectiontype_streamline(ret), node)
         ret1 == "symbols and abbreviated terms" and return ret1
-        !level || node.level == 1 or return nil
+        !level || node.level == 1 || node.attr("heading") or return nil
         @seen_headers.include? ret and return nil
         @seen_headers << ret unless ret1.nil?
         @seen_headers_canonical << ret1 unless ret1.nil?
@@ -59,9 +58,12 @@ module Metanorma
         ["normative references", "terms and definitions", "scope",
          "symbols and abbreviated terms", "clause", "bibliography"].freeze
 
-      def start_main_section(ret, node)
-        return if node.role == "preface" || node.attr("style") == "preface"
+      def role_style(node, value)
+        node.role == value || node.attr("style") == value
+      end
 
+      def start_main_section(ret, node)
+        role_style(node, "preface") and return
         @preface = false if self.class::MAIN_CLAUSE_NAMES.include?(ret)
         @preface = false if self.class::PREFACE_CLAUSE_NAMES
           .intersection(@seen_headers_canonical + [ret]).empty?
@@ -79,29 +81,20 @@ module Metanorma
       end
 
       def section_attributes(node)
-        ret = { id: Metanorma::Utils::anchor_or_uuid(node),
-                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") &&
-                          node.level == 1
-                          true
-                        end),
-                tag: node&.attr("tag"),
-                "multilingual-rendering": node&.attr("multilingual-rendering"),
-                colophon: (if node.role == "colophon" ||
-                          node.attr("style") == "colophon"
-                             true
-                           end),
-                preface: (if node.role == "preface" ||
-                          node.attr("style") == "preface"
-                            true
-                          end) }
-        return ret unless node.attributes["change"]
+        ret =
+          { id: Metanorma::Utils::anchor_or_uuid(node),
+            annex: role_style(node, "appendix") && node.level == 1 ? true : nil,
+            colophon: role_style(node, "colophon") ? true : nil,
+            preface: role_style(node, "preface") ? true : nil }
+        %w(language script number branch-number type tag keeptitle
+           multilingual-rendering).each do |k|
+          a = node.attr(k) and ret[k.to_sym] = a
+        end
+        section_attributes_change(node, ret).compact
+      end
 
+      def section_attributes_change(node, ret)
+        node.attributes["change"] or return ret
         ret.merge(change: node.attributes["change"],
                   path: node.attributes["path"],
                   path_end: node.attributes["path_end"],

data/lib/metanorma/standoc/term_lookup_cleanup.rb

@@ -5,8 +5,6 @@ module Metanorma
     # Intelligent term lookup xml modifier
     class TermLookupCleanup
       AUTO_GEN_ID_REGEXP = /\A_/.freeze
-      EXISTING_TERM_REGEXP = /\Aterm-/.freeze
-      EXISTING_SYMBOL_REGEXP = /\Asymbol-/.freeze
 
       attr_reader :xmldoc, :lookup, :log
 
@@ -61,13 +59,12 @@ module Metanorma
       def related_cleanup
         xmldoc.xpath("//related").each do |n|
           refterm = n.at("./refterm") or next
+          repl = "<preferred><expression>" \
+            "<name>#{refterm.children.to_xml}</name></expression></preferred>"
           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(<<~XML,
-              <preferred><expression><name>#{refterm.children.to_xml}</name></expression></preferred>
-            XML
-                           )
+            refterm.replace(repl)
         end
       end
 
@@ -96,7 +93,7 @@ module Metanorma
       def remove_missing_ref?(node)
         node.at("../eref | ../termref") and return false
         xref = node.at("../xref") or return true
-        xref["target"] && !xref["target"]&.empty? and return false
+        xref["target"] && !xref["target"].empty? and return false
         xref.remove # if xref supplied by user, we won't delete
         true
       end
@@ -251,8 +248,7 @@ module Metanorma
       end
 
       def unique_text_id(text, prefix)
-        @idhash["#{prefix}-#{text}"] or
-          return "#{prefix}-#{text}"
+        @idhash["#{prefix}-#{text}"] or return "#{prefix}-#{text}"
         (1..Float::INFINITY).lazy.each do |index|
           @idhash["#{prefix}-#{text}-#{index}"] or
             break("#{prefix}-#{text}-#{index}")

data/lib/metanorma/standoc/validate.rb

@@ -53,7 +53,7 @@ module Metanorma
         orig = ""
         a and orig += "\n\tAsciimath original: #{@c.decode(a.children.to_xml)}"
         l and orig += "\n\tLatexmath original: #{@c.decode(l.children.to_xml)}"
-        @log.add("Mathematics", elem,
+        @log.add("Maths", elem,
                  "Invalid MathML: #{math}\n #{error}#{orig}", severity: 0)
       end
 
@@ -83,7 +83,7 @@ module Metanorma
         outer.name == "figure" && inner.name == "figure" and return
         err =
           "There is an instance of #{inner.name} nested within #{outer.name}"
-        @log.add("Syntax", inner, err)
+        @log.add("Style", inner, err)
         nested_asset_xref_report(outer, inner, doc)
       end
 

data/lib/metanorma/standoc/validate_section.rb

@@ -21,14 +21,14 @@ module Metanorma
         if callouts.size != annotations.size && !annotations.empty?
           err = "mismatch of callouts (#{callouts.size}) and annotations " \
                 "(#{annotations.size})"
-          @log.add("AsciiDoc Input", elem, err, severity: 0)
+          @log.add("Crossreferences", elem, err, severity: 0)
         end
       end
 
       def style_warning(node, msg, text = nil)
         w = msg
         w += ": #{text}" if text
-        @log.add("Metanorma XML Style Warning", node, w)
+        @log.add("Style", node, w)
       end
 
       def asset_title_style(root)
@@ -61,7 +61,7 @@ module Metanorma
           docid = b.at("./docidentifier[@type = 'metanorma']") or next
           /^\[\d+\]$/.match?(docid.text) or next
           @log.add("Bibliography", b,
-                   "Numeric reference in normative references", severity: 0)
+                   "Numeric reference in normative references", severity: 1)
         end
       end
     end

data/lib/metanorma/standoc/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "2.8.4".freeze
+    VERSION = "2.8.6".freeze
   end
 end

data/metanorma-standoc.gemspec

@@ -30,6 +30,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "addressable", "~> 2.8.0"
   spec.add_dependency "asciidoctor", "~> 2.0.0"
+  spec.add_dependency "crass", "~> 1.0.0"
   spec.add_dependency "iev", "~> 0.3.0"
   spec.add_dependency "isodoc", "~> 2.9.0"
   spec.add_dependency "metanorma", ">= 1.6.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 2.8.4
+  version: 2.8.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-04 00:00:00.000000000 Z
+date: 2024-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: crass
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: iev
   requirement: !ruby/object:Gem::Requirement
@@ -503,6 +517,7 @@ files:
 - lib/metanorma/standoc/front.rb
 - lib/metanorma/standoc/front_contributor.rb
 - lib/metanorma/standoc/front_organisation.rb
+- lib/metanorma/standoc/init.rb
 - lib/metanorma/standoc/inline.rb
 - lib/metanorma/standoc/isodoc-compile.rng
 - lib/metanorma/standoc/isodoc.rng