metanorma-un 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78dd2e66f1de6d3ff4914f842c2bcaed21247b2ae03f58fdd2e31615abeffb40
-  data.tar.gz: e6439b8ede7334ee4e4a96e4f3a074071e7011f449636142fa62acc2c039c79c
+  metadata.gz: bb4cec32f898b0e8fb67d94c1757eaf4336fdc76553559d8d3bd605f8ae35765
+  data.tar.gz: 1070671f7c2e81f7fc61462390129b01dfd31cf64fb17bd69974e94c72fbb9b2
 SHA512:
-  metadata.gz: fc672a906c91fea85f3f7e6c72eae206477c8fdbb9770316d8c9826ba99a6322f7ce8fe1bbf61c54ba59a46a8805177f01cc7083392fdc3ca0e89d8c6d5567a1
-  data.tar.gz: c666dcd1fcc305cc16d97c6f98e0dce7074a96724394a72e6e5ff1fa3abe4a7ae9b9689d69e35c0ec51d35451377701b0b1dbdc629c72e890e4f6bd62c89fb7e
+  metadata.gz: 1d433580329fcb1c9982107b7fa02f1301ffd4477dbda664c07f93ee0e108b95fadec720b755064f5d08fff14c8421c3f8686e7f4a66d476e9e86b80dd178b8c
+  data.tar.gz: aec0d9d71e583d8a92bf32074418bd7240812efb6f220177638847eb8eb083412f66946db5b05d4b31ebaa25604c08dcaf7dcb57dc142c215e25b2161eb5f6c2

data/lib/asciidoctor/un/converter.rb

@@ -130,8 +130,8 @@ module Asciidoctor
       def doctype(node)
         d = node.attr("doctype")
         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'"
+          agenda budgetary sec-gen-notes expert-report resolution plenary-attachment}.include? d
+          @log.add("Document Attributes", nil, "#{d} is not a legal document type: reverting to 'recommendation'")
           d = "recommendation"
         end
         d
@@ -149,6 +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
         @files_to_delete.each { |f| FileUtils.rm f }
         ret
       end
@@ -185,6 +186,12 @@ module Asciidoctor
 
       def sections_cleanup(xmldoc)
         super
+        doctype = xmldoc&.at("//bibdata/ext/doctype")&.text
+        %w(plenary agenda budgetary).include?(doctype) or
+          para_to_clause(xmldoc)
+      end
+
+      def para_to_clause(xmldoc)
         xmldoc.xpath("//clause/p | //annex/p").each do |p|
           cl = Nokogiri::XML::Node.new("clause", xmldoc)
           cl["id"] = p["id"]
@@ -204,6 +211,15 @@ module Asciidoctor
           "subsequence": node.attr("subsequence"),
         ))
       end
+
+      def sectiontype_streamline(ret)
+        case ret
+        when "foreword" then "donotrecognise-foreword"
+        when "introduction" then "donotrecognise-foreword"
+        else
+          super
+        end
+      end
     end
   end
 end

data/lib/asciidoctor/un/isodoc.rng

@@ -645,6 +645,11 @@
     <optional>
       <attribute name="script"/>
     </optional>
+    <optional>
+      <attribute name="inline-header">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
     <optional>
       <attribute name="obligation">
         <choice>

data/lib/asciidoctor/un/validate.rb

@@ -14,7 +14,7 @@ module Asciidoctor
         stage = xmldoc&.at("//bibdata/status/stage")&.text
         %w(proposal working-draft committee-draft draft-standard final-draft
         published withdrawn).include? stage or
-          warn "Document Attributes: #{stage} is not a recognised status"
+        @log.add("Document Attributes", nil, "#{stage} is not a recognised status")
       end
     end
   end

data/lib/isodoc/un/base_convert.rb

@@ -227,6 +227,13 @@ module IsoDoc
           c1&.children&.each { |c2| parse(c2, s) }
         end
       end
+
+      def is_plenary?(docxml)
+        doctype = docxml&.at(ns("//bibdata/ext/doctype"))&.text
+        return true if  %w(plenary agenda budgetary).include?(doctype)
+        return true if docxml&.at(ns("//bibdata/ext/session/*"))
+        false
+      end
     end
   end
 end

data/lib/isodoc/un/html/header.html

@@ -84,8 +84,13 @@ exactly'></p>
 </div>
 
 <div style='mso-element:header' id=eh2>
+  {% if session_id %}
+<p class=MsoHeader align=left style='text-align:left;line-height:12.0pt;
+mso-line-height-rule:exactly'><span lang=EN-GB><b>{{ session_id }}</b></span></p>
+  {% else %}
 <p class=MsoHeader align=center style='text-align:center;line-height:12.0pt;
 mso-line-height-rule:exactly'><span lang=EN-GB><b>{{ formatted_docnumber }}</b></span></p>
+{% endif %}
 
 <div style='mso-element:para-border-div;border:none;border-bottom:solid windowtext 1.0pt;
 mso-border-bottom-alt:solid windowtext .5pt;padding:0cm 0cm 1.0pt 0cm'>
@@ -99,8 +104,13 @@ lang=EN-US><o:p>&nbsp;</o:p></span></p>
 </div>
 
 <div style='mso-element:header' id=eh2l>
+  {% if session_id %}
+<p class=MsoHeaderLandscape align=left style='text-align:left;line-height:12.0pt;
+mso-line-height-rule:exactly'><span lang=EN-GB><b>{{ session_id }}</b></span></p>
+  {% else %}
 <p class=MsoHeaderLandscape align=center style='text-align:center;line-height:12.0pt;
 mso-line-height-rule:exactly'><span lang=EN-GB><b>{{ formatted_docnumber }}</b></span></p>
+  {% endif %}
 
 <div style='mso-element:para-border-div;border:none;border-bottom:solid windowtext 1.0pt;
 mso-border-bottom-alt:solid windowtext .5pt;padding:0cm 0cm 1.0pt 0cm'>
@@ -114,9 +124,13 @@ lang=EN-US><o:p>&nbsp;</o:p></span></p>
 </div>
 
 <div style='mso-element:header' id=h2>
-
+{% if session_id %}
+<p class=MsoHeader align=right style='text-align:right;line-height:12.0pt;
+mso-line-height-rule:exactly'><span lang=EN-GB><b>{{ session_id }}</b></span></p>
+{% else %}
 <p class=MsoHeader align=center style='text-align:center;line-height:12.0pt;
 mso-line-height-rule:exactly'><span lang=EN-GB><b>{{ formatted_docnumber }}</b></span></p>
+{% endif %}
 
 <div style='mso-element:para-border-div;border:none;border-bottom:solid windowtext 1.0pt;
 mso-border-bottom-alt:solid windowtext .5pt;padding:0cm 0cm 1.0pt 0cm'>
@@ -131,8 +145,13 @@ lang=EN-US><o:p>&nbsp;</o:p></span></p>
 
 <div style='mso-element:header' id=h2l>
 
+{% if session_id %}
+<p class=MsoHeaderLandscape align=right style='text-align:right;line-height:12.0pt;
+mso-line-height-rule:exactly'><span lang=EN-GB><b>{{ session_id }}</b></span></p>
+{% else %}
 <p class=MsoHeaderLandscape align=center style='text-align:center;line-height:12.0pt;
 mso-line-height-rule:exactly'><span lang=EN-GB><b>{{ formatted_docnumber }}</b></span></p>
+{% endif %}
 
 <div style='mso-element:para-border-div;border:none;border-bottom:solid windowtext 1.0pt;
 mso-border-bottom-alt:solid windowtext .5pt;padding:0cm 0cm 1.0pt 0cm'>

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

@@ -1,8 +1,8 @@
-<div class="document-stage-band" id='{{ stage | downcase | replace: " ", "-" }}-band'>
+<div class="document-stage-band" id="{{ stage | downcase | replace: ' ', '-' }}-band">
     <p class="document-stage">{{ stage }}</p>
 </div>
 
-<div class="document-type-band" id='{{ doctype | downcase | replace: " ", "-" }}-band'>
+<div class="document-type-band" id="{{ doctype | downcase | replace: ' ', '-' }}-band">
     <p class="document-type">UNECE {{ doctype }}</p>
 </div>
 

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

@@ -1,8 +1,8 @@
-<div class="document-stage-band" id='{{ stage | downcase | replace: " ", "-" }}-band'>
+<div class="document-stage-band" id="{{ stage | downcase | replace: ' ', '-' }}-band">
     <p class="document-stage">{{ stage }}</p>
 </div>
 
-<div class="document-type-band" id='{{ doctype | downcase | replace: " ", "-" }}-band'>
+<div class="document-type-band" id="{{ doctype | downcase | replace: ' ', '-' }}-band">
     <p class="document-type">UNECE {{ doctype }}</p>
 </div>
 

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

@@ -7,126 +7,7 @@
    License: none (public domain)
 */
 
-html, body, div, span, applet, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-a, abbr, acronym, address, big, cite, code,
-del, dfn, em, img, ins, kbd, q, s, samp,
-small, strike, strong, sub, sup, tt, var,
-b, u, i, center,
-ol, ul, li,
-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,
-time, mark, audio, video {
-        margin: 0;
-        padding: 0;
-}
-
-html, body, div, span, applet, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-a, abbr, acronym, address, big, cite, code,
-del, dfn, em, img, ins, kbd, q, s, samp,
-small, strike, strong, sub, sup, tt, var,
-b, u, i, center,
-dl, dt, dd, ol, ul, li,
-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,
-time, mark, audio, video {
-        border: 0;
-        font-size: 100%;
-}
-
-html, body, div, span, applet, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-a, abbr, acronym, address, big, cite, code,
-del, dfn, em, img, ins, kbd, q, s, samp,
-small, strike, strong, tt, var,
-b, u, i, center,
-dl, dd, ol, ul, li,
-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,
-time, mark, audio, video {
-        vertical-align: baseline;
-}
-
-
-html, body, div, span, applet, object, iframe,
-p, blockquote,
-a, abbr, acronym, address, big, cite,
-del, dfn, em, img, ins, q, s,
-small, strike, strong, sub, sup, var,
-b, u, i, center,
-dl, dt, dd, ol, ul, li,
-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,
-time, mark, audio, video {
-  font-family: $bodyfont;
-}
-
-code, pre, tt, kbd, samp {
-  font-family: $monospacefont;
-  font-variant-ligatures: none;
-}
-
-code *, pre *, tt *, kbd *, samp * {
-  font-family: $monospacefont !important;
-  font-variant-ligatures: none;
-}
-
-h1, h2, h3, h4, h5, h6, .h2Annex {
-  font-family: $headerfont;
-}
-
-dl {
-  display: grid;
-  grid-template-columns: max-content auto;
-}
-
-dt {
-  grid-column-start: 1;
-}
-
-dd {
-  grid-column-start: 2;
-}
-
-dd p, dt p {
-  margin-top: 0px;
-}
-
-/* HTML5 display-role reset for older browsers */
-article, aside, details, figcaption, figure,
-footer, header, hgroup, menu, nav, section {
-	display: block;
-}
-body {
-	line-height: 1;
-}
-
-blockquote, q {
-	quotes: none;
-}
-blockquote:before, blockquote:after,
-q:before, q:after {
-	content: '';
-	content: none;
-}
-table {
-	border-collapse: collapse;
-	border-spacing: 0;
-}
-
+@import 'base_style/all';
 
 /*
     1. HTML & Body
@@ -153,148 +34,79 @@ $un-text: #333;
 $un-link: #00ADEF;
 
 body {
-  margin: 0;
-  margin-left: auto;
-  margin-right: auto;
-  max-width: 100%;
-  color: $un-text;
+  @include bodyStyle1(15px, 1.4em, $un-text, #ffffff, 300);
   font-weight: 400;
-  font-size: 15px;
-  line-height: 1.4em;
-  background-color: #ffffff;
-}
-
-p {
-  line-height: 1.6;
 }
 
 main {
   margin: 0 3em 0 6em;
 }
 
-#toc{
-  font-family: $bodyfont;
-  font-weight: 400;
+p {
+  line-height: 1.6;
 }
 
 /*
     2. Responsive navigation layout
 */
 
+#toc {
+  @include toc($un-text, #1661AD, $un-text);
+  @include sidebarToc();
 
-@media screen and (min-width: 768px) {
-    nav {
-        position: fixed;
-        top: 0;
-        bottom: 0;
-        left: 0;
-        width: 323px;
-        font-size: 0.9em;
-        overflow: auto;
-        padding: 0 0 0 45px;
-        margin-right: 30px;
-        background-color: #f2f2f2;
-    }
-
-    #toggle {
-        position: fixed;
-        height: 100%;
-        width: 30px;
-        background-color: $un-blue;
-        color: white!important;
-        cursor: pointer;
-        z-index: 100;
-    }
-
-    #toggle span {
-        text-align: center;
-        width: 100%;
-        position: absolute;
-        top: 50%;
-        transform: translate(0, -50%);
-
-    }
-
-    .container {
-        padding-left: 360px;
-    }
-
-    .rule.toc {
-        display: none;
-    }
+  .toc-active a {
+    color: white;
+  }
 
-    h1.toc-contents {
-        margin-top: 1em;
-    }
+  .toc-active,
+  li:hover {
+    background: linear-gradient(280deg, $un-blue, $un-classic-blue);
+    box-shadow: inset -5px 0px 10px -5px $un-blue !important;
 
-    ul#toc-list {
-        padding:0;
-        margin:0;
+    a {
+      color: white;
+      background: none;
+      box-shadow: none;
     }
-}
+  }
 
-@media screen and (max-width: 768px) {
-    #toc {
-        padding: 0 1.5em 0 1.5em;
-        overflow: visible;
+  ul {
+    a:hover {
+      box-shadow: none;
+      color: white;
     }
-}
-
-  div.figure > img {
-    margin-left: auto;
-margin-right: auto;
-display: block;
-max-width: 100%;
-height: auto;
   }
-
-#toc ul {
-  margin: 0;
-  padding: 0;
-  list-style: none;
-}
-
-#toc li a {
-  padding: 5px 10px;
-}
-
-#toc a {
-  color: $un-text;
-  text-decoration: none;
-  display: block;
 }
 
-#toc a:hover {
-/*  color: white;*/
-    box-shadow: none;
+nav {
+  @include sidebarNav(#f2f2f2, 323px, 45px);
 }
 
-#toc .h2 {
-  padding-left: 30px;
+#toggle {
+  @include sidebarNavToggle(white, $un-blue)
 }
 
-#toc .h3 {
-  padding-left: 50px;
-}
+@media screen and (min-width: 768px) {
+  .container {
+      padding-left: 360px;
+  }
 
-#toc .toc-active a {
-  color: white;
-}
+  .rule.toc {
+      display: none;
+  }
 
-#toc .toc-active,
-#toc li:hover {
-  background: linear-gradient(280deg, $un-blue, $un-classic-blue);
-  box-shadow: inset -5px 0px 10px -5px $un-blue!important;
-}
+  h1.toc-contents {
+      margin-top: 1em;
+  }
 
-#toc li:hover a {
-  color: white;
-  background: none;
-  box-shadow: none;
+  ul#toc-list {
+      padding:0;
+      margin:0;
+  }
 }
 
-#toc li a {
-/*  text-transform: uppercase;*/
+div.figure {
+  @include figureBlock();
 }
 
 /*
@@ -302,69 +114,31 @@ height: auto;
 */
 
 .document-type-band {
-    left:0;
-    top:180px;
-    height: 100%;
-    position: fixed;
-    display: block;
-    z-index: 99;
-    /*box-shadow: -5px 0px 10px #1d1d1d*/
-
+  @include docBand(2, 150, 180px);
 }
 
 .document-stage-band {
-    left:0;
-    top:0;
-    height: 100%;
-    position: fixed;
-    display: block;
-    z-index: 98;
-    box-shadow: -5px 0px 10px #1d1d1d
-}
-
-.document-type {
-    position: relative;
-    width: 25px;
+  @include docBand(1, 150);
 }
-
-.document-stage {
-    position: relative;
-    width: 25px;
+.document-stage-band > :first-child {
+  font-weight: 300;
 }
 
-p.document-type, p.document-stage {
-    color: white;
-    text-transform: uppercase;
-    font-size: 0.9em;
-    font-weight: 400;
-    letter-spacing: 0.05em;
-    margin:0;
-    margin-left: 6px;
-    writing-mode:tb-rl;
-	-webkit-transform:rotate(180deg);
-	-moz-transform:rotate(180deg);
-	-o-transform: rotate(180deg);
-	white-space:nowrap;
-	display:block;
-    bottom:0;
-}
-
-p.document-type {
-    font-weight: 400;
-    height: 150;
+p.document-type,
+p.document-stage {
+  @include docBandTitle(150);
 }
 
 #governance-band p.document-type {
-    font-weight: 400;
-    height: 230px!important;
+  height: 230px !important;
 }
 
 p.document-stage {
-    font-weight: 300;
-    height:160px;
+  font-weight: 300;
+  height: 160px;
 }
 
-#standard-band p{
+#standard-band p {
   height: 270px;
 }
 
@@ -372,77 +146,78 @@ p.document-stage {
   height: 150px;
 }
 
-
-#standard-band,  #published-band {
-    background-color: #9ABD48;
+#standard-band,
+#published-band {
+  background-color: #9ABD48;
 }
 
-#standard, #published {
-    border-bottom: solid 3px #9ABD48;
+#standard,
+#published {
+  border-bottom: solid 3px #9ABD48;
 }
 
-#governance, #policy-and-procedures {
-    border-bottom: solid 3px #750697;
+#governance,
+#policy-and-procedures {
+  border-bottom: solid 3px #750697;
 }
 
-#governance-band, #policy-and-procedures-band {
-    background-color: #750697;
+#governance-band,
+#policy-and-procedures-band {
+  background-color: #750697;
 }
 
 #guide {
-    border-bottom: solid 3px #48a0e7;
+  border-bottom: solid 3px #48a0e7;
 }
 
 #guide-band {
-    background-color: #48a0e7;
+  background-color: #48a0e7;
 }
 
 .coverpage-maturity {
-    font-family: $bodyfont;
-    font-weight: 400;
-    font-size: 1em;
-    margin: 0 0 2em 0;
-    text-transform: uppercase;
-    }
+  @include coverpageStageBlock();
+}
 
-#working-draft, #proposal {
-    border-bottom: solid 3px #F7803C;
+#working-draft,
+#proposal {
+  border-bottom: solid 3px #F7803C;
 }
 
-#working-draft-band, #proposal-band {
-    background-color: #F7803C;
+#working-draft-band,
+#proposal-band {
+  background-color: #F7803C;
 }
 
 #committee-draft {
-    border-bottom: solid 3px #fd06fd;
+  border-bottom: solid 3px #fd06fd;
 }
 
 #committee-draft-band {
-    background-color: #fd06fd;
+  background-color: #fd06fd;
 }
 
 #draft-standard {
-    border-bottom: solid 3px #fdf906;
+  border-bottom: solid 3px #fdf906;
 }
 
 #draft-standard-band {
-    background-color: #fdf906;
+  background-color: #fdf906;
 }
 
 #standard {
-    border-bottom: solid 3px #9ABD48;
+  border-bottom: solid 3px #9ABD48;
 }
 
 #standard-band {
-    background-color: #9ABD48;
+  background-color: #9ABD48;
 }
 
 #obsolete {
-    border-bottom: solid 3px #7e0d13;
+  border-bottom: solid 3px #7e0d13;
 }
 
 #obsolete-band {
-    background-color: #7e0d13;
+  background-color: #7e0d13;
 }
 
 /*
@@ -556,36 +331,7 @@ h6 {
     3.2 Links
 */
 
-a, a:visited{
-  text-decoration: none;
-  color: $un-link;
-}
-
-a:hover {
-  color: white;
-  background: $un-blue;
-  box-shadow: 3px 0 0 $un-blue, -3px 0 0 $un-blue;
-  /* padding: 2px 0 2px 0; */
-}
-
-::selection {
-  background: $un-blue; /* WebKit/Blink Browsers */
-  color: white;
-}
-
-::-moz-selection {
-  background: $un-blue; /* Gecko Browsers */
-  color: white;
-}
-
-.contact-info a:hover {
-  color: $un-link;
-  text-decoration: underline;
-  background: none;
-  box-shadow: 0 0 0 0;
-}
-
-
+@include elementStyles($un-link, $un-blue, white);
 
 /*
     3.3 Lists
@@ -629,10 +375,7 @@ main ul > li {
 */
 
 .rule {
-  width: 100%;
-  height: 1px;
-  background-color: #eee;
-  margin: 2em 0;
+  @include rule(1px, #eee)
 }
 
 /*
@@ -648,29 +391,22 @@ p.Biblio, p.NormRef {
     3.6 Source Code + figures
 */
 
-pre {
-    font-family: $monospacefont;
-    font-variant-ligatures: none;
-  }
-
-.figure, pre, .pseudocode {
-    background-color: $un-gray;
-    font-size: 0.8em;
-    line-height: 1.6em;
-    padding: 1.5em;
-    margin: 2em 0 1em 0;
-    overflow: auto;
+.figure,
+pre,
+.pseudocode {
+  @include pseudocodeBlock($un-gray);
 }
 
-.FigureTitle, .SourceTitle, .AdmonitionTitle, .RecommendationTitle {
-    font-weight: 700;
-    font-size: 1em;
-    text-align: center;
+pre {
+  @include monospaceBlockStyle()
 }
 
-div.Admonition {
-  border: 2px solid black;
-  padding: 6pt;
+@include admonitionBlock();
+@include recommendationBlock();
+
+.FigureTitle,
+.SourceTitle {
+  @include blockTitle()
 }
 
 /*
@@ -705,22 +441,16 @@ div.Admonition {
 */
 
 .example {
-    background-color: #e1eef1;
-    padding: 1.2em;
-    margin: 2em 0 1em 0;
-    padding-left: 2em;
-}
+  @include exampleBlock(#e1eef1, #424242, 1.2em);
 
-.example .example-title {
-    font-weight: 700;
-    text-transform: uppercase;
-    text-align: center;
-    margin-top:0;
-    margin-left:-1.5em;
-}
+  .example-title {
+    margin-top: 0;
+  }
 
-.example pre, .example .pseudocode {
-      background: none;
+  pre,
+  .pseudocode {
+    background: none;
+  }
 }
 
 /*
@@ -728,26 +458,7 @@ div.Admonition {
 */
 
 table {
-  border-collapse: collapse;
-  width: 100%;
-  font-weight: 300;
-  margin: 1em 0 2em 0;
-  margin-left: auto;
-  margin-right: auto;
-  padding-right: 2em;
-}
-
-table, th, td {
-  border: 1px solid black;
-  font-size: 0.95em;
-}
-
-td, th {
-  padding: 1em;
-}
-
-td.header {
-  font-weight: 400;
+  @include table(1px solid black);
 }
 
 p.TableTitle {
@@ -775,13 +486,7 @@ a.footnote-number {
 */
 
 .Quote {
-    background-color: #f2f2f2;
-    font-style: italic;
-    width: 80%;
-    padding: 1.5em;
-    margin-top: 2em;
-    margin-left: auto;
-    margin-right: auto;
+  @include blockquoteBlock(#f2f2f2);
 }
 
 
@@ -790,10 +495,7 @@ a.footnote-number {
 */
 
 .formula {
-    background-color: #f2f2f2;
-    padding: 1.5em;
-    margin-top: 2em;
-    text-align: center;
+  @include formulaBlock(#f2f2f2)
 }
 
 /*
@@ -1001,48 +703,22 @@ text-align: center;
   border: solid;
 }
 
-/*  .copyright .name, .copyright .address {color: $un-link;} */
-
-
-
 /*
     5.0 Other styles
 */
 
 
-
 /*
 To top button
 */
 
 #myBtn {
-  font-family: $monospacefont;
-  font-variant-ligatures: none;
-  display: none;
-  position: fixed;
-  bottom: 20px;
-  right: 30px;
-  z-index: 99;
-  font-size: 12px;
-  border: none;
-  outline: none;
-  background-color: #1f8ca0;
-  opacity: 0.15;
-  color: white;
-  cursor: pointer;
-  padding: 10px 15px 10px 15px;
-  border-radius: 4px;
+  @include toTopBtn(white, #1f8ca0);
   text-transform: uppercase;
-}
-
-#myBtn:hover {
-  opacity: 1;
-}
 
-a.anchorjs-link:hover {
-  background: none;
-  color: $un-link;
-  box-shadow: none;
+  a.anchorjs-link {
+    @include anchorLink($un-link)
+  }
 }
 
 @page {
@@ -1055,10 +731,6 @@ a.anchorjs-link:hover {
       page-break-before: always;
   }
 
-  nav {
-    page-break-after: always;
-  }
-
   h1, h2, h3, h4 {
     page-break-after: avoid;
     margin-top: 1.2em;
@@ -1086,29 +758,10 @@ a.anchorjs-link:hover {
     margin-top: -5px;
   }
 
-
-  #toggle, .document-stage-band,
-  .document-type-band, button#myBtn {
-      display: none;
-  }
-
-  button#myBtn {
-    background-color: white;
-  }
-
   .container {
       padding-left: 0;
   }
 
-  nav {
-      position: relative;
-      width: auto;
-      font-size: 0.9em;
-      overflow: auto;
-      padding: 0;
-      margin-right: 0;
-      background-color: white;
-  }
 
   #toc .toc-active a {
     color: #4D7EA5;

data/lib/isodoc/un/html_convert.rb

@@ -47,7 +47,7 @@ module IsoDoc
       end
 
       def make_body(xml, docxml)
-        plenary = docxml.at(ns("//bibdata/ext[doctype = 'plenary']"))
+        plenary = is_plenary?(docxml)
         body_attr = { lang: "EN-US", link: "blue", vlink: "#954F72", "xml:lang": "EN-US", class: "container" }
         if plenary && @htmlcoverpage == html_doc_path("html_unece_titlepage.html")
           @htmlcoverpage = html_doc_path("html_unece_plenary_titlepage.html")

data/lib/isodoc/un/pdf_convert.rb

@@ -53,7 +53,7 @@ module IsoDoc
       end
 
       def make_body(xml, docxml)
-        plenary = docxml.at(ns("//bibdata/ext[doctype = 'plenary']"))
+        plenary = is_plenary?(docxml)
         body_attr = { lang: "EN-US", link: "blue", vlink: "#954F72", "xml:lang": "EN-US", class: "container" }
         if plenary && @htmlcoverpage == html_doc_path("html_unece_titlepage.html")
           @htmlcoverpage = html_doc_path("html_unece_plenary_titlepage.html")

data/lib/isodoc/un/word_convert.rb

@@ -51,7 +51,7 @@ module IsoDoc
       end
 
       def make_body(xml, docxml)
-        plenary = docxml.at(ns("//bibdata/ext[doctype = 'plenary']"))
+        plenary = is_plenary?(docxml)
         if plenary && @wordcoverpage == html_doc_path("word_unece_titlepage.html")
           @wordcoverpage = html_doc_path("word_unece_plenary_titlepage.html")
         end
@@ -144,7 +144,8 @@ module IsoDoc
         foreword = docxml.at("//p[@class = 'ForewordTitle']/..")
         intro = docxml.at("//p[@class = 'IntroTitle']/..")
         abstract = docxml.at("//p[@class = 'AbstractTitle']/..")
-        abstract.parent = (abstractbox || preface_container) if abstract
+        abstract.parent = (abstractbox || preface_container) if abstract &&
+          (abstractbox || preface_container)
         abstractbox and abstract&.xpath(".//p/br")&.each do |a|
           a.parent.remove if /page-break-before:always/.match(a["style"])
         end

data/lib/metanorma/un/version.rb

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

data/metanorma-unece.gemspec

@@ -44,5 +44,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rubocop", "= 0.54.0"
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
-  spec.add_development_dependency "metanorma", "~> 0.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-un
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-05 00:00:00.000000000 Z
+date: 2020-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -234,20 +234,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: metanorma
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.1
 description: |
   Metanorma for UN documents.