metanorma-iso 2.1.2 → 2.1.5

data/lib/isodoc/iso/metadata.rb

@@ -230,7 +230,7 @@ module IsoDoc
         ret = [ag]
         ret << sc_base(xml, "approvalgroup")
         ret << wg_base(xml, "approvalgroup")
-        set(:approvalgroup, ret)
+        set(:approvalgroup, ret.compact)
       end
 
       def secretariat(xml)

data/lib/isodoc/iso/presentation_xml_convert.rb

@@ -38,7 +38,7 @@ module IsoDoc
         lbl = if n.nil? || blank?(n[:label]) then @i18n.example
               else l10n("#{@i18n.example} #{n[:label]}")
               end
-        prefix_name(node, " — ", lbl, "name")
+        prefix_name(node, block_delim, lbl, "name")
       end
 
       def example_span_label(_node, div, name)
@@ -196,6 +196,10 @@ module IsoDoc
         type
       end
 
+      def related1(node)
+        node.remove
+      end
+
       include Init
     end
   end

data/lib/isodoc/iso/word_cleanup.rb

@@ -11,11 +11,10 @@ module IsoDoc
         end
       end
 
-      # force Annex h2 down to be p.h2Annex, so it is not picked up by ToC
       def word_annex_cleanup1(docxml, lvl)
         docxml.xpath("//h#{lvl}[ancestor::*[@class = 'Section3']]").each do |h2|
           h2.name = "p"
-          h2["class"] = "h#{lvl}Annex"
+          h2["class"] = "a#{lvl}"
         end
       end
 
@@ -37,16 +36,51 @@ module IsoDoc
 
       def style_cleanup(docxml)
         word_annex_cleanup_h1(docxml)
-        style_cleanup1(docxml)
+        figure_style(docxml)
+        new_styles(docxml)
       end
 
-      def style_cleanup1(docxml)
-        docxml.xpath("//*[@class = 'example']").each do |p|
-          p["class"] = "Example"
+      def figure_style(docxml)
+        docxml.xpath("//div[@class = 'figure']").each do |f|
+          f["style"] ||= ""
+          f["style"] += "text-align:center;"
         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 quote_style1(div)
+        div.xpath(".//li").each do |p|
+          p["style"] ||= ""
+          p["style"] += "font-size:#{default_fonts({})[:smallerfontsize]};"
+        end
+      end
+
+      STYLESMAP = {
+        example: "Example",
+        note: "Note",
+        Sourcecode: "Code",
+        tabletitle: "Tabletitle",
+        Biblio: "MsoNormal",
+        figure: "MsoNormal",
+        SourceTitle: "FigureTitle",
+      }.freeze
+
+      def new_styles(docxml)
+        STYLESMAP.each do |k, v|
+          docxml.xpath("//*[@class = '#{k}']").each { |s| s["class"] = v }
+        end
+        docxml.xpath("//div[@class = 'Section3']//p[@class = 'Tabletitle']")
+          .each { |t| t["class"] = "AnnexTableTitle" }
         docxml.xpath("//*[@class = 'zzHelp']/p[not(@class)]").each do |p|
           p["class"] = "zzHelp"
         end
+        quote_style(docxml)
       end
 
       def authority_hdr_cleanup(docxml)

data/lib/isodoc/iso/word_dis_cleanup.rb

@@ -1,11 +1,6 @@
 module IsoDoc
   module Iso
     class WordDISConvert < WordConvert
-      def style_cleanup(docxml)
-        super
-        dis_styles(docxml)
-      end
-
       STYLESMAP = {
         AltTerms: "AdmittedTerm",
         TableFootnote: "Tablefootnote",
@@ -30,7 +25,7 @@ module IsoDoc
         zzCopyright1: "zzCopyright",
       }.freeze
 
-      def dis_styles(docxml)
+      def new_styles(docxml)
         STYLESMAP.each do |k, v|
           docxml.xpath("//*[@class = '#{k}']").each { |s| s["class"] = v }
         end
@@ -46,8 +41,8 @@ module IsoDoc
         figure_style(docxml)
         note_style(docxml)
         example_style(docxml)
-        quote_style(docxml)
         dis_style_interactions(docxml)
+        quote_style(docxml)
       end
 
       def dis_style_interactions(docxml)
@@ -68,13 +63,6 @@ module IsoDoc
         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|
@@ -230,6 +218,14 @@ module IsoDoc
           end
         end
       end
+
+      def make_FigureWordToC(docxml)
+        super.sub(/FigureTitle,figuretitle/, "Figure title,Annex Figure Title")
+      end
+
+      def make_TableWordToC(docxml)
+        super.sub(/TableTitle,tabletitle/, "Table title,Annex Table Title")
+      end
     end
   end
 end

data/lib/metanorma/iso/base.rb

@@ -5,16 +5,10 @@ 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
 

data/lib/metanorma/iso/biblio.rng

@@ -623,6 +623,97 @@
     <zeroOrMore>
       <ref name="bsource"/>
     </zeroOrMore>
+    <oneOrMore>
+      <ref name="docidentifier"/>
+    </oneOrMore>
+    <optional>
+      <ref name="docnumber"/>
+    </optional>
+    <zeroOrMore>
+      <ref name="bdate"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="contributor"/>
+    </zeroOrMore>
+    <optional>
+      <ref name="edition"/>
+    </optional>
+    <zeroOrMore>
+      <ref name="version"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="biblionote"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="language"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="script"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="bibabstract"/>
+    </zeroOrMore>
+    <optional>
+      <ref name="status"/>
+    </optional>
+    <zeroOrMore>
+      <ref name="copyright"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="docrelation"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="series"/>
+    </zeroOrMore>
+    <optional>
+      <ref name="medium"/>
+    </optional>
+    <zeroOrMore>
+      <ref name="bplace"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="bprice"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="extent"/>
+    </zeroOrMore>
+    <optional>
+      <ref name="bibliographic_size"/>
+    </optional>
+    <zeroOrMore>
+      <ref name="accesslocation"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="license"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="bclassification"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="bkeyword"/>
+    </zeroOrMore>
+    <optional>
+      <ref name="validity"/>
+    </optional>
+  </define>
+  <define name="ReducedBibliographicItem">
+    <optional>
+      <attribute name="type">
+        <ref name="BibItemType"/>
+      </attribute>
+    </optional>
+    <optional>
+      <ref name="fetched"/>
+    </optional>
+    <optional>
+      <ref name="formattedref"/>
+    </optional>
+    <zeroOrMore>
+      <ref name="btitle"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="bsource"/>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="docidentifier"/>
     </zeroOrMore>
@@ -638,9 +729,9 @@
     <optional>
       <ref name="edition"/>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="version"/>
-    </optional>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="biblionote"/>
     </zeroOrMore>
@@ -833,6 +924,12 @@
           <data type="boolean"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="language"/>
+      </optional>
+      <optional>
+        <attribute name="script"/>
+      </optional>
       <text/>
     </element>
   </define>
@@ -1172,7 +1269,7 @@
         </element>
       </optional>
       <element name="bibitem">
-        <ref name="BibliographicItem"/>
+        <ref name="ReducedBibliographicItem"/>
       </element>
       <choice>
         <zeroOrMore>
@@ -1197,9 +1294,9 @@
       <optional>
         <ref name="revision-date"/>
       </optional>
-      <zeroOrMore>
+      <optional>
         <ref name="draft"/>
-      </zeroOrMore>
+      </optional>
     </element>
   </define>
   <define name="vedition">

data/lib/metanorma/iso/cleanup.rb

@@ -1,8 +1,5 @@
 require "date"
-require "nokogiri"
 require "htmlentities"
-require "json"
-require "pathname"
 
 module Metanorma
   module ISO
@@ -15,8 +12,7 @@ module Metanorma
 
       POST_NORMREF_FOOTNOTES =
         "//sections//clause[not(@type = 'scope')]//fn | "\
-        "//annex//fn | "\
-        "//references[@normative = 'false']//fn".freeze
+        "//annex//fn | //references[@normative = 'false']//fn".freeze
 
       def other_footnote_renumber(xmldoc)
         seen = {}
@@ -80,7 +76,8 @@ module Metanorma
         return 2 if bib.at("#{PUBLISHER}[abbreviation = 'IEC']")
         return 2 if bib.at("#{PUBLISHER}[name = 'International "\
                            "Electrotechnical Commission']")
-        return 3 if bib.at("./docidentifier[@type][not(#{OTHERIDS})]")
+        return 3 if bib.at("./docidentifier[@type][not(#{OTHERIDS})]") ||
+          bib.at("./docidentifier[not(@type)]")
 
         4
       end
@@ -102,7 +99,8 @@ module Metanorma
       def sort_biblio_key(bib)
         pubclass = pub_class(bib)
         num = bib&.at("./docnumber")&.text
-        id = bib&.at("./docidentifier[not(#{OTHERIDS})]")
+        id = bib&.at("./docidentifier[@primary]") ||
+          bib&.at("./docidentifier[not(#{OTHERIDS})]")
         metaid = bib&.at("./docidentifier[@type = 'metanorma']")&.text
         abbrid = metaid unless /^\[\d+\]$/.match?(metaid)
         /\d-(?<partid>\d+)/ =~ id&.text
@@ -118,9 +116,7 @@ module Metanorma
         super
         return unless @amd
 
-        xml.xpath("//*[@inline-header]").each do |h|
-          h.delete("inline-header")
-        end
+        xml.xpath("//*[@inline-header]").each { |h| h.delete("inline-header") }
       end
 
       def boilerplate_file(_xmldoc)
@@ -170,8 +166,7 @@ module Metanorma
 
             if id = replacement_standard(b)
               insert_unpub_note(b, @i18n.cancelled_and_replaced.sub(/%/, id))
-            else
-              insert_unpub_note(b, @i18n.withdrawn)
+            else insert_unpub_note(b, @i18n.withdrawn)
             end
           end
       end
@@ -214,25 +209,43 @@ module Metanorma
         super
         approval_groups_rename(xmldoc)
         editorial_groups_agency(xmldoc)
+        editorial_group_types(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
+          xmldoc.xpath("//bibdata//approval-#{v}").each { |a| a.name = v }
         end
       end
 
       def editorial_groups_agency(xmldoc)
-        pubs = xmldoc.xpath("//bibdata/contributor[role/@type = 'publisher']/"\
-                            "organization").each_with_object([]) do |p, m|
+        pubs = extract_publishers(xmldoc)
+        xmldoc.xpath("//bibdata/ext/editorialgroup").each do |e|
+          pubs.reverse.each do |p|
+            if e.children.empty? then e << "<agency>#{p}</agency>"
+            else e.children.first.previous = "<agency>#{p}</agency>"
+            end
+          end
+        end
+      end
+
+      def extract_publishers(xmldoc)
+        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
+
+      DEFAULT_EDGROUP_TYPE = { "technical-committee": "TC",
+                               subcommittee: "SC", workgroup: "WG" }.freeze
+
+      def editorial_group_types(xmldoc)
+        %w(technical-committee subcommittee workgroup).each do |v|
+          xmldoc.xpath("//bibdata//#{v} | //bibdata//approval-#{v}").each do |g|
+            next if g["type"]
+
+            g["type"] = DEFAULT_EDGROUP_TYPE[v.to_sym]
           end
         end
       end

data/lib/metanorma/iso/front.rb

@@ -88,24 +88,31 @@ module Metanorma
       def metadata_editorial_committee(node, xml)
         xml.editorialgroup do |a|
           %w(technical-committee subcommittee workgroup).each do |v|
-            committee_component(v, node, a)
+            node.attr("#{v}-number") and 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)
+        types = metadata_approval_committee_types(node)
         xml.approvalgroup do |a|
           metadata_approval_agency(a, node.attr("approval-agency")
             &.split(%r{[/,;]}))
-          types.each { |v| committee_component(v, node, a) }
+          types.each do |v|
+            node.attr("#{v}-number") and committee_component(v, node, a)
+          end
         end
       end
 
+      def metadata_approval_committee_types(node)
+        types = %w(technical-committee subcommittee workgroup)
+        node.attr("approval-technical-committee-number") and
+          types = %w(approval-technical-committee approval-subcommittee
+                     approval-workgroup)
+        types
+      end
+
       def metadata_approval_agency(xml, list)
         list = ["ISO"] if list.nil? || list.empty?
         list.each do |v|

data/lib/metanorma/iso/isodoc.rng

@@ -69,6 +69,17 @@
         </zeroOrMore>
       </element>
     </define>
+    <define name="AdmonitionType">
+      <choice>
+        <value>warning</value>
+        <value>note</value>
+        <value>tip</value>
+        <value>important</value>
+        <value>caution</value>
+        <value>statement</value>
+        <value>editorial</value>
+      </choice>
+    </define>
     <define name="index">
       <element name="index">
         <optional>
@@ -116,6 +127,11 @@
             <data type="boolean"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="suppress_identifier">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <ref name="BibliographicItem"/>
       </element>
     </define>
@@ -703,6 +719,9 @@
       <optional>
         <attribute name="tag"/>
       </optional>
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <optional>
         <attribute name="multilingual-rendering">
           <ref name="MultilingualRenderingType"/>
@@ -738,6 +757,9 @@
         <optional>
           <attribute name="tag"/>
         </optional>
+        <optional>
+          <attribute name="type"/>
+        </optional>
         <optional>
           <attribute name="multilingual-rendering">
             <ref name="MultilingualRenderingType"/>
@@ -2059,6 +2081,7 @@
       <value>compare</value>
       <value>contrast</value>
       <value>see</value>
+      <value>seealso</value>
     </choice>
   </define>
   <define name="deprecates">
@@ -2481,6 +2504,16 @@
           <text/>
         </element>
       </optional>
+      <optional>
+        <element name="amendment">
+          <text/>
+        </element>
+      </optional>
+      <optional>
+        <element name="corrigendum">
+          <text/>
+        </element>
+      </optional>
       <optional>
         <element name="language">
           <text/>

data/lib/metanorma/iso/isostandard.rng

@@ -45,7 +45,9 @@
         <ref name="horizontal"/>
       </optional>
       <ref name="editorialgroup"/>
-      <ref name="approvalgroup"/>
+      <optional>
+        <ref name="approvalgroup"/>
+      </optional>
       <zeroOrMore>
         <ref name="ics"/>
       </zeroOrMore>

data/lib/metanorma/iso/validate_section.rb

@@ -202,18 +202,6 @@ module Metanorma
         end
       end
 
-      def asset_style(root)
-        root.xpath("//example | //termexample").each { |e| example_style(e) }
-        root.xpath("//definition/verbal-definition").each do |e|
-          definition_style(e)
-        end
-        root.xpath("//note").each { |e| note_style(e) }
-        root.xpath("//fn").each { |e| footnote_style(e) }
-        root.xpath(ASSETS_TO_STYLE).each { |e| style(e, extract_text(e)) }
-        norm_bibitem_style(root)
-        super
-      end
-
       def subclause_validate(root)
         root.xpath("//clause/clause/clause/clause/clause/clause/clause/clause")
           .each do |c|

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "2.1.2".freeze
+    VERSION = "2.1.5".freeze
   end
 end

data/spec/isodoc/blocks_spec.rb

@@ -297,7 +297,7 @@ RSpec.describe IsoDoc do
           <iso-standard xmlns="http://riboseinc.com/isoxml" type='presentation'>
           <preface><foreword displayorder="1">
           <admonition id="_70234f78-64e5-4dfc-8b6f-f3f037348b6a" type="editorial">
-                         <p id='_e94663cc-2473-4ccc-9a72-983a74d989f2'>
+                         <p id='_e94663cc-2473-4ccc-9a72-983a74d989f2'>EDITORIAL NOTE — 
                  Only use paddy or parboiled rice for the
                  determination of husked rice yield.
                </p>
@@ -312,7 +312,7 @@ RSpec.describe IsoDoc do
              <div>
                <h1 class='ForewordTitle'>Foreword</h1>
                <div id='_70234f78-64e5-4dfc-8b6f-f3f037348b6a' class='zzHelp'>
-                 <p>
+                 <p>EDITORIAL NOTE — 
                     Only use paddy or parboiled rice for the
                    determination of husked rice yield.
                  </p>
@@ -332,7 +332,7 @@ RSpec.describe IsoDoc do
       <div>
         <h1 class='ForewordTitle'>Foreword</h1>
         <div id='_70234f78-64e5-4dfc-8b6f-f3f037348b6a' class='zzHelp'>
-          <p> Only use paddy or parboiled rice for the determination of husked rice yield. </p>
+          <p>EDITORIAL NOTE — Only use paddy or parboiled rice for the determination of husked rice yield. </p>
           <p class='ForewordText' id='_e94663cc-2473-4ccc-9a72-983a74d989f3'>Para 2.</p>
         </div>
       </div>

data/spec/isodoc/metadata_spec.rb

@@ -209,7 +209,6 @@ RSpec.describe IsoDoc::Iso::Metadata do
             </editorialgroup>
             <approvalgroup>
               <technical-committee number="34" type="ABC">Food products</technical-committee>
-              <subcommittee number="4" type="DEF">Cereals and pulses</subcommittee>
               <workgroup number="3" type="GHI">Rice Group</workgroup>
             </approvalgroup>
             <ics><code>1.2.3</code></ics>
@@ -224,7 +223,7 @@ RSpec.describe IsoDoc::Iso::Metadata do
     INPUT
     output = <<~OUTPUT
       {:agency=>"ISO/IEC",
-      :approvalgroup=>["ABC 34", "DEF 4", "GHI 3"],
+      :approvalgroup=>["ABC 34", "GHI 3"],
       :docnumber=>"ISO/IEC/CD 17301-1-3",
       :docnumber_lang=>"ISO/IEC/CD 17301-1-3 (E)",
       :docnumber_reference=>"ISO/IEC/CD 17301-1-3 (E)",