metanorma-unece 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86e4d49b216c7cf8ee9315034243132870f6c4932257128c8eb3c752ad5a87f5
-  data.tar.gz: 92c478095f75b798443b4bd1b2317e2f5492e01b732d2b2d94f7fdc174f1bc63
+  metadata.gz: 93cd4ceeaf6825b20fc2292bdf21d4b1303c6beb7fdc15752130cda11f9e1bf6
+  data.tar.gz: ed0519860a0f996f436a3c40236ab6dc4040b303789467cb88482b24e1e4bd6e
 SHA512:
-  metadata.gz: 490b142dcfd116a872c4f28139b8bd267e576705ba09457148667367053e7b0cd0d5be1dd6f3f7ce7db87326a7883cbb684e8572eaaf0823626ad073b34b88c0
-  data.tar.gz: '08e69ccc41508b7ef6495dbbfa6cd17fba5fd2ee826459fc52f2a5e4e135d9ff29b89f94a97a6399b79aa52a66dc46b83e2603fe38251a9fce5cc1fa883f40f4'
+  metadata.gz: add90ed90dc0ab5745d6ac986c54d090b8929e914db6733601c3becb1e214f372347efa48295d941e07dc9ef8f71bd724d4830f4485bd084b59ca1f81ad7d34a
+  data.tar.gz: fb9137b591878903fb3618e5abd852da8cd4ba8227b58f62397675fd5cceddd12a1d2e47472d487a99449073c98ad8c094a2424b38c538538bddde7c02bf1f39

data/README.adoc

@@ -185,8 +185,11 @@ resolution:: Resolutions and other formal decisions of United Nations organs
 `:committee:`:: The name of the relevant UNECE committee, for example,
   `United Nations Centre for Trade Facilitation and Electronic Business (UN/CEFACT)` (mandatory)
 
-`:language:` :: The language of the document (only `en` for now)  (mandatory)
-`:script:` :: The language of the document (only `Latn` for now)  (mandatory)
+`:language:` :: The language(s) of the document. This is the language in which the document
+has been issued, not the language(s) in which it has been submitted. ISO-639-1 codes are used
+for languages, and they are comma-delimited. If not specified, the six official languages of the
+UN are assumed: Arabic, Chinese, English, French, Russian and Spanish (`ar,zh,en,fr,ru,es`).
+`:script:` :: The script of the document
 
 `:toc:` :: Include table of contents in Word output. (Table of contents is always included in
 HTML output.)
@@ -194,23 +197,31 @@ HTML output.)
 NOTE: The attribute `:draft:`, if present, includes review notes in the XML output;
 these are otherwise suppressed.
 
+=== UN document-specific attributes
+
+`:distribution:`:: Extent of distribution allowed. e.g. `General`
 
 === Recommendation specific attributes
 
 `:docnumber:`:: The document number if the document is a Recommendation. e.g. `42` for Recommendation 42, which happens to be the ultimate answer. (mandatory for Recommendation)
 
+`:submissionlanguage:`:: The language(s) in which the document was originally submitted.
+ISO-639-1 codes are used for languages, and they are comma-delimited. 
 
 === Plenary document specific attributes
 
 `:session-date:`:: Date of the session where this document will be discussed. e.g. `Geneva, 30 April – 1 May 2018`
 
-`:agenda-item:`:: Number of the agenda item this document belongs to. e.g. `Item 6 of the provisional agenda`
+`:item-number:`:: Number of the agenda item this document belongs to. e.g. `Item 6 of the provisional agenda`. If the document corresponds to multiple items, they are comma-delimited. If the document belongs to multiple subitems under a single item, following editorial practice of the UN (http://dd.dgacm.org/editorialmanual/ed-guidelines/format/Model_mast21.pdf), give the item and subitems identifiers here.
+
+`:item-name:`:: Name of the agenda item this document belongs to. If the document corresponds to multiple items, they are comma-delimited. 
+`:subitem-name:`:: Name of the agenda subitem this document belongs to. If the document corresponds to multiple subitems, they are comma-delimited. 
 
 `:collaborator:`:: Collaborator of this document, if any. e.g. `World Economic Forum`
 
-`:agenda-id:`:: The unique ID number of this agenda item. e.g. `ECE/TRADE/C/CEFACT/2018/6`
+`:agenda-id:`:: The unique identifier of this agenda item. e.g. `ECE/TRADE/C/CEFACT/2018/6`. If there are multiple agenda items or subitems, given them comma-delimited.
 
-`:distribution:`:: Extent of distribution allowed. e.g. `General`
+`:item-footnote:`:: Footnoted reference to item, if item is on the preliminary list or the provisional agenda.
 
 [[model_additions]]
 == Asciidoctor features specific to CSAND

data/lib/asciidoctor/unece/converter.rb

@@ -80,19 +80,33 @@ module Asciidoctor
         end
       end
 
+      def metadata_distribution(node, xml)
+          xml.distribution node.attr("distribution") if node.attr("distribution")
+      end
+
       def metadata_session(node, xml)
         xml.session do |session|
           session.number node.attr("session") if node.attr("session")
           session.date node.attr("session-date") if node.attr("session-date")
-          session.agenda_item node.attr("agenda-item") if node.attr("agenda-item")
+          node&.attr("item-number")&.split(/,[ ]*/)&.each { |i| session.item_number i }
+          node&.attr("item-name")&.split(/,[ ]*/)&.each { |i| session.item_name i }
+          node&.attr("subitem-name")&.split(/,[ ]*/)&.each { |i| session.subitem_name i }
           session.collaborator node.attr("collaborator") if node.attr("collaborator")
           session.id node.attr("agenda-id") if node.attr("agenda-id")
-          session.distribution node.attr("distribution") if node.attr("distribution")
+          session.item_footnote node.attr("item-footnote") if node.attr("item-footnote")
         end
       end
 
+      def metadata_language(node, xml)
+        languages = node&.attr("language")&.split(/,[ ]*/) || %w(ar ru en fr zh es)
+        languages.each { |l| xml.language l }
+        languages = node&.attr("submissionlanguage")&.split(/,[ ]*/) || []
+        languages.each { |l| xml.submissionlanguage l }
+      end
+
       def metadata(node, xml)
         super
+        metadata_distribution(node, xml)
         metadata_session(node, xml)
       end
 
@@ -144,15 +158,6 @@ module Asciidoctor
                         File.join(File.dirname(__FILE__), "unece.rng"))
       end
 
-      def literal(node)
-        noko do |xml|
-          xml.figure **id_attr(node) do |f|
-            figure_title(node, f)
-            f.pre node.lines.join("\n")
-          end
-        end
-      end
-
       def style(n, t)
         return
       end
@@ -173,29 +178,6 @@ module Asciidoctor
         IsoDoc::Unece::WordConvert.new(doc_extract_attributes(node))
       end
 
-      def inline_quoted(node)
-        noko do |xml|
-          case node.type
-          when :emphasis then xml.em node.text
-          when :strong then xml.strong node.text
-          when :monospaced then xml.tt node.text
-          when :double then xml << "\"#{node.text}\""
-          when :single then xml << "'#{node.text}'"
-          when :superscript then xml.sup node.text
-          when :subscript then xml.sub node.text
-          when :asciimath then stem_parse(node.text, xml)
-          else
-            case node.role
-            when "strike" then xml.strike node.text
-            when "smallcap" then xml.smallcap node.text
-            when "keyword" then xml.keyword node.text
-            else
-              xml << node.text
-            end
-          end
-        end.join
-      end
-
       def sections_cleanup(xmldoc)
         super
         xmldoc.xpath("//clause/p | //annex/p").each do |p|

data/lib/asciidoctor/unece/isodoc.rng

@@ -384,6 +384,7 @@
       <ref name="sourcecode"/>
       <ref name="example"/>
       <ref name="review"/>
+      <ref name="pre"/>
     </choice>
   </define>
   <define name="paragraph">
@@ -540,6 +541,20 @@
       </zeroOrMore>
     </element>
   </define>
+  <define name="pre">
+    <element name="pre">
+      <attribute name="id">
+        <data type="ID"/>
+      </attribute>
+      <optional>
+        <ref name="tname"/>
+      </optional>
+      <text/>
+      <zeroOrMore>
+        <ref name="note"/>
+      </zeroOrMore>
+    </element>
+  </define>
   <define name="table">
     <element name="table">
       <attribute name="id">
@@ -710,6 +725,7 @@
       </optional>
       <choice>
         <ref name="image"/>
+        <ref name="pre"/>
         <zeroOrMore>
           <ref name="figure"/>
         </zeroOrMore>
@@ -735,6 +751,7 @@
       <ref name="sub"/>
       <ref name="sup"/>
       <ref name="tt"/>
+      <ref name="keyword"/>
       <ref name="strike"/>
       <ref name="smallcap"/>
       <ref name="xref"/>
@@ -765,6 +782,11 @@
       <text/>
     </element>
   </define>
+  <define name="keyword">
+    <element name="keyword">
+      <text/>
+    </element>
+  </define>
   <define name="sub">
     <element name="sub">
       <text/>

data/lib/asciidoctor/unece/unece.rng

@@ -199,6 +199,9 @@
       <zeroOrMore>
         <ref name="language"/>
       </zeroOrMore>
+      <zeroOrMore>
+        <ref name="submissionlanguage"/>
+      </zeroOrMore>
       <zeroOrMore>
         <ref name="script"/>
       </zeroOrMore>
@@ -216,6 +219,12 @@
       <zeroOrMore>
         <ref name="ics"/>
       </zeroOrMore>
+      <optional>
+        <ref name="distribution"/>
+      </optional>
+      <optional>
+        <ref name="session"/>
+      </optional>
     </define>
     <define name="preface">
       <element name="preface">
@@ -236,11 +245,93 @@
       </element>
     </define>
   </include>
+  <define name="session">
+    <element name="session">
+      <optional>
+        <ref name="session-number"/>
+      </optional>
+      <optional>
+        <ref name="session-date"/>
+      </optional>
+      <zeroOrMore>
+        <ref name="item-number"/>
+      </zeroOrMore>
+      <zeroOrMore>
+        <ref name="item-name"/>
+      </zeroOrMore>
+      <zeroOrMore>
+        <ref name="subitem-name"/>
+      </zeroOrMore>
+      <optional>
+        <ref name="collaborator"/>
+      </optional>
+      <optional>
+        <ref name="agenda-id"/>
+      </optional>
+      <optional>
+        <ref name="item-footnote"/>
+      </optional>
+    </element>
+  </define>
   <define name="committee">
     <element name="committee">
       <text/>
     </element>
   </define>
+  <define name="session-number">
+    <element name="number">
+      <text/>
+    </element>
+  </define>
+  <define name="session-date">
+    <element name="session-date">
+      <data type="date"/>
+    </element>
+  </define>
+  <define name="item-number">
+    <element name="item-number">
+      <text/>
+    </element>
+  </define>
+  <define name="collaborator">
+    <element name="collaborator">
+      <text/>
+    </element>
+  </define>
+  <define name="agenda-id">
+    <element name="agenda-id">
+      <text/>
+    </element>
+  </define>
+  <define name="item-name">
+    <element name="item-name">
+      <text/>
+    </element>
+  </define>
+  <define name="subitem-name">
+    <element name="subitem-name">
+      <text/>
+    </element>
+  </define>
+  <define name="item-footnote">
+    <element name="item-footnote">
+      <text/>
+    </element>
+  </define>
+  <define name="submissionlanguage">
+    <element name="submissionlanguage">
+      <text/>
+    </element>
+  </define>
+  <define name="distribution">
+    <element name="distribution">
+      <choice>
+        <value>general</value>
+        <value>limited</value>
+        <value>restricted</value>
+      </choice>
+    </element>
+  </define>
   <define name="unece-standard">
     <element name="unece-standard">
       <ref name="bibdata"/>

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

@@ -0,0 +1,133 @@
+<div class="document-stage-band" id='{{ status | downcase | replace: " ", "-" }}-band'>
+    <p class="document-stage">{{ status }}</p>
+</div>
+
+<div class="document-type-band" id='{{ doctype | downcase | replace: " ", "-" }}-band'>
+    <p class="document-type">UNECE {{ doctype }}</p>
+</div>
+
+
+
+  <div id='toggle'> <span>&#x2022;</span> </div>
+
+  <header>
+
+<!--<div class="WordSection1">-->
+  <div class="coverpage">
+    <div class="wrapper-top">
+
+  <div class="coverpage-doc-identity">
+    <div class="doc-number">
+      <span class="docnumber">{{ formatted_docnumber }}</span>
+      <span class="docyear">{{ draftinfo }}</span>
+    </div>
+
+    <div class="doc-number">
+      <p>{{ session_number }} session</p>
+      <p>{{ session_date }}</p>
+{% if session_itemnumber.size == 1 %}
+<p>Agenda item {{ session_itemnumber[0] }}</p>
+{% endif %}
+{% if session_itemnumber.size > 1 %}
+<p>Agenda items {{ session_itemnumber | join: ", " }}</p>
+{% endif %}
+<p>{{ docnumber }}{% if item_footnote %}[{{item_footnote}}]{% endif %}
+{% if session_itemname.size > 0 %}
+<p> {{ session_itemname | join: "<br/>" }}</p>
+{% endif %}
+{% if session_subitemname.size > 0 %}
+<p>{{ session_subitemname | join: "<br/>" }}</p>
+{% endif %}
+</div>
+    </div>
+
+    <div class="coverpage-title">
+      <span class="title-first">{{ doctitle }}</span>
+      <!--<span class="title-second">{{ docsubtitle }}</span>-->
+    </div>
+  </div>
+
+  <div class="coverpage-logo">
+    <span>UNECE {{ docyear }}</span>
+  </div>
+
+  <div class="coverpage-tc-name">
+    <span>{{ tc }}</span>
+  </div>
+  </div>
+
+    <div class="wrapper-top-bottom"></div>
+
+  <div class="WordSection11">
+  <div class="coverpage-stage-block" >
+    <span class="coverpage-stage" id="{{ doctype | replace: ' ', '-' | downcase }}">UNECE {{ doctype }}</span>
+  </div>
+
+  <div class="coverpage-stage-block" >
+    <p><span class="coverpage-maturity" id="{{ status | replace: ' ', '-' | downcase }}">{% if unpublished %}{{ status }}{% endif %}</span></p>
+{% if submissionlanguage %}
+<p><span class="coverpage-maturity">Original: {{ submissionlanguage | join: "/" }}</span></p>
+{% endif %}
+{% if language %}
+<p><span class="coverpage-maturity">{{ language | join: ", " }} only</span></p>
+{% endif %}
+</div>
+
+{% if doctype == "Policy And Procedures" or doctype == "Proposal" %}
+<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="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>
+</div>
+
+<div class="rule"></div>
+</div>
+  </div>
+
+
+</header>