metanorma-itu 2.1.0 → 2.1.3

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/isodoc/itu/base_convert.rb +1 -1
  3. data/lib/isodoc/itu/cleanup.rb +1 -1
  4. data/lib/isodoc/itu/html/htmlstyle.css +6 -0
  5. data/lib/isodoc/itu/html/htmlstyle.scss +2 -0
  6. data/lib/isodoc/itu/html/itu.css +17 -9
  7. data/lib/isodoc/itu/html/itu.scss +18 -8
  8. data/lib/isodoc/itu/html/word_itu_intro.html +40 -41
  9. data/lib/isodoc/itu/i18n.rb +1 -1
  10. data/lib/isodoc/itu/itu.implementers-guide.xsl +1358 -240
  11. data/lib/isodoc/itu/itu.in-force.xsl +1358 -240
  12. data/lib/isodoc/itu/itu.recommendation-annex.xsl +1358 -240
  13. data/lib/isodoc/itu/itu.recommendation-supplement.xsl +1358 -240
  14. data/lib/isodoc/itu/itu.recommendation.xsl +1358 -240
  15. data/lib/isodoc/itu/itu.resolution.xsl +1358 -240
  16. data/lib/isodoc/itu/itu.service-publication.xsl +1358 -240
  17. data/lib/isodoc/itu/itu.technical-paper.xsl +1358 -240
  18. data/lib/isodoc/itu/itu.technical-report.xsl +1358 -240
  19. data/lib/isodoc/itu/terms.rb +1 -1
  20. data/lib/isodoc/itu/word_cleanup.rb +6 -6
  21. data/lib/isodoc/itu/word_convert.rb +1 -1
  22. data/lib/metanorma/itu/biblio.rng +134 -39
  23. data/lib/metanorma/itu/converter.rb +2 -1
  24. data/lib/metanorma/itu/isodoc.rng +16 -0
  25. data/lib/metanorma/itu/itu.rng +3 -0
  26. data/lib/metanorma/itu/version.rb +1 -1
  27. metadata +3 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 0a9eccc8a2a7ded921ed0c0449effc1bd291f24397cc336d764dc40b240ed2ba
4
- data.tar.gz: ea6f904adef534c080e262d41390445da3620fc9fe527aabb58719210856a4c7
3
+ metadata.gz: d29a65e64ee8a41d89e6bae93139d7fe3a2a7baf8a6c32dc029b92925eda7a82
4
+ data.tar.gz: 3889ea90247a6df197d00e1b8aaa430dcb39bae273aa5f3d6333c9b7cf834e99
5
5
  SHA512:
6
- metadata.gz: 998adbdb918ad2266a4ac677dcf57bafcce80cd290f1a46ce69639e1f7497a15bb1ef3435e7431257a25b42ce76bc209c18335b4ee7edb7913f522ce3538c0d3
7
- data.tar.gz: 4bcf1dd0491a7bc603805439a5dafaeb655ebca57562c62b6ea72bc73fea327e8b400a1d24668a285b560630c9357941276a81210ce9f721467b0f5985182df5
6
+ metadata.gz: d7f24ca939be577f0e877165fae648757d90f42cc7c09effe5e23f0c85949462708df35f7406147d9984bbf91b97ebdbfc9bb94deaf725292f2fd7c5b1b6cbe0
7
+ data.tar.gz: eb258d2af57e26754eabd161e6e2ad3b332adfc53dbb5cdc635d9ceecaf66dc1d8f580325953267acc4c65e7f5f1bb20c0556b20a394435818628e009f854948
data/lib/isodoc/itu/base_convert.rb CHANGED
@@ -30,7 +30,7 @@ module IsoDoc
30
30
  end
31
31
 
32
32
  def note_delim
33
- " – "
33
+ " – "
34
34
  end
35
35
 
36
36
  def para_class(node)
data/lib/isodoc/itu/cleanup.rb CHANGED
@@ -25,7 +25,7 @@ module IsoDoc
25
25
  def term_cleanup1(docxml)
26
26
  docxml.xpath("//p[@class = 'Terms']").each do |d|
27
27
  h2 = d.at("./preceding-sibling::*[@class = 'TermNum'][1]")
28
- d.children.first.previous = "<b>#{h2.children.to_xml}</b>&nbsp;"
28
+ d.children.first.previous = "<b>#{h2.children.to_xml}</b>&#xa0;"
29
29
  d["id"] = h2["id"]
30
30
  h2.remove
31
31
  end
data/lib/isodoc/itu/html/htmlstyle.css CHANGED
@@ -823,6 +823,12 @@ nav #toc {
823
823
  font-size: 1em;
824
824
  text-align: center; }
825
825
 
826
+ .ListTitle {
827
+ font-weight: 700;
828
+ font-size: 1em;
829
+ text-align: center;
830
+ text-align: left; }
831
+
826
832
  pre {
827
833
  font-family: {{monospacefont}};
828
834
  font-variant-ligatures: none;
data/lib/isodoc/itu/html/htmlstyle.scss CHANGED
@@ -162,6 +162,8 @@ nav {
162
162
  @include blockTitle();
163
163
  }
164
164
 
165
+ @include listBlock();
166
+
165
167
  pre {
166
168
  @include sourceBlock(#f6f6f6);
167
169
  font-size: $monospacefontsize;
data/lib/isodoc/itu/html/itu.css CHANGED
@@ -142,7 +142,7 @@ p.AdmonitionTitle, p.RecommendationTitle {
142
142
  mso-bidi-font-family: {{bodyfont}};
143
143
  mso-ansi-language: EN-GB; }
144
144
 
145
- p.TableTitle {
145
+ p.TableTitle, p.ListTitle {
146
146
  mso-style-unhide: no;
147
147
  mso-style-qformat: yes;
148
148
  mso-style-parent: "";
@@ -180,13 +180,15 @@ p.Note, div.Note, li.Note {
180
180
  mso-layout-grid-align: none;
181
181
  punctuation-wrap: simple;
182
182
  text-autospace: none;
183
- font-size: {{smallerfontsize}};
184
183
  mso-bidi-font-size: 10.0pt;
185
- font-family: {{bodyfont}};
186
184
  mso-fareast-font-family: {{bodyfont}};
187
185
  mso-bidi-font-family: {{bodyfont}};
188
186
  mso-ansi-language: EN-GB; }
189
187
 
188
+ p.Note, div.Note, li.Note {
189
+ font-size: {{smallerfontsize}};
190
+ font-family: {{bodyfont}}; }
191
+
190
192
  p.TableFootnote, div.TableFootnote, li.TableFootnote {
191
193
  mso-style-unhide: no;
192
194
  mso-style-qformat: yes;
@@ -682,12 +684,14 @@ p.Quote, li.Quote, div.Quote {
682
684
  line-height: {{normalfontsize}};
683
685
  mso-pagination: widow-orphan;
684
686
  tab-stops: 20.15pt;
685
- font-size: {{normalfontsize}};
686
- font-family: {{bodyfont}};
687
687
  mso-fareast-font-family: {{bodyfont}};
688
688
  mso-bidi-font-family: {{bodyfont}};
689
689
  mso-ansi-language: EN-GB; }
690
690
 
691
+ p.Quote, li.Quote {
692
+ font-size: {{normalfontsize}};
693
+ font-family: {{bodyfont}}; }
694
+
691
695
  p.QuoteAttribution {
692
696
  text-align: right;
693
697
  mso-style-priority: 99;
@@ -717,8 +721,6 @@ p.Admonition, li.Admonition, div.Admonition {
717
721
  mso-border-themecolor: accent1;
718
722
  padding: 0cm;
719
723
  mso-padding-alt: 10.0pt 10.0pt 10.0pt 10.0pt;
720
- font-size: {{normalfontsize}};
721
- font-family: {{bodyfont}};
722
724
  mso-ascii-font-family: {{bodyfont}};
723
725
  mso-ascii-theme-font: minor-latin;
724
726
  mso-fareast-font-family: {{bodyfont}};
@@ -729,7 +731,11 @@ p.Admonition, li.Admonition, div.Admonition {
729
731
  mso-bidi-theme-font: minor-bidi;
730
732
  color: #4472C4;
731
733
  mso-themecolor: accent1;
732
- mso-ansi-language: EN-AU;
734
+ mso-ansi-language: EN-AU; }
735
+
736
+ p.Admonition, li.Admonition {
737
+ font-size: {{normalfontsize}};
738
+ font-family: {{bodyfont}};
733
739
  font-style: italic; }
734
740
 
735
741
  p.Code, li.Code, div.Code {
@@ -1098,7 +1104,9 @@ aside {
1098
1104
  margin-left: 0pt; }
1099
1105
 
1100
1106
  p.example, li.example, div.example, td.example {
1101
- mso-pagination: none;
1107
+ mso-pagination: none; }
1108
+
1109
+ p.example, li.example, td.example {
1102
1110
  font-size: 10.0pt;
1103
1111
  font-family: {{bodyfont}}; }
1104
1112
 
data/lib/isodoc/itu/html/itu.scss CHANGED
@@ -135,7 +135,7 @@ p.AdmonitionTitle, p.RecommendationTitle
135
135
  mso-fareast-font-family:$bodyfont;
136
136
  mso-bidi-font-family:$bodyfont;
137
137
  mso-ansi-language:EN-GB;}
138
- p.TableTitle
138
+ p.TableTitle, p.ListTitle
139
139
  {mso-style-unhide:no;
140
140
  mso-style-qformat:yes;
141
141
  mso-style-parent:"";
@@ -172,12 +172,14 @@ p.Note, div.Note, li.Note
172
172
  mso-layout-grid-align:none;
173
173
  punctuation-wrap:simple;
174
174
  text-autospace:none;
175
- font-size:$smallerfontsize;
176
175
  mso-bidi-font-size:10.0pt;
177
- font-family:$bodyfont;
178
176
  mso-fareast-font-family:$bodyfont;
179
177
  mso-bidi-font-family:$bodyfont;
180
178
  mso-ansi-language:EN-GB;}
179
+ p.Note, div.Note, li.Note {
180
+ font-size:$smallerfontsize;
181
+ font-family:$bodyfont;
182
+ }
181
183
  p.TableFootnote, div.TableFootnote, li.TableFootnote
182
184
  {mso-style-unhide:no;
183
185
  mso-style-qformat:yes;
@@ -652,11 +654,13 @@ p.Quote, li.Quote, div.Quote
652
654
  line-height:$normalfontsize;
653
655
  mso-pagination:widow-orphan;
654
656
  tab-stops:20.15pt;
655
- font-size:$normalfontsize;
656
- font-family:$bodyfont;
657
657
  mso-fareast-font-family:$bodyfont;
658
658
  mso-bidi-font-family:$bodyfont;
659
659
  mso-ansi-language:EN-GB;}
660
+ p.Quote, li.Quote {
661
+ font-size:$normalfontsize;
662
+ font-family:$bodyfont;
663
+ }
660
664
  p.QuoteAttribution
661
665
  {text-align:right;
662
666
  mso-style-priority:99;
@@ -686,8 +690,6 @@ p.Admonition, li.Admonition, div.Admonition
686
690
  mso-border-themecolor:accent1;
687
691
  padding:0cm;
688
692
  mso-padding-alt:10.0pt 10.0pt 10.0pt 10.0pt;
689
- font-size:$normalfontsize;
690
- font-family:$bodyfont;
691
693
  mso-ascii-font-family:$bodyfont;
692
694
  mso-ascii-theme-font:minor-latin;
693
695
  mso-fareast-font-family:$bodyfont;
@@ -699,7 +701,12 @@ p.Admonition, li.Admonition, div.Admonition
699
701
  color:#4472C4;
700
702
  mso-themecolor:accent1;
701
703
  mso-ansi-language:EN-AU;
702
- font-style:italic;}
704
+ }
705
+ p.Admonition, li.Admonition {
706
+ font-size:$normalfontsize;
707
+ font-family:$bodyfont;
708
+ font-style:italic;
709
+ }
703
710
  p.Code, li.Code, div.Code
704
711
  {mso-style-name:Code;
705
712
  mso-style-priority:16;
@@ -1051,6 +1058,9 @@ margin-left: 0pt;
1051
1058
 
1052
1059
  p.example, li.example, div.example, td.example {
1053
1060
  mso-pagination:none;
1061
+ }
1062
+
1063
+ p.example, li.example, td.example {
1054
1064
  font-size:10.0pt;
1055
1065
  font-family:$bodyfont;}
1056
1066
 
data/lib/isodoc/itu/html/word_itu_intro.html CHANGED
@@ -1,51 +1,50 @@
1
1
  {% if doctype != "Resolution" %}
2
- <table class=MsoNormalTable border=0 cellspacing=0 cellpadding=0
3
- style='border-collapse:collapse;mso-table-layout-alt:fixed;mso-padding-alt:
4
- 0cm 5.4pt 0cm 5.4pt'>
2
+ <table class="MsoNormalTable" border="0" cellspacing="0" cellpadding="0"
3
+ style='border-collapse:collapse;mso-table-layout-alt:fixed;mso-padding-alt:0cm 5.4pt 0cm 5.4pt'>
5
4
  <tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes;mso-yfti-lastrow:yes'>
6
- <td width=663 valign=top style='width:497.25pt;padding:0cm 5.4pt 0cm 5.4pt'>
7
- <p class=RecNo><span style='mso-bookmark:_Hlk526346232'><a name=irecnoe></a><span
8
- 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>
9
- <p class=Rectitle align="center"><span style='mso-bookmark:_Hlk526346232'><span lang=FR-CH
5
+ <td width="663" valign="top" style='width:497.25pt;padding:0cm 5.4pt 0cm 5.4pt'>
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;'>{% if doctype != "Service Publication" %}{{ doctype_display }} {% endif %}{{ docnumber }}<o:p></o:p></span></span></p>
8
+ <p class="Rectitle" align="center"><span style='mso-bookmark:_Hlk526346232'><span lang="FR-CH"
10
9
  style='mso-ansi-language:FR-CH;font-size:14pt;font-weight:bold;'>{{ doctitle }}<o:p></o:p></span></span></p>
11
10
  {% if annexid %}
12
- <p class=Rectitle align="center"><span style='mso-bookmark:_Hlk526346232'><span lang=FR-CH
11
+ <p class="Rectitle" align="center"><span style='mso-bookmark:_Hlk526346232'><span lang="FR-CH"
13
12
  style='mso-ansi-language:FR-CH;font-size:14pt;font-weight:bold;'>{{ annexid }}<o:p></o:p></span></span></p>
14
13
  {% endif %}
15
14
  {% if annextitle %}
16
- <p class=Rectitle align="center"><span style='mso-bookmark:_Hlk526346232'><span lang=FR-CH
15
+ <p class="Rectitle" align="center"><span style='mso-bookmark:_Hlk526346232'><span lang="FR-CH"
17
16
  style='mso-ansi-language:FR-CH;font-size:14pt;font-weight:bold;'>{{ annextitle }}<o:p></o:p></span></span></p>
18
17
  {% endif %}
19
18
  {% if amendmentid %}
20
- <p class=Rectitle align="center"><span style='mso-bookmark:_Hlk526346232'><span lang=FR-CH
19
+ <p class="Rectitle" align="center"><span style='mso-bookmark:_Hlk526346232'><span lang="FR-CH"
21
20
  style='mso-ansi-language:FR-CH;font-size:14pt;font-weight:bold;'>{{ amendmentid }}<o:p></o:p></span></span></p>
22
21
  {% endif %}
23
22
  {% if amendmenttitle %}
24
- <p class=Rectitle align="center"><span style='mso-bookmark:_Hlk526346232'><span lang=FR-CH
23
+ <p class="Rectitle" align="center"><span style='mso-bookmark:_Hlk526346232'><span lang="FR-CH"
25
24
  style='mso-ansi-language:FR-CH;font-size:14pt;font-weight:bold;'>{{ amendmenttitle }}<o:p></o:p></span></span></p>
26
25
  {% endif %}
27
26
  {% if corrigendumid %}
28
- <p class=Rectitle align="center"><span style='mso-bookmark:_Hlk526346232'><span lang=FR-CH
27
+ <p class="Rectitle" align="center"><span style='mso-bookmark:_Hlk526346232'><span lang="FR-CH"
29
28
  style='mso-ansi-language:FR-CH;font-size:14pt;font-weight:bold;'>{{ corrigendumid }}<o:p></o:p></span></span></p>
30
29
  {% endif %}
31
30
  {% if corrigendumtitle %}
32
- <p class=Rectitle align="center"><span style='mso-bookmark:_Hlk526346232'><span lang=FR-CH
31
+ <p class="Rectitle" align="center"><span style='mso-bookmark:_Hlk526346232'><span lang="FR-CH"
33
32
  style='mso-ansi-language:FR-CH;font-size:14pt;font-weight:bold;'>{{ corrigendumtitle }}<o:p></o:p></span></span></p>
34
33
  {% endif %}
35
34
  <span style='mso-bookmark:_Hlk526346232'></span>
36
- <p class=MsoNormal><span style='mso-bookmark:_Hlk526346232'><span lang=FR-CH
37
- style='mso-ansi-language:FR-CH'><o:p>&nbsp;</o:p></span></span></p>
35
+ <p class="MsoNormal"><span style='mso-bookmark:_Hlk526346232'><span lang="FR-CH"
36
+ style='mso-ansi-language:FR-CH'><o:p>&#xa0;</o:p></span></span></p>
38
37
  </td>
39
38
  <span style='mso-bookmark:_Hlk526346232'></span>
40
39
  </tr>
41
40
  </table>
42
41
 
43
- <p class=MsoNormal><span style='mso-bookmark:_Hlk526346232'><span lang=FR-CH
44
- style='mso-ansi-language:FR-CH'><o:p>&nbsp;</o:p></span></span></p>
42
+ <p class="MsoNormal"><span style='mso-bookmark:_Hlk526346232'><span lang="FR-CH"
43
+ style='mso-ansi-language:FR-CH'><o:p>&#xa0;</o:p></span></span></p>
45
44
 
46
45
  {% if doctype != "Service Publication" %}
47
46
 
48
- <p class=MsoNormal><o:wrapblock><v:shapetype id="_x0000_t202"
47
+ <p class="MsoNormal"><o:wrapblock><v:shapetype id="_x0000_t202"
49
48
  coordsize="21600,21600" o:spt="202" path="m,l,21600r21600,l21600,xe">
50
49
  <v:stroke joinstyle="miter"/>
51
50
  <v:path gradientshapeok="t" o:connecttype="rect"/>
@@ -97,50 +96,50 @@ AIYEAABkcnMvZG93bnJldi54bWxQSwUGAAAAAAQABADzAAAAlgUAAAAA
97
96
  <w:wrap type="topAndBottom" anchory="margin"/>
98
97
  <w:anchorlock/>
99
98
  </v:shape></o:wrapblock><br
100
- style='mso-ignore:vglayout' clear=ALL>
101
- <span lang=EN-US style='mso-ansi-language:EN-US'><o:p></o:p></span></p>
99
+ style='mso-ignore:vglayout' clear="ALL">
100
+ <span lang="EN-US" style='mso-ansi-language:EN-US'><o:p></o:p></span></p>
102
101
 
103
102
 
104
103
 
105
104
 
106
105
 
107
- <p class=MsoNormal><span style='mso-bookmark:_Hlk526346232'><span lang=EN-US
108
- style='mso-ansi-language:EN-US'><o:p>&nbsp;</o:p></span></span></p>
106
+ <p class="MsoNormal"><span style='mso-bookmark:_Hlk526346232'><span lang="EN-US"
107
+ style='mso-ansi-language:EN-US'><o:p>&#xa0;</o:p></span></span></p>
109
108
 
110
- <p class=MsoNormal><span style='mso-bookmark:_Hlk526346232'><span lang=EN-US
111
- style='mso-ansi-language:EN-US'><o:p>&nbsp;</o:p></span></span></p>
109
+ <p class="MsoNormal"><span style='mso-bookmark:_Hlk526346232'><span lang="EN-US"
110
+ style='mso-ansi-language:EN-US'><o:p>&#xa0;</o:p></span></span></p>
112
111
 
113
112
  <!--
114
- <table class=MsoNormalTable border=0 cellspacing=0 cellpadding=0 width=663
113
+ <table class="MsoNormalTable" border="0" cellspacing="0" cellpadding="0" width="663"
115
114
  style='width:497.4pt;border-collapse:collapse;mso-padding-alt:0cm 5.4pt 0cm 5.4pt'>
116
115
  <tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes;mso-yfti-lastrow:yes'>
117
- <td width=663 valign=top style='width:497.4pt;padding:0cm 5.4pt 0cm 5.4pt'>
116
+ <td width="663" valign="top" style='width:497.4pt;padding:0cm 5.4pt 0cm 5.4pt'>
118
117
  -->
119
118
  <div id="historybox">
120
119
  </div>
121
120
  <!--
122
121
  <span style='mso-bookmark:_Hlk526346232'></span>
123
- <p class=Headingb style='margin-bottom:6.0pt'><span style='mso-bookmark:_Hlk526346232'><span
124
- lang=EN-US style='mso-ansi-language:EN-US'><o:p></o:p></span></span></p>
122
+ <p class="Headingb" style='margin-bottom:6.0pt'><span style='mso-bookmark:_Hlk526346232'><span
123
+ lang="EN-US" style='mso-ansi-language:EN-US'><o:p></o:p></span></span></p>
125
124
  </td>
126
125
  <span style='mso-bookmark:_Hlk526346232'></span>
127
126
  </tr>
128
127
  </table>
129
128
  -->
130
129
 
131
- <p class=MsoNormal><span style='mso-bookmark:_Hlk526346232'><span lang=EN-US
132
- style='mso-ansi-language:EN-US'><o:p>&nbsp;</o:p></span></span></p>
130
+ <p class="MsoNormal"><span style='mso-bookmark:_Hlk526346232'><span lang="EN-US"
131
+ style='mso-ansi-language:EN-US'><o:p>&#xa0;</o:p></span></span></p>
133
132
 
134
133
  <div id="sourcebox"/>
135
134
 
136
- <p class=MsoNormal><span style='mso-bookmark:_Hlk526346232'><span lang=EN-US
137
- style='mso-ansi-language:EN-US'><o:p>&nbsp;</o:p></span></span></p>
135
+ <p class="MsoNormal"><span style='mso-bookmark:_Hlk526346232'><span lang="EN-US"
136
+ style='mso-ansi-language:EN-US'><o:p>&#xa0;</o:p></span></span></p>
138
137
 
139
- <table class=MsoNormalTable border=0 cellspacing=0 cellpadding=0
138
+ <table class="MsoNormalTable" border="0" cellspacing="0" cellpadding="0"
140
139
  style='border-collapse:collapse;mso-table-layout-alt:fixed;mso-padding-alt:
141
140
  0cm 5.4pt 0cm 5.4pt'>
142
141
  <tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes;mso-yfti-lastrow:yes'>
143
- <td width=663 valign=top style='width:497.25pt;padding:0cm 5.4pt 0cm 5.4pt'>
142
+ <td width="663" valign="top" style='width:497.25pt;padding:0cm 5.4pt 0cm 5.4pt'>
144
143
  <div id="keywordsbox">
145
144
  </div>
146
145
  </td>
@@ -152,14 +151,14 @@ style='mso-ansi-language:EN-US'><o:p>&nbsp;</o:p></span></span></p>
152
151
 
153
152
  {% endif %}
154
153
 
155
- <p class=MsoNormal><span style='mso-bookmark:_Hlk526346232'><span lang=EN-US
156
- style='mso-ansi-language:EN-US'><o:p>&nbsp;</o:p></span></span></p>
154
+ <p class="MsoNormal"><span style='mso-bookmark:_Hlk526346232'><span lang="EN-US"
155
+ style='mso-ansi-language:EN-US'><o:p>&#xa0;</o:p></span></span></p>
157
156
  {% endif %}
158
157
 
159
158
  {% if doctype == "Service Publication" %}
160
159
  {% else %}
161
160
  {% if doctype != "Resolution" %}
162
- <p><br clear=all
161
+ <p><br clear="all"
163
162
  style='page-break-before:always'></p>
164
163
  {% endif %}
165
164
 
@@ -168,15 +167,15 @@ style='mso-ansi-language:EN-US'><o:p>&nbsp;</o:p></span></span></p>
168
167
  <div id="boilerplate-copyright-destination"/>
169
168
 
170
169
  {% if doctype != "Resolution" %}
171
- <b style='mso-bidi-font-weight:normal'><span lang=EN-US style='font-size:12.0pt;
170
+ <b style='mso-bidi-font-weight:normal'><span lang="EN-US" style='font-size:12.0pt;
172
171
  mso-bidi-font-size:10.0pt;font-family:"Times New Roman",serif;mso-fareast-font-family:
173
172
  "Times New Roman";mso-ansi-language:EN-US;mso-fareast-language:EN-US;
174
- mso-bidi-language:AR-SA'><br clear=all style='page-break-before:always'>
173
+ mso-bidi-language:AR-SA'><br clear="all" style='page-break-before:always'/>
175
174
  </span></b>
176
175
 
177
- <p class=MsoNormal align=center style='text-align:center'>
176
+ <p class="MsoNormal" align="center" style='text-align:center'>
178
177
  <b>{{ labels["table_of_contents"] }}</b></p>
179
- <p class=MsoNormal style='tab-stops:right 17.0cm'><span style='mso-tab-count:1'/>
178
+ <p class="MsoNormal" style='tab-stops:right 17.0cm'><span style='mso-tab-count:1'/>
180
179
  <b>{{ labels["page"] }}</b></p>
181
180
 
182
181
  WORDTOC
data/lib/isodoc/itu/i18n.rb CHANGED
@@ -16,7 +16,7 @@ module IsoDoc
16
16
  end
17
17
  else load_yaml2x("en")
18
18
  end
19
- super.merge(y)
19
+ super.deep_merge(y)
20
20
  end
21
21
  end
22
22
  end