RubyGems - metanorma-iec - Versions diffs - 2.0.8 → 2.1.0 - Mend

metanorma-iec 2.0.8 → 2.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (19) hide show

checksums.yaml +4 -4
data/lib/isodoc/iec/html/html_iec_titlepage.html +1 -0
data/lib/isodoc/iec/iec.international-standard.xsl +475 -180
data/lib/isodoc/iec/init.rb +6 -5
data/lib/isodoc/iec/presentation_xml_convert.rb +3 -3
data/lib/isodoc/iec/xref.rb +4 -0
data/lib/metanorma/iec/biblio.rng +37 -8
data/lib/metanorma/iec/iec.rng +1 -0
data/lib/metanorma/iec/isodoc.rng +56 -0
data/lib/metanorma/iec/version.rb +1 -1
data/metanorma-iec.gemspec +1 -1
data/spec/isodoc/blocks_spec.rb +146 -202
data/spec/isodoc/i18n_spec.rb +22 -7
data/spec/isodoc/iev_spec.rb +7 -7
data/spec/isodoc/inline_spec.rb +255 -249
data/spec/isodoc/ref_spec.rb +14 -62
data/spec/metanorma/base_spec.rb +2 -2
data/spec/metanorma/inline_spec.rb +6 -6
metadata +4 -4

data/lib/isodoc/iec/init.rb CHANGED Viewed

@@ -10,12 +10,14 @@ module IsoDoc
         @meta = Metadata.new(lang, script, labels)
       end
-      def xref_init(lang, script, klass, labels, options)
-        @xrefs = Xref.new(lang, script, HtmlConvert.new(language: lang, script: script), labels, options)
+      def xref_init(lang, script, _klass, labels, options)
+        @xrefs = Xref.new(lang, script,
+                          HtmlConvert.new(language: lang, script: script),
+                          labels, options)
       end
-       def i18n_init(lang, script, i18nyaml = nil)
-        @i18n = I18n.new(lang, script, i18nyaml || @i18nyaml)
+      def i18n_init(lang, script, i18nyaml = nil)
+        @i18n = I18n.new(lang, script, i18nyaml: i18nyaml || @i18nyaml)
       end
       def convert1(docxml, filename, dir)
@@ -26,4 +28,3 @@ module IsoDoc
     end
   end
 end

data/lib/isodoc/iec/presentation_xml_convert.rb CHANGED Viewed

@@ -7,8 +7,8 @@ module IsoDoc
       def i18n_init(lang, script, i18nyaml = nil)
         super
         @i18n_lg = {}
-        @i18n_lg["en"] = I18n.new("en", "Latn", i18nyaml || @i18nyaml)
-        @i18n_lg["fr"] = I18n.new("fr", "Latn", i18nyaml || @i18nyaml)
+        @i18n_lg["en"] = I18n.new("en", "Latn", i18nyaml: i18nyaml || @i18nyaml)
+        @i18n_lg["fr"] = I18n.new("fr", "Latn", i18nyaml: i18nyaml || @i18nyaml)
         @i18n_lg["default"] = @i18n
       end
@@ -89,7 +89,7 @@ module IsoDoc
           fr = docxml.at(ns("//term[@language = 'fr'][@tag = '#{en['tag']}']"))
           merge_fr_into_en_term1(en, fr) if fr
         end
-        @xrefs.parse docxml
+        @xrefs.parse_inclusions(clauses: true).parse docxml
         docxml.xpath(ns("//term/name")).each(&:remove)
         term(docxml)
       end

data/lib/isodoc/iec/xref.rb CHANGED Viewed

@@ -17,10 +17,14 @@ module IsoDoc
         super
         return unless @is_iev
+        if @parse_settings.empty? || @parse_settings[:clauses]
         terms_iev_names(docxml)
+        end
+        if @parse_settings.empty?
         middle_section_asset_names(docxml)
         termnote_anchor_names(docxml)
         termexample_anchor_names(docxml)
+        end
       end
       def terms_iev_names(docxml)

data/lib/metanorma/iec/biblio.rng CHANGED Viewed

@@ -851,17 +851,46 @@
   </define>
   <define name="bplace">
     <element name="place">
-      <optional>
-        <attribute name="uri">
-          <data type="anyURI"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="region"/>
-      </optional>
+      <choice>
+        <text/>
+        <group>
+          <ref name="bibliocity"/>
+          <zeroOrMore>
+            <ref name="biblioregion"/>
+          </zeroOrMore>
+          <zeroOrMore>
+            <ref name="bibliocountry"/>
+          </zeroOrMore>
+        </group>
+      </choice>
+    </element>
+  </define>
+  <define name="bibliocity">
+    <element name="city">
       <text/>
     </element>
   </define>
+  <define name="biblioregion">
+    <element name="region">
+      <ref name="RegionType"/>
+    </element>
+  </define>
+  <define name="bibliocountry">
+    <element name="country">
+      <ref name="RegionType"/>
+    </element>
+  </define>
+  <define name="RegionType">
+    <optional>
+      <attribute name="iso"/>
+    </optional>
+    <optional>
+      <attribute name="recommended">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
+    <text/>
+  </define>
   <define name="bprice">
     <element name="price">
       <attribute name="currency"/>

data/lib/metanorma/iec/iec.rng CHANGED Viewed

@@ -14,6 +14,7 @@
         <value>international-workshop-agreement</value>
         <value>guide</value>
         <value>industry-technical-agreement</value>
+        <value>system-reference-delivrabble</value>
       </choice>
     </define>
     <define name="BibDataExtensionType">

data/lib/metanorma/iec/isodoc.rng CHANGED Viewed

@@ -32,6 +32,43 @@
         <ref name="DocumentType"/>
       </element>
     </define>
+    <define name="admonition">
+      <element name="admonition">
+        <attribute name="type">
+          <ref name="AdmonitionType"/>
+        </attribute>
+        <optional>
+          <attribute name="class"/>
+        </optional>
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+        <optional>
+          <attribute name="uri">
+            <data type="anyURI"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="coverpage">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="notag">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
+        <optional>
+          <ref name="tname"/>
+        </optional>
+        <zeroOrMore>
+          <ref name="paragraph-with-footnote"/>
+        </zeroOrMore>
+        <zeroOrMore>
+          <ref name="note"/>
+        </zeroOrMore>
+      </element>
+    </define>
     <define name="index">
       <element name="index">
         <optional>
@@ -851,6 +888,16 @@
             <ref name="MultilingualRenderingType"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="coverpage">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="notag">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <oneOrMore>
           <choice>
             <ref name="paragraph"/>
@@ -1178,6 +1225,7 @@
       <ref name="concept"/>
       <ref name="add"/>
       <ref name="del"/>
+      <ref name="span"/>
     </choice>
   </define>
   <define name="add">
@@ -1204,6 +1252,14 @@
       </choice>
     </element>
   </define>
+  <define name="span">
+    <element name="span">
+      <attribute name="class"/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="concept">
     <element name="concept">
       <optional>

data/lib/metanorma/iec/version.rb CHANGED Viewed

@@ -1,6 +1,6 @@
 module Metanorma
   module Iec
-    VERSION = "2.0.8".freeze
+    VERSION = "2.1.0".freeze
   end
 end

data/metanorma-iec.gemspec CHANGED Viewed

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
   spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
-  spec.add_dependency "metanorma-iso", "~> 2.0.0"
+  spec.add_dependency "metanorma-iso", "~> 2.1.0"
   spec.add_dependency "ruby-jing"
   spec.add_development_dependency "debug"

data/spec/isodoc/blocks_spec.rb CHANGED Viewed

@@ -1,219 +1,163 @@
 require "spec_helper"
 RSpec.describe IsoDoc::Iec do
-  it "processes admonitions" do
-    expect(xmlpp(IsoDoc::Iec::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-    <iso-standard xmlns="http://riboseinc.com/isoxml">
-    <preface><foreword>
-    <admonition id="_70234f78-64e5-4dfc-8b6f-f3f037348b6a" type="caution">
-  <p id="_e94663cc-2473-4ccc-9a72-983a74d989f2">Only use paddy or parboiled rice for the determination of husked rice yield.</p>
-  <p id="_e94663cc-2473-4ccc-9a72-983a74d989f3">Para 2.</p>
-</admonition>
-    </foreword></preface>
-    </iso-standard>
-    INPUT
-    #{HTML_HDR}
-             <div>
-               <h1 class='ForewordTitle'>FOREWORD</h1>
-               <div class='boilerplate_legal'/>
-               <div id='_70234f78-64e5-4dfc-8b6f-f3f037348b6a' class='Admonition'>
-                 <p>
-                   CAUTION &#8212; Only use paddy or parboiled rice for the
-                   determination of husked rice yield.
-                 </p>
-                 <p id='_e94663cc-2473-4ccc-9a72-983a74d989f3'>Para 2.</p>
-               </div>
-             </div>
-             #{IEC_TITLE1}
-           </div>
-         </body>
-       </html>
-    OUTPUT
-  end
-  it "processes admonitions with titles" do
-    expect(xmlpp(IsoDoc::Iec::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-    <iso-standard xmlns="http://riboseinc.com/isoxml">
-    <preface><foreword>
-    <admonition id="_70234f78-64e5-4dfc-8b6f-f3f037348b6a" type="caution">
-    <name>Title</name>
-    <ul>
-    <li>List</li>
-    </ul>
-  <p id="_e94663cc-2473-4ccc-9a72-983a74d989f2">Only use paddy or parboiled rice for the determination of husked rice yield.</p>
-</admonition>
-    </foreword></preface>
-    </iso-standard>
-    INPUT
-     #{HTML_HDR}
-             <div>
-               <h1 class='ForewordTitle'>FOREWORD</h1>
-               <div class='boilerplate_legal'/>
-               <div id='_70234f78-64e5-4dfc-8b6f-f3f037348b6a' class='Admonition'>
-                 <p>Title &#8212; </p>
-                 <ul>
-                   <li>List</li>
-                 </ul>
-                 <p id='_e94663cc-2473-4ccc-9a72-983a74d989f2'>Only use paddy or parboiled rice for the determination of husked rice yield.</p>
-               </div>
-             </div>
-             #{IEC_TITLE1}
-           </div>
-         </body>
-       </html>
-    OUTPUT
-  end
   it "processes formulae (Word)" do
-    expect(xmlpp(IsoDoc::Iec::WordConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-    <iso-standard xmlns="http://riboseinc.com/isoxml">
-    <preface><foreword>
-    <formula id="_be9158af-7e93-4ee2-90c5-26d31c181934" unnumbered="true">
-  <stem type="AsciiMath">r = 1 %</stem>
-<dl id="_e4fe94fe-1cde-49d9-b1ad-743293b7e21d">
-  <dt>
-    <stem type="AsciiMath">r</stem>
-  </dt>
-  <dd>
-    <p id="_1b99995d-ff03-40f5-8f2e-ab9665a69b77">is the repeatability limit.</p>
-  </dd>
-</dl>
-    <note id="_83083c7a-6c85-43db-a9fa-4d8edd0c9fc0">
-    <name>NOTE</name>
-  <p id="_511aaa98-4116-42af-8e5b-c87cdf5bfdc8">[durationUnits] is essentially a duration statement without the "P" prefix. "P" is unnecessary because between "G" and "U" duration is always expressed.</p>
-</note>
-    </formula>
-    <formula id="_be9158af-7e93-4ee2-90c5-26d31c181935"><name>1</name>
-  <stem type="AsciiMath">r = 1 %</stem>
-  </formula>
-    </foreword></preface>
-    </iso-standard>
+    input = <<~INPUT
+          <iso-standard xmlns="http://riboseinc.com/isoxml">
+          <preface><foreword>
+          <formula id="_be9158af-7e93-4ee2-90c5-26d31c181934" unnumbered="true">
+        <stem type="AsciiMath">r = 1 %</stem>
+      <dl id="_e4fe94fe-1cde-49d9-b1ad-743293b7e21d">
+        <dt>
+          <stem type="AsciiMath">r</stem>
+        </dt>
+        <dd>
+          <p id="_1b99995d-ff03-40f5-8f2e-ab9665a69b77">is the repeatability limit.</p>
+        </dd>
+      </dl>
+          <note id="_83083c7a-6c85-43db-a9fa-4d8edd0c9fc0">
+          <name>NOTE</name>
+        <p id="_511aaa98-4116-42af-8e5b-c87cdf5bfdc8">[durationUnits] is essentially a duration statement without the "P" prefix. "P" is unnecessary because between "G" and "U" duration is always expressed.</p>
+      </note>
+          </formula>
+          <formula id="_be9158af-7e93-4ee2-90c5-26d31c181935"><name>1</name>
+        <stem type="AsciiMath">r = 1 %</stem>
+        </formula>
+          </foreword></preface>
+          </iso-standard>
     INPUT
-<html xmlns:epub='http://www.idpf.org/2007/ops' lang='en'>
-         <head>
-           <style>
-           </style>
-           <style>
-           </style>
-         </head>
-         <body lang='EN-US' link='blue' vlink='#954F72'>
-           <div class='WordSection2'>
-             <p>
-               <br clear='all' style='mso-special-character:line-break;page-break-before:always'/>
-             </p>
-             #{IEC_TITLE}
-             <div>
-               <h1 class='ForewordTitle'>FOREWORD</h1>
-               <div class='boilerplate_legal'/>
-               <div id='_be9158af-7e93-4ee2-90c5-26d31c181934'><div class='formula'>
-                 <p class='formula'>
-                   <span style='mso-tab-count:1'>&#160; </span>
-                   <span class='stem'>(#(r = 1 %)#)</span>
-                 </p>
-               </div>
-               <span class='zzMoveToFollowing'>
-  where
-  <span class='stem'>(#(r)#)</span>
-</span>
-<p id='_1b99995d-ff03-40f5-8f2e-ab9665a69b77'>is the repeatability limit.</p>
-               <div id='_83083c7a-6c85-43db-a9fa-4d8edd0c9fc0' class='Note'>
-                 <p class='Note'>
-                   <span class='note_label'>NOTE</span>
-                   <span style='mso-tab-count:1'>&#160; </span>
-                   [durationUnits] is essentially a duration statement without the "P"
-                   prefix. "P" is unnecessary because between "G" and "U" duration is
-                   always expressed.
-                 </p>
-               </div>
-               </div>
-               <div id='_be9158af-7e93-4ee2-90c5-26d31c181935'><div class='formula'>
-                 <p class='formula'>
-                   <span style='mso-tab-count:1'>&#160; </span>
-                   <span class='stem'>(#(r = 1 %)#)</span>
-                   <span style='mso-tab-count:1'>&#160; </span>
-                   (1)
+    output = <<~OUTPUT
+      <html xmlns:epub='http://www.idpf.org/2007/ops' lang='en'>
+               <head>
+                 <style>
+                 </style>
+                 <style>
+                 </style>
+               </head>
+               <body lang='EN-US' link='blue' vlink='#954F72'>
+                 <div class='WordSection2'>
+                   <p>
+                     <br clear='all' style='mso-special-character:line-break;page-break-before:always'/>
+                   </p>
+                   #{IEC_TITLE}
+                   <div>
+                     <h1 class='ForewordTitle'>FOREWORD</h1>
+                     <div class='boilerplate_legal'/>
+                     <div id='_be9158af-7e93-4ee2-90c5-26d31c181934'><div class='formula'>
+                       <p class='formula'>
+                         <span style='mso-tab-count:1'>&#160; </span>
+                         <span class='stem'>(#(r = 1 %)#)</span>
+                       </p>
+                     </div>
+                     <span class='zzMoveToFollowing'>
+        where#{' '}
+        <span class='stem'>(#(r)#)</span>
+      </span>
+      <p id='_1b99995d-ff03-40f5-8f2e-ab9665a69b77'>is the repeatability limit.</p>
+                     <div id='_83083c7a-6c85-43db-a9fa-4d8edd0c9fc0' class='Note'>
+                       <p class='Note'>
+                         <span class='note_label'>NOTE</span>
+                         <span style='mso-tab-count:1'>&#160; </span>
+                         [durationUnits] is essentially a duration statement without the "P"
+                         prefix. "P" is unnecessary because between "G" and "U" duration is
+                         always expressed.
+                       </p>
+                     </div>
+                     </div>
+                     <div id='_be9158af-7e93-4ee2-90c5-26d31c181935'><div class='formula'>
+                       <p class='formula'>
+                         <span style='mso-tab-count:1'>&#160; </span>
+                         <span class='stem'>(#(r = 1 %)#)</span>
+                         <span style='mso-tab-count:1'>&#160; </span>
+                         (1)
+                       </p>
+                     </div>
+                     </div>
+                   </div>
+                   <p>&#160;</p>
+                 </div>
+                 <p>
+                   <br clear='all' class='section'/>
                  </p>
-               </div>
-               </div>
-             </div>
-             <p>&#160;</p>
-           </div>
-           <p>
-             <br clear='all' class='section'/>
-           </p>
-           <div class='WordSection3'>
-             #{IEC_TITLE1}
-           </div>
-           <br clear='all' style='page-break-before:left;mso-break-type:section-break'/>
-           <div class='colophon'/>
-         </body>
-       </html>
+                 <div class='WordSection3'>
+                   #{IEC_TITLE1}
+                 </div>
+                 <br clear='all' style='page-break-before:left;mso-break-type:section-break'/>
+                 <div class='colophon'/>
+               </body>
+             </html>
     OUTPUT
+    expect(xmlpp(IsoDoc::Iec::WordConvert.new({})
+      .convert("test", input, true)))
+      .to be_equivalent_to xmlpp(output)
   end
-     it "cross-references formulae" do
-    expect(xmlpp(IsoDoc::Iec::PresentationXMLConvert.new({}).convert("test", <<~"INPUT", true).gsub(%r{^.*<body}m, "<body").gsub(%r{</body>.*}m, "</body>"))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-            <iso-standard xmlns="http://riboseinc.com/isoxml">
-            <preface>
-    <foreword>
-    <p>
-    <xref target="N1"/>
-    <xref target="N2"/>
-    </p>
-    </foreword>
-    </preface>
-    <sections>
-    <clause id="intro"><title>First</title>
-    <formula id="N1">
-  <stem type="AsciiMath">r = 1 %</stem>
-  </formula>
-  <clause id="xyz"><title>Preparatory</title>
-    <formula id="N2" inequality="true">
-  <stem type="AsciiMath">r = 1 %</stem>
-  </formula>
-    <xref target="N2"/>
-</clause>
-</sections>
-    </iso-standard>
+  it "cross-references formulae" do
+    input = <<~INPUT
+                  <iso-standard xmlns="http://riboseinc.com/isoxml">
+                  <preface>
+          <foreword>
+          <p>
+          <xref target="N1"/>
+          <xref target="N2"/>
+          </p>
+          </foreword>
+          </preface>
+          <sections>
+          <clause id="intro"><title>First</title>
+          <formula id="N1">
+        <stem type="AsciiMath">r = 1 %</stem>
+        </formula>
+        <clause id="xyz"><title>Preparatory</title>
+          <formula id="N2" inequality="true">
+        <stem type="AsciiMath">r = 1 %</stem>
+        </formula>
+          <xref target="N2"/>
+      </clause>
+      </sections>
+          </iso-standard>
     INPUT
-    <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
-         <preface>
-           <foreword displayorder="1">
-             <p>
-               <xref target='N1'>Clause 1, Equation (1)</xref>
-               <xref target='N2'>1.1, Inequality (2)</xref>
-             </p>
-           </foreword>
-         </preface>
-         <sections>
-           <clause id='intro' displayorder="2">
-             <title depth='1'>
-               1
-               <tab/>
-               First
-             </title>
-             <formula id='N1'>
-               <name>1</name>
-               <stem type='AsciiMath'>r = 1 %</stem>
-             </formula>
-             <clause id='xyz'>
-               <title depth='2'>
-                 1.1
+    output = <<~OUTPUT
+      <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
+           <preface>
+             <foreword displayorder="1">
+               <p>
+                 <xref target='N1'>Clause 1, Equation (1)</xref>
+                 <xref target='N2'>1.1, Inequality (2)</xref>
+               </p>
+             </foreword>
+           </preface>
+           <sections>
+             <clause id='intro' displayorder="2">
+               <title depth='1'>
+                 1
                  <tab/>
-                 Preparatory
+                 First
                </title>
-               <formula id='N2' inequality='true'>
-                 <name>2</name>
+               <formula id='N1'>
+                 <name>1</name>
                  <stem type='AsciiMath'>r = 1 %</stem>
                </formula>
-               <xref target='N2'>Inequality (2)</xref>
+               <clause id='xyz'>
+                 <title depth='2'>
+                   1.1
+                   <tab/>
+                   Preparatory
+                 </title>
+                 <formula id='N2' inequality='true'>
+                   <name>2</name>
+                   <stem type='AsciiMath'>r = 1 %</stem>
+                 </formula>
+                 <xref target='N2'>Inequality (2)</xref>
+               </clause>
              </clause>
-           </clause>
-         </sections>
-       </iso-standard>
+           </sections>
+         </iso-standard>
     OUTPUT
-       end
+    expect(xmlpp(IsoDoc::Iec::PresentationXMLConvert.new({})
+      .convert("test", input, true)
+      .gsub(%r{^.*<body}m, "<body")
+      .gsub(%r{</body>.*}m, "</body>")))
+      .to be_equivalent_to xmlpp(output)
+  end
 end