metanorma-iso 2.1.0 → 2.1.3

data/lib/isodoc/iso/word_dis_cleanup.rb

@@ -0,0 +1,235 @@
+module IsoDoc
+  module Iso
+    class WordDISConvert < WordConvert
+      def style_cleanup(docxml)
+        super
+        dis_styles(docxml)
+      end
+
+      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 dis_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" }
+      end
+
+      def dis_styles1(docxml)
+        amd_style(docxml)
+        code_style(docxml)
+        figure_style(docxml)
+        note_style(docxml)
+        example_style(docxml)
+        quote_style(docxml)
+        dis_style_interactions(docxml)
+      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)
+        return unless @meta.get[:doctype] == "Amendment"
+
+        docxml.xpath("//div[@class = 'WordSection3']//h1").each do |h|
+          h.name = "p"
+          h["style"] = "font-style:italic;page-break-after:avoid;"
+        end
+      end
+
+      def quote_style(docxml)
+        docxml.xpath("//div[@class = 'Quote' or @class = 'Note' or "\
+                     "@class = 'Example' or @class = 'Admonition']").each do |d|
+                       quote_style1(d)
+                     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 remove_note_label(doc)
+        doc.xpath("//span[@class = 'note_label' or @class = 'example_label']")
+          .each do |s|
+          s.replace(s.children)
+        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|
+            next if p["class"] && p["class"] != "Example"
+
+            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|
+            next if p["class"] && p["class"] != "Note"
+
+            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 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 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_cleanup(docxml)
+        word_table_cell_para(docxml)
+        super
+        word_section_end_empty_para(docxml)
+        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(p.to_xml.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(p.to_xml.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"
+          t.delete("header")
+          if t.at("./p |./div")
+            t.xpath("./p | ./div").each { |p| p["class"] = s }
+          else
+            t.children = "<div class='#{s}'>#{t.children.to_xml}</div>"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/isodoc/iso/word_dis_convert.rb

@@ -1,16 +1,16 @@
+require_relative "word_dis_cleanup"
+
 module IsoDoc
   module Iso
     class WordDISConvert < WordConvert
       def default_file_locations(_options)
-        {
-          wordstylesheet: html_doc_path("wordstyle-dis.scss"),
+        { wordstylesheet: html_doc_path("wordstyle-dis.scss"),
           standardstylesheet: html_doc_path("isodoc-dis.scss"),
           header: html_doc_path("header-dis.html"),
           wordcoverpage: html_doc_path("word_iso_titlepage-dis.html"),
           wordintropage: html_doc_path("word_iso_intro-dis.html"),
           ulstyle: "l3",
-          olstyle: "l2",
-        }
+          olstyle: "l2" }
       end
 
       def initialize(options)
@@ -19,47 +19,20 @@ module IsoDoc
         super
       end
 
-      def init_dis; end
+      def init_dis(options); end
 
-      def style_cleanup(docxml)
+      def convert1(docxml, filename, dir)
+        update_coverpage(docxml)
         super
-        dis_styles(docxml)
       end
 
-      STYLESMAP = {
-        AltTerms: "AdmittedTerm",
-        TableFootnote: "Tablefootnote",
-        formula: "Formula",
-        note: "Note",
-        NormRef: "RefNorm",
-        biblio: "BiblioEntry",
-        MsoNormal: "MsoBodyText",
-        FigureTitle: "Figuretitle",
-      }.freeze
-
-      def dis_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" }
-      end
-
-      def dis_styles1(docxml)
-        code_style(docxml)
-        figure_style(docxml)
-        example_style(docxml)
-      end
-
-      def example_style(docxml)
-        docxml.xpath("//div[@class = 'Example']").each do |d|
-          d.xpath("./p").each_with_index do |p, i|
-            next if p["class"] && p["class"] != "Example"
-
-            p["class"] = (i.zero? ? "Example" : "Examplecontinued")
-          end
+      def update_coverpage(docxml)
+        stage = docxml.at(ns("//bibdata/status/stage"))&.text
+        substage = docxml.at(ns("//bibdata/status/substage"))&.text
+        if /^9/.match?(stage) || (stage == "60" && substage == "60")
+          @wordcoverpage = html_doc_path("word_iso_titlepage.html")
+        elsif stage == "60" && substage == "00"
+          @wordcoverpage = html_doc_path("word_iso_titlepage-prf.html")
         end
       end
 
@@ -71,13 +44,6 @@ module IsoDoc
         { class: "Tabletitle", style: "text-align:center;" }
       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 span_parse(node, out)
         out.span **{ class: node["class"] } do |x|
           node.children.each { |n| parse(n, x) }
@@ -88,8 +54,8 @@ module IsoDoc
         <<~TOC.freeze
           <span lang="EN-GB"><span
           style='mso-element:field-begin'></span><span
-          style='mso-spacerun:yes'>&#xA0;</span>TOC \\o &quot;2-#{level}&quot; \\h \\z \\t
-          &quot;Heading 1;1;ANNEX;1;Biblio Title;1;Foreword Title;1;Intro Title;1;ANNEXN;1;ANNEXZ;1;na2;1;na3;1;na4;1;na5;1;na6;1;Title;1;Base_Heading;1;Box-title;1;Front Head;1;Index Head;1;AMEND Terms Heading;1;AMEND Heading 1 Unnumbered;1&quot;
+          style='mso-spacerun:yes'>&#xA0;</span>TOC \\o "2-#{level}" \\h \\z \\t
+          "Heading 1,1,ANNEX,1,Biblio Title,1,Foreword Title,1,Intro Title,1,ANNEXN,1,ANNEXZ,1,na2,1,na3,1,na4,1,na5,1,na6,1,Title,1,Base_Heading,1,Box-title,1,Front Head,1,Index Head,1,AMEND Terms Heading,1,AMEND Heading 1 Unnumbered,1"
            <span style='mso-element:field-separator'></span></span>
         TOC
       end
@@ -100,60 +66,10 @@ module IsoDoc
         ret
       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 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 make_tr_attr(cell, row, totalrows, header)
         super.merge(header: header)
       end
 
-      def word_cleanup(docxml)
-        word_table_cell_para(docxml)
-        super
-      end
-
-      def word_table_cell_para(docxml)
-        docxml.xpath("//td | //th").each do |t|
-          s = t["header"] == "true" ? "Tableheader" : "Tablebody"
-          t.delete("header")
-          if t.at("./p |./div")
-            t.xpath("./p | ./div").each { |p| p["class"] = s }
-          else
-            t.children = "<div class='#{s}'>#{t.children.to_xml}</div>"
-          end
-        end
-      end
-
       def toWord(result, filename, dir, header)
         result = from_xhtml(word_cleanup(to_xhtml(result)))
           .gsub(/-DOUBLE_HYPHEN_ESCAPE-/, "--")
@@ -169,6 +85,38 @@ module IsoDoc
         header&.unlink
         @wordstylesheet.unlink if @wordstylesheet.is_a?(Tempfile)
       end
+
+      def middle_title(_isoxml, out)
+        middle_title_dis(out)
+      end
+
+      def middle_title_dis(out)
+        out.p(**{ class: "zzSTDTitle" }) do |p|
+          p << @meta.get[:doctitleintro]
+          @meta.get[:doctitleintro] && @meta.get[:doctitlemain] and p << " &#x2014; "
+          p << @meta.get[:doctitlemain]
+          @meta.get[:doctitlemain] && @meta.get[:doctitlepart] and p << " &#x2014; "
+          if @meta.get[:doctitlepart]
+            b = @meta.get[:doctitlepartlabel] and
+              p << "<span style='font-weight:normal'>#{b}</span> "
+            p << " #{@meta.get[:doctitlepart]}"
+          end
+          @meta.get[:doctitleamdlabel] || @meta.get[:doctitleamd] ||
+            @meta.get[:doctitlecorrlabel] and middle_title_dis_amd(p)
+        end
+      end
+
+      def middle_title_dis_amd(para)
+        para.span(**{ style: "font-weight:normal" }) do |p|
+          if a = @meta.get[:doctitleamdlabel]
+            p << " #{a}"
+            a = @meta.get[:doctitleamd] and p << ": #{a}"
+          end
+          if a = @meta.get[:doctitlecorrlabel]
+            p << " #{a}"
+          end
+        end
+      end
     end
   end
 end

data/lib/isodoc/iso/xref.rb

@@ -77,11 +77,10 @@ module IsoDoc
         i = Counter.new
         clause.xpath(ns("./appendix")).each do |c|
           i.increment(c)
-          @anchors[c["id"]] = anchor_struct(i.print, nil, @labels["appendix"],
-                                            "clause")
-          @anchors[c["id"]][:level] = 2
-          @anchors[c["id"]][:subtype] = "annex"
-          @anchors[c["id"]][:container] = clause["id"]
+          @anchors[c["id"]] =
+            anchor_struct(i.print, nil, @labels["appendix"],
+                          "clause").merge(level: 2, subtype: "annex",
+                                          container: clause["id"])
           j = Counter.new
           c.xpath(ns("./clause | ./references")).each do |c1|
             j.increment(c1)
@@ -92,7 +91,7 @@ module IsoDoc
       end
 
       # subclauses are not prefixed with "Clause"
-      # retaining sybtupe for the semantics
+      # retaining subtype for the semantics
       def section_names1(clause, num, level)
         @anchors[clause["id"]] =
           { label: num, level: level, xref: num, subtype: "clause" }
@@ -189,6 +188,35 @@ module IsoDoc
       def annex_name_lbl(clause, num)
         super.sub(%r{<br/>(.*)$}, "<br/><span class='obligation'>\\1</span>")
       end
+
+      def list_anchor_names(sections)
+        sections.each do |s|
+          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|
+            @anchors[n["id"]] = anchor_struct(increment_label(notes, n, c), n,
+                                              @labels["list"], "list", false)
+            list_item_anchor_names(n, @anchors[n["id"]], 1, "",
+                                   !single_ol_for_xrefs?(notes))
+          end
+          list_anchor_names(s.xpath(ns(CHILD_SECTIONS)))
+        end
+      end
+
+      # all li in the ol in lists are consecutively numbered through @start
+      def single_ol_for_xrefs?(lists)
+        return true if lists.size == 1
+
+        start = 0
+        lists.each_with_index do |l, i|
+          next if i.zero?
+
+          start += lists[i - 1].xpath(ns("./li")).size
+          return false unless l["start"]&.to_i == start + 1
+        end
+        true
+      end
     end
   end
 end

data/lib/metanorma/iso/base.rb

@@ -5,10 +5,16 @@ require "pathname"
 require "open-uri"
 require "isodoc"
 require "fileutils"
+require_relative "macros"
 
 module Metanorma
   module ISO
     class Converter < Standoc::Converter
+      Asciidoctor::Extensions.register do
+        block Metanorma::ISO::EditorAdmonitionBlock
+        treeprocessor Metanorma::ISO::EditorInlineAdmonitionBlock
+      end
+
       XML_ROOT_TAG = "iso-standard".freeze
       XML_NAMESPACE = "https://www.metanorma.org/ns/iso".freeze
 
@@ -25,6 +31,10 @@ module Metanorma
         IsoDoc::Iso::WordConvert.new(doc_extract_attributes(node))
       end
 
+      def doc_extract_attributes(node)
+        super.merge(isowordtemplate: node.attr("iso-word-template"))
+      end
+
       def pdf_converter(node)
         return nil if node.attr("no-pdf")
 
@@ -49,7 +59,16 @@ module Metanorma
 
       def ol_attrs(node)
         attr_code(keep_attrs(node)
-                  .merge(id: ::Metanorma::Utils::anchor_or_uuid(node)))
+                  .merge(id: ::Metanorma::Utils::anchor_or_uuid(node),
+                         start: node.attr("start")))
+      end
+
+      def admonition_name(node)
+        name = super
+        a = node.attr("type") and ["editorial"].each do |t|
+          name = t if a.casecmp(t).zero?
+        end
+        name
       end
 
       def outputs(node, ret)