metanorma-un 0.5.0 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84ac6004180fc5b55f02c08ce72d19b4b2e0de5f5b406f4c6796fe5595edeee6
-  data.tar.gz: 0d742071c23c5455cca3ddcd9a13dcdcf45ad781478dfad4a4297510697e5f70
+  metadata.gz: a89fbe7a8aacf50f53139a549d660b7d0706321463965c5050bb6c2c1d4acdac
+  data.tar.gz: f43a231cf294d7f45becca41ce489d6534811cc9f414a0163aeffcb3aa199415
 SHA512:
-  metadata.gz: e0d3b23e08336a19b8000792d0facbb9e7311f77ef014e5931503027b5dd9e54fa84e6135c4e38535a8bc0a75d476f5b8ac95443cda73b1e9c4cb19a3d5b3571
-  data.tar.gz: 88d72ed256d4c45d0c1873c42423fcc6449a99b0a3efa8d842f9d33fcf63dc823a102fac228b4c3fb9a82f737e20cd3befeb6a43e59c7b13884a4c7f301216b6
+  metadata.gz: 62377ec55bd35ef893b6ac9bf80676a2873cdd5a63cf6635412b6ceb294aa6d85b352c535392647e633691fd9c1424a740460586e6f3395c1a8958e230e6ea98
+  data.tar.gz: 75337ef3e5cab047fae4c81d3e879291d904de3e58bb07bdf976e1bb3197789679b0fecd6f9ecf20b3489701d9a4036ef6584b1f969e56996dd24300195425e4

data/lib/asciidoctor/un/basicdoc.rng

@@ -402,6 +402,16 @@
           </choice>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="valign">
+          <choice>
+            <value>top</value>
+            <value>middle</value>
+            <value>bottom</value>
+            <value>baseline</value>
+          </choice>
+        </attribute>
+      </optional>
       <choice>
         <zeroOrMore>
           <ref name="TextElement"/>
@@ -429,6 +439,16 @@
           </choice>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="valign">
+          <choice>
+            <value>top</value>
+            <value>middle</value>
+            <value>bottom</value>
+            <value>baseline</value>
+          </choice>
+        </attribute>
+      </optional>
       <choice>
         <zeroOrMore>
           <ref name="TextElement"/>
@@ -998,6 +1018,9 @@
           <value>alphabet_upper</value>
         </choice>
       </attribute>
+      <optional>
+        <attribute name="start"/>
+      </optional>
       <oneOrMore>
         <ref name="li"/>
       </oneOrMore>

data/lib/asciidoctor/un/boilerplate.xml

@@ -40,15 +40,17 @@
   </legal-statement>
   <feedback-statement>
     <clause>
-      <p id="boilerplate-feedback-name">UN Economic Commission for Europe: Information Service</p>
+      <p id="boilerplate-feedback-name">{% if subdivision %}{{subdivision}}{% else %}UN Economic Commission for Europe: Information Service{% endif %}</p>
       <p id="boilerplate-feedback-address">
+        {% if pub_address %}{{ pub_address }}{% else %}
         Palais des Nations<br />
         CH-1211 Geneva 10<br />
-        Switzerland<br />
+        Switzerland{% endif %}<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>
+        <link target="tel:{% if pub_phone %}{{ pub_phone }}{% else %}+41(0)229171234{% endif %}">{% if pub_phone %}{{ pub_phone }}{% else %}+41 (0) 22 917 12 34 (switchboard){% endif %}</link><br />
+        {% if pub_fax %}<link target="tel:{{pub_fax}}">{{pub_fax}}</link><br/>{% endif %}       
+        <link target="mailto:{% if pub_email %}{{ pub_email }}{% else %}unece_info@un.org{% endif %}">{% if pub_email %}{{ pub_email }}{% else %}unece_info@un.org{% endif %}</link><br />
+        <link target="{% if pub_uri %}{{pub_uri}}{% else %}https://www.unece.org/{% endif %}">{% if pub_uri %}{{pub_uri}}{% else %}www.unece.org/{% endif %}</link>
       </p>
     </clause>
   </feedback-statement>

data/lib/asciidoctor/un/converter.rb

@@ -11,24 +11,8 @@ module Asciidoctor
 
       register_for "un"
 
-      def metadata_author(node, xml)
-        xml.contributor do |c|
-          c.role **{ type: "author" }
-          c.organization do |a|
-            a.name Metanorma::UN::ORGANIZATION_NAME_LONG
-            a.abbreviation Metanorma::UN::ORGANIZATION_NAME_SHORT
-          end
-        end
-      end
-
-      def metadata_publisher(node, xml)
-        xml.contributor do |c|
-          c.role **{ type: "publisher" }
-          c.organization do |a|
-            a.name Metanorma::UN::ORGANIZATION_NAME_LONG
-            a.abbreviation Metanorma::UN::ORGANIZATION_NAME_SHORT
-          end
-        end
+      def default_publisher
+        "United Nations"
       end
 
       def metadata_committee(node, xml)
@@ -58,8 +42,8 @@ module Asciidoctor
           node.attr("subtitle") and
             xml.title **{ type: "subtitle", language: lang,
                           format: "text/plain" } do |t|
-            t << asciidoc_sub(node.attr("subtitle"))
-          end
+              t << asciidoc_sub(node.attr("subtitle"))
+            end
         end
       end
 
@@ -74,19 +58,6 @@ module Asciidoctor
         xml.docnumber { |i| i << node.attr("docnumber") }
       end
 
-      def metadata_copyright(node, xml)
-        from = node.attr("copyright-year") || Date.today.year
-        xml.copyright do |c|
-          c.from from
-          c.owner do |owner|
-            owner.organization do |o|
-              o.name Metanorma::UN::ORGANIZATION_NAME_LONG
-              o.abbreviation Metanorma::UN::ORGANIZATION_NAME_SHORT
-            end
-          end
-        end
-      end
-
       def metadata_distribution(node, xml)
         xml.distribution node.attr("distribution") if node.attr("distribution")
       end
@@ -142,7 +113,7 @@ module Asciidoctor
       end
 
       def doctype(node)
-        d = node.attr("doctype")
+        d = super
         unless %w{plenary recommendation addendum communication corrigendum 
           reissue agenda budgetary sec-gen-notes expert-report resolution 
           plenary-attachment}.include? d
@@ -237,7 +208,7 @@ module Asciidoctor
 
       def admonition_attrs(node)
         attr_code(super.merge("unnumbered": node.option?("unnumbered"),
-          "subsequence": node.attr("subsequence")))
+                              "subsequence": node.attr("subsequence")))
       end
 
       def sectiontype_streamline(ret)

data/lib/asciidoctor/un/isodoc.rng

@@ -43,7 +43,9 @@
     <define name="xref">
       <element name="xref">
         <attribute name="target">
-          <data type="IDREF"/>
+          <data type="string">
+            <param name="pattern">\i\c*|\c+#\c+</param>
+          </data>
         </attribute>
         <optional>
           <attribute name="type">
@@ -61,6 +63,11 @@
             </choice>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="droploc">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <text/>
       </element>
     </define>
@@ -578,6 +585,8 @@
             <ref name="ol"/>
             <ref name="dl"/>
             <ref name="formula"/>
+            <ref name="quote"/>
+            <ref name="sourcecode"/>
           </choice>
         </oneOrMore>
       </element>
@@ -661,6 +670,16 @@
             </choice>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="valign">
+            <choice>
+              <value>top</value>
+              <value>middle</value>
+              <value>bottom</value>
+              <value>baseline</value>
+            </choice>
+          </attribute>
+        </optional>
         <choice>
           <zeroOrMore>
             <choice>
@@ -697,6 +716,16 @@
             </choice>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="valign">
+            <choice>
+              <value>top</value>
+              <value>middle</value>
+              <value>bottom</value>
+              <value>baseline</value>
+            </choice>
+          </attribute>
+        </optional>
         <choice>
           <zeroOrMore>
             <choice>
@@ -834,6 +863,13 @@
   </define>
   <define name="standard-document">
     <element name="standard-document">
+      <attribute name="version"/>
+      <attribute name="type">
+        <choice>
+          <value>semantic</value>
+          <value>presentation</value>
+        </choice>
+      </attribute>
       <ref name="bibdata"/>
       <optional>
         <ref name="boilerplate"/>
@@ -855,7 +891,7 @@
       <oneOrMore>
         <choice>
           <ref name="content"/>
-          <ref name="preface_abstract"/>
+          <ref name="abstract"/>
           <ref name="foreword"/>
           <ref name="introduction"/>
           <ref name="acknowledgements"/>
@@ -1049,14 +1085,17 @@
       <ref name="section-title"/>
     </optional>
     <group>
-      <group>
-        <zeroOrMore>
-          <ref name="BasicBlock"/>
-        </zeroOrMore>
-        <zeroOrMore>
-          <ref name="note"/>
-        </zeroOrMore>
-      </group>
+      <choice>
+        <group>
+          <zeroOrMore>
+            <ref name="BasicBlock"/>
+          </zeroOrMore>
+          <zeroOrMore>
+            <ref name="note"/>
+          </zeroOrMore>
+        </group>
+        <ref name="amend"/>
+      </choice>
       <zeroOrMore>
         <choice>
           <ref name="clause-subsection"/>
@@ -1453,11 +1492,6 @@
       </optional>
     </element>
   </define>
-  <define name="preface_abstract">
-    <element name="abstract">
-      <ref name="Basic-Section"/>
-    </element>
-  </define>
   <define name="term-clause">
     <element name="clause">
       <optional>
@@ -1507,4 +1541,79 @@
       <ref name="CitationType"/>
     </element>
   </define>
+  <define name="amend">
+    <element name="amend">
+      <optional>
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+      </optional>
+      <attribute name="change">
+        <choice>
+          <value>add</value>
+          <value>modify</value>
+          <value>delete</value>
+        </choice>
+      </attribute>
+      <optional>
+        <attribute name="path"/>
+      </optional>
+      <optional>
+        <attribute name="path_end"/>
+      </optional>
+      <optional>
+        <attribute name="title"/>
+      </optional>
+      <optional>
+        <element name="location">
+          <zeroOrMore>
+            <ref name="locality"/>
+          </zeroOrMore>
+        </element>
+      </optional>
+      <zeroOrMore>
+        <ref name="autonumber"/>
+      </zeroOrMore>
+      <optional>
+        <element name="description">
+          <zeroOrMore>
+            <ref name="BasicBlock"/>
+          </zeroOrMore>
+        </element>
+      </optional>
+      <optional>
+        <element name="newcontent">
+          <zeroOrMore>
+            <ref name="BasicBlock"/>
+          </zeroOrMore>
+        </element>
+      </optional>
+      <optional>
+        <element name="description">
+          <zeroOrMore>
+            <ref name="BasicBlock"/>
+          </zeroOrMore>
+        </element>
+      </optional>
+    </element>
+  </define>
+  <define name="autonumber">
+    <element name="autonumber">
+      <attribute name="type">
+        <choice>
+          <value>requirement</value>
+          <value>recommendation</value>
+          <value>permission</value>
+          <value>table</value>
+          <value>figure</value>
+          <value>admonition</value>
+          <value>formula</value>
+          <value>sourcecode</value>
+          <value>example</value>
+          <value>note</value>
+        </choice>
+      </attribute>
+      <text/>
+    </element>
+  </define>
 </grammar>

data/lib/asciidoctor/un/un.rng

@@ -340,6 +340,13 @@
   </define>
   <define name="un-standard">
     <element name="un-standard">
+      <attribute name="version"/>
+      <attribute name="type">
+        <choice>
+          <value>semantic</value>
+          <value>presentation</value>
+        </choice>
+      </attribute>
       <ref name="bibdata"/>
       <optional>
         <ref name="boilerplate"/>

data/lib/isodoc/un/html/html_unece_plenary_titlepage.html

@@ -42,8 +42,16 @@
 </div>
     </div>
 
+{% assign fn_refs = "" | split: ',' %}
+{% assign txt = "" %}
+{% for item in title_footnote %}
+{% assign txt = txt | append: "*" %}
+{% assign txtarr = txt | split: "," %}
+{% assign fn_refs = fn_refs | concat: txtarr %} 
+{% endfor %}
+
     <div class="coverpage-title">
-      <span class="title-first">{{ doctitle }}</span>
+      <span class="title-first">{{ doctitle }}{% if fn_refs.size > 0 %}<sup>{{ fn_refs | join: "," }}</sup>{% endif %} </span>
       <!--<span class="title-second">{{ docsubtitle }}</span>-->
     </div>
   </div>
@@ -69,6 +77,14 @@
 <div  class="coverpage-stage-block" >{{ revdate }}</div>
 {% endif %}
 
+{% if fn_refs.size > 0 %}
+<div class="title-footnote">   
+{% for item in title_footnote %}
+<p><sup>{{fn_refs[forloop.index0]}}</sup> {{ item }}</p>
+{% endfor %}
+</div>  
+{% endif %}
+
 <div class="info-section">
 <div class="copyright">
   <p class="year">

data/lib/isodoc/un/html/html_unece_titlepage.html

@@ -22,8 +22,17 @@
       <span class="docyear">{{ draftinfo }}</span>
     </div>
 
+
+{% assign fn_refs = "" | split: ',' %}
+{% assign txt = "" %}
+{% for item in title_footnote %}
+{% assign txt = txt | append: "*" %}
+{% assign txtarr = txt | split: "," %}
+{% assign fn_refs = fn_refs | concat: txtarr %}
+{% endfor %}
+
     <div class="coverpage-title">
-      <span class="title-first">{{ doctitle }}</span>
+      <span class="title-first">{{ doctitle }}{% if fn_refs.size > 0 %}<sup>{{ fn_refs | join: "," }}</sup>{% endif %} </span>
       <!--<span class="title-second">{{ docsubtitle }}</span>-->
     </div>
   </div>
@@ -57,6 +66,16 @@
 <div  class="coverpage-stage-block" >{{ revdate }}</div>
 {% endif %}
 
+{% if fn_refs.size > 0 %}
+<div class="title-footnote">
+{% for item in title_footnote %}
+<p><sup>{{fn_refs[forloop.index0]}}</sup> {{ item }}</p>
+{% endfor %}
+</div>
+{% endif %}
+
+
+
 <div class="info-section">
 <div class="copyright">
   <p class="year">

data/lib/isodoc/un/html/htmlstyle.css

@@ -16,7 +16,7 @@ fieldset, form, label, legend,
 table, caption, tbody, tfoot, thead, tr, th, td,
 article, aside, canvas, details, embed,
 figure, figcaption, footer, header, hgroup,
-menu, nav, output, ruby, section, summary,
+menu, output, ruby, section, summary,
 time, mark, audio, video {
   margin: 0;
   padding: 0; }
@@ -920,6 +920,9 @@ h2 p {
   padding: 0 2em 0 3em;
   text-align: center; }
 
+.title-footnote {
+  text-align: left; }
+
 .info-section {
   padding: 0 2em; }