metanorma-iso 1.3.13 → 1.3.15

data/lib/asciidoctor/iso/reqt.rng

@@ -54,9 +54,9 @@
     <optional>
       <ref name="subject"/>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="reqinherit"/>
-    </optional>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="classification"/>
     </zeroOrMore>

data/lib/isodoc/iso/base_convert.rb

@@ -58,14 +58,6 @@ module IsoDoc
       def error_parse(node, out)
         case node.name
         when "appendix" then clause_parse(node, out)
-        when "copyright-statement"
-          out.div **{class: "copyright"} do |div|
-            node.children.each { |n| parse(n, div) }
-          end
-        when "license-statement"
-          out.div **{class: "license"} do |div|
-            node.children.each { |n| parse(n, out) }
-          end
         else
           super
         end
@@ -197,21 +189,6 @@ module IsoDoc
       def clausedelim
         ""
       end
-
-      def boilerplate(node, out)
-        boilerplate = node.at(ns("//boilerplate")) or return
-        out.div **{class: "authority"} do |s|
-          boilerplate.children.each do |n|
-            if n.name == "title"
-              s.h1 do |h|
-                n.children.each { |nn| parse(nn, h) }
-              end
-            else
-              parse(n, s)
-            end
-          end
-        end
-      end
     end
   end
 end

data/lib/isodoc/iso/html/html_iso_intro.html

@@ -1,4 +1,4 @@
-<div id="copyright"/>
+<div id="boilerplate-copyright-destination"/>
 
 <nav>
 

data/lib/isodoc/iso/html/html_iso_titlepage.html

@@ -44,7 +44,7 @@ name="CVP_Secretariat_Loca">Secretariat</a>: {{ secretariat }}</p>
 
 {% if unpublished %}
 <div class="coverpage_warning">
-  <div id="license"/>
+  <div id="boilerplate-license-destination"/>
 <!--
 <p>Warning for WDs
 and CDs</p>

data/lib/isodoc/iso/html/isodoc.scss

@@ -269,13 +269,36 @@ p.IntroTitle, li.IntroTitle, div.IntroTitle
 	tab-stops:20.15pt;
 	font-size:14.0pt;
 	mso-bidi-font-size:11.0pt;
-	page-break-before:always;
 	font-family:$headerfont;
 	mso-fareast-font-family:$headerfont;
 	mso-bidi-font-family:$headerfont;
 	mso-ansi-language:EN-GB;
 	font-weight:bold;
+        page-break-before:always;
 	mso-bidi-font-weight:normal;}
+p.TitlePageSubhead, li.TitlePageSubhead, div.TitlePageSubhead {
+  mso-style-noshow:yes;
+        mso-style-unhide:no;
+        mso-style-parent:"Foreword Title";
+        margin-top:0cm;
+        margin-right:0cm;
+        margin-bottom:15.5pt;
+        margin-left:0cm;
+        text-align:center;
+        line-height:15.5pt;
+        mso-pagination:widow-orphan;
+        page-break-after:avoid;
+        mso-hyphenate:none;
+        tab-stops:20.15pt;
+        font-size:14.0pt;
+        mso-bidi-font-size:11.0pt;
+        font-family:$headerfont;
+        mso-fareast-font-family:$headerfont;
+        mso-bidi-font-family:$headerfont;
+        mso-ansi-language:EN-GB;
+        font-weight:bold;
+        mso-bidi-font-weight:normal;
+}
 p.Terms, li.Terms, div.Terms
 	{mso-style-name:"Term\(s\)";
 	mso-style-priority:8;
@@ -704,16 +727,16 @@ div.coverpage_warning
   font-style: italic;
 }
 
-.copyright {
+.boilerplate-copyright {
   padding: 1em;
 }
 
-.copyright .name {
+.boilerplate-copyright .boilerplate-name {
   color: #485094;
   font-weight: 600;
 }
 
-.copyright .address {
+.boilerplate-copyright .boilerplate-address {
   color: #485094;
 }
 

data/lib/isodoc/iso/html/style-human.scss

@@ -204,20 +204,19 @@ span.title {
     line-height: 0.5em;
 }
 
-.copyright .name {
+.boilerplate-copyright #boilerplate-name {
     font-weight: 900;
     padding-top: 1em;
 }
 
-.copyright .year, .copyright .message,
-.copyright .name, .copyright .address {
+.boilerplate-copyright p {
     margin-top: 1em;
     line-height: 1.1em;
     display: block;
 }
 
-.copyright .message, .copyright .name, 
-.copyright .address {
+.boilerplate-copyright #boilerplate-message, .boilerplate-copyright #boilerplate-name, 
+.boilerplate-copyright #boilerplate-address {
     font-size: 0.9em;
 }
 

data/lib/isodoc/iso/html/style-iso.scss

@@ -205,14 +205,13 @@ span.partlabel {
     padding-bottom: 1em;
 }
 
-.copyright .year, .copyright .message,
-.copyright .name, .copyright .address {
+.boilerplate-copyright p {
     margin-top: 1em;
     display: block;
 }
 
-.copyright .message, .copyright .name, 
-.copyright .address {
+.boilerplate-copyright #boilerplate-message, .boilerplate-copyright #boilerplate-name, 
+.boilerplate-copyright #boilerplate-address {
     font-size: 0.9em;
 }
 

data/lib/isodoc/iso/html/word_iso_intro.html

@@ -2,7 +2,7 @@
 border-bottom-alt:solid windowtext .5pt;mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:
 solid windowtext .5pt;mso-border-right-alt:solid windowtext .5pt;padding:1.0pt 4.0pt 0cm 4.0pt;
 margin-left:5.1pt;margin-right:5.1pt'>
-<div id="copyright"/>
+<div id="boilerplate-copyright-destination"/>
 </div>
 
 <p class="zzContents" style='margin-top:0cm'><span lang="EN-GB">Contents</span></p>

data/lib/isodoc/iso/html/word_iso_titlepage.html

@@ -66,7 +66,7 @@ mso-border-alt:solid windowtext .5pt;padding:1.0pt 4.0pt 1.0pt 4.0pt;
 margin-left:4.25pt;margin-right:4.25pt'>
 -->
 
-  <div id="license"/>
+  <div id="boilerplate-license-destination"/>
 <!--
 <p class="MsoNormal" align="center" style='margin-bottom:6.0pt;text-align:center;
 border:none;mso-border-alt:solid windowtext .5pt;padding:0cm;mso-padding-alt:

data/lib/isodoc/iso/html/wordstyle.scss

@@ -847,7 +847,6 @@ p.Tablebody, li.Tablebody, div.Tablebody
 	mso-endnote-separator:url("file:///C:/Doc/FILENAME_files/header.html") es;
 	mso-endnote-continuation-separator:url("file:///C:/Doc/FILENAME_files/header.html") ecs;
 	mso-facing-pages:yes;
-    mso-page-orientation: portrait;
 	}
 @page WordSection1
 	{size:595.0pt 842.0pt;
@@ -871,6 +870,26 @@ div.WordSection1
         mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef2;
         mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f2;
         mso-paper-source:0;}
+@page WordSection2L
+        {size:841.9pt 595.3pt;
+        margin:39.7pt 53.85pt 1.0cm 53.85pt;
+        mso-header-margin:35.45pt;
+        mso-footer-margin:14.2pt;
+        mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2;
+        mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2;
+        mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef2;
+        mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f2;
+        mso-paper-source:0;}
+@page WordSection2P
+        {size:595.3pt 841.9pt;
+        margin:39.7pt 53.85pt 1.0cm 53.85pt;
+        mso-header-margin:35.45pt;
+        mso-footer-margin:14.2pt;
+        mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2;
+        mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2;
+        mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef2;
+        mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f2;
+        mso-paper-source:0;}
 div.WordSection2
         {page:WordSection2;}
 @page WordSection3
@@ -884,6 +903,26 @@ div.WordSection2
         mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef3;
         mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f3;
         mso-paper-source:0;}
+@page WordSection3L
+        {size:841.9pt 595.3pt;
+        margin:39.7pt 53.85pt 1.0cm 53.85pt;
+        mso-header-margin:35.45pt;
+        mso-footer-margin:14.2pt;
+        mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2;
+        mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2;
+        mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef3;
+        mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f3;
+        mso-paper-source:0;}
+@page WordSection3P
+        {size:595.3pt 841.9pt;
+        margin:39.7pt 53.85pt 1.0cm 53.85pt;
+        mso-header-margin:35.45pt;
+        mso-footer-margin:14.2pt;
+        mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2;
+        mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2;
+        mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef3;
+        mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f3;
+        mso-paper-source:0;}
 div.WordSection3
         {page:WordSection3;}
 @page WordSection4

data/lib/isodoc/iso/html_convert.rb

@@ -40,35 +40,6 @@ module IsoDoc
         insert
       end
 
-      def make_body3(body, docxml)
-        body.div **{ class: "main-section" } do |div3|
-          boilerplate docxml, div3
-          abstract docxml, div3
-          foreword docxml, div3
-          introduction docxml, div3
-          middle docxml, div3
-          footnotes div3
-          comments div3
-        end
-      end
-
-      def html_preface(docxml)
-        super
-        authority_cleanup(docxml)
-        docxml
-      end
-
-      def authority_cleanup(docxml)
-        dest = docxml.at("//div[@id = 'copyright']")
-        auth = docxml.at("//div[@class = 'copyright']")
-        auth&.xpath(".//h1 | .//h2")&.each { |h| h["class"] = "IntroTitle" }
-        dest and auth and dest.replace(auth.remove)
-        dest = docxml.at("//div[@id = 'license']")
-        auth = docxml.at("//div[@class = 'license']")
-        auth&.xpath(".//h1 | .//h2")&.each { |h| h["class"] = "IntroTitle" }
-        dest and auth and dest.replace(auth.remove)
-      end
-
       include BaseConvert
     end
   end

data/lib/isodoc/iso/word_convert.rb

@@ -47,17 +47,6 @@ module IsoDoc
         end
       end
 
-      def make_body2(body, docxml)
-        body.div **{ class: "WordSection2" } do |div2|
-          boilerplate docxml, div2
-          abstract docxml, div2
-          foreword docxml, div2
-          introduction docxml, div2
-          div2.p { |p| p << "&nbsp;" } # placeholder
-        end
-        section_break(body)
-      end
-
       def colophon(body, docxml)
         stage =  @meta.get[:stage_int]
         return if !stage.nil? && stage < 60
@@ -108,22 +97,22 @@ module IsoDoc
       end
 
       def authority_cleanup(docxml)
-        insert = docxml.at("//div[@id = 'license']")
-        auth = docxml&.at("//div[@class = 'license']")&.remove
+        insert = docxml.at("//div[@id = 'boilerplate-license-destination']")
+        auth = docxml&.at("//div[@class = 'boilerplate-license']")&.remove
         auth&.xpath(".//p[not(@class)]")&.each { |p| p["class"] = "zzWarning" }
         auth and insert.children = auth
-        insert = docxml.at("//div[@id = 'copyright']")
-        auth = docxml&.at("//div[@class = 'copyright']")&.remove
+        insert = docxml.at("//div[@id = 'boilerplate-copyright-destination']")
+        auth = docxml&.at("//div[@class = 'boilerplate-copyright']")&.remove
         auth&.xpath(".//p[not(@class)]")&.each { |p| p["class"] = "zzCopyright" }
-        auth&.xpath(".//p[@id = 'authority2']")&.each { |p| p["class"] = "zzCopyright1" }
-        auth&.xpath(".//p[@id = 'authority3']")&.each { |p| p["class"] = "zzAddress" }
+        auth&.xpath(".//p[@id = 'boilerplate-message']")&.each { |p| p["class"] = "zzCopyright1" }
+        auth&.xpath(".//p[@id = 'boilerplate-address']")&.each { |p| p["class"] = "zzAddress" }
+        auth&.xpath(".//p[@id = 'boilerplate-name']")&.each { |p| p["class"] = "boilerplate-name" }
         auth and insert.children = auth
       end
 
       def word_cleanup(docxml)
         authority_hdr_cleanup(docxml)
         super
-        authority_cleanup(docxml)
         docxml
       end
 

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "1.3.13".freeze
+    VERSION = "1.3.15".freeze
   end
 end

data/spec/asciidoctor-iso/cleanup_spec.rb

@@ -191,7 +191,7 @@ RSpec.describe Asciidoctor::ISO do
       </foreword></preface><sections>
       </sections><bibliography><references id="_" obligation="informative">
         <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>
+        <p id="_">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="iso216" type="standard">
          <title format="text/plain">Reference</title>
          <docidentifier>ISO 216:2001</docidentifier>
@@ -230,7 +230,7 @@ RSpec.describe Asciidoctor::ISO do
       </foreword></preface><sections>
       </sections><bibliography><references id="_" obligation="informative">
         <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>
+        <p id="_">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="iso216" type="standard">
          <title format="text/plain">Reference</title>
          <docidentifier>ISO 216</docidentifier>
@@ -324,7 +324,7 @@ RSpec.describe Asciidoctor::ISO do
       #{BLANK_HDR}
       <sections></sections>
       <bibliography><references id="_" obligation="informative"><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>
+      <p id="_">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="iso216" type="standard">
          <title format="text/plain">Reference</title>
          <docidentifier>ISO 216</docidentifier>
@@ -628,7 +628,7 @@ RSpec.describe Asciidoctor::ISO do
       </p>
       </clause></sections><bibliography><references id="_" obligation="informative">
         <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>
+        <p id="_">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="iso123" type="standard">
          <title format="text/plain">Standard</title>
          <docidentifier>ISO 123:—</docidentifier>

data/spec/asciidoctor-iso/inline_spec.rb

@@ -129,7 +129,7 @@ RSpec.describe Asciidoctor::ISO do
 
        </sections><bibliography><references id="_" obligation="informative">
          <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>
+         <p id="_">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">
          <formattedref format="application/x-isodoc+xml">Reference</formattedref>
          <docidentifier>x</docidentifier>

data/spec/asciidoctor-iso/refs_spec.rb

@@ -17,7 +17,7 @@ RSpec.describe Asciidoctor::ISO do
        <sections>
               </sections><bibliography><references id="_" obligation="informative">
          <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>
+         <p id="_">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="iso123" type="standard">
          <title format="text/plain">Standard</title>
          <docidentifier>ISO 123:—</docidentifier>
@@ -53,7 +53,7 @@ RSpec.describe Asciidoctor::ISO do
       <sections>
       </sections><bibliography><references id="_" obligation="informative">
         <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>
+        <p id="_">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="iso123" type="standard">
          <title format="text/plain">Standard</title>
          <docidentifier>ISO 123:1066 (all parts)</docidentifier>
@@ -88,7 +88,7 @@ RSpec.describe Asciidoctor::ISO do
 
        </sections><bibliography><references id="_" obligation="informative">
          <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>
+         <p id="_">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="iso123">
          <formattedref format="application/x-isodoc+xml">
            <em>Standard</em>

data/spec/asciidoctor-iso/section_spec.rb

@@ -67,14 +67,14 @@ RSpec.describe Asciidoctor::ISO do
 
        <terms id="_" obligation="normative">
          <title>Terms and definitions</title>
-         <p>For the purposes of this document, the following terms and definitions apply.</p>
-         <p>ISO and IEC maintain terminological databases for use in
+         <p id="_">For the purposes of this document, the following terms and definitions apply.</p>
+         <p id="_">ISO and IEC maintain terminological databases for use in
 standardization at the following addresses:</p>
 
-<ul>
-<li> <p>ISO Online browsing platform: available at
+<ul id="_">
+<li> <p id="_">ISO Online browsing platform: available at
   <link target="http://www.iso.org/obp"/></p> </li>
-<li> <p>IEC Electropedia: available at
+<li> <p id="_">IEC Electropedia: available at
 <link target="http://www.electropedia.org"/>
 </p> </li> </ul>
 
@@ -110,7 +110,7 @@ standardization at the following addresses:</p>
           <title>Appendix 1</title>
        </appendix></annex><bibliography><references id="_" obligation="informative">
          <title>Normative References</title>
-         <p>There are no normative references in this document.</p>
+         <p id="_">There are no normative references in this document.</p>
        </references><clause id="_" obligation="informative">
          <title>Bibliography</title>
          <references id="_" obligation="informative">
@@ -198,14 +198,14 @@ standardization at the following addresses:</p>
      
        <terms id="_" obligation="normative">
          <title>Terms and definitions</title>
-         <p>For the purposes of this document, the following terms and definitions apply.</p>
-         <p>ISO and IEC maintain terminological databases for use in
+         <p id="_">For the purposes of this document, the following terms and definitions apply.</p>
+         <p id="_">ISO and IEC maintain terminological databases for use in
 standardization at the following addresses:</p>
 
-<ul>
-<li> <p>ISO Online browsing platform: available at
+<ul id="_">
+<li> <p id="_">ISO Online browsing platform: available at
   <link target="http://www.iso.org/obp"/></p> </li>
-<li> <p>IEC Electropedia: available at
+<li> <p id="_">IEC Electropedia: available at
 <link target="http://www.electropedia.org"/>
 </p> </li> </ul>
          <term id="_">
@@ -249,7 +249,7 @@ standardization at the following addresses:</p>
          <bibliography>
            <references id='_' obligation='informative'>
              <title>Normative References</title>
-             <p>There are no normative references in this document.</p>
+             <p id="_">There are no normative references in this document.</p>
            </references>
            <clause id='_' obligation='informative'>
              <title>Bibliography</title>
@@ -357,22 +357,21 @@ standardization at the following addresses:</p>
       === Term1
 
      INPUT
-             #{BLANK_HDR}
-             <termdocsource bibitemid="iso1234"/><termdocsource bibitemid="iso5678"/>
+          #{BLANK_HDR.sub(/<boilerplate>/, '<termdocsource bibitemid="iso1234"/><termdocsource bibitemid="iso5678"/><boilerplate>')}
         <preface><foreword obligation="informative">
          <title>Foreword</title>
          <p id="_">Foreword</p>
        </foreword></preface><sections>
        <terms id="_" obligation="normative">
-          <title>Terms and definitions</title><p>For the purposes of this document, the terms and definitions 
+          <title>Terms and definitions</title><p id="_">For the purposes of this document, the terms and definitions 
   given in <eref bibitemid="iso1234"/> and <eref bibitemid="iso5678"/> and the following apply.</p>
-  <p>ISO and IEC maintain terminological databases for use in
+  <p id="_">ISO and IEC maintain terminological databases for use in
 standardization at the following addresses:</p>
 
-<ul>
-<li> <p>ISO Online browsing platform: available at
+<ul id="_">
+<li> <p id="_">ISO Online browsing platform: available at
   <link target="http://www.iso.org/obp"/></p> </li>
-<li> <p>IEC Electropedia: available at
+<li> <p id="_">IEC Electropedia: available at
 <link target="http://www.electropedia.org"/>
 </p> </li> </ul>
 
@@ -396,24 +395,37 @@ standardization at the following addresses:</p>
 
      INPUT
              #{BLANK_HDR}
-        <preface><foreword obligation="informative">
-         <title>Foreword</title>
-         <p id="_">Foreword</p>
-       </foreword></preface><sections>
-       <terms id="_" obligation="normative">
-          <title>Terms and definitions</title><p>No terms and definitions are listed in this document.</p>
-          <p>ISO and IEC maintain terminological databases for use in
-standardization at the following addresses:</p>
-
-<ul>
-<li> <p>ISO Online browsing platform: available at
-  <link target="http://www.iso.org/obp"/></p> </li>
-<li> <p>IEC Electropedia: available at
-<link target="http://www.electropedia.org"/>
-</p> </li> </ul>
-
-       </terms></sections>
-       </iso-standard>
+ <preface>
+            <foreword obligation='informative'>
+              <title>Foreword</title>
+              <p id='_'>Foreword</p>
+            </foreword>
+          </preface>
+          <sections>
+            <terms id='_' obligation='normative'>
+              <title>Terms and definitions</title>
+              <p id='_'>No terms and definitions are listed in this document.</p>
+              <p id='_'>
+                ISO and IEC maintain terminological databases for use in standardization
+                at the following addresses:
+              </p>
+              <ul id='_'>
+                <li>
+                  <p id='_'>
+                    ISO Online browsing platform: available at 
+                    <link target='http://www.iso.org/obp'/>
+                  </p>
+                </li>
+                <li>
+                  <p id='_'>
+                    IEC Electropedia: available at 
+                    <link target='http://www.electropedia.org'/>
+                  </p>
+                </li>
+              </ul>
+            </terms>
+          </sections>
+        </iso-standard>
 
      OUTPUT
     end
@@ -428,23 +440,22 @@ standardization at the following addresses:</p>
       == Terms and Definitions
 
      INPUT
-             #{BLANK_HDR}
-             <termdocsource bibitemid="iso1234"/><termdocsource bibitemid="iso5678"/>
+     #{BLANK_HDR.sub(/<boilerplate>/, '<termdocsource bibitemid="iso1234"/><termdocsource bibitemid="iso5678"/><boilerplate>')}
         <preface><foreword obligation="informative">
          <title>Foreword</title>
          <p id="_">Foreword</p>
        </foreword></preface><sections>
        <terms id="_" obligation="normative">
          <title>Terms and definitions</title>
-         <p>For the purposes of this document,
+         <p id="_">For the purposes of this document,
         the terms and definitions given in <eref bibitemid="iso1234"/> and <eref bibitemid="iso5678"/> apply.</p>
-        <p>ISO and IEC maintain terminological databases for use in
+        <p id="_">ISO and IEC maintain terminological databases for use in
 standardization at the following addresses:</p>
 
-<ul>
-<li> <p>ISO Online browsing platform: available at
+<ul id="_">
+<li> <p id="_">ISO Online browsing platform: available at
   <link target="http://www.iso.org/obp"/></p> </li>
-<li> <p>IEC Electropedia: available at
+<li> <p id="_">IEC Electropedia: available at
 <link target="http://www.electropedia.org"/>
 </p> </li> </ul>