metanorma-iec 1.0.5 → 1.1.0

data/spec/examples/rice.html

@@ -269,14 +269,14 @@ p.Terms {
     font-size: 0.9em;
     overflow: auto;
     padding: 0 0 0 20px;
-    background-color: #f7f7f7;
+    background-color: #f5faff;
     line-height: 1.2em; }
   #toggle {
     position: fixed;
     height: 100%;
     width: 30px;
     border-right: solid black 1px;
-    background-color: #f7f7f7;
+    background-color: #f5faff;
     color: black !important;
     cursor: pointer;
     margin-left: -4em;
@@ -506,7 +506,7 @@ p.Biblio, p.NormRef {
   font-variant-ligatures: none; }
 
 .figure, .Sourcecode {
-  background-color: #f7f7f7;
+  background-color: #f5faff;
   line-height: 1.6em;
   padding: 1.5em;
   margin: 2em 0 1em 0;
@@ -639,7 +639,7 @@ ol > li > p:before {
 3.11 Blockquotes
 */
 .blockquote, .Quote {
-  background-color: #f7f7f7;
+  background-color: #f5faff;
   font-style: italic;
   width: 80%;
   padding: 1.5em;
@@ -651,7 +651,7 @@ ol > li > p:before {
 3.12 Formulas
 */
 .formula {
-  background-color: #f7f7f7;
+  background-color: #f5faff;
   padding: 1.5em;
   margin-top: 2em;
   text-align: center;

data/spec/isodoc/blocks_spec.rb

@@ -0,0 +1,154 @@
+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">
+  <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">
+  <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)
+                 </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>
+    OUTPUT
+  end
+
+end

data/spec/isodoc/i18n_spec.rb

@@ -60,11 +60,11 @@ RSpec.describe IsoDoc do
        <appendix id="Q2" inline-header="false" obligation="normative">
          <title>An Appendix</title>
        </appendix>
-       </annex><bibliography><references id="R" obligation="informative">
+       </annex><bibliography><references id="R" obligation="informative" normative="true">
          <title>Normative References</title>
        </references><clause id="S" obligation="informative">
          <title>Bibliography</title>
-         <references id="T" obligation="informative">
+         <references id="T" obligation="informative" normative="false">
          <title>Bibliography Subsection</title>
        </references>
        </clause>
@@ -85,7 +85,7 @@ RSpec.describe IsoDoc do
         </div>
                <p>This is patent boilerplate</p>
              </div>
-             #{IEC_TITLE}
+             #{IEC_TITLE1}
              <div id="D">
                <h1>1&#160; Scope</h1>
                <p id="E">Text</p>
@@ -204,11 +204,11 @@ RSpec.describe IsoDoc do
               <appendix id="Q2" inline-header="false" obligation="normative">
          <title>An Appendix</title>
        </appendix>
-       </annex><bibliography><references id="R" obligation="informative">
+       </annex><bibliography><references id="R" obligation="informative" normative="true">
          <title>Normative References</title>
        </references><clause id="S" obligation="informative">
          <title>Bibliography</title>
-         <references id="T" obligation="informative">
+         <references id="T" obligation="informative" normative="false">
          <title>Bibliography Subsection</title>
        </references>
        </clause>
@@ -229,7 +229,7 @@ RSpec.describe IsoDoc do
         </div>
                <p>This is patent boilerplate</p>
              </div>
-             #{IEC_TITLE}
+             #{IEC_TITLE1}
              <div id="D">
                <h1>1&#160; Scope</h1>
                <p id="E">Text</p>
@@ -348,11 +348,11 @@ RSpec.describe IsoDoc do
               <appendix id="Q2" inline-header="false" obligation="normative">
          <title>An Appendix</title>
        </appendix>
-       </annex><bibliography><references id="R" obligation="informative">
+       </annex><bibliography><references id="R" obligation="informative" normative="true">
          <title>Normative References</title>
        </references><clause id="S" obligation="informative">
          <title>Bibliography</title>
-         <references id="T" obligation="informative">
+         <references id="T" obligation="informative" normative="false">
          <title>Bibliography Subsection</title>
        </references>
        </clause>
@@ -374,7 +374,7 @@ RSpec.describe IsoDoc do
         </div>
                <p>This is patent boilerplate</p>
              </div>
-             #{IEC_TITLE.sub(/INTERNATIONAL ELECTROTECHNICAL COMMISSION/, "COMMISSION ELECTROTECHNIQUE INTERNATIONALE")}
+             #{IEC_TITLE1}
              <div id="D">
                <h1>1&#160; Domaine d'application</h1>
                <p id="E">Text</p>
@@ -494,7 +494,7 @@ RSpec.describe IsoDoc do
               <appendix id="Q2" inline-header="false" obligation="normative">
          <title>An Appendix</title>
        </appendix>
-       </annex><bibliography><references id="R" obligation="informative">
+       </annex><bibliography><references id="R" obligation="informative" normative="true">
          <title>Normative References</title>
          <bibitem id="ISO712" type="standard">
   <title format="text/plain">Cereals and cereal products</title>
@@ -508,7 +508,7 @@ RSpec.describe IsoDoc do
 </bibitem>
        </references><clause id="S" obligation="informative">
          <title>Bibliography</title>
-         <references id="T" obligation="informative">
+         <references id="T" obligation="informative"  normative="false">
          <title>Bibliography Subsection</title>
        </references>
        </clause>
@@ -529,7 +529,7 @@ RSpec.describe IsoDoc do
               </div>
                <p>This is patent boilerplate</p>
              </div>
-    #{IEC_TITLE.sub(/INTERNATIONAL ELECTROTECHNICAL COMMISSION/, "&#22269;&#38469;&#30005;&#24037;&#22996;&#21592;&#20250;")}
+    #{IEC_TITLE1}
              <div id="D">
                <h1>1&#160; &#33539;&#22260;</h1>
                <p id="E">

data/spec/isodoc/iev_spec.rb

@@ -37,7 +37,7 @@ RSpec.describe IsoDoc do
           <h2>Introduction Subsection</h2>
         </div>
       </div>
-      #{IEC_TITLE}
+      #{IEC_TITLE1}
     </div>
   </body>
 </html>
@@ -93,7 +93,7 @@ RSpec.describe IsoDoc do
          </bibdata>
          <sections> </sections>
          <bibliography>
-           <references id='_' obligation='informative'>
+           <references id='_' obligation='informative' normative="true">
              <title>Normative References</title>
              <p id='_'>There are no normative references in this document.</p>
              <bibitem id='A'>
@@ -103,7 +103,7 @@ RSpec.describe IsoDoc do
                <docidentifier>B</docidentifier>
              </bibitem>
            </references>
-           <references id='_' obligation='informative'>
+           <references id='_' obligation='informative' normative="false">
              <title>Bibliography</title>
              <p id='_'>There are no normative references in this document.</p>
              <bibitem id='A'>
@@ -122,10 +122,14 @@ INPUT
   <h1 class='ForewordTitle'>FOREWORD</h1>
   <div class='boilerplate_legal'/>
 </div>
-      #{IEC_TITLE}
+      #{IEC_TITLE1}
       <div>
   <h1>1&#160; Normative references</h1>
   <p id='_'>There are no normative references in this document.</p>
+  <p id='A' class='NormRef'>
+  B,
+  <i>TITLE</i>
+</p>
 </div>
     </div>
   </body>
@@ -137,7 +141,7 @@ OUTPUT
     expect(xmlpp(IsoDoc::Iec::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns="http://riboseinc.com/isoxml">
      <bibdata type='standard'>
-           <docidentifier type='iso'>IEC 60050-192 ED 1</docidentifier>
+           <docidentifier type='ISO'>IEC 60050-192 ED 1</docidentifier>
            <docnumber>60050</docnumber>
     </bibdata>
     <sections>
@@ -194,7 +198,7 @@ INPUT
         <h1 class='ForewordTitle'>FOREWORD</h1>
         <div class='boilerplate_legal'/>
       </div>
-            #{IEC_TITLE}
+            #{IEC_TITLE1}
       <div id='_terms_and_definitions'>
         <h1>1&#160; Terms and definitions</h1>
         <br/>
@@ -244,14 +248,14 @@ INPUT
               <li>A</li>
             </ul>
           </div>
-          <div class='Note'>
+          <div class='Note' id='_671a1994-4783-40d0-bc81-987d06ffb74e'>
             <p>
               Note 1 to entry: The starch of waxy rice consists almost entirely
               of amylopectin. The kernels have a tendency to stick together
               after cooking.
             </p>
           </div>
-          <div class='Note'>
+          <div class='Note' id='_671a1994-4783-40d0-bc81-987d06ffb74f'>
             <p>
               Note 2 to entry:
               <ul>
@@ -282,7 +286,7 @@ end
     IsoDoc::Iec::WordConvert.new({}).convert("test", <<~"INPUT", false)
         <iso-standard xmlns="http://riboseinc.com/isoxml">
         <bibdata type='standard'>
-           <docidentifier type='iso'>IEC 60050-192 ED 1</docidentifier>
+           <docidentifier type='ISO'>IEC 60050-192 ED 1</docidentifier>
            <docnumber>60050</docnumber>
     </bibdata>
     <sections>
@@ -308,9 +312,6 @@ end
       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")
     <div class='WordSection3'>
-         <p class='zzSTDTitle1'>INTERNATIONAL ELECTROTECHNICAL COMMISSION</p>
-         <p class='zzSTDTitle1'>____________</p>
-         <p class='zzSTDTitle1'>&#xA0;</p>
          <p class='zzSTDTitle1'>
            <b/>
          </p>

data/spec/isodoc/inline_spec.rb

@@ -24,7 +24,7 @@ RSpec.describe IsoDoc do
        <a id="H"/> <br/>
        </p>
                </div>
-               #{IEC_TITLE}
+               #{IEC_TITLE1}
              </div>
            </body>
        </html>
@@ -56,7 +56,7 @@ RSpec.describe IsoDoc do
        <a href="mailto:fred@example.com">mailto:fred@example.com</a>
        </p>
                </div>
-               #{IEC_TITLE}
+               #{IEC_TITLE1}
              </div>
            </body>
        </html>
@@ -82,7 +82,7 @@ RSpec.describe IsoDoc do
        <para><b role="strong">&lt;barry fred="http://example.com"&gt;example&lt;/barry&gt;</b></para>
        </p>
                </div>
-               #{IEC_TITLE}
+               #{IEC_TITLE1}
              </div>
            </body>
        </html>
@@ -114,7 +114,7 @@ RSpec.describe IsoDoc do
        <span class="stem">Latex?</span>
        </p>
                </div>
-               #{IEC_TITLE}
+               #{IEC_TITLE1}
              </div>
            </body>
        </html>
@@ -142,7 +142,7 @@ RSpec.describe IsoDoc do
        (#((Hello))#)
        </p>
                </div>
-               #{IEC_TITLE}
+               #{IEC_TITLE1}
              </div>
            </body>
        </html>
@@ -158,7 +158,7 @@ RSpec.describe IsoDoc do
     <eref type="inline" bibitemid="ISO712" citeas="ISO 712">A</stem>
     </p>
     </foreword></preface>
-    <bibliography><references id="_normative_references" obligation="informative"><title>Normative References</title>
+    <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>
@@ -182,7 +182,7 @@ RSpec.describe IsoDoc do
            <a href="#ISO712">A</a>
            </p>
                </div>
-               #{IEC_TITLE}
+               #{IEC_TITLE1}
                <div>
                  <h1>1&#160; Normative references</h1>
                  <p id="ISO712" class="NormRef">ISO 712, <i> Cereals and cereal products</i></p>
@@ -213,7 +213,7 @@ RSpec.describe IsoDoc do
     <eref type="inline" bibitemid="ISO712" citeas="ISO 712">A</eref>
     </p>
     </foreword></preface>
-    <bibliography><references id="_normative_references" obligation="informative"><title>Normative References</title>
+    <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>
@@ -243,15 +243,15 @@ RSpec.describe IsoDoc do
            <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, </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_TITLE}
+               #{IEC_TITLE1}
                <div>
                  <h1>1&#160; Normative references</h1>
-                 <p id="ISO712" class="NormRef">ISO 712, <i> Cereals and cereal products</i></p>
+                 <p id="ISO712" class="NormRef">ISO 712, <i>Cereals and cereal products</i></p>
                </div>
              </div>
            </body>