metanorma-iso 1.8.0 → 1.8.5

data/spec/isodoc/i18n_spec.rb

@@ -88,11 +88,11 @@ RSpec.describe IsoDoc do
           <language current="true">en</language>
         </bibdata>
         <preface>
-          <foreword obligation="informative">
+          <foreword obligation="informative" displayorder='1'>
             <title>Foreword</title>
             <p id="A">This is a preamble</p>
           </foreword>
-          <introduction id="B" obligation="informative">
+          <introduction id="B" obligation="informative" displayorder='2'>
             <title depth="1">0<tab/>Introduction</title>
             <clause id="C" inline-header="false" obligation="informative">
               <title depth="2">0.1<tab/>Introduction Subsection</title>
@@ -101,11 +101,11 @@ RSpec.describe IsoDoc do
           </introduction>
         </preface>
         <sections>
-          <clause id="D" obligation="normative" type="scope">
+          <clause id="D" obligation="normative" type="scope" displayorder='3'>
             <title depth="1">1<tab/>Scope</title>
             <p id="E">Text</p>
           </clause>
-          <clause id="H" obligation="normative">
+          <clause id="H" obligation="normative" displayorder='5'>
             <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>
@@ -122,14 +122,14 @@ RSpec.describe IsoDoc do
               </dl>
             </definitions>
           </clause>
-          <definitions id="L">
+          <definitions id="L" displayorder='6'>
             <title>4</title>
             <dl>
               <dt>Symbol</dt>
               <dd>Definition</dd>
             </dl>
           </definitions>
-          <clause id="M" inline-header="false" obligation="normative">
+          <clause id="M" inline-header="false" obligation="normative" displayorder='7'>
             <title depth="1">5<tab/>Clause 4</title>
             <clause id="N" inline-header="false" obligation="normative">
               <title depth="2">5.1<tab/>Introduction</title>
@@ -139,7 +139,7 @@ RSpec.describe IsoDoc do
             </clause>
           </clause>
         </sections>
-        <annex id="P" inline-header="false" obligation="normative">
+        <annex id="P" inline-header="false" obligation="normative" displayorder='8'>
           <title>
             <strong>Annex A</strong>
             <br/>(normative)
@@ -157,10 +157,10 @@ RSpec.describe IsoDoc do
           </appendix>
         </annex>
         <bibliography>
-          <references id="R" normative="true" obligation="informative">
+          <references id="R" normative="true" obligation="informative" displayorder='4'>
             <title depth="1">2<tab/>Normative References</title>
           </references>
-          <clause id="S" obligation="informative">
+          <clause id="S" obligation="informative" displayorder='9'>
             <title depth="1">Bibliography</title>
             <references id="T" normative="false" obligation="informative">
               <title depth="2">Bibliography Subsection</title>
@@ -341,11 +341,11 @@ RSpec.describe IsoDoc do
             <language current="true">tlh</language>
           </bibdata>
           <preface>
-            <foreword obligation="informative">
+            <foreword obligation="informative" displayorder='1'>
               <title>Foreword</title>
               <p id="A">This is a preamble</p>
             </foreword>
-            <introduction id="B" obligation="informative">
+            <introduction id="B" obligation="informative" displayorder='2'>
               <title depth="1">
                 0
                 <tab/>
@@ -358,11 +358,11 @@ RSpec.describe IsoDoc do
             </introduction>
           </preface>
           <sections>
-            <clause id="D" obligation="normative" type="scope">
+            <clause id="D" obligation="normative" type="scope" displayorder='3'>
               <title depth="1">1<tab/>Scope</title>
               <p id="E">Text</p>
             </clause>
-            <clause id="H" obligation="normative">
+            <clause id="H" obligation="normative" displayorder='5'>
               <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>
@@ -379,14 +379,14 @@ RSpec.describe IsoDoc do
                 </dl>
               </definitions>
             </clause>
-            <definitions id="L">
+            <definitions id="L" displayorder='6'>
               <title>4</title>
               <dl>
                 <dt>Symbol</dt>
                 <dd>Definition</dd>
               </dl>
             </definitions>
-            <clause id="M" inline-header="false" obligation="normative">
+            <clause id="M" inline-header="false" obligation="normative" displayorder='7'>
               <title depth="1">5<tab/>Clause 4</title>
               <clause id="N" inline-header="false" obligation="normative">
                 <title depth="2">5.1<tab/>Introduction</title>
@@ -396,7 +396,7 @@ RSpec.describe IsoDoc do
               </clause>
             </clause>
           </sections>
-          <annex id="P" inline-header="false" obligation="normative">
+          <annex id="P" inline-header="false" obligation="normative" displayorder='8'>
             <title>
               <strong>Annex A</strong>
               <br/>(normative)
@@ -414,10 +414,10 @@ RSpec.describe IsoDoc do
             </appendix>
           </annex>
           <bibliography>
-            <references id="R" normative="true" obligation="informative">
+            <references id="R" normative="true" obligation="informative" displayorder='4'>
               <title depth="1">2<tab/>Normative References</title>
             </references>
-            <clause id="S" obligation="informative">
+            <clause id="S" obligation="informative" displayorder='9'>
               <title depth="1">Bibliography</title>
               <references id="T" normative="false" obligation="informative">
                 <title depth="2">Bibliography Subsection</title>
@@ -515,11 +515,11 @@ RSpec.describe IsoDoc do
           <language current="true">fr</language>
         </bibdata>
         <preface>
-          <foreword obligation="informative">
+          <foreword obligation="informative" displayorder='1'>
             <title>Foreword</title>
             <p id="A">This is a preamble</p>
           </foreword>
-          <introduction id="B" obligation="informative">
+          <introduction id="B" obligation="informative" displayorder='2'>
             <title depth="1">0<tab/>Introduction</title>
             <clause id="C" inline-header="false" obligation="informative">
               <title depth="2">0.1<tab/>Introduction Subsection</title>
@@ -528,11 +528,11 @@ RSpec.describe IsoDoc do
           </introduction>
         </preface>
         <sections>
-          <clause id="D" obligation="normative" type="scope">
+          <clause id="D" obligation="normative" type="scope" displayorder='3'>
             <title depth="1">1<tab/>Scope</title>
             <p id="E">Text</p>
           </clause>
-          <clause id="H" obligation="normative">
+          <clause id="H" obligation="normative" displayorder='5'>
             <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>
@@ -549,14 +549,14 @@ RSpec.describe IsoDoc do
               </dl>
             </definitions>
           </clause>
-          <definitions id="L">
+          <definitions id="L" displayorder='6'>
             <title>4</title>
             <dl>
               <dt>Symbol</dt>
               <dd>Definition</dd>
             </dl>
           </definitions>
-          <clause id="M" inline-header="false" obligation="normative">
+          <clause id="M" inline-header="false" obligation="normative" displayorder='7'>
             <title depth="1">5<tab/>Clause 4</title>
             <clause id="N" inline-header="false" obligation="normative">
               <title depth="2">5.1<tab/>Introduction</title>
@@ -566,7 +566,7 @@ RSpec.describe IsoDoc do
             </clause>
           </clause>
         </sections>
-        <annex id="P" inline-header="false" obligation="normative">
+        <annex id="P" inline-header="false" obligation="normative" displayorder='8'>
           <title>
             <strong>Annexe A</strong>
             <br/>(normative)
@@ -584,10 +584,10 @@ RSpec.describe IsoDoc do
           </appendix>
         </annex>
         <bibliography>
-          <references id="R" normative="true" obligation="informative">
+          <references id="R" normative="true" obligation="informative" displayorder='4'>
             <title depth="1">2<tab/>Normative References</title>
           </references>
-          <clause id="S" obligation="informative">
+          <clause id="S" obligation="informative" displayorder='9'>
             <title depth="1">Bibliography</title>
             <references id="T" normative="false" obligation="informative">
               <title depth="2">Bibliography Subsection</title>
@@ -796,11 +796,11 @@ RSpec.describe IsoDoc do
           <script current="true">Hans</script>
         </bibdata>
         <preface>
-          <foreword obligation="informative">
+          <foreword obligation="informative" displayorder='1'>
             <title>Foreword</title>
             <p id="A">This is a preamble</p>
           </foreword>
-          <introduction id="B" obligation="informative">
+          <introduction id="B" obligation="informative" displayorder='2'>
             <title depth="1">0
               <tab/>
               Introduction</title>
@@ -813,7 +813,7 @@ RSpec.describe IsoDoc do
           </introduction>
         </preface>
         <sections>
-          <clause id="D" obligation="normative" type="scope">
+          <clause id="D" obligation="normative" type="scope" displayorder='3'>
             <title depth="1">1
               <tab/>
               Scope</title>
@@ -821,7 +821,7 @@ RSpec.describe IsoDoc do
               <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">
+          <clause id="H" obligation="normative" displayorder='5'>
             <title depth="1">3
               <tab/>
               Terms, definitions, symbols and abbreviated terms</title>
@@ -842,14 +842,14 @@ RSpec.describe IsoDoc do
               </dl>
             </definitions>
           </clause>
-          <definitions id="L">
+          <definitions id="L" displayorder='6'>
             <title>4</title>
             <dl>
               <dt>Symbol</dt>
               <dd>Definition</dd>
             </dl>
           </definitions>
-          <clause id="M" inline-header="false" obligation="normative">
+          <clause id="M" inline-header="false" obligation="normative" displayorder='7'>
             <title depth="1">5
               <tab/>
               Clause 4</title>
@@ -865,7 +865,7 @@ RSpec.describe IsoDoc do
             </clause>
           </clause>
         </sections>
-        <annex id="P" inline-header="false" obligation="normative">
+        <annex id="P" inline-header="false" obligation="normative" displayorder='8'>
           <title>
             <strong>附件A</strong>
             <br/>（规范性附录）
@@ -889,7 +889,7 @@ RSpec.describe IsoDoc do
           </appendix>
         </annex>
         <bibliography>
-          <references id="R" normative="true" obligation="informative">
+          <references id="R" normative="true" obligation="informative" displayorder='4'>
             <title depth="1">2
               <tab/>
               Normative References</title>
@@ -904,7 +904,7 @@ RSpec.describe IsoDoc do
               </contributor>
             </bibitem>
           </references>
-          <clause id="S" obligation="informative">
+          <clause id="S" obligation="informative" displayorder='9'>
             <title depth="1">Bibliography</title>
             <references id="T" normative="false" obligation="informative">
               <title depth="2">Bibliography Subsection</title>

data/spec/isodoc/inline_spec.rb

@@ -318,7 +318,7 @@ RSpec.describe IsoDoc do
       <?xml version='1.0'?>
       <iso-standard type="presentation" xmlns="http://riboseinc.com/isoxml">
         <preface>
-          <foreword>
+          <foreword displayorder="1">
             <p>
               <eref bibitemid="IEV" citeas="IEV" type="inline">
                 <locality type="clause">
@@ -372,7 +372,7 @@ RSpec.describe IsoDoc do
           </foreword>
         </preface>
         <bibliography>
-          <references id="_normative_references" normative="true" obligation="informative">
+          <references id="_normative_references" normative="true" obligation="informative" displayorder="2">
             <title depth="1">1<tab/>
               Normative References</title>
             <bibitem id="ISO712" type="standard">

data/spec/isodoc/iso_spec.rb

@@ -177,8 +177,8 @@ RSpec.describe IsoDoc::Iso do
     OUTPUT
   end
 
-  it "processes examples (Presentation XML)" do
-    output = IsoDoc::Iso::PresentationXMLConvert.new({}).convert("test", <<~"INPUT", true)
+  it "processes examples" do
+    input = <<~INPUT
       <iso-standard xmlns="http://riboseinc.com/isoxml">
         <preface>
           <foreword>
@@ -190,11 +190,11 @@ RSpec.describe IsoDoc::Iso do
         </preface>
       </iso-standard>
     INPUT
-    expect(xmlpp(output)).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    presxml = <<~OUTPUT
       <?xml version='1.0'?>
       <iso-standard type="presentation" xmlns="http://riboseinc.com/isoxml">
         <preface>
-          <foreword>
+          <foreword displayorder="1">
             <example id="samplecode">
               <name>EXAMPLE — Title</name>
               <p>Hello</p>
@@ -203,22 +203,8 @@ RSpec.describe IsoDoc::Iso do
         </preface>
       </iso-standard>
     OUTPUT
-  end
 
-  it "processes examples (HTML)" do
-    output = IsoDoc::Iso::HtmlConvert.new({}).convert("test", <<~"INPUT", true)
-      <iso-standard xmlns="http://riboseinc.com/isoxml">
-        <preface>
-          <foreword>
-            <example id="samplecode">
-              <name>EXAMPLE — Title</name>
-              <p>Hello</p>
-            </example>
-          </foreword>
-        </preface>
-      </iso-standard>
-    INPUT
-    expect(xmlpp(output)).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    html = <<~OUTPUT
       #{HTML_HDR}
             <br/>
             <div>
@@ -232,10 +218,49 @@ RSpec.describe IsoDoc::Iso do
         </body>
       </html>
     OUTPUT
+
+    word = <<~OUTPUT
+          <body lang="EN-US" link="blue" vlink="#954F72">
+        <div class="WordSection1">
+          <p>&#160;</p>
+        </div>
+        <p>
+          <br clear="all" class="section"/>
+        </p>
+        <div class="WordSection2">
+          <p>
+            <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
+          </p>
+          <div>
+            <h1 class="ForewordTitle">Foreword</h1>
+            <div id="samplecode" class="example">
+              <p><span class="example_label">EXAMPLE&#160;&#8212; Title</span><span style="mso-tab-count:1">&#160; </span>Hello</p>
+            </div>
+          </div>
+          <p>&#160;</p>
+        </div>
+        <p>
+          <br clear="all" class="section"/>
+        </p>
+        <div class="WordSection3">
+          <p class="zzSTDTitle1"/>
+        </div>
+        <br clear="all" style="page-break-before:left;mso-break-type:section-break"/>
+        <div class="colophon"/>
+      </body>
+    OUTPUT
+    expect(IsoDoc::Iso::PresentationXMLConvert.new({})
+      .convert("test", input, true)).to be_equivalent_to xmlpp(presxml)
+    expect(IsoDoc::Iso::HtmlConvert.new({})
+      .convert("test", presxml, true)).to be_equivalent_to xmlpp(html)
+    output = IsoDoc::Iso::WordConvert.new({}).convert("test", presxml, true)
+    expect(xmlpp(output
+      .sub(/^.*<body/m, "<body").sub(%r{</body>.*$}m, "</body>")))
+      .to be_equivalent_to xmlpp(word)
   end
 
-  it "processes sequences of examples (Presentation XML)" do
-    output = IsoDoc::Iso::PresentationXMLConvert.new({}).convert("test", <<~"INPUT", true)
+  it "processes sequences of examples" do
+    input = <<~INPUT
       <iso-standard xmlns="http://riboseinc.com/isoxml">
         <preface>
           <foreword>
@@ -250,11 +275,11 @@ RSpec.describe IsoDoc::Iso do
         </preface>
       </iso-standard>
     INPUT
-    expect(xmlpp(output)).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    presxml = <<~OUTPUT
       <?xml version='1.0'?>
       <iso-standard type="presentation" xmlns="http://riboseinc.com/isoxml">
         <preface>
-          <foreword>
+          <foreword displayorder="1">
             <example id="samplecode">
               <name>EXAMPLE 1</name>
               <quote>Hello</quote>
@@ -267,26 +292,7 @@ RSpec.describe IsoDoc::Iso do
         </preface>
       </iso-standard>
     OUTPUT
-  end
-
-  it "processes sequences of examples (HTML)" do
-    output = IsoDoc::Iso::HtmlConvert.new({}).convert("test", <<~"INPUT", true)
-      <iso-standard xmlns="http://riboseinc.com/isoxml">
-        <preface>
-          <foreword>
-            <example id="samplecode">
-              <name>EXAMPLE 1</name>
-              <quote>Hello</quote>
-            </example>
-            <example id="samplecode2">
-              <name>EXAMPLE 2 — Title</name>
-              <p>Hello</p>
-            </example>
-          </foreword>
-        </preface>
-      </iso-standard>
-    INPUT
-    expect(xmlpp(output)).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    html = <<~OUTPUT
       #{HTML_HDR}
             <br/>
             <div>
@@ -304,105 +310,47 @@ RSpec.describe IsoDoc::Iso do
         </body>
       </html>
     OUTPUT
-  end
-
-  it "processes examples (Word)" do
-    output = IsoDoc::Iso::WordConvert.new({}).convert("test", <<~"INPUT", true)
-      <iso-standard xmlns="http://riboseinc.com/isoxml">
-        <preface>
-          <foreword>
-            <example id="samplecode">
-              <name>EXAMPLE — Title</name>
-              <p>Hello</p>
-            </example>
-          </foreword>
-        </preface>
-      </iso-standard>
-    INPUT
-    expect(xmlpp(output.sub(/^.*<body/m, "<body").sub(%r{</body>.*$}m, "</body>")))
-      .to be_equivalent_to xmlpp(<<~"OUTPUT")
-        <body lang="EN-US" link="blue" vlink="#954F72">
-          <div class="WordSection1">
-            <p>&#160;</p>
-          </div>
+    word = <<~OUTPUT
+          <body lang="EN-US" link="blue" vlink="#954F72">
+        <div class="WordSection1">
+          <p>&#160;</p>
+        </div>
+        <p>
+          <br clear="all" class="section"/>
+        </p>
+        <div class="WordSection2">
           <p>
-            <br clear="all" class="section"/>
+            <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
           </p>
-          <div class="WordSection2">
-            <p>
-              <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
-            </p>
-            <div>
-              <h1 class="ForewordTitle">Foreword</h1>
-              <div id="samplecode" class="example">
-                <p><span class="example_label">EXAMPLE&#160;&#8212; Title</span><span style="mso-tab-count:1">&#160; </span>Hello</p>
-              </div>
+          <div>
+            <h1 class="ForewordTitle">Foreword</h1>
+            <div id="samplecode" class="example">
+              <p><span class="example_label">EXAMPLE  1</span><span style="mso-tab-count:1">&#160; </span></p>
+              <div class="Quote">Hello</div>
             </div>
-            <p>&#160;</p>
-          </div>
-          <p>
-            <br clear="all" class="section"/>
-          </p>
-          <div class="WordSection3">
-            <p class="zzSTDTitle1"/>
-          </div>
-          <br clear="all" style="page-break-before:left;mso-break-type:section-break"/>
-          <div class="colophon"/>
-        </body>
-      OUTPUT
-  end
-
-  it "processes sequences of examples (Word)" do
-    output = IsoDoc::Iso::WordConvert.new({}).convert("test", <<~"INPUT", true)
-      <iso-standard xmlns="http://riboseinc.com/isoxml">
-        <preface>
-          <foreword>
-            <example id="samplecode">
-              <name>EXAMPLE 1</name>
-              <quote>Hello</quote>
-            </example>
-            <example id="samplecode2">
-              <name>EXAMPLE 2 — Title</name>
-              <p>Hello</p>
-            </example>
-          </foreword>
-        </preface>
-      </iso-standard>
-    INPUT
-    expect(xmlpp(output.sub(/^.*<body/m, "<body").sub(%r{</body>.*$}m, "</body>")))
-      .to be_equivalent_to xmlpp(<<~"OUTPUT")
-        <body lang="EN-US" link="blue" vlink="#954F72">
-          <div class="WordSection1">
-            <p>&#160;</p>
-          </div>
-          <p>
-            <br clear="all" class="section"/>
-          </p>
-          <div class="WordSection2">
-            <p>
-              <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
-            </p>
-            <div>
-              <h1 class="ForewordTitle">Foreword</h1>
-              <div id="samplecode" class="example">
-                <p><span class="example_label">EXAMPLE  1</span><span style="mso-tab-count:1">&#160; </span></p>
-                <div class="Quote">Hello</div>
-              </div>
-              <div id="samplecode2" class="example">
-                <p><span class="example_label">EXAMPLE  2&#160;&#8212; Title</span><span style="mso-tab-count:1">&#160; </span>Hello</p>
-              </div>
+            <div id="samplecode2" class="example">
+              <p><span class="example_label">EXAMPLE  2&#160;&#8212; Title</span><span style="mso-tab-count:1">&#160; </span>Hello</p>
             </div>
-            <p>&#160;</p>
           </div>
-          <p>
-            <br clear="all" class="section"/>
-          </p>
-          <div class="WordSection3">
-            <p class="zzSTDTitle1"/>
-          </div>
-          <br clear="all" style="page-break-before:left;mso-break-type:section-break"/>
-          <div class="colophon"/>
-        </body>
-      OUTPUT
+          <p>&#160;</p>
+        </div>
+        <p>
+          <br clear="all" class="section"/>
+        </p>
+        <div class="WordSection3">
+          <p class="zzSTDTitle1"/>
+        </div>
+        <br clear="all" style="page-break-before:left;mso-break-type:section-break"/>
+        <div class="colophon"/>
+      </body>
+    OUTPUT
+    expect(IsoDoc::Iso::PresentationXMLConvert.new({})
+      .convert("test", input, true)).to be_equivalent_to xmlpp(presxml)
+    expect(IsoDoc::Iso::HtmlConvert.new({})
+      .convert("test", presxml, true)).to be_equivalent_to xmlpp(html)
+    output = IsoDoc::Iso::WordConvert.new({}).convert("test", presxml, true)
+    expect(xmlpp(output
+      .sub(/^.*<body/m, "<body").sub(%r{</body>.*$}m, "</body>")))
+      .to be_equivalent_to xmlpp(word)
   end
 end