metanorma-un 0.10.6 → 0.10.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13fff374aafdafa6d161fede1185537264028684bee832b5f7621bf6a123b59b
-  data.tar.gz: 0c8aa1357775cd80b6e40d8d2ae741de66138677ef5ea2d01ee694b01fcf37c6
+  metadata.gz: c7c45854aea4c72619dbb87420deb144e2074c879cc7ade99cf19f2c55d3194f
+  data.tar.gz: c20d5555a7ed1cd05878113402842e95281f881807904bd6cdd7fc8642e5f21a
 SHA512:
-  metadata.gz: bb1e37afcafb4c86209c90ba71886364bf14ee28533524973b38948d578a06766a7385099cded6e71c88fd8ae38ebb7e443ee63a235014c35847da2a0b18fe98
-  data.tar.gz: 19b02d8f0fc9ff5f5149d1a35d498ceef5b70e15bd1d4ef88576dba0e4c7cea48d164c7c70060d2ca152746c7cf853870edf8c94f0f29bd36b870eb2f629a9af
+  metadata.gz: 4dd0dd4b0b94377c146c5994899dba8da5ea5dd1dd9247d10567c601320b38535917f63ab9cfecdaba3d3170bb568125297d36ee3714fc2f1d032150639b65b3
+  data.tar.gz: e232807d3106fff96e09a44bb5ed661637ccfbe180d86ee18dfa07e45fbf1d1252a27b1a50a489740389ce257d6b1642fccc49cea13756c77ff086268427854e

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