metanorma-iso 2.7.4 → 2.7.5

data/lib/isodoc/iso/presentation_xml_convert.rb

@@ -79,6 +79,10 @@ module IsoDoc
           node["inline-header"] = "true"
         end
         super
+        if node["type"] == "section"
+          t = node.at(ns("./title/tab")) and
+            t.previous = @i18n.l10n(": ").sub(/\p{Zs}$/, "")
+        end
       end
 
       def clause(docxml)

data/lib/isodoc/iso/xref.rb

@@ -12,12 +12,12 @@ module IsoDoc
         if @klass.amd?(docxml)
           [{ path: "//sections/clause", multi: true }]
         else
-          [{ path: "//clause[@type = 'scope']" },
+          [{ path: "//sections/clause[@type = 'scope']" },
            { path: @klass.norm_ref_xpath },
            { path:
              "#{@klass.middle_clause(docxml)} | //sections/terms | " \
-             "//sections/clause[descendant::terms or descendant::definitions] " \
-             "| //sections/definitions", multi: true }]
+             "//sections/clause[descendant::terms or descendant::definitions] | " \
+             "//sections/definitions | //sections/clause[@type = 'section']", multi: true }]
         end
       end
 
@@ -46,9 +46,7 @@ module IsoDoc
 
       def hierarchical_formula_names(clause, num)
         c = IsoDoc::XrefGen::Counter.new
-        clause.xpath(ns(".//formula")).each do |t|
-          next if blank?(t["id"])
-
+        clause.xpath(ns(".//formula")).noblank.each do |t|
           @anchors[t["id"]] = anchor_struct(
             "#{num}#{hiersep}#{c.increment(t).print}", t,
             t["inequality"] ? @labels["inequality"] : @labels["formula"],
@@ -130,7 +128,7 @@ module IsoDoc
           notes = s.xpath(ns(".//ol")) - s.xpath(ns(".//clause//ol")) -
             s.xpath(ns(".//appendix//ol")) - s.xpath(ns(".//ol//ol"))
           c = Counter.new
-          notes.reject { |n| blank?(n["id"]) }.each do |n|
+          notes.noblank.each do |n|
             @anchors[n["id"]] = anchor_struct(increment_label(notes, n, c), n,
                                               @labels["list"], "list", false)
             list_item_anchor_names(n, @anchors[n["id"]], 1, "",

data/lib/isodoc/iso/xref_section.rb

@@ -47,6 +47,17 @@ module IsoDoc
         end
       end
 
+      def section_name_anchors(clause, num, level)
+        if clause["type"] == "section"
+          @anchors[clause["id"]] =
+            { label: l10n("#{@labels['section']} #{num}"),
+              xref: l10n("#{@labels['section']} #{num}"),
+              title: clause_title(clause), level: level, type: "clause",
+              elem: @labels["section"] }
+        else super
+        end
+      end
+
       def annex_names1(clause, num, level)
         @anchors[clause["id"]] = { label: num, xref: num, level: level,
                                    subtype: "annex" }

data/lib/metanorma/iso/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/iso/boilerplate-fr.adoc

@@ -73,7 +73,7 @@ CP 401 • Ch. de Blandonnet 8 +
 CH-1214 Vernier, Geneva +
 Tél: +41 22 749 01 11 +
 Email: copyright@iso.org +
-Website: www.iso.org
+Website: {% if document_scheme == "2024" %}https://www.iso.org/[www.iso.org]{% else %}www.iso.org{% endif %}
 
 [[boilerplate-place]]
 Publié en Suisse

data/lib/metanorma/iso/boilerplate-ru.adoc

@@ -49,7 +49,7 @@ CP 401 • Ch. de Blandonnet 8 +
 CH-1214 Vernier, Geneva +
 Тел: +41 22 749 01 11 +
 Электронная почта: copyright@iso.org +
-Сайт: www.iso.org
+Сайт: {% if document_scheme == "2024" %}https://www.iso.org/[www.iso.org]{% else %}www.iso.org{% endif %}
 
 [[boilerplate-place]]
 Издано в Швейцарии

data/lib/metanorma/iso/boilerplate.adoc

@@ -73,7 +73,7 @@ CP 401 • Ch. de Blandonnet 8 +
 CH-1214 Vernier, Geneva +
 Phone: +41 22 749 01 11 +
 Email: copyright@iso.org +
-Website: www.iso.org
+Website: {% if document_scheme == "2024" %}https://www.iso.org/[www.iso.org]{% else %}www.iso.org{% endif %}
 
 [[boilerplate-place]]
 Published in Switzerland

data/lib/metanorma/iso/cleanup.rb

@@ -1,3 +1,5 @@
+require_relative "cleanup_biblio"
+
 module Metanorma
   module ISO
     class Converter < Standoc::Converter
@@ -24,80 +26,20 @@ module Metanorma
         end
       end
 
-      def id_prefix(prefix, id)
-        # we're just inheriting the prefixes from parent doc
-        @amd and return id.text
-        prefix.join("/") + (id.text.match?(%{^/}) ? "" : " ") + id.text
-      end
-
-      def get_id_prefix(xmldoc)
-        xmldoc.xpath("//bibdata/contributor[role/@type = 'publisher']" \
-                     "/organization").each_with_object([]) do |x, prefix|
-          x1 = x.at("abbreviation")&.text || x.at("name")&.text
-          prefix << x1
+      def ol_cleanup(doc)
+        doc.xpath("//ol[@explicit-type]").each do |x|
+          x["type"] = x["explicit-type"]
+          x.delete("explicit-type")
+          @log.add("Style", x,
+                   "Style override set for ordered list")
         end
       end
 
-      # ISO as a prefix goes first
-      def docidentifier_cleanup(xmldoc)
-        prefix = get_id_prefix(xmldoc)
-        id = xmldoc.at("//bibdata/ext/structuredidentifier/project-number") and
-          id.content = id_prefix(prefix, id)
-      end
-
-      def format_ref(ref, type)
-        ref = ref.sub(/ \(All Parts\)/i, "")
-        super
-      end
-
       TERM_CLAUSE =
         "//sections//terms | " \
         "//sections//clause[descendant::terms][not(descendant::definitions)]"
           .freeze
 
-      PUBLISHER = "./contributor[role/@type = 'publisher']/organization".freeze
-
-      def pub_class(bib)
-        return 1 if bib.at("#{PUBLISHER}[abbreviation = 'ISO']")
-        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 " \
-                           "Electrotechnical Commission']")
-        return 3 if bib.at("./docidentifier[@type]" \
-                           "[not(#{skip_docid} or @type = 'metanorma')]") ||
-          bib.at("./docidentifier[not(@type)]")
-
-        4
-      end
-
-      def sort_biblio(bib)
-        bib.sort { |a, b| sort_biblio_key(a) <=> sort_biblio_key(b) }
-      end
-
-      # sort by: doc class (ISO, IEC, other standard (not DOI &c), other
-      # then standard class (docid class other than DOI &c)
-      # then docnumber if present, numeric sort
-      #      else alphanumeric metanorma id (abbreviation)
-      # then doc part number if present, numeric sort
-      # then doc id (not DOI &c)
-      # then title
-      def sort_biblio_key(bib)
-        pubclass = pub_class(bib)
-        num = bib.at("./docnumber")&.text
-        id = bib.at("./docidentifier[@primary]") ||
-          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)} :: " \
-          "#{sprintf('%09d', partid.to_i)} :: #{id&.text} :: #{title}"
-      end
-
       def sections_cleanup(xml)
         super
         @amd or return
@@ -127,52 +69,6 @@ module Metanorma
         end
       end
 
-      def bibitem_cleanup(xmldoc)
-        super
-        unpublished_note(xmldoc)
-        withdrawn_note(xmldoc)
-      end
-
-      def unpublished_note(xmldoc)
-        xmldoc.xpath("//bibitem[not(./ancestor::bibitem)]" \
-                     "[not(note[@type = 'Unpublished-Status'])]").each do |b|
-          pub_class(b) > 2 and next
-          ((s = b.at("./status/stage")) && s.text.match?(/\d/) &&
-           (s.text.to_i < 60)) or next
-          insert_unpub_note(b, @i18n.under_preparation
-            .sub("%", b.at("docidentifier").text))
-        end
-      end
-
-      def withdrawn_note(xmldoc)
-        xmldoc.xpath("//bibitem[not(note[@type = 'Unpublished-Status'])]")
-          .each do |b|
-            withdrawn_ref?(b) or next
-            if id = replacement_standard(b)
-              insert_unpub_note(b, @i18n.cancelled_and_replaced.sub("%", id))
-            else insert_unpub_note(b, @i18n.withdrawn)
-            end
-          end
-      end
-
-      def withdrawn_ref?(biblio)
-        pub_class(biblio) > 2 and return false
-        (s = biblio.at("./status/stage")) && (s.text.to_i == 95) &&
-          (t = biblio.at("./status/substage")) && (t.text.to_i == 99)
-      end
-
-      def replacement_standard(biblio)
-        r = biblio.at("./relation[@type = 'updates']/bibitem") or return nil
-        id = r.at("./formattedref | ./docidentifier[@primary = 'true'] | " \
-                  "./docidentifier | ./formattedref") or return nil
-        id.text
-      end
-
-      def insert_unpub_note(biblio, msg)
-        biblio.at("./language | ./script | ./abstract | ./status")
-          .previous = %(<note type="Unpublished-Status"><p>#{msg}</p></note>)
-      end
-
       def termdef_boilerplate_insert(xmldoc, isodoc, once = false)
         once = true
         super

data/lib/metanorma/iso/cleanup_biblio.rb

@@ -0,0 +1,120 @@
+module Metanorma
+  module ISO
+    class Converter < Standoc::Converter
+      def id_prefix(prefix, id)
+        # we're just inheriting the prefixes from parent doc
+        @amd and return id.text
+        prefix.join("/") + (id.text.match?(%{^/}) ? "" : " ") + id.text
+      end
+
+      def get_id_prefix(xmldoc)
+        xmldoc.xpath("//bibdata/contributor[role/@type = 'publisher']" \
+                     "/organization").each_with_object([]) do |x, prefix|
+          x1 = x.at("abbreviation")&.text || x.at("name")&.text
+          prefix << x1
+        end
+      end
+
+      # ISO as a prefix goes first
+      def docidentifier_cleanup(xmldoc)
+        prefix = get_id_prefix(xmldoc)
+        id = xmldoc.at("//bibdata/ext/structuredidentifier/project-number") and
+          id.content = id_prefix(prefix, id)
+      end
+
+      def format_ref(ref, type)
+        ref = ref.sub(/ \(All Parts\)/i, "")
+        super
+      end
+
+      PUBLISHER = "./contributor[role/@type = 'publisher']/organization".freeze
+
+      def pub_class(bib)
+        return 1 if bib.at("#{PUBLISHER}[abbreviation = 'ISO']")
+        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 " \
+                           "Electrotechnical Commission']")
+        return 3 if bib.at("./docidentifier[@type]" \
+                           "[not(#{skip_docid} or @type = 'metanorma')]") ||
+          bib.at("./docidentifier[not(@type)]")
+
+        4
+      end
+
+      def sort_biblio(bib)
+        bib.sort { |a, b| sort_biblio_key(a) <=> sort_biblio_key(b) }
+      end
+
+      # sort by: doc class (ISO, IEC, other standard (not DOI &c), other
+      # then standard class (docid class other than DOI &c)
+      # then docnumber if present, numeric sort
+      #      else alphanumeric metanorma id (abbreviation)
+      # then doc part number if present, numeric sort
+      # then doc id (not DOI &c)
+      # then title
+      def sort_biblio_key(bib)
+        pubclass = pub_class(bib)
+        num = bib.at("./docnumber")&.text
+        id = bib.at("./docidentifier[@primary]") ||
+          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)} :: " \
+          "#{sprintf('%09d', partid.to_i)} :: #{id&.text} :: #{title}"
+      end
+
+      def bibitem_cleanup(xmldoc)
+        super
+        unpublished_note(xmldoc)
+        withdrawn_note(xmldoc)
+      end
+
+      def unpublished_note(xmldoc)
+        xmldoc.xpath("//bibitem[not(./ancestor::bibitem)]" \
+                     "[not(note[@type = 'Unpublished-Status'])]").each do |b|
+          pub_class(b) > 2 and next
+          ((s = b.at("./status/stage")) && s.text.match?(/\d/) &&
+           (s.text.to_i < 60)) or next
+          insert_unpub_note(b, @i18n.under_preparation
+            .sub("%", b.at("docidentifier").text))
+        end
+      end
+
+      def withdrawn_note(xmldoc)
+        xmldoc.xpath("//bibitem[not(note[@type = 'Unpublished-Status'])]")
+          .each do |b|
+            withdrawn_ref?(b) or next
+            if id = replacement_standard(b)
+              insert_unpub_note(b, @i18n.cancelled_and_replaced.sub("%", id))
+            else insert_unpub_note(b, @i18n.withdrawn)
+            end
+          end
+      end
+
+      def withdrawn_ref?(biblio)
+        pub_class(biblio) > 2 and return false
+        (s = biblio.at("./status/stage")) && (s.text.to_i == 95) &&
+          (t = biblio.at("./status/substage")) && (t.text.to_i == 99)
+      end
+
+      def replacement_standard(biblio)
+        r = biblio.at("./relation[@type = 'updates']/bibitem") or return nil
+        id = r.at("./formattedref | ./docidentifier[@primary = 'true'] | " \
+                  "./docidentifier | ./formattedref") or return nil
+        id.text
+      end
+
+      def insert_unpub_note(biblio, msg)
+        biblio.at("./language | ./script | ./abstract | ./status")
+          .previous = %(<note type="Unpublished-Status"><p>#{msg}</p></note>)
+      end
+    end
+  end
+end

data/lib/metanorma/iso/front_id.rb

@@ -9,7 +9,7 @@ module Metanorma
     class Converter < Standoc::Converter
       def metadata_id(node, xml)
         if id = node.attr("docidentifier")
-          xml.docidentifier id, **attr_code(type: "ISO")
+          xml.docidentifier id, **attr_code(type: "ISO", primary: "true")
         else iso_id(node, xml)
         end
         node.attr("tc-docnumber")&.split(/,\s*/)&.each do |n|
@@ -161,12 +161,13 @@ module Metanorma
       end
 
       def cen_id_out(xml, params)
-        xml.docidentifier iso_id_default(params).to_s, **attr_code(type: "CEN")
+        xml.docidentifier iso_id_default(params).to_s,
+                          **attr_code(type: "CEN", primary: "true")
       end
 
       def iso_id_out_common(xml, params, with_prf)
         xml.docidentifier iso_id_default(params).to_s(with_prf: with_prf),
-                          **attr_code(type: "ISO")
+                          **attr_code(type: "ISO", primary: "true")
         xml.docidentifier iso_id_reference(params)
           .to_s(format: :ref_num_short, with_prf: with_prf),
                           **attr_code(type: "iso-reference")
@@ -185,8 +186,7 @@ module Metanorma
         params_nolang = params.dup.tap { |hs| hs.delete(:language) }
         params1 = if params[:unpublished]
                     params_nolang.dup.tap { |hs| hs.delete(:year) }
-                  else params_nolang
-                  end
+                  else params_nolang end
         params1.delete(:unpublished)
         pubid_select(params1).create(**params1)
       end

data/lib/metanorma/iso/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/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "2.7.4".freeze
+    VERSION = "2.7.5".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 2.7.4
+  version: 2.7.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-10 00:00:00.000000000 Z
+date: 2024-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
@@ -375,6 +375,7 @@ files:
 - lib/metanorma/iso/boilerplate-ru.adoc
 - lib/metanorma/iso/boilerplate.adoc
 - lib/metanorma/iso/cleanup.rb
+- lib/metanorma/iso/cleanup_biblio.rb
 - lib/metanorma/iso/converter.rb
 - lib/metanorma/iso/front.rb
 - lib/metanorma/iso/front_contributor.rb