metanorma-itu 1.2.8 → 1.2.9

Sign up to get free protection for your applications and to get access to all the features.
Files changed (27) hide show
  1. checksums.yaml +4 -4
  2. data/lib/asciidoctor/itu/basicdoc.rng +32 -0
  3. data/lib/asciidoctor/itu/boilerplate.xml +3 -0
  4. data/lib/asciidoctor/itu/front.rb +19 -3
  5. data/lib/asciidoctor/itu/isodoc.rng +15 -0
  6. data/lib/asciidoctor/itu/validate.rb +1 -1
  7. data/lib/isodoc/itu/html/header.html +8 -16
  8. data/lib/isodoc/itu/html/html_itu_intro.html +4 -3
  9. data/lib/isodoc/itu/html/html_itu_titlepage.html +3 -0
  10. data/lib/isodoc/itu/html/htmlstyle.css +12 -0
  11. data/lib/isodoc/itu/html/htmlstyle.scss +1 -0
  12. data/lib/isodoc/itu/html/logo-sp.png +0 -0
  13. data/lib/isodoc/itu/html/word_itu_intro.html +11 -3
  14. data/lib/isodoc/itu/html/word_itu_titlepage.html +5 -1
  15. data/lib/isodoc/itu/html/word_itu_titlepage_sp.html +108 -0
  16. data/lib/isodoc/itu/i18n-en.yaml +28 -0
  17. data/lib/isodoc/itu/itu.recommendation-annex.xsl +65 -28
  18. data/lib/isodoc/itu/itu.recommendation.xsl +65 -28
  19. data/lib/isodoc/itu/itu.resolution.xsl +65 -28
  20. data/lib/isodoc/itu/itu.technical-paper.xsl +65 -28
  21. data/lib/isodoc/itu/itu.technical-report.xsl +65 -28
  22. data/lib/isodoc/itu/metadata.rb +16 -2
  23. data/lib/isodoc/itu/presentation_xml_convert.rb +52 -0
  24. data/lib/isodoc/itu/word_cleanup.rb +1 -0
  25. data/lib/isodoc/itu/word_convert.rb +9 -0
  26. data/lib/metanorma/itu/version.rb +1 -1
  27. metadata +4 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 3a6bada1aaf7b5e637051d16c6ee680dd610219f37f80eddc03a5bd6ac5accbd
4
- data.tar.gz: 1ac0ac45d4c860c4c71e22e2710655251d2afad206624f6daf30f71fcf936552
3
+ metadata.gz: 4a55d05a3d934a812b372c286512e5fb68669e934fdf564af21ec47695680374
4
+ data.tar.gz: c4a84f598551512a1dcd029c5af2b765a8ffa133f2d8f88df6e4b2fe04ff6bce
5
5
  SHA512:
6
- metadata.gz: 632c22a49ec0c545ff27cb8554ec020eb94cc5966da6ccec38e643ec9c30e34a1538793d5dfc3d2311b1a233f3bbbee1460ae433471bc32fcfa7c1bac0431078
7
- data.tar.gz: 97b6073a3c8e1b98aeb09fc1b0b2ee617c7262fdfe46dd35d0f70ffee6d06435ff2cd000aefe27197d61c45854bf170b569862b827d41982e17f0f9963a965c9
6
+ metadata.gz: f5b9e4c6265927997e40bb3178040efde32681cf159a1a33e560b02c0e982b8de2efa5851f161425860e487bb455eeac848c76b14d5823100bd2c5ffd7f8a310
7
+ data.tar.gz: 2e2b8bab79a9085704a8fab36944fe0670ca37758e156e4fac20e67cb713f7337b0cc13a23042296e28ac313c1152cc6ca48212be033ccfffdfb074fbe30f074
data/lib/asciidoctor/itu/basicdoc.rng CHANGED
@@ -596,6 +596,7 @@
596
596
  <ref name="bookmark"/>
597
597
  <ref name="image"/>
598
598
  <ref name="index"/>
599
+ <ref name="index-xref"/>
599
600
  </choice>
600
601
  </define>
601
602
  <define name="PureTextElement">
@@ -737,6 +738,37 @@
737
738
  </optional>
738
739
  </element>
739
740
  </define>
741
+ <define name="index-xref">
742
+ <element name="index-xref">
743
+ <attribute name="also">
744
+ <data type="boolean"/>
745
+ </attribute>
746
+ <element name="primary">
747
+ <oneOrMore>
748
+ <ref name="PureTextElement"/>
749
+ </oneOrMore>
750
+ </element>
751
+ <optional>
752
+ <element name="secondary">
753
+ <oneOrMore>
754
+ <ref name="PureTextElement"/>
755
+ </oneOrMore>
756
+ </element>
757
+ </optional>
758
+ <optional>
759
+ <element name="tertiary">
760
+ <oneOrMore>
761
+ <ref name="PureTextElement"/>
762
+ </oneOrMore>
763
+ </element>
764
+ </optional>
765
+ <element name="target">
766
+ <oneOrMore>
767
+ <ref name="PureTextElement"/>
768
+ </oneOrMore>
769
+ </element>
770
+ </element>
771
+ </define>
740
772
  <!-- bare ID element, used for referencing arbitrary spans of text -->
741
773
  <define name="bookmark">
742
774
  <element name="bookmark">
data/lib/asciidoctor/itu/boilerplate.xml CHANGED
@@ -1,4 +1,6 @@
1
1
  <boilerplate>
2
+ {% if doctype == "Service Publication" %}
3
+ {% else %}
2
4
  <copyright-statement>
3
5
  <clause>
4
6
  <p>&copy; ITU {{ docyear }}</p>
@@ -40,6 +42,7 @@
40
42
  </clause>
41
43
  {% endif %}
42
44
  </legal-statement>
45
+ {% endif %}
43
46
  </boilerplate>
44
47
 
45
48
 
data/lib/asciidoctor/itu/front.rb CHANGED
@@ -126,12 +126,28 @@ module Asciidoctor
126
126
  end
127
127
  end
128
128
 
129
- def itu_id(node, xml)
129
+ ITULANG = {
130
+ "en" => "E", "fr" => "F", "ar" => "A",
131
+ "es" => "S", "zh" => "C", "ru" => "R"
132
+ }.freeze
133
+
134
+ def itu_id1(node, lang)
130
135
  bureau = node.attr("bureau") || "T"
136
+ id = if doctype(node) == "service-publication"
137
+ @i18n.annex_to_itu_ob_abbrev.sub(/%/, node.attr("docnumber"))
138
+ else
139
+ "ITU-#{bureau} #{node.attr("docnumber")}"
140
+ end
141
+ id + (lang ? "-#{ITULANG[@lang]}" : "")
142
+ end
143
+
144
+ def itu_id(node, xml)
131
145
  return unless node.attr("docnumber")
132
146
  xml.docidentifier **{type: "ITU"} do |i|
133
- i << "ITU-#{bureau} "\
134
- "#{node.attr("docnumber")}"
147
+ i << itu_id1(node, false)
148
+ end
149
+ xml.docidentifier **{type: "ITU-lang"} do |i|
150
+ i << itu_id1(node, true)
135
151
  end
136
152
  xml.docnumber { |i| i << node.attr("docnumber") }
137
153
  end
data/lib/asciidoctor/itu/isodoc.rng CHANGED
@@ -246,6 +246,9 @@
246
246
  <data type="boolean"/>
247
247
  </attribute>
248
248
  </optional>
249
+ <optional>
250
+ <ref name="colgroup"/>
251
+ </optional>
249
252
  <optional>
250
253
  <ref name="tname"/>
251
254
  </optional>
@@ -764,6 +767,18 @@
764
767
  </define>
765
768
  </include>
766
769
  <!-- end overrides -->
770
+ <define name="colgroup">
771
+ <element name="colgroup">
772
+ <oneOrMore>
773
+ <ref name="col"/>
774
+ </oneOrMore>
775
+ </element>
776
+ </define>
777
+ <define name="col">
778
+ <element name="col">
779
+ <attribute name="width"/>
780
+ </element>
781
+ </define>
767
782
  <define name="TextElement" combine="choice">
768
783
  <ref name="concept"/>
769
784
  </define>
data/lib/asciidoctor/itu/validate.rb CHANGED
@@ -11,7 +11,7 @@ module Asciidoctor
11
11
  %w(recommendation recommendation-supplement recommendation-amendment
12
12
  recommendation-corrigendum recommendation-errata recommendation-annex
13
13
  focus-group implementers-guide technical-paper technical-report
14
- joint-itu-iso-iec).include? doctype or
14
+ joint-itu-iso-iec service-publication).include? doctype or
15
15
  @log.add("Document Attributes", nil,
16
16
  "#{doctype} is not a recognised document type")
17
17
  end
data/lib/isodoc/itu/html/header.html CHANGED
@@ -115,8 +115,7 @@ MERGEFORMAT </span><span lang=EN-GB style='font-weight:normal'><span
115
115
  style='mso-element:field-separator'></span></span><![endif]--><span lang=FR-CH
116
116
  style='mso-ansi-language:FR-CH;font-weight:normal;mso-no-proof:yes'>ii</span><!--[if supportFields]><span
117
117
  lang=EN-GB style='font-weight:normal'><span style='mso-element:field-end'></span></span><![endif]--><span
118
- lang=FR-CH style='mso-ansi-language:FR-CH'><span style='mso-tab-count:1'>              </span>Rec.
119
- ITU‑{{ bureau }} {{ docnumeric }} {% if amendmentid %}{{ amendmentid }}{% endif %} {% if corrigendumid %}{{ corrigendumid }}{% endif %} ({{ pubdate_monthyear }})<o:p></o:p></span></p>
118
+ 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>
120
119
  </div>
121
120
 
122
121
  <div style='mso-element:footer' id=ef2l>
@@ -128,13 +127,11 @@ MERGEFORMAT </span><span lang=EN-GB style='font-weight:normal'><span
128
127
  style='mso-element:field-separator'></span></span><![endif]--><span lang=FR-CH
129
128
  style='mso-ansi-language:FR-CH;font-weight:normal;mso-no-proof:yes'>ii</span><!--[if supportFields]><span
130
129
  lang=EN-GB style='font-weight:normal'><span style='mso-element:field-end'></span></span><![endif]--><span
131
- lang=FR-CH style='mso-ansi-language:FR-CH'><span style='mso-tab-count:1'>              </span>Rec.
132
- ITU‑{{ bureau }} {{ docnumeric }} {% if amendmentid %}{{ amendmentid }}{% endif %} {% if corrigendumid %}{{ corrigendumid }}{% endif %} ({{ pubdate_monthyear }})<o:p></o:p></span></p>
130
+ 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>
133
131
  </div>
134
132
 
135
133
  <div style='mso-element:footer' id=f2>
136
- <p class=FooterQP style='line-height:12.0pt'><span lang=EN-GB><span style='mso-tab-count:2'>                                                                                                       </span>Rec.
137
- ITU‑{{ bureau }} {{docnumeric}} {% if amendmentid %}{{ amendmentid }}{% endif %} {% if corrigendumid %}{{ corrigendumid }}{% endif %} ({{ pubdate_monthyear }})<span style='mso-tab-count:1'>             </span></span><!--[if supportFields]><span
134
+ <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
138
135
  lang=EN-GB style='font-weight:normal'><span style='mso-element:field-begin'></span>
139
136
  PAGE<span style='mso-spacerun:yes'>  </span>\* MERGEFORMAT <span
140
137
  style='mso-element:field-separator'></span></span><![endif]--><span lang=EN-GB
@@ -144,8 +141,7 @@ lang=EN-GB style='font-weight:normal'><o:p></o:p></span></p>
144
141
  </div>
145
142
 
146
143
  <div style='mso-element:footer' id=f2l>
147
- <p class=FooterQPLandscape style='line-height:12.0pt'><span lang=EN-GB><span style='mso-tab-count:2'>                                                                                                       </span>Rec.
148
- ITU‑{{ bureau }} {{docnumeric}} {% if amendmentid %}{{ amendmentid }}{% endif %} {% if corrigendumid %}{{ corrigendumid }}{% endif %} ({{ pubdate_monthyear }})<span style='mso-tab-count:1'>             </span></span><!--[if supportFields]><span
144
+ <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
149
145
  lang=EN-GB style='font-weight:normal'><span style='mso-element:field-begin'></span>
150
146
  PAGE<span style='mso-spacerun:yes'>  </span>\* MERGEFORMAT <span
151
147
  style='mso-element:field-separator'></span></span><![endif]--><span lang=EN-GB
@@ -163,8 +159,7 @@ MERGEFORMAT </span><span lang=EN-GB style='font-weight:normal'><span
163
159
  style='mso-element:field-separator'></span></span><![endif]--><span lang=FR-CH
164
160
  style='mso-ansi-language:FR-CH;font-weight:normal;mso-no-proof:yes'>ii</span><!--[if supportFields]><span
165
161
  lang=EN-GB style='font-weight:normal'><span style='mso-element:field-end'></span></span><![endif]--><span
166
- lang=FR-CH style='mso-ansi-language:FR-CH'><span style='mso-tab-count:1'>              </span>Rec.
167
- ITU‑{{ bureau }} {{ docnumeric }} {% if amendmentid %}{{ amendmentid }}{% endif %} {% if corrigendumid %}{{ corrigendumid }}{% endif %} ({{ pubdate_monthyear }})<o:p></o:p></span></p>
162
+ 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>
168
163
  </div>
169
164
 
170
165
  <div style='mso-element:footer' id=ef3l>
@@ -176,13 +171,11 @@ MERGEFORMAT </span><span lang=EN-GB style='font-weight:normal'><span
176
171
  style='mso-element:field-separator'></span></span><![endif]--><span lang=FR-CH
177
172
  style='mso-ansi-language:FR-CH;font-weight:normal;mso-no-proof:yes'>ii</span><!--[if supportFields]><span
178
173
  lang=EN-GB style='font-weight:normal'><span style='mso-element:field-end'></span></span><![endif]--><span
179
- lang=FR-CH style='mso-ansi-language:FR-CH'><span style='mso-tab-count:1'>              </span>Rec.
180
- ITU‑{{ bureau }} {{ docnumeric }} {% if amendmentid %}{{ amendmentid }}{% endif %} {% if corrigendumid %}{{ corrigendumid }}{% endif %} ({{ pubdate_monthyear }})<o:p></o:p></span></p>
174
+ 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>
181
175
  </div>
182
176
 
183
177
  <div style='mso-element:footer' id=f3>
184
- <p class=FooterQP style='line-height:12.0pt'><span lang=EN-GB><span style='mso-tab-count:2'>                                                                                                       </span>Rec.
185
- ITU‑{{ bureau }} {{docnumeric}} {% if amendmentid %}{{ amendmentid }}{% endif %} {% if corrigendumid %}{{ corrigendumid }}{% endif %} ({{ pubdate_monthyear }})<span style='mso-tab-count:1'>             </span></span><!--[if supportFields]><span
178
+ <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
186
179
  lang=EN-GB style='font-weight:normal'><span style='mso-element:field-begin'></span>
187
180
  PAGE<span style='mso-spacerun:yes'>  </span>\* MERGEFORMAT <span
188
181
  style='mso-element:field-separator'></span></span><![endif]--><span lang=EN-GB
@@ -192,8 +185,7 @@ lang=EN-GB style='font-weight:normal'><o:p></o:p></span></p>
192
185
  </div>
193
186
 
194
187
  <div style='mso-element:footer' id=f3l>
195
- <p class=FooterQPLandscape style='line-height:12.0pt'><span lang=EN-GB><span style='mso-tab-count:2'>                                                                                                       </span>Rec.
196
- ITU‑{{ bureau }} {{docnumeric}} {% if amendmentid %}{{ amendmentid }}{% endif %} {% if corrigendumid %}{{ corrigendumid }}{% endif %} ({{ pubdate_monthyear }})<span style='mso-tab-count:1'>             </span></span><!--[if supportFields]><span
188
+ <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
197
189
  lang=EN-GB style='font-weight:normal'><span style='mso-element:field-begin'></span>
198
190
  PAGE<span style='mso-spacerun:yes'>  </span>\* MERGEFORMAT <span
199
191
  style='mso-element:field-separator'></span></span><![endif]--><span lang=EN-GB
data/lib/isodoc/itu/html/html_itu_intro.html CHANGED
@@ -1,10 +1,11 @@
1
- <div id="boilerplate-legal-destination"/>
1
+ {% if doctype != "Service Publication" %}
2
+ <div id="boilerplate-legal-destination"/>
2
3
  <div id="boilerplate-license-destination"/>
3
-
4
+ {% endif %}
4
5
 
5
6
 
6
7
  <nav>
7
- <h1 id="content">Contents</h1>
8
+ <h1 id="content">{{ table_of_contents}}</h1>
8
9
  <div id="toc"></div>
9
10
 
10
11
  </nav>
data/lib/isodoc/itu/html/html_itu_titlepage.html CHANGED
@@ -70,6 +70,9 @@
70
70
  {% if docsubtitle %}
71
71
  <br/><span class="doc-subtitle">{{ docsubtitle }}</span>
72
72
  {% endif %}
73
+ {% if positiontitle %}
74
+ <br/><span class="doc-annextitle">{{ positiontitle }}</span>
75
+ {% endif %}
73
76
  {% if annextitle %}
74
77
  <br/><span class="doc-annextitle">{{ annexid }}{% if annexid and annextitle %}: {% endif %}{{ annextitle }}</span>
75
78
  {% endif %}
data/lib/isodoc/itu/html/htmlstyle.css CHANGED
@@ -174,6 +174,12 @@ a.FootnoteRef + a.FootnoteRef:before {
174
174
  #joint-itu-iso-iec {
175
175
  border-bottom: solid 3px #48a0e7; }
176
176
 
177
+ #service-publication-band {
178
+ background-color: #750697; }
179
+
180
+ #service-publication {
181
+ border-bottom: solid 3px #750697; }
182
+
177
183
  #in-force-band {
178
184
  background-color: #d9f39d; }
179
185
 
@@ -380,6 +386,12 @@ a.FootnoteRef + a.FootnoteRef:before {
380
386
  #joint-itu-iso-iec {
381
387
  border-bottom: solid 3px #48a0e7; }
382
388
 
389
+ #service-publication-band {
390
+ background-color: #750697; }
391
+
392
+ #service-publication {
393
+ border-bottom: solid 3px #750697; }
394
+
383
395
  #in-force-band {
384
396
  background-color: #d9f39d; }
385
397
 
data/lib/isodoc/itu/html/htmlstyle.scss CHANGED
@@ -12,6 +12,7 @@ $doctype-colors-list: (
12
12
  focus-group: #750697,
13
13
  implementers-guide: #750697,
14
14
  joint-itu-iso-iec: #48a0e7,
15
+ service-publication: #750697
15
16
  );
16
17
 
17
18
 
data/lib/isodoc/itu/html/word_itu_intro.html CHANGED
@@ -4,7 +4,7 @@
4
4
  <tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes;mso-yfti-lastrow:yes'>
5
5
  <td width=663 valign=top style='width:497.25pt;padding:0cm 5.4pt 0cm 5.4pt'>
6
6
  <p class=RecNo><span style='mso-bookmark:_Hlk526346232'><a name=irecnoe></a><span
7
- lang=FR-CH style='mso-ansi-language:FR-CH;font-size:14pt;font-weight:bold;'>{{ doctype}} {{ docnumber }}<o:p></o:p></span></span></p>
7
+ lang=FR-CH style='mso-ansi-language:FR-CH;font-size:14pt;font-weight:bold;'>{% if doctype != "Service Publication" %}{{ doctype_display }} {% endif %}{{ docnumber }}<o:p></o:p></span></span></p>
8
8
  <p class=Rectitle align="center"><span style='mso-bookmark:_Hlk526346232'><span lang=FR-CH
9
9
  style='mso-ansi-language:FR-CH;font-size:14pt;font-weight:bold;'>{{ doctitle }}<o:p></o:p></span></span></p>
10
10
  {% if annexid %}
@@ -42,6 +42,8 @@
42
42
  <p class=MsoNormal><span style='mso-bookmark:_Hlk526346232'><span lang=FR-CH
43
43
  style='mso-ansi-language:FR-CH'><o:p>&nbsp;</o:p></span></span></p>
44
44
 
45
+ {% if doctype != "Service Publication" %}
46
+
45
47
  <p class=MsoNormal><o:wrapblock><v:shapetype id="_x0000_t202"
46
48
  coordsize="21600,21600" o:spt="202" path="m,l,21600r21600,l21600,xe">
47
49
  <v:stroke joinstyle="miter"/>
@@ -147,9 +149,13 @@ style='mso-ansi-language:EN-US'><o:p>&nbsp;</o:p></span></span></p>
147
149
 
148
150
  <div id="change_logbox"/>
149
151
 
152
+ {% endif %}
153
+
150
154
  <p class=MsoNormal><span style='mso-bookmark:_Hlk526346232'><span lang=EN-US
151
155
  style='mso-ansi-language:EN-US'><o:p>&nbsp;</o:p></span></span></p>
152
156
 
157
+ {% if doctype == "Service Publication" %}
158
+ {% else %}
153
159
  <p><br clear=all
154
160
  style='page-break-before:always'></p>
155
161
 
@@ -164,8 +170,10 @@ mso-bidi-language:AR-SA'><br clear=all style='page-break-before:always'>
164
170
  </span></b>
165
171
 
166
172
  <p class=MsoNormal align=center style='text-align:center'>
167
- <b>Table of Contents</b></p>
173
+ <b>{{ table_of_contents }}</b></p>
168
174
  <p class=MsoNormal style='tab-stops:right 17.0cm'><span style='mso-tab-count:1'/>
169
- <b>Page</b></p>
175
+ <b>{{ page }}</b></p>
170
176
 
171
177
  WORDTOC
178
+
179
+ {% endif %}
data/lib/isodoc/itu/html/word_itu_titlepage.html CHANGED
@@ -327,10 +327,14 @@
327
327
  <span lang="EN-GB"
328
328
  style='font-size:18.0pt;mso-bidi-font-size:10.0pt;font-family:"Arial",sans-serif;
329
329
  mso-bidi-font-family:"Times New Roman"'>{% if annexid or amendmentid or corrigendumid %}{% if doctype != "Recommendation" %}{{ docnumeric }}<br/>{% endif %}{{ doctitle }}
330
+ {% if positiontitle %}<br/>{{ positiontitle | upcase }}{% endif %}
330
331
  {% if annexid %}<br/><b>{{ annexid }}{% if annextitle %}: {{ annextitle }}{% endif %}</b>{% endif %}
331
332
  {% if amendmentid %}<br/><b>{{ amendmentid }}{% if amendmenttitle %}: {{ amendmenttitle }}{% endif %}</b>{% endif %}
332
333
  {% if corrigendumid %}<br/><b>{{ corrigendumid }}{% if corrigendumtitle %}: {{ corrigendumtitle }}{% endif %}</b>{% endif %}
333
- {% else %}<b>{% if doctype != "Recommendation" %}{{ docnumeric }}<br/>{% endif %}{{ doctitle }}</b>{% endif %}</span>
334
+ {% else %}
335
+ <b>{% if doctype != "Recommendation" %}{{ docnumeric }}<br/>{% endif %}{{ doctitle }}</b>
336
+ {% if positiontitle %}<br/><br/>{{ positiontitle | upcase }}{% endif %}
337
+ {% endif %}</span>
334
338
  </a></span><span
335
339
  style='mso-bookmark:_Hlk526346232'><span style='mso-bookmark:c1tite'><b><span
336
340
  lang="EN-US" style='font-size:18.0pt;mso-bidi-font-size:10.0pt;font-family:
data/lib/isodoc/itu/html/word_itu_titlepage_sp.html ADDED
@@ -0,0 +1,108 @@
1
+
2
+ <p class="MsoNormal" align="center" dir="RTL" style='margin-top:0cm;text-align:center;
3
+ direction:rtl;unicode-bidi:embed'><i><span lang="EN-GB" dir="LTR" style='font-size:
4
+ 10.0pt'><o:p>&#xA0;</o:p></span></i></p>
5
+
6
+ {% if lang == "zh" %}
7
+ <p class="MsoNormal" align="center" style='margin-top:0cm;text-align:center'><i><span
8
+ lang="EN-GB" style='font-size:10.0pt'>国际电联{{ pubdate_ddMMMyyyy }}第{{ docnumeric }}期</span></i></p>
9
+
10
+ <p class="MsoNormal" align="center" style='margin-top:0cm;text-align:center'><i><span
11
+ lang="EN-GB" style='font-size:10.0pt'>《操作公报》附件</span></i></p>
12
+ {% else %}
13
+ <p class="MsoNormal" align="center" style='margin-top:0cm;text-align:center'><i><span
14
+ lang="EN-GB" style='font-size:10.0pt'>{{ annex_to_itu_ob }}</span></i></p>
15
+
16
+ <p class="MsoNormal" align="center" style='margin-top:0cm;text-align:center'><i><span
17
+ lang="EN-GB" style='font-size:10.0pt'>{{ number_abbrev }} {{ docnumeric }} – {{ pubdate_ddMMMyyyy }}</span></i></p>
18
+ {% endif %}
19
+
20
+ <p class="MEP"><span lang="EN-GB" style='font-size:10.0pt'><o:p>&#xA0;</o:p></span></p>
21
+
22
+ <table class="MsoNormalTable" border="0" cellspacing="0" cellpadding="0" width="643" style='border-collapse:collapse;mso-table-layout-alt:fixed;mso-padding-alt:
23
+ 0cm 0cm 0cm 0cm'>
24
+ <tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes;page-break-inside:avoid;
25
+ height:3.0cm;mso-height-rule:exactly'>
26
+ <td width="85" valign="top" style='width:63.95pt;padding:0cm 5.4pt 0cm 5.4pt'>
27
+ <p class="MsoNormal" style='margin-top:0cm;margin-right:0cm;margin-bottom:0cm;
28
+ margin-left:0pt;margin-bottom:.0001pt'><span lang="EN-GB" style='font-family:FrugalSans;mso-fareast-language:ZH-CN;mso-no-proof:yes'><v:shape
29
+ id="Picture_x0020_1" o:spid="_x0000_i1033" type="#_x0000_t75" alt="logo_E"
30
+ style='width:46pt;height:52pt;visibility:visible;
31
+ mso-wrap-style:square'>
32
+ <v:imagedata src="{{ logo_sp }}" o:title="logo_E"/>
33
+ </v:shape>
34
+ </span></p>
35
+ </td>
36
+ <td width="548" style='width:411.1pt;padding:0cm 0cm 0cm 0cm;height:3.0cm;mso-height-rule:exactly'>
37
+ <p class="MsoNormal" style='margin-top:0cm'><b style='mso-bidi-font-weight:
38
+ normal'><span lang="EN-GB" style='font-size:14.0pt;mso-bidi-font-size:10.0pt'>{{ international_telecommunication_union | upcase }}</span></b></p>
39
+ </td>
40
+ </tr>
41
+ <tr style='mso-yfti-irow:1;page-break-inside:avoid;height:4.0cm;mso-height-rule:
42
+ exactly'>
43
+ <td width="95" style='width:70.9pt;padding:0cm 0cm 0cm 0cm;height:4.0cm;
44
+ mso-height-rule:exactly'>
45
+ <p class="MsoNormal" style='margin-top:0cm'><span lang="EN-GB" style='font-size:
46
+ 14.0pt;mso-bidi-font-size:10.0pt'><o:p>&#xA0;</o:p></span></p>
47
+ </td>
48
+ <td width="548" style='width:411.1pt;padding:0cm 0cm 0cm 0cm;height:4.0cm;
49
+ mso-height-rule:exactly'>
50
+ <p class="MsoNormal" style='margin-top:0cm;text-align:left;'><b style='mso-bidi-font-weight:
51
+ normal'><span lang="EN-GB" style='font-size:18.0pt;mso-bidi-font-size:10.0pt'>{% if bureau == "R" %}{{ br }}{% endif %}{% if bureau == "T" %}{{ tsb }}{% endif %}{% if bureau == "D" %}{{ bdt }}{% endif %}<br/>
52
+ </span></b><b style='mso-bidi-font-weight:normal'><span lang="EN-GB" style='font-size:14.0pt;mso-bidi-font-size:10.0pt'>{% if bureau == "R" %}{{ br_full }}{% endif %}{% if bureau == "T" %}{{ tsb_full }}{% endif %}{% if bureau == "D" %}{{ bdt_full }}{% endif %}</span></b><span lang="EN-GB" style='font-size:14.0pt;mso-bidi-font-size:10.0pt'><o:p></o:p></span></p>
53
+ </td>
54
+ </tr>
55
+ <tr style='mso-yfti-irow:2;mso-yfti-lastrow:yes;page-break-inside:avoid;
56
+ height:42.55pt;mso-height-rule:exactly'>
57
+ <td width="95" style='width:70.9pt;padding:0cm 0cm 0cm 0cm;height:42.55pt;
58
+ mso-height-rule:exactly'>
59
+ <p class="MsoNormal" style='margin-top:5.0pt;margin-right:0cm;margin-bottom:
60
+ 5.0pt;margin-left:0cm'><span lang="EN-GB" style='font-size:14.0pt;mso-bidi-font-size:
61
+ 10.0pt'><o:p>&#xA0;</o:p></span></p>
62
+ </td>
63
+ <td width="548" style='width:411.1pt;border:none;border-bottom:solid windowtext 2.25pt;
64
+ padding:0cm 0cm 0cm 0cm;height:42.55pt;mso-height-rule:exactly'>
65
+ <p class="MsoNormal" style='margin-top:5.0pt;margin-right:0cm;margin-bottom:
66
+ 5.0pt;margin-left:0cm'><b style='mso-bidi-font-weight:normal'><span
67
+ lang="EN-GB" style='font-size:18.0pt;mso-bidi-font-size:10.0pt'><o:p>&#xA0;</o:p></span></b></p>
68
+ </td>
69
+ </tr>
70
+ </table>
71
+ <p class="MsoNormal"><span lang="EN-GB"><o:p>&#xA0;</o:p></span></p>
72
+
73
+ <table class="MsoNormalTable" border="0" cellspacing="0" cellpadding="0" width="643" style='border-collapse:collapse;mso-table-layout-alt:fixed;mso-padding-alt:0cm 0cm 0cm 0cm'>
74
+ <tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes;page-break-inside:avoid;height:2.0cm;mso-height-rule:exactly'>
75
+ <td width="95" style='width:70.9pt;padding:0cm 0cm 0cm 0cm;height:2.0cm;mso-height-rule:exactly'>
76
+ <p class="MsoNormal" style='margin-top:5.0pt;margin-right:0cm;margin-bottom:5.0pt;margin-left:0cm'><span lang="EN-GB" style='font-size:14.0pt;mso-bidi-font-size:10.0pt'><o:p>&#xA0;</o:p></span></p>
77
+ </td>
78
+ <td width="548" style='width:411.1pt;padding:0cm 0cm 0cm 0cm;height:2.0cm;mso-height-rule:exactly'>
79
+ <p class="MsoNormal" style='margin-top:5.0pt;margin-right:0cm;margin-bottom:5.0pt;margin-left:0cm'><b style='mso-bidi-font-weight:normal'><span
80
+ lang="EN-GB" style='font-size:18.0pt;mso-bidi-font-size:10.0pt'><o:p>&#xA0;</o:p></span></b></p>
81
+ </td>
82
+ </tr>
83
+ <tr style='mso-yfti-irow:1;page-break-inside:avoid'>
84
+ <td width="95" style='width:70.9pt;padding:0cm 0cm 0cm 0cm'>
85
+ <p class="MsoNormal"><span lang="EN-GB" style='font-size:14.0pt;mso-bidi-font-size:10.0pt'><o:p>&#xA0;</o:p></span></p>
86
+ </td>
87
+ <td width="548" style='width:411.1pt;padding:0cm 0cm 0cm 0cm'>
88
+ <p class="MsoNormal"><b style='mso-bidi-font-weight:normal'><span lang="EN-GB" style='font-size:14.0pt;mso-bidi-font-size:10.0pt'>{{ doctitle }}</span></b></p>
89
+ {% if positiontitle %}<p class="MsoNormal"/>
90
+ <p class="MsoNormal" style='font-size:14.0pt'>{{ positiontitle | upcase }}</p>{% endif %}
91
+ </td>
92
+ </tr>
93
+ <tr style='mso-yfti-irow:2;mso-yfti-lastrow:yes;page-break-inside:avoid;height:2.0cm;mso-height-rule:exactly'>
94
+ <td width="95" style='width:70.9pt;padding:0cm 0cm 0cm 0cm;height:2.0cm;mso-height-rule:exactly'>
95
+ <p class="MsoNormal"><span lang="EN-GB" style='font-size:14.0pt;mso-bidi-font-size:10.0pt'><o:p>&#xA0;</o:p></span></p>
96
+ </td>
97
+ <td width="548" style='width:411.1pt;border:none;border-bottom:solid windowtext 2.25pt;padding:0cm 0cm 0cm 0cm;height:2.0cm;mso-height-rule:exactly'>
98
+ <p class="MsoNormal"><b style='mso-bidi-font-weight:normal'><span lang="EN-GB" style='font-size:14.0pt;mso-bidi-font-size:10.0pt'><o:p>&#xA0;</o:p></span></b></p>
99
+ </td>
100
+ </tr>
101
+ </table>
102
+
103
+ <p class="MEP">&#xA0;</p>
104
+
105
+ <p class="MEP">&#xA0;</p>
106
+
107
+ <p class="MsoNormal" style='margin-left:2.0cm;text-indent:-2.0cm'><b
108
+ style='mso-bidi-font-weight:normal'><span lang="EN-GB" style='font-size:12.0pt;mso-bidi-font-size:10.0pt'>{{ placedate_year }}</span></b></p>