metanorma-iso 2.5.2 → 2.5.4

data/lib/isodoc/iso/word_dis_styles.rb

@@ -0,0 +1,233 @@
+module IsoDoc
+  module Iso
+    class WordDISConvert < WordConvert
+      STYLESMAP = {
+        AltTerms: "AdmittedTerm",
+        TableFootnote: "Tablefootnote",
+        formula: "Formula",
+        note: "Note",
+        example: "Example",
+        admonition: "Admonition",
+        admonitiontitle: "AdmonitionTitle",
+        sourcetitle: "SourceTitle",
+        TableTitle: "Tabletitle",
+        titlepagesbhead: "TablePageSubhead",
+        NormRef: "RefNorm",
+        Biblio: "BiblioEntry",
+        MsoNormal: "MsoBodyText",
+        FigureTitle: "Figuretitle",
+        zzwarning: "zzWarning",
+        zzwarninghdr: "zzWarningHdr",
+        quoteattribution: "QuoteAttribution",
+        Sourcecode: "Code",
+        zzSTDTitle1: "zzSTDTitle",
+        zzSTDTitle2: "zzSTDTitle",
+        zzCopyright1: "zzCopyright",
+      }.freeze
+
+      def new_styles(docxml)
+        STYLESMAP.each do |k, v|
+          docxml.xpath("//*[@class = '#{k}']").each { |s| s["class"] = v }
+        end
+        docxml.xpath("//h1[@class = 'ForewordTitle' or @class = 'IntroTitle']")
+          .each { |h| h.name = "p" }
+        dis_styles1(docxml)
+        docxml.xpath("//p[not(@class)]").each { |p| p["class"] = "MsoBodyText" }
+        stripbgcolor(docxml)
+      end
+
+      def sourcecode_style
+        "Code"
+      end
+
+      def dis_styles1(docxml)
+        amd_style(docxml)
+        middle_title_style(docxml)
+        code_style(docxml)
+        figure_style(docxml)
+        formula_style(docxml)
+        note_style(docxml)
+        example_style(docxml)
+        dis_style_interactions(docxml)
+        quote_style(docxml)
+        smaller_code_style(docxml)
+      end
+
+      def middle_title_style(docxml)
+        docxml.xpath("//p[@class = 'zzSTDTitle2']").each do |p|
+          p1 = p.previous_element && p1.name == p &&
+            p1["class"] = "zzSTDTitle2" or next
+          p1 << " #{p.remove.children.to_xml}"
+        end
+      end
+
+      def dis_style_interactions(docxml)
+        docxml.xpath("//p[@class = 'Code' or @class = 'Code-' or " \
+                     "@class = 'Code--']" \
+                     "[following::p[@class = 'Examplecontinued']]").each do |p|
+          p["style"] ||= ""
+          p["style"] = "margin-bottom:12pt;#{p['style']}"
+        end
+      end
+
+      def amd_style(docxml)
+        @meta.get[:doctype] == "Amendment" or return
+        docxml.xpath("//div[@class = 'WordSection3']//h1").each do |h|
+          h.name = "p"
+          h["style"] = "font-style:italic;page-break-after:avoid;"
+        end
+      end
+
+      def para_style_change(div, class1, class2)
+        s = class1 ? "@class = '#{class1}'" : "not(@class)"
+        div.xpath(".//p[#{s}]").each do |p|
+          p["class"] = class2
+        end
+      end
+
+      def quote_style1(div)
+        para_style_change(div, nil, "BodyTextindent1")
+        para_style_change(div, "Code-", "Code--")
+        para_style_change(div, "Code", "Code-")
+        if div["class"] != "Example"
+          para_style_change(div, "Example", "Exampleindent")
+          para_style_change(div, "Examplecontinued", "Exampleindentcontinued")
+        end
+        if div["class"] != "Note"
+          para_style_change(div, "Note", "Noteindent")
+          para_style_change(div, "Notecontinued", "Noteindentcontinued")
+        end
+        div.xpath(".//table[@class = 'dl']").each do |t|
+          t["style"] = "margin-left: 1cm;"
+        end
+      end
+
+      def note_style(docxml)
+        remove_note_label(docxml)
+        note_continued_style(docxml)
+      end
+
+      def example_style(docxml)
+        example_continued_style(docxml)
+      end
+
+      def example_continued_style(docxml)
+        docxml.xpath("//div[@class = 'Example']").each do |d|
+          d.xpath("./p").each_with_index do |p, i|
+            p["class"] && p["class"] != "Example" and next
+            p["class"] = (i.zero? ? "Example" : "Examplecontinued")
+          end
+        end
+      end
+
+      def note_continued_style(docxml)
+        docxml.xpath("//div[@class = 'Note']").each do |d|
+          d.xpath("./p").each_with_index do |p, i|
+            p["class"] && p["class"] != "Note" and next
+            p["class"] = (i.zero? ? "Note" : "Notecontinued")
+          end
+        end
+      end
+
+      FIGURE_NESTED_STYLES =
+        { Note: "Figurenote", example: "Figureexample" }.freeze
+
+      def figure_style(docxml)
+        docxml.xpath("//div[@class = 'figure']").each do |f|
+          FIGURE_NESTED_STYLES.each do |k, v|
+            f.xpath(".//*[@class = '#{k}']").each { |n| n["class"] = v }
+          end
+          f.xpath("./img").each do |i|
+            i.replace("<p class='FigureGraphic'>#{i.to_xml}</p>")
+          end
+        end
+      end
+
+      def formula_style(docxml)
+        docxml.xpath("//div[@class = 'Formula']").each do |f|
+          f.xpath(".//p[not(@class)]").each do |p|
+            p["class"] = "Formula"
+          end
+        end
+      end
+
+      def code_style(doc)
+        span_style((doc.xpath("//tt//b") - doc.xpath("//tt//i//b")),
+                   "ISOCodebold")
+        span_style((doc.xpath("//tt//i") - doc.xpath("//tt//b//i")),
+                   "ISOCodeitalic")
+        span_style((doc.xpath("//b//tt") - doc.xpath("//b//i//tt")),
+                   "ISOCodebold")
+        span_style((doc.xpath("//i//tt") - doc.xpath("//i//b//tt")),
+                   "ISOCodeitalic")
+        span_style(doc.xpath("//tt"), "ISOCode")
+      end
+
+      def span_style(xpath, style)
+        xpath.each do |elem|
+          elem.name = "span"
+          elem["class"] = style
+        end
+      end
+
+      def smaller_code_style(doc)
+        smaller_code_style_names(doc)
+        smaller_code_style_names2spans(doc)
+      end
+
+      # TODO read $smallerfonsize from CSS definitions
+      SMALL_FONT_CLASSES =
+        %w(pseudocode Note tablefootnote figdl MsoISOTable MsoTableGrid
+           TableISO Example Notecontinued Noteindent Noteindentcontinued
+           ListNumber5- ListContinue5- BodyTextIndent22 BodyTextIndent32
+           Exampleindent2 Exampleindent2continued Noteindent2continued
+           Noteindent2 example_label note_label Tablebody MsoNormalTable).freeze
+
+      INLINE_CODE_CLASSES = %w(ISOCodebold ISOCodeitalic ISOCode).freeze
+
+      def smaller_code_style_names(doc)
+        klass = SMALL_FONT_CLASSES.map { |x| "@class = '#{x}'" }.join(" or ")
+        doc.xpath("//*[#{klass}]") - doc.xpath("//*[#{klass}]//*[#{klass}]")
+          .each do |d|
+            INLINE_CODE_CLASSES.each do |n|
+              d.xpath(".//span[@class = '#{n}']").each do |s|
+                s["class"] += "-"
+              end
+            end
+          end
+      end
+
+      def smaller_code_style_names2spans(doc)
+        INLINE_CODE_CLASSES.each do |n|
+          doc.xpath("//span[@class = '#{n}-']").each do |s|
+            s["class"] = n
+            s.children =
+              "<span style='font-size: 9pt;'>#{s.children.to_xml}</span>"
+          end
+        end
+      end
+
+      def word_annex_cleanup1(docxml, lvl)
+        docxml.xpath("//h#{lvl}[ancestor::*[@class = 'Section3']]").each do |h2|
+          h2.name = "p"
+          h2["class"] = "a#{lvl}"
+        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
+      end
+
+      def figure_toc_class
+        ["Figure Title", "Annex Figure Title", "AnnexFigureTitle"] + super
+      end
+    end
+  end
+end

data/lib/isodoc/iso/xref_section.rb

@@ -7,10 +7,9 @@ module IsoDoc
         clause.at(ns("./clause")) and
           @anchors[clause["id"]] = { label: nil, level: 1, type: "clause",
                                      xref: clause.at(ns("./title"))&.text }
-        i = Counter.new
+        i = Counter.new(0, prefix: "0.")
         clause.xpath(ns("./clause")).each do |c|
-          i.increment(c)
-          section_names1(c, "0.#{i.print}", 2)
+          section_names1(c, i.increment(c).print, 2)
         end
       end
 
@@ -27,10 +26,9 @@ module IsoDoc
             anchor_struct(i.print, nil, @labels["appendix"],
                           "clause").merge(level: 2, subtype: "annex",
                                           container: clause["id"])
-          j = Counter.new
+          j = Counter.new(0, prefix: "#{i.print}.")
           c.xpath(ns("./clause | ./references")).each do |c1|
-            j.increment(c1)
-            lbl = "#{@labels['appendix']} #{i.print}.#{j.print}"
+            lbl = "#{@labels['appendix']} #{j.increment(c1).print}"
             appendix_names1(c1, l10n(lbl), 3, clause["id"])
           end
         end
@@ -41,32 +39,29 @@ module IsoDoc
       def section_names1(clause, num, level)
         @anchors[clause["id"]] =
           { label: num, level: level, xref: num, subtype: "clause" }
-        i = Counter.new
+        i = Counter.new(0, prefix: "#{num}.")
         clause.xpath(ns("./clause | ./terms | ./term | ./definitions | " \
                         "./references"))
           .each do |c|
-          i.increment(c)
-          section_names1(c, "#{num}.#{i.print}", level + 1)
+          section_names1(c, i.increment(c).print, level + 1)
         end
       end
 
       def annex_names1(clause, num, level)
         @anchors[clause["id"]] = { label: num, xref: num, level: level,
                                    subtype: "annex" }
-        i = Counter.new
+        i = Counter.new(0, prefix: "#{num}.")
         clause.xpath(ns("./clause | ./references")).each do |c|
-          i.increment(c)
-          annex_names1(c, "#{num}.#{i.print}", level + 1)
+          annex_names1(c, i.increment(c).print, level + 1)
         end
       end
 
       def appendix_names1(clause, num, level, container)
         @anchors[clause["id"]] = { label: num, xref: num, level: level,
                                    container: container }
-        i = Counter.new
+        i = Counter.new(0, prefix: "#{num}.")
         clause.xpath(ns("./clause | ./references")).each do |c|
-          i.increment(c)
-          appendix_names1(c, "#{num}.#{i.print}", level + 1, container)
+          appendix_names1(c, i.increment(c).print, level + 1, container)
         end
       end
 

data/lib/metanorma/iso/base.rb

@@ -5,6 +5,7 @@ require "pathname"
 require "open-uri"
 require "isodoc"
 require "fileutils"
+require_relative "processor"
 
 module Metanorma
   module ISO
@@ -47,7 +48,9 @@ module Metanorma
       end
 
       def presentation_xml_converter(node)
-        IsoDoc::Iso::PresentationXMLConvert.new(html_extract_attributes(node))
+        IsoDoc::Iso::PresentationXMLConvert
+          .new(html_extract_attributes(node)
+          .merge(output_formats: ::Metanorma::Iso::Processor.new.output_formats))
       end
 
       def init(node)

data/lib/metanorma/iso/basicdoc.rng

@@ -346,6 +346,8 @@
           <ref name="keyword"/>
           <ref name="xref"/>
           <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
         </choice>
       </oneOrMore>
     </element>
@@ -623,6 +625,8 @@
           <ref name="eref"/>
           <ref name="xref"/>
           <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -636,6 +640,8 @@
           <ref name="eref"/>
           <ref name="xref"/>
           <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -648,6 +654,8 @@
           <ref name="eref"/>
           <ref name="xref"/>
           <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -655,7 +663,11 @@
   <define name="keyword">
     <element name="keyword">
       <zeroOrMore>
-        <ref name="PureTextElement"/>
+        <choice>
+          <ref name="PureTextElement"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
+        </choice>
       </zeroOrMore>
     </element>
   </define>
@@ -676,7 +688,11 @@
   <define name="strike">
     <element name="strike">
       <zeroOrMore>
-        <ref name="PureTextElement"/>
+        <choice>
+          <ref name="PureTextElement"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
+        </choice>
       </zeroOrMore>
     </element>
   </define>
@@ -898,44 +914,47 @@
   -->
   <define name="image">
     <element name="image">
-      <attribute name="id">
-        <data type="ID"/>
+      <ref name="Image"/>
+    </element>
+  </define>
+  <define name="Image">
+    <attribute name="id">
+      <data type="ID"/>
+    </attribute>
+    <attribute name="src">
+      <data type="anyURI"/>
+    </attribute>
+    <attribute name="mimetype"/>
+    <optional>
+      <attribute name="filename"/>
+    </optional>
+    <optional>
+      <attribute name="width">
+        <choice>
+          <data type="int"/>
+          <value>auto</value>
+        </choice>
       </attribute>
-      <attribute name="src">
+    </optional>
+    <optional>
+      <attribute name="height">
+        <choice>
+          <data type="int"/>
+          <value>auto</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="alt"/>
+    </optional>
+    <optional>
+      <attribute name="title"/>
+    </optional>
+    <optional>
+      <attribute name="longdesc">
         <data type="anyURI"/>
       </attribute>
-      <attribute name="mimetype"/>
-      <optional>
-        <attribute name="filename"/>
-      </optional>
-      <optional>
-        <attribute name="width">
-          <choice>
-            <data type="int"/>
-            <value>auto</value>
-          </choice>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="height">
-          <choice>
-            <data type="int"/>
-            <value>auto</value>
-          </choice>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="alt"/>
-      </optional>
-      <optional>
-        <attribute name="title"/>
-      </optional>
-      <optional>
-        <attribute name="longdesc">
-          <data type="anyURI"/>
-        </attribute>
-      </optional>
-    </element>
+    </optional>
   </define>
   <define name="video">
     <element name="video">

data/lib/metanorma/iso/biblio.rng

@@ -348,6 +348,9 @@
       <zeroOrMore>
         <ref name="contact"/>
       </zeroOrMore>
+      <optional>
+        <ref name="logo"/>
+      </optional>
     </element>
   </define>
   <define name="orgname">
@@ -366,6 +369,11 @@
       </choice>
     </element>
   </define>
+  <define name="logo">
+    <element name="logo">
+      <ref name="image"/>
+    </element>
+  </define>
   <define name="NameWithVariants">
     <element name="primary">
       <ref name="LocalizedString"/>
@@ -942,6 +950,7 @@
       <value>obsoleted</value>
       <value>confirmed</value>
       <value>updated</value>
+      <value>corrected</value>
       <value>issued</value>
       <value>transmitted</value>
       <value>copied</value>
@@ -1283,7 +1292,7 @@
       <value>mergedInto</value>
       <value>splits</value>
       <value>splitInto</value>
-      <value>instance</value>
+      <value>instanceOf</value>
       <value>hasInstance</value>
       <value>exemplarOf</value>
       <value>hasExemplar</value>

data/lib/metanorma/iso/cleanup.rb

@@ -1,6 +1,3 @@
-require "date"
-require "htmlentities"
-
 module Metanorma
   module ISO
     class Converter < Standoc::Converter
@@ -37,7 +34,6 @@ module Metanorma
         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
           prefix << x1
         end
       end
@@ -76,9 +72,7 @@ module Metanorma
       end
 
       def sort_biblio(bib)
-        bib.sort do |a, b|
-          sort_biblio_key(a) <=> sort_biblio_key(b)
-        end
+        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
@@ -90,15 +84,15 @@ module Metanorma
       # 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
+        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
+        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}"
@@ -241,6 +235,14 @@ module Metanorma
           end
         end
       end
+
+      def termdef_boilerplate_insert_location(xmldoc)
+        f = xmldoc.at(self.class::TERM_CLAUSE)
+        root = xmldoc.at("//sections/terms | //sections/clause[.//terms]")
+        !f || !root and return f || root
+        f.at("./preceding-sibling::clause") and return root
+        f
+      end
     end
   end
 end

data/lib/metanorma/iso/front_id.rb

@@ -84,7 +84,8 @@ module Metanorma
       end
 
       def iso_id_year(node)
-        node.attr("copyright-year") || node.attr("updated-date")
+        (node.attr("copyright-year") || node.attr("updated-date") ||
+         node.attr("published-date"))
           &.sub(/-.*$/, "") || Date.today.year
       end