isodoc 0.8.4 → 0.8.5

data/lib/isodoc/pdf_convert.rb

@@ -1,6 +1,7 @@
 require_relative "html_function/comments.rb"
 require_relative "html_function/footnotes.rb"
 require_relative "html_function/html.rb"
+require "metanorma"
 
 module IsoDoc
   class PdfConvert < ::IsoDoc::Convert
@@ -12,7 +13,7 @@ module IsoDoc
     def initialize(options)
       super
       @tmpimagedir = "_pdfimages"
-            @maxwidth = 500
+      @maxwidth = 500
       @maxheight = 800
     end
 
@@ -24,7 +25,7 @@ module IsoDoc
       return result if debug
       postprocess(result, filename, dir)
       system "rm -fr #{dir}"
-      Metanorma::Output::Pdf.new.convert(filename + ".html", filename)
+      ::Metanorma::Output::Pdf.new.convert(filename + ".html", outname_html + ".pdf")
       system "rm -r #{filename + '.html'} #{@tmpimagedir}"
     end
   end

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "0.8.4".freeze
+  VERSION = "0.8.5".freeze
 end

data/lib/isodoc/word_function/postprocess.rb

@@ -68,7 +68,7 @@ module IsoDoc::WordFunction
       meta = @meta.get
       meta[:filename] = filename
       params = meta.map { |k, v| [k.to_s, v] }.to_h
-      File.open("header.html", "w") do |f|
+      File.open("header.html", "w:UTF-8") do |f|
         f.write(template.render(params))
       end
       @files_to_delete << "header.html"

data/spec/isodoc/blocks_spec.rb

@@ -611,7 +611,7 @@ World</p>
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <quote id="_044bd364-c832-4b78-8fea-92242402a1d1">
-  <source type="inline" bibitemid="ISO7301" citeas="ISO 7301: 2011"><locality type="clause"><referenceFrom>1</referenceFrom></locality></source>
+  <source type="inline" bibitemid="ISO7301" citeas="ISO 7301:2011"><locality type="clause"><referenceFrom>1</referenceFrom></locality></source>
   <author>ISO</author>
   <p id="_d4fd0a61-f300-4285-abe6-602707590e53">This International Standard gives the minimum specifications for rice (<em>Oryza sativa</em> L.) which is subject to international trade. It is applicable to the following types: husked rice and milled rice, parboiled or not, intended for direct human consumption. It is neither applicable to other products derived from rice, nor to waxy rice (glutinous rice).</p>
 </quote>
@@ -627,7 +627,7 @@ World</p>
 
 
          <p id="_d4fd0a61-f300-4285-abe6-602707590e53">This International Standard gives the minimum specifications for rice (<i>Oryza sativa</i> L.) which is subject to international trade. It is applicable to the following types: husked rice and milled rice, parboiled or not, intended for direct human consumption. It is neither applicable to other products derived from rice, nor to waxy rice (glutinous rice).</p>
-       <p class="QuoteAttribution">&#8212; ISO, <a href="#ISO7301">ISO 7301: 2011, Clause 1</a></p></div>
+       <p class="QuoteAttribution">&#8212; ISO, <a href="#ISO7301">ISO 7301:2011, Clause 1</a></p></div>
                </div>
                <p class="zzSTDTitle1"/>
              </div>

data/spec/isodoc/i18n_spec.rb

@@ -15,9 +15,6 @@ RSpec.describe IsoDoc do
         <introduction id="B" obligation="informative"><title>Introduction</title><clause id="C" inline-header="false" obligation="informative">
          <title>Introduction Subsection</title>
        </clause>
-       <patent-notice>
-       <p>This is patent boilerplate</p>
-       </patent-notice>
        </introduction></preface><sections>
        <clause id="D" obligation="normative">
          <title>Scope</title>
@@ -58,9 +55,6 @@ RSpec.describe IsoDoc do
          <title>Annex A.1a</title>
          </clause>
        </clause>
-       <appendix id="Q2" inline-header="false" obligation="normative">
-         <title>An Appendix</title>
-       </appendix>
        </annex><bibliography><references id="R" obligation="informative">
          <title>Normative References</title>
        </references><clause id="S" obligation="informative">
@@ -80,11 +74,10 @@ RSpec.describe IsoDoc do
                </div>
                <br/>
                <div class="Section3" id="B">
-                 <h1 class="IntroTitle">0.&#160; Introduction</h1>
+                 <h1 class="IntroTitle">Introduction</h1>
                  <div id="C">
-          <h2>0.1. Introduction Subsection</h2>
+          <h2>Introduction Subsection</h2>
         </div>
-                 <p>This is patent boilerplate</p>
                </div>
                <p class="zzSTDTitle1"/>
                <div id="D">
@@ -141,9 +134,6 @@ RSpec.describe IsoDoc do
           <h3>A.1.1. Annex A.1a</h3>
           </div>
         </div>
-                 <div id="Q2">
-                <h2>Appendix 1. An Appendix</h2>
-                </div>
                </div>
                <br/>
                <div>
@@ -172,9 +162,6 @@ RSpec.describe IsoDoc do
         <introduction id="B" obligation="informative"><title>Introduction</title><clause id="C" inline-header="false" obligation="informative">
          <title>Introduction Subsection</title>
        </clause>
-       <patent-notice>
-       <p>This is patent boilerplate</p>
-       </patent-notice>
        </introduction></preface><sections>
        <clause id="D" obligation="normative">
          <title>Scope</title>
@@ -215,9 +202,6 @@ RSpec.describe IsoDoc do
          <title>Annex A.1a</title>
          </clause>
        </clause>
-              <appendix id="Q2" inline-header="false" obligation="normative">
-         <title>An Appendix</title>
-       </appendix>
        </annex><bibliography><references id="R" obligation="informative">
          <title>Normative References</title>
        </references><clause id="S" obligation="informative">
@@ -237,11 +221,10 @@ RSpec.describe IsoDoc do
                </div>
                <br/>
                <div class="Section3" id="B">
-                 <h1 class="IntroTitle">0.&#160; Introduction</h1>
+                 <h1 class="IntroTitle">Introduction</h1>
                  <div id="C">
-          <h2>0.1. Introduction Subsection</h2>
+          <h2>Introduction Subsection</h2>
         </div>
-                 <p>This is patent boilerplate</p>
                </div>
                <p class="zzSTDTitle1"/>
                <div id="D">
@@ -298,9 +281,6 @@ RSpec.describe IsoDoc do
           <h3>A.1.1. Annex A.1a</h3>
           </div>
         </div>
-                         <div id="Q2">
-                <h2>Appendix 1. An Appendix</h2>
-                </div>
                </div>
                <br/>
                <div>
@@ -329,9 +309,6 @@ RSpec.describe IsoDoc do
         <introduction id="B" obligation="informative"><title>Introduction</title><clause id="C" inline-header="false" obligation="informative">
          <title>Introduction Subsection</title>
        </clause>
-       <patent-notice>
-       <p>This is patent boilerplate</p>
-       </patent-notice>
        </introduction></preface><sections>
        <clause id="D" obligation="normative">
          <title>Scope</title>
@@ -372,9 +349,6 @@ RSpec.describe IsoDoc do
          <title>Annex A.1a</title>
          </clause>
        </clause>
-              <appendix id="Q2" inline-header="false" obligation="normative">
-         <title>An Appendix</title>
-       </appendix>
        </annex><bibliography><references id="R" obligation="informative">
          <title>Normative References</title>
        </references><clause id="S" obligation="informative">
@@ -394,11 +368,10 @@ RSpec.describe IsoDoc do
                </div>
                <br/>
                <div class="Section3" id="B">
-                 <h1 class="IntroTitle">0.&#160; Introduction</h1>
+                 <h1 class="IntroTitle">Introduction</h1>
                  <div id="C">
-          <h2>0.1. Introduction Subsection</h2>
+          <h2>Introduction Subsection</h2>
         </div>
-                 <p>This is patent boilerplate</p>
                </div>
                <p class="zzSTDTitle1"/>
                <div id="D">
@@ -454,9 +427,6 @@ RSpec.describe IsoDoc do
           <h3>A.1.1. Annex A.1a</h3>
           </div>
         </div>
-               <div id="Q2">
-                <h2>Appendice 1. An Appendix</h2>
-                </div>
                </div>
                <br/>
                <div>
@@ -486,9 +456,6 @@ RSpec.describe IsoDoc do
         <introduction id="B" obligation="informative"><title>Introduction</title><clause id="C" inline-header="false" obligation="informative">
          <title>Introduction Subsection</title>
        </clause>
-       <patent-notice>
-       <p>This is patent boilerplate</p>
-       </patent-notice>
        </introduction></preface><sections>
        <clause id="D" obligation="normative">
          <title>Scope</title>
@@ -529,9 +496,6 @@ RSpec.describe IsoDoc do
          <title>Annex A.1a</title>
          </clause>
        </clause>
-              <appendix id="Q2" inline-header="false" obligation="normative">
-         <title>An Appendix</title>
-       </appendix>
        </annex><bibliography><references id="R" obligation="informative">
          <title>Normative References</title>
          <bibitem id="ISO712" type="standard">
@@ -561,11 +525,10 @@ RSpec.describe IsoDoc do
                </div>
                <br/>
                <div class="Section3" id="B">
-                 <h1 class="IntroTitle">0.&#160; &#24341;&#35328;</h1>
+                 <h1 class="IntroTitle">&#24341;&#35328;</h1>
                  <div id="C">
-                <h2>0.1. Introduction Subsection</h2>
+                <h2>Introduction Subsection</h2>
               </div>
-                 <p>This is patent boilerplate</p>
                </div>
                <p class="zzSTDTitle1"/>
                <div id="D">
@@ -622,9 +585,6 @@ RSpec.describe IsoDoc do
                 <h3>A.1.1. Annex A.1a</h3>
                 </div>
                 </div>
-                <div id="Q2">
-                <h2>&#38468;&#24405;1. An Appendix</h2>
-              </div>
                </div>
                <br/>
                <div>

data/spec/isodoc/inline_spec.rb

@@ -38,6 +38,8 @@ RSpec.describe IsoDoc do
     <p>
     <link target="http://example.com"/>
     <link target="http://example.com">example</link>
+    <link target="mailto:fred@example.com"/>
+    <link target="mailto:fred@example.com">mailto:fred@example.com</link>
     </p>
     </foreword></preface>
     <sections>
@@ -50,6 +52,8 @@ RSpec.describe IsoDoc do
                  <p>
        <a href="http://example.com">http://example.com</a>
        <a href="http://example.com">example</a>
+       <a href="mailto:fred@example.com">fred@example.com</a>
+       <a href="mailto:fred@example.com">mailto:fred@example.com</a>
        </p>
                </div>
                <p class="zzSTDTitle1"/>

data/spec/isodoc/metadata_spec.rb

@@ -10,16 +10,8 @@ RSpec.describe IsoDoc do
   expect(Hash[c.info(Nokogiri::XML(<<~"INPUT"), nil).sort]).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <bibdata type="international-standard">
-  <title>
-    <title-intro language="en" format="text/plain">Cereals and pulses</title-intro>
-    <title-main language="en" format="text/plain">Specifications and test methods</title-main>
-    <title-part language="en" format="text/plain">Rice</title-part>
-  </title>
-  <title>
-    <title-intro language="fr" format="text/plain">Céréales et légumineuses</title-intro>
-    <title-main language="fr" format="text/plain">Spécification et méthodes d'essai</title-main>
-    <title-part language="fr" format="text/plain">Riz</title-part>
-  </title>
+  <title>The Incredible Mr Ripley</title>
+  <title language="en">Cereals and pulses</title>
   <docidentifier>
     <project-number part="1">17301</project-number>
     <tc-document-number>17301</tc-document-number>
@@ -43,11 +35,7 @@ RSpec.describe IsoDoc do
   </contributor>
   <language>en</language>
   <script>Latn</script>
-  <status>
-    <stage>30</stage>
-    <substage>92</substage>
-    <iteration>3</iteration>
-  </status>
+  <status>Committee Draft</status>
   <copyright>
     <from>2016</from>
     <owner>
@@ -69,7 +57,7 @@ RSpec.describe IsoDoc do
 </version>
 </iso-standard>
 INPUT
-       {:accesseddate=>"2012", :activateddate=>"2013", :agency=>"ISO", :confirmeddate=>"XXX", :createddate=>"2010&ndash;2011", :docnumber=>"PreCD3 17301-1", :docsubtitle=>"C&#xe9;r&#xe9;ales et l&#xe9;gumineuses&nbsp;&mdash; Sp&#xe9;cification et m&#xe9;thodes d&#x27;essai&nbsp;&mdash; Partie&nbsp;1: Riz", :docsubtitleintro=>"C&#xe9;r&#xe9;ales et l&#xe9;gumineuses", :docsubtitlemain=>"Sp&#xe9;cification et m&#xe9;thodes d&#x27;essai", :docsubtitlepart=>"Partie&nbsp;1: Riz", :doctitle=>"Cereals and pulses&nbsp;&mdash; Specifications and test methods&nbsp;&mdash; Part&nbsp;1: Rice", :doctitleintro=>"Cereals and pulses", :doctitlemain=>"Specifications and test methods", :doctitlepart=>"Part&nbsp;1: Rice", :doctype=>"International Standard", :docyear=>"2016", :draft=>"0.4", :draftinfo=>" (draft 0.4, 2016-05-01)", :editorialgroup=>["TC 34", "SC 4", "WG 3"], :ics=>"XXX", :implementeddate=>"XXX", :issueddate=>"XXX", :obsoleteddate=>"2014", :obsoletes=>nil, :obsoletes_part=>nil, :publisheddate=>"2011", :revdate=>"2016-05-01", :sc=>"SC 4", :secretariat=>"GB", :stage=>"30", :stage_int=>30, :stageabbr=>"PreCD3", :tc=>"TC 34", :updateddate=>"XXX", :wg=>"WG 3"}
+{:accesseddate=>"2012", :activateddate=>"2013", :agency=>"ISO", :confirmeddate=>"XXX", :createddate=>"2010&ndash;2011", :docnumber=>"17301-1 Committee draft", :doctitle=>"Cereals and pulses", :doctype=>"International Standard", :docyear=>"2016", :draft=>"0.4", :draftinfo=>" (draft 0.4, 2016-05-01)", :editorialgroup=>["TC 34", "SC 4", "WG 3"], :ics=>"XXX", :implementeddate=>"XXX", :issueddate=>"XXX", :obsoleteddate=>"2014", :obsoletes=>nil, :obsoletes_part=>nil, :publisheddate=>"2011", :revdate=>"2016-05-01", :sc=>"SC 4", :secretariat=>"GB", :status=>"Committee draft", :tc=>"TC 34", :updateddate=>"XXX", :wg=>"WG 3"}
 OUTPUT
   end
 
@@ -81,16 +69,8 @@ OUTPUT
   expect(Hash[c.info(Nokogiri::XML(<<~"INPUT"), nil).sort]).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <bibdata type="international-standard">
-  <title>
-    <title-intro language="en" format="text/plain">Cereals and pulses</title-intro>
-    <title-main language="en" format="text/plain">Specifications and test methods</title-main>
-    <title-part language="en" format="text/plain">Rice</title-part>
-  </title>
-  <title>
-    <title-intro language="fr" format="text/plain">Céréales et légumineuses</title-intro>
-    <title-main language="fr" format="text/plain">Spécification et méthodes d'essai</title-main>
-    <title-part language="fr" format="text/plain">Riz</title-part>
-  </title>
+  <title language="fr" format="text/plain">Céréales et légumineuses</ti>
+  <title language="en" format="text/plain">Cereals and pulses</title>
   <docidentifier>
     <project-number part="1" subpart="3">17301</project-number>
     <tc-document-number>17301</tc-document-number>
@@ -115,10 +95,7 @@ OUTPUT
   </contributor>
   <language>en</language>
   <script>Latn</script>
-  <status>
-    <stage>30</stage>
-    <substage>92</substage>
-  </status>
+  <status>Published</status>
   <copyright>
     <from>2016</from>
     <owner>
@@ -145,7 +122,7 @@ OUTPUT
 </version>
 </iso-standard>
 INPUT
-{:accesseddate=>"XXX", :agency=>"ISO/IEC", :confirmeddate=>"XXX", :createddate=>"XXX", :docnumber=>"CD 17301-1-3", :docsubtitle=>"C&#xe9;r&#xe9;ales et l&#xe9;gumineuses&nbsp;&mdash; Sp&#xe9;cification et m&#xe9;thodes d&#x27;essai&nbsp;&mdash; Partie&nbsp;1&ndash;3: Riz", :docsubtitleintro=>"C&#xe9;r&#xe9;ales et l&#xe9;gumineuses", :docsubtitlemain=>"Sp&#xe9;cification et m&#xe9;thodes d&#x27;essai", :docsubtitlepart=>"Partie&nbsp;1&ndash;3: Riz", :doctitle=>"Cereals and pulses&nbsp;&mdash; Specifications and test methods&nbsp;&mdash; Part&nbsp;1&ndash;3: Rice", :doctitleintro=>"Cereals and pulses", :doctitlemain=>"Specifications and test methods", :doctitlepart=>"Part&nbsp;1&ndash;3: Rice", :doctype=>"International Standard", :docyear=>"2016", :draft=>"12", :draftinfo=>" (draft 12, 2016-05-01)", :editorialgroup=>["ABC 34", "DEF 4", "GHI 3"], :ics=>"1.2.3, 1.2.3", :implementeddate=>"XXX", :issueddate=>"XXX", :obsoleteddate=>"XXX", :obsoletes=>"IEC 8121", :obsoletes_part=>"3.1", :publisheddate=>"XXX", :revdate=>"2016-05-01", :sc=>"DEF 4", :secretariat=>"XXXX", :stage=>"30", :stage_int=>30, :stageabbr=>"CD", :tc=>"ABC 34", :updateddate=>"XXX", :wg=>"GHI 3"}
+{:accesseddate=>"XXX", :agency=>"ISO/IEC", :confirmeddate=>"XXX", :createddate=>"XXX", :docnumber=>"17301-1-3", :doctitle=>"Cereals and pulses", :doctype=>"International Standard", :docyear=>"2016", :draft=>"12", :draftinfo=>" (draft 12, 2016-05-01)", :editorialgroup=>["ABC 34", "DEF 4", "GHI 3"], :ics=>"1.2.3, 1.2.3", :implementeddate=>"XXX", :issueddate=>"XXX", :obsoleteddate=>"XXX", :obsoletes=>"IEC 8121", :obsoletes_part=>"3.1", :publisheddate=>"XXX", :revdate=>"2016-05-01", :sc=>"DEF 4", :secretariat=>"XXXX", :status=>"Published", :tc=>"ABC 34", :updateddate=>"XXX", :wg=>"GHI 3"}
 OUTPUT
   end
 

data/spec/isodoc/postproc_spec.rb

@@ -69,6 +69,20 @@ RSpec.describe IsoDoc do
     expect(html).to match(%r{libs/jquery})
   end
 
+    it "generates Headless HTML output docs with null configuration from file" do
+    system "rm -f spec/assets/iso.html"
+    IsoDoc::HeadlessHtmlConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css"}).convert("spec/assets/iso.xml", nil, false)
+    expect(File.exist?("spec/assets/iso.headless.html")).to be true
+    html = File.read("spec/assets/iso.headless.html")
+    expect(html).not_to match(/another empty stylesheet/)
+    expect(html).not_to match(%r{https://use.fontawesome.com})
+    expect(html).not_to match(%r{libs/jquery})
+    expect(html).not_to match(%r{<html})
+    expect(html).not_to match(%r{<head})
+    expect(html).not_to match(%r{<body})
+    expect(html).to match(%r{<div})
+  end
+
   it "generates Word output docs with null configuration from file" do
     system "rm -f spec/assets/iso.doc"
     IsoDoc::WordConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css"}).convert("spec/assets/iso.xml", nil, false)
@@ -77,6 +91,13 @@ RSpec.describe IsoDoc do
     expect(word).to match(/one empty stylesheet/)
   end
 
+  it "generates PDF output docs with null configuration from file" do
+    system "rm -f spec/assets/iso.pdf"
+    #require "byebug"; byebug
+    IsoDoc::PdfConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css"}).convert("spec/assets/iso.xml", nil, false)
+    expect(File.exist?("spec/assets/iso.pdf")).to be true
+  end
+
   it "generates HTML output docs with complete configuration" do
     system "rm -f test.doc"
     system "rm -f test.html"
@@ -171,9 +192,6 @@ RSpec.describe IsoDoc do
          <clause id="Q" inline-header="false" obligation="normative">
          <title>Annex A.1</title>
          </clause>
-                <appendix id="Q2" inline-header="false" obligation="normative">
-         <title>An Appendix</title>
-       </appendix>
     </annex>
     </iso-standard>
     INPUT
@@ -188,9 +206,6 @@ RSpec.describe IsoDoc do
                  <div><a name="Q" id="Q"></a>
             <p class="h2Annex">A.1. Annex A.1</p>
        </div>
-              <div><a name="Q2" id="Q2"></a>
-                <p class="h2Annex">Appendix 1. An Appendix</p>
-                </div>
                </div>
              </div>
     OUTPUT
@@ -207,7 +222,7 @@ RSpec.describe IsoDoc do
 <term id="paddy1"><preferred>paddy</preferred>
 <definition><p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p></definition>
 <termsource status="modified">
-  <origin bibitemid="ISO7301" type="inline" citeas="ISO 7301: 2011"><locality type="clause"><referenceFrom>3.1</referenceFrom></locality></origin>
+  <origin bibitemid="ISO7301" type="inline" citeas="ISO 7301:2011"><locality type="clause"><referenceFrom>3.1</referenceFrom></locality></origin>
     <modification>
     <p id="_e73a417d-ad39-417d-a4c8-20e4e2529489">The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here</p>
   </modification>
@@ -236,7 +251,7 @@ RSpec.describe IsoDoc do
        </p> </li> </ul>
        <p class="TermNum"><a name="paddy1" id="paddy1"></a>1.1</p><p class="Terms" style="text-align:left;">paddy</p>
        <p class="MsoNormal"><a name="_eb29b35e-123e-4d1c-b50b-2714d41e747f" id="_eb29b35e-123e-4d1c-b50b-2714d41e747f"></a>rice retaining its husk after threshing</p>
-       <p class="MsoNormal">[SOURCE: <a href="#ISO7301">ISO 7301: 2011, 3.1</a>, modified &mdash; The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here]</p></div>
+       <p class="MsoNormal">[SOURCE: <a href="#ISO7301">ISO 7301:2011, 3.1</a>, modified &mdash; The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here]</p></div>
              </div>
     OUTPUT
   end
@@ -424,9 +439,8 @@ CkZJTEVOQU1FOiB0ZXN0Cgo=
              <div>
                <h1 class="ForewordTitle">Foreword</h1>
                <div id="_" class="figure">
-
-<img src="_images/_.png" height="673" width="800" />
-<img src="_images/_.png" height="1200" width="80" />
+               <img src="_images/_.png" height="776" width="922" />
+<img src="_images/_.png" height="800" width="53" />
 <img src="_images/_.png" height="83" width="99" />
        <p class="FigureTitle" align="center">Figure 1&#xA0;&#x2014; Split-it-right sample divider</p></div>
              </div>
@@ -460,7 +474,7 @@ CkZJTEVOQU1FOiB0ZXN0Cgo=
 </termexample>
 
 <termsource status="modified">
-  <origin bibitemid="ISO7301" type="inline" citeas="ISO 7301: 2011"><locality type="clause"><referenceFrom>3.1</referenceFrom></locality></origin>
+  <origin bibitemid="ISO7301" type="inline" citeas="ISO 7301:2011"><locality type="clause"><referenceFrom>3.1</referenceFrom></locality></origin>
     <modification>
     <p id="_e73a417d-ad39-417d-a4c8-20e4e2529489">The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here</p>
   </modification>
@@ -483,7 +497,7 @@ CkZJTEVOQU1FOiB0ZXN0Cgo=
   <p id="_19830f33-e46c-42cc-94ca-a5ef101132d5">The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p>
 </termnote>
 <termsource status="identical">
-  <origin bibitemid="ISO7301" type="inline" citeas="ISO 7301: 2011"><locality type="clause"><referenceFrom>3.1</referenceFrom></locality></origin>
+  <origin bibitemid="ISO7301" type="inline" citeas="ISO 7301:2011"><locality type="clause"><referenceFrom>3.1</referenceFrom></locality></origin>
 </termsource></term>
 </terms>
 </sections>

data/spec/isodoc/section_spec.rb

@@ -12,9 +12,6 @@ RSpec.describe IsoDoc do
         <introduction id="B" obligation="informative"><title>Introduction</title><clause id="C" inline-header="false" obligation="informative">
          <title>Introduction Subsection</title>
        </clause>
-       <patent-notice>
-       <p>This is patent boilerplate</p>
-       </patent-notice>
        </introduction></preface><sections>
        <clause id="D" obligation="normative">
          <title>Scope</title>
@@ -55,9 +52,6 @@ RSpec.describe IsoDoc do
          <title>Annex A.1a</title>
          </clause>
        </clause>
-              <appendix id="Q2" inline-header="false" obligation="normative">
-         <title>An Appendix</title>
-       </appendix>
        </annex><bibliography><references id="R" obligation="informative">
          <title>Normative References</title>
        </references><clause id="S" obligation="informative">
@@ -77,11 +71,10 @@ RSpec.describe IsoDoc do
                 </div>
                 <br/>
                 <div class="Section3" id="B">
-                  <h1 class="IntroTitle">0.&#160; Introduction</h1>
+                  <h1 class="IntroTitle">Introduction</h1>
                   <div id="C">
-           <h2>0.1. Introduction Subsection</h2>
+           <h2>Introduction Subsection</h2>
          </div>
-                  <p>This is patent boilerplate</p>
                 </div>
                 <p class="zzSTDTitle1"/>
                 <div id="D">
@@ -138,9 +131,6 @@ RSpec.describe IsoDoc do
            <h3>A.1.1. Annex A.1a</h3>
            </div>
          </div>
-                  <div id="Q2">
-                <h2>Appendix 1. An Appendix</h2>
-                </div>
 
                 </div>
                 <br/>
@@ -167,9 +157,6 @@ OUTPUT
         <introduction id="B" obligation="informative"><title>Introduction</title><clause id="C" inline-header="false" obligation="informative">
          <title>Introduction Subsection</title>
        </clause>
-       <patent-notice>
-       <p>This is patent boilerplate</p>
-       </patent-notice>
        </introduction></preface><sections>
        <clause id="D" obligation="normative">
          <title>Scope</title>
@@ -210,9 +197,6 @@ OUTPUT
          <title>Annex A.1a</title>
          </clause>
        </clause>
-              <appendix id="Q2" inline-header="false" obligation="normative">
-         <title>An Appendix</title>
-       </appendix>
        </annex><bibliography><references id="R" obligation="informative">
          <title>Normative References</title>
        </references><clause id="S" obligation="informative">
@@ -241,11 +225,10 @@ OUTPUT
                </div>
                <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
                <div class="Section3" id="B">
-                 <h1 class="IntroTitle">0.<span style="mso-tab-count:1">&#160; </span>Introduction</h1>
+                 <h1 class="IntroTitle">Introduction</h1>
                  <div id="C">
-          <h2>0.1. Introduction Subsection</h2>
+          <h2>Introduction Subsection</h2>
         </div>
-                 <p>This is patent boilerplate</p>
                </div>
                <p>&#160;</p>
              </div>
@@ -307,9 +290,6 @@ OUTPUT
           <div id="Q1">
           <h3>A.1.1. Annex A.1a</h3>
           </div>
-        </div>
-                 <div id="Q2">
-          <h2>Appendix 1. An Appendix</h2>
         </div>
                </div>
                <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>