metanorma-bsi 0.0.1 → 0.1.0

data/spec/isodoc/i18n_spec.rb

@@ -75,63 +75,62 @@ RSpec.describe IsoDoc do
        </clause>
        </bibliography>
        </iso-standard>
-        INPUT
+    INPUT
 
-        presxml = <<~OUTPUT
-        <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
+    presxml = <<~OUTPUT
+       <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
        <bibdata>
        <docnumber>1</docnumber>
        <language current="true">en</language>
        <ext>
-  <doctype language=''>international-standard</doctype>
-  <doctype language='en'>International Standard</doctype>
-<horizontal>true</horizontal>
-<function>emc</function>
-</ext>
+       <doctype language="">international-standard</doctype><doctype language="en">International Standard</doctype>
+       <horizontal>true</horizontal>
+       <function>emc</function>
+       </ext>
        </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"><title depth="1">0<tab/>Introduction</title><clause id="C" inline-header="false" 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>
         </clause>
         <p>This is patent boilerplate</p>
         </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"><title depth="1">3<tab/>Terms, definitions, symbols and abbreviated terms</title><terms id="I" 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>
           <term id="J"><name>3.1.1</name>
           <preferred>Term2</preferred>
         </term>
         </terms>
-        <definitions id="K" inline-header='true'><title>3.2</title>
+        <definitions id="K" inline-header="true"><title>3.2</title>
           <dl>
           <dt>Symbol</dt>
           <dd>Definition</dd>
           </dl>
         </definitions>
         </clause>
-        <definitions id="L"><title>4</title>
+        <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"><title depth="1">5<tab/>Clause 4</title><clause id="N" 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>
         </clause>
         <clause id="O" inline-header="false" obligation="normative">
           <title depth="2">5.2<tab/>Clause 4.2</title>
         </clause></clause>
-
-        </sections><annex id="P" inline-header="false" obligation="normative">
-          <title><strong>Annex A</strong><br/>(normative)<br/><br/><strong>Annex</strong></title>
+     
+        </sections><annex id="P" inline-header="false" obligation="normative" displayorder="8">
+          <title><strong>Annex A</strong><tab/>(normative)<br/><strong>Annex</strong></title>
           <clause id="Q" inline-header="false" obligation="normative">
           <title depth="2">A.1<tab/>Annex A.1</title>
           <clause id="Q1" inline-header="false" obligation="normative">
@@ -141,9 +140,9 @@ RSpec.describe IsoDoc do
         <appendix id="Q2" inline-header="false" obligation="normative">
           <title depth="2">Appendix 1<tab/>An Appendix</title>
         </appendix>
-        </annex><bibliography><references id="R" obligation="informative" normative="true">
+        </annex><bibliography><references id="R" obligation="informative" normative="true" displayorder="4">
           <title depth="1">2<tab/>Normative References</title>
-        </references><clause id="S" obligation="informative">
+        </references><clause id="S" obligation="informative" displayorder="9">
           <title depth="1">Bibliography</title>
           <references id="T" obligation="informative" normative="false">
           <title depth="2">Bibliography Subsection</title>
@@ -151,85 +150,77 @@ RSpec.describe IsoDoc do
         </clause>
         </bibliography>
         </iso-standard>
-        OUTPUT
-
-        html = <<~OUTPUT
-        #{HTML_HDR}
-             <div>
-               <h1 class="ForewordTitle">FOREWORD</h1>
-               <div class="boilerplate_legal"/>
-               <p id="A">This is a preamble</p>
-             </div>
-             <br/>
-             <div class="Section3" id="B">
-               <h1 class="IntroTitle">0&#8195;Introduction</h1>
-               <div id="C"><h2>0.1&#8195;Introduction Subsection</h2>
-
-        </div>
-               <p>This is patent boilerplate</p>
-             </div>
-             #{IEC_TITLE1}
-             <div id="D">
-               <h1>1&#8195;Scope</h1>
-               <p id="E">Text</p>
-             </div>
-             <div>
-               <h1>2&#8195;Normative References</h1>
-             </div>
-             <div id="H"><h1>3&#8195;Terms, definitions, symbols and abbreviated terms</h1>
-       <div id="I"><h2>3.1&#8195;Normal Terms</h2>
-
-          <p class="TermNum" id="J">3.1.1</p>
-          <p class="Terms" style="text-align:left;">Term2</p>
-
-        </div><div id="K"><span class='zzMoveToFollowing'>
-  <b>3.2&#8195;</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&#8195;Clause 4</h1>
-               <div id="N"><h2>5.1&#8195;Introduction</h2>
-
-        </div>
-               <div id="O"><h2>5.2&#8195;Clause 4.2</h2>
-
-        </div>
-             </div>
-             <br/>
-             <div id="P" class="Section3">
-               <h1 class="Annex"><b>Annex A</b><br/>(normative)<br/><br/><b>Annex</b></h1>
-               <div id="Q"><h2>A.1&#8195;Annex A.1</h2>
-
-          <div id="Q1"><h3>A.1.1&#8195;Annex A.1a</h3>
-
-          </div>
-        </div>
-               <div id="Q2"><h2>Appendix 1&#8195;An Appendix</h2>
+    OUTPUT
 
-        </div>
-             </div>
-             <br/>
-             <div>
-               <h1 class="Section3">Bibliography</h1>
-               <div>
-                 <h2 class="Section3">Bibliography Subsection</h2>
-               </div>
-             </div>
-           </div>
-         </body>
-       </html>
+    html = <<~OUTPUT
+              #{HTML_HDR}
+                   <div>
+                     <h1 class="ForewordTitle">Foreword</h1>
+                     <div class="boilerplate_legal"/>
+                     <p id="A">This is a preamble</p>
+                   </div>
+                   <br/>
+                   <div class="Section3" id="B">
+                     <h1 class="IntroTitle">0&#8195;Introduction</h1>
+                     <div id="C"><h2>0.1&#8195;Introduction Subsection</h2>
+              </div>
+                     <p>This is patent boilerplate</p>
+                   </div>
+                   #{IEC_TITLE1}
+                   <div id="D">
+                     <h1>1&#8195;Scope</h1>
+                     <p id="E">Text</p>
+                   </div>
+                   <div>
+                     <h1>2&#8195;Normative References</h1>
+                   </div>
+                   <div id="H"><h1>3&#8195;Terms, definitions, symbols and abbreviated terms</h1>
+             <div id="I"><h2>3.1&#8195;Normal Terms</h2>
+                <p class="TermNum" id="J">3.1.1</p>
+                <p class="Terms" style="text-align:left;">Term2</p>
+              </div><div id="K"><span class='zzMoveToFollowing'>
+        <b>3.2&#8195;</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&#8195;Clause 4</h1>
+                     <div id="N"><h2>5.1&#8195;Introduction</h2>
+              </div>
+                     <div id="O"><h2>5.2&#8195;Clause 4.2</h2>
+              </div>
+                   </div>
+                   <br/>
+                   <div id="P" class="Section3">
+                     <h1 class="Annex"><b>Annex A</b>&#8195;(normative)<br/><b>Annex</b></h1>
+                     <div id="Q"><h2>A.1&#8195;Annex A.1</h2>
+                <div id="Q1"><h3>A.1.1&#8195;Annex A.1a</h3>
+                </div>
+              </div>
+                     <div id="Q2"><h2>Appendix 1&#8195;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::BSI::PresentationXMLConvert.new({}).convert("test", input, true).sub(%r{<localized-strings>.*</localized-strings>}m, ""))).to be_equivalent_to xmlpp(presxml)
+    expect(xmlpp(IsoDoc::BSI::PresentationXMLConvert.new({}).convert("test", input, true).sub(%r{<localized-strings>.*</localized-strings>}m, ""))).to be_equivalent_to xmlpp(presxml)
     expect(xmlpp(IsoDoc::BSI::HtmlConvert.new({}).convert("test", presxml, true))).to be_equivalent_to xmlpp(html)
   end
 
@@ -301,142 +292,73 @@ RSpec.describe IsoDoc do
        </clause>
        </bibliography>
        </iso-standard>
-        INPUT
-        <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
-         <bibdata>
-           <language current="true">tlh</language>
-         </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'>
-               0
-               <tab/>
-               Introduction
-             </title>
-             <clause id='C' inline-header='false' obligation='informative'>
-               <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">
-             <title depth='1'>
-               1
-               <tab/>
-               Scope
-             </title>
-             <p id='E'>Text</p>
-           </clause>
-           <clause id='H' obligation='normative'>
-             <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>
-               <term id='J'>
-                 <name>3.1.1</name>
-                 <preferred>Term2</preferred>
-               </term>
-             </terms>
-             <definitions id='K' inline-header='true'>
-               <title>3.2</title>
-               <dl>
-                 <dt>Symbol</dt>
-                 <dd>Definition</dd>
-               </dl>
-             </definitions>
-           </clause>
-           <definitions id='L'>
-             <title>4</title>
-             <dl>
-               <dt>Symbol</dt>
-               <dd>Definition</dd>
-             </dl>
-           </definitions>
-           <clause id='M' inline-header='false' obligation='normative'>
-             <title depth='1'>
-               5
-               <tab/>
-               Clause 4
-             </title>
-             <clause id='N' inline-header='false' obligation='normative'>
-               <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>
-             </clause>
-           </clause>
-         </sections>
-         <annex id='P' inline-header='false' obligation='normative'>
-           <title>
-             <strong>Annex A</strong>
-             <br/>
-             (normative)
-             <br/>
-             <br/>
-             <strong>Annex</strong>
-           </title>
-           <clause id='Q' inline-header='false' obligation='normative'>
-             <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>
-             </clause>
-           </clause>
-           <appendix id='Q2' inline-header='false' obligation='normative'>
-             <title depth='2'>
-               Appendix 1
-               <tab/>
-               An Appendix
-             </title>
-           </appendix>
-         </annex>
-         <bibliography>
-           <references id='R' obligation='informative' normative='true'>
-             <title depth='1'>
-               2
-               <tab/>
-               Normative References
-             </title>
-           </references>
-           <clause id='S' obligation='informative'>
-             <title depth='1'>Bibliography</title>
-             <references id='T' obligation='informative' normative='false'>
-               <title depth='2'>Bibliography Subsection</title>
-             </references>
-           </clause>
-         </bibliography>
-       </iso-standard>
+    INPUT
+       <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
+       <bibdata>
+       <language current="true">tlh</language>
+       </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><clause id="C" inline-header="false" obligation="informative">
+          <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>
+          <p id="E">Text</p>
+        </clause>
+     
+        <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>
+          <term id="J"><name>3.1.1</name>
+          <preferred>Term2</preferred>
+        </term>
+        </terms>
+        <definitions id="K" inline-header="true"><title>3.2</title>
+          <dl>
+          <dt>Symbol</dt>
+          <dd>Definition</dd>
+          </dl>
+        </definitions>
+        </clause>
+        <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" 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>
+        </clause>
+        <clause id="O" inline-header="false" obligation="normative">
+          <title depth="2">5.2<tab/>Clause 4.2</title>
+        </clause></clause>
+     
+        </sections><annex id="P" inline-header="false" obligation="normative" displayorder="8">
+          <title><strong>Annex A</strong><tab/>(normative)<br/><strong>Annex</strong></title>
+          <clause id="Q" inline-header="false" obligation="normative">
+          <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>
+          </clause>
+        </clause>
+               <appendix id="Q2" inline-header="false" obligation="normative">
+          <title depth="2">Appendix 1<tab/>An Appendix</title>
+        </appendix>
+        </annex><bibliography><references id="R" obligation="informative" normative="true" displayorder="4">
+          <title depth="1">2<tab/>Normative References</title>
+        </references><clause id="S" obligation="informative" displayorder="9">
+          <title depth="1">Bibliography</title>
+          <references id="T" obligation="informative" normative="false">
+          <title depth="2">Bibliography Subsection</title>
+        </references>
+        </clause>
+        </bibliography>
+        </iso-standard>
     OUTPUT
   end
 end

data/spec/isodoc/inline_spec.rb

@@ -16,7 +16,7 @@ RSpec.describe IsoDoc do
     INPUT
     #{HTML_HDR}
                <div>
-                 <h1 class="ForewordTitle">FOREWORD</h1>
+                 <h1 class="ForewordTitle">Foreword</h1>
                  <div class="boilerplate_legal"/>
                  <p>
        <i>A</i> <b>B</b> <sup>C</sup> <sub>D</sub> <tt>E</tt>
@@ -47,7 +47,7 @@ RSpec.describe IsoDoc do
     INPUT
     #{HTML_HDR}
                <div>
-                 <h1 class="ForewordTitle">FOREWORD</h1>
+                 <h1 class="ForewordTitle">Foreword</h1>
                  <div class="boilerplate_legal"/>
                  <p>
        <a href="http://example.com">http://example.com</a>
@@ -76,7 +76,7 @@ RSpec.describe IsoDoc do
     INPUT
     #{HTML_HDR}
                <div>
-                 <h1 class="ForewordTitle">FOREWORD</h1>
+                 <h1 class="ForewordTitle">Foreword</h1>
                  <div class="boilerplate_legal"/>
                  <p>
        <para><b role="strong">&lt;barry fred="http://example.com"&gt;example&lt;/barry&gt;</b></para>
@@ -104,7 +104,7 @@ RSpec.describe IsoDoc do
     INPUT
     #{HTML_HDR.sub(/<html/, "<html xmlns:m='m'")}
                <div>
-                 <h1 class="ForewordTitle">FOREWORD</h1>
+                 <h1 class="ForewordTitle">Foreword</h1>
                  <div class="boilerplate_legal"/>
                  <p>
        <span class="stem">(#(A)#)</span>
@@ -135,7 +135,7 @@ RSpec.describe IsoDoc do
     INPUT
     #{HTML_HDR}
                <div>
-                 <h1 class="ForewordTitle">FOREWORD</h1>
+                 <h1 class="ForewordTitle">Foreword</h1>
                  <div class="boilerplate_legal"/>
                  <p>
        <span class="stem">(#(((A)#)))</span>
@@ -187,7 +187,7 @@ expect(xmlpp(IsoDoc::BSI::PresentationXMLConvert.new({}).convert("test", <<~"INP
 <?xml version='1.0'?>
        <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
          <preface>
-           <foreword>
+           <foreword displayorder="1">
              <p>
                <eref type='inline' bibitemid='IEV' citeas='IEV'>
                  <locality type='clause'>
@@ -261,7 +261,7 @@ expect(xmlpp(IsoDoc::BSI::PresentationXMLConvert.new({}).convert("test", <<~"INP
            </foreword>
          </preface>
          <bibliography>
-           <references id='_normative_references' obligation='informative' normative='true'>
+           <references id='_normative_references' obligation='informative' normative='true' displayorder="2">
            <title depth='1'>
   1
   <tab/>

data/spec/isodoc/iso_spec.rb

@@ -15,8 +15,8 @@ RSpec.describe IsoDoc::BSI do
     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: "Tahoma", sans-serif;]m)
-    expect(html).to match(%r[\.h2Annex[^{]+\{[^{]+font-family: "Tahoma", sans-serif;]m)
+    expect(html).to match(%r[blockquote[^{]+\{[^{]+font-family: "Gesta", "Tahoma", sans-serif;]m)
+    expect(html).to match(%r[\.h2Annex[^{]+\{[^{]+font-family: "Gesta", "Tahoma", sans-serif;]m)
   end
 
   it "processes isodoc as ISO: Chinese HTML output" do
@@ -66,7 +66,7 @@ RSpec.describe IsoDoc::BSI do
     INPUT
         #{HTML_HDR}
              <div>
-               <h1 class="ForewordTitle">FOREWORD</h1>
+               <h1 class="ForewordTitle">Foreword</h1>
                <div class="boilerplate_legal"/>
                <div id="samplecode" class="example">
                  <p><span class="example_label">EXAMPLE</span>&#8195;Hello</p>
@@ -97,7 +97,7 @@ RSpec.describe IsoDoc::BSI do
     INPUT
         #{HTML_HDR}
              <div>
-               <h1 class="ForewordTitle">FOREWORD</h1>
+               <h1 class="ForewordTitle">Foreword</h1>
                <div class="boilerplate_legal"/>
                <div id="samplecode" class="example">
                  <p><span class="example_label">EXAMPLE  1</span>&#8195;Hello</p>

data/spec/isodoc/metadata_spec.rb

@@ -258,5 +258,4 @@ INPUT
 :wg=>"GHI 3"}
 OUTPUT
   end
-
 end

data/spec/isodoc/ref_spec.rb

@@ -130,7 +130,7 @@ RSpec.describe IsoDoc::BSI do
             <bibdata>
             <language current="true">en</language>
             </bibdata>
-            <preface><foreword>
+            <preface><foreword displayorder='1'>
           <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">
           <eref bibitemid="ISO712">[110]</eref>
           <eref bibitemid="ISBN">[1]</eref>
@@ -142,7 +142,7 @@ RSpec.describe IsoDoc::BSI do
           <eref bibitemid="zip_ffs">[5]</eref>
           </p>
             </foreword></preface>
-            <bibliography><references id="_normative_references" obligation="informative" normative="true"><title depth="1">1<tab/>Normative References</title>
+            <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>
@@ -186,13 +186,13 @@ RSpec.describe IsoDoc::BSI do
         </bibitem>
         <bibitem id="ref1">
           <formattedref format="application/x-isodoc+xml"><smallcap>Standard No I.C.C 167</smallcap>. <em>Determination of the protein content in cereal and cereal products for food and animal feeding stuffs according to the Dumas combustion method</em> (see <link target="http://www.icc.or.at"/>)</formattedref>
-          <docidentifier type="ICC">167</docidentifier>
+          <docidentifier type="ICC">ICC 167</docidentifier>
         </bibitem>
         <note><name>NOTE</name><p>This is an annotation of ISO 20483:2013-2014</p></note>
             <bibitem id="zip_ffs"><formattedref format="application/x-isodoc+xml">Title 5</formattedref><docidentifier type="metanorma">[5]</docidentifier></bibitem>
 
 
-        </references><references id="_bibliography" obligation="informative" normative="false">
+        </references><references id="_bibliography" obligation="informative" normative="false" displayorder='3'>
           <title depth="1">Bibliography</title>
         <bibitem id="ISBN" type="ISBN">
           <title format="text/plain">Chemicals for analytical laboratory use</title>
@@ -234,12 +234,12 @@ RSpec.describe IsoDoc::BSI do
         </bibitem>
         <bibitem id="ref11">
           <title>Internet Calendaring and Scheduling Core Object Specification (iCalendar)</title>
-          <docidentifier type="IETF">RFC 10</docidentifier>
+          <docidentifier type="IETF">IETF RFC 10</docidentifier>
         </bibitem>
         <bibitem id="ref12">
           <formattedref format="application/x-isodoc+xml">CitationWorks. 2019. <em>How to cite a reference</em>.</formattedref>
           <docidentifier type="metanorma">[Citn]</docidentifier>
-          <docidentifier type="IETF">RFC 20</docidentifier>
+          <docidentifier type="IETF">IETF RFC 20</docidentifier>
         </bibitem>
 
 
@@ -251,7 +251,7 @@ RSpec.describe IsoDoc::BSI do
   html = <<~OUTPUT
     #{HTML_HDR}
       <div>
-        <h1 class='ForewordTitle'>FOREWORD</h1>
+        <h1 class='ForewordTitle'>Foreword</h1>
         <div class='boilerplate_legal'/>
         <p id='_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f'>
           <a href='#ISO712'>[110]</a>