metanorma-iso 2.1.1 → 2.1.2

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,56 +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",
-        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",
-      }.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
 
@@ -80,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) }
@@ -98,7 +55,7 @@ module IsoDoc
           <span lang="EN-GB"><span
           style='mso-element:field-begin'></span><span
           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"
+          "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
@@ -109,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-/, "--")
@@ -178,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)

data/lib/metanorma/iso/biblio.rng

@@ -614,12 +614,12 @@
     <optional>
       <ref name="fetched"/>
     </optional>
-    <choice>
-      <oneOrMore>
-        <ref name="btitle"/>
-      </oneOrMore>
+    <optional>
       <ref name="formattedref"/>
-    </choice>
+    </optional>
+    <oneOrMore>
+      <ref name="btitle"/>
+    </oneOrMore>
     <zeroOrMore>
       <ref name="bsource"/>
     </zeroOrMore>
@@ -986,36 +986,34 @@
           <ref name="SeriesType"/>
         </attribute>
       </optional>
-      <choice>
+      <optional>
         <ref name="formattedref"/>
-        <group>
-          <ref name="btitle"/>
-          <optional>
-            <ref name="bplace"/>
-          </optional>
-          <optional>
-            <ref name="seriesorganization"/>
-          </optional>
-          <optional>
-            <ref name="abbreviation"/>
-          </optional>
-          <optional>
-            <ref name="seriesfrom"/>
-          </optional>
-          <optional>
-            <ref name="seriesto"/>
-          </optional>
-          <optional>
-            <ref name="seriesnumber"/>
-          </optional>
-          <optional>
-            <ref name="seriespartnumber"/>
-          </optional>
-          <optional>
-            <ref name="seriesrun"/>
-          </optional>
-        </group>
-      </choice>
+      </optional>
+      <ref name="btitle"/>
+      <optional>
+        <ref name="bplace"/>
+      </optional>
+      <optional>
+        <ref name="seriesorganization"/>
+      </optional>
+      <optional>
+        <ref name="abbreviation"/>
+      </optional>
+      <optional>
+        <ref name="seriesfrom"/>
+      </optional>
+      <optional>
+        <ref name="seriesto"/>
+      </optional>
+      <optional>
+        <ref name="seriesnumber"/>
+      </optional>
+      <optional>
+        <ref name="seriespartnumber"/>
+      </optional>
+      <optional>
+        <ref name="seriesrun"/>
+      </optional>
     </element>
   </define>
   <define name="SeriesType">

data/lib/metanorma/iso/boilerplate-fr.xml

@@ -1,6 +1,9 @@
 <boilerplate>
   <copyright-statement>
     <clause>
+      {% if stage_int >= 40 %}
+      <title>DOCUMENT PROTÉGÉ PAR COPYRIGHT</title>
+      {% endif %}
       <p id="boilerplate-year">&#xa9; <span class="std_publisher">{{ agency }}</span> <span class="std_docNumber">{{ docyear }}</span></p>
 
   <p id="boilerplate-message">

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

@@ -1,6 +1,9 @@
 <boilerplate>
   <copyright-statement>
     <clause>
+      {% if stage_int >= 40 %}
+      <title>ДОКУМЕНТ, ОХРАНЯЕМЫЙ АВТОРСКИМ ПРАВОМ</title>
+      {% endif %}
       <p id="boilerplate-year">&#xa9; <span class="std_publisher">{{ agency }}</span> <span class="std_docNumber">{{ docyear }}</span></p>
 
   <p id="boilerplate-message">

data/lib/metanorma/iso/boilerplate.xml

@@ -1,6 +1,9 @@
 <boilerplate>
   <copyright-statement>
     <clause>
+      {% if stage_int >= 40 %}
+      <title>COPYRIGHT PROTECTED DOCUMENT</title>
+      {% endif %}
       <p id="boilerplate-year">&#xa9; <span class="std_publisher">{{ agency }}</span> <span class="std_docNumber">{{ docyear }}</span></p>
 
   <p id="boilerplate-message">

data/lib/metanorma/iso/cleanup.rb

@@ -40,7 +40,7 @@ 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
+          # (x1 == "ISO" and prefix.unshift("ISO")) or prefix << x1
           prefix << x1
         end
       end
@@ -209,6 +209,33 @@ module Metanorma
         @vocab and return
         super
       end
+
+      def bibdata_cleanup(xmldoc)
+        super
+        approval_groups_rename(xmldoc)
+        editorial_groups_agency(xmldoc)
+      end
+
+      def approval_groups_rename(xmldoc)
+        %w(technical-committee subcommittee workgroup).each do |v|
+          xmldoc.xpath("//bibdata//approval-#{v}").each do |a|
+            a.name = v
+          end
+        end
+      end
+
+      def editorial_groups_agency(xmldoc)
+        pubs = xmldoc.xpath("//bibdata/contributor[role/@type = 'publisher']/"\
+                            "organization").each_with_object([]) do |p, m|
+          x = p.at("./abbreviation") || p.at("./name") or next
+          m << x.text
+        end
+        xmldoc.xpath("//bibdata/ext/editorialgroup").each do |e|
+          pubs.reverse.each do |p|
+            e.children.first.previous = "<agency>#{p}</agency>"
+          end
+        end
+      end
     end
   end
 end

data/lib/metanorma/iso/front.rb

@@ -81,11 +81,35 @@ module Metanorma
       end
 
       def metadata_committee(node, xml)
+        metadata_editorial_committee(node, xml)
+        metadata_approval_committee(node, xml)
+      end
+
+      def metadata_editorial_committee(node, xml)
         xml.editorialgroup do |a|
-          committee_component("technical-committee", node, a)
-          committee_component("subcommittee", node, a)
-          committee_component("workgroup", node, a)
-          node.attr("secretariat") && a.secretariat(node.attr("secretariat"))
+          %w(technical-committee subcommittee workgroup).each do |v|
+            committee_component(v, node, a)
+          end
+          node.attr("secretariat") and a.secretariat(node.attr("secretariat"))
+        end
+      end
+
+      def metadata_approval_committee(node, xml)
+        types = %w(technical-committee subcommittee workgroup)
+        node.attr("approval-technical-committee-number") and
+          types = %w(approval-technical-committee approval-subcommittee
+                     approval-workgroup)
+        xml.approvalgroup do |a|
+          metadata_approval_agency(a, node.attr("approval-agency")
+            &.split(%r{[/,;]}))
+          types.each { |v| committee_component(v, node, a) }
+        end
+      end
+
+      def metadata_approval_agency(xml, list)
+        list = ["ISO"] if list.nil? || list.empty?
+        list.each do |v|
+          xml.agency v
         end
       end
 
@@ -146,7 +170,8 @@ module Metanorma
       end
 
       def relaton_relations
-        super + %w(obsoletes successor-of manifestation-of related annotation-of)
+        super + %w(obsoletes successor-of manifestation-of related
+                   annotation-of)
       end
 
       def relaton_relation_descriptions
@@ -162,7 +187,7 @@ module Metanorma
           "identical-adopted-from" => "adoptedFrom",
           "modified-adopted-from" => "adoptedFrom",
           "related-directive" => "related",
-          "related-mandate" => "related",
+          "related-mandate" => "related"
         )
       end
     end

data/lib/metanorma/iso/front_id.rb

@@ -202,6 +202,8 @@ module Metanorma
         %w(40 50).include?(stage) && i = node.attr("iteration") and
           itersuffix = ".#{i}"
         return docnum if abbr.nil? || abbr.empty? # prefixes added in cleanup
+
+        typeabbr = "" if %w(DTS FDTS).include?(abbr.sub(/\s+$/, ""))
         return "/#{abbr}#{typeabbr} #{docnum}#{itersuffix}" unless @amd
 
         a = docnum.split(%r{/})

data/lib/metanorma/iso/isodoc.rng

@@ -282,6 +282,9 @@
             <ref name="MultilingualRenderingType"/>
           </attribute>
         </optional>
+        <optional>
+          <ref name="tname"/>
+        </optional>
         <oneOrMore>
           <ref name="ul_li"/>
         </oneOrMore>
@@ -324,6 +327,9 @@
             </choice>
           </attribute>
         </optional>
+        <optional>
+          <ref name="tname"/>
+        </optional>
         <oneOrMore>
           <ref name="li"/>
         </oneOrMore>
@@ -360,6 +366,9 @@
             <ref name="MultilingualRenderingType"/>
           </attribute>
         </optional>
+        <optional>
+          <ref name="tname"/>
+        </optional>
         <oneOrMore>
           <ref name="dt"/>
           <ref name="dd"/>

data/lib/metanorma/iso/isostandard.rng

@@ -45,6 +45,7 @@
         <ref name="horizontal"/>
       </optional>
       <ref name="editorialgroup"/>
+      <ref name="approvalgroup"/>
       <zeroOrMore>
         <ref name="ics"/>
       </zeroOrMore>
@@ -249,6 +250,7 @@
         <value>warning</value>
         <value>important</value>
         <value>safety precautions</value>
+        <value>editorial</value>
       </choice>
     </define>
     <define name="preface">
@@ -308,18 +310,7 @@
     </define>
     <define name="editorialgroup">
       <element name="editorialgroup">
-        <oneOrMore>
-          <ref name="technical-committee"/>
-        </oneOrMore>
-        <zeroOrMore>
-          <ref name="subcommittee"/>
-        </zeroOrMore>
-        <zeroOrMore>
-          <ref name="workgroup"/>
-        </zeroOrMore>
-        <optional>
-          <ref name="secretariat"/>
-        </optional>
+        <ref name="ISOProjectGroup"/>
       </element>
     </define>
     <define name="Content-Section">
@@ -367,6 +358,33 @@
     </define>
   </include>
   <!-- end overrides -->
+  <define name="ISOProjectGroup">
+    <zeroOrMore>
+      <ref name="agency"/>
+    </zeroOrMore>
+    <oneOrMore>
+      <ref name="technical-committee"/>
+    </oneOrMore>
+    <zeroOrMore>
+      <ref name="subcommittee"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="workgroup"/>
+    </zeroOrMore>
+    <optional>
+      <ref name="secretariat"/>
+    </optional>
+  </define>
+  <define name="approvalgroup">
+    <element name="approvalgroup">
+      <ref name="ISOProjectGroup"/>
+    </element>
+  </define>
+  <define name="agency">
+    <element name="agency">
+      <text/>
+    </element>
+  </define>
   <!--
     We display the Normative References between scope and terms; but to keep the
     grammar simple, we keep the references together

data/lib/metanorma/iso/macros.rb

@@ -0,0 +1,29 @@
+module Metanorma
+  module ISO
+    class EditorAdmonitionBlock < Asciidoctor::Extensions::BlockProcessor
+      use_dsl
+      named :EDITOR
+      on_contexts :example, :paragraph
+
+      def process(parent, reader, attrs)
+        attrs["name"] = "editorial"
+        attrs["caption"] = "EDITOR"
+        create_block(parent, :admonition, reader.lines, attrs,
+                     content_model: :compound)
+      end
+    end
+
+    class EditorInlineAdmonitionBlock < Asciidoctor::Extensions::Treeprocessor
+      def process(document)
+        (document.find_by context: :paragraph).each do |para|
+          next unless /^EDITOR: /.match? para.lines[0]
+
+          para.set_attr("name", "editorial")
+          para.set_attr("caption", "EDITOR")
+          para.lines[0].sub!(/^EDITOR: /, "")
+          para.context = :admonition
+        end
+      end
+    end
+  end
+end