metanorma-iso 2.1.2 → 2.1.3

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)

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 = {}
@@ -118,9 +114,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 +164,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 +207,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

@@ -703,6 +703,9 @@
       <optional>
         <attribute name="tag"/>
       </optional>
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <optional>
         <attribute name="multilingual-rendering">
           <ref name="MultilingualRenderingType"/>
@@ -738,6 +741,9 @@
         <optional>
           <attribute name="tag"/>
         </optional>
+        <optional>
+          <attribute name="type"/>
+        </optional>
         <optional>
           <attribute name="multilingual-rendering">
             <ref name="MultilingualRenderingType"/>
@@ -2059,6 +2065,7 @@
       <value>compare</value>
       <value>contrast</value>
       <value>see</value>
+      <value>seealso</value>
     </choice>
   </define>
   <define name="deprecates">

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.3".freeze
   end
 end

data/spec/isodoc/section_spec.rb

@@ -576,17 +576,11 @@ RSpec.describe IsoDoc do
              <ext>
                <doctype>standard</doctype>
                <subdoctype>vocabulary</subdoctype>
-               <editorialgroup identifier='ISO/ / / '>
+               <editorialgroup identifier='ISO'>
                <agency>ISO</agency>
-                 <technical-committee/>
-                 <subcommittee/>
-                 <workgroup/>
                </editorialgroup>
-               <approvalgroup identifier='ISO/ / / '>
+               <approvalgroup identifier='ISO'>
                <agency>ISO</agency>
-                 <technical-committee/>
-                 <subcommittee/>
-                 <workgroup/>
                </approvalgroup>
                <stagename>International standard</stagename>
              </ext>

data/spec/isodoc/word_dis_spec.rb

@@ -673,6 +673,66 @@ RSpec.describe IsoDoc do
       .to be_equivalent_to xmlpp(word)
   end
 
+  it "deals with lists and paragraphs" do
+    input = <<~INPUT
+        <iso-standard xmlns="http://riboseinc.com/isoxml">
+      <bibdata>
+        <status><stage>50</stage></status>
+      </bibdata>
+      <sections>
+      <clause id="A">
+      <p id="_eb2fd8cd-5cbe-1f1f-7bdb-282868a25828">ISO and IEC maintain terminological databases for use in
+      standardization at the following addresses:</p>
+
+      <ul id="_6f8dbb84-61d9-f774-264e-b7e249cf44d1">
+      <li> <p id="_9f56356a-3a58-64c4-e59e-a23ca3da7e88">ISO Online browsing platform: available at
+        <link target="https://www.iso.org/obp"/></p></li>
+      <li> <p id="_5dc6886f-a99c-e420-a29d-2aa6ca9f376e">IEC Electropedia: available at
+      <link target="https://www.electropedia.org"/>
+      </p> </li> </ul>
+      </clause>
+      </sections>
+      </iso-standard>
+    INPUT
+    word = <<~OUTPUT
+      <div class='WordSection3'>
+         <p class='zzSTDTitle'/>
+         <div>
+           <a name='A' id='A'/>
+           <h1>1</h1>
+           <p class='MsoBodyText'>
+             <a name='_eb2fd8cd-5cbe-1f1f-7bdb-282868a25828' id='_eb2fd8cd-5cbe-1f1f-7bdb-282868a25828'/>
+             ISO and IEC maintain terminological databases for use in standardization
+             at the following addresses:
+           </p>
+           <p class='ListContinue1'>
+             —
+             <span style='mso-tab-count:1'> </span>
+               ISO Online browsing platform: available at
+               <a href='https://www.iso.org/obp'>https://www.iso.org/obp</a>
+           </p>
+           <p class='ListContinue1'>
+             —
+             <span style='mso-tab-count:1'> </span>
+               IEC Electropedia: available at
+               <a href='https://www.electropedia.org'>https://www.electropedia.org</a>
+           </p>
+         </div>
+       </div>
+    OUTPUT
+    FileUtils.rm_f "test.doc"
+    presxml = IsoDoc::Iso::PresentationXMLConvert.new({})
+      .convert("test", input, true)
+    IsoDoc::Iso::WordConvert.new({}).convert("test", presxml, false)
+    expect(File.exist?("test.doc")).to be true
+    output = File.read("test.doc", encoding: "UTF-8")
+      .sub(/^.*<html/m, "<html")
+      .sub(/<\/html>.*$/m, "</html>")
+    expect(xmlpp(Nokogiri::XML(output)
+      .at("//xmlns:div[@class = 'WordSection3']").to_xml))
+      .to be_equivalent_to xmlpp(word)
+  end
+
   it "deals with ordered list start" do
     input = <<~INPUT
       <iso-standard xmlns="http://riboseinc.com/isoxml">

data/spec/metanorma/amd_spec.rb

@@ -352,15 +352,9 @@ RSpec.describe Metanorma::ISO do
             <doctype>amendment</doctype>
             <editorialgroup>
              <agency>ISO</agency>
-              <technical-committee/>
-              <subcommittee/>
-              <workgroup/>
             </editorialgroup>
             <approvalgroup>
              <agency>ISO</agency>
-              <technical-committee/>
-              <subcommittee/>
-              <workgroup/>
             </approvalgroup>
             <structuredidentifier>
               <project-number amendment="1" part="1">17301</project-number>
@@ -431,15 +425,9 @@ RSpec.describe Metanorma::ISO do
             <doctype>amendment</doctype>
             <editorialgroup>
              <agency>ISO</agency>
-              <technical-committee/>
-              <subcommittee/>
-              <workgroup/>
             </editorialgroup>
             <approvalgroup>
              <agency>ISO</agency>
-              <technical-committee/>
-              <subcommittee/>
-              <workgroup/>
             </approvalgroup>
             <structuredidentifier>
               <project-number amendment="1" part="1">17301</project-number>
@@ -507,17 +495,11 @@ RSpec.describe Metanorma::ISO do
           </copyright>
           <ext>
             <doctype>amendment</doctype>
-            <editorialgroup>
+             <editorialgroup>
              <agency>ISO</agency>
-              <technical-committee/>
-              <subcommittee/>
-              <workgroup/>
             </editorialgroup>
             <approvalgroup>
              <agency>ISO</agency>
-              <technical-committee/>
-              <subcommittee/>
-              <workgroup/>
             </approvalgroup>
             <structuredidentifier>
               <project-number amendment="1" part="1">17301</project-number>
@@ -586,17 +568,11 @@ RSpec.describe Metanorma::ISO do
           </copyright>
           <ext>
             <doctype>technical-corrigendum</doctype>
-            <editorialgroup>
+             <editorialgroup>
              <agency>ISO</agency>
-              <technical-committee/>
-              <subcommittee/>
-              <workgroup/>
             </editorialgroup>
             <approvalgroup>
              <agency>ISO</agency>
-              <technical-committee/>
-              <subcommittee/>
-              <workgroup/>
             </approvalgroup>
             <structuredidentifier>
               <project-number corrigendum="3" part="1">17301</project-number>
@@ -665,17 +641,11 @@ RSpec.describe Metanorma::ISO do
           </copyright>
           <ext>
             <doctype>technical-corrigendum</doctype>
-            <editorialgroup>
+                        <editorialgroup>
              <agency>ISO</agency>
-              <technical-committee/>
-              <subcommittee/>
-              <workgroup/>
             </editorialgroup>
             <approvalgroup>
              <agency>ISO</agency>
-              <technical-committee/>
-              <subcommittee/>
-              <workgroup/>
             </approvalgroup>
             <structuredidentifier>
               <project-number part='1' corrigendum='3'>17301</project-number>
@@ -743,17 +713,11 @@ RSpec.describe Metanorma::ISO do
           </copyright>
           <ext>
             <doctype>technical-corrigendum</doctype>
-            <editorialgroup>
+                        <editorialgroup>
              <agency>ISO</agency>
-              <technical-committee/>
-              <subcommittee/>
-              <workgroup/>
             </editorialgroup>
             <approvalgroup>
              <agency>ISO</agency>
-              <technical-committee/>
-              <subcommittee/>
-              <workgroup/>
             </approvalgroup>
             <structuredidentifier>
               <project-number corrigendum="3" part="1">17301</project-number>