metanorma-unece 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1884c00a1f3cdb5626d42140dbaf0cc1eba0b94a0b55326fcb61299d748670a5
-  data.tar.gz: 206c2ff4bd76b1737832bd33d5faefeca07fbaa9e3aeb2ee0da9cdda344c0aef
+  metadata.gz: 86e4d49b216c7cf8ee9315034243132870f6c4932257128c8eb3c752ad5a87f5
+  data.tar.gz: 92c478095f75b798443b4bd1b2317e2f5492e01b732d2b2d94f7fdc174f1bc63
 SHA512:
-  metadata.gz: 0b4bced04b985dbe955927b45a46e0d552a7f4197b8346868e44f058ea04773c3bed8ab504f313ed54a5906253a07ec16cbd13e873dfbf47b0ce70281fc2918c
-  data.tar.gz: cb3a319050a40edc80909a93eff0d3a7f59aac5e1d94e7f5e0e24381ef13e717486e3d3d45a77befdf987c9434ccbcfadcc47d522fe33681aefb654e5a88a961
+  metadata.gz: 490b142dcfd116a872c4f28139b8bd267e576705ba09457148667367053e7b0cd0d5be1dd6f3f7ce7db87326a7883cbb684e8572eaaf0823626ad073b34b88c0
+  data.tar.gz: '08e69ccc41508b7ef6495dbbfa6cd17fba5fd2ee826459fc52f2a5e4e135d9ff29b89f94a97a6399b79aa52a66dc46b83e2603fe38251a9fce5cc1fa883f40f4'

data/README.adoc

@@ -146,7 +146,8 @@ tables etc, and automatically generating references and citations.
 === Common attributes
 
 The gem relies on Asciidoctor document attributes to provide necessary
-metadata about the document. These include:
+metadata about the document. The https://github.com/riboseinc/metanorma-standoc[metanorma-standoc]
+gem documents the Asciidoctor document attributes common to all metanorma gems. These include:
 
 `:edition:`:: The document edition
 
@@ -166,6 +167,15 @@ document identifier. The permitted types for UNECE are:
 --
 recommendation:: UNECE Recommendation
 plenary:: UNECE Plenary document
+addendum:: Addendum
+communication:: Communication
+corrigendum:: Corrigendum
+reissue:: Reissue (of something)
+agenda:: Documents relating to agendas of principal organs
+budgetary:: Documents relating to programme budget implications
+sec-gen-notes:: Notes by the Secretary-General
+expert-report:: Reports of intergovernmental and expert bodies
+resolution:: Resolutions and other formal decisions of United Nations organs
 --
 
 `:status:``:: The document status. The permitted types are: `proposal`,
@@ -203,21 +213,14 @@ these are otherwise suppressed.
 `:distribution:`:: Extent of distribution allowed. e.g. `General`
 
 [[model_additions]]
-== Asciidoctor model additions
+== Asciidoctor features specific to CSAND
 
-Refer also to https://github.com/riboseinc/metanorma-standoc/blob/master/README.adoc; this section lists additions specific only to metanorma-unece
+The https://github.com/riboseinc/metanorma-standoc[metanorma-standoc]
+gem documents the customisations of Asciidoctor markup common to all metanorma gems.
+The following markup is specific to this gem:
 
 === Abstract
 
-A clause is recognised as an abstract if it is prefixed with the `[abstract]` style attribute:
-
-[source,asciidoctor]
---
-[abstract]
-== Summary
-In 2017, the World Economic Forum approached UN/CEFACT in order to create a guide on Paperless Trade which might help countries to understand and implement specific provisions of the World Trade Organization?~@~Ys Trade Facilitation Agreement, specifically article 10 on Formalities connected with importation and exportation (10.2, 10.3 and 10.4) as well as article 7 on Release and clearance of goods (7.1 and 7.2).
---
-
 Abstracts are moved to the front page in plenary documents. In recommendation documents, they appear in the document preface, before the foreword and introduction.
 
 === Paragraph numbering

data/lib/asciidoctor/unece/converter.rb

@@ -115,7 +115,8 @@ module Asciidoctor
 
       def doctype(node)
         d = node.attr("doctype")
-        unless %w{plenary recommendation}.include? d
+        unless %w{plenary recommendation addendum communication corrigendum reissue
+          agenda budgetary sec-gen-notes expert-report resolution}.include? d
           warn "#{d} is not a legal document type: reverting to 'recommendation'"
           d = "recommendation"
         end

data/lib/asciidoctor/unece/isostandard.rng

@@ -744,6 +744,9 @@
     </define>
     <define name="preface">
       <element name="preface">
+        <optional>
+          <ref name="preface_abstract"/>
+        </optional>
         <ref name="foreword"/>
         <optional>
           <ref name="introduction"/>
@@ -811,6 +814,11 @@
       </optional>
     </element>
   </define>
+  <define name="preface_abstract">
+    <element name="abstract">
+      <ref name="Basic-Section"/>
+    </element>
+  </define>
   <define name="foreword">
     <element name="foreword">
       <ref name="Basic-Section"/>

data/lib/asciidoctor/unece/unece.rng

@@ -138,6 +138,15 @@
       <choice>
         <value>recommendation</value>
         <value>plenary</value>
+        <value>addendum</value>
+        <value>communication</value>
+        <value>corrigendum</value>
+        <value>reissue</value>
+        <value>agenda</value>
+        <value>budgetary</value>
+        <value>sec-gen-notes</value>
+        <value>expert-report</value>
+        <value>resolution</value>
       </choice>
     </define>
     <define name="editorialgroup">

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

@@ -45,7 +45,7 @@
   </div>
 
   <div class="coverpage-stage-block" >
-    <p><span class="coverpage-maturity" id="{{ status | replace: ' ', '-' | downcase }}">{{ status }}</span></p>
+    <p><span class="coverpage-maturity" id="{{ status | replace: ' ', '-' | downcase }}">{% if unpublished %}{{ status }}{% endif %}</span></p>
 {% if security %}
 <p><span class="coverpage-maturity">Classification: {{ security }}</span></p>
 {% endif %}
@@ -55,7 +55,7 @@
 <div  class="coverpage-stage-block" >{{ revdate }}</div>
 {% endif %}
 
-{% if status != "Published" and status != "Withdrawn" %}
+{% if unpublished %}
   <div class="coverpage-warning">
     <span class="title">Warning for Drafts</span>
 

data/lib/isodoc/unece/metadata.rb

@@ -54,6 +54,10 @@ module IsoDoc
         end
       end
 
+      def unpublished(status)
+        %w(published withdrawn).include? status.downcase
+      end
+
       def version(isoxml, _out)
         super
         revdate = get[:revdate]

data/lib/metanorma/unece/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Unece
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-unece
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-19 00:00:00.000000000 Z
+date: 2018-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor