metanorma-iso 2.3.5 → 2.4.0

data/lib/isodoc/iso/presentation_xml_convert.rb

@@ -215,6 +215,27 @@ module IsoDoc
         node.remove
       end
 
+      def note1(elem)
+        elem["type"] == "units" and return
+        super
+      end
+
+      def formula_where(dlist)
+        dlist.nil? and return
+        return super unless dlist.xpath(ns("./dt")).size == 1 &&
+          dlist.at(ns("./dd"))&.elements&.size == 1 &&
+          dlist.at(ns("./dd/p"))
+
+        formula_where_one(dlist)
+      end
+
+      def formula_where_one(dlist)
+        dt = to_xml(dlist.at(ns("./dt")).children)
+        dd = to_xml(dlist.at(ns("./dd/p")).children)
+        dlist.previous = "<p>#{@i18n.where_one} #{dt} #{dd}</p>"
+        dlist.remove
+      end
+
       include Init
     end
   end

data/lib/isodoc/iso/sections.rb

@@ -7,24 +7,24 @@ module IsoDoc
       end
 
       def middle_title_main(out)
-        out.p(**{ class: "zzSTDTitle1" }) do |p|
+        out.p(class: "zzSTDTitle1") do |p|
           p << @meta.get[:doctitleintro]
           p << " &#x2014; " if @meta.get[:doctitleintro] && @meta.get[:doctitlemain]
           p << @meta.get[:doctitlemain]
           p << " &#x2014; " if @meta.get[:doctitlemain] && @meta.get[:doctitlepart]
         end
-        a = @meta.get[:doctitlepart] and out.p(**{ class: "zzSTDTitle2" }) do |p|
+        a = @meta.get[:doctitlepart] and out.p(class: "zzSTDTitle2") do |p|
           b = @meta.get[:doctitlepartlabel] and p << "#{b}: "
           p << "<br/><b>#{a}</b>"
         end
       end
 
       def middle_title_amd(out)
-        a = @meta.get[:doctitleamdlabel] and out.p(**{ class: "zzSTDTitle2" }) do |p|
+        a = @meta.get[:doctitleamdlabel] and out.p(class: "zzSTDTitle2") do |p|
           p << a
           a = @meta.get[:doctitleamd] and p << ": #{a}"
         end
-        a = @meta.get[:doctitlecorrlabel] and out.p(**{ class: "zzSTDTitle2" }) do |p|
+        a = @meta.get[:doctitlecorrlabel] and out.p(class: "zzSTDTitle2") do |p|
           p << a
         end
       end
@@ -39,8 +39,8 @@ module IsoDoc
         f = isoxml.at(ns("//introduction")) || return
         title_attr = { class: "IntroTitle" }
         page_break(out)
-        out.div **{ class: "Section3", id: f["id"] } do |div|
-          clause_name(nil, f.at(ns("./title")), div, title_attr)
+        out.div class: "Section3", id: f["id"] do |div|
+          clause_name(f, f.at(ns("./title")), div, title_attr)
           f.elements.each do |e|
             parse(e, div) unless e.name == "title"
           end

data/lib/isodoc/iso/word_cleanup.rb

@@ -5,7 +5,7 @@ module IsoDoc
         super
         xml.xpath("//div[@class = 'figure']//table[@class = 'dl']").each do |t|
           t["class"] = "figdl"
-          d = t.add_previous_sibling("<div class='figdl' "\
+          d = t.add_previous_sibling("<div class='figdl' " \
                                      "style='page-break-after:avoid;'/>")
           t.parent = d.first
         end
@@ -38,6 +38,16 @@ module IsoDoc
         word_annex_cleanup_h1(docxml)
         figure_style(docxml)
         new_styles(docxml)
+        index_cleanup(docxml)
+      end
+
+      def index_cleanup(docxml)
+        docxml.xpath("//div[@class = 'index']").each do |i|
+          i.xpath(".//p | .//li").each do |p|
+            p["style"] ||= ""
+            p["style"] += "margin-bottom:0px;"
+          end
+        end
       end
 
       def figure_style(docxml)
@@ -48,7 +58,7 @@ module IsoDoc
       end
 
       def quote_style(docxml)
-        docxml.xpath("//div[@class = 'Quote' or @class = 'Note' or "\
+        docxml.xpath("//div[@class = 'Quote' or @class = 'Note' or " \
                      "@class = 'Example' or @class = 'Admonition']").each do |d|
                        quote_style1(d)
                      end

data/lib/isodoc/iso/word_convert.rb

@@ -10,10 +10,6 @@ module IsoDoc
       def initialize(options)
         @libdir = File.dirname(__FILE__)
         super
-        @wordToClevels = options[:doctoclevels].to_i
-        @wordToClevels = 3 if @wordToClevels.zero?
-        @htmlToClevels = options[:htmltoclevels].to_i
-        @htmlToClevels = 3 if @htmlToClevels.zero?
         init_dis(options)
       end
 
@@ -74,17 +70,41 @@ module IsoDoc
           make_body1(body, docxml)
           make_body2(body, docxml)
           make_body3(body, docxml)
+          indexsect(docxml, body)
           colophon(body, docxml)
         end
       end
 
+      def br(out, pagebreak)
+        out.br clear: "all", style: "page-break-before:#{pagebreak};" \
+                                    "mso-break-type:section-break"
+      end
+
       def colophon(body, _docxml)
         stage = @meta.get[:stage_int]
         return if !stage.nil? && stage < 60
 
-        body.br **{ clear: "all", style: "page-break-before:left;" \
-                                         "mso-break-type:section-break" }
-        body.div **{ class: "colophon" } do |div|
+        br(body, "left")
+        body.div class: "colophon" do |div|
+        end
+      end
+
+      def indexsect(isoxml, out)
+        isoxml.xpath(ns("//indexsect")).each do |i|
+          indexsect_title(i, out)
+          br(out, "auto")
+          out.div class: "index" do |div|
+            i.children.each do |e|
+              parse(e, div) unless e.name == "title"
+            end
+          end
+        end
+      end
+
+      def indexsect_title(clause, out)
+        br(out, "always")
+        out.div class: "WordSection3" do |div|
+          clause_name(clause, clause.at(ns("./title")), div, nil)
         end
       end
 
@@ -181,7 +201,7 @@ module IsoDoc
         return if name.nil?
 
         name&.at(ns("./strong"))&.remove # supplied by CSS list numbering
-        div.h1 **{ class: "Annex" } do |t|
+        div.h1 class: "Annex" do |t|
           annex_name1(name, t)
           clause_parse_subtitle(name, t)
         end
@@ -190,7 +210,7 @@ module IsoDoc
       def annex_name1(name, out)
         name.children.each do |c2|
           if c2.name == "span" && c2["class"] == "obligation"
-            out.span **{ style: "font-weight:normal;" } do |s|
+            out.span style: "font-weight:normal;" do |s|
               c2.children.each { |c3| parse(c3, s) }
             end
           else parse(c2, out)
@@ -204,6 +224,21 @@ module IsoDoc
         ret
       end
 
+      def table_parse(node, out)
+        @in_table = true
+        table_title_parse(node, out)
+        measurement_units(node, out)
+        out.div align: "center", class: "table_container" do |div|
+          div.table **table_attrs(node) do |t|
+            table_parse_core(node, t)
+            (dl = node.at(ns("./dl"))) && parse(dl, div)
+            node.xpath(ns("./note[not(@type = 'units')]"))
+              .each { |n| parse(n, div) }
+          end
+        end
+        @in_table = false
+      end
+
       include BaseConvert
       include Init
     end

data/lib/isodoc/iso/xref.rb

@@ -65,19 +65,24 @@ module IsoDoc
 
       def figure_anchor(elem, sublabel, label, klass)
         @anchors[elem["id"]] = anchor_struct(
-          (sublabel ? "#{label} #{sublabel}" : label),
+          "#{label}#{sublabel}",
           nil, @labels[klass] || klass.capitalize, klass, elem["unnumbered"]
         )
-        sublabel && elem["unnumbered"] != "true" and
+        !sublabel.empty? && elem["unnumbered"] != "true" and
           @anchors[elem["id"]][:label] = sublabel
       end
 
+      def subfigure_label(subfignum)
+        subfignum.zero? and return ""
+        " #{(subfignum + 96).chr})"
+      end
+
       def sequential_figure_names(clause)
         j = 0
         clause.xpath(ns(FIGURE_NO_CLASS)).noblank
           .each_with_object(IsoDoc::XrefGen::Counter.new) do |t, c|
           j = subfigure_increment(j, c, t)
-          sublabel = j.zero? ? nil : "#{(j + 96).chr})"
+          sublabel = subfigure_label(j)
           figure_anchor(t, sublabel, c.print, "figure")
         end
         sequential_figure_class_names(clause)
@@ -101,7 +106,7 @@ module IsoDoc
         clause.xpath(ns(FIGURE_NO_CLASS)).noblank.each do |t|
           j = subfigure_increment(j, c, t)
           label = "#{num}#{hiersep}#{c.print}"
-          sublabel = j.zero? ? nil : "#{(j + 96).chr})"
+          sublabel = subfigure_label(j)
           figure_anchor(t, sublabel, label, "figure")
         end
         hierarchical_figure_class_names(clause, num)
@@ -196,6 +201,19 @@ module IsoDoc
         super
         modspec_table_xrefs(clause) if @anchors_previous
       end
+
+      def uncountable_note?(note)
+        @anchors[note["id"]] || blank?(note["id"]) || note["type"] == "units"
+      end
+
+      def note_anchor_names1(notes, counter)
+        countable = notes.reject { |n| uncountable_note?(n) }
+        countable.each do |n|
+          @anchors[n["id"]] =
+            anchor_struct(increment_label(countable, n, counter), n,
+                          @labels["note_xref"], "note", false)
+        end
+      end
     end
   end
 end

data/lib/metanorma/iso/base.rb

@@ -56,9 +56,14 @@ module Metanorma
         @vocab = node.attr("docsubtype") == "vocabulary"
       end
 
+      def toc_default
+        { word_levels: 3, html_levels: 2 }
+      end
+
       def ol_attrs(node)
         attr_code(keep_attrs(node)
                   .merge(id: ::Metanorma::Utils::anchor_or_uuid(node),
+                         "explicit-type": olist_style(node.attributes[1]),
                          start: node.attr("start")))
       end
 

data/lib/metanorma/iso/biblio.rng

@@ -216,6 +216,9 @@
       <optional>
         <ref name="fullname"/>
       </optional>
+      <zeroOrMore>
+        <ref name="credential"/>
+      </zeroOrMore>
       <zeroOrMore>
         <ref name="affiliation"/>
       </zeroOrMore>
@@ -232,6 +235,11 @@
       <ref name="FullNameType"/>
     </element>
   </define>
+  <define name="credential">
+    <element name="credential">
+      <text/>
+    </element>
+  </define>
   <define name="FullNameType">
     <choice>
       <group>
@@ -305,7 +313,9 @@
       <zeroOrMore>
         <ref name="affiliationdescription"/>
       </zeroOrMore>
-      <ref name="organization"/>
+      <optional>
+        <ref name="organization"/>
+      </optional>
     </element>
   </define>
   <define name="affiliationname">

data/lib/metanorma/iso/cleanup.rb

@@ -8,11 +8,13 @@ module Metanorma
                               "//clause[@type = 'scope']//fn".freeze
 
       NORMREF_FOOTNOTES =
-        "//references[@normative = 'true']//fn".freeze
+        "//references[@normative = 'true']//fn | " \
+        "//clause[.//references[@normative = 'true']]//fn".freeze
 
       POST_NORMREF_FOOTNOTES =
         "//sections//clause[not(@type = 'scope')]//fn | " \
-        "//annex//fn | //references[@normative = 'false']//fn".freeze
+        "//annex//fn | //references[@normative = 'false']//fn | " \
+        "//clause[.//references[@normative = 'false']]//fn".freeze
 
       def other_footnote_renumber(xmldoc)
         seen = {}
@@ -27,8 +29,7 @@ module Metanorma
 
       def id_prefix(prefix, id)
         # we're just inheriting the prefixes from parent doc
-        return id.text if @amd
-
+        @amd and return id.text
         prefix.join("/") + (id.text.match?(%{^/}) ? "" : " ") + id.text
       end
 
@@ -44,18 +45,8 @@ 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)
@@ -115,8 +106,7 @@ module Metanorma
 
       def sections_cleanup(xml)
         super
-        return unless @amd
-
+        @amd or return
         xml.xpath("//*[@inline-header]").each { |h| h.delete("inline-header") }
       end
 
@@ -163,8 +153,7 @@ module Metanorma
       def withdrawn_note(xmldoc)
         xmldoc.xpath("//bibitem[not(note[@type = 'Unpublished-Status'])]")
           .each do |b|
-            next unless withdrawn_ref?(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)
@@ -173,8 +162,7 @@ module Metanorma
       end
 
       def withdrawn_ref?(biblio)
-        return false if pub_class(biblio) > 2
-
+        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

data/lib/metanorma/iso/front_id.rb

@@ -46,11 +46,14 @@ module Metanorma
       end
 
       def metadata_id(node, xml)
-        iso_id(node, xml)
+        if id = node.attr("docidentifier")
+          xml.docidentifier id, **attr_code(type: "ISO")
+        else iso_id(node, xml)
+        end
         node.attr("tc-docnumber")&.split(/,\s*/)&.each do |n|
           xml.docidentifier(n, **attr_code(type: "iso-tc"))
         end
-        xml.docnumber node&.attr("docnumber")
+        xml.docnumber node.attr("docnumber")
       end
 
       # @param type [nil, :tr, :ts, :amd, :cor, :guide, :dir, :tc, Type]
@@ -62,6 +65,7 @@ module Metanorma
         when "directive" then :dir
         when "technical-report" then :tr
         when "technical-specification" then :ts
+        when "publicly-available-specification" then :pas
         when "guide" then :guide
         end
       end
@@ -138,7 +142,7 @@ module Metanorma
         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),
+          .to_s(format: :ref_num_short, with_prf: with_prf),
                           **attr_code(type: "iso-reference")
         xml.docidentifier iso_id_reference(params).urn, **attr_code(type: "URN")
         return if @amd
@@ -146,7 +150,7 @@ module Metanorma
         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),
+          .to_s(format: :ref_num_long, with_prf: with_prf),
                           **attr_code(type: "iso-with-lang")
       rescue StandardError => e
         clean_abort("Document identifier: #{e}", xml)