metanorma-unece 0.2.12 → 0.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2af9f1413f022c4968df2c7a46d238fee9eeb63ee8e077a02e8c0d2ec5897e53
-  data.tar.gz: 3f03cab11092d066d5050f07a62e671577edf775b39f29e52e4c74263edd9574
+  metadata.gz: 2b3cff7f43d8c91bd1ff185db5bb3957cd7ef76851894ad2b171d2337ea00a28
+  data.tar.gz: 8f658026cd8011d9a9ec8e87412f53fc42099b133689b8651f755e2b32d12dcc
 SHA512:
-  metadata.gz: '09422afc7019474badc803d9db3b77a7780abe6e674136f7d845466589df1259338b71de5e4e49d869a617be5cc936e457bf831b8352e586020c84d4c5df02f9'
-  data.tar.gz: d590a51c196445f8a893300de24ad3934291496134bf968cddab5eae5d438cc474814fbcbc23c73857e697b7b98feeaf038c976c0d5931551ca5fc1a5690a18f
+  metadata.gz: 4c44286119f5c0b9397d2a6ddb425e11f0a47fdaa94c8f6e4684e7f2d3134332ef35eb4a6cf0d6d709ef1f191c0ab17e9b69ade273b8473d7be1fa24213dcf98
+  data.tar.gz: 2ccb65e2f73701f5ee722740ab23c2a1c8949f3e630f4b56851e94fa9c4b60d13ce7a5f3f716f07852ca6b6885dcbbd71304b93b7d1703b07bba782e13dd77b1

data/lib/asciidoctor/unece/boilerplate.xml

@@ -0,0 +1,57 @@
+<boilerplate>
+  <copyright-statement>
+    <clause>
+      <p id="boilerplate-ECEhdr">ECE/TRADE/437</p>
+      <p>Copyright © United Nations {{ docyear }}<br/>
+        All rights reserved worldwide<br/>
+        United Nations publication issued by the Economic Commission for Europe</p>
+    </clause>
+  </copyright-statement>
+  <license-statement>
+    <clause>
+      <p>None of the materials provided on this web site may be used,
+        reproduced or transmitted, in whole or in part, in any form or by any
+        means, electronic or mechanical, including photocopying, recording or
+        the use of any information storage and retrieval system, except as
+        provided for in the Terms and Conditions of Use of United Nations Web
+        Sites, without permission in writing from the publisher.</p>
+
+      <p>News-related material can be used as long as the appropriate credit is given and the United Nations is advised.</p>
+      <p>To request such permission or for further enquires, please visit:
+        <link target="https://shop.un.org/rights-permissions">United Nations Publications: Rights and Permissions.</link></p>
+    </clause>
+  </license-statement>
+  <legal-statement>
+    <clause>
+      <clause>
+        <title>Note</title>
+        <p>The designations employed and the presentation of the material in this publication do not imply the expression of any opinion whatsoever on the part of the Secretariat of the United Nations concerning the legal status of any country, territory, city or area, or of its authorities, or concerning the delimitation of its frontiers or boundaries.</p>
+      </clause>
+
+      {% if tc == "United Nations Centre for Trade Facilitation and Electronic Business (UN/CEFACT)" %}
+      <clause>
+        <title>#{tc}<br/>Simple, Transparent and Effective Processes for Global Commerce</title>
+        <p>UN/CEFACT's mission is to improve the ability of business, trade and administrative organizations, from developed, developing and transitional economies, to exchange products and relevant services effectively. Its principal focus is on facilitating national and international transactions, through the simplification and harmonization of processes, procedures and information flows, and so contribute to the growth of global commerce.</p>
+        <p>Participation in UN/CEFACT is open to experts from United Nations Member States, Intergovernmental Organizations and Non-Governmental Organizations recognised by the United Nations Economic and Social Council (ECOSOC). Through this participation of government and business representatives from around the world, UN/CEFACT has developed a range of trade facilitation and e-business standards, recommendations and tools that are approved within a broad intergovernmental process and implemented globally.</p>
+        <p align="center"><b>www.unece.org/cefact</b></p>
+      </clause>
+      {% endif %}
+    </clause>
+  </legal-statement>
+  <feedback-statement>
+    <clause>
+      <p id="boilerplate-feedback-name">UN Economic Commission for Europe: Information Service</p>
+      <p id="boilerplate-feedback-address">
+        Palais des Nations<br />
+        CH-1211 Geneva 10<br />
+        Switzerland<br />
+        <br />
+        <link target="tel:+41(0)229171234">+41 (0) 22 917 12 34 (switchboard)</link><br />
+        <link target="mailto:unece_info@un.org">unece_info@un.org</link><br />
+        <link target="https://www.unece.org/">www.unece.org/</link>
+      </p>
+    </clause>
+  </feedback-statement>
+</boilerplate>
+
+

data/lib/asciidoctor/unece/converter.rb

@@ -207,11 +207,6 @@ module Asciidoctor
           "subsequence": node.attr("subsequence"),
         ))
       end
-
-      #def clause_parse(attrs, xml, node)
-        #abstract_parse(attrs, xml, node) && return if node.attr("style") == "abstract"
-        #super
-      #end
     end
   end
 end

data/lib/isodoc/unece/base_convert.rb

@@ -9,7 +9,7 @@ module IsoDoc
         @meta = Metadata.new(lang, script, labels)
         @meta.set(:toc, @toc)
       end
-      
+
       def annex_name(annex, name, div)
         div.h1 **{ class: "Annex" } do |t|
           t << "#{anchor(annex['id'], :label)}"
@@ -59,7 +59,7 @@ module IsoDoc
         end
       end
 
-      def annex_levelnumber(num, lvl)
+      def annex_levelnum(num, lvl)
         case lvl % 3
         when 0 then RomanNumerals.to_roman(num)
         when 1 then ("A".ord + num - 1).chr
@@ -67,43 +67,53 @@ module IsoDoc
         end
       end
 
-      def leaf_section(clause, lvl)
+      NONTERMINAL =
+        "./clause | ./term  | ./terms | ./definitions | ./references".freeze
+
+      def leaf_section?(clause)
+        !clause.at(ns(NONTERMINAL)) &&
+          !%w(definitions annex terms).include?(clause.name) &&
+          clause.at(ns("./p | ./bibitem"))
+      end
+
+      def label_leaf_section(clause, lvl)
         @paranumber += 1
-        @anchors[clause["id"]] = {label: @paranumber.to_s, xref: "paragraph #{@paranumber}", level: lvl, type: "paragraph" }
+        @anchors[clause["id"]] = {label: @paranumber.to_s, 
+                                  xref: "paragraph #{@paranumber}", 
+                                  level: lvl, type: "paragraph" }
       end
 
-      def annex_leaf_section(clause, num, lvl)
+      def label_annex_leaf_section(clause, num, lvl)
         @paranumber += 1
-        @anchors[clause["id"]] = {label: @paranumber.to_s, xref: "paragraph #{num}.#{@paranumber}", level: lvl, type: "paragraph" }
+        @anchors[clause["id"]] = {label: @paranumber.to_s, 
+                                  xref: "paragraph #{num}.#{@paranumber}", 
+                                  level: lvl, type: "paragraph" }
       end
 
       def section_names(clause, num, lvl)
         return num if clause.nil?
-        clause.at(ns("./clause | ./term  | ./terms | ./definitions | ./references")) or
-          leaf_section(clause, lvl) && return
+        leaf_section?(clause) and label_leaf_section(clause, lvl) and return
         num = num + 1
         lbl = levelnumber(num, 1)
-        @anchors[clause["id"]] =
-          { label: lbl, xref: l10n("#{@clause_lbl} #{lbl}"), level: lvl, type: "clause" }
+        @anchors[clause["id"]] = { label: lbl, level: lvl, type: "clause",
+                                   xref: l10n("#{@clause_lbl} #{lbl}") }
         i = 1
-        clause.xpath(ns("./clause | ./term  | ./terms | ./definitions | ./references")).each do |c|
+        clause.xpath(ns(NONTERMINAL)).each do |c|
           section_names1(c, "#{lbl}.#{levelnumber(i, lvl + 1)}", lvl + 1)
-          i += 1 if c.at(ns("./clause | ./term  | ./terms | ./definitions | ./references"))
+          i += 1 if !leaf_section?(c)
         end
         num
       end
 
       def section_names1(clause, num, level)
-        unless clause.at(ns("./clause | ./term  | ./terms | ./definitions | ./references"))
-          leaf_section(clause, level) and return
-        end
+        leaf_section?(clause) and label_leaf_section(clause, level) and return
         /\.(?<leafnum>[^.]+$)/ =~ num
-        @anchors[clause["id"]] =
-          { label: leafnum, level: level, xref: l10n("#{@clause_lbl} #{num}"), type: "clause" }
+        @anchors[clause["id"]] = { label: leafnum, level: level, type: "clause",
+                                   xref: l10n("#{@clause_lbl} #{num}") }
         i = 1
-        clause.xpath(ns("./clause | ./terms | ./term | ./definitions | ./references")).each do |c|
+        clause.xpath(ns(NONTERMINAL)).each do |c|
           section_names1(c, "#{num}.#{levelnumber(i, level + 1)}", level + 1)
-          i += 1 if c.at(ns("./clause | ./term  | ./terms | ./definitions | ./references"))
+          i += 1 if !leaf_section?(c)
         end
       end
 
@@ -113,29 +123,28 @@ module IsoDoc
 
       def annex_names(clause, num)
         hierarchical_asset_names(clause, num)
-        unless clause.at(ns("./clause | ./term  | ./terms | ./definitions | ./references"))
-          annex_leaf_section(clause, num, 1) and return
-        end
-        @anchors[clause["id"]] = { label: annex_name_lbl(clause, num), type: "clause",
+        leaf_section?(clause) and
+          label_annex_leaf_section(clause, num, 1) and return
+        @anchors[clause["id"]] = { label: annex_name_lbl(clause, num),
+                                   type: "clause",
                                    xref: "#{@annex_lbl} #{num}", level: 1 }
         i = 1
         clause.xpath(ns("./clause")).each do |c|
-          annex_names1(c, "#{num}.#{annex_levelnumber(i, 2)}", 2)
-          i += 1 if c.at(ns("./clause | ./term  | ./terms | ./definitions | ./references"))
+          annex_names1(c, "#{num}.#{annex_levelnum(i, 2)}", 2)
+          i += 1 if !leaf_section?(c)
         end
       end
 
       def annex_names1(clause, num, level)
-        unless clause.at(ns("./clause | ./term  | ./terms | ./definitions | ./references"))
-          annex_leaf_section(clause, num, level) and return
-        end
+        leaf_section?(clause) and
+          label_annex_leaf_section(clause, num, level) and return
         /\.(?<leafnum>[^.]+$)/ =~ num
         @anchors[clause["id"]] = { label: leafnum, xref: "#{@annex_lbl} #{num}",
                                    level: level, type: "clause" }
         i = 1
         clause.xpath(ns("./clause | ./references")).each do |c|
-          annex_names1(c, "#{num}.#{annex_levelnumber(i, level + 1)}", level + 1)
-          i += 1 if c.at(ns("./clause | ./term  | ./terms | ./definitions | ./references"))
+          annex_names1(c, "#{num}.#{annex_levelnum(i, level + 1)}", level + 1)
+          i += 1 if !leaf_section?(c)
         end
       end
 
@@ -158,7 +167,8 @@ module IsoDoc
         clause.xpath(ns(".//admonition")).each do |t|
           i += 1 unless t["unnumbered"]
           next if t["id"].nil? || t["id"].empty?
-          @anchors[t["id"]] = anchor_struct(i.to_s, nil, @admonition_lbl, "box", t["unnumbered"])
+          @anchors[t["id"]] = anchor_struct(i.to_s, nil, @admonition_lbl,
+                                            "box", t["unnumbered"])
         end
       end
 
@@ -167,7 +177,9 @@ module IsoDoc
         clause.xpath(ns(".//admonition")).each do |t|
           i += 1 unless t["unnumbered"]
           next if t["id"].nil? || t["id"].empty?
-          @anchors[t["id"]] = anchor_struct("#{num}.#{i}", nil, @admonition_lbl, "box", t["unnumbered"])
+          @anchors[t["id"]] =
+            anchor_struct("#{num}.#{i}", nil, @admonition_lbl, "box",
+                          t["unnumbered"])
         end
       end
 

data/lib/isodoc/unece/html/html_unece_intro.html

@@ -1,21 +1,9 @@
+{% if doctype == "Recommendation" %}
 <div>
-  <p><b>Note</b>
-  <p>The designations employed and the presentation of the material in this publication do not imply the expression of any opinion whatsoever on the part of the Secretariat of the United Nations concerning the legal status of any country, territory, city or area, or of its authorities, or concerning the delimitation of its frontiers or boundaries.</p>
-
-  {% if tc == "United Nations Centre for Trade Facilitation and Electronic Business (UN/CEFACT)" %}
-  <p align="center"><b>The United Nations Centre for Trade Facilitation and Electronic Business (UN/CEFACT)</b></p>
-  <p align="center"><b>Simple, Transparent and Effective Processes for Global Commerce</b></p>
-  <p>UN/CEFACT’s mission is to improve the ability of business, trade and administrative organizations, from developed, developing and transitional economies, to exchange products and relevant services effectively. Its principal focus is on facilitating national and international transactions, through the simplification and harmonization of processes, procedures and information flows, and so contribute to the growth of global commerce.</p>
-  <p>Participation in UN/CEFACT is open to experts from United Nations Member States, Intergovernmental Organizations and Non-Governmental Organizations recognised by the United Nations Economic and Social Council (ECOSOC). Through this participation of government and business representatives from around the world, UN/CEFACT has developed a range of trade facilitation and e-business standards, recommendations and tools that are approved within a broad intergovernmental process and implemented globally.</p>
-  <p align="center"<b>www.unece.org/cefact</b></p>
-  {% endif %}
-
-  <p align="center" style="border:solid;">ECE/TRADE/437</p>
-  <p align="center">Copyright © United Nations {{ docyear }}<br/>
-  All rights reserved worldwide<br/>
-  United Nations publication issued by the Economic Commission for Europe</p>
-
+   <div id="boilerplate-legal-destination"/>
+  <div id="boilerplate-copyright-destination"/>
 </div>
+{% endif %}
 
 <nav>
   <h1 id="content">Contents</h1>

data/lib/isodoc/unece/html/html_unece_plenary_titlepage.html

@@ -77,51 +77,18 @@
 <div  class="coverpage-stage-block" >{{ revdate }}</div>
 {% endif %}
 
-{% if unpublished %}
-  <div class="coverpage-warning">
-    <span class="title">Warning for Drafts</span>
-
-    <p class="content">
-    This document is not a UNECE Standard. It is distributed for review and
-    comment, and is subject to change without notice and may not be referred to as
-    a Standard. Recipients of this draft are invited to submit, with their
-    comments, notification of any relevant patent rights of which they are aware
-    and to provide supporting documentation.
-    </p>
-  </div>
-{% endif %}
-
 <div class="info-section">
 <div class="copyright">
   <p class="year">
     &copy; {{ docyear }} United Nations.
   </p>
 
-  <p class="message">
-    None of the materials provided on this web site may be used,
-    reproduced or transmitted, in whole or in part, in any form or by any
-    means, electronic or mechanical, including photocopying, recording or
-    the use of any information storage and retrieval system, except as
-    provided for in the Terms and Conditions of Use of United Nations Web
-    Sites, without permission in writing from the publisher. <br>
-    <br>
-    News-related material can be used as long as the appropriate credit is given and the United Nations is advised.<br>
-    <br>
-    To request such permission or for further enquires, please visit:
-    <a href="https://shop.un.org/rights-permissions">United Nations Publications: Rights and Permissions.</a><br>
-  </p>
+  <div class="message">
+  <div id="boilerplate-license-destination"/>
+  </div>
 
 <div class="contact-info">
-  <p class="name">UN Economic Commission for Europe: Information Service</p>
-  <p class="address">
-    Palais des Nations<br />
-    CH-1211 Geneva 10<br />
-    Switzerland<br />
-    <br />
-    <a href="tel:+41(0)229171234">+41 (0) 22 917 12 34 (switchboard)</a><br />
-    <a href="mailto:unece_info@un.org">unece_info@un.org</a><br />
-    <a href="https://www.unece.org/">www.unece.org/</a>
-  </p>
+  <div id="boilerplate-feedback-destination"/>
 </div>
 </div>
 

data/lib/isodoc/unece/html/html_unece_titlepage.html

@@ -58,51 +58,18 @@
 <div  class="coverpage-stage-block" >{{ revdate }}</div>
 {% endif %}
 
-{% if unpublished %}
-  <div class="coverpage-warning">
-    <span class="title">Warning for Drafts</span>
-
-    <p class="content">
-    This document is not a UNECE Standard. It is distributed for review and
-    comment, and is subject to change without notice and may not be referred to as
-    a Standard. Recipients of this draft are invited to submit, with their
-    comments, notification of any relevant patent rights of which they are aware
-    and to provide supporting documentation.
-    </p>
-  </div>
-{% endif %}
-
 <div class="info-section">
 <div class="copyright">
   <p class="year">
     &copy; {{ docyear }} United Nations.
   </p>
 
-  <p class="message">
-    None of the materials provided on this web site may be used,
-    reproduced or transmitted, in whole or in part, in any form or by any
-    means, electronic or mechanical, including photocopying, recording or
-    the use of any information storage and retrieval system, except as
-    provided for in the Terms and Conditions of Use of United Nations Web
-    Sites, without permission in writing from the publisher. <br>
-    <br>
-    News-related material can be used as long as the appropriate credit is given and the United Nations is advised.<br>
-    <br>
-    To request such permission or for further enquires, please visit:
-    <a href="https://shop.un.org/rights-permissions">United Nations Publications: Rights and Permissions.</a><br>
-  </p>
+  <div class="message">
+  <div id="boilerplate-license-destination"/>
+  </div>
 
 <div class="contact-info">
-  <p class="name">UN Economic Commission for Europe: Information Service</p>
-  <p class="address">
-    Palais des Nations<br />
-    CH-1211 Geneva 10<br />
-    Switzerland<br />
-    <br />
-    <a href="tel:+41(0)229171234">+41 (0) 22 917 12 34 (switchboard)</a><br />
-    <a href="mailto:unece_info@un.org">unece_info@un.org</a><br />
-    <a href="https://www.unece.org/">www.unece.org/</a>
-  </p>
+  <div id="boilerplate-feedback-destination"/>
 </div>
 </div>
 

data/lib/isodoc/unece/html/htmlstyle.scss

@@ -819,7 +819,7 @@ a.footnote-number {
 }
 
 /* http://www.un.org/styleguide/ labels */
-.contact-info .name {
+.contact-info #boilerplate-feedback-name {
 /*  font-weight: 700;
   font-size: 1.2em;
   margin-bottom:0;*/
@@ -834,7 +834,7 @@ a.footnote-number {
   margin-bottom: 9px;
 }
 
-.contact-info .address {
+.contact-info #boilerplate-feedback-address {
     font-size: 1em;
     line-height: 1.3em;
     margin-top:0;
@@ -986,13 +986,21 @@ h2 p {
   4.4 Copyright
 */
 
-.copyright {
+.boilerplate-copyright {
   padding: 1em;
   font-size: 0.9em;
   text-align: left;
 }
 
 
+.boilerplate-copyright p {
+text-align: center;
+}
+
+#boilerplate-ECEhdr {
+  border: solid;
+}
+
 /*  .copyright .name, .copyright .address {color: $un-link;} */
 
 

data/lib/isodoc/unece/html/unece.scss

@@ -268,13 +268,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;
@@ -574,6 +597,30 @@ div.WordSection1
 	mso-paper-source:0;
 	mso-footnote-numbering-restart:each-section;
       }
+@page WordSection2L
+        {size:841.9pt 595.3pt;
+        margin:39.7pt 53.85pt 1.0cm 3.0cm;
+        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;
+        mso-footnote-numbering-restart:each-section;
+      }
+@page WordSection2P
+        {size:595.3pt 841.9pt;
+        margin:39.7pt 53.85pt 1.0cm 3.0cm;
+        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;
+        mso-footnote-numbering-restart:each-section;
+      }
 div.WordSection2
 	{page:WordSection2;}
 @page WordSection3
@@ -589,6 +636,30 @@ div.WordSection2
 	mso-paper-source:0;
 	mso-footnote-numbering-restart:each-section;
       }
+@page WordSection3L
+        {size:841.9pt 595.3pt;
+        margin:39.7pt 53.85pt 1.0cm 3.0cm;
+        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;
+        mso-footnote-numbering-restart:each-section;
+      }
+@page WordSection3P
+        {size:595.3pt 841.9pt;
+        margin:39.7pt 53.85pt 1.0cm 3.0cm;
+        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;
+        mso-footnote-numbering-restart:each-section;
+      }
 div.WordSection3
 	{page:WordSection3;}
 table.MsoISOTable
@@ -721,3 +792,10 @@ table.dl
 	margin-bottom:11.0pt;
 	margin-left:20.15pt;}
 
+.boilerplate-ECEhdr {
+  border: solid;
+}
+
+.boilerplate-copyright p {
+  text-align: center;
+}

data/lib/isodoc/unece/html/word_unece_intro.html

@@ -1,20 +1,7 @@
 {% if doctype == "Recommendation" %}
 <div>
-  <p><b>Note</b>
-  <p>The designations employed and the presentation of the material in this publication do not imply the expression of any opinion whatsoever on the part of the Secretariat of the United Nations concerning the legal status of any country, territory, city or area, or of its authorities, or concerning the delimitation of its frontiers or boundaries.</p>
-
-  {% if tc == "United Nations Centre for Trade Facilitation and Electronic Business (UN/CEFACT)" %}
-  <p align="center"><b>The United Nations Centre for Trade Facilitation and Electronic Business (UN/CEFACT)</b></p>
-  <p align="center"><b>Simple, Transparent and Effective Processes for Global Commerce</b></p>
-  <p>UN/CEFACT’s mission is to improve the ability of business, trade and administrative organizations, from developed, developing and transitional economies, to exchange products and relevant services effectively. Its principal focus is on facilitating national and international transactions, through the simplification and harmonization of processes, procedures and information flows, and so contribute to the growth of global commerce.</p>
-  <p>Participation in UN/CEFACT is open to experts from United Nations Member States, Intergovernmental Organizations and Non-Governmental Organizations recognised by the United Nations Economic and Social Council (ECOSOC). Through this participation of government and business representatives from around the world, UN/CEFACT has developed a range of trade facilitation and e-business standards, recommendations and tools that are approved within a broad intergovernmental process and implemented globally.</p>
-  <p align="center"<b>www.unece.org/cefact</b></p>
-  {% endif %}
-
-  <p align="center" style="border:solid;">ECE/TRADE/437</p>
-  <p align="center">Copyright © United Nations {{ docyear }}<br/>
-  All rights reserved worldwide<br/>
-  United Nations publication issued by the Economic Commission for Europe</p>
+  <div id="boilerplate-legal-destination"/>
+  <div id="boilerplate-copyright-destination"/>
 
 </div>
 

data/lib/isodoc/unece/html_convert.rb

@@ -13,12 +13,6 @@ module IsoDoc
         super
       end
 
-      #def convert1(docxml, filename, dir)
-        #FileUtils.cp html_doc_path('logo.jpg'), File.join(@localdir, "logo.jpg")
-        #@files_to_delete << File.join(@localdir, "logo.jpg")
-        #super
-      #end
-
       def default_fonts(options)
         {
           bodyfont: (
@@ -58,7 +52,6 @@ module IsoDoc
         if plenary && @htmlcoverpage == html_doc_path("html_unece_titlepage.html")
           @htmlcoverpage = html_doc_path("html_unece_plenary_titlepage.html")
         end
-        #@htmlintropage = nil if plenary
         xml.body **body_attr do |body|
           make_body1(body, docxml)
           make_body2(body, docxml)
@@ -68,6 +61,7 @@ module IsoDoc
 
       def make_body3(body, docxml)
         body.div **{ class: "main-section" } do |div3|
+          boilerplate docxml, div3
           abstract docxml, div3
           foreword docxml, div3
           introduction docxml, div3
@@ -77,27 +71,6 @@ module IsoDoc
         end
       end
 
-      def html_preface(docxml)
-        super
-=begin
-        preface_container = docxml.at("//div[@id = 'preface_container']") # recommendation
-        abstractbox = docxml.at("//div[@id = 'abstractbox']") # plenary
-        foreword = docxml.at("//p[@class = 'ForewordTitle']/..")
-        intro = docxml.at("//p[@class = 'IntroTitle']/..")
-        abstract = docxml.at("//h1[@class = 'AbstractTitle']/..")
-        abstract.parent = (abstractbox || preface_container) if abstract
-        docxml.at("//h1[@class = 'AbstractTitle']").remove if abstractbox
-        foreword.parent = preface_container if foreword && preface_container
-        intro.parent = preface_container if intro && preface_container
-        if abstractbox && !intro && !foreword
-          sect2 = docxml.at("//div[@class='WordSection2']")
-          sect2.next_element.remove # pagebreak
-          sect2.remove # pagebreak
-        end
-=end
-        docxml
-      end
-
       def middle(isoxml, out)
         clause isoxml, out
         annex isoxml, out

data/lib/isodoc/unece/pdf_convert.rb

@@ -68,6 +68,7 @@ module IsoDoc
 
       def make_body3(body, docxml)
         body.div **{ class: "main-section" } do |div3|
+          boilerplate docxml, div3
           abstract docxml, div3
           foreword docxml, div3
           introduction docxml, div3

data/lib/isodoc/unece/word_convert.rb

@@ -67,6 +67,7 @@ module IsoDoc
       def make_body2(body, docxml)
         body.div **{ class: "WordSection2" } do |div2|
           info docxml, div2
+          boilerplate docxml, div2
           abstract docxml, div2
           foreword docxml, div2
           introduction docxml, div2
@@ -101,8 +102,10 @@ module IsoDoc
         else
           div.send "h#{anchor(node['id'], :level) || '1'}" do |h|
             lbl = anchor(node['id'], :label, false)
-            h << "#{lbl}. " if lbl && !@suppressheadingnumbers
-            insert_tab(h, 1)
+            if lbl && !@suppressheadingnumbers
+              h << "#{lbl}. "
+              insert_tab(h, 1)
+            end
             c1&.children&.each { |c2| parse(c2, h) }
           end
         end
@@ -165,6 +168,12 @@ module IsoDoc
         end
       end
 
+      def authority_cleanup(docxml)
+        super
+        a = docxml.at("//div[@id = 'boilerplate-ECEhdr']") and a["class"] = "boilerplate-ECEhdr"
+        docxml&.at("//div[@class = 'authority']")&.remove
+      end
+
       include BaseConvert
     end
   end

data/lib/metanorma/unece/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Unece
-    VERSION = "0.2.12"
+    VERSION = "0.2.13"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-unece
 version: !ruby/object:Gem::Version
-  version: 0.2.12
+  version: 0.2.13
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-17 00:00:00.000000000 Z
+date: 2020-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -274,6 +274,7 @@ files:
 - lib/asciidoctor/unece.rb
 - lib/asciidoctor/unece/basicdoc.rng
 - lib/asciidoctor/unece/biblio.rng
+- lib/asciidoctor/unece/boilerplate.xml
 - lib/asciidoctor/unece/converter.rb
 - lib/asciidoctor/unece/isodoc.rng
 - lib/asciidoctor/unece/reqt.rng