metanorma-standoc 3.1.3 → 3.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b781bd30313479321cf23297d77787c8500bda06c74a76028853f9b28d30510
-  data.tar.gz: bbdf82ad80d7a6b9f1f21582d7ab6eeb58b365d4aea706a49046d74b4e6309ad
+  metadata.gz: 07dd4263f3139ccb6d6f742e52e7ccf48a4d5f585dc442fd4fe22019f68a2173
+  data.tar.gz: 013cd7e28bb591c2b09b138de8debe85831bc30460ed6192aae2dd9d4434de89
 SHA512:
-  metadata.gz: 398ae3eaa49e8d22a4612adecf703cc4d3d7ae1b4a056f29289e5e9517be690253a1fadabf67ef1d030763992c5d97b405cc8296275df5a98eb5fc40386b93da
-  data.tar.gz: 994a1d4820b1a68e2768ca5c189788f89a7487c1e9dd63f09178aed9c1dfd558f416a1c8521834c5e8d39b294f9a488a61778f3490e5e3aad04b10d7b5bcc386
+  metadata.gz: 4a856c20cb73fb75982c1e473d5d959e1aeed8cd1354eb53af33d612d8769e03b4f85229bfd93adaafb0840e1a4071eca7c99e49e4ed5ae0dd2211e55d6ec8fa
+  data.tar.gz: bcc1fa89fe0ddd3b33c0bf9d0bd7696a1668a9d123b289aff61d4f82969bcdc54c7dc0088e7debb3d3256221eefbc5609b8e0ac3d074c62dfcbde826e5b995e7

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

@@ -76,12 +76,6 @@ from other documents in the same doctype</a:documentation>
     <ref name="flavor">
       <a:documentation>Flavour of Metanorma used to process this document</a:documentation>
     </ref>
-    <optional>
-      <ref name="editorialgroup">
-        <a:documentation>Groups associated with the production of the standards document, typically within
-a standards definition organization</a:documentation>
-      </ref>
-    </optional>
     <zeroOrMore>
       <ref name="ics">
         <a:documentation>Classification of the document contents taken from the International Classification of Standards</a:documentation>
@@ -130,49 +124,6 @@ a standards definition organization</a:documentation>
 However we prefer not to hardcode it, given ongoing extension.</a:documentation>
     <text/>
   </define>
-  <define name="editorialgroup">
-    <a:documentation>A group associated with the production of the standards document, typically within
-a standards definition organization</a:documentation>
-    <element name="editorialgroup">
-      <oneOrMore>
-        <ref name="technical-committee">
-          <a:documentation>A technical committee associated with the production of the standards document</a:documentation>
-        </ref>
-      </oneOrMore>
-    </element>
-  </define>
-  <define name="technical-committee">
-    <a:documentation>Technical committee associated with the production of a standards document</a:documentation>
-    <element name="technical-committee">
-      <ref name="IsoWorkgroup"/>
-    </element>
-  </define>
-  <define name="IsoWorkgroup">
-    <optional>
-      <attribute name="number">
-        <a:documentation>Numeric identifier of the technical committee</a:documentation>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="type">
-        <a:documentation>Type of the technical committee, used in identifying the technical committee</a:documentation>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="identifier">
-        <a:documentation>Non-numeric, complete identifier of the technical committee</a:documentation>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="prefix">
-        <a:documentation>Disambiguating prefix added to number to form the identifier of the technical committee,
-typically indicating its type</a:documentation>
-      </attribute>
-    </optional>
-    <text>
-      <a:documentation>Name of the technical committee</a:documentation>
-    </text>
-  </define>
   <define name="ics">
     <a:documentation>Classification taken from the International Classification of Standards. 
 ICS is defined by ISO here -- https://www.iso.org/publication/PUB100033.html</a:documentation>

data/lib/metanorma/standoc/biblio.rng

@@ -242,6 +242,8 @@ Detailed in https://www.relaton.org/model/creator/</a:documentation>
     </choice>
   </define>
   <define name="roledescription">
+    <a:documentation>A more detailed description of the role of the contributor
+Some descriptions are reserved words; in particular, the editorial committee of a standard has the role description "committee"</a:documentation>
     <element name="description">
       <ref name="LocalizedMarkedUpString"/>
     </element>
@@ -443,7 +445,10 @@ real names (if the person is named with a pseudonym or user name); previous lega
     </oneOrMore>
     <zeroOrMore>
       <ref name="subdivision">
-        <a:documentation>The subdivision of the organization directly involved with the production of the bibliographic item</a:documentation>
+        <a:documentation>The subdivision of the organization directly involved with the production of the bibliographic item.
+Multiple subdivisions can be specified for an organization, with no implication of hierarchical
+relation between them
+Editorial and advisory groups are represented as consecutive subdivisions of the SDO</a:documentation>
       </ref>
     </zeroOrMore>
     <optional>
@@ -485,6 +490,11 @@ real names (if the person is named with a pseudonym or user name); previous lega
           <a:documentation>The type of subdivision</a:documentation>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="subtype">
+          <a:documentation>The subtype of subdivision; e.g. different types of technical committee</a:documentation>
+        </attribute>
+      </optional>
       <ref name="OrganizationType">
         <a:documentation>The subdivision, modelled recursively as an organization</a:documentation>
       </ref>

data/lib/metanorma/standoc/blocks_notes.rb

@@ -6,6 +6,7 @@ module Metanorma
           .merge(
             "keep-separate": node.attr("keep-separate"),
             keepasterm: node.option?("termnote") ? "true" : nil,
+            type: node.attr("type")
           )))
       end
 

data/lib/metanorma/standoc/cleanup.rb

@@ -33,7 +33,8 @@ module Metanorma
         passthrough_cleanup(xmldoc) # feeds: smartquotes_cleanup
         unnumbered_blocks_cleanup(xmldoc)
         termdocsource_cleanup(xmldoc) # feeds: metadata_cleanup
-        metadata_cleanup(xmldoc) # feeds: boilerplate_cleanup
+        metadata_cleanup(xmldoc) # feeds: boilerplate_cleanup, bibdata_cleanup,
+        # docidentifier_cleanup (in generic: template)
         misccontainer_cleanup(xmldoc)
         sections_cleanup(xmldoc) # feeds: obligations_cleanup, toc_cleanup,
         # floatingtitle_cleanup
@@ -202,6 +203,8 @@ module Metanorma
       end
 
       def metadata_cleanup(xmldoc)
+        bibdata_published(xmldoc) # feeds: bibdata_cleanup,
+        # docidentifier_cleanup (in generic: template)
         (@metadata_attrs.nil? || @metadata_attrs.empty?) and return
         ins = add_misc_container(xmldoc)
         ins << @metadata_attrs

data/lib/metanorma/standoc/cleanup_bibdata.rb

@@ -59,7 +59,7 @@ module Metanorma
         end
       end
 
-      def indirect_eref_to_xref(eref, ident, id_map=nil)
+      def indirect_eref_to_xref(eref, ident, id_map = nil)
         loc = eref.at("./localityStack[locality[@type = 'anchor']]") ||
           eref.at("./locality[@type = 'anchor']")
         loc = loc&.remove&.text || ident
@@ -72,6 +72,7 @@ module Metanorma
         else
           eref.document.at("//*[@anchor = '#{loc}']") and return
         end
+
         eref.children = %(** Missing target #{loc})
         eref["target"] = ident
       end
@@ -181,6 +182,20 @@ module Metanorma
           ins.next = c
         end
       end
+
+      def bibdata_published(xmldoc)
+        ins = add_misc_container(xmldoc)
+        ins ||= add_misc_container(xmldoc)
+        ins.at("./semantic-metadata/stage-published") and return
+        p = published?(xmldoc.at("bibdata/status/stage")&.text, xmldoc)
+        ins << <<~XML
+          <semantic-metadata><stage-published>#{p}</stage-published></semantic-metadata>
+        XML
+      end
+
+      def published?(stage, _xmldoc)
+        stage.casecmp("published").zero?
+      end
     end
   end
 end

data/lib/metanorma/standoc/cleanup_boilerplate.rb

@@ -162,25 +162,64 @@ module Metanorma
         end
       end
 
-      # Asciidoc macro, e.g. span:publisher[...]
-      # May contain one or more {{ }} in target, with spaces in them
-      # Does not end in \]
-      ADOC_MACRO_START =
-        '\S+:(?:[^\[\] ]+|\{\{[^{}]+\}\})*\[.*?(?<!\\\\)\]'.freeze
-
-      # Replace {{ ... }} with {{ pass:[...]}} to preserve any XML markup
-      # use pass:[...\] if {{}} is already inside an Asciidoc macro
-      # Do not use pass: if this is a macro target: mailto:{{x}}[]
-      # or body: mailto:[{{x}}]
+      # The boilerplate file is in Liquid AsciiDoc format
+      # (technically, `boilerplate.adoc.liquid`).
+      #
+      # This file is processed separately from the main Metanorma document and
+      # therefore is oblivious of the `{{ concept-mention }}` syntax.
+      #
+      # Due to historic reasons, the Liquid objects being evaluated in the
+      # boilerplate document are XML strings. Notably these are the document
+      # metadata, that are extracted from the already generated Metanorma XML.
+      #
+      # These XML strings are then passed into the AsciiDoc macros such as
+      # `span:publisher[...]`.
+      #
+      # Here, we need to interpolate the XML strings into the AsciiDoc macros
+      # without breaking the AsciiDoc syntax.
+      #
+      # EXAMPLE 1: `mailto:{{ pub_email }}[]`, we need to
+      # convert it to:
+      # `mailto:{{ pass-format:metanorma[++pub_email_xml++] }}[]`
+      #
+      # EXAMPLE 2: `link:{{ pub_uri}}[{{ pub_address }}, {{ pub_uri }}]`
+      # We need to convert it to:
+      # `link:{{ pass-format:metanorma[++pub_uri_xml++] }}[{{
+      # pass-format:metanorma[++pub_address_xml++] }}, {{
+      # pass-format:metanorma[++pub_uri_xml++] }}]`
+      #
+      # NOTE: The boilerplate may use macros that contain one or more
+      # `{{ ... }}` in the target, and can contain spaces in them.
+      #
+      # NOTE: The routine needs to handle cases where the content
+      # contains an escaped closing bracket `\]`.
+
+      ADOC_MACRO_PATTERN = /\S+:[^\[\n]*\[[^\]\\]*(?:\\.[^\]\\]*)*\]/
+
+      # Replace {{ ... }} with {{ pass-format:metanorma:[...] }} to preserve any
+      # XML markup provided by Metanorma XML Metadata content, through the
+      # `pass-format:metanorma` command.
+      #
+      # * If `{{ ... }}` is inside an Asciidoc macro, we have to wrap with
+      #   pass-format:metanorma:[...\].
+      # * If this is a macro target (e.g. `mailto:{{x}}[]`, body: mailto:[{{x}}])
+      #   then do not use pass-format:metanorma.
+
       def boilerplate_read(file)
         ret = File.read(file, encoding: "UTF-8")
-        /\.adoc$/.match?(file) or return ret
-        ret.split(/(#{ADOC_MACRO_START}|\])/o).map do |r|
-          if /^#{ADOC_MACRO_START}$/o.match?(r)
-            r
+        /\.adoc(\.liquid)?$/.match?(file) or return ret
+
+        # Split content into macro and non-macro parts
+        parts = ret.split(/(#{ADOC_MACRO_PATTERN})/)
+
+        parts.map.with_index do |part, index|
+          if index.odd? && is_valid_macro?(part)
+            # This is a macro - leave unchanged
+            part
           else
-            r.gsub(/(?<!\{)(\{\{[^{}]+\}\})(?!\})/,
-                   "pass-format:metanorma[++\\1++]")
+            # Not a macro - wrap {{ }} patterns
+            part.gsub(/(?<!\{)(\{\{[^{}]+\}\})(?!\})/,
+                     "pass-format:metanorma[++\\1++]")
           end
         end.join
       end
@@ -199,6 +238,13 @@ module Metanorma
         ret
       end
 
+      private
+
+      def is_valid_macro?(text)
+        # Simple validation - does it look like a macro?
+        text.match?(/^\S+:[^\[]*\[.*\]$/)
+      end
+
       # remove Metanorma namespace, so generated doc containing boilerplate
       # can be queried consistently
       # _\d+ anchor is assigned to titleless clauses, will clash with main doc

data/lib/metanorma/standoc/cleanup_maths.rb

@@ -96,7 +96,8 @@ module Metanorma
 
       def add_misc_container(xmldoc)
         unless ins = xmldoc.at("//metanorma-extension")
-          a = xmldoc.xpath("//termdocsource")&.last || xmldoc.at("//bibdata")
+          a = xmldoc.xpath("//termdocsource")&.last || xmldoc.at("//bibdata") ||
+            xmldoc.root.children.first
           a.next = "<metanorma-extension/>"
           ins = xmldoc.at("//metanorma-extension")
         end

data/lib/metanorma/standoc/converter.rb

@@ -33,6 +33,7 @@ module Metanorma
         block_macro Metanorma::Plugin::Lutaml::LutamlGmlDictionaryBlockMacro
         block Metanorma::Plugin::Lutaml::LutamlGmlDictionaryBlock
         block_macro Metanorma::Plugin::Lutaml::LutamlKlassTableBlockMacro
+        block_macro Metanorma::Plugin::Lutaml::LutamlEnumTableBlockMacro
         preprocessor Metanorma::Standoc::EmbedIncludeProcessor
         preprocessor Metanorma::Standoc::LinkProtectPreprocessor
         preprocessor Metanorma::Standoc::PassProtectPreprocessor

data/lib/metanorma/standoc/front.rb

@@ -53,13 +53,6 @@ module Metanorma
         end
       end
 
-      def metadata_committee(node, xml)
-        node.attr("technical-committee") or return
-        xml.editorialgroup do |a|
-          committee_component("technical-committee", node, a)
-        end
-      end
-
       def metadata_ics(node, xml)
         ics = node.attr("library-ics")
         ics&.split(/,\s*/)&.each do |i|
@@ -194,7 +187,6 @@ module Metanorma
         metadata_doctype(node, ext)
         metadata_subdoctype(node, ext)
         metadata_flavor(node, ext)
-        metadata_committee(node, ext)
         metadata_ics(node, ext)
         structured_id(node, ext)
         metadata_coverpage_images(node, ext)

data/lib/metanorma/standoc/front_committee.rb

@@ -0,0 +1,138 @@
+module Metanorma
+  module Standoc
+    module Front
+      def committee_number_or_name?(node, type, suffix)
+        node.attr("#{type}-number#{suffix}") || node.attr("#{type}#{suffix}")
+      end
+
+      def committee_contributors(node, xml, agency, _opts)
+        t = metadata_committee_types(node)
+        v = t.first
+        if committee_number_or_name?(node, v, "")
+          node.attr(v) or node.set_attr(v, "")
+          o = committee_contrib_org_prep(node, v, agency, _opts)
+          o[:groups] = t
+          org_contributor(node, xml, o)
+        end
+      end
+
+      def metadata_committee_types(_node)
+        %w(technical-committee)
+      end
+
+      def committee_contrib_org_prep(node, type, agency, _opts)
+        agency_arr, agency_abbrev =
+          committee_org_prep_agency(node, type, agency, [], [])
+        { source: [type], role: "author", desc: "committee",
+          default_org: false, committee: true,
+          agency: agency_arr, agency_abbrev:,
+          subdivtype: type.sub(/^approval-/, "").tr("-", " ").capitalize }.compact
+      end
+
+      def committee_org_prep_agency(node, type, agency, agency_arr, agency_abbr)
+        i = 1
+        suffix = ""
+        while committee_number_or_name?(node, type, suffix)
+          agency_arr << (node.attr("#{type}-agency#{suffix}") || agency)
+          agency_abbr << node.attr("#{type}-agency-abbr#{suffix}")
+          i += 1
+          suffix = "_#{i}"
+        end
+        [agency_arr, agency_abbr]
+      end
+
+      def contrib_committee_build(xml, agency, committee)
+        if name = org_abbrev.invert[agency]
+          committee[:agency_abbrev] = agency
+          agency = name
+        end
+        xml.name agency
+        s = committee
+        loop do
+          contrib_committee_subdiv(xml, s)
+          s = s[:subdiv] or break
+        end
+        abbr = committee[:agency_abbrev] and xml.abbreviation abbr
+        full_committee_id(xml.parent)
+      end
+
+      def contrib_committee_subdiv(xml, committee)
+        contributors_committees_filter_empty?(committee) and return
+        xml.subdivision **attr_code(type: committee[:subdivtype],
+                                    subtype: committee[:type]) do |o|
+          o.name committee[:name]
+          committee[:abbr] and o.abbreviation committee[:abbr]
+          committee[:ident] and o.identifier committee[:ident]
+        end
+      end
+
+      def full_committee_id(contrib)
+        ret = full_committee_agency_id(contrib)
+        ids = contrib.xpath("./subdivision").map do |x|
+          x.at("./identifier")&.text
+        end.compact
+        ins = contrib.at("./subdivision/identifier") and
+          ins.next = "<identifier type='full'>#{ret}#{ids.join('/')}</identifier>"
+      end
+
+      def full_committee_agency_id(contrib)
+        agency = contrib.at("./abbreviation")&.text
+        ret = agency == default_publisher ? "" : "#{agency} "
+        /^\s+/.match?(ret) and ret = ""
+        ret
+      end
+
+      def org_attrs_parse(node, opts)
+        opts_orig = opts.dup
+        ret = []
+        ret << org_attrs_parse_core(node, opts)&.map&.with_index do |x, i|
+          x.merge(agency: opts.dig(:agency, i), subdivtype: opts[:subdivtype],
+                  agency_abbrev: opts.dig(:agency_abbrev, i), abbr: opts[:abbr],
+                  committee: opts[:committee], default_org: opts[:default_org])
+        end
+        org_attrs_add_committees(node, ret, opts, opts_orig)
+      end
+
+      def org_attrs_add_committees(node, ret, opts, opts_orig)
+        opts_orig[:groups]&.each_with_index do |g, i|
+          i.zero? and next
+          contributors_committees_pad_multiples(ret.first, node, g)
+          opts = committee_contrib_org_prep(node, g, nil, opts_orig)
+          ret << org_attrs_parse_core(node, opts).map do |x|
+            x.merge(subdivtype: opts[:subdivtype])
+          end
+        end
+        contributors_committees_nest1(ret)
+      end
+
+      # ensure there is subcommittee, workgroup -number_2, -number_3 etc
+      # to parse multiple tech committees
+      def contributors_committees_pad_multiples(committees, node, group)
+        committees.each_with_index do |_r, j|
+          suffix = j.zero? ? "" : "_#{j + 1}"
+          node.attr("#{group}#{suffix}") or
+            node.set_attr("#{group}#{suffix}", "")
+          node.attr("#{group}-number#{suffix}") or
+            node.set_attr("#{group}-number#{suffix}", "")
+        end
+      end
+
+      def contributors_committees_filter_empty?(committee)
+        (committee[:name].nil? || committee[:name].empty?) &&
+          committee[:ident].nil?
+      end
+
+      def contributors_committees_nest1(committees)
+        committees.empty? and return committees
+        committees = committees.reverse
+        committees.each_with_index do |m, i|
+          i.zero? and next
+          m.each_with_index do |m1, j|
+            m1[:subdiv] = committees[i - 1][j]
+          end
+        end
+        committees[-1]
+      end
+    end
+  end
+end

data/lib/metanorma/standoc/front_contributor.rb

@@ -1,4 +1,5 @@
 require_relative "./front_organisation"
+require_relative "./front_committee"
 
 module Metanorma
   module Standoc
@@ -8,6 +9,7 @@ module Metanorma
                         { source: ["publisher", "pub"], role: "author",
                           default: default_publisher })
         personal_author(node, xml)
+        committee_contributors(node, xml, default_publisher, {})
       end
 
       def personal_author(node, xml)

data/lib/metanorma/standoc/front_organisation.rb

@@ -1,18 +1,6 @@
 module Metanorma
   module Standoc
     module Front
-      def committee_component(compname, node, out)
-        i = 1
-        suffix = ""
-        while node.attr(compname + suffix)
-          out.send compname.gsub(/-/, "_"), node.attr(compname + suffix),
-                   **attr_code(number: node.attr("#{compname}-number#{suffix}"),
-                               type: node.attr("#{compname}-type#{suffix}"))
-          i += 1
-          suffix = "_#{i}"
-        end
-      end
-
       def organization(org, orgname, node = nil, default_org = nil, attrs = {})
         orgname, abbr = org_name_and_abbrev(attrs, orgname)
         org.name orgname
@@ -147,12 +135,16 @@ module Metanorma
       end
 
       def org_organization(node, xml, org)
-        organization(xml, org[:name], node, !node.attr("publisher"), org)
-        org_address(org, xml)
-        org_logo(xml, org[:logo])
+        if org[:committee]
+          contrib_committee_build(xml, org[:agency], org)
+        else
+          organization(xml, org[:name], node, !node.attr("publisher"), org)
+          org_address(org, xml)
+          org_logo(xml, org[:logo])
+        end
       end
 
-      def org_attrs_parse(node, opts)
+      def org_attrs_parse_core(node, opts)
         source = opts[:source]&.detect { |s| node.attr(s) }
         org_attrs_simple_parse(node, opts, source) ||
           org_attrs_complex_parse(node, opts, source)
@@ -178,7 +170,7 @@ module Metanorma
         i = 1
         suffix = ""
         ret = []
-        while node.attr(source + suffix)
+        while committee_number_or_name?(node, source, suffix)
           ret << extract_org_attrs_complex(node, opts, source, suffix)
           i += 1
           suffix = "_#{i}"
@@ -187,14 +179,28 @@ module Metanorma
       end
 
       def extract_org_attrs_complex(node, opts, source, suffix)
-        { name: node.attr(source + suffix),
+        n = node.attr("#{source}-number#{suffix}") # for committees
+        t = committee_ident(node.attr("#{source}-type#{suffix}"), n, source)
+        { name: node.attr(source + suffix), ident: t,
           abbrev: node.attr("#{source}_abbr#{suffix}"),
           role: opts[:role], desc: opts[:desc],
+          type: node.attr("#{source}-type#{suffix}"),
           subdiv: node.attr("#{source}_subdivision#{suffix}"),
           logo: node.attr("#{source}_logo#{suffix}") }.compact
           .merge(extract_org_attrs_address(node, opts, suffix))
       end
 
+      def committee_abbrevs
+        { "technical-committee" => "TC" }
+      end
+
+      def committee_ident(type, number, level)
+        number.nil? || number.empty? and return
+        type ||= committee_abbrevs[level]
+        type == "Other" and type = ""
+        "#{type} #{number}".strip
+      end
+
       def extract_org_attrs_address(node, opts, suffix)
         %w(address phone fax email uri).each_with_object({}) do |a, m|
           opts[:source]&.each do |s|

data/lib/metanorma/standoc/isodoc.rng

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-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">
-<!-- VERSION v2.1.0 -->
+<!-- VERSION v2.1.1 -->
 
   <!--
     ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437
@@ -2233,6 +2233,11 @@ used in document amendments</a:documentation>
       <ref name="RequiredId"/>
       <ref name="NumberingAttributes"/>
       <ref name="BlockAttributes"/>
+      <optional>
+        <attribute name="type">
+          <a:documentation>Semantic classification of note</a:documentation>
+        </attribute>
+      </optional>
       <oneOrMore>
         <choice>
           <a:documentation>Content of the term note</a:documentation>

data/lib/metanorma/standoc/ref_queue.rb

@@ -131,7 +131,7 @@ module Metanorma
 
       def fetch_ref(xml, code, year, **opts)
         opts[:no_year] and return nil
-        code = code.sub(/^\([^)]+\)/, "")
+        _, code = extract_balanced_parentheses(code)
         hit = fetch_ref1(code, year, opts) or return nil
         xml.parent.add_child(smart_render_xml(hit, code, opts))
         xml

data/lib/metanorma/standoc/ref_utility.rb

@@ -42,7 +42,7 @@ module Metanorma
       end
 
       def docid(bib, code, codetype = nil)
-        type, code1 = if /^\[\d+\]$|^\([^)]+\).*$/.match?(code)
+        type, code1 = if /^\[\d+\]$|^\(.+\).*$/.match?(code)
                         ["metanorma", mn_code(code)]
                       elsif %w(attachment repo path).include?(codetype)
                         [nil, code]
@@ -62,7 +62,10 @@ module Metanorma
       end
 
       def mn_code(code)
-        code.sub(/^\(/, "[").sub(/^([^)]+)\).*$/, "\\1]")
+        # Handle balanced parentheses at the start of the string
+        balance, remainder = extract_balanced_parentheses(code)
+        balance and return "[#{balance}]"
+        remainder
           .sub(/^dropid\((.+)\)$/, "\\1")
           .sub(/^hidden\((.+)\)$/, "\\1")
           .sub(/^nofetch\((.+)\)$/, "\\1")
@@ -218,6 +221,28 @@ module Metanorma
           @type = 'DOI' or @type = 'doi' or @type = 'ISSN' or @type = 'issn' or @type = 'ISBN' or @type = 'isbn' or starts-with(@type, 'ISSN.') or starts-with(@type, 'ISBN.') or starts-with(@type, 'issn.') or starts-with(@type, 'isbn.')
         XPATH
       end
+
+      private
+
+      def extract_balanced_parentheses(code)
+        code.start_with?("(") or return [nil, code]
+        paren_count = 0
+        # Find the matching closing parenthesis
+        code.each_char.with_index do |char, index|
+          case char
+          when "(" then paren_count += 1
+          when ")"
+            paren_count -= 1
+            paren_count.zero? or next
+            # Found the matching closing parenthesis
+            content = code[1...index] # Extract content between parentheses
+            remaining = code[(index + 1)..] || "" # Get remaining string
+            return [content, remaining]
+          end
+        end
+        # If we get here, parentheses are unbalanced - return original
+        [nil, code]
+      end
     end
   end
 end

data/lib/metanorma/standoc/regex.rb

@@ -52,27 +52,28 @@ module Metanorma
 
       ISO_REF =
         %r{^<ref\sid="(?<anchor>[^"]+)">
-      \[(?<usrlbl>\([^)]+\))?(?<code>(?:ISO|IEC)[^0-9]*\s[0-9-]+|IEV)
+      \[(?<usrlbl>\(.+\))?(?<code>(?:ISO|IEC)[^0-9]*\s[0-9-]+|IEV)
       (?::(?<year>[0-9][0-9-]+))?\]</ref>,?\s*(?<text>.*)$}xm
 
       ISO_REF_NO_YEAR =
         %r{^<ref\sid="(?<anchor>[^"]+)">
-      \[(?<usrlbl>\([^)]+\))?(?<code>(?:ISO|IEC)[^0-9]*\s[0-9-]+):
+      \[(?<usrlbl>\(.+\))?(?<code>(?:ISO|IEC)[^0-9]*\s[0-9-]+):
       (?:--|–|—|&\#821[12];)\]</ref>,?\s*
         (?:<fn[^>]*>\s*<p>(?<fn>[^\]]+)</p>\s*</fn>)?,?\s?(?<text>.*)$}xm
 
       ISO_REF_ALL_PARTS =
         %r{^<ref\sid="(?<anchor>[^"]+)">
-      \[(?<usrlbl>\([^)]+\))?(?<code>(?:ISO|IEC)[^0-9]*\s[0-9]+)
+      \[(?<usrlbl>\(.+\))?(?<code>(?:ISO|IEC)[^0-9]*\s[0-9]+)
       (?::(?<year>--|–|—|&\#821[12];|[0-9][0-9-]+))?\s
       \(all\sparts\)\]</ref>,?\s*
         (?:<fn[^>]*>\s*<p>(?<fn>[^\]]+)</p>\s*</fn>,?\s?)?(?<text>.*)$}xm
 
+      # These regexes allow () inside usrlbl but not inside code
       NON_ISO_REF = %r{^<ref\sid="(?<anchor>[^"]+)">
-      \[(?<usrlbl>\([^)]+\))?(?<code>.+?)\]</ref>,?\s*(?<text>.*)$}xm
+      \[(?<usrlbl>\(.+\))?(?<code>.+?)\]</ref>,?\s*(?<text>.*)$}xm
 
       NON_ISO_REF1 = %r{^<ref\sid="(?<anchor>[^"]+)">
-      (?<usrlbl>\([^)]+\))?(?<code>.+?)</ref>,?\s*(?<text>.*)$}xm
+      (?<usrlbl>\(.+\))?(?<code>.+?)</ref>,?\s*(?<text>.*)$}xm
     end
   end
 end

data/lib/metanorma/standoc/sectiontype.rb

@@ -73,6 +73,7 @@ module Metanorma
       end
 
       def preface_main_filter(ret, node)
+        node.level > 1 and return ret
         start_main_section(ret, node)
         @preface && self.class::MAIN_CLAUSE_NAMES.include?(ret) and return nil
         !@preface && self.class::PREFACE_CLAUSE_NAMES.include?(ret) and

data/lib/metanorma/standoc/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "3.1.3".freeze
+    VERSION = "3.1.4".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 3.1.3
+  version: 3.1.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-08-04 00:00:00.000000000 Z
+date: 2025-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -519,6 +519,7 @@ files:
 - lib/metanorma/standoc/datamodel/diagram_preprocessor.rb
 - lib/metanorma/standoc/datamodel/plantuml_renderer.rb
 - lib/metanorma/standoc/front.rb
+- lib/metanorma/standoc/front_committee.rb
 - lib/metanorma/standoc/front_contributor.rb
 - lib/metanorma/standoc/front_organisation.rb
 - lib/metanorma/standoc/init.rb