metanorma-itu 2.2.9 → 2.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 735608fd24b2767257388a61ff50f39bf4cd7b96fc51c068cccf49e5172cadb9
-  data.tar.gz: 2b3219c15dd78b22c78c167fd0511ae9a0745311393000399b0aab346cf65a34
+  metadata.gz: 34fd70f326f5d59da1151d44bb78211515837f388ac91eff8a9107f0b793ffb0
+  data.tar.gz: 1cbb63aa20b86b9d7b23dcde0f85c038cdfd8eead38c91399986332678e72c02
 SHA512:
-  metadata.gz: 68028cb6db40348b7523a315f2ebefaffa62000188118e0e4c901f71e835ba185b5a11b9eb35a8b6243aa92f041ca48945dfde8b7f358316ce9d67d95f2beaf7
-  data.tar.gz: ea549a061785f953f480fafe89511aa3a92825d84ac601dc9868908b36735717da5c42dca6850991e12d6daa06fbe3c188eac31f7d027506275fabb364db70ec
+  metadata.gz: a5ffd918a02cc6872d116ba3443a5c4b5a8dff5fa8a86e8fc26dba3149b59415e851ff6ca85a7f6bfc0b784ba429a7694e831f5e896ea883629cac16f2bfdd94
+  data.tar.gz: 731035bab592506b06ac5d15e77484a6573da11fa6b337cded4c9b15952be0c917fcf5dd08b614d56bfd7e72934ea282132280b5f51d2176fe5c481bce8f2f9d

data/lib/isodoc/itu/base_convert.rb

@@ -11,20 +11,28 @@ module IsoDoc
       FRONT_CLAUSE = "//*[parent::preface]" \
                      "[not(local-name() = 'abstract')]".freeze
 
-      def preface(isoxml, out)
-        isoxml.xpath(ns(FRONT_CLAUSE)).each do |c|
-          next unless is_clause?(c.name)
-
-          title = c&.at(ns("./title"))
-          out.div **attr_code(clause_attrs(c)) do |s|
-            clause_name(c, title, s, class: "IntroTitle")
-            c.elements.reject { |c1| c1.name == "title" }.each do |c1|
-              parse(c1, s)
-            end
+      def introduction(clause, out)
+        title = clause.at(ns("./title"))
+        out.div **attr_code(clause_attrs(clause)) do |s|
+          clause_name(clause, title, s, class: "IntroTitle")
+          clause.elements.reject { |c1| c1.name == "title" }.each do |c1|
+            parse(c1, s)
           end
         end
       end
 
+      def foreword(clause, out)
+        introduction(clause, out)
+      end
+
+      def acknowledgements(clause, out)
+        introduction(clause, out)
+      end
+
+      def preface_normal(clause, out)
+        introduction(clause, out)
+      end
+
       def clausedelim
         ""
       end
@@ -53,7 +61,7 @@ module IsoDoc
       end
 
       def annex_name(annex, name, div)
-        #preceding_floating_titles(name, div)
+        # preceding_floating_titles(name, div)
         r_a = @meta.get[:doctype_original] == "recommendation-annex"
         div.h1 class: r_a ? "RecommendationAnnex" : "Annex" do |t|
           name&.children&.each { |c2| parse(c2, t) }

data/lib/isodoc/itu/html/html_itu_intro.html

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

data/lib/isodoc/itu/html/word_itu_intro.html

@@ -166,19 +166,4 @@ style='mso-ansi-language:EN-US'><o:p>&#xa0;</o:p></span></span></p>
 <div id="boilerplate-license-destination"/>
 <div id="boilerplate-copyright-destination"/>
 
-  {% if doctype != "Resolution" %}
-<b style='mso-bidi-font-weight:normal'><span lang="EN-US" style='font-size:12.0pt;
-mso-bidi-font-size:10.0pt;font-family:"Times New Roman",serif;mso-fareast-font-family:
-"Times New Roman";mso-ansi-language:EN-US;mso-fareast-language:EN-US;
-mso-bidi-language:AR-SA'><br clear="all" style='page-break-before:always'/>
-</span></b>
-
-<p class="MsoNormal" align="center" style='text-align:center'>
-<b>{{ labels["table_of_contents"] }}</b></p>
-<p class="MsoNormal" style='tab-stops:right 17.0cm'><span style='mso-tab-count:1'/>
-  <b>{{ labels["page"] }}</b></p>
-
-WORDTOC
-
-{% endif %}
 {% endif %}

data/lib/isodoc/itu/html_convert.rb

@@ -60,9 +60,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
-          preface docxml, div3
+          front docxml, div3
           middle docxml, div3
           footnotes div3
           comments div3