metanorma-iso 2.3.2 → 2.3.4

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/isodoc/iso/presentation_xref.rb

@@ -113,11 +113,11 @@ module IsoDoc
                 delim = " "
                 @xrefs.anchor(container, :label)
                 # 7 a) : Clause 7 a), but Clause 7 List 1 a)
-              else
-                anchor_xref(node, container)
+              else anchor_xref(node, container)
               end
 
-        l10n(ref + delim + linkend)
+        ref and linkend = ref + delim + linkend
+        l10n(linkend)
       end
 
       def expand_citeas(text)

data/lib/isodoc/iso/word_dis_cleanup.rb

@@ -204,46 +204,13 @@ module IsoDoc
         docxml
       end
 
-      def authority_cleanup(docxml)
-        super
-        if @meta.get[:stage_int].to_s[0] == "9" ||
-            @meta.get[:stage_int].to_s[0] == "6"
-          copyright_prf(docxml)
-        else
-          copyright_dis(docxml)
-        end
-      end
-
-      def copyright_prf(docxml)
-        docxml.xpath("//p[@id = 'boilerplate-address']")&.each do |p|
-          p["class"] = "zzCopyright"
-          p["style"] = "text-indent:20.15pt;"
-          p.replace(to_xml(p).gsub(%r{<br/>}, "</p>\n<p class='zzCopyright' " \
-                                              "style='text-indent:20.15pt;'>"))
-        end
-        docxml.xpath("//p[@class = 'zzCopyrightHdr']")&.each do |p|
-          # p["class"] = "zzCopyright"
-          p.remove
-        end
-      end
-
-      def copyright_dis(docxml)
-        docxml.xpath("//p[@id = 'boilerplate-address']")&.each do |p|
-          p["class"] = "zzCopyright"
-          p.replace(to_xml(p).gsub(%r{<br/>}, "</p>\n<p class='zzCopyright'>"))
-        end
-        docxml.xpath("//p[@class = 'zzCopyrightHdr']")&.each do |p|
-          p.remove
-        end
-      end
-
       def word_section_end_empty_para(docxml)
         docxml.at("//div[@class='WordSection1']/p[last()]").remove
       end
 
       def word_table_cell_para(docxml)
         docxml.xpath("//td | //th").each do |t|
-          s = t["header"] == "true" ? "Tableheader" : "Tablebody"
+          s = word_table_cell_para_style(t)
           t.delete("header")
           if t.at("./p |./div")
             t.xpath("./p | ./div").each { |p| p["class"] = s }
@@ -253,6 +220,12 @@ module IsoDoc
         end
       end
 
+      def word_table_cell_para_style(cell)
+        ret = cell["header"] == "true" ? "Tableheader" : "Tablebody"
+        cell["class"] == "rouge-code" and ret = "Code"
+        ret
+      end
+
       def table_toc_class
         ["Table title", "Tabletitle", "Annex Table Title", "AnnexTableTitle"] +
           super

data/lib/isodoc/iso/word_dis_convert.rb

@@ -3,7 +3,7 @@ require_relative "word_dis_cleanup"
 module IsoDoc
   module Iso
     class WordDISConvert < WordConvert
-      attr_accessor :bgstripcolor 
+      attr_accessor :bgstripcolor
 
       def default_file_locations(_options)
         { wordstylesheet: html_doc_path("wordstyle-dis.scss"),
@@ -21,8 +21,7 @@ module IsoDoc
         super
       end
 
-      def init_dis(opt)
-      end
+      def init_dis(opt); end
 
       def convert1(docxml, filename, dir)
         update_coverpage(docxml)
@@ -48,7 +47,7 @@ module IsoDoc
       end
 
       def span_parse(node, out)
-        out.span **{ class: node["class"] } do |x|
+        out.span class: node["class"] do |x|
           node.children.each { |n| parse(n, x) }
         end
       end
@@ -88,7 +87,7 @@ module IsoDoc
       end
 
       def middle_title_dis(out)
-        out.p(**{ class: "zzSTDTitle" }) do |p|
+        out.p(class: "zzSTDTitle") do |p|
           p << @meta.get[:doctitleintro]
           @meta.get[:doctitleintro] && @meta.get[:doctitlemain] and p << " &#x2014; "
           p << @meta.get[:doctitlemain]
@@ -104,7 +103,7 @@ module IsoDoc
       end
 
       def middle_title_dis_amd(para)
-        para.span(**{ style: "font-weight:normal" }) do |p|
+        para.span(style: "font-weight:normal") do |p|
           if a = @meta.get[:doctitleamdlabel]
             p << " #{a}"
             a = @meta.get[:doctitleamd] and p << ": #{a}"
@@ -114,6 +113,34 @@ module IsoDoc
           end
         end
       end
+
+      def authority_cleanup(docxml)
+        super
+        if @meta.get[:stage_int].to_s[0] == "9" ||
+            @meta.get[:stage_int].to_s[0] == "6"
+          copyright_prf(docxml)
+        else
+          copyright_dis(docxml)
+        end
+      end
+
+      def copyright_prf(docxml)
+        docxml.xpath("//p[@id = 'boilerplate-address']")&.each do |p|
+          p["class"] = "zzCopyright"
+          p["style"] = "text-indent:20.15pt;"
+          p.replace(to_xml(p).gsub(%r{<br/>}, "</p>\n<p class='zzCopyright' " \
+                                              "style='text-indent:20.15pt;'>"))
+        end
+        docxml.xpath("//p[@class = 'zzCopyrightHdr']")&.each(&:remove)
+      end
+
+      def copyright_dis(docxml)
+        docxml.xpath("//p[@id = 'boilerplate-address']")&.each do |p|
+          p["class"] = "zzCopyright"
+          p.replace(to_xml(p).gsub(%r{<br/>}, "</p>\n<p class='zzCopyright'>"))
+        end
+        docxml.xpath("//p[@class = 'zzCopyrightHdr']")&.each(&:remove)
+      end
     end
   end
 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/biblio.rng

@@ -1316,7 +1316,7 @@
       <value>commentaryOf</value>
       <value>hasCommentary</value>
       <value>related</value>
-      <value>complements</value>
+      <value>hasComplement</value>
       <value>complementOf</value>
       <value>obsoletes</value>
       <value>obsoletedBy</value>

data/lib/metanorma/iso/cleanup.rb

@@ -4,14 +4,14 @@ require "htmlentities"
 module Metanorma
   module ISO
     class Converter < Standoc::Converter
-      PRE_NORMREF_FOOTNOTES = "//preface//fn | "\
+      PRE_NORMREF_FOOTNOTES = "//preface//fn | " \
                               "//clause[@type = 'scope']//fn".freeze
 
       NORMREF_FOOTNOTES =
         "//references[@normative = 'true']//fn".freeze
 
       POST_NORMREF_FOOTNOTES =
-        "//sections//clause[not(@type = 'scope')]//fn | "\
+        "//sections//clause[not(@type = 'scope')]//fn | " \
         "//annex//fn | //references[@normative = 'false']//fn".freeze
 
       def other_footnote_renumber(xmldoc)
@@ -33,7 +33,7 @@ module Metanorma
       end
 
       def get_id_prefix(xmldoc)
-        xmldoc.xpath("//bibdata/contributor[role/@type = 'publisher']"\
+        xmldoc.xpath("//bibdata/contributor[role/@type = 'publisher']" \
                      "/organization").each_with_object([]) do |x, prefix|
           x1 = x.at("abbreviation")&.text || x.at("name")&.text
           # (x1 == "ISO" and prefix.unshift("ISO")) or prefix << x1
@@ -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)
@@ -60,23 +64,21 @@ module Metanorma
       end
 
       TERM_CLAUSE =
-        "//sections//terms | "\
+        "//sections//terms | " \
         "//sections//clause[descendant::terms][not(descendant::definitions)]"
           .freeze
 
       PUBLISHER = "./contributor[role/@type = 'publisher']/organization".freeze
 
-      OTHERIDS = "@type = 'DOI' or @type = 'metanorma' or @type = 'ISSN' or "\
-                 "@type = 'ISBN'".freeze
-
       def pub_class(bib)
         return 1 if bib.at("#{PUBLISHER}[abbreviation = 'ISO']")
-        return 1 if bib.at("#{PUBLISHER}[name = 'International Organization "\
+        return 1 if bib.at("#{PUBLISHER}[name = 'International Organization " \
                            "for Standardization']")
         return 2 if bib.at("#{PUBLISHER}[abbreviation = 'IEC']")
-        return 2 if bib.at("#{PUBLISHER}[name = 'International "\
+        return 2 if bib.at("#{PUBLISHER}[name = 'International " \
                            "Electrotechnical Commission']")
-        return 3 if bib.at("./docidentifier[@type][not(#{OTHERIDS})]") ||
+        return 3 if bib.at("./docidentifier[@type]" \
+                           "[not(#{skip_docid} or @type = 'metanorma')]") ||
           bib.at("./docidentifier[not(@type)]")
 
         4
@@ -99,15 +101,15 @@ module Metanorma
         pubclass = pub_class(bib)
         num = bib&.at("./docnumber")&.text
         id = bib&.at("./docidentifier[@primary]") ||
-          bib&.at("./docidentifier[not(#{OTHERIDS})]")
+          bib&.at("./docidentifier[not(#{skip_docid} or @type = 'metanorma')]")
         metaid = bib&.at("./docidentifier[@type = 'metanorma']")&.text
         abbrid = metaid unless /^\[\d+\]$/.match?(metaid)
         /\d-(?<partid>\d+)/ =~ id&.text
         type = id["type"] if id
         title = bib&.at("./title[@type = 'main']")&.text ||
           bib&.at("./title")&.text || bib&.at("./formattedref")&.text
-        "#{pubclass} :: #{type} :: "\
-          "#{num.nil? ? abbrid : sprintf('%09d', num.to_i)} :: "\
+        "#{pubclass} :: #{type} :: " \
+          "#{num.nil? ? abbrid : sprintf('%09d', num.to_i)} :: " \
           "#{sprintf('%09d', partid.to_i)} :: #{id&.text} :: #{title}"
       end
 
@@ -148,7 +150,7 @@ module Metanorma
       end
 
       def unpublished_note(xmldoc)
-        xmldoc.xpath("//bibitem[not(./ancestor::bibitem)]"\
+        xmldoc.xpath("//bibitem[not(./ancestor::bibitem)]" \
                      "[not(note[@type = 'Unpublished-Status'])]").each do |b|
           next if pub_class(b) > 2
           next unless (s = b.at("./status/stage")) && (s.text.to_i < 60)
@@ -179,7 +181,7 @@ module Metanorma
 
       def replacement_standard(biblio)
         r = biblio.at("./relation[@type = 'updates']/bibitem") or return nil
-        id = r.at("./formattedref | ./docidentifier[@primary = 'true'] | "\
+        id = r.at("./formattedref | ./docidentifier[@primary = 'true'] | " \
                   "./docidentifier | ./formattedref") or return nil
         id.text
       end
@@ -234,7 +236,7 @@ module Metanorma
       end
 
       def extract_publishers(xmldoc)
-        xmldoc.xpath("//bibdata/contributor[role/@type = 'publisher']/"\
+        xmldoc.xpath("//bibdata/contributor[role/@type = 'publisher']/" \
                      "organization").each_with_object([]) do |p, m|
           x = p.at("./abbreviation") || p.at("./name") or next
           m << x.text

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