metanorma-un 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb4cec32f898b0e8fb67d94c1757eaf4336fdc76553559d8d3bd605f8ae35765
-  data.tar.gz: 1070671f7c2e81f7fc61462390129b01dfd31cf64fb17bd69974e94c72fbb9b2
+  metadata.gz: 19c3f9c7ce6ea98f5bf53a78c196245f689cf3dda1aaced7caeb708302198f3d
+  data.tar.gz: 74545edd7c80ae129866df3a06e9944e230bd6e72d78517a213d774761cd1e01
 SHA512:
-  metadata.gz: 1d433580329fcb1c9982107b7fa02f1301ffd4477dbda664c07f93ee0e108b95fadec720b755064f5d08fff14c8421c3f8686e7f4a66d476e9e86b80dd178b8c
-  data.tar.gz: aec0d9d71e583d8a92bf32074418bd7240812efb6f220177638847eb8eb083412f66946db5b05d4b31ebaa25604c08dcaf7dcb57dc142c215e25b2161eb5f6c2
+  metadata.gz: 6684a220b9cc0820a8fd6a55fe747cfa4975109bb27168115c39822b443bfee112778c81d9261ed9f79e1fcfaae021ee1b667a31a0b34428f4a698d66f3cd536
+  data.tar.gz: 948b8e07d434eace1e34762b52e5b735861f8107f2c4df259e551077b362054cb5fce4cc80fe7b8fcd3ea2b70c13cb168218c6349a224053fe4f354230803098

data/.github/workflows/macos.yml

@@ -1,12 +1,11 @@
-# Auto-generated !!! Do not edit it manually
-# use ci-master https://github.com/metanorma/metanorma-build-scripts
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
 name: macos
 
 on:
   push:
     branches: [ master ]
   pull_request:
-    branches: [ '**' ]
 
 jobs:
   test-macos:

data/.github/workflows/ubuntu.yml

@@ -1,12 +1,11 @@
-# Auto-generated !!! Do not edit it manually
-# use ci-master https://github.com/metanorma/metanorma-build-scripts
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
 name: ubuntu
 
 on:
   push:
     branches: [ master ]
   pull_request:
-    branches: [ '**' ]
 
 jobs:
   test-linux:
@@ -25,7 +24,7 @@ jobs:
           architecture: 'x64'
       - name: Update gems
         run: |
-          gem install bundler 
+          gem install bundler
           bundle install --jobs 4 --retry 3
       - name: Use Node
         uses: actions/setup-node@v1
@@ -37,3 +36,15 @@ jobs:
       - name: Run specs
         run: |
           bundle exec rake
+      - name: Trigger dependent repositories
+        if: github.ref == 'refs/heads/master'
+        env:
+          GH_USERNAME: ${{ secrets.PAT_USERNAME }}
+          GH_ACCESS_TOKEN: ${{ secrets.PAT_TOKEN }}
+        run: |
+          curl -LO --retry 3 https://raw.githubusercontent.com/metanorma/metanorma-build-scripts/master/trigger-gh-actions.sh
+          [[ -f ".github/workflows/dependent_repos.env" ]] && source .github/workflows/dependent_repos.env
+          for repo in $DEPENDENT_REPOS
+          do
+            sh trigger-gh-actions.sh $ORGANISATION $repo $GH_USERNAME $GH_ACCESS_TOKEN $GITHUB_REPOSITORY
+          done

data/.github/workflows/windows.yml

@@ -1,12 +1,11 @@
-# Auto-generated !!! Do not edit it manually
-# use ci-master https://github.com/metanorma/metanorma-build-scripts
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
 name: windows
 
 on:
   push:
     branches: [ master ]
   pull_request:
-    branches: [ '**' ]
 
 jobs:
   test-windows:
@@ -26,7 +25,7 @@ jobs:
       - name: Update gems
         shell: pwsh
         run: |
-          gem install bundler 
+          gem install bundler
           bundle config --local path vendor/bundle
           bundle update
           bundle install --jobs 4 --retry 3

data/README.adoc

@@ -2,11 +2,11 @@
 
 (Formerly known as metanorma-unece)
 
-https://github.com/metanorma/metanorma-un[metanorma-un] image:https://img.shields.io/gem/v/metanorma-un.svg["Gem Version", link="https://rubygems.org/gems/metanorma-un"]::
+image:https://img.shields.io/gem/v/metanorma-un.svg["Gem Version", link="https://rubygems.org/gems/metanorma-un"]::
 image:https://github.com/metanorma/metanorma-un/workflows/macos/badge.svg["Build Status (macOS)", link="https://github.com/metanorma/metanorma-un/actions?workflow=macos"]
 image:https://github.com/metanorma/metanorma-un/workflows/windows/badge.svg["Build Status (Windows)", link="https://github.com/metanorma/metanorma-un/actions?workflow=windows"]
 image:https://github.com/metanorma/metanorma-un/workflows/ubuntu/badge.svg["Build Status (Ubuntu)", link="https://github.com/metanorma/metanorma-un/actions?workflow=ubuntu"]
-image:https://codeclimate.com/github/metanorma/metanorma-un/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/metanorma/metanorma-un"]
+image:https://codeclimate.com/github/metanorma/metanorma-unece/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/metanorma/metanorma-unece"]
 image:https://img.shields.io/github/issues-pr-raw/metanorma/metanorma-un.svg["Pull Requests", link="https://github.com/metanorma/metanorma-un/pulls"]
 image:https://img.shields.io/github/commits-since/metanorma/metanorma-un/latest.svg["Commits since latest",link="https://github.com/metanorma/metanorma-un/releases"]
 

data/lib/asciidoctor/un/biblio.rng

@@ -703,21 +703,11 @@
   </define>
   <define name="TypedTitleString">
     <optional>
-      <attribute name="type">
-        <ref name="TitleType"/>
-      </attribute>
+      <attribute name="type"/>
     </optional>
     <ref name="FormattedString"/>
   </define>
-  <define name="TitleType">
-    <choice>
-      <value>alternative</value>
-      <value>original</value>
-      <value>unofficial</value>
-      <value>subtitle</value>
-      <value>main</value>
-    </choice>
-  </define>
+  <!-- TitleType = ( "alternative" | "original" | "unofficial" | "subtitle" | "main" ) -->
   <define name="TypedUri">
     <optional>
       <attribute name="type"/>

data/lib/asciidoctor/un/boilerplate.xml

@@ -30,7 +30,7 @@
 
       {% 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>
+        <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>

data/lib/asciidoctor/un/converter.rb

@@ -52,7 +52,7 @@ module Asciidoctor
       def title(node, xml)
         ["en"].each do |lang|
           xml.title **{ type: "main", language: lang, format: "text/plain" } do |t|
-            t << Asciidoctor::Standoc::Utils::asciidoc_sub(node.attr("title"))
+            t << Asciidoctor::Standoc::Utils::asciidoc_sub(node.attr("title") || node.title)
           end
           node.attr("subtitle") and
             xml.title **{ type: "subtitle", language: lang, format: "text/plain" } do |t|
@@ -149,7 +149,7 @@ module Asciidoctor
           word_converter(node).convert filename unless node.attr("nodoc")
           pdf_converter(node).convert filename unless node.attr("nodoc")
         end
-        @log.write(@filename + ".err") unless @novalid
+        @log.write(@localdir + @filename + ".err") unless @novalid
         @files_to_delete.each { |f| FileUtils.rm f }
         ret
       end

data/lib/asciidoctor/un/isodoc.rng

@@ -101,9 +101,7 @@
         <ref name="structuredidentifier"/>
       </zeroOrMore>
     </define>
-    <define name="TitleType">
-      <text/>
-    </define>
+    <!-- TitleType = text -->
     <define name="sections">
       <element name="sections">
         <oneOrMore>

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

@@ -16,12 +16,13 @@
   <div class="coverpage">
     <div class="wrapper-top">
 
+  <div class="coverpage-logo">
+    <span>UNECE {{ docyear }}</span>
+  </div>
+  <div class="coverpage-tc-name">
+    <span>{{ tc }}</span>
+  </div>
   <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>
@@ -46,18 +47,9 @@
       <!--<span class="title-second">{{ docsubtitle }}</span>-->
     </div>
   </div>
-
-  <div class="coverpage-logo">
-    <span>UNECE {{ docyear }}</span>
+  <div class="wrapper-top-bottom"></div>
   </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>

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

@@ -36,8 +36,7 @@
     <span>{{ tc }}</span>
   </div>
   </div>
-
-    <div class="wrapper-top-bottom"></div>
+  <div class="wrapper-top-bottom"></div>
 
   <div class="WordSection11">
   <div class="coverpage-stage-block" >

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

@@ -33,6 +33,30 @@ $un-text: #333;
 /* RT: I made this up */
 $un-link: #00ADEF;
 
+$un-background: #9abd48;
+
+$un-guide: #48a0e7;
+
+$un-toc: #1661ad;
+
+$un-governence: #750697;
+
+$un-working-draft: #f7803c;
+
+$un-comitee-draft: #fd06fd;
+
+$un-draft-standard: #fdf906;
+
+$un-obsolete: #7e0d13;
+
+$un-note: #fff495;
+
+$un-admonition-back: #ffcccc;
+
+$un-admonition-color: #47430c;
+
+$un-toc-active: #4d7ea5;
+
 body {
   @include bodyStyle1(15px, 1.4em, $un-text, #ffffff, 300);
   font-weight: 400;
@@ -51,7 +75,7 @@ p {
 */
 
 #toc {
-  @include toc($un-text, #1661AD, $un-text);
+  @include toc($un-text, $un-toc, $un-text);
   @include sidebarToc();
 
   .toc-active a {
@@ -88,24 +112,24 @@ nav {
 
 @media screen and (min-width: 768px) {
   .container {
-      padding-left: 360px;
+    padding-left: 360px;
   }
 
   .rule.toc {
-      display: none;
+    display: none;
   }
 
   h1.toc-contents {
-      margin-top: 1em;
+    margin-top: 1em;
   }
 
   ul#toc-list {
-      padding:0;
-      margin:0;
+    margin: 0;
+    padding: 0;
   }
 }
 
-div.figure {
+.figure {
   @include figureBlock();
 }
 
@@ -120,10 +144,16 @@ div.figure {
 .document-stage-band {
   @include docBand(1, 150);
 }
-.document-stage-band > :first-child {
+
+.document-stage-band> :first-child {
   font-weight: 300;
 }
 
+div.document-stage-band,
+div.document-type-band {
+  background-color: $un-background;
+}
+
 p.document-type,
 p.document-stage {
   @include docBandTitle(150);
@@ -148,30 +178,30 @@ p.document-stage {
 
 #standard-band,
 #published-band {
-  background-color: #9ABD48;
+  background-color: $un-background;
 }
 
 #standard,
 #published {
-  border-bottom: solid 3px #9ABD48;
+  border-bottom: solid 3px $un-background;
 }
 
 #governance,
 #policy-and-procedures {
-  border-bottom: solid 3px #750697;
+  border-bottom: solid 3px $un-governence;
 }
 
 #governance-band,
 #policy-and-procedures-band {
-  background-color: #750697;
+  background-color: $un-governence;
 }
 
 #guide {
-  border-bottom: solid 3px #48a0e7;
+  border-bottom: solid 3px $un-guide;
 }
 
 #guide-band {
-  background-color: #48a0e7;
+  background-color: $un-guide;
 }
 
 .coverpage-maturity {
@@ -180,44 +210,44 @@ p.document-stage {
 
 #working-draft,
 #proposal {
-  border-bottom: solid 3px #F7803C;
+  border-bottom: solid 3px $un-working-draft;
 }
 
 #working-draft-band,
 #proposal-band {
-  background-color: #F7803C;
+  background-color: $un-working-draft;
 }
 
 #committee-draft {
-  border-bottom: solid 3px #fd06fd;
+  border-bottom: solid 3px $un-comitee-draft;
 }
 
 #committee-draft-band {
-  background-color: #fd06fd;
+  background-color: $un-comitee-draft;
 }
 
 #draft-standard {
-  border-bottom: solid 3px #fdf906;
+  border-bottom: solid 3px $un-draft-standard;
 }
 
 #draft-standard-band {
-  background-color: #fdf906;
+  background-color: $un-draft-standard;
 }
 
 #standard {
-  border-bottom: solid 3px #9ABD48;
+  border-bottom: solid 3px $un-background;
 }
 
 #standard-band {
-  background-color: #9ABD48;
+  background-color: $un-background;
 }
 
 #obsolete {
-  border-bottom: solid 3px #7e0d13;
+  border-bottom: solid 3px $un-obsolete;
 }
 
 #obsolete-band {
-  background-color: #7e0d13;
+  background-color: $un-obsolete;
 }
 
 /*
@@ -228,7 +258,13 @@ p.document-stage {
     3.1 Titles
 */
 
-h1, h2, h3, h4, h5, h6, .h2Annex {
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+.h2Annex {
   font-family: $headerfont;
   color: $un-blue;
   font-weight: 700;
@@ -237,7 +273,9 @@ h1, h2, h3, h4, h5, h6, .h2Annex {
   margin-bottom: 0.3em;
 }
 
-h1, h2, h3 {
+h1,
+h2,
+h3 {
   margin-top: 18px;
   margin-bottom: 9px;
 }
@@ -259,7 +297,7 @@ h2 {
 h3 {
   font-size: 24px;
   margin-top: 26px;
-  color: black;
+  color: $un-black;
 }
 
 h4 {
@@ -271,7 +309,7 @@ h4 {
 
 h5 {
   font-size: 16.25px;
-  color: black;
+  color: $un-black;
   margin-bottom: 2px;
 }
 
@@ -304,28 +342,30 @@ h6 {
     font-weight: 100;
   }*/
 
-  .TermNum, .Terms, .AltTerms {
-    color: $un-blue;
-    font-weight: 100;
-  }
+.TermNum,
+.Terms,
+.AltTerms {
+  color: $un-blue;
+  font-weight: 100;
+}
 
-  h2.TermNum {
-    margin-bottom: 0;
-  }
+h2.TermNum {
+  margin-bottom: 0;
+}
 
-  p.Terms {
-    font-size: 1.1em;
-    line-height: 1.5em;
-    margin: 0;
-  }
+p.Terms {
+  font-size: 1.1em;
+  line-height: 1.5em;
+  margin: 0;
+}
 
-  p.AltTerms {
-    /*
+p.AltTerms {
+  /*
     font-style: italic;
      */
-    font-size: 1.1em;
-    margin: 0;
-  }
+  font-size: 1.1em;
+  margin: 0;
+}
 
 /*
     3.2 Links
@@ -337,15 +377,16 @@ h6 {
     3.3 Lists
 */
 
-ul, ol {
+ul,
+ol {
   margin-left: 1.2em;
 }
 
-ul > li p:first-child {
+ul>li p:first-child {
   display: inline;
 }
 
-ul > li:first-child {
+ul>li:first-child {
   margin-top: 1em;
 }
 
@@ -362,7 +403,7 @@ ul > li:first-child {
   display: none;
 }
 
-main ul > li {
+main ul>li {
   list-style-type: disc;
   list-style-position: outside;
   margin-bottom: 0.5em;
@@ -382,9 +423,10 @@ main ul > li {
     3.5 Bibliograhy
 */
 
-p.Biblio, p.NormRef {
-    margin-top: 1em;
-    margin-left: 2em;
+p.Biblio,
+p.NormRef {
+  margin-left: 2em;
+  margin-top: 1em;
 }
 
 /*
@@ -414,25 +456,25 @@ pre {
 */
 
 .Note {
-    background-color: #fff495;
-    color: #47430c;
-    padding: 1.2em;
-    margin: 1em 0 1em 0;
+  background-color: $un-note;
+  color: $un-admonition-color;
+  margin: 1em 0;
+  padding: 1.2em;
 
-    p {
-        margin: 0;
-    }
+  p {
+    margin: 0;
+  }
 }
 
 .Admonition {
-    background-color: #ffcccc;
-    color: #47430c;
-    padding: 1.2em;
-    margin: 1em 0 1em 0;
+  background-color: $un-admonition-back;
+  color: $un-admonition-color;
+  margin: 1em 0;
+  padding: 1.2em;
 
-    p {
-        margin: 0;
-    }
+  p {
+    margin: 0;
+  }
 }
 
 
@@ -458,7 +500,7 @@ pre {
 */
 
 table {
-  @include table(1px solid black);
+  @include table(1px solid $un-black);
 }
 
 p.TableTitle {
@@ -472,12 +514,12 @@ p.TableTitle {
 */
 
 a.footnote-number {
-    vertical-align: super;
-    font-size: 0.8em;
+  font-size: 0.8em;
+  vertical-align: super;
 }
 
 .footnote {
-    font-size: 0.9em;
+  font-size: 0.9em;
 }
 
 
@@ -503,7 +545,6 @@ a.footnote-number {
 */
 
 .contact-info {
-/*  padding: 2em;*/
   margin-top: 5em;
   text-align: left;
 }
@@ -515,16 +556,11 @@ a.footnote-number {
 
 .contact-info p,
 .contact-info a {
-/*  font-family: $monospacefont;
-  font-variant-ligatures: none; */
   font-weight: 400;
 }
 
-/* http://www.un.org/styleguide/ labels */
+// http://www.un.org/styleguide/ labels
 .contact-info #boilerplate-feedback-name {
-/*  font-weight: 700;
-  font-size: 1.2em;
-  margin-bottom:0;*/
   padding-left: 1px;
   color: $un-label;
   font-size: 18.2px;
@@ -537,9 +573,9 @@ a.footnote-number {
 }
 
 .contact-info #boilerplate-feedback-address {
-    font-size: 1em;
-    line-height: 1.3em;
-    margin-top:0;
+  font-size: 1em;
+  line-height: 1.3em;
+  margin-top: 0;
 }
 
 /*
@@ -547,7 +583,7 @@ a.footnote-number {
 */
 
 span.keyword {
-    font-weight: 600;
+  font-weight: 600;
 }
 
 /*
@@ -555,8 +591,8 @@ span.keyword {
 */
 
 p {
-    margin-top: 1em;
-    margin-bottom: 1em;
+  margin-bottom: 1em;
+  margin-top: 1em;
 }
 
 h2 p {
@@ -610,6 +646,7 @@ h2 p {
 
 .WordSection11 {
   padding: 0 2em 0 3em;
+  text-align: center;
 }
 
 .info-section {
@@ -621,7 +658,8 @@ h2 p {
 }
 
 
-.zzSTDTitle1, .MsoCommentText {
+.zzSTDTitle1,
+.MsoCommentText {
   display: none;
 }
 
@@ -631,7 +669,8 @@ h2 p {
   padding-left: 1.5em;
 }
 
-.coverpage-logo span, .coverpage-tc-name span {
+.coverpage-logo span,
+.coverpage-tc-name span {
   font-family: $bodyfont;
   text-transform: none;
   font-weight: 300;
@@ -696,7 +735,7 @@ h2 p {
 
 
 .boilerplate-copyright p {
-text-align: center;
+  text-align: center;
 }
 
 #boilerplate-ECEhdr {
@@ -727,16 +766,25 @@ To top button
 
 @media print {
 
-  .document-info,  nav, .copyright {
-      page-break-before: always;
+  .document-info,
+  nav,
+  .copyright {
+    page-break-before: always;
   }
 
-  h1, h2, h3, h4 {
+  h1,
+  h2,
+  h3,
+  h4 {
     page-break-after: avoid;
     margin-top: 1.2em;
   }
 
-  .note, .figure, pre, .pseudocode, table {
+  .note,
+  .figure,
+  pre,
+  .pseudocode,
+  table {
     page-break-inside: avoid;
   }
 
@@ -745,7 +793,7 @@ To top button
   }
 
   .coverpage {
-      height: 23cm;
+    height: 23cm;
   }
 
   .wrapper-top {
@@ -759,69 +807,71 @@ To top button
   }
 
   .container {
-      padding-left: 0;
+    padding-left: 0;
   }
 
 
   #toc .toc-active a {
-    color: #4D7EA5;
+    color: $un-toc-active;
   }
 
-  #toc .toc-active, #toc li:hover {
+  #toc .toc-active,
+  #toc li:hover {
     background: white;
-    box-shadow: none !important; }
-
-    #toc li:hover a {
-    color: black; }
-
+    box-shadow: none !important;
+  }
 
-    h1.content {
-      margin-top: 2em;
-      line-height: 2.5em;
-    }
+  #toc li:hover a {
+    color: $un-black;
+  }
 
-    h1 {
-      font-size: 1.5em;
-      line-height: 1.5;
-    }
 
-    h2 {
-      font-size: 1.2em
-    }
+  h1.content {
+    line-height: 2.5em;
+    margin-top: 2em;
+  }
 
-    h3 {
-      font-size: 1em;
-    }
+  h1 {
+    font-size: 1.5em;
+    line-height: 1.5;
+  }
 
+  h2 {
+    font-size: 1.2em;
+  }
 
-    .Note {
-        background-color: #fff495;
-        color: #47430c;
-        padding: 5px;
-        margin: 2em 0 1em 0; }
+  h3 {
+    font-size: 1em;
+  }
 
-    .Note p {
-      padding: 0 5px 0 5px;
-    }
 
-    .Admonition {
-        background-color: #ffcccc;
-        color: #47430c;
-        padding: 5px;
-        margin: 2em 0 1em 0; }
+  .Note {
+    background-color: $un-note;
+    color: $un-admonition-color;
+    margin: 2em 0 1em;
+    padding: 5px;
+  }
 
-    .Admonition p {
-      padding: 0 5px 0 5px;
-    }
+  .Note p {
+    padding: 0 5px;
+  }
 
+  .Admonition {
+    background-color: $un-admonition-back;
+    color: $un-admonition-color;
+    margin: 2em 0 1em;
+    padding: 5px;
+  }
 
-    nav {
-      line-height: 1;
-    }
+  .Admonition p {
+    padding: 0 5px;
+  }
 
-    .wrapper-top-bottom {
-      display: none;
-    }
+  nav {
+    line-height: 1;
+  }
 
+  .wrapper-top-bottom {
+    display: none;
+  }
 }
-

data/lib/isodoc/un/metadata.rb

@@ -8,8 +8,8 @@ module IsoDoc
     class Metadata < IsoDoc::Metadata
       def initialize(lang, script, labels)
         super
-                here = File.dirname(__FILE__)
-set(:logo, File.expand_path(File.join(here, "html", "logo.jpg")))
+        here = File.dirname(__FILE__)
+        set(:logo, File.expand_path(File.join(here, "html", "logo.jpg")))
       end
 
       def title(isoxml, _out)
@@ -42,6 +42,7 @@ set(:logo, File.expand_path(File.join(here, "html", "logo.jpg")))
         set(:doclanguage, lgs) unless lgs.empty?
         set(:submissionlanguage, slgs) unless slgs.empty?
         session(isoxml, _out)
+        super
       end
 
       def multival(isoxml, xpath)
@@ -82,34 +83,6 @@ set(:logo, File.expand_path(File.join(here, "html", "logo.jpg")))
       def unpublished(status)
         !%w(published withdrawn).include? status.downcase
       end
-
-      def version(isoxml, _out)
-        super
-        revdate = get[:revdate]
-        set(:revdate_monthyear, monthyr(revdate))
-      end
-
-      MONTHS = {
-        "01": "January",
-        "02": "February",
-        "03": "March",
-        "04": "April",
-        "05": "May",
-        "06": "June",
-        "07": "July",
-        "08": "August",
-        "09": "September",
-        "10": "October",
-        "11": "November",
-        "12": "December",
-      }.freeze
-
-      def monthyr(isodate)
-        m = /(?<yr>\d\d\d\d)-(?<mo>\d\d)/.match isodate
-        return isodate unless m && m[:yr] && m[:mo]
-        return "#{MONTHS[m[:mo].to_sym]} #{m[:yr]}"
-      end
-
     end
   end
 end

data/lib/metanorma/un/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module UN
-    VERSION = "0.3.4"
+    VERSION = "0.3.5"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-un
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-20 00:00:00.000000000 Z
+date: 2020-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities