metanorma-un 0.10.7 → 0.10.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07114d1e32b69ac6b36edb86273058d1e9e7cc66962ca18d710be70c51e8e3f8
-  data.tar.gz: e48bfe9b62640242b24a609bb8ee7e858e01c9fbcb700647d7597565a8168c26
+  metadata.gz: 5d5f21ba4f476f4f4eb4c4ea273724746e9d66a690c8f6ded9bbc8115c2268cf
+  data.tar.gz: b4d20e7df2a817f278499fd1d01e685a548364aa82929ef87c23ca32516392f8
 SHA512:
-  metadata.gz: afb9c24220d815c2bfddceeb0484768954f120465177d24d6c9abaeac1f0fd155359910c2b4de8b3a56374783f463aa2452504ff1484aebba81a8814160e46c4
-  data.tar.gz: 31b47dd6d2c2d929eb5c9be33e54d89240ea6ce24cea1a4ac627b9aa16f3284c9971a40796282c079cf03998749837ed5bc5ab39d6a175cc567c16b260b6b1d2
+  metadata.gz: b8130bdd72fc907640e55c637bb76620b6f7ead9332698a99e74e39276d6c0ea9e8d11c6165439cd4015c0b3b308b3108afa3bbb9fbe2d3ea2db3bb76b5e64ba
+  data.tar.gz: 4550c21f8cc91a6bf7780847efe8c69c60168226f968f0d1b832e06ca9961eeb1b57667915005c44be78e0c352985ca945cd12eea6ad83dd5fb16a25b1adbb59

data/lib/isodoc/un/base_convert.rb

@@ -31,6 +31,11 @@ module IsoDoc
 
         false
       end
+
+      def convert_i18n_init1(docxml)
+        super
+        docxml.xpath(ns("//bibdata/language")).size > 1 and @lang = "en"
+      end
     end
   end
 end

data/lib/isodoc/un/html/html_unece_intro.html

@@ -6,7 +6,6 @@
 {% endif %}
 
 <nav>
-  <h1 id="content">{{ labels["table_of_contents"] }}</h1>
   <div id="toc"></div>
 
 </nav>

data/lib/isodoc/un/html/word_unece_intro.html

@@ -8,8 +8,3 @@
 <div id="preface_container"/>
 {% endif %}
 
-{% if toc %}
-<p class="zzContents" style='margin-top:0cm'><span lang="EN-GB">{{ labels["table_of_contents"] }}</span></p>
-
-WORDTOC
-{% endif %}

data/lib/isodoc/un/html_convert.rb

@@ -68,12 +68,7 @@ module IsoDoc
       def make_body3(body, docxml)
         body.div class: "main-section" do |div3|
           boilerplate docxml, div3
-          preface_block docxml, div3
-          abstract docxml, div3
-          foreword docxml, div3
-          introduction docxml, div3
-          preface docxml, div3
-          acknowledgements docxml, div3
+          front docxml, div3
           middle docxml, div3
           footnotes div3
           comments div3
@@ -87,24 +82,22 @@ module IsoDoc
         bibliography isoxml, out
       end
 
-      def introduction(isoxml, out)
-        f = isoxml.at(ns("//introduction")) || return
+      def introduction(clause, out)
         page_break(out)
-        out.div class: "Section3", id: f["id"] do |div|
-          clause_name(f, f.at(ns("./title")), div, { class: "IntroTitle" })
-          f.elements.each do |e|
+        out.div class: "Section3", id: clause["id"] do |div|
+          clause_name(clause, clause.at(ns("./title")), div, { class: "IntroTitle" })
+          clause.elements.each do |e|
             parse(e, div) unless e.name == "title"
           end
         end
       end
 
-      def foreword(isoxml, out)
-        f = isoxml.at(ns("//foreword")) || return
+      def foreword(clause, out)
         page_break(out)
-        out.div **attr_code(id: f["id"]) do |s|
-          clause_name(f, f.at(ns("./title")) || @i18n.foreword, s,
+        out.div **attr_code(id: clause["id"]) do |s|
+          clause_name(clause, clause.at(ns("./title")) || @i18n.foreword, s,
                       class: "ForewordTitle")
-          f.elements.each { |e| parse(e, s) unless e.name == "title" }
+          clause.elements.each { |e| parse(e, s) unless e.name == "title" }
         end
       end
 

data/lib/isodoc/un/presentation_xml_convert.rb

@@ -39,6 +39,11 @@ module IsoDoc
         prefix_name(elem, "<br/>", lbl, "title")
       end
 
+      def toc_title(docxml)
+        @toc or return
+        super
+      end
+
       include Init
     end
   end