metanorma-un 0.8.8 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c579d88ee27f6171c252864a7d48d06e0c4271e2b0810443b346cb09a0a6e218
-  data.tar.gz: 67b18b39fd7892605c545ae1c38d674f6934576b2b149dbd1402993b17309736
+  metadata.gz: fd38bdd1ebd36217dcc775f8203e06752a74c22fb6ec653d38c702275d37af66
+  data.tar.gz: c598199308783c403d112efa70fa8fce946a64d4cfe24456270bfef58e041522
 SHA512:
-  metadata.gz: ef33aafb8d235ac2940f2b277f9d1fb3449f04d945a0a08a172625908b03caf7f9f27a8f9610e6e867ab889e772af731d53efee129916a333df97ef4d0a917ad
-  data.tar.gz: 1086dc2dba39739b4e2d8d6f3c711cdd77e0e7dffe08d441081f58becff90ffb5a1c317f0d5177963208cbe89a2e145ce2983a011f41ca5097a26d73639c6430
+  metadata.gz: 054ebc49d618d714f9bf11b341e2ebf4bc18cac87403214550f9854ba1e565377a5cef3cd065d2e189dec5c08c933d8bff37ad0e7be53be4e3698917d9d90db5
+  data.tar.gz: f501716d1de02d13e24ece38e2c78b1b6602305cfea8ab09914291e2387c93f250c4866ef933ec189ab63cd7657a42473f97b59d2f6db33c9e971ad65d8ce4bd

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

@@ -85,6 +85,9 @@
 </div>  
 {% endif %}
 
+        <div class="coverpage-warning" id="coverpage-note-destination"/>
+
+
 <div class="info-section">
 <div class="copyright">
   <p class="year">

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

@@ -74,6 +74,7 @@
 </div>
 {% endif %}
 
+        <div class="coverpage-warning" id="coverpage-note-destination"/>
 
 
 <div class="info-section">

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

@@ -765,6 +765,12 @@ pre {
   font-size: 1em;
   text-align: center; }
 
+.ListTitle {
+  font-weight: 700;
+  font-size: 1em;
+  text-align: center;
+  text-align: left; }
+
 .FigureTitle,
 .SourceTitle {
   font-weight: 700;

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

@@ -464,6 +464,7 @@ pre {
 
 @include admonitionBlock();
 @include recommendationBlock();
+@include listBlock();
 
 .FigureTitle,
 .SourceTitle {

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

@@ -116,7 +116,7 @@ p.AdmonitionTitle, p.RecommendationTitle {
   mso-bidi-font-family: {{bodyfont}};
   mso-ansi-language: EN-GB; }
 
-p.TableTitle {
+p.TableTitle, p.ListTitle {
   mso-style-unhide: no;
   mso-style-qformat: yes;
   mso-style-parent: "";
@@ -147,13 +147,15 @@ p.Note, div.Note, li.Note, p.TableFootnote, div.TableFootnote, li.TableFootnote
   line-height: 12.0pt;
   mso-pagination: widow-orphan;
   tab-stops: 20.15pt;
-  font-size: {{smallerfontsize}};
   mso-bidi-font-size: 11.0pt;
-  font-family: {{bodyfont}};
   mso-fareast-font-family: {{bodyfont}};
   mso-bidi-font-family: {{bodyfont}};
   mso-ansi-language: EN-GB; }
 
+p.Note, li.Note, p.TableFootnote, div.TableFootnote, li.TableFootnote {
+  font-size: {{smallerfontsize}};
+  font-family: {{bodyfont}}; }
+
 p.ANNEX, li.ANNEX, div.ANNEX {
   mso-style-name: ANNEX;
   mso-style-priority: 10;
@@ -499,12 +501,14 @@ p.Quote, li.Quote, div.Quote {
   line-height: 12.0pt;
   mso-pagination: widow-orphan;
   tab-stops: 20.15pt;
-  font-size: {{normalfontsize}};
-  font-family: {{bodyfont}};
   mso-fareast-font-family: {{bodyfont}};
   mso-bidi-font-family: {{bodyfont}};
   mso-ansi-language: EN-GB; }
 
+p.Quote, li.Quote {
+  font-size: {{normalfontsize}};
+  font-family: {{bodyfont}}; }
+
 p.QuoteAttribution {
   text-align: right;
   mso-style-priority: 99;
@@ -533,8 +537,6 @@ p.Admonition, li.Admonition, div.Admonition {
   mso-border-alt: solid black .25pt;
   padding: 0cm;
   mso-padding-alt: 10.0pt 10.0pt 10.0pt 10.0pt;
-  font-size: 12.0pt;
-  font-family: {{bodyfont}};
   mso-ascii-font-family: {{bodyfont}};
   mso-ascii-theme-font: minor-latin;
   mso-fareast-font-family: {{bodyfont}};
@@ -545,6 +547,10 @@ p.Admonition, li.Admonition, div.Admonition {
   mso-bidi-theme-font: minor-bidi;
   mso-ansi-language: EN-AU; }
 
+p.Admonition, li.Admonition {
+  font-size: 12.0pt;
+  font-family: {{bodyfont}}; }
+
 p.Code, li.Code, div.Code {
   mso-style-name: Code;
   mso-style-priority: 16;
@@ -775,9 +781,11 @@ aside {
   font-weight: bold;
   margin-left: -36.0pt; }
 
-p.example, li.example, div.example, td.example {
+p.example, li.example, td.example {
   margin-right: 0pt;
-  margin-left: 0pt; }
+  margin-left: 0pt;
+  font-size: {{smallerfontsize}};
+  font-family: {{bodyfont}}; }
 
 div.example {
   margin-right: 36.0pt;
@@ -786,9 +794,7 @@ div.example {
   margin-bottom: 0cm; }
 
 p.example, li.example, div.example, td.example {
-  mso-pagination: none;
-  font-size: {{smallerfontsize}};
-  font-family: {{bodyfont}}; }
+  mso-pagination: none; }
 
 td.example p.MsoListParagraph {
   font-size: {{smallerfontsize}}; }

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

@@ -123,7 +123,7 @@ p.AdmonitionTitle, p.RecommendationTitle
         mso-fareast-font-family:$bodyfont;
         mso-bidi-font-family:$bodyfont;
         mso-ansi-language:EN-GB;}
-p.TableTitle
+p.TableTitle, p.ListTitle
 	{mso-style-unhide:no;
 	mso-style-qformat:yes;
 	mso-style-parent:"";
@@ -153,12 +153,14 @@ p.Note, div.Note, li.Note, p.TableFootnote, div.TableFootnote, li.TableFootnote
 	line-height:12.0pt;
 	mso-pagination:widow-orphan;
 	tab-stops:20.15pt;
-	font-size:$smallerfontsize;
 	mso-bidi-font-size:11.0pt;
-	font-family:$bodyfont;
 	mso-fareast-font-family:$bodyfont;
 	mso-bidi-font-family:$bodyfont;
 	mso-ansi-language:EN-GB;}
+p.Note, li.Note, p.TableFootnote, div.TableFootnote, li.TableFootnote {
+	font-size:$smallerfontsize;
+	font-family:$bodyfont;
+        }
 p.ANNEX, li.ANNEX, div.ANNEX
 	{mso-style-name:ANNEX;
 	mso-style-priority:10;
@@ -489,11 +491,13 @@ p.Quote, li.Quote, div.Quote
 	line-height:12.0pt;
 	mso-pagination:widow-orphan;
 	tab-stops:20.15pt;
-	font-size:$normalfontsize;
-	font-family:$bodyfont;
 	mso-fareast-font-family:$bodyfont;
 	mso-bidi-font-family:$bodyfont;
 	mso-ansi-language:EN-GB;}
+p.Quote, li.Quote {
+	font-size:$normalfontsize;
+	font-family:$bodyfont;
+        }
 p.QuoteAttribution
         {text-align:right;
         mso-style-priority:99;
@@ -522,8 +526,6 @@ p.Admonition, li.Admonition, div.Admonition
 	mso-border-alt:solid black .25pt;
 	padding:0cm;
 	mso-padding-alt:10.0pt 10.0pt 10.0pt 10.0pt;
-	font-size:12.0pt;
-	font-family:$bodyfont;
 	mso-ascii-font-family:$bodyfont;
 	mso-ascii-theme-font:minor-latin;
 	mso-fareast-font-family:$bodyfont;
@@ -533,6 +535,10 @@ p.Admonition, li.Admonition, div.Admonition
 	mso-bidi-font-family:$bodyfont;
 	mso-bidi-theme-font:minor-bidi;
 	mso-ansi-language:EN-AU; }
+p.Admonition, li.Admonition {
+	font-size:12.0pt;
+	font-family:$bodyfont;
+        }
 p.Code, li.Code, div.Code
 	{mso-style-name:Code;
 	mso-style-priority:16;
@@ -749,9 +755,11 @@ font-weight: bold;
 margin-left: -36.0pt;
 }
 
-p.example, li.example, div.example, td.example {
+p.example, li.example, td.example {
   margin-right: 0pt;
   margin-left: 0pt;
+  font-size:$smallerfontsize;
+        font-family:$bodyfont;
 }
 
 div.example {
@@ -763,8 +771,7 @@ div.example {
 
 p.example, li.example, div.example, td.example {
         mso-pagination:none;
-        font-size:$smallerfontsize;
-        font-family:$bodyfont;}
+      }
 
 td.example p.MsoListParagraph {
   font-size: $smallerfontsize;

data/lib/isodoc/un/html/word_unece_plenary_titlepage.html

@@ -9253,6 +9253,10 @@ in Collaboration with {{ session_collaborator }}</span></b>
     <p class="MsoNormal"></p>
         <div class="MsoNormal" id='abstractbox' style='margin-left:70.9pt;font-size:10.0pt;mso-bidi-font-size:12.0pt;font-family:"Times New Roman",serif;mso-style-textoutline-type:none;mso-style-textoutline-outlinestyle-dpiwidth:.75pt;mso-style-textoutline-outlinestyle-linecap:round;mso-style-textoutline-outlinestyle-join:bevel;mso-style-textoutline-outlinestyle-pctmiterlimit:0%;mso-style-textoutline-outlinestyle-dash:solid;mso-style-textoutline-outlinestyle-align:center;mso-style-textoutline-outlinestyle-compound:simple'/>
     </div>
+
+                     <div class="coverpage-warning" id="coverpage-note-destination"/>
+
+
 <p class="MsoNormal"><v:shapetype id="_x0000_t202"
  coordsize="21600,21600" o:spt="202" path="m,l,21600r21600,l21600,xe">
  <v:stroke joinstyle="miter"/>

data/lib/isodoc/un/html/word_unece_titlepage.html

@@ -2,16 +2,16 @@
 <span lang="EN-GB"><span style='mso-no-proof:yes'><b>{{ tc | join: "/" }}</b></span></p>
 
 {% if submissionlanguage %}
-<p class=MsoNormal style='tab-stops:70.9pt 12.0cm'><span lang=EN-AU
+<p class="MsoNormal" style='tab-stops:70.9pt 12.0cm'><span lang="EN-AU"
 style='font-family:"Times New Roman",serif'><span style='mso-tab-count:2'>  </span></span><span
-lang=EN-AU style='font-size:10.0pt;mso-bidi-font-size:12.0pt;font-family:"Times New Roman",serif'>Original:
+lang="EN-AU" style='font-size:10.0pt;mso-bidi-font-size:12.0pt;font-family:"Times New Roman",serif'>Original:
 {{ submissionlanguage | join: "/" }}<o:p></o:p></span></p>
 {% endif %}
 
 {% if doclanguage %}
-<p class=MsoNormal style='tab-stops:70.9pt 12.0cm'><span lang=EN-AU
+<p class="MsoNormal" style='tab-stops:70.9pt 12.0cm'><span lang="EN-AU"
 style='font-family:"Times New Roman",serif'><span style='mso-tab-count:2'> </span></span><span
-lang=EN-AU style='font-size:10.0pt;mso-bidi-font-size:12.0pt;font-family:"Times New Roman",serif'>{{ doclanguage | join: ", " }} only<o:p></o:p></span></p>
+lang="EN-AU" style='font-size:10.0pt;mso-bidi-font-size:12.0pt;font-family:"Times New Roman",serif'>{{ doclanguage | join: ", " }} only<o:p></o:p></span></p>
 {% endif %}
 
 {% assign fn_refs = "" | split: ',' %}
@@ -30,6 +30,9 @@ style='mso-bidi-font-weight:normal'><span lang="EN-GB" style='font-size:24.0pt'>
 normal'><span lang="EN-GB" style='font-size:14.0pt;mso-no-proof:yes'>{{ doctype }} No. {{ docnumber }} {{ draftinfo }}</span></b><b
 <p class="MsoNormal" style='margin-top:100.0pt'><span lang="EN-GB"><o:p>&nbsp;</o:p></span></p>
 
+        <div class="coverpage-warning" id="coverpage-note-destination"/>
+
+
 {% if fn_refs.size > 0 %}
 <div class="title-footnote">
 {% for item in title_footnote %}

data/lib/isodoc/un/i18n.rb

@@ -3,7 +3,7 @@ module IsoDoc
     class I18n < IsoDoc::I18n
       def load_yaml1(lang, script)
         y = YAML.load_file(File.join(File.dirname(__FILE__), "i18n-en.yaml"))
-        super.merge(y)
+        super.deep_merge(y)
       end
     end
   end

data/lib/isodoc/un/init.rb

@@ -17,7 +17,7 @@ module IsoDoc
       end
 
       def i18n_init(lang, script, i18nyaml = nil)
-        @i18n = I18n.new(lang, script, i18nyaml || @i18nyaml)
+        @i18n = I18n.new(lang, script, i18nyaml: i18nyaml || @i18nyaml)
       end
 
       def fileloc(loc)

data/lib/isodoc/un/presentation_xml_convert.rb

@@ -9,46 +9,37 @@ module IsoDoc
         @toc = options[:toc]
       end
 
-      def note1(f)
-        return if f.parent.name == "bibitem"
-        return if f["type"] == "title-footnote"
-        n = @xrefs.get[f["id"]]
-        lbl = case f["type"]
+      def note1(elem)
+        return if elem.parent.name == "bibitem"
+        return if elem["type"] == "title-footnote"
+
+        # n = @xrefs.get[f["id"]]
+        lbl = case elem["type"]
               when "source" then "Source"
               when "abbreviation" then "Abbreviations"
               else
                 @i18n.note
               end
-        prefix_name(f, "", lbl, "name")
+        prefix_name(elem, "", lbl, "name")
       end
 
-      def conversions(docxml)
-        super
-        admonition docxml
-      end
+      def admonition1(elem)
+        return if elem["notag"] == "true"
 
-      def admonition(docxml)
-        docxml.xpath(ns("//admonition")).each do |f|
-          admonition1(f)
-        end
-      end
-
-      def admonition1(f)
-        n = @xrefs.anchor(f['id'], :label) or return
+        n = @xrefs.anchor(elem["id"], :label) or return
         lbl = l10n("#{@i18n.admonition} #{n}")
-        prefix_name(f, " — ", lbl, "name")
+        prefix_name(elem, " — ", lbl, "name")
       end
 
-      def annex1(f)
-        lbl = @xrefs.anchor(f['id'], :label)
-        if t = f.at(ns("./title"))
+      def annex1(elem)
+        lbl = @xrefs.anchor(elem["id"], :label)
+        if t = elem.at(ns("./title"))
           t.children = "<strong>#{t.children.to_xml}</strong>"
         end
-        prefix_name(f, "<br/>", lbl, "title")
+        prefix_name(elem, "<br/>", lbl, "title")
       end
 
       include Init
     end
   end
 end
-