metanorma-iso 1.3.26 → 1.3.27

data/lib/asciidoctor/iso/isostandard.rng

@@ -362,6 +362,9 @@
             <data type="boolean"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="number"/>
+        </optional>
         <optional>
           <attribute name="subsequence"/>
         </optional>

data/lib/asciidoctor/iso/reqt.rng

@@ -30,9 +30,22 @@
         <data type="boolean"/>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="number"/>
+    </optional>
     <optional>
       <attribute name="subsequence"/>
     </optional>
+    <optional>
+      <attribute name="keep-with-next">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="keep-lines-together">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
     <attribute name="id">
       <data type="ID"/>
     </attribute>
@@ -141,6 +154,16 @@
         <data type="boolean"/>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="keep-with-next">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="keep-lines-together">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
     <oneOrMore>
       <ref name="BasicBlock"/>
     </oneOrMore>

data/lib/asciidoctor/iso/term_lookup_cleanup.rb

@@ -57,15 +57,15 @@ module Asciidoctor
 
       def replace_automatic_generated_ids_terms
         xmldoc.xpath('//term').each.with_object({}) do |term_node, res|
-          next if AUTOMATIC_GENERATED_ID_REGEXP.match(term_node['id']).nil?
-
           normalize_id_and_memorize(term_node, res, './preferred')
         end
       end
 
       def normalize_id_and_memorize(term_node, res_table, text_selector)
         term_text = normalize_ref_id(term_node.at(text_selector).text)
+                  unless AUTOMATIC_GENERATED_ID_REGEXP.match(term_node['id']).nil?
         term_node['id'] = unique_text_id(term_text)
+                  end
         res_table[term_text] = term_node['id']
       end
 

data/lib/asciidoctor/iso/validate.rb

@@ -170,11 +170,7 @@ module Asciidoctor
 
       def bibitem_validate(xmldoc)
         xmldoc.xpath("//bibitem[date/on = '–']").each do |b|
-          found = false
-          b.xpath("./note").each do |n|
-            found = true if /^ISO DATE:/.match n.text
-          end
-          found or
+          b.at("./note[@type = 'ISO DATE']") or
             @log.add("Style", b,
                      "Reference #{b&.at("./@id")&.text} does not have an "\
                      "associated footnote indicating unpublished status")

data/lib/asciidoctor/iso/validate_title.rb

@@ -36,7 +36,7 @@ module Asciidoctor
 
       # ISO/IEC DIR 2, 11.4
       def title_subpart_validate(root)
-        docid = root.at("//bibdata/docidentifier[@type = 'iso']")
+        docid = root.at("//bibdata/docidentifier[@type = 'ISO']")
         subpart = /-\d+-\d+/.match docid
         iec = root.at("//bibdata/contributor[role/@type = 'publisher']/"\
                       "organization[abbreviation = 'IEC' or "\

data/lib/isodoc/iso/base_convert.rb

@@ -1,6 +1,7 @@
 require "isodoc"
 require_relative "metadata"
 require_relative "sections"
+require_relative "xref"
 require "fileutils"
 
 module IsoDoc
@@ -20,35 +21,10 @@ module IsoDoc
         super
       end
 
-      def anchor_names(docxml)
-        if @amd
-          back_anchor_names(docxml)
-          note_anchor_names(docxml.xpath(ns("//annex//table | //annex//figure")))
-          note_anchor_names(docxml.xpath(ns("//annex")))
-          example_anchor_names(docxml.xpath(ns("//annex")))
-          list_anchor_names(docxml.xpath(ns("//annex")))
-        else
-          super
-        end
-      end
-
       def implicit_reference(b)
         b&.at(ns("./docidentifier"))&.text == "IEV"
       end
 
-      def initial_anchor_names(d)
-        super
-        introduction_names(d.at(ns("//introduction")))
-      end
-
-      # we can reference 0-number clauses in introduction
-      def introduction_names(clause)
-        return if clause.nil?
-        clause.xpath(ns("./clause")).each_with_index do |c, i|
-          section_names1(c, "0.#{i + 1}", 2)
-        end
-      end
-
       # terms not defined in standoc
       def error_parse(node, out)
         case node.name
@@ -58,36 +34,6 @@ module IsoDoc
         end
       end
 
-      def annex_names(clause, num)
-        appendix_names(clause, num)
-        super
-      end
-
-      def appendix_names(clause, num)
-        clause.xpath(ns("./appendix")).each_with_index do |c, i|
-          @anchors[c["id"]] = anchor_struct(i + 1, nil, @appendix_lbl, "clause")
-          @anchors[c["id"]][:level] = 2
-          @anchors[c["id"]][:container] = clause["id"]
-        end
-      end
-
-      def section_names1(clause, num, level)
-        @anchors[clause["id"]] =
-          { label: num, level: level, xref: num }
-        # subclauses are not prefixed with "Clause"
-        clause.xpath(ns("./clause | ./terms | ./term | ./definitions | ./references")).
-          each_with_index do |c, i|
-          section_names1(c, "#{num}.#{i + 1}", level + 1)
-        end
-      end
-
-      def annex_names1(clause, num, level)
-        @anchors[clause["id"]] = { label: num, xref: num, level: level }
-        clause.xpath(ns("./clause | ./references")).each_with_index do |c, i|
-          annex_names1(c, "#{num}.#{i + 1}", level + 1)
-        end
-      end
-
       def eref_localities1_zh(target, type, from, to, delim)
         subsection = from&.text&.match(/\./)
         ret = (delim == ";") ? ";" : (type == "list") ? "" : delim
@@ -101,6 +47,7 @@ module IsoDoc
       end
 
       def eref_localities1(target, type, from, to, delim, lang = "en")
+        return "" if type == "anchor"
         subsection = from&.text&.match(/\./)
         type = type.downcase
         return l10n(eref_localities1_zh(target, type, from, to, delim)) if lang == "zh"
@@ -198,10 +145,6 @@ module IsoDoc
                                 sub(/ \(All Parts\)/i, "") }
       end
 
-      def table_footnote_reference_format(a)
-        a.content = a.content + ")"
-      end
-
       def cleanup(docxml)
         super
         table_th_center(docxml)
@@ -215,16 +158,59 @@ module IsoDoc
         end
       end
 
-      def hierarchical_formula_names(clause, num)
-        c = IsoDoc::Function::XrefGen::Counter.new
-        clause.xpath(ns(".//formula")).each do |t|
-          next if t["id"].nil? || t["id"].empty?
-          @anchors[t["id"]] =
-            anchor_struct("#{num}#{hiersep}#{c.increment(t).print}", t,
-                          t["inequality"] ? @inequality_lbl : @formula_lbl,
-                          "formula", t["unnumbered"])
+      def formula_where(dl, out)
+        return if dl.nil?
+        return super unless (dl&.xpath(ns("./dt"))&.size == 1 && 
+                             dl&.at(ns("./dd"))&.elements&.size == 1 &&
+                             dl&.at(ns("./dd/p")))
+        out.span **{ class: "zzMoveToFollowing" } do |s|
+          s << "#{@where_lbl} "
+          dl.at(ns("./dt")).children.each { |n| parse(n, s) }
+          s << " "
+        end
+        parse(dl.at(ns("./dd/p")), out)
+      end
+
+      def admonition_parse(node, out)
+        type = node["type"]
+        name = admonition_name(node, type)
+        out.div **{ id: node["id"], class: admonition_class(node) } do |div|
+          node.first_element_child.name == "p" ?
+            admonition_p_parse(node, div, name) : admonition_parse1(node, div, name)
+        end
+      end
+
+      def admonition_parse1(node, div, name)
+        div.p do |p|
+          admonition_name_parse(node, p, name) if name
+        end
+        node.children.each { |n| parse(n, div) unless n.name == "name" }
+      end
+
+      def admonition_p_parse(node, div, name)
+        div.p do |p|
+          admonition_name_parse(node, p, name) if name
+          node.first_element_child.children.each { |n| parse(n, p) }
         end
+        node.element_children[1..-1].each { |n| parse(n, div) }
       end
+
+      def admonition_name_parse(_node, div, name)
+        name.children.each { |n| parse(n, div) }
+        div << " &mdash; "
+      end
+
+       def figure_name_parse(node, div, name)
+      lbl = anchor(node['id'], :label, false)
+      lbl = nil if labelled_ancestor(node) && node.ancestors("figure").empty?
+      return if lbl.nil? && name.nil?
+      div.p **{ class: "FigureTitle", style: "text-align:center;" } do |p|
+        figname = node.parent.name == "figure" ? "" : "#{@figure_lbl} "
+        lbl.nil? or p << l10n("#{figname}#{lbl}")
+        name and !lbl.nil? and p << "&nbsp;&mdash; "
+        name and name.children.each { |n| parse(n, div) }
+      end
+    end
     end
   end
 end

data/lib/isodoc/iso/html/isodoc.scss

@@ -619,6 +619,10 @@ table.figdl
         margin-right: 0cm;
       }
 
+div.figdl p, table.figdl p {
+  font-size: 10.0pt;
+}
+
 table.formula_dl {
 	margin-left:20.15pt;
 }

data/lib/isodoc/iso/html/style-human.scss

@@ -507,6 +507,9 @@ pre {
     @include blockTitle()
 }
 
+.figure dl {
+}
+
 /*
 3.7 Notes
 */

data/lib/isodoc/iso/html/style-iso.scss

@@ -537,6 +537,9 @@ pre {
     @include blockTitle()
 }
 
+.figure dl {
+}
+
 /*
 3.7 Notes
 */

data/lib/isodoc/iso/html/word_iso_intro.html

@@ -5,6 +5,10 @@ margin-left:5.1pt;margin-right:5.1pt'>
 <div id="boilerplate-copyright-destination"/>
 </div>
 
+{% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
+{% else %}
+
 <p class="zzContents" style='margin-top:0cm'><span lang="EN-GB">Contents</span></p>
 
 WORDTOC
+{% endif %}

data/lib/isodoc/iso/metadata.rb

@@ -53,7 +53,7 @@ module IsoDoc
       end
 
       def docid(isoxml, _out)
-        dn = isoxml.at(ns("//bibdata/docidentifier[@type = 'iso']"))
+        dn = isoxml.at(ns("//bibdata/docidentifier[@type = 'ISO']"))
         set(:docnumber, dn&.text)
         tcdn = isoxml.xpath(ns("//bibdata/docidentifier[@type = 'iso-tc']"))
         set(:tc_docnumber, tcdn.map { |n| n.text })

data/lib/isodoc/iso/xref.rb

@@ -0,0 +1,105 @@
+module IsoDoc
+  module Iso
+    module BaseConvert
+      def anchor_names(docxml)
+        if @amd
+          back_anchor_names(docxml)
+          note_anchor_names(docxml.xpath(ns("//annex//table | //annex//figure")))
+          note_anchor_names(docxml.xpath(ns("//annex")))
+          example_anchor_names(docxml.xpath(ns("//annex")))
+          list_anchor_names(docxml.xpath(ns("//annex")))
+        else
+          super
+        end
+      end
+
+      def initial_anchor_names(d)
+        super
+        introduction_names(d.at(ns("//introduction")))
+      end
+
+      # we can reference 0-number clauses in introduction
+      def introduction_names(clause)
+        return if clause.nil?
+        clause.xpath(ns("./clause")).each_with_index do |c, i|
+          section_names1(c, "0.#{i + 1}", 2)
+        end
+      end
+
+      def annex_names(clause, num)
+        appendix_names(clause, num)
+        super
+      end
+
+      def appendix_names(clause, num)
+        clause.xpath(ns("./appendix")).each_with_index do |c, i|
+          @anchors[c["id"]] = anchor_struct(i + 1, nil, @appendix_lbl, "clause")
+          @anchors[c["id"]][:level] = 2
+          @anchors[c["id"]][:container] = clause["id"]
+        end
+      end
+
+      def section_names1(clause, num, level)
+        @anchors[clause["id"]] =
+          { label: num, level: level, xref: num }
+        # subclauses are not prefixed with "Clause"
+        clause.xpath(ns("./clause | ./terms | ./term | ./definitions | "\
+                        "./references")).
+                       each_with_index do |c, i|
+          section_names1(c, "#{num}.#{i + 1}", level + 1)
+        end
+      end
+
+      def annex_names1(clause, num, level)
+        @anchors[clause["id"]] = { label: num, xref: num, level: level }
+        clause.xpath(ns("./clause | ./references")).each_with_index do |c, i|
+          annex_names1(c, "#{num}.#{i + 1}", level + 1)
+        end
+      end
+
+      def hierarchical_formula_names(clause, num)
+        c = IsoDoc::Function::XrefGen::Counter.new
+        clause.xpath(ns(".//formula")).each do |t|
+          next if t["id"].nil? || t["id"].empty?
+          @anchors[t["id"]] =
+            anchor_struct("#{num}#{hiersep}#{c.increment(t).print}", t,
+                          t["inequality"] ? @inequality_lbl : @formula_lbl,
+                          "formula", t["unnumbered"])
+        end
+      end
+
+      def figure_anchor(t, sublabel, label)
+        @anchors[t["id"]] = anchor_struct(
+          (sublabel ? "#{label} #{sublabel}" : label),
+          nil, @figure_lbl, "figure", t["unnumbered"])
+        sublabel && t["unnumbered"] != "true" and
+          @anchors[t["id"]][:label] = sublabel
+      end
+
+      def sequential_figure_names(clause)
+        c = IsoDoc::Function::XrefGen::Counter.new
+        j = 0
+        clause.xpath(ns(".//figure | .//sourcecode[not(ancestor::example)]")).
+          each do |t|
+          j = subfigure_increment(j, c, t)
+          sublabel = j.zero? ? nil : "#{(j+96).chr})"
+          next if t["id"].nil? || t["id"].empty?
+          figure_anchor(t, sublabel, c.print)
+        end
+      end
+
+      def hierarchical_figure_names(clause, num)
+        c = IsoDoc::Function::XrefGen::Counter.new
+        j = 0
+        clause.xpath(ns(".//figure |  .//sourcecode[not(ancestor::example)]")).
+          each do |t|
+          j = subfigure_increment(j, c, t)
+          label = "#{num}#{hiersep}#{c.print}"
+          sublabel = j.zero? ? nil : "#{(j+96).chr})"
+          next if t["id"].nil? || t["id"].empty?
+          figure_anchor(t, sublabel, label)
+        end
+      end
+    end
+  end
+end

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "1.3.26".freeze
+    VERSION = "1.3.27".freeze
   end
 end

data/spec/asciidoctor-iso/amd_spec.rb

@@ -241,7 +241,7 @@ OUTPUT
   d’échantillon et recommandations relatives aux conditions d’entreposage et
   de transport
 </title>
-    <docidentifier type='iso'>ISO 17301-1:2016/PreNP Amd 1</docidentifier>
+    <docidentifier type='ISO'>ISO 17301-1:2016/PreNP Amd 1</docidentifier>
     <docidentifier type='iso-with-lang'>ISO 17301-1:2016/PreNP Amd 1(E)</docidentifier>
     <docidentifier type='iso-reference'>ISO 17301-1:2016/PreNP Amd 1:2017(E)</docidentifier>
     <docnumber>17301</docnumber>
@@ -332,7 +332,7 @@ Author
 INPUT
  <iso-standard xmlns='https://www.metanorma.org/ns/iso'>
    <bibdata type='standard'>
-     <docidentifier type='iso'>ISO 17301-1:2030/CD Amd 1</docidentifier>
+     <docidentifier type='ISO'>ISO 17301-1:2030/CD Amd 1</docidentifier>
      <docidentifier type='iso-with-lang'>ISO 17301-1:2030/CD Amd 1(E)</docidentifier>
      <docidentifier type='iso-reference'>ISO 17301-1:2030/CD Amd 1(E)</docidentifier>
      <docnumber>17301</docnumber>
@@ -400,7 +400,7 @@ Author
 INPUT
 <iso-standard xmlns='https://www.metanorma.org/ns/iso'>
          <bibdata type='standard'>
-           <docidentifier type='iso'>ISO 17301-1:2030/DAmd 1</docidentifier>
+           <docidentifier type='ISO'>ISO 17301-1:2030/DAmd 1</docidentifier>
            <docidentifier type='iso-with-lang'>ISO 17301-1:2030/DAmd 1(E)</docidentifier>
            <docidentifier type='iso-reference'>ISO 17301-1:2030/DAmd 1(E)</docidentifier>
            <docnumber>17301</docnumber>
@@ -467,7 +467,7 @@ Author
 INPUT
 <iso-standard xmlns='https://www.metanorma.org/ns/iso'>
          <bibdata type='standard'>
-           <docidentifier type='iso'>ISO 17301-1:2030/Amd 1</docidentifier>
+           <docidentifier type='ISO'>ISO 17301-1:2030/Amd 1</docidentifier>
            <docidentifier type='iso-with-lang'>ISO 17301-1:2030/Amd 1(E)</docidentifier>
            <docidentifier type='iso-reference'>ISO 17301-1:2030/Amd 1(E)</docidentifier>
            <docnumber>17301</docnumber>
@@ -535,7 +535,7 @@ Author
 INPUT
 <iso-standard xmlns='https://www.metanorma.org/ns/iso'>
   <bibdata type='standard'>
-    <docidentifier type='iso'>ISO 17301-1:2030/CD Cor.3</docidentifier>
+    <docidentifier type='ISO'>ISO 17301-1:2030/CD Cor.3</docidentifier>
     <docidentifier type='iso-with-lang'>ISO 17301-1:2030/CD Cor.3(E)</docidentifier>
     <docidentifier type='iso-reference'>ISO 17301-1:2030/CD Cor.3(E)</docidentifier>
     <docnumber>17301</docnumber>
@@ -603,7 +603,7 @@ Author
 INPUT
 <iso-standard xmlns='https://www.metanorma.org/ns/iso'>
   <bibdata type='standard'>
-    <docidentifier type='iso'>ISO 17301-1:2030/FDCor.3</docidentifier>
+    <docidentifier type='ISO'>ISO 17301-1:2030/FDCor.3</docidentifier>
     <docidentifier type='iso-with-lang'>ISO 17301-1:2030/FDCor.3(E)</docidentifier>
     <docidentifier type='iso-reference'>ISO 17301-1:2030/FDCor.3(E)</docidentifier>
     <docnumber>17301</docnumber>
@@ -670,7 +670,7 @@ Author
 INPUT
 <iso-standard xmlns='https://www.metanorma.org/ns/iso'>
          <bibdata type='standard'>
-           <docidentifier type='iso'>ISO 17301-1:2030/Cor.3</docidentifier>
+           <docidentifier type='ISO'>ISO 17301-1:2030/Cor.3</docidentifier>
            <docidentifier type='iso-with-lang'>ISO 17301-1:2030/Cor.3(E)</docidentifier>
            <docidentifier type='iso-reference'>ISO 17301-1:2030/Cor.3(E)</docidentifier>
            <docnumber>17301</docnumber>