metanorma-iso 1.8.1 → 1.8.6

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">
@@ -390,4 +390,284 @@ RSpec.describe IsoDoc do
       </iso-standard>
     OUTPUT
   end
+
+  it "processes concept markup" do
+    input = <<~INPUT
+          <iso-standard xmlns="http://riboseinc.com/isoxml">
+          <preface><foreword>
+          <p>
+          <ul>
+                    <li><concept><refterm>term</refterm>
+              <xref target='clause1'/>
+            </concept></li>
+            <li><concept><refterm>term</refterm>
+              <renderterm>term</renderterm>
+              <xref target='clause1'/>
+            </concept></li>
+          <li><concept><refterm>term</refterm>
+              <renderterm>w[o]rd</renderterm>
+              <xref target='clause1'>Clause #1</xref>
+            </concept></li>
+            <li><concept><refterm>term</refterm>
+              <renderterm>term</renderterm>
+              <eref bibitemid="ISO712" type="inline" citeas="ISO 712"/>
+            </concept></li>
+            <li><concept><refterm>term</refterm>
+              <renderterm>word</renderterm>
+              <eref bibitemid="ISO712" type="inline" citeas="ISO 712">The Aforementioned Citation</eref>
+            </concept></li>
+            <li><concept><refterm>term</refterm>
+              <renderterm>word</renderterm>
+              <eref bibitemid="ISO712" type="inline" citeas="ISO 712">
+                <locality type='clause'>
+                  <referenceFrom>3.1</referenceFrom>
+                </locality>
+                <locality type='figure'>
+                  <referenceFrom>a</referenceFrom>
+                </locality>
+              </eref>
+            </concept></li>
+            <li><concept><refterm>term</refterm>
+              <renderterm>word</renderterm>
+              <eref bibitemid="ISO712" type="inline" citeas="ISO 712">
+              <localityStack>
+                <locality type='clause'>
+                  <referenceFrom>3.1</referenceFrom>
+                </locality>
+              </localityStack>
+              <localityStack>
+                <locality type='figure'>
+                  <referenceFrom>b</referenceFrom>
+                </locality>
+              </localityStack>
+              </eref>
+            </concept></li>
+            <li><concept><refterm>term</refterm>
+              <renderterm>word</renderterm>
+              <eref bibitemid="ISO712" type="inline" citeas="ISO 712">
+              <localityStack>
+                <locality type='clause'>
+                  <referenceFrom>3.1</referenceFrom>
+                </locality>
+              </localityStack>
+              <localityStack>
+                <locality type='figure'>
+                  <referenceFrom>b</referenceFrom>
+                </locality>
+              </localityStack>
+              The Aforementioned Citation
+              </eref>
+            </concept></li>
+            <li><concept><refterm>term</refterm>
+              <renderterm>word</renderterm>
+              <termref base='IEV' target='135-13-13'/>
+            </concept></li>
+            <li><concept><refterm>term</refterm>
+              <renderterm>word</renderterm>
+              <termref base='IEV' target='135-13-13'>The IEV database</termref>
+            </concept></li>
+            </ul>
+          </p>
+          </foreword></preface>
+          <sections>
+          <clause id="clause1"><title>Clause 1</title></clause>
+          </sections>
+          <bibliography><references id="_normative_references" obligation="informative" normative="true"><title>Normative References</title>
+          <p>The following documents are referred to in the text in such a way that some or all of their content constitutes requirements of this document. For dated references, only the edition cited applies. For undated references, the latest edition of the referenced document (including any amendments) applies.</p>
+      <bibitem id="ISO712" type="standard">
+        <title format="text/plain">Cereals or cereal products</title>
+        <title type="main" format="text/plain">Cereals and cereal products</title>
+        <docidentifier type="ISO">ISO 712</docidentifier>
+        <contributor>
+          <role type="publisher"/>
+          <organization>
+            <name>International Organization for Standardization</name>
+          </organization>
+        </contributor>
+      </bibitem>
+      </references></bibliography>
+          </iso-standard>
+    INPUT
+    presxml = <<~OUTPUT
+      <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
+              <preface><foreword displayorder="1">
+              <p>
+              <ul>
+                        <li>
+                  (<xref target="clause1">Clause 2</xref>)
+                </li>
+                <li>
+                  <em>term</em>
+                  (<xref target="clause1">Clause 2</xref>)
+                </li>
+              <li>
+                  <em>w[o]rd</em>
+                  (<xref target="clause1">Clause #1</xref>)
+                </li>
+                <li>
+                  <em>term</em>
+                  (<eref bibitemid="ISO712" type="inline" citeas="ISO 712">ISO 712</eref>)
+                </li>
+                <li>
+                  <em>word</em>
+                  (<eref bibitemid="ISO712" type="inline" citeas="ISO 712">The Aforementioned Citation</eref>)
+                </li>
+                <li>
+                  <em>word</em>
+                  (<eref bibitemid="ISO712" type="inline" citeas="ISO 712"><locality type="clause">
+                      <referenceFrom>3.1</referenceFrom>
+                    </locality><locality type="figure">
+                      <referenceFrom>a</referenceFrom>
+                    </locality>ISO 712, 3.1, Figure a</eref>)
+                </li>
+                <li>
+                  <em>word</em>
+                  (<eref bibitemid="ISO712" type="inline" citeas="ISO 712"><localityStack>
+                    <locality type="clause">
+                      <referenceFrom>3.1</referenceFrom>
+                    </locality>
+                  </localityStack><localityStack>
+                    <locality type="figure">
+                      <referenceFrom>b</referenceFrom>
+                    </locality>
+                  </localityStack>ISO 712, 3.1; Figure b</eref>)
+                </li>
+                <li>
+                  <em>word</em>
+                  (<eref bibitemid="ISO712" type="inline" citeas="ISO 712">
+                  <localityStack>
+                    <locality type="clause">
+                      <referenceFrom>3.1</referenceFrom>
+                    </locality>
+                  </localityStack>
+                  <localityStack>
+                    <locality type="figure">
+                      <referenceFrom>b</referenceFrom>
+                    </locality>
+                  </localityStack>
+                  The Aforementioned Citation
+                  </eref>)
+                </li>
+                <li>
+                  <em>word</em>
+                  [term defined in <termref base="IEV" target="135-13-13"/>]
+                </li>
+                <li>
+                  <em>word</em>
+                  [term defined in <termref base="IEV" target="135-13-13">The IEV database</termref>]
+                </li>
+                </ul>
+              </p>
+              </foreword></preface>
+              <sections>
+              <clause id="clause1" displayorder="3"><title depth="1">2<tab/>Clause 1</title></clause>
+              </sections>
+              <bibliography><references id="_normative_references" obligation="informative" normative="true" displayorder="2"><title depth="1">1<tab/>Normative References</title>
+              <p>The following documents are referred to in the text in such a way that some or all of their content constitutes requirements of this document. For dated references, only the edition cited applies. For undated references, the latest edition of the referenced document (including any amendments) applies.</p>
+          <bibitem id="ISO712" type="standard">
+            <title format="text/plain">Cereals or cereal products</title>
+            <title type="main" format="text/plain">Cereals and cereal products</title>
+            <docidentifier type="ISO">ISO 712</docidentifier>
+            <contributor>
+              <role type="publisher"/>
+              <organization>
+                <name>International Organization for Standardization</name>
+              </organization>
+            </contributor>
+          </bibitem>
+          </references></bibliography>
+              </iso-standard>
+    OUTPUT
+    output = <<~OUTPUT
+      #{HTML_HDR}
+      <br/>
+             <div>
+               <h1 class='ForewordTitle'>Foreword</h1>
+               <p>
+                 <ul>
+                   <li>
+                      (
+                     <a href='#clause1'>Clause 2</a>
+                     )
+                   </li>
+                   <li>
+                     <i>term</i>
+                      (
+                     <a href='#clause1'>Clause 2</a>
+                     )
+                   </li>
+                   <li>
+                     <i>w[o]rd</i>
+                      (
+                     <a href='#clause1'>Clause #1</a>
+                     )
+                   </li>
+                   <li>
+                     <i>term</i>
+                      (
+                     <a href='#ISO712'>ISO 712</a>
+                     )
+                   </li>
+                   <li>
+                     <i>word</i>
+                      (
+                     <a href='#ISO712'>The Aforementioned Citation</a>
+                     )
+                   </li>
+                   <li>
+                     <i>word</i>
+                      (
+                     <a href='#ISO712'>ISO 712, 3.1, Figure a</a>
+                     )
+                   </li>
+                   <li>
+                     <i>word</i>
+                      (
+                     <a href='#ISO712'>ISO 712, 3.1; Figure b</a>
+                     )
+                   </li>
+                   <li>
+                     <i>word</i>
+                      (
+                     <a href='#ISO712'> The Aforementioned Citation </a>
+                     )
+                   </li>
+                   <li>
+                     <i>word</i>
+                      [term defined in Termbase IEV, term ID 135-13-13]
+                   </li>
+                   <li>
+                     <i>word</i>
+                      [term defined in Termbase IEV, term ID 135-13-13]
+                   </li>
+                 </ul>
+               </p>
+             </div>
+             <p class='zzSTDTitle1'/>
+             <div>
+               <h1>1&#160; Normative References</h1>
+               <p>
+                 The following documents are referred to in the text in such a way that
+                 some or all of their content constitutes requirements of this
+                 document. For dated references, only the edition cited applies. For
+                 undated references, the latest edition of the referenced document
+                 (including any amendments) applies.
+               </p>
+               <p id='ISO712' class='NormRef'>
+                 ISO 712,
+                 <i>Cereals and cereal products</i>
+               </p>
+             </div>
+             <div id='clause1'>
+               <h1>2&#160; Clause 1</h1>
+             </div>
+           </div>
+         </body>
+       </html>
+    OUTPUT
+    expect(xmlpp(IsoDoc::Iso::PresentationXMLConvert.new({})
+      .convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
+    expect(xmlpp(IsoDoc::Iso::HtmlConvert.new({})
+      .convert("test", presxml, true))).to be_equivalent_to xmlpp(output)
+  end
 end

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