metanorma-iso 2.1.0 → 2.1.1

data/lib/isodoc/iso/metadata.rb

@@ -94,25 +94,25 @@ module IsoDoc
         suffix = @c.encode(part.text, :hexadecimal)
         p = titlenums[:part]
         titlenums[:part] && titlenums[:subpart] and
-          p = "#{titlenums[:part]}–#{titlenums[:subpart]}"
+          p = "#{titlenums[:part]}–#{titlenums[:subpart]}"
         titlenums[:part] and
-          suffix = "#{part_label(lang)} #{p}: " + suffix
+          suffix = "#{part_label(lang)} #{p}: " + suffix
         suffix
       end
 
       def part_prefix(titlenums, lang)
         p = titlenums[:part]
         titlenums[:part] && titlenums[:subpart] and
-          p = "#{titlenums[:part]}–#{titlenums[:subpart]}"
-        "#{part_label(lang)} #{p}"
+          p = "#{titlenums[:part]}–#{titlenums[:subpart]}"
+        "#{part_label(lang)} #{p}"
       end
 
       def amd_prefix(titlenums, lang)
-        "#{amd_label(lang)} #{titlenums[:amd]}"
+        "#{amd_label(lang)} #{titlenums[:amd]}"
       end
 
       def corr_prefix(titlenums, lang)
-        "#{corr_label(lang)} #{titlenums[:corr]}"
+        "#{corr_label(lang)} #{titlenums[:corr]}"
       end
 
       def compose_title(tparts, tnums, lang)
@@ -121,10 +121,10 @@ module IsoDoc
           main = @c.encode(tparts[:main].text, :hexadecimal)
         tparts[:intro] &&
           main = "#{@c.encode(tparts[:intro].text,
-                              :hexadecimal)} — #{main}"
+                              :hexadecimal)} — #{main}"
         if tparts[:part]
           suffix = part_title(tparts[:part], tnums, lang)
-          main = "#{main} — #{suffix}"
+          main = "#{main} — #{suffix}"
         end
         main
       end

data/lib/isodoc/iso/presentation_inline.rb

@@ -56,7 +56,7 @@ module IsoDoc
 
       def eref_localities1_zh(target, type, from, upto, node)
         ret = " 第#{from}" if from
-        ret += "–#{upto}" if upto
+        ret += "–#{upto}" if upto
         if node["droploc"] != "true" && !subclause?(target, type, from)
           ret += eref_locality_populate(type, node)
         end
@@ -76,7 +76,7 @@ module IsoDoc
               else ""
               end
         ret += " #{from}" if from
-        ret += "–#{upto}" if upto
+        ret += "–#{upto}" if upto
         ret += ")" if type == "list"
         l10n(ret)
       end

data/lib/isodoc/iso/presentation_xml_convert.rb

@@ -29,7 +29,7 @@ module IsoDoc
       def figure1(node)
         lbl = @xrefs.anchor(node["id"], :label, false) or return
         figname = node.parent.name == "figure" ? "" : "#{@i18n.figure} "
-        connective = node.parent.name == "figure" ? "  " : " — "
+        connective = node.parent.name == "figure" ? "  " : " — "
         prefix_name(node, connective, l10n("#{figname}#{lbl}"), "name")
       end
 
@@ -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, " — ", lbl, "name")
       end
 
       def example_span_label(_node, div, name)

data/lib/isodoc/iso/presentation_xref.rb

@@ -80,7 +80,7 @@ module IsoDoc
 
       def eref_localities1_zh(target, type, from, upto, node)
         ret = " 第#{from}" if from
-        ret += "–#{upto}" if upto
+        ret += "–#{upto}" if upto
         node["droploc"] != "true" && !subclause?(target, type, from) and
           ret += eref_locality_populate(type, node)
         ret += ")" if type == "list"
@@ -97,7 +97,7 @@ module IsoDoc
         node["droploc"] != "true" && !subclause?(target, type, from) and
           ret = eref_locality_populate(type, node)
         ret += " #{from}" if from
-        ret += "–#{upto}" if upto
+        ret += "–#{upto}" if upto
         ret += ")" if type == "list"
         ret = l10n(ret)
         locality_span_wrap(ret, type)

data/lib/isodoc/iso/sections.rb

@@ -9,9 +9,9 @@ module IsoDoc
       def middle_title_main(out)
         out.p(**{ class: "zzSTDTitle1" }) do |p|
           p << @meta.get[:doctitleintro]
-          p << " &mdash; " if @meta.get[:doctitleintro] && @meta.get[:doctitlemain]
+          p << " &#x2014; " if @meta.get[:doctitleintro] && @meta.get[:doctitlemain]
           p << @meta.get[:doctitlemain]
-          p << " &mdash; " if @meta.get[:doctitlemain] && @meta.get[:doctitlepart]
+          p << " &#x2014; " if @meta.get[:doctitlemain] && @meta.get[:doctitlepart]
         end
         a = @meta.get[:doctitlepart] and out.p(**{ class: "zzSTDTitle2" }) do |p|
           b = @meta.get[:doctitlepartlabel] and p << "#{b}: "

data/lib/isodoc/iso/word_convert.rb

@@ -88,8 +88,8 @@ module IsoDoc
           <span lang="EN-GB"><span
             style='mso-element:field-begin'></span><span
             style='mso-spacerun:yes'>&#xA0;</span>TOC
-            \\o &quot;1-#{level}&quot; \\h \\z \\t &quot;Heading
-            1;1;ANNEX;1;Biblio Title;1;Foreword Title;1;Intro Title;1&quot; <span
+            \\o "1-#{level}" \\h \\z \\t "Heading
+            1;1;ANNEX;1;Biblio Title;1;Foreword Title;1;Intro Title;1" <span
             style='mso-element:field-separator'></span></span>
         TOC
       end

data/lib/isodoc/iso/word_dis_convert.rb

@@ -31,10 +31,19 @@ module IsoDoc
         TableFootnote: "Tablefootnote",
         formula: "Formula",
         note: "Note",
+        example: "Example",
+        admonition: "Admonition",
+        admonitiontitle: "AdmonitionTitle",
+        sourcetitle: "SourceTitle",
+        tabletitle: "TableTitle",
+        titlepagesbhead: "TablePageSubhead",
         NormRef: "RefNorm",
-        biblio: "BiblioEntry",
+        Biblio: "BiblioEntry",
         MsoNormal: "MsoBodyText",
         FigureTitle: "Figuretitle",
+        zzwarning: "zzWarning",
+        zzwarninghdr: "zzWarningHdr",
+        quoteattribution: "QuoteAttribution",
       }.freeze
 
       def dis_styles(docxml)
@@ -88,8 +97,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

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "2.1.0".freeze
+    VERSION = "2.1.1".freeze
   end
 end

data/spec/isodoc/amd_spec.rb

@@ -755,22 +755,22 @@ RSpec.describe IsoDoc do
       :docnumber_lang=>"ISO/PreNWIP3 17301-1:2016/Amd.1(E)",
       :docnumber_reference=>"ISO/PreNWIP3 17301-1:2016/Amd.1:2017(E)",
       :docnumeric=>"17301",
-      :docsubtitle=>"Introduction Française — Titre Principal — Partie 1: Part du Titre",
+      :docsubtitle=>"Introduction Française — Titre Principal — Partie 1: Part du Titre",
       :docsubtitleamd=>"Fraction massique de matière étrangère, riz usiné (non gluant), diviseurs d’échantillon et recommandations relatives aux conditions d’entreposage et de transport",
-      :docsubtitleamdlabel=>"AMENDMENT 1",
-      :docsubtitlecorrlabel=>"RECTIFICATIF TECHNIQUE 2",
+      :docsubtitleamdlabel=>"AMENDMENT 1",
+      :docsubtitlecorrlabel=>"RECTIFICATIF TECHNIQUE 2",
       :docsubtitleintro=>"Introduction Française",
       :docsubtitlemain=>"Titre Principal",
       :docsubtitlepart=>"Part du Titre",
-      :docsubtitlepartlabel=>"Partie 1",
-      :doctitle=>"Introduction — Main Title — Title — Part 1: Title Part",
+      :docsubtitlepartlabel=>"Partie 1",
+      :doctitle=>"Introduction — Main Title — Title — Part 1: Title Part",
       :doctitleamd=>"Mass fraction of extraneous matter, milled rice (nonglutinous), sample dividers and recommendations relating to storage and transport conditions",
-      :doctitleamdlabel=>"AMENDMENT 1",
-      :doctitlecorrlabel=>"TECHNICAL CORRIGENDUM 2",
+      :doctitleamdlabel=>"AMENDMENT 1",
+      :doctitlecorrlabel=>"TECHNICAL CORRIGENDUM 2",
       :doctitleintro=>"Introduction",
       :doctitlemain=>"Main Title — Title",
       :doctitlepart=>"Title Part",
-      :doctitlepartlabel=>"Part 1",
+      :doctitlepartlabel=>"Part 1",
       :doctype=>"Amendment",
       :doctype_display=>"Amendment",
       :docyear=>"2017",
@@ -920,22 +920,22 @@ RSpec.describe IsoDoc do
       :docnumber_lang=>"ISO/PreNWIP3 17301-1:2016/Amd.1(E)",
       :docnumber_reference=>"ISO/PreNWIP3 17301-1:2016/Amd.1:2017(E)",
       :docnumeric=>"17301",
-      :docsubtitle=>"Introduction — Main Title — Title — Part 1: Title Part",
+      :docsubtitle=>"Introduction — Main Title — Title — Part 1: Title Part",
       :docsubtitleamd=>"Mass fraction of extraneous matter, milled rice (nonglutinous), sample dividers and recommendations relating to storage and transport conditions",
-      :docsubtitleamdlabel=>"AMENDMENT 1",
-      :docsubtitlecorrlabel=>"TECHNICAL CORRIGENDUM 2",
+      :docsubtitleamdlabel=>"AMENDMENT 1",
+      :docsubtitlecorrlabel=>"TECHNICAL CORRIGENDUM 2",
       :docsubtitleintro=>"Introduction",
       :docsubtitlemain=>"Main Title — Title",
       :docsubtitlepart=>"Title Part",
-      :docsubtitlepartlabel=>"Part 1",
-      :doctitle=>"Introduction Française — Titre Principal — Partie 1: Part du Titre",
+      :docsubtitlepartlabel=>"Part 1",
+      :doctitle=>"Introduction Française — Titre Principal — Partie 1: Part du Titre",
       :doctitleamd=>"Fraction massique de matière étrangère, riz usiné (non gluant), diviseurs d’échantillon et recommandations relatives aux conditions d’entreposage et de transport",
-      :doctitleamdlabel=>"AMENDMENT 1",
-      :doctitlecorrlabel=>"RECTIFICATIF TECHNIQUE 2",
+      :doctitleamdlabel=>"AMENDMENT 1",
+      :doctitlecorrlabel=>"RECTIFICATIF TECHNIQUE 2",
       :doctitleintro=>"Introduction Française",
       :doctitlemain=>"Titre Principal",
       :doctitlepart=>"Part du Titre",
-      :doctitlepartlabel=>"Partie 1",
+      :doctitlepartlabel=>"Partie 1",
       :doctype=>"Amendment",
       :doctype_display=>"Amendment",
       :docyear=>"2017",

data/spec/isodoc/metadata_spec.rb

@@ -97,21 +97,21 @@ RSpec.describe IsoDoc::Iso::Metadata do
       :circulateddate=>"XXX",
       :confirmeddate=>"XXX",
       :copieddate=>"XXX",
-      :createddate=>"2010–2011",
+      :createddate=>"2010–2011",
       :docnumber=>"ISO/PreCD3 17301-1",
       :docnumber_lang=>"ISO/PreCD3 17301-1 (E)",
       :docnumber_reference=>"ISO/PreCD3 17301-1:2000 (E)",
       :docnumeric=>"1730",
-      :docsubtitle=>"Céréales et légumineuses — Spécification et méthodes d'essai — Partie 1: Riz",
+      :docsubtitle=>"Céréales et légumineuses — Spécification et méthodes d'essai — Partie 1: Riz",
       :docsubtitleintro=>"Céréales et légumineuses",
       :docsubtitlemain=>"Spécification et méthodes d'essai",
       :docsubtitlepart=>"Riz",
-      :docsubtitlepartlabel=>"Partie 1",
-      :doctitle=>"Cereals and pulses — Specifications and test methods — Part 1: Rice",
+      :docsubtitlepartlabel=>"Partie 1",
+      :doctitle=>"Cereals and pulses — Specifications and test methods — Part 1: Rice",
       :doctitleintro=>"Cereals and pulses",
       :doctitlemain=>"Specifications and test methods",
       :doctitlepart=>"Rice",
-      :doctitlepartlabel=>"Part 1",
+      :doctitlepartlabel=>"Part 1",
       :doctype=>"International Standard",
       :doctype_display=>"International Standard",
       :docyear=>"2016",
@@ -238,16 +238,16 @@ RSpec.describe IsoDoc::Iso::Metadata do
       :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)",
-      :docsubtitle=>"Céréales et légumineuses — Spécification et méthodes d'essai — Partie 1–3: Riz",
+      :docsubtitle=>"Céréales et légumineuses — Spécification et méthodes d'essai — Partie 1–3: Riz",
       :docsubtitleintro=>"Céréales et légumineuses",
       :docsubtitlemain=>"Spécification et méthodes d'essai",
       :docsubtitlepart=>"Riz",
-      :docsubtitlepartlabel=>"Partie 1–3",
-      :doctitle=>"Cereals and pulses — Specifications and test methods — Part 1–3: Rice",
+      :docsubtitlepartlabel=>"Partie 1–3",
+      :doctitle=>"Cereals and pulses — Specifications and test methods — Part 1–3: Rice",
       :doctitleintro=>"Cereals and pulses",
       :doctitlemain=>"Specifications and test methods",
       :doctitlepart=>"Rice",
-      :doctitlepartlabel=>"Part 1–3",
+      :doctitlepartlabel=>"Part 1–3",
       :doctype=>"International Standard",
       :doctype_display=>"International Standard",
       :docyear=>"2016",
@@ -374,16 +374,16 @@ RSpec.describe IsoDoc::Iso::Metadata do
       :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)",
-      :docsubtitle=>"Cereals and pulses — Specifications and test methods — Part 1–3: Rice",
+      :docsubtitle=>"Cereals and pulses — Specifications and test methods — Part 1–3: Rice",
       :docsubtitleintro=>"Cereals and pulses",
       :docsubtitlemain=>"Specifications and test methods",
       :docsubtitlepart=>"Rice",
-      :docsubtitlepartlabel=>"Part 1–3",
-      :doctitle=>"Céréales et légumineuses — Spécification et méthodes d'essai — Partie 1–3: Riz",
+      :docsubtitlepartlabel=>"Part 1–3",
+      :doctitle=>"Céréales et légumineuses — Spécification et méthodes d'essai — Partie 1–3: Riz",
       :doctitleintro=>"Céréales et légumineuses",
       :doctitlemain=>"Spécification et méthodes d'essai",
       :doctitlepart=>"Riz",
-      :doctitlepartlabel=>"Partie 1–3",
+      :doctitlepartlabel=>"Partie 1–3",
       :doctype=>"International Standard",
       :doctype_display=>"Standard International",
       :docyear=>"2016",
@@ -515,16 +515,16 @@ RSpec.describe IsoDoc::Iso::Metadata do
       :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)",
-      :docsubtitle=>"Cereals and pulses — Specifications and test methods — Part 1–3: Rice",
+      :docsubtitle=>"Cereals and pulses — Specifications and test methods — Part 1–3: Rice",
       :docsubtitleintro=>"Cereals and pulses",
       :docsubtitlemain=>"Specifications and test methods",
       :docsubtitlepart=>"Rice",
-      :docsubtitlepartlabel=>"Part 1–3",
-      :doctitle=>"Зерновые и бобовые — Технические характеристики и методы испытаний — Часть 1–3: Рис",
+      :docsubtitlepartlabel=>"Part 1–3",
+      :doctitle=>"Зерновые и бобовые — Технические характеристики и методы испытаний — Часть 1–3: Рис",
       :doctitleintro=>"Зерновые и бобовые",
       :doctitlemain=>"Технические характеристики и методы испытаний",
       :doctitlepart=>"Рис",
-      :doctitlepartlabel=>"Часть 1–3",
+      :doctitlepartlabel=>"Часть 1–3",
       :doctype=>"International Standard",
       :doctype_display=>"International Standard",
       :docyear=>"2016",

data/spec/isodoc/postproc_spec.rb

@@ -381,6 +381,7 @@ RSpec.describe IsoDoc do
     word = File.read("test.doc", encoding: "UTF-8")
       .sub(/^.*An empty word intro page\./m, "")
       .sub(%r{</div>.*$}m, "</div>")
+    .gsub(/<o:p>&#xA0;<\/o:p>/, "")
 
     expect(xmlpp("<div>#{word.gsub(/_Toc\d\d+/, '_Toc')}"))
       .to be_equivalent_to xmlpp(<<~'OUTPUT')
@@ -486,7 +487,6 @@ RSpec.describe IsoDoc do
               <span style="mso-element:field-end"/>
             </span>
             <span lang="EN-GB" xml:lang="EN-GB">
-              <p class="MsoNormal"> </p>
             </span>
           </p>
           <p class="MsoNormal"> </p>
@@ -1030,7 +1030,8 @@ RSpec.describe IsoDoc do
            '<div class="WordSection2">')
       .sub(%r{<p class="MsoNormal">\s*<br clear="all" class="section"/>\s*</p>\s*<div class="WordSection3">.*$}m, "")
 
-    expect(xmlpp(word.gsub(/_Toc\d\d+/, "_Toc")))
+    expect(xmlpp(word.gsub(/_Toc\d\d+/, "_Toc")
+      .gsub(/<o:p>&#xA0;<\/o:p>/, "")))
       .to be_equivalent_to xmlpp(<<~'OUTPUT')
         <div class="WordSection2">An empty word intro page.
           <p class="MsoToc1">
@@ -1110,7 +1111,6 @@ RSpec.describe IsoDoc do
               <span style="mso-element:field-end"/>
             </span>
             <span lang="EN-GB" xml:lang="EN-GB">
-              <p class="MsoNormal"> </p>
             </span>
           </p>
           <p class="MsoNormal"> </p>

data/spec/spec_helper.rb

@@ -60,6 +60,13 @@ def metadata(hash)
 end
 
 def xmlpp(xml)
+  c = HTMLEntities.new
+  xml &&= xml.split(/(&\S+?;)/).map do |n|
+    if /^&\S+?;$/.match?(n)
+      c.encode(c.decode(n), :hexadecimal)
+    else n
+    end
+  end.join
   s = ""
   f = REXML::Formatters::Pretty.new(2)
   f.compact = true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-09 00:00:00.000000000 Z
+date: 2022-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc