metanorma-un 0.8.7 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba4084264415215b21e84838b56d4b26a86a7fa0f8917f449f11b621eb2e8219
-  data.tar.gz: 572850950b31f5ba76f88404b6af7ef79e40cda2b8056fd7da6eeb7fa8b18fa8
+  metadata.gz: f94f7953e256699e56fb1d4f6f34139f1d08a09acefb869004182d4613762793
+  data.tar.gz: beb4fac7e74dce851f5545ddb1aa951f539a1febaebcd76ad2819363bd756f2d
 SHA512:
-  metadata.gz: e88c1ff785691b5c2d50f48d9a3ec160ded4f14f0c09df0d0a928fca37dc6522b1dbbdae6091b51985b8f0546ec0b9cb7a11a2c2469bdb4c7a0c42dabd12b739
-  data.tar.gz: b49745dae7076fb8068a7a2c98dd9484bbb87bb4430951a3bab16eda2069a46c60c29cb33dc5df1be35bc566ce027279328e47dcae7ab74e5a6cc0223db7d28b
+  metadata.gz: 1e89c3843c534fc0cc44ae3435e70f82aacb6433729ca9f4935d75c2e1fbec4ea88f85c23ef685625a6e9298696d43e8a1138428fba7bed1645cdeb5a5e913e9
+  data.tar.gz: 8281614c7d9b53801bef955cd26bd55d285b8dae18e6923a23ef48990b1d6c4a88fe687b33964d4c03ca58e0a9b1a925e07520d92f492bafab8f16f8d67298ab

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/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/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
-