metanorma-un 0.9.0 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e366a3b59b9803320aac7c83e3138a519626597bbc6dc8e3348b77b58747d57c
-  data.tar.gz: 5f31a640fa6773835c6fb6d04d1da24dbdefc09a517acae1efc3e0f2a6da9acc
+  metadata.gz: 7a19302629920120d5bd3ef41ad5caf321914a49faf45ddff3646b8f5e2224e2
+  data.tar.gz: 7ffc87968fbd90b21ea9fdf3007f17db5695a48575284302bd79696b35ac0fce
 SHA512:
-  metadata.gz: 9d160ce19ed4a1f65931298574075d261ae42d1f3cc498421328fa576ca79a29810baf6b72ba9196471df32c60902abf581f65c5d6ac98477633dbddcd18aa27
-  data.tar.gz: a678ff6186ad97b878ce6e57669b1b71b0670810653411f7dc676f016ce434acb2bc5df7650b93fba7f22bc63dafe4eb203f4097a63d98ad85c2c88638873905
+  metadata.gz: 65dbc51a9c7d6d3c3c5f08d4cbeed51c56ca86fd95a65f08ecf6a7a33baf6f2869ed7410c8820248d3aac77eeac40f84c26dec6a4e6823dde1e5af096611b470
+  data.tar.gz: 84051bf8dce10c80c15a6fbf2bf7eeaf156264b8692a72316ec1a7684d6b48aabc73f35a3427bf0d3f7b7f6d32e1c7310d29aa8f60e7d91aca5f968d53edf873

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_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: ',' %}

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/presentation_xml_convert.rb

@@ -28,7 +28,7 @@ module IsoDoc
 
         n = @xrefs.anchor(elem["id"], :label) or return
         lbl = l10n("#{@i18n.admonition} #{n}")
-        prefix_name(elem, " — ", lbl, "name")
+        prefix_name(elem, block_delim, lbl, "name")
       end
 
       def annex1(elem)