metanorma-iso 2.0.6.1 → 2.0.8.1

data/spec/isodoc/i18n_spec.rb

@@ -380,11 +380,7 @@ RSpec.describe IsoDoc do
               <p id="A">This is a preamble</p>
             </foreword>
             <introduction id="B" obligation="informative" displayorder='2'>
-              <title depth="1">
-                0
-                <tab/>
-                Introduction
-              </title>
+              <title depth="1">0<tab/>Introduction</title>
               <clause id="C" inline-header="false" obligation="informative">
                 <title depth="2">0.1<tab/>Introduction Subsection</title>
               </clause>
@@ -1146,40 +1142,31 @@ RSpec.describe IsoDoc do
              <doctype language='zh'>&#x56FD;&#x9645;&#x6807;&#x51C6;</doctype>
            </ext>
          </bibdata>
+
         <preface>
           <foreword obligation="informative" displayorder='1'>
             <title>Foreword</title>
             <p id="A">This is a preamble</p>
           </foreword>
           <introduction id="B" obligation="informative" displayorder='2'>
-            <title depth="1">0
-              <tab/>
-              Introduction</title>
+            <title depth="1">0<tab/>Introduction</title>
             <clause id="C" inline-header="false" obligation="informative">
-              <title depth="2">0.1
-                <tab/>
-                Introduction Subsection</title>
+              <title depth="2">0.1<tab/>Introduction Subsection</title>
             </clause>
             <p>This is patent boilerplate</p>
           </introduction>
         </preface>
         <sections>
           <clause id="D" obligation="normative" type="scope" displayorder='3'>
-            <title depth="1">1
-              <tab/>
-              Scope</title>
+            <title depth="1">1<tab/>Scope</title>
             <p id="E">
-              <eref bibitemid="ISO712" type="inline"><locality type="table"><referenceFrom>1</referenceFrom><referenceTo>1</referenceTo></locality>ISO 712、第1–1表</eref>
+              <eref bibitemid="ISO712" type="inline"><locality type="table"><referenceFrom>1</referenceFrom><referenceTo>1</referenceTo></locality>ISO 712, 第1–1表</eref>
             </p>
           </clause>
           <clause id="H" obligation="normative" displayorder='5'>
-            <title depth="1">3
-              <tab/>
-              Terms, definitions, symbols and abbreviated terms</title>
+            <title depth="1">3<tab/>Terms, definitions, symbols and abbreviated terms</title>
             <terms id="I" obligation="normative">
-              <title depth="2">3.1
-                <tab/>
-                Normal Terms</title>
+              <title depth="2">3.1<tab/>Normal Terms</title>
               <term id="J">
                 <name>3.1.1</name>
                 <preferred><strong>Term2</strong></preferred>
@@ -1201,18 +1188,12 @@ RSpec.describe IsoDoc do
             </dl>
           </definitions>
           <clause id="M" inline-header="false" obligation="normative" displayorder='7'>
-            <title depth="1">5
-              <tab/>
-              Clause 4</title>
+            <title depth="1">5<tab/>Clause 4</title>
             <clause id="N" inline-header="false" obligation="normative">
-              <title depth="2">5.1
-                <tab/>
-                Introduction</title>
+              <title depth="2">5.1<tab/>Introduction</title>
             </clause>
             <clause id="O" inline-header="false" obligation="normative">
-              <title depth="2">5.2
-                <tab/>
-                Clause 4.2</title>
+              <title depth="2">5.2<tab/>Clause 4.2</title>
             </clause>
           </clause>
         </sections>
@@ -1224,26 +1205,18 @@ RSpec.describe IsoDoc do
             <br/>
             <strong>Annex</strong></title>
           <clause id="Q" inline-header="false" obligation="normative">
-            <title depth="2">A.1
-              <tab/>
-              Annex A.1</title>
+            <title depth="2">A.1<tab/>Annex A.1</title>
             <clause id="Q1" inline-header="false" obligation="normative">
-              <title depth="3">A.1.1
-                <tab/>
-                Annex A.1a</title>
+              <title depth="3">A.1.1<tab/>Annex A.1a</title>
             </clause>
           </clause>
           <appendix id="Q2" inline-header="false" obligation="normative">
-            <title depth="2">附录1
-              <tab/>
-              An Appendix</title>
+            <title depth="2">附录1<tab/>An Appendix</title>
           </appendix>
         </annex>
         <bibliography>
           <references id="R" normative="true" obligation="informative" displayorder='4'>
-            <title depth="1">2
-              <tab/>
-              Normative References</title>
+            <title depth="1">2<tab/>Normative References</title>
             <bibitem id="ISO712" type="standard">
               <title format="text/plain">Cereals and cereal products</title>
               <docidentifier>ISO 712</docidentifier>
@@ -1267,78 +1240,102 @@ RSpec.describe IsoDoc do
 
     html = <<~OUTPUT
       #{HTML_HDR.gsub(/"en"/, '"zh"')}
-            <br/>
-            <div>
-              <h1 class="ForewordTitle">Foreword</h1>
-              <p id="A">This is a preamble</p>
-            </div>
-            <br/>
-            <div class="Section3" id="B">
-              <h1 class="IntroTitle">0 &#12288; Introduction</h1>
-              <div id="C">
-                <h2>0.1 &#12288; Introduction Subsection</h2>
-              </div>
-              <p>This is patent boilerplate</p>
-            </div>
-            <p class="zzSTDTitle1"/>
-            <div id="D">
-              <h1>1 &#12288; Scope</h1>
-              <p id="E"><a href='#ISO712'>ISO 712&#12289;&#31532;1&#8211;1&#34920;</a></p>
-            </div>
-            <div>
-              <h1>2 &#12288; Normative References</h1>
-              <p id="ISO712" class="NormRef">ISO 712, <i>Cereals and cereal products</i></p>
-            </div>
-            <div id="H">
-              <h1>3 &#12288; Terms, definitions, symbols and abbreviated terms</h1>
-              <div id="I"><h2>3.1 &#12288; Normal Terms</h2>
-                <p class="TermNum" id="J">3.1.1</p>
-                <p class="Terms" style="text-align:left;"><b>Term2</b></p>
-              </div><div id="K">
-              <span class='zzMoveToFollowing'>
-                <b>3.2&#12288;</b>
-              </span>
-                <dl><dt><p>Symbol</p></dt><dd>Definition</dd></dl>
-              </div></div>
-            <div id="L" class="Symbols">
-              <h1>4</h1>
-              <dl>
-                <dt>
-                  <p>Symbol</p>
-                </dt>
-                <dd>Definition</dd>
-              </dl>
-            </div>
-            <div id="M">
-              <h1>5 &#12288; Clause 4</h1>
-              <div id="N">
-                <h2>5.1 &#12288; Introduction</h2>
-              </div>
-              <div id="O">
-                <h2>5.2 &#12288; Clause 4.2</h2>
-              </div>
-            </div>
-            <br/>
-            <div id="P" class="Section3">
-              <h1 class="Annex"><b>&#38468;&#20214;A</b><br/>&#65288;&#35268;&#33539;&#24615;&#38468;&#24405;&#65289;<br/><br/><b>Annex</b></h1>
-              <div id="Q">
-                <h2>A.1 &#12288; Annex A.1</h2>
-                <div id="Q1"><h3>A.1.1 &#12288; Annex A.1a</h3></div>
-              </div>
-              <div id="Q2">
-                <h2>&#38468;&#24405;1 &#12288; An Appendix</h2>
-              </div>
-            </div>
-            <br/>
-            <div>
-              <h1 class="Section3">Bibliography</h1>
-              <div>
-                <h2 class="Section3">Bibliography Subsection</h2>
-              </div>
-            </div>
-          </div>
-        </body>
-      </html>
+                   <br/>
+             <div>
+               <h1 class='ForewordTitle'>Foreword</h1>
+               <p id='A'>This is a preamble</p>
+             </div>
+             <br/>
+             <div class='Section3' id='B'>
+               <h1 class='IntroTitle'>0　Introduction</h1>
+               <div id='C'>
+                 <h2>0.1　Introduction Subsection</h2>
+               </div>
+               <p>This is patent boilerplate</p>
+             </div>
+             <p class='zzSTDTitle1'/>
+             <div id='D'>
+               <h1>1　Scope</h1>
+               <p id='E'>
+                 <a href='#ISO712'>ISO 712, 第1–1表</a>
+               </p>
+             </div>
+             <div>
+               <h1>2　Normative References</h1>
+               <p id='ISO712' class='NormRef'>
+                 ISO 712,
+                 <i>Cereals and cereal products</i>
+               </p>
+             </div>
+             <div id='H'>
+               <h1>3　Terms, definitions, symbols and abbreviated terms</h1>
+               <div id='I'>
+                 <h2>3.1　Normal Terms</h2>
+                 <p class='TermNum' id='J'>3.1.1</p>
+                 <p class='Terms' style='text-align:left;'>
+                   <b>Term2</b>
+                 </p>
+               </div>
+               <div id='K'>
+                 <span class='zzMoveToFollowing'>
+                   <b>3.2　</b>
+                 </span>
+                 <dl>
+                   <dt>
+                     <p>Symbol</p>
+                   </dt>
+                   <dd>Definition</dd>
+                 </dl>
+               </div>
+             </div>
+             <div id='L' class='Symbols'>
+               <h1>4</h1>
+               <dl>
+                 <dt>
+                   <p>Symbol</p>
+                 </dt>
+                 <dd>Definition</dd>
+               </dl>
+             </div>
+             <div id='M'>
+               <h1>5　Clause 4</h1>
+               <div id='N'>
+                 <h2>5.1　Introduction</h2>
+               </div>
+               <div id='O'>
+                 <h2>5.2　Clause 4.2</h2>
+               </div>
+             </div>
+             <br/>
+             <div id='P' class='Section3'>
+               <h1 class='Annex'>
+                 <b>附件A</b>
+                 <br/>
+                 （规范性附录）
+                 <br/>
+                 <br/>
+                 <b>Annex</b>
+               </h1>
+               <div id='Q'>
+                 <h2>A.1　Annex A.1</h2>
+                 <div id='Q1'>
+                   <h3>A.1.1　Annex A.1a</h3>
+                 </div>
+               </div>
+               <div id='Q2'>
+                 <h2>附录1　An Appendix</h2>
+               </div>
+             </div>
+             <br/>
+             <div>
+               <h1 class='Section3'>Bibliography</h1>
+               <div>
+                 <h2 class='Section3'>Bibliography Subsection</h2>
+               </div>
+             </div>
+           </div>
+         </body>
+       </html>
     OUTPUT
     expect(xmlpp(IsoDoc::Iso::PresentationXMLConvert.new({})
       .convert("test", input, true))

data/spec/isodoc/iso_spec.rb

@@ -15,9 +15,12 @@ RSpec.describe IsoDoc::Iso do
       </iso-standard>
     INPUT
     html = File.read("test.html", encoding: "utf-8")
-    expect(html).to match(%r[\bpre[^{]+\{[^{]+font-family: "Courier New", monospace;]m)
-    expect(html).to match(%r[blockquote[^{]+\{[^{]+font-family: "Cambria", serif;]m)
-    expect(html).to match(%r[\.h2Annex[^{]+\{[^{]+font-family: "Cambria", serif;]m)
+    expect(html)
+      .to match(%r[\bpre[^{]+\{[^{]+font-family: "Courier New", monospace;]m)
+    expect(html)
+      .to match(%r[blockquote[^{]+\{[^{]+font-family: "Cambria", serif;]m)
+    expect(html)
+      .to match(%r[\.h2Annex[^{]+\{[^{]+font-family: "Cambria", serif;]m)
   end
 
   it "processes isodoc as ISO: alt HTML output" do
@@ -33,27 +36,34 @@ RSpec.describe IsoDoc::Iso do
       </iso-standard>
     INPUT
     html = File.read("test.html", encoding: "utf-8")
-    expect(html).to match(%r[\bpre[^{]+\{[^{]+font-family: "Space Mono", monospace;]m)
-    expect(html).to match(%r[blockquote[^{]+\{[^{]+font-family: "Lato", sans-serif;]m)
-    expect(html).to match(%r[\.h2Annex[^{]+\{[^{]+font-family: "Lato", sans-serif;]m)
+    expect(html)
+      .to match(%r[\bpre[^{]+\{[^{]+font-family: "Space Mono", monospace;]m)
+    expect(html)
+      .to match(%r[blockquote[^{]+\{[^{]+font-family: "Lato", sans-serif;]m)
+    expect(html)
+      .to match(%r[\.h2Annex[^{]+\{[^{]+font-family: "Lato", sans-serif;]m)
   end
 
   it "processes isodoc as ISO: Chinese HTML output" do
-    IsoDoc::Iso::HtmlConvert.new(script: "Hans").convert("test", <<~"INPUT", false)
-      <iso-standard xmlns="http://riboseinc.com/isoxml">
-        <preface>
-          <foreword>
-            <note>
-              <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">These results are based on a study carried out on three different types of kernel.</p>
-            </note>
-          </foreword>
-        </preface>
-      </iso-standard>
-    INPUT
+    IsoDoc::Iso::HtmlConvert.new(script: "Hans")
+      .convert("test", <<~"INPUT", false)
+        <iso-standard xmlns="http://riboseinc.com/isoxml">
+          <preface>
+            <foreword>
+              <note>
+                <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">These results are based on a study carried out on three different types of kernel.</p>
+              </note>
+            </foreword>
+          </preface>
+        </iso-standard>
+      INPUT
     html = File.read("test.html", encoding: "utf-8")
-    expect(html).to match(%r[\bpre[^{]+\{[^{]+font-family: "Courier New", monospace;]m)
-    expect(html).to match(%r[blockquote[^{]+\{[^{]+font-family: "Source Han Sans", serif;]m)
-    expect(html).to match(%r[\.h2Annex[^{]+\{[^{]+font-family: "Source Han Sans", sans-serif;]m)
+    expect(html)
+      .to match(%r[\bpre[^{]+\{[^{]+font-family: "Courier New", monospace;]m)
+    expect(html)
+      .to match(%r[blockquote[^{]+\{[^{]+font-family: "Source Han Sans", serif;]m)
+    expect(html)
+      .to match(%r[\.h2Annex[^{]+\{[^{]+font-family: "Source Han Sans", sans-serif;]m)
   end
 
   it "processes isodoc as ISO: user nominated fonts" do
@@ -72,9 +82,12 @@ RSpec.describe IsoDoc::Iso do
         </iso-standard>
       INPUT
     html = File.read("test.html", encoding: "utf-8")
-    expect(html).to match(%r[\bpre[^{]+\{[^{]+font-family: Andale Mono;]m)
-    expect(html).to match(%r[blockquote[^{]+\{[^{]+font-family: Zapf Chancery;]m)
-    expect(html).to match(%r[\.h2Annex[^{]+\{[^{]+font-family: Comic Sans;]m)
+    expect(html)
+      .to match(%r[\bpre[^{]+\{[^{]+font-family: Andale Mono;]m)
+    expect(html)
+      .to match(%r[blockquote[^{]+\{[^{]+font-family: Zapf Chancery;]m)
+    expect(html)
+      .to match(%r[\.h2Annex[^{]+\{[^{]+font-family: Comic Sans;]m)
   end
 
   it "processes isodoc as ISO: Word output" do
@@ -90,9 +103,12 @@ RSpec.describe IsoDoc::Iso do
       </iso-standard>
     INPUT
     html = File.read("test.doc", encoding: "utf-8")
-    expect(html).to match(%r[\bpre[^{]+\{[^{]+font-family: "Courier New", monospace;]m)
-    expect(html).to match(%r[Quote[^{]+\{[^{]+font-family: "Cambria", serif;]m)
-    expect(html).to match(%r[\.h2Annex[^{]+\{[^{]+font-family: "Cambria", serif;]m)
+    expect(html)
+      .to match(%r[\bpre[^{]+\{[^{]+font-family: "Courier New", monospace;]m)
+    expect(html)
+      .to match(%r[Quote[^{]+\{[^{]+font-family: "Cambria", serif;]m)
+    expect(html)
+      .to match(%r[\.h2Annex[^{]+\{[^{]+font-family: "Cambria", serif;]m)
   end
 
   it "does not include IEV in references" do

data/spec/isodoc/ref_spec.rb

@@ -272,7 +272,7 @@ RSpec.describe IsoDoc do
             </note>
             <bibitem id="ISO3696" type="standard">
               <title format="text/plain">Water for analytical laboratory use</title>
-              <docidentifier type='metanorma-ordinal'>[1]</docidentifier>
+              <docidentifier type='metanorma-ordinal'>[3]</docidentifier>
               <docidentifier type="ISO">ISO 3696</docidentifier>
               <contributor>
                 <role type="publisher"/>
@@ -295,7 +295,7 @@ RSpec.describe IsoDoc do
             </bibitem>
             <bibitem id="ref11">
               <title>Internet Calendaring and Scheduling Core Object Specification (iCalendar)</title>
-              <docidentifier type='metanorma-ordinal'>[2]</docidentifier>
+              <docidentifier type='metanorma-ordinal'>[4]</docidentifier>
               <docidentifier type="IETF">IETF RFC 10</docidentifier>
             </bibitem>
             <bibitem id="ref12">
@@ -363,7 +363,7 @@ RSpec.describe IsoDoc do
                 <p>
                   <span class="note_label">NOTE</span>&#160; This is another annotation of document ISSN.</p>
               </div>
-              <p class="Biblio" id="ISO3696">[1]&#160; ISO 3696,
+              <p class="Biblio" id="ISO3696">[3]&#160; ISO 3696,
                 <i>Water for analytical laboratory use</i></p>
               <p class="Biblio" id="ref10">[10]&#160; <span style="font-variant:small-caps;">Standard No I.C.C 167</span>
                  .
@@ -371,7 +371,7 @@ RSpec.describe IsoDoc do
                 (see
                 <a href="http://www.icc.or.at">http://www.icc.or.at</a>
                 )</p>
-              <p class="Biblio" id="ref11">[2]&#160; IETF RFC 10,
+              <p class="Biblio" id="ref11">[4]&#160; IETF RFC 10,
                 <i>Internet Calendaring and Scheduling Core Object Specification (iCalendar)</i></p>
               <p class="Biblio" id="ref12">Citn&#160; IETF RFC 20, CitationWorks. 2019.
                 <i>How to cite a reference</i>
@@ -384,8 +384,12 @@ RSpec.describe IsoDoc do
         </body>
       </html>
     OUTPUT
-    expect(xmlpp(IsoDoc::Iso::PresentationXMLConvert.new({}).convert("test", input, true))
-      .sub(%r{<localized-strings>.*</localized-strings>}m, "")).to be_equivalent_to xmlpp(presxml)
-    expect(xmlpp(IsoDoc::Iso::HtmlConvert.new({}).convert("test", presxml, true))).to be_equivalent_to xmlpp(html)
+    expect(xmlpp(IsoDoc::Iso::PresentationXMLConvert.new({})
+      .convert("test", input, true))
+      .sub(%r{<localized-strings>.*</localized-strings>}m, ""))
+      .to be_equivalent_to xmlpp(presxml)
+    expect(xmlpp(IsoDoc::Iso::HtmlConvert.new({})
+      .convert("test", presxml, true)))
+      .to be_equivalent_to xmlpp(html)
   end
 end