metanorma-itu 2.2.8 → 2.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 445ba87d63596d4fdf7e4d574f479da16fb1c39d3403219977dc1b4c26b20d55
-  data.tar.gz: 245242e1ef0b6a2459725af2ee27f3519cbf058ef5e66aa5b65c43d7b8c4148f
+  metadata.gz: 1af172c1828172865a7029d57fd81240dff5b4440bf52f932dd7f93de4f5c301
+  data.tar.gz: 07d819996e52440f7fc8804b3a055f092102fa708f39f452f6c8d14894901bf6
 SHA512:
-  metadata.gz: f6c06789d6ad416c5971c2515f52a3daae2942b7673cb0fdfa53386a46a7b31cfcb2ecce093ec037dd754efbc776d0430a801590bfe3a803cd575c2fae4a0db0
-  data.tar.gz: dafc2854942bdc297170369b910e7e83d5eb54106ca78d4c01b256dbd3496a880573302a5a16f31d3a612e2421fc304818642da3029b217ca31f55d2150832ed
+  metadata.gz: f6a92e2a27586126bc38a19210844fac81e37f7c44474bab78eee01babe53499be3759552870f65adec068dc7d2dcdc596b5404fd65b6e0d76c98cc65bf3b268
+  data.tar.gz: e8058feafc43953d36a3c6324eb8cdb348a08c723df5614c076b0c112e1bfe51c87261526f461a189c729d40c6d7e579ec147df3245a444c4d59d27b2f2a4968

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/word_itu_titlepage_sp.html

@@ -5,16 +5,21 @@ direction:rtl;unicode-bidi:embed'><i><span lang="EN-GB" dir="LTR" style='font-si
 
 {%  if lang == "zh" %}
 <p class="MsoNormal" align="center" style='margin-top:0cm;text-align:center'><i><span
-                     lang="EN-GB" style='font-size:10.0pt'>国际电联{{ pubdate_ddMMMyyyy }}第{{ docnumeric }}期</span></i></p>
+                     lang="{{ lang }}" style='font-size:10.0pt'>国际电联{{ pubdate_ddMMMyyyy }}第{{ docnumeric }}期</span></i></p>
 
 <p class="MsoNormal" align="center" style='margin-top:0cm;text-align:center'><i><span
-lang="EN-GB" style='font-size:10.0pt'>《操作公报》附件</span></i></p>
+                     lang="{{ lang }}" style='font-size:10.0pt'>《操作公报》附件</span></i></p>
 {% else %}
-<p class="MsoNormal" align="center" style='margin-top:0cm;text-align:center'><i><span
-lang="EN-GB" style='font-size:10.0pt'>{{ annex_to_itu_ob }}</span></i></p>
+<p class="MsoNormal" align="center" style='margin-top:0cm;text-align:center'>{% if lang != "ar" %}<i>{% endif %}<span
+                     lang="{{ lang }}" style='font-size:10.0pt'>{{ labels["annex_to_itu_ob"] }}</span>{% if lang != "ar" %}</i>{% endif %}</p>
 
+{% if lang == "ar" %}
+<p class="MsoNormal" align="center" style='margin-top:0cm;text-align:center'><span
+                     lang="{{ lang }}" style='font-size:10.0pt'>{{ docnumeric }} – {{ pubdate_ddMMMyyyy }} {{ labels["number_abbrev"] }}</span></p>
+{% else %}
 <p class="MsoNormal" align="center" style='margin-top:0cm;text-align:center'><i><span
-lang="EN-GB" style='font-size:10.0pt'>{{ number_abbrev }} {{ docnumeric }} – {{ pubdate_ddMMMyyyy }}</span></i></p>
+                     lang="{{ lang }}" style='font-size:10.0pt'>{{ labels["number_abbrev"] }} {{ docnumeric }} – {{ pubdate_ddMMMyyyy }}</span></i></p>
+{% endif %}
 {% endif %}
 {% if docnumber_td %}<p><span class="doc-identifier">TD number: {{docnumber_td}}</span></p>{%endif%}
 {% if docnumber_provisional %}<p><span class="doc-identifier">Provisional identifier: {{docnumber_provisional}}</span></p>{%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