metanorma-iso 2.3.3 → 2.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0647a3daea24684073cb1e71bfbf231e56357153263b8722aad8bae15198743
-  data.tar.gz: 5ba4f09cba4bfe26b99f001b001cda9884df2bea21d8f81a8807df8528dcd2b2
+  metadata.gz: ec56973b9086f25dbaeeb4ec2561b59357fb180a912b7b4a81870c5432e81fb8
+  data.tar.gz: 9828d23dd60b3ea444e9a23c2ef7caf7e6d819e42090812e5ab22384339794a4
 SHA512:
-  metadata.gz: 45a6c71aafc32fdb25ea35bfa95d5381a81ae5e21d2888d9ba65fb5c2789d7e770bb20cdf35765755251d725d6d84ffa7a85563d58acf216d0530f700b19f0ba
-  data.tar.gz: a77b5942e043bce247b7911746f7a7dd2ffc949761c22d696686ca4a9d8872835030b1cab3c833d277814cee24cb8e0d4c019f6f99d3f1bd960ab7ad7705d43b
+  metadata.gz: cff4f259add1f02c6915c4b013150529523a5f4e9b3c6e285061a1e8ae1205d183cc00fdadfb90ecddde9446b29f5350b8d1f1c02c4bef1106111de6065e35c4
+  data.tar.gz: df7ca4b80cfad19b2171dc8eab675ebd8fb19b244ffdcb889325e9c31f835cd375d3cd2b849ca68e578078a2a80a54b7fc0eb485aff9c6fcc4d221eebfce7580

data/lib/isodoc/iso/base_convert.rb

@@ -180,6 +180,7 @@ module IsoDoc
 
       def indexsect(isoxml, out)
         isoxml.xpath(ns("//indexsect")).each do |i|
+          page_break(out)
           clause_parse(i, out)
         end
       end

data/lib/isodoc/iso/html/html_iso_titlepage.html

@@ -19,7 +19,7 @@
 <p class="coverpage_docnumber">{{ docnumber_undated }} {{ draftinfo }}</p>
 {% endif %}
 
-<p class="coverpage_techcommittee">{{ agency }}/{{ editorialgroup | join: "/" }}</p>
+<p class="coverpage_techcommittee">{{ editorialgroup }}</p>
 
 {% if secretariat %}
 <p class="coverpage_techcommittee"><a

data/lib/isodoc/iso/html/word_iso_titlepage-dis.html

@@ -20,7 +20,7 @@
 
 <p class="zzCover" style='font-weight:normal;'><span lang="EN-GB">Reference number of project: {{ docnumber_undated }}{% if draftinfo %} {{ draftinfo }}{% endif %}</span></p>
 
-<p class="zzCover" style='font-weight:normal;'><span lang="EN-GB">Committee identification: {{ agency }}/{{ approvalgroup | join: "/" }}</span></p>
+<p class="zzCover" style='font-weight:normal;'><span lang="EN-GB">Committee identification: {{ approvalgroup }}</span></p>
 
 <!--
 {% if doctitleamdlabel %}

data/lib/isodoc/iso/html/word_iso_titlepage-prf.html

@@ -14,7 +14,7 @@
 <p class="zzCover" align="right" style='text-align:right'><span lang="EN-GB">Date: <span style='mso-no-proof:yes'><b>{{ doc_date }}</b></span></span></p>
 {% endif %}
 
-<p class="zzCover" style='font-weight:normal;'><span lang="EN-GB">{{agency}}/{{ editorialgroup | join: "/" }}</span></p>
+<p class="zzCover" style='font-weight:normal;'><span lang="EN-GB">{{ editorialgroup}}</span></p>
 
 <!--
 {% if doctitleamdlabel %}

data/lib/isodoc/iso/html/word_iso_titlepage.html

@@ -23,7 +23,7 @@ style='mso-bidi-font-weight:normal'><span lang="EN-GB" style='font-size:14.0pt'>
 {% endif %}
 
 <p class="MsoNormal" align="right" style='text-align:right'><span lang="EN-GB"
-style='mso-no-proof:yes'>{{ agency }}&#xa0;{{ editorialgroup | join: "/" }}</span></p>
+style='mso-no-proof:yes'>{{ editorialgroup }}</span></p>
 
 {% if secretariat %}
 <p class="MsoNormal" align="right" style='text-align:right'><span lang="EN-GB">{{ labels["secretariat"] }}: <span style='mso-no-proof:yes'>{{ secretariat }}</span></span></p>

data/lib/isodoc/iso/metadata.rb

@@ -6,7 +6,6 @@ module IsoDoc
       def initialize(lang, script, locale, i18n)
         super
         DATETYPES.each { |w| @metadata["#{w.gsub(/-/, '_')}date".to_sym] = nil }
-        set(:editorialgroup, [])
         set(:obsoletes, nil)
         set(:obsoletes_part, nil)
       end
@@ -100,7 +99,7 @@ module IsoDoc
         main = ""
         tparts[:main].nil? or
           main = @c.encode(tparts[:main].text, :hexadecimal)
-        tparts[:intro] &&
+        tparts[:intro] and
           main = "#{@c.encode(tparts[:intro].text,
                               :hexadecimal)} — #{main}"
         if tparts[:part]
@@ -119,20 +118,19 @@ module IsoDoc
       end
 
       def title_parts(isoxml, lang)
-        { intro: isoxml.at(ns("//bibdata/title[@type='title-intro' and "\
+        { intro: isoxml.at(ns("//bibdata/title[@type='title-intro' and " \
                               "@language='#{lang}']")),
-          main: isoxml.at(ns("//bibdata/title[@type='title-main' and "\
+          main: isoxml.at(ns("//bibdata/title[@type='title-main' and " \
                              "@language='#{lang}']")),
-          part: isoxml.at(ns("//bibdata/title[@type='title-part' and "\
+          part: isoxml.at(ns("//bibdata/title[@type='title-part' and " \
                              "@language='#{lang}']")),
-          amd: isoxml.at(ns("//bibdata/title[@type='title-amd' and "\
+          amd: isoxml.at(ns("//bibdata/title[@type='title-amd' and " \
                             "@language='#{lang}']")) }
       end
 
       def title(isoxml, _out)
         lang = case @lang
-               when "fr" then "fr"
-               when "ru" then "ru"
+               when "fr", "ru" then @lang
                else "en"
                end
         # intro, main, part, amd = title_parts(isoxml, lang)
@@ -179,58 +177,57 @@ module IsoDoc
         tc(xml)
         sc(xml)
         wg(xml)
-        approvalgroup(xml)
+        editorialgroup(xml)
         secretariat(xml)
       end
 
       def tc(xml)
         tcid = tc_base(xml, "editorialgroup") or return
         set(:tc, tcid)
-        set(:editorialgroup, get[:editorialgroup] << tcid)
       end
 
       def tc_base(xml, grouptype)
-        tc_num = xml.at(ns("//bibdata/ext/#{grouptype}/"\
+        tc_num = xml.at(ns("//bibdata/ext/#{grouptype}/" \
                            "technical-committee/@number")) or return nil
-        tc_type = xml.at(ns("//bibdata/ext/#{grouptype}/technical-committee/"\
+        tc_type = xml.at(ns("//bibdata/ext/#{grouptype}/technical-committee/" \
                             "@type"))&.text || "TC"
-        "#{tc_type} #{tc_num.text}"
+        tc_type == "Other" and tc_type = ""
+        "#{tc_type} #{tc_num.text}".strip
       end
 
       def sc(xml)
         scid = sc_base(xml, "editorialgroup") or return
         set(:sc, scid)
-        set(:editorialgroup, get[:editorialgroup] << scid)
       end
 
       def sc_base(xml, grouptype)
-        sc_num = xml.at(ns("//bibdata/ext/#{grouptype}/subcommittee/"\
+        sc_num = xml.at(ns("//bibdata/ext/#{grouptype}/subcommittee/" \
                            "@number")) or return nil
-        sc_type = xml.at(ns("//bibdata/ext/#{grouptype}/subcommittee/"\
+        sc_type = xml.at(ns("//bibdata/ext/#{grouptype}/subcommittee/" \
                             "@type"))&.text || "SC"
+        sc_type == "Other" and sc_type = ""
         "#{sc_type} #{sc_num.text}"
       end
 
       def wg(xml)
         wgid = wg_base(xml, "editorialgroup") or return
         set(:wg, wgid)
-        set(:editorialgroup, get[:editorialgroup] << wgid)
       end
 
       def wg_base(xml, grouptype)
-        wg_num = xml.at(ns("//bibdata/ext/#{grouptype}/workgroup/"\
+        wg_num = xml.at(ns("//bibdata/ext/#{grouptype}/workgroup/" \
                            "@number")) or return
-        wg_type = xml.at(ns("//bibdata/ext/#{grouptype}/workgroup/"\
+        wg_type = xml.at(ns("//bibdata/ext/#{grouptype}/workgroup/" \
                             "@type"))&.text || "WG"
+        wg_type == "Other" and wg_type = ""
         "#{wg_type} #{wg_num.text}"
       end
 
-      def approvalgroup(xml)
-        ag = tc_base(xml, "approvalgroup") or return
-        ret = [ag]
-        ret << sc_base(xml, "approvalgroup")
-        ret << wg_base(xml, "approvalgroup")
-        set(:approvalgroup, ret.compact)
+      def editorialgroup(xml)
+        a = xml.at(ns("//bibdata/ext/editorialgroup/@identifier")) and
+          set(:editorialgroup, a.text)
+        a = xml.at(ns("//bibdata/ext/approvalgroup/@identifier")) and
+          set(:approvalgroup, a.text)
       end
 
       def secretariat(xml)

data/lib/isodoc/iso/presentation_bibdata.rb

@@ -49,10 +49,16 @@ module IsoDoc
         agency = group.xpath(ns("./agency"))&.map(&:text)
         ret = %w(technical-committee subcommittee workgroup)
           .each_with_object([]) do |v, m|
-          a = group.at(ns("./#{v}")) or next
-          m << "#{a['type']} #{a['number']}"
+          m << editorialgroup_identifier2(group, v)
         end
-        group["identifier"] = (agency + ret).join("/")
+        group["identifier"] = (agency + ret.compact).join("/")
+      end
+
+      def editorialgroup_identifier2(group, level)
+        a = group.at(ns("./#{level}")) or return nil
+        type = a["type"]
+        type&.casecmp("other")&.zero? and type = ""
+        "#{type} #{a['number']}".strip
       end
 
       def bibdata_i18n(bib)

data/lib/isodoc/iso/presentation_xml_convert.rb

@@ -96,7 +96,8 @@ module IsoDoc
       def concept_term(docxml)
         docxml.xpath(ns("//term")).each do |f|
           m = {}
-          f.xpath(ns(".//concept")).each { |c| concept_term1(c, m) }
+          (f.xpath(ns(".//concept")) - f.xpath(ns(".//term//concept")))
+            .each { |c| concept_term1(c, m) }
         end
       end
 
@@ -113,11 +114,13 @@ module IsoDoc
       end
 
       def concept1_ref_content(ref)
-        repl = if ref.name == "termref"
-                 @i18n.term_defined_in.sub(/%/, to_xml(ref))
-               else "(#{to_xml(ref)})"
-               end
-        ref.replace(repl)
+        prev = "("
+        foll = ")"
+        if ref.name == "termref"
+          prev, foll = @i18n.term_defined_in.split("%")
+        end
+        ref.previous = prev
+        ref.next = foll
       end
 
       def concept1(node)
@@ -128,7 +131,6 @@ module IsoDoc
 
       # we're assuming terms and clauses in the right place for display,
       # to cope with multiple terms sections
-
       def display_order(docxml)
         i = 0
         i = display_order_xpath(docxml, "//preface/*", i)
@@ -157,8 +159,7 @@ module IsoDoc
 
       def insertall_after_here(node, insert, name)
         node.children.each do |n|
-          next unless n.name == name
-
+          n.name == name or next
           insert.next = n.remove
           insert = n
         end
@@ -166,8 +167,7 @@ module IsoDoc
       end
 
       def termexamples_before_termnotes(node)
-        return unless insert = node.at(ns("./definition"))
-
+        insert = node.at(ns("./definition")) or return
         insert = insertall_after_here(node, insert, "termexample")
         insertall_after_here(node, insert, "termnote")
       end
@@ -181,11 +181,9 @@ module IsoDoc
 
       def admonition1(elem)
         super
-        return unless n = elem.at(ns("./name"))
-
+        n = elem.at(ns("./name")) or return
         p = n.next_element
-        return unless p.name == "p"
-
+        p.name == "p" or return
         p.children.first.previous = admonition_name(to_xml(n.remove.children))
       end
 
@@ -199,8 +197,7 @@ module IsoDoc
       end
 
       def bibrender_formattedref(formattedref, xml)
-        return if %w(techreport standard).include? xml["type"]
-
+        %w(techreport standard).include? xml["type"] and return
         super
       end
 

data/lib/metanorma/iso/basicdoc.rng

@@ -522,7 +522,6 @@
       <value>tip</value>
       <value>important</value>
       <value>caution</value>
-      <value>statement</value>
     </choice>
   </define>
   <define name="figure">

data/lib/metanorma/iso/cleanup.rb

@@ -44,14 +44,18 @@ module Metanorma
       # ISO as a prefix goes first
       def docidentifier_cleanup(xmldoc)
         prefix = get_id_prefix(xmldoc)
+=begin
         id = xmldoc.at("//bibdata/docidentifier[@type = 'ISO']") or return
         id.content = id_prefix(prefix, id)
+=end
         id = xmldoc.at("//bibdata/ext/structuredidentifier/project-number") and
           id.content = id_prefix(prefix, id)
+=begin
         %w(iso-with-lang iso-reference iso-undated).each do |t|
           id = xmldoc.at("//bibdata/docidentifier[@type = '#{t}']") and
             id.content = id_prefix(prefix, id)
         end
+=end
       end
 
       def format_ref(ref, type)

data/lib/metanorma/iso/front.rb

@@ -12,12 +12,27 @@ module Metanorma
       def metadata_ext(node, xml)
         super
         structured_id(node, xml)
-        xml.stagename stage_name(get_stage(node), get_substage(node),
-                                 doctype(node), node.attr("iteration"))
+        id = iso_id_default(iso_id_params(node))
+        id.stage and
+          xml.stagename metadata_stagename(id)&.strip,
+                        **attr_code(abbreviation: id.typed_stage_abbrev&.strip)
         @amd && a = node.attr("updates-document-type") and
           xml.updates_document_type a
       end
 
+      def metadata_stagename(id)
+        if @amd
+          id.amendments&.first&.stage&.name ||
+            id.corrigendums&.first&.stage&.name
+        else
+          begin
+            id.typed_stage_name
+          rescue StandardError
+            id.stage&.name
+          end
+        end
+      end
+
       def metadata_subdoctype(node, xml)
         super
         a = node.attr("horizontal") and xml.horizontal a
@@ -32,7 +47,7 @@ module Metanorma
         publishers = node.attr("publisher") || "ISO"
         csv_split(publishers).each do |p|
           xml.contributor do |c|
-            c.role **{ type: "author" }
+            c.role type: "author"
             c.organization do |a|
               organization(a, p, false, node, !node.attr("publisher"))
             end
@@ -44,7 +59,7 @@ module Metanorma
         publishers = node.attr("publisher") || "ISO"
         csv_split(publishers).each do |p|
           xml.contributor do |c|
-            c.role **{ type: "publisher" }
+            c.role type: "publisher"
             c.organization do |a|
               organization(a, p, true, node, !node.attr("publisher"))
             end
@@ -73,8 +88,9 @@ module Metanorma
       def metadata_status(node, xml)
         stage = get_stage(node)
         substage = get_substage(node)
+        abbrev = iso_id_default(iso_id_params(node)).stage&.abbr
         xml.status do |s|
-          s.stage stage, **attr_code(abbreviation: cover_stage_abbr(node))
+          s.stage stage, **attr_code(abbreviation: abbrev)
           s.substage substage
           node.attr("iteration") && (s.iteration node.attr("iteration"))
         end

data/lib/metanorma/iso/front_id.rb

@@ -34,153 +34,158 @@ module Metanorma
         "95": "Withdrawal",
       }.freeze
 
-      def stage_abbr(stage, substage, doctype)
+      def stage_abbr(stage, substage, _doctype)
         return nil if stage.to_i > 60
 
         ret = STAGE_ABBRS[stage.to_sym]
         ret = "PRF" if stage == "60" && substage == "00"
+        ret = nil if stage == "60" && substage != "00"
         ret = "AWI" if stage == "10" && substage == "99"
         ret = "AWI" if stage == "20" && substage == "00"
-        if %w(amendment technical-corrigendum technical-report
-              technical-specification).include?(doctype)
-          ret = "D" if stage == "40" && doctype == "amendment"
-          ret = "FD" if stage == "50" && %w(amendment technical-corrigendum)
-            .include?(doctype)
-        end
-        ret
-      end
-
-      def stage_name(stage, substage, _doctype, iteration = nil)
-        return "Proof" if stage == "60" && substage == "00"
-
-        ret = STAGE_NAMES[stage.to_sym]
-        if iteration && %w(20 30).include?(stage)
-          prefix = iteration.to_i.localize(@lang.to_sym)
-            .to_rbnf_s("SpelloutRules", "spellout-ordinal")
-          ret = "#{prefix.capitalize} #{ret.downcase}"
-        end
         ret
       end
 
       def metadata_id(node, xml)
         iso_id(node, xml)
-        node&.attr("tc-docnumber")&.split(/,\s*/)&.each do |n|
+        node.attr("tc-docnumber")&.split(/,\s*/)&.each do |n|
           xml.docidentifier(n, **attr_code(type: "iso-tc"))
         end
         xml.docnumber node&.attr("docnumber")
       end
 
+      # @param type [nil, :tr, :ts, :amd, :cor, :guide, :dir, :tc, Type]
+      # document's type, eg. :tr, :ts, :amd, :cor, Type.new(:tr)
+      def get_typeabbr(node, amd: false)
+        node.attr("amendment-number") and return :amd
+        node.attr("corrigendum-number") and return :cor
+        case doctype(node)
+        when "directive" then :dir
+        when "technical-report" then :tr
+        when "technical-specification" then :ts
+        when "guide" then :guide
+        end
+      end
+
       def iso_id(node, xml)
         (!@amd && node.attr("docnumber")) || (@amd && node.attr("updates")) or
           return
-        dn = id_stage_prefix(iso_id1(node), node)
-        dns = [id_year(dn, node, mode: :default),
-               id_year(dn, node, mode: :force),
-               id_year(dn, node, mode: :strip)]
-        iso_id_out(node, xml, dns)
+        params = iso_id_params(node)
+        iso_id_out(xml, params, true)
       end
 
-      def iso_id_out(node, xml, dns)
-        xml.docidentifier dns[0], **attr_code(type: "ISO")
-        xml.docidentifier dns[2], **attr_code(type: "iso-undated")
-        xml.docidentifier(id_langsuffix(dns[0], node),
-                          **attr_code(type: "iso-with-lang"))
-        xml.docidentifier(id_langsuffix(dns[1], node),
-                          **attr_code(type: "iso-reference"))
+      def iso_id_params(node)
+        params = iso_id_params_core(node)
+        params2 = iso_id_params_add(node)
+        if node.attr("updates")
+          orig_id = Pubid::Iso::Identifier::Base.parse(node.attr("updates"))
+          orig_id.edition ||= 1
+        end
+        iso_id_params_resolve(params, params2, node, orig_id)
+      end
+
+      # unpublished is for internal use
+      def iso_id_params_core(node)
+        pub = (node.attr("publisher") || "ISO").split(/[;,]/)
+        ret = { number: node.attr("docnumber"),
+                part: node.attr("partnumber"),
+                language: node.attr("language") || "en",
+                type: get_typeabbr(node),
+                publisher: pub[0],
+                unpublished: /^[0-5]/.match?(get_stage(node)),
+                copublisher: pub[1..-1] }.compact
+        ret[:copublisher].empty? and ret.delete(:copublisher)
+        ret
       end
 
-            def get_typeabbr(node, amd: false)
-        case doctype(node)
-        when "directive" then "DIR "
-        when "technical-report" then "TR "
-        when "technical-specification" then "TS "
-        when "amendment" then (amd ? "Amd " : "")
-        when "technical-corrigendum" then (amd ? "Cor " : "")
-        end
+      def iso_id_params_add(node)
+        stage = iso_id_stage(node)
+
+        ret = { number: node.attr("amendment-number") ||
+          node.attr("corrigendum-number"),
+                year: iso_id_year(node),
+                iteration: node.attr("iteration") }.compact
+        stage and ret[:stage] = stage
+        ret[:stage] == "60.00" and ret[:stage] = :PRF
+        ret
       end
 
-=begin
-def get_typeabbr(node, amd: false)
-        case doctype(node)
-        when "directive" then "DIR"
-        when "technical-report" then "TR"
-        when "technical-specification" then "TS"
-        else nil
+      def iso_id_stage(node)
+        stage = stage_abbr(get_stage(node), get_substage(node),
+                           doctype(node))
+        harmonised = "#{get_stage(node)}.#{get_substage(node)}"
+        harmonised = nil unless /^\d\d\.\d\d/.match?(harmonised)
+        { abbr: stage&.to_sym, harmonized_code: harmonised }
+        harmonised || stage&.to_sym
+      end
+
+      def iso_id_year(node)
+        node.attr("copyright-year") || node.attr("updated-date")
+          &.sub(/-.*$/, "") || Date.today.year
+      end
+
+      def iso_id_params_resolve(params, params2, node, orig_id)
+        if orig_id && (node.attr("amendment-number") ||
+            node.attr("corrigendum-number"))
+          params.delete(:unpublished)
+          params.delete(:part)
+          params2[:base] = orig_id
         end
+        params.merge!(params2)
+        params
       end
 
-      def iso_id(node, xml)
-        (!@amd && node.attr("docnumber")) || (@amd && node.attr("updates")) or
-          return
-        stage = id_stage_abbr(get_stage(node), get_substage(node), node, true)&.strip
-        stage = nil if %w{IS (Review) (Withdrwal)}.include?(stage.strip)
-          urn_stage = "#{get_stage(node)}.#{get_substage(node)}"
-pub =  (node.attr("publisher") || "ISO").split(/[;,]/)
-        params = {
-          number: node.attr("docnumber"), # (@amd ? node.attr("updates") : node.attr("docnumber")),
-          part: node.attr("partnumber"),
-          language: node.attr("language") || "en",
-          type: get_typeabbr(node),
-          year: node.attr("copyright-year") || node.attr("updated-date")&.sub(/-.*$/, ""),
-          publisher: pub[0],
-          copublisher: pub[1..-1],
-        }.compact
-        if a = node.attr("amendment-number")
-          params[:amendments] = { number: a, stage: stage }
-          elsif a = node.attr("corrigendum-number")
-          params[:corrigendums] = { number: a, stage: stage }
-          else
-            params.merge!( { stage: stage, urn_stage: urn_stage }.compact )
-          end
-        iso_id_out(xml, params)
+      def iso_id_out(xml, params, with_prf)
+        xml.docidentifier iso_id_default(params).to_s(with_prf: with_prf),
+                          **attr_code(type: "ISO")
+        xml.docidentifier iso_id_reference(params)
+          .to_s(format: :ref_num_long, with_prf: with_prf),
+                          **attr_code(type: "iso-reference")
+        xml.docidentifier iso_id_reference(params).urn, **attr_code(type: "URN")
+        return if @amd
+
+        xml.docidentifier iso_id_undated(params).to_s(with_prf: with_prf),
+                          **attr_code(type: "iso-undated")
+        xml.docidentifier iso_id_with_lang(params)
+          .to_s(format: :ref_num_short, with_prf: with_prf),
+                          **attr_code(type: "iso-with-lang")
+      rescue StandardError => e
+        clean_abort("Document identifier: #{e}", xml)
       end
 
-      def iso_id_out(xml, params)
+      def iso_id_default(params)
         params_nolang = params.dup.tap { |hs| hs.delete(:language) }
-        unpub = /^[0-5]/.match?(params[:urn_stage])
-        params1 = unpub ? params_nolang.dup.tap { |hs| hs.delete(:year) } : params_nolang
-        xml.docidentifier Pubid::Iso::Identifier.new(**params1), **attr_code(type: "ISO")
-        params2 = params_nolang.dup.tap { |hs| hs.delete(:year) }
-        xml.docidentifier Pubid::Iso::Identifier.new(**params2), **attr_code(type: "iso-undated")
-        params1 = unpub ? params.dup.tap { |hs| hs.delete(:year) } : params
-        xml.docidentifier(Pubid::Iso::Identifier.new(**params1),
-                          **attr_code(type: "iso-with-lang"))
-        warn params
-        warn "Generated: #{Pubid::Iso::Identifier.new(**params).to_s}"
-        xml.docidentifier(Pubid::Iso::Identifier.new(**params),
-                          **attr_code(type: "iso-reference"))
+        params1 = if params[:unpublished]
+                    params_nolang.dup.tap do |hs|
+                      hs.delete(:year)
+                    end
+                  else params_nolang
+                  end
+        params1.delete(:unpublished)
+        Pubid::Iso::Identifier.create(**params1)
       end
-=end
 
-      def iso_id1(node)
-        if @amd
-          dn = node.attr("updates")
-          add_amd_parts(dn, node)
-        else
-          part, subpart = node&.attr("partnumber")&.split(/-/)
-          add_id_parts(node.attr("docnumber"), part, subpart)
+      def iso_id_undated(params)
+        params_nolang = params.dup.tap { |hs| hs.delete(:language) }
+        params2 = params_nolang.dup.tap do |hs|
+          hs.delete(:year)
+          hs.delete(:unpublished)
         end
+        Pubid::Iso::Identifier.create(**params2)
       end
 
-      def add_amd_parts(docnum, node)
-        case doctype(node)
-        when "amendment"
-          "#{docnum}/Amd #{node.attr('amendment-number')}"
-        when "technical-corrigendum"
-          "#{docnum}/Cor.#{node.attr('corrigendum-number')}"
-        end
+      def iso_id_with_lang(params)
+        params1 = if params[:unpublished]
+                    params.dup.tap do |hs|
+                      hs.delete(:year)
+                    end
+                  else params end
+        params1.delete(:unpublished)
+        Pubid::Iso::Identifier.create(**params1)
       end
 
-      def id_langsuffix(docnum, node)
-        lang = node.attr("language") || "en"
-        suffix = case lang
-                 when "en" then "(E)"
-                 when "fr" then "(F)"
-                 when "ru" then "(R)"
-                 else
-                   "(X)"
-                 end
-        "#{docnum}#{suffix}"
+      def iso_id_reference(params)
+        params1 = params.dup.tap { |hs| hs.delete(:unpublished) }
+        Pubid::Iso::Identifier.create(**params1)
       end
 
       def structured_id(node, xml)
@@ -197,83 +202,6 @@ pub =  (node.attr("publisher") || "ISO").split(/[;,]/)
         end
       end
 
-      def add_id_parts(docnum, part, subpart)
-        docnum += "-#{part}" if part
-        docnum += "-#{subpart}" if subpart
-        docnum
-      end
-
-      def id_stage_abbr(stage, substage, node, bare = false)
-        ret = id_stage_abbr1(stage, substage, node, bare)
-        if %w(amendment technical-corrigendum technical-report
-              technical-specification).include?(doctype(node)) &&
-            !%w(D FD).include?(ret)
-          ret = "#{ret} "
-        end
-        ret
-      end
-
-      def id_stage_abbr1(stage, substage, node, bare)
-        if bare
-          IsoDoc::Iso::Metadata.new("en", "Latn", nil, @i18n)
-            .status_abbrev(stage_abbr(stage, substage, doctype(node)),
-                           substage, nil, nil, doctype(node))
-        else
-          IsoDoc::Iso::Metadata.new("en", "Latn", nil, @i18n)
-            .status_abbrev(stage_abbr(stage, substage, doctype(node)),
-                           substage, node.attr("iteration"),
-                           node.attr("draft"), doctype(node))
-        end
-      end
-
-      def cover_stage_abbr(node)
-        stage = get_stage(node)
-        abbr = id_stage_abbr(get_stage(node), get_substage(node), node, true)
-        typeabbr = get_typeabbr(node, amd: true)
-        if stage.to_i > 50 || (stage.to_i == 60 && get_substage(node).to_i < 60)
-          typeabbr = ""
-        end
-        "#{abbr}#{typeabbr}".strip
-      end
-
-      def id_stage_prefix(docnum, node)
-        stage = get_stage(node)
-        typeabbr = get_typeabbr(node)
-        if stage && (stage.to_i < 60)
-          docnum = unpub_stage_prefix(docnum, stage, typeabbr, node)
-        elsif typeabbr == "DIR " then docnum = "#{typeabbr}#{docnum}"
-        elsif typeabbr && !@amd then docnum = "/#{typeabbr}#{docnum}"
-        end
-        docnum
-      end
-
-      def id_year(docnum, node, mode: :default)
-        case mode
-        when :strip then docnum.sub(/:(19|20)\d\d(?!\d)/, "")
-        when :force then id_add_year(docnum, node)
-        else
-          stage = get_stage(node)
-          if stage && (stage.to_i < 60)
-            docnum
-          else id_add_year(docnum, node)
-          end
-        end
-      end
-
-      def unpub_stage_prefix(docnum, stage, typeabbr, node)
-        abbr = id_stage_abbr(stage, get_substage(node), node)
-        %w(40 50).include?(stage) && i = node.attr("iteration") and
-          itersuffix = ".#{i}"
-        return docnum if abbr.nil? || abbr.empty? # prefixes added in cleanup
-
-        typeabbr = "" if %w(DTS FDTS).include?(abbr.sub(/\s+$/, ""))
-        return "/#{abbr}#{typeabbr} #{docnum}#{itersuffix}" unless @amd
-
-        a = docnum.split(%r{/})
-        a[-1] = "#{abbr}#{a[-1]}#{itersuffix}"
-        a.join("/")
-      end
-
       def id_add_year(docnum, node)
         year = node.attr("copyright-year")
         @amd and year ||= node.attr("updated-date")&.sub(/-.*$/, "")

data/lib/metanorma/iso/isodoc.rng

@@ -66,6 +66,7 @@
         <value>caution</value>
         <value>statement</value>
         <value>editorial</value>
+        <value>box</value>
       </choice>
     </define>
     <define name="index">

data/lib/metanorma/iso/processor.rb

@@ -37,7 +37,7 @@ module Metanorma
       end
 
       def use_presentation_xml(ext)
-        return true if ext == :html_alt
+        return true if [:html_alt, :sts, :isosts].include?(ext)
 
         super
       end

data/lib/metanorma/iso/section.rb

@@ -45,9 +45,13 @@ module Metanorma
         super
       end
 
+      # in ISO, term has subterm, unless
+      # there is no definition to the term (subclauses start immediately),
+      # or it is labelled as "grouping"
       def term_contains_subclauses(node)
-        @vocab and return false # treat this as a term
-        super
+        !node.sections? and return false
+        node.level != node.blocks[0].level ||
+          node.role == "grouping"
       end
     end
   end

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "2.3.3".freeze
+    VERSION = "2.3.5".freeze
   end
 end

data/lib/relaton/render/general.rb

@@ -1,4 +1,5 @@
 require "relaton-render"
+require "isodoc"
 require_relative "parse"
 
 module Relaton

data/metanorma-iso.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "metanorma-standoc", "~> 2.3.0"
   spec.add_dependency "mnconvert", "~> 1.14"
-  spec.add_dependency "pubid-iso"
+  spec.add_dependency "pubid-iso", "~> 0.4.0"
   spec.add_dependency "ruby-jing"
   spec.add_dependency "tokenizer", "~> 0.3.0"
   spec.add_dependency "twitter_cldr"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 2.3.3
+  version: 2.3.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-23 00:00:00.000000000 Z
+date: 2023-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
@@ -42,16 +42,16 @@ dependencies:
   name: pubid-iso
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: ruby-jing
   requirement: !ruby/object:Gem::Requirement
@@ -296,7 +296,6 @@ files:
 - ".rubocop.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
-- Gemfile.devel
 - LICENSE
 - Makefile
 - README.adoc

data/Gemfile.devel

@@ -1,2 +0,0 @@
-#gem "isodoc", git: "https://github.com/metanorma/isodoc", branch: "main"
-