metanorma-itu 1.2.10 → 1.2.11

data/lib/isodoc/itu/cleanup.rb

@@ -0,0 +1,55 @@
+module IsoDoc
+  module ITU
+    module BaseConvert
+      def cleanup(docxml)
+        super
+        term_cleanup(docxml)
+        refs_cleanup(docxml)
+        title_cleanup(docxml)
+      end
+
+      def title_cleanup(docxml)
+        docxml.xpath("//h1[@class = 'RecommendationAnnex']").each do |h|
+          h.name = "p"
+          h["class"] = "h1Annex"
+        end
+        docxml
+      end
+
+      def term_cleanup(docxml)
+        term_cleanup1(docxml)
+        term_cleanup2(docxml)
+        docxml
+      end
+
+      def term_cleanup1(docxml)
+        docxml.xpath("//p[@class = 'Terms']").each do |d|
+          h2 = d.at("./preceding-sibling::*[@class = 'TermNum'][1]")
+          d.children.first.previous = "<b>#{h2.children.to_xml}</b>&nbsp;"
+          d["id"] = h2["id"]
+          h2.remove
+        end
+      end
+
+      def term_cleanup2(docxml)
+        docxml.xpath("//p[@class = 'TermNum']").each do |d|
+          d1 = d.next_element and d1.name == "p" or next
+          d1.children.each { |e| e.parent = d }
+          d1.remove
+        end
+      end
+
+      def refs_cleanup(docxml)
+        docxml.xpath("//tx[following-sibling::tx]").each do |tx|
+          tx << tx.next_element.remove.children
+        end
+        docxml.xpath("//tx").each do |tx|
+          tx.name = "td"
+          tx["colspan"] = "2"
+          tx.wrap("<tr></tr>")
+        end
+        docxml
+      end
+    end
+  end
+end

data/lib/isodoc/itu/html/header.html

@@ -115,7 +115,7 @@ MERGEFORMAT </span><span lang=EN-GB style='font-weight:normal'><span
 style='mso-element:field-separator'></span></span><![endif]--><span lang=FR-CH
 style='mso-ansi-language:FR-CH;font-weight:normal;mso-no-proof:yes'>ii</span><!--[if supportFields]><span
 lang=EN-GB style='font-weight:normal'><span style='mso-element:field-end'></span></span><![endif]--><span
-                      lang=FR-CH style='mso-ansi-language:FR-CH'><span style='mso-tab-count:1'>              </span>{% if doctype_abbreviated %}{{ doctype_abbreviated }} {% endif %}{% if docnumber_lang %}{{docnumber_lang}}{% else %}{{ docnumber }}{% endif %} {% if amendmentid %}{{ amendmentid }}{% endif %} {% if corrigendumid %}{{ corrigendumid }}{% endif %} ({{ pubdate_monthyear }})<o:p></o:p></span></p>
+                      lang=FR-CH style='mso-ansi-language:FR-CH'><span style='mso-tab-count:1'>              </span>{% if doctype == "Resolution" %}{{ meeting_acronym }} &#x2013; {{ doctype }} {{ docnumber}}{% else %}{% if doctype_abbreviated %}{{ doctype_abbreviated }} {% endif %}{% if docnumber_lang %}{{docnumber_lang}}{% else %}{{ docnumber }}{% endif %} {% if amendmentid %}{{ amendmentid }}{% endif %} {% if corrigendumid %}{{ corrigendumid }}{% endif %} ({{ pubdate_monthyear }}){% endif %}<o:p></o:p></span></p>
 </div>
 
 <div style='mso-element:footer' id=ef2l>
@@ -127,11 +127,12 @@ MERGEFORMAT </span><span lang=EN-GB style='font-weight:normal'><span
 style='mso-element:field-separator'></span></span><![endif]--><span lang=FR-CH
 style='mso-ansi-language:FR-CH;font-weight:normal;mso-no-proof:yes'>ii</span><!--[if supportFields]><span
 lang=EN-GB style='font-weight:normal'><span style='mso-element:field-end'></span></span><![endif]--><span
-lang=FR-CH style='mso-ansi-language:FR-CH'><span style='mso-tab-count:1'>              </span>{% if doctype_abbreviated %}{{ doctype_abbreviated }} {% endif %}{% if docnumber_lang %}{{docnumber_lang}}{% else %}{{ docnumber }}{% endif %} {% if amendmentid %}{{ amendmentid }}{% endif %} {% if corrigendumid %}{{ corrigendumid }}{% endif %} ({{ pubdate_monthyear }})<o:p></o:p></span></p>
+                      lang=FR-CH style='mso-ansi-language:FR-CH'><span style='mso-tab-count:1'>              </span>{% if doctype == "Resolution" %}{{ meeting_acronym }} &#x2013; {{ doctype }} {{ docnumber}}{% else %}{% if doctype_abbreviated %}{{ doctype_abbreviated }} {% endif %}{% if docnumber_lang %}{{docnumber_lang}}{% else %}{{ docnumber }}{% endif %} {% if amendmentid %}{{ amendmentid }}{% endif %} {% if corrigendumid %}{{ corrigendumid }}{% endif %} ({{ pubdate_monthyear }}){% endif %}</span></p>
 </div>
 
 <div style='mso-element:footer' id=f2>
-<p class=FooterQP style='line-height:12.0pt'><span lang=EN-GB><span style='mso-tab-count:2'>                                                                                                       </span>{% if doctype_abbreviated %}{{ doctype_abbreviated }} {% endif %}{% if docnumber_lang %}{{docnumber_lang}}{% else %}{{ docnumber }}{% endif %} {% if amendmentid %}{{ amendmentid }}{% endif %} {% if corrigendumid %}{{ corrigendumid }}{% endif %} ({{ pubdate_monthyear }})<span style='mso-tab-count:1'>             </span></span><!--[if supportFields]><span
+<p class=FooterQP style='line-height:12.0pt'><span lang=EN-GB><span style='mso-tab-count:2'>                                                                                                       </span>{% if doctype == "Resolution" %}{{ meeting_acronym }} &#x2013; {{ doctype }} {{ docnumber}}{% else %}{% if doctype_abbreviated %}{{ doctype_abbreviated }} {% endif %}{% if docnumber_lang %}{{docnumber_lang}}{% else %}{{ docnumber }}{% endif %} {% if amendmentid %}{{ amendmentid }}{% endif %} {% if corrigendumid %}{{ corrigendumid }}{% endif %} ({{ pubdate_monthyear }}){% endif %}
+  <span style='mso-tab-count:1'>             </span></span><!--[if supportFields]><span
 lang=EN-GB style='font-weight:normal'><span style='mso-element:field-begin'></span>
 PAGE<span style='mso-spacerun:yes'>  </span>\* MERGEFORMAT <span
 style='mso-element:field-separator'></span></span><![endif]--><span lang=EN-GB
@@ -141,7 +142,8 @@ lang=EN-GB style='font-weight:normal'><o:p></o:p></span></p>
 </div>
 
 <div style='mso-element:footer' id=f2l>
-<p class=FooterQPLandscape style='line-height:12.0pt'><span lang=EN-GB><span style='mso-tab-count:2'>                                                                                                       </span>{% if doctype_abbreviated %}{{ doctype_abbreviated }} {% endif %}{% if docnumber_lang %}{{docnumber_lang}}{% else %}{{ docnumber }}{% endif %} {% if amendmentid %}{{ amendmentid }}{% endif %} {% if corrigendumid %}{{ corrigendumid }}{% endif %} ({{ pubdate_monthyear }})<span style='mso-tab-count:1'>             </span></span><!--[if supportFields]><span
+<p class=FooterQPLandscape style='line-height:12.0pt'><span lang=EN-GB><span style='mso-tab-count:2'>                                                                                                       </span>{% if doctype == "Resolution" %}{{ meeting_acronym }} &#x2013; {{ doctype }} {{ docnumber}}{% else %}{% if doctype_abbreviated %}{{ doctype_abbreviated }} {% endif %}{% if docnumber_lang %}{{docnumber_lang}}{% else %}{{ docnumber }}{% endif %} {% if amendmentid %}{{ amendmentid }}{% endif %} {% if corrigendumid %}{{ corrigendumid }}{% endif %} ({{ pubdate_monthyear }}){% endif %}
+  <span style='mso-tab-count:1'>             </span></span><!--[if supportFields]><span
 lang=EN-GB style='font-weight:normal'><span style='mso-element:field-begin'></span>
 PAGE<span style='mso-spacerun:yes'>  </span>\* MERGEFORMAT <span
 style='mso-element:field-separator'></span></span><![endif]--><span lang=EN-GB
@@ -159,7 +161,7 @@ MERGEFORMAT </span><span lang=EN-GB style='font-weight:normal'><span
 style='mso-element:field-separator'></span></span><![endif]--><span lang=FR-CH
 style='mso-ansi-language:FR-CH;font-weight:normal;mso-no-proof:yes'>ii</span><!--[if supportFields]><span
 lang=EN-GB style='font-weight:normal'><span style='mso-element:field-end'></span></span><![endif]--><span
-lang=FR-CH style='mso-ansi-language:FR-CH'><span style='mso-tab-count:1'>              </span>{% if doctype_abbreviated %}{{ doctype_abbreviated }} {% endif %}{% if docnumber_lang %}{{docnumber_lang}}{% else %}{{ docnumber }}{% endif %} {% if amendmentid %}{{ amendmentid }}{% endif %} {% if corrigendumid %}{{ corrigendumid }}{% endif %} ({{ pubdate_monthyear }})<o:p></o:p></span></p>
+                      lang=FR-CH style='mso-ansi-language:FR-CH'><span style='mso-tab-count:1'>              </span>{% if doctype == "Resolution" %}{{ meeting_acronym }} &#x2013; {{ doctype }} {{ docnumber}}{% else %}{% if doctype_abbreviated %}{{ doctype_abbreviated }} {% endif %}{% if docnumber_lang %}{{docnumber_lang}}{% else %}{{ docnumber }}{% endif %} {% if amendmentid %}{{ amendmentid }}{% endif %} {% if corrigendumid %}{{ corrigendumid }}{% endif %} ({{ pubdate_monthyear }}){% endif %}</span></p>
 </div>
 
 <div style='mso-element:footer' id=ef3l>
@@ -171,11 +173,12 @@ MERGEFORMAT </span><span lang=EN-GB style='font-weight:normal'><span
 style='mso-element:field-separator'></span></span><![endif]--><span lang=FR-CH
 style='mso-ansi-language:FR-CH;font-weight:normal;mso-no-proof:yes'>ii</span><!--[if supportFields]><span
 lang=EN-GB style='font-weight:normal'><span style='mso-element:field-end'></span></span><![endif]--><span
-lang=FR-CH style='mso-ansi-language:FR-CH'><span style='mso-tab-count:1'>              </span>{% if doctype_abbreviated %}{{ doctype_abbreviated }} {% endif %}{% if docnumber_lang %}{{docnumber_lang}}{% else %}{{ docnumber }}{% endif %} {% if amendmentid %}{{ amendmentid }}{% endif %} {% if corrigendumid %}{{ corrigendumid }}{% endif %} ({{ pubdate_monthyear }})<o:p></o:p></span></p>
+                      lang=FR-CH style='mso-ansi-language:FR-CH'><span style='mso-tab-count:1'>              </span>{% if doctype == "Resolution" %}{{ meeting_acronym }} &#x2013; {{ doctype }} {{ docnumber}}{% else %}{% if doctype_abbreviated %}{{ doctype_abbreviated }} {% endif %}{% if docnumber_lang %}{{docnumber_lang}}{% else %}{{ docnumber }}{% endif %} {% if amendmentid %}{{ amendmentid }}{% endif %} {% if corrigendumid %}{{ corrigendumid }}{% endif %} ({{ pubdate_monthyear }}){% endif %}</span></p>
 </div>
 
 <div style='mso-element:footer' id=f3>
-<p class=FooterQP style='line-height:12.0pt'><span lang=EN-GB><span style='mso-tab-count:2'>                                                                                                       </span>{% if doctype_abbreviated %}{{ doctype_abbreviated }} {% endif %}{% if docnumber_lang %}{{docnumber_lang}}{% else %}{{ docnumber }}{% endif %} {% if amendmentid %}{{ amendmentid }}{% endif %} {% if corrigendumid %}{{ corrigendumid }}{% endif %}  ({{ pubdate_monthyear }})<span style='mso-tab-count:1'>             </span></span><!--[if supportFields]><span
+<p class=FooterQP style='line-height:12.0pt'><span lang=EN-GB><span style='mso-tab-count:2'>                                                                                                       </span>{% if doctype == "Resolution" %}{{ meeting_acronym }} &#x2013; {{ doctype }} {{ docnumber}}{% else %}{% if doctype_abbreviated %}{{ doctype_abbreviated }} {% endif %}{% if docnumber_lang %}{{docnumber_lang}}{% else %}{{ docnumber }}{% endif %} {% if amendmentid %}{{ amendmentid }}{% endif %} {% if corrigendumid %}{{ corrigendumid }}{% endif %} ({{ pubdate_monthyear }}){% endif %}
+  <span style='mso-tab-count:1'>             </span></span><!--[if supportFields]><span
 lang=EN-GB style='font-weight:normal'><span style='mso-element:field-begin'></span>
 PAGE<span style='mso-spacerun:yes'>  </span>\* MERGEFORMAT <span
 style='mso-element:field-separator'></span></span><![endif]--><span lang=EN-GB
@@ -185,7 +188,8 @@ lang=EN-GB style='font-weight:normal'><o:p></o:p></span></p>
 </div>
 
 <div style='mso-element:footer' id=f3l>
-<p class=FooterQPLandscape style='line-height:12.0pt'><span lang=EN-GB><span style='mso-tab-count:2'>                                                                                                       </span>{% if doctype_abbreviated %}{{ doctype_abbreviated }} {% endif %}{% if docnumber_lang %}{{docnumber_lang}}{% else %}{{ docnumber }}{% endif %} {% if amendmentid %}{{ amendmentid }}{% endif %} {% if corrigendumid %}{{ corrigendumid }}{% endif %} ({{ pubdate_monthyear }})<span style='mso-tab-count:1'>             </span></span><!--[if supportFields]><span
+<p class=FooterQPLandscape style='line-height:12.0pt'><span lang=EN-GB><span style='mso-tab-count:2'>                                                                                                       </span>{% if doctype == "Resolution" %}{{ meeting_acronym }} &#x2013; {{ doctype }} {{ docnumber}}{% else %}{% if doctype_abbreviated %}{{ doctype_abbreviated }} {% endif %}{% if docnumber_lang %}{{docnumber_lang}}{% else %}{{ docnumber }}{% endif %} {% if amendmentid %}{{ amendmentid }}{% endif %} {% if corrigendumid %}{{ corrigendumid }}{% endif %} ({{ pubdate_monthyear }}){% endif %}
+  <span style='mso-tab-count:1'>             </span></span><!--[if supportFields]><span
 lang=EN-GB style='font-weight:normal'><span style='mso-element:field-begin'></span>
 PAGE<span style='mso-spacerun:yes'>  </span>\* MERGEFORMAT <span
 style='mso-element:field-separator'></span></span><![endif]--><span lang=EN-GB

data/lib/isodoc/itu/html/html_itu_titlepage.html

@@ -43,15 +43,17 @@
 
         <div class="doc-info-left">
           <div class="doc-identifier">
-            {{ docnumeric }}
+            {% if doctype != "Recommendation" %}{{doctype }} {% endif %}{{ docnumeric }}
             {% if amendmentid %}<div class="doc-subidentifier">{{ amendmentid }}</div>{% endif %} 
             {% if corrigendumid %}<div class="doc-subidentifier">{{ corrigendumid }}</div>{% endif %}       
             {% if edition %} <div> Revision {{ edition }}</div> {% endif %}
             <div> {{ draftinfo }}</div>
           </div>
+          {% if pubdate_monthyear %}
           <div class="publication-month">
             ({{ pubdate_monthyear }})
           </div>
+          {% endif %}
         </div>
 
         <div class="doc-category">
@@ -61,11 +63,21 @@
         </div>
 
         <div class="coverpage-title">
-          <span class="doc-series">{% if series %}Series {{ series }}{% endif %}</span>
-
+          {% if series %}
+          <span class="doc-series">Series {{ series }}</span>
+          {% endif %}
+            {% if series1 %}
           <span class="doc-subSeries">
             {{ series1 }} {% if series2 %}&mdash; {{ series2 }}{% endif %}
           </span>
+            {% endif %}
+        {% if meeting %}
+          <span class="doc-series">{{ meeting | upcase }}</span>
+        {% endif %}
+        {% if meeting_place or meeting_date %}
+        <span class="doc-subSeries">{{ meeting_place }}{% if meeting_place and meeting_date %}, {% endif %}{{ meeting_date }}</span>
+        {% endif %}
+
           <span class="doc-title">{{ doctitle }}</span>
           {% if docsubtitle %}
           <br/><span class="doc-subtitle">{{ docsubtitle }}</span>

data/lib/isodoc/itu/html/htmlstyle.css

@@ -145,16 +145,16 @@ a.FootnoteRef + a.FootnoteRef:before {
   border-bottom: solid 3px #a3d88f; }
 
 #technical-paper-band {
-  background-color: #53dd6c; }
+  background-color: #ff6b6b; }
 
 #technical-paper {
-  border-bottom: solid 3px #53dd6c; }
+  border-bottom: solid 3px #ff6b6b; }
 
 #technical-report-band {
-  background-color: #53dd6c; }
+  background-color: #ff6b6b; }
 
 #technical-report {
-  border-bottom: solid 3px #53dd6c; }
+  border-bottom: solid 3px #ff6b6b; }
 
 #focus-group-band {
   background-color: #750697; }
@@ -169,10 +169,10 @@ a.FootnoteRef + a.FootnoteRef:before {
   border-bottom: solid 3px #750697; }
 
 #joint-itu-iso-iec-band {
-  background-color: #48a0e7; }
+  background-color: #edc9ff; }
 
 #joint-itu-iso-iec {
-  border-bottom: solid 3px #48a0e7; }
+  border-bottom: solid 3px #edc9ff; }
 
 #service-publication-band {
   background-color: #750697; }
@@ -180,6 +180,24 @@ a.FootnoteRef + a.FootnoteRef:before {
 #service-publication {
   border-bottom: solid 3px #750697; }
 
+#resolution-band {
+  background-color: #f2b79f; }
+
+#resolution {
+  border-bottom: solid 3px #f2b79f; }
+
+#handbook-band {
+  background-color: #750697; }
+
+#handbook {
+  border-bottom: solid 3px #750697; }
+
+#question-band {
+  background-color: #750697; }
+
+#question {
+  border-bottom: solid 3px #750697; }
+
 #in-force-band {
   background-color: #d9f39d; }
 
@@ -357,16 +375,16 @@ a.FootnoteRef + a.FootnoteRef:before {
   border-bottom: solid 3px #a3d88f; }
 
 #technical-paper-band {
-  background-color: #53dd6c; }
+  background-color: #ff6b6b; }
 
 #technical-paper {
-  border-bottom: solid 3px #53dd6c; }
+  border-bottom: solid 3px #ff6b6b; }
 
 #technical-report-band {
-  background-color: #53dd6c; }
+  background-color: #ff6b6b; }
 
 #technical-report {
-  border-bottom: solid 3px #53dd6c; }
+  border-bottom: solid 3px #ff6b6b; }
 
 #focus-group-band {
   background-color: #750697; }
@@ -381,10 +399,10 @@ a.FootnoteRef + a.FootnoteRef:before {
   border-bottom: solid 3px #750697; }
 
 #joint-itu-iso-iec-band {
-  background-color: #48a0e7; }
+  background-color: #edc9ff; }
 
 #joint-itu-iso-iec {
-  border-bottom: solid 3px #48a0e7; }
+  border-bottom: solid 3px #edc9ff; }
 
 #service-publication-band {
   background-color: #750697; }
@@ -392,6 +410,24 @@ a.FootnoteRef + a.FootnoteRef:before {
 #service-publication {
   border-bottom: solid 3px #750697; }
 
+#resolution-band {
+  background-color: #f2b79f; }
+
+#resolution {
+  border-bottom: solid 3px #f2b79f; }
+
+#handbook-band {
+  background-color: #750697; }
+
+#handbook {
+  border-bottom: solid 3px #750697; }
+
+#question-band {
+  background-color: #750697; }
+
+#question {
+  border-bottom: solid 3px #750697; }
+
 #in-force-band {
   background-color: #d9f39d; }
 

data/lib/isodoc/itu/html/htmlstyle.scss

@@ -1,5 +1,6 @@
 $recBandColor: #a3d88f;
-$tecPaperColor: #53dd6c;
+$tecPaperColor: #ff6b6b;
+$guidePaperColor: #750697;
 $doctype-colors-list: (
   recommendation: $recBandColor,
   recommendation-amendment: $recBandColor,
@@ -9,10 +10,13 @@ $doctype-colors-list: (
   recommendation-annex: $recBandColor,
   technical-paper: $tecPaperColor,
   technical-report: $tecPaperColor,
-  focus-group: #750697,
-  implementers-guide: #750697,
-  joint-itu-iso-iec: #48a0e7,
-  service-publication: #750697
+  focus-group: $guidePaperColor,
+  implementers-guide: $guidePaperColor,
+  joint-itu-iso-iec: #edc9ff,
+  service-publication: $guidePaperColor,
+  resolution: #f2b79f,
+  handbook: $guidePaperColor,
+  question: $guidePaperColor
 );
 
 

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

@@ -1,3 +1,4 @@
+{% if doctype != "Resolution" %}
 <table class=MsoNormalTable border=0 cellspacing=0 cellpadding=0
  style='border-collapse:collapse;mso-table-layout-alt:fixed;mso-padding-alt:
  0cm 5.4pt 0cm 5.4pt'>
@@ -153,16 +154,20 @@ style='mso-ansi-language:EN-US'><o:p>&nbsp;</o:p></span></span></p>
 
 <p class=MsoNormal><span style='mso-bookmark:_Hlk526346232'><span lang=EN-US
 style='mso-ansi-language:EN-US'><o:p>&nbsp;</o:p></span></span></p>
+{% endif %}
 
   {% if doctype == "Service Publication" %}
   {% else %}
+  {% if doctype != "Resolution" %}
 <p><br clear=all
          style='page-break-before:always'></p>
+{% endif %}
 
 <div id="boilerplate-legal-destination"/>
 <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;
@@ -177,3 +182,4 @@ mso-bidi-language:AR-SA'><br clear=all style='page-break-before:always'>
 WORDTOC
 
 {% endif %}
+{% endif %}

data/lib/isodoc/itu/html/word_itu_titlepage.html

@@ -206,9 +206,13 @@
   <span style='mso-bookmark:_Hlk526346232'></span>
   <td width="400" colspan="2" valign="top" style='width:300.0pt;padding:0cm 4.25pt 0cm 4.25pt'>
   <p class="MsoNormal" align="right" style='margin-top:12.0pt;text-align:right'><span
-  style='mso-bookmark:_Hlk526346232'><a name="dnume"><b style='mso-bidi-font-weight:
+  style='mso-bookmark:_Hlk526346232'>
+    {% if doctype != "Resolution" %}
+    <a name="dnume"><b style='mso-bidi-font-weight:
   normal'><span lang="EN-US" style='font-size:30.0pt;mso-bidi-font-size:10.0pt;
-  font-family:"Arial",sans-serif;mso-ansi-language:EN-US'>{% if doctype == "Recommendation" %}{{ docnumeric }}{% else %}{% if recommendationnumber %}{{ recommendationnumber }} {% endif %}{{ doctype_display }}{% endif %}<o:p></o:p></span></b></a></span></p>
+  font-family:"Arial",sans-serif;mso-ansi-language:EN-US'>{% if doctype == "Recommendation" %}{{ docnumeric }}{% else %}{% if recommendationnumber %}{{ recommendationnumber }} {% endif %}{{ doctype_display }}{% endif %}<o:p></o:p></span></b></a>
+    {% endif %}
+  </span></p>
   </td>
   <span style='mso-bookmark:_Hlk526346232'><span style='mso-bookmark:dnume'></span></span>
  </tr>
@@ -294,14 +298,28 @@
   <td width="569" colspan="4" valign="bottom" style='width:426.5pt;border:none;
   border-bottom:solid windowtext 1.5pt;padding:0cm 5.4pt 0cm 5.4pt;height:6.0cm;
   mso-height-rule:exactly'>
+    {% if series %}
   <p class="MsoNormal" align="left" style='text-align:left;tab-stops:39.7pt 59.55pt 79.4pt 99.25pt right 17.0cm'><span
   style='mso-bookmark:_Hlk526346232'><a name="dsece"><span lang="EN-US"
   style='font-size:16.0pt;mso-bidi-font-size:10.0pt;font-family:"Arial",sans-serif;
-  mso-ansi-language:EN-US'>{% if series %}SERIES {{ series | upcase }}{% endif %}<o:p></o:p></span></a></span></p>
+  mso-ansi-language:EN-US'>SERIES {{ series | upcase }}<o:p></o:p></span></a></span></p>
+  {% endif %}
+  {% if series1 %}
   <p class="MsoNormal" align="left" style='text-align:left;tab-stops:39.7pt 59.55pt 79.4pt 99.25pt right 17.0cm'><span
   style='mso-bookmark:_Hlk526346232'><span style='mso-bookmark:dsece'><span
   lang="EN-US" style='font-size:16.0pt;mso-bidi-font-size:10.0pt;font-family:
   "Arial",sans-serif;mso-ansi-language:EN-US'>{{ series1 }}&#xA0;{% if series2 %}&#x2014;{% endif %}{{ series2 }}<o:p></o:p></span></span></span></p>
+  {% endif %}
+      {% if meeting %}
+  <p class="MsoNormal" align="left" style='text-align:left;tab-stops:39.7pt 59.55pt 79.4pt 99.25pt right 17.0cm'><span
+  style='mso-bookmark:_Hlk526346232'><a name="dsece"><span lang="EN-US"
+  style='font-size:16.0pt;mso-bidi-font-size:10.0pt;font-family:"Arial",sans-serif;
+  mso-ansi-language:EN-US'>{{ meeting | upcase }}<o:p></o:p></span></a></span></p>
+  {% endif %}
+  {% if meeting_place or meeting_date %}
+  <p class="MsoNormal" align="left" style='text-align:left;tab-stops:39.7pt 59.55pt 79.4pt 99.25pt right 17.0cm'><span
+  lang="EN-US" style='font-size:16.0pt;mso-bidi-font-size:10.0pt;font-family:"Arial",sans-serif;mso-ansi-language:EN-US'>{{ meeting_place }}{% if meeting_place and meeting_date %}, {% endif %}{{ meeting_date }}</span></p>
+  {% endif %}
   <span style='mso-bookmark:_Hlk526346232'><span style='mso-bookmark:dsece'></span></span>
   <p class="MsoNormal" align="left" style='text-align:left;tab-stops:39.7pt 59.55pt 79.4pt 99.25pt right 17.0cm'><span
   style='mso-bookmark:_Hlk526346232'><span style='mso-bookmark:dsece'><span
@@ -332,7 +350,8 @@
   {% if amendmentid %}<br/><b>{{ amendmentid }}{% if amendmenttitle %}: {{ amendmenttitle }}{% endif %}</b>{% endif %}
   {% if corrigendumid %}<br/><b>{{ corrigendumid }}{% if corrigendumtitle %}: {{ corrigendumtitle }}{% endif %}</b>{% endif %}
   {% else %}
-  <b>{% if doctype != "Recommendation" %}{{ docnumeric }}<br/>{% endif %}{{ doctitle }}</b>
+  <b>{% if doctype != "Recommendation" and doctype != "Resolution" %}{{ docnumeric }}
+    <br/>{% endif %}{% if doctype == "Resolution" %}{{ doctype_display }} {% endif %}{{ doctitle }}</b>
   {% if positiontitle %}<br/><br/>{{ positiontitle | upcase }}{% endif %}
   {% endif %}</span>
   </a></span><span
@@ -383,10 +402,14 @@
   height:70.9pt;mso-height-rule:exactly'>
   <p class="MsoNormal" align="left" style='margin-top:3.0pt;margin-right:0cm;
   margin-bottom:12.0pt;margin-left:0cm;text-align:left;tab-stops:39.7pt 59.55pt 79.4pt 99.25pt right 17.0cm'><span
-  style='mso-bookmark:_Hlk526346232'><a name="dnum2e"></a><span lang="EN-US"
+  style='mso-bookmark:_Hlk526346232'><a name="dnum2e"></a>
+  {% if doctype != "Resolution" %}
+  <span lang="EN-US"
   style='font-size:16.0pt;mso-bidi-font-size:10.0pt;font-family:"Arial",sans-serif;
   mso-ansi-language:EN-US'>{% if stage == "Draft" %}Draft {% endif %}{% if recommendationnumber %}{{ recommendationnumber }} {% endif %}{{ doctype_display }}<span style='mso-spacerun:yes'> 
-  </span>ITU‑{{ bureau }}<span style='mso-spacerun:yes'>  </span>{{ docnumeric }}<o:p></o:p></span></span></p>
+  </span>ITU‑{{ bureau }}<span style='mso-spacerun:yes'>  </span>{{ docnumeric }}<o:p></o:p></span>
+  {% endif %}
+  </span></p>
   <span style='mso-bookmark:_Hlk526346232'></span>
   <p class="MsoNormal" align="left" style='margin-top:3.0pt;text-align:left;
   tab-stops:39.7pt 59.55pt 79.4pt 99.25pt right 17.0cm'><span style='mso-bookmark:

data/lib/isodoc/itu/html/wordstyle.css

@@ -485,6 +485,9 @@ h1 {
   mso-hyphenate: none;
   font-family: {{headerfont}};
   mso-fareast-font-family: {{headerfont}};
+          {% if doctype == "Resolution" %}
+  text-align: center;
+          {% endif %}
   color: black;
   font-weight: bold;
   mso-font-kerning: 0pt;

data/lib/isodoc/itu/html/wordstyle.scss

@@ -453,6 +453,9 @@ h1
 	mso-hyphenate:none;
 	font-family:$headerfont;
 	mso-fareast-font-family:$headerfont;
+        {% if doctype == "Resolution" %}
+        text-align: center;
+        {% endif %}
     color:black;
 	font-weight:bold;
 	mso-font-kerning:0pt;

data/lib/isodoc/itu/i18n-en.yaml

@@ -17,8 +17,10 @@ inform_annex: (This appendix does not form an integral part of this %.)
 formula: Equation
 inequality: Inequality
 clause: clause
+section: section
 annex_subclause: clause
 in: in
+to: to
 where: "where:"
 blankclause: This clause is intentionally left blank.
 norm_with_refs_pref:
@@ -49,6 +51,7 @@ number_abbrev: No.
 annex_to_itu_ob_abbrev: Annex to ITU OB %
 international_telecommunication_union: International Telecommunication Union
 position_on: (Position on %)
+revision_abbreviation: Rev.
 tsb: TSB
 br: BR
 bdt: BDT
@@ -56,6 +59,7 @@ tsb_full: Telecommunication<br/>Standardization Bureau<br/>of ITU
 br_full: Radiocommunication Bureau<br/>of ITU
 bdt_full: Telecommunication<br/>Development Bureau<br/>of ITU
 doctype_dict:
+  resolution: Resolution
   recommendation: Recommendation
   recommendation-supplement: Recommendation Supplement
   recommendation-amendment: Recommendation Amendment