metanorma-itu 2.0.8 → 2.1.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/isodoc/itu/base_convert.rb +1 -1
- data/lib/isodoc/itu/cleanup.rb +1 -1
- data/lib/isodoc/itu/html/html_itu_titlepage.html +1 -0
- data/lib/isodoc/itu/html/word_itu_intro.html +40 -41
- data/lib/isodoc/itu/html/word_itu_titlepage.html +1 -0
- data/lib/isodoc/itu/html/word_itu_titlepage_sp.html +1 -1
- data/lib/isodoc/itu/html_convert.rb +16 -11
- data/lib/isodoc/itu/init.rb +1 -1
- data/lib/isodoc/itu/itu.implementers-guide.xsl +1500 -279
- data/lib/isodoc/itu/itu.in-force.xsl +1500 -279
- data/lib/isodoc/itu/itu.recommendation-annex.xsl +1500 -279
- data/lib/isodoc/itu/itu.recommendation-supplement.xsl +1500 -279
- data/lib/isodoc/itu/itu.recommendation.xsl +1500 -279
- data/lib/isodoc/itu/itu.resolution.xsl +1500 -279
- data/lib/isodoc/itu/itu.service-publication.xsl +1500 -279
- data/lib/isodoc/itu/itu.technical-paper.xsl +1500 -279
- data/lib/isodoc/itu/itu.technical-report.xsl +1500 -279
- data/lib/isodoc/itu/presentation_xml_convert.rb +16 -0
- data/lib/isodoc/itu/ref.rb +20 -32
- data/lib/isodoc/itu/terms.rb +1 -1
- data/lib/isodoc/itu/word_cleanup.rb +11 -9
- data/lib/isodoc/itu/word_convert.rb +1 -1
- data/lib/isodoc/itu/xref.rb +42 -27
- data/lib/isodoc/itu/xref_section.rb +0 -15
- data/lib/metanorma/itu/biblio.rng +37 -8
- data/lib/metanorma/itu/isodoc.rng +56 -0
- data/lib/metanorma/itu/version.rb +1 -1
- data/lib/relaton/render/config.yml +3 -0
- data/lib/relaton/render/general.rb +13 -0
- data/metanorma-itu.gemspec +1 -1
- metadata +6 -4
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 91544fe7390a2f041533fbe0c48fd16574259c08c432cdd35b37cceb768ad8c1
|
|
4
|
+
data.tar.gz: cc6ed24243b38035fb32e8f249d74592c13c52b5c4a2f5a913734fdcf152f6c2
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 333e2543bb6d3fefb656687862f4117c1cfa2e528d5f0ed8d79130c45e67f33b5e66b2f4df80f9e5d3c6ef7cad62e0858afd7c8b1fc6110f78723b29472f5c98
|
|
7
|
+
data.tar.gz: c5be04ee71ecd56bd2068102784a0e2628ea524935487fac3418da34ac5bb3ad57c6de781543a0c47d80c0411dcd0e4955ebef013a0a350ef2360ae741a48f43
|
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
|
|
28
|
+
d.children.first.previous = "<b>#{h2.children.to_xml}</b> "
|
|
29
29
|
d["id"] = h2["id"]
|
|
30
30
|
h2.remove
|
|
31
31
|
end
|
|
@@ -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
|
|
35
|
+
<p class="MsoNormal"><span style='mso-bookmark:_Hlk526346232'><span lang="FR-CH"
|
|
36
|
+
style='mso-ansi-language:FR-CH'><o:p> </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
|
|
42
|
+
<p class="MsoNormal"><span style='mso-bookmark:_Hlk526346232'><span lang="FR-CH"
|
|
43
|
+
style='mso-ansi-language:FR-CH'><o:p> </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
|
|
106
|
+
<p class="MsoNormal"><span style='mso-bookmark:_Hlk526346232'><span lang="EN-US"
|
|
107
|
+
style='mso-ansi-language:EN-US'><o:p> </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
|
|
109
|
+
<p class="MsoNormal"><span style='mso-bookmark:_Hlk526346232'><span lang="EN-US"
|
|
110
|
+
style='mso-ansi-language:EN-US'><o:p> </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
|
|
130
|
+
<p class="MsoNormal"><span style='mso-bookmark:_Hlk526346232'><span lang="EN-US"
|
|
131
|
+
style='mso-ansi-language:EN-US'><o:p> </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
|
|
135
|
+
<p class="MsoNormal"><span style='mso-bookmark:_Hlk526346232'><span lang="EN-US"
|
|
136
|
+
style='mso-ansi-language:EN-US'><o:p> </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> </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
|
|
154
|
+
<p class="MsoNormal"><span style='mso-bookmark:_Hlk526346232'><span lang="EN-US"
|
|
155
|
+
style='mso-ansi-language:EN-US'><o:p> </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> </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
|
|
@@ -419,6 +419,7 @@
|
|
|
419
419
|
<span style='mso-bookmark:_Hlk526346232'></span>
|
|
420
420
|
</tr>
|
|
421
421
|
</table>
|
|
422
|
+
<div class="coverpage-warning" id="coverpage-note-destination"/>
|
|
422
423
|
|
|
423
424
|
<p class="MsoNormal" align="right" style='margin-top:0.0pt;text-align:right;
|
|
424
425
|
tab-stops:39.7pt 59.55pt 79.4pt 99.25pt right 17.0cm'><span style='mso-bookmark:
|
|
@@ -99,7 +99,7 @@ normal'><span lang="EN-GB" style='font-size:14.0pt;mso-bidi-font-size:10.0pt'>{{
|
|
|
99
99
|
<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> </o:p></span></b></p>
|
|
100
100
|
</td>
|
|
101
101
|
</tr>
|
|
102
|
-
</table
|
|
102
|
+
</table><div class="coverpage-warning" id="coverpage-note-destination"/>
|
|
103
103
|
|
|
104
104
|
<p class="MEP"> </p>
|
|
105
105
|
|
|
@@ -4,7 +4,6 @@ require "fileutils"
|
|
|
4
4
|
|
|
5
5
|
module IsoDoc
|
|
6
6
|
module ITU
|
|
7
|
-
|
|
8
7
|
# A {Converter} implementation that generates HTML output, and a document
|
|
9
8
|
# schema encapsulation of the document for validation
|
|
10
9
|
#
|
|
@@ -17,14 +16,20 @@ module IsoDoc
|
|
|
17
16
|
|
|
18
17
|
def default_fonts(options)
|
|
19
18
|
{
|
|
20
|
-
bodyfont: (options[:script] == "Hans"
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
'"Times New Roman",serif'
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
19
|
+
bodyfont: (if options[:script] == "Hans"
|
|
20
|
+
'"Source Han Sans",serif'
|
|
21
|
+
else
|
|
22
|
+
'"Times New Roman",serif'
|
|
23
|
+
end),
|
|
24
|
+
headerfont: (if options[:script] == "Hans"
|
|
25
|
+
'"Source Han Sans",sans-serif'
|
|
26
|
+
else
|
|
27
|
+
'"Times New Roman",serif'
|
|
28
|
+
end),
|
|
29
|
+
monospacefont: '"Courier New",monospace',
|
|
30
|
+
normalfontsize: "14px",
|
|
31
|
+
monospacefontsize: "0.8em",
|
|
32
|
+
footnotefontsize: "0.9em",
|
|
28
33
|
}
|
|
29
34
|
end
|
|
30
35
|
|
|
@@ -38,12 +43,12 @@ module IsoDoc
|
|
|
38
43
|
|
|
39
44
|
def googlefonts
|
|
40
45
|
<<~HEAD.freeze
|
|
41
|
-
|
|
46
|
+
<link href="https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,600,600i,800|Space+Mono:400,700" rel="stylesheet">
|
|
42
47
|
HEAD
|
|
43
48
|
end
|
|
44
49
|
|
|
45
50
|
def make_body(xml, docxml)
|
|
46
|
-
body_attr = { lang: "EN-US", link: "blue", vlink: "#954F72",
|
|
51
|
+
body_attr = { lang: "EN-US", link: "blue", vlink: "#954F72",
|
|
47
52
|
"xml:lang": "EN-US", class: "container" }
|
|
48
53
|
xml.body **body_attr do |body|
|
|
49
54
|
make_body1(body, docxml)
|
data/lib/isodoc/itu/init.rb
CHANGED