metanorma-iec 1.1.0 → 1.2.1

data/spec/isodoc/iev_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
   
 RSpec.describe IsoDoc do
   it "processes introductions under IEV" do
-    expect(xmlpp(IsoDoc::Iec::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
       <iso-standard xmlns="http://riboseinc.com/isoxml">
       <bibdata>
       <docidentifier type="iso">IEC/PWI 60050-871 ED 2</docidentifier>
@@ -20,6 +20,30 @@ RSpec.describe IsoDoc do
        </introduction></preface><sections/>
        </iso-standard>
        INPUT
+
+       presxml = <<~OUTPUT
+       <iso-standard xmlns='http://riboseinc.com/isoxml'>
+  <bibdata>
+    <docidentifier type='iso'>IEC/PWI 60050-871 ED 2</docidentifier>
+    <docnumber>60050</docnumber>
+  </bibdata>
+  <preface>
+    <foreword obligation='informative'>
+      <title>Foreword</title>
+      <p id='A'>This is a preamble</p>
+    </foreword>
+    <introduction id='B' obligation='informative'>
+      <title depth='1'>Introduction</title>
+      <clause id='C' inline-header='false' obligation='informative'>
+        <title depth='2'>Introduction Subsection</title>
+      </clause>
+    </introduction>
+  </preface>
+  <sections/>
+</iso-standard>
+OUTPUT
+
+       html = <<~OUTPUT
        #{HTML_HDR}
       <div>
         <h1 class='ForewordTitle'>FOREWORD</h1>
@@ -29,9 +53,7 @@ RSpec.describe IsoDoc do
       <br/>
       <div class='Section3' id='B'>
         <h1 class='IntroTitle'>
-          INTRODUCTION
-          <br/>
-          Principles and rules followed
+          Introduction
         </h1>
         <div id='C'>
           <h2>Introduction Subsection</h2>
@@ -42,10 +64,12 @@ RSpec.describe IsoDoc do
   </body>
 </html>
        OUTPUT
+    expect(xmlpp(IsoDoc::Iec::PresentationXMLConvert.new({}).convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
+    expect(xmlpp(IsoDoc::Iec::HtmlConvert.new({}).convert("test", presxml, true))).to be_equivalent_to xmlpp(html)
   end
 
   it "processes bibliographies under IEV" do
-    expect(xmlpp(IsoDoc::Iec::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
  <iec-standard xmlns='https://www.metanorma.org/ns/iec'>
          <bibdata type='standard'>
            <docidentifier type='iso'>IEC 60050 ED 1</docidentifier>
@@ -93,7 +117,7 @@ RSpec.describe IsoDoc do
          </bibdata>
          <sections> </sections>
          <bibliography>
-           <references id='_' obligation='informative' normative="true">
+           <references obligation='informative' normative="true" id="X">
              <title>Normative References</title>
              <p id='_'>There are no normative references in this document.</p>
              <bibitem id='A'>
@@ -116,7 +140,79 @@ RSpec.describe IsoDoc do
 
          </bibliography>
        </iec-standard>
-INPUT
+       INPUT
+       presxml = <<~OUTPUT
+       <iec-standard xmlns='https://www.metanorma.org/ns/iec'>
+         <bibdata type='standard'>
+           <docidentifier type='iso'>IEC 60050 ED 1</docidentifier>
+           <docnumber>60050</docnumber>
+           <contributor>
+             <role type='author'/>
+             <organization>
+               <name>International Electrotechnical Commission</name>
+               <abbreviation>IEC</abbreviation>
+             </organization>
+           </contributor>
+           <contributor>
+             <role type='publisher'/>
+             <organization>
+               <name>International Electrotechnical Commission</name>
+               <abbreviation>IEC</abbreviation>
+             </organization>
+           </contributor>
+           <language>en</language>
+           <script>Latn</script>
+           <status>
+             <stage>60</stage>
+             <substage>60</substage>
+           </status>
+           <copyright>
+             <from>2020</from>
+             <owner>
+               <organization>
+                 <name>International Electrotechnical Commission</name>
+                 <abbreviation>IEC</abbreviation>
+               </organization>
+             </owner>
+           </copyright>
+           <ext>
+             <doctype>article</doctype>
+             <editorialgroup>
+               <technical-committee/>
+               <subcommittee/>
+               <workgroup/>
+             </editorialgroup>
+             <structuredidentifier>
+               <project-number>IEC 60050</project-number>
+             </structuredidentifier>
+           </ext>
+         </bibdata>
+         <sections> </sections>
+         <bibliography>
+           <references obligation='informative' normative='true' id="X">
+           <title depth='1'>1<tab/>Normative References</title>
+             <p id='_'>There are no normative references in this document.</p>
+             <bibitem id='A'>
+               <formattedref format='application/x-isodoc+xml'>
+                 <em>TITLE</em>
+               </formattedref>
+               <docidentifier>B</docidentifier>
+             </bibitem>
+           </references>
+           <references id='_' obligation='informative' normative='false'>
+             <title depth='1'>Bibliography</title>
+             <p id='_'>There are no normative references in this document.</p>
+             <bibitem id='A'>
+               <formattedref format='application/x-isodoc+xml'>
+                 <em>TITLE</em>
+               </formattedref>
+               <docidentifier>B</docidentifier>
+             </bibitem>
+           </references>
+         </bibliography>
+       </iec-standard>
+       OUTPUT
+       html = <<~OUTPUT
  #{HTML_HDR}
  <div id=''>
   <h1 class='ForewordTitle'>FOREWORD</h1>
@@ -124,7 +220,7 @@ INPUT
 </div>
       #{IEC_TITLE1}
       <div>
-  <h1>1&#160; Normative references</h1>
+  <h1>1&#160; Normative References</h1>
   <p id='_'>There are no normative references in this document.</p>
   <p id='A' class='NormRef'>
   B,
@@ -135,10 +231,12 @@ INPUT
   </body>
 </html>
 OUTPUT
+    expect(xmlpp(IsoDoc::Iec::PresentationXMLConvert.new({}).convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
+    expect(xmlpp(IsoDoc::Iec::HtmlConvert.new({}).convert("test", presxml, true))).to be_equivalent_to xmlpp(html)
   end
 
     it "processes IEV terms" do
-    expect(xmlpp(IsoDoc::Iec::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+      input = <<~INPUT
     <iso-standard xmlns="http://riboseinc.com/isoxml">
      <bibdata type='standard'>
            <docidentifier type='ISO'>IEC 60050-192 ED 1</docidentifier>
@@ -163,7 +261,7 @@ OUTPUT
 </termexample>
 
 <termsource status="modified">
-  <origin bibitemid="ISO7301" type="inline" citeas="ISO 7301:2011"><locality type="clause"><referenceFrom>3.1</referenceFrom></locality></origin>
+  <origin bibitemid="ISO7301" type="inline" citeas="ISO 7301:2011"><locality type="clause"><referenceFrom>3.1</referenceFrom></locality>ISO 7301:2011, 3.1</origin>
     <modification>
     <p id="_e73a417d-ad39-417d-a4c8-20e4e2529489">The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here</p>
   </modification>
@@ -187,12 +285,81 @@ OUTPUT
   <p id="_19830f33-e46c-42cc-94ca-a5ef101132d5">The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p>
 </termnote>
 <termsource status="identical">
-  <origin bibitemid="ISO7301" type="inline" citeas="ISO 7301:2011"><locality type="clause"><referenceFrom>3.1</referenceFrom></locality></origin>
+  <origin bibitemid="ISO7301" type="inline" citeas="ISO 7301:2011"><locality type="clause"><referenceFrom>3.1</referenceFrom></locality>ISO 7301:2011, 3.1</origin>
 </termsource></term>
 </terms>
+</clause>
 </sections>
 </iso-standard>
 INPUT
+
+presxml = <<~INPUT
+    <iso-standard xmlns="http://riboseinc.com/isoxml">
+     <bibdata type='standard'>
+           <docidentifier type='ISO'>IEC 60050-192 ED 1</docidentifier>
+           <docnumber>60050</docnumber>
+    </bibdata>
+    <sections>
+    <clause id="_terms_and_definitions" obligation="normative"><title depth="1">1<tab/>Terms and definitions</title>
+    <terms id="_general" obligation="normative"><title>192-01 General</title>
+
+<term id="paddy1">
+<name>192-01-01</name>
+<preferred>paddy</preferred>
+<definition><p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p></definition>
+<termexample id="_bd57bbf1-f948-4bae-b0ce-73c00431f892">
+<name>EXAMPLE 1</name>
+  <p id="_65c9a509-9a89-4b54-a890-274126aeb55c">Foreign seeds, husks, bran, sand, dust.</p>
+  <ul>
+  <li>A</li>
+  </ul>
+</termexample>
+<termexample id="_bd57bbf1-f948-4bae-b0ce-73c00431f894">
+<name>EXAMPLE 2</name>
+  <ul>
+  <li>A</li>
+  </ul>
+</termexample>
+
+<termsource status="modified">
+  <origin bibitemid="ISO7301" type="inline" citeas="ISO 7301:2011"><locality type="clause"><referenceFrom>3.1</referenceFrom></locality>ISO 7301:2011, 3.1</origin>
+    <modification>
+    <p id="_e73a417d-ad39-417d-a4c8-20e4e2529489">The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here</p>
+  </modification>
+</termsource></term>
+
+<term id="paddy">
+<name>192-01-02</name>
+<preferred>paddy</preferred><admitted>paddy rice</admitted>
+<admitted>rough rice</admitted>
+<deprecates>cargo rice</deprecates>
+<domain>rice</domain>
+<definition><p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p></definition>
+<termexample id="_bd57bbf1-f948-4bae-b0ce-73c00431f893">
+<name>EXAMPLE</name>
+  <ul>
+  <li>A</li>
+  </ul>
+</termexample>
+<termnote id="_671a1994-4783-40d0-bc81-987d06ffb74e">
+<name>Note 1 to entry</name>
+  <p id="_19830f33-e46c-42cc-94ca-a5ef101132d5">The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p>
+</termnote>
+<termnote id="_671a1994-4783-40d0-bc81-987d06ffb74f">
+<name>Note 2 to entry</name>
+<ul><li>A</li></ul>
+  <p id="_19830f33-e46c-42cc-94ca-a5ef101132d5">The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p>
+</termnote>
+<termsource status="identical">
+  <origin bibitemid="ISO7301" type="inline" citeas="ISO 7301:2011"><locality type="clause"><referenceFrom>3.1</referenceFrom></locality>ISO 7301:2011, 3.1</origin>
+</termsource></term>
+</terms>
+</clause>
+</sections>
+</iso-standard>
+INPUT
+
+html = <<~OUTPUT
  #{HTML_HDR}
       <div id=''>
         <h1 class='ForewordTitle'>FOREWORD</h1>
@@ -278,12 +445,14 @@ INPUT
   </body>
 </html>
     OUTPUT
+    expect(xmlpp(IsoDoc::Iec::PresentationXMLConvert.new({}).convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
+    expect(xmlpp(IsoDoc::Iec::HtmlConvert.new({}).convert("test", presxml, true))).to be_equivalent_to xmlpp(html)
 end
 
      it "populates Word template with terms reference labels" do
     FileUtils.rm_f "test.doc"
     FileUtils.rm_f "test.html"
-    IsoDoc::Iec::WordConvert.new({}).convert("test", <<~"INPUT", false)
+    input = <<~INPUT
         <iso-standard xmlns="http://riboseinc.com/isoxml">
         <bibdata type='standard'>
            <docidentifier type='ISO'>IEC 60050-192 ED 1</docidentifier>
@@ -296,7 +465,7 @@ end
 <term id="paddy1"><preferred>paddy</preferred>
 <definition><p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p></definition>
 <termsource status="modified">
-  <origin bibitemid="ISO7301" type="inline" citeas="ISO 7301:2011"><locality type="clause"><referenceFrom>3.1</referenceFrom></locality></origin>
+  <origin bibitemid="ISO7301" type="inline" citeas="ISO 7301:2011"><locality type="clause"><referenceFrom>3.1</referenceFrom></locality>ISO 7301:2011, 3.1</origin>
     <modification>
     <p id="_e73a417d-ad39-417d-a4c8-20e4e2529489">The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here</p>
   </modification>
@@ -306,8 +475,46 @@ end
 </clause>
 </sections>
 </iso-standard>
-
     INPUT
+    presxml = <<~OUTPUT
+    <iso-standard xmlns='http://riboseinc.com/isoxml'>
+  <bibdata type='standard'>
+    <docidentifier type='ISO'>IEC 60050-192 ED 1</docidentifier>
+    <docnumber>60050</docnumber>
+  </bibdata>
+  <sections>
+    <clause id='_terms_and_definitions' obligation='normative'>
+      <title depth='1'>1<tab/>Terms and definitions</title>
+      <terms id='_general' obligation='normative'>
+        <title>192-01 General</title>
+        <term id='paddy1'>
+          <name>192-01-01</name>
+          <preferred>paddy</preferred>
+          <definition>
+            <p id='_eb29b35e-123e-4d1c-b50b-2714d41e747f'>rice retaining its husk after threshing</p>
+          </definition>
+          <termsource status='modified'>
+            <origin bibitemid='ISO7301' type='inline' citeas='ISO 7301:2011'>
+              <locality type='clause'>
+                <referenceFrom>3.1</referenceFrom>
+              </locality>
+              ISO 7301:2011, 3.1
+            </origin>
+            <modification>
+              <p id='_e73a417d-ad39-417d-a4c8-20e4e2529489'>
+                The term "cargo rice" is shown as deprecated, and Note 1 to
+                entry is not included here
+              </p>
+            </modification>
+          </termsource>
+        </term>
+      </terms>
+    </clause>
+  </sections>
+</iso-standard>
+OUTPUT
+    expect(xmlpp(IsoDoc::Iec::PresentationXMLConvert.new({}).convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
+    IsoDoc::Iec::WordConvert.new({}).convert("test", presxml, false)
     word = File.read("test.doc").sub(/^.*<div class="WordSection3">/m, '<div class="WordSection3">').
       sub(%r{<br clear="all" style="page-break-before:left;mso-break-type:section-break"/>.*$}m, "")
     expect(xmlpp(word)).to be_equivalent_to xmlpp(<<~"OUTPUT")

data/spec/isodoc/inline_spec.rb

@@ -149,52 +149,8 @@ RSpec.describe IsoDoc do
     OUTPUT
   end
 
-  it "processes eref types" 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>
-    <p>
-    <eref type="footnote" bibitemid="ISO712" citeas="ISO 712">A</stem>
-    <eref type="inline" bibitemid="ISO712" citeas="ISO 712">A</stem>
-    </p>
-    </foreword></preface>
-    <bibliography><references id="_normative_references" obligation="informative"  normative="true"><title>Normative References</title>
-<bibitem id="ISO712" type="standard">
-  <title format="text/plain">Cereals and cereal products</title>
-  <docidentifier>ISO 712</docidentifier>
-  <contributor>
-    <role type="publisher"/>
-    <organization>
-      <abbreviation>ISO</abbreviation>
-    </organization>
-  </contributor>
-</bibitem>
-    </references>
-    </bibliography>
-    </iso-standard>
-    INPUT
-    #{HTML_HDR}
-               <div>
-                 <h1 class="ForewordTitle">FOREWORD</h1>
-                 <div class="boilerplate_legal"/>
-                 <p>
-           <sup><a href="#ISO712">A</a></sup>
-           <a href="#ISO712">A</a>
-           </p>
-               </div>
-               #{IEC_TITLE1}
-               <div>
-                 <h1>1&#160; Normative references</h1>
-                 <p id="ISO712" class="NormRef">ISO 712, <i> Cereals and cereal products</i></p>
-               </div>
-             </div>
-           </body>
-       </html>
-    OUTPUT
-  end
-
   it "processes eref content" do
-    expect(xmlpp(IsoDoc::Iec::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+expect(xmlpp(IsoDoc::Iec::PresentationXMLConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <p>
@@ -228,34 +184,102 @@ RSpec.describe IsoDoc do
     </bibliography>
     </iso-standard>
     INPUT
-    #{HTML_HDR}
-               <div>
-                 <h1 class="ForewordTitle">FOREWORD</h1>
-                 <div class="boilerplate_legal"/>
-                 <p>
-           <a href="#IEV">IEV, 1-2-3</a>
-           <a href="#ISO712">ISO 712</a>
-           <a href="#ISO712">ISO 712</a>
-           <a href="#ISO712">ISO 712, Table 1</a>
-           <a href="#ISO712">ISO 712, Table 1&#8211;1</a>
-           <a href="#ISO712">ISO 712, Clause 1, Table 1</a>
-           <a href="#ISO712">ISO 712, Clause 1 a)</a>
-           <a href="#ISO712">ISO 712, Clause 1</a>
-           <a href="#ISO712">ISO 712, 1.5</a>
-           <a href="#ISO712">A</a>
-           <a href="#ISO712">ISO 712, Whole of text</a>
-           <a href="#ISO712">ISO 712, Prelude 7</a>
-           <a href="#ISO712">A</a>
-           </p>
-               </div>
-               #{IEC_TITLE1}
-               <div>
-                 <h1>1&#160; Normative references</h1>
-                 <p id="ISO712" class="NormRef">ISO 712, <i>Cereals and cereal products</i></p>
-               </div>
-             </div>
-           </body>
-       </html>
+<?xml version='1.0'?>
+       <iso-standard xmlns='http://riboseinc.com/isoxml'>
+         <preface>
+           <foreword>
+             <p>
+               <eref type='inline' bibitemid='IEV' citeas='IEV'>
+                 <locality type='clause'>
+                   <referenceFrom>1-2-3</referenceFrom>
+                 </locality>
+                 IEV, 1-2-3
+               </eref>
+               <eref type='inline' bibitemid='ISO712' citeas='ISO 712'>ISO 712</eref>
+               <eref type='inline' bibitemid='ISO712'>ISO 712</eref>
+               <eref type='inline' bibitemid='ISO712'>
+                 <locality type='table'>
+                   <referenceFrom>1</referenceFrom>
+                 </locality>
+                 ISO 712, Table 1
+               </eref>
+               <eref type='inline' bibitemid='ISO712'>
+                 <locality type='table'>
+                   <referenceFrom>1</referenceFrom>
+                   <referenceTo>1</referenceTo>
+                 </locality>
+                 ISO 712, Table 1&#x2013;1
+               </eref>
+               <eref type='inline' bibitemid='ISO712'>
+                 <locality type='clause'>
+                   <referenceFrom>1</referenceFrom>
+                 </locality>
+                 <locality type='table'>
+                   <referenceFrom>1</referenceFrom>
+                 </locality>
+                 ISO 712, Clause 1, Table 1
+               </eref>
+               <eref type='inline' bibitemid='ISO712'>
+                 <locality type='clause'>
+                   <referenceFrom>1</referenceFrom>
+                 </locality>
+                 <locality type='list'>
+                   <referenceFrom>a</referenceFrom>
+                 </locality>
+                 ISO 712, Clause 1 a)
+               </eref>
+               <eref type='inline' bibitemid='ISO712'>
+                 <locality type='clause'>
+                   <referenceFrom>1</referenceFrom>
+                 </locality>
+                 ISO 712, Clause 1
+               </eref>
+               <eref type='inline' bibitemid='ISO712'>
+                 <locality type='clause'>
+                   <referenceFrom>1.5</referenceFrom>
+                 </locality>
+                 ISO 712, 1.5
+               </eref>
+               <eref type='inline' bibitemid='ISO712'>
+                 <locality type='table'>
+                   <referenceFrom>1</referenceFrom>
+                 </locality>
+                 A
+               </eref>
+               <eref type='inline' bibitemid='ISO712'>
+                 <locality type='whole'/>
+                 ISO 712, Whole of text
+               </eref>
+               <eref type='inline' bibitemid='ISO712'>
+                 <locality type='locality:prelude'>
+                   <referenceFrom>7</referenceFrom>
+                 </locality>
+                 ISO 712, Prelude 7
+               </eref>
+               <eref type='inline' bibitemid='ISO712' citeas='ISO 712'>A</eref>
+             </p>
+           </foreword>
+         </preface>
+         <bibliography>
+           <references id='_normative_references' obligation='informative' normative='true'>
+           <title depth='1'>
+  1
+  <tab/>
+  Normative References
+</title>
+             <bibitem id='ISO712' type='standard'>
+               <title format='text/plain'>Cereals and cereal products</title>
+               <docidentifier>ISO 712</docidentifier>
+               <contributor>
+                 <role type='publisher'/>
+                 <organization>
+                   <abbreviation>ISO</abbreviation>
+                 </organization>
+               </contributor>
+             </bibitem>
+           </references>
+         </bibliography>
+       </iso-standard>
     OUTPUT
   end