metanorma-itu 2.2.4 → 2.2.6
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 +11 -11
- data/lib/isodoc/itu/html/header.html +4 -4
- data/lib/isodoc/itu/html/html_itu_titlepage.html +2 -0
- data/lib/isodoc/itu/html/htmlstyle.css +4 -0
- data/lib/isodoc/itu/html/htmlstyle.scss +6 -0
- data/lib/isodoc/itu/html/word_itu_titlepage.html +2 -0
- data/lib/isodoc/itu/html/word_itu_titlepage_sp.html +2 -0
- data/lib/isodoc/itu/i18n-ar.yaml +1 -0
- data/lib/isodoc/itu/i18n-de.yaml +1 -0
- data/lib/isodoc/itu/i18n-en.yaml +1 -0
- data/lib/isodoc/itu/i18n-es.yaml +1 -0
- data/lib/isodoc/itu/i18n-fr.yaml +1 -0
- data/lib/isodoc/itu/i18n-ru.yaml +1 -0
- data/lib/isodoc/itu/i18n-zh-Hans.yaml +1 -0
- data/lib/isodoc/itu/itu.implementers-guide.xsl +227 -100
- data/lib/isodoc/itu/itu.in-force.xsl +227 -100
- data/lib/isodoc/itu/itu.recommendation-annex.xsl +227 -100
- data/lib/isodoc/itu/itu.recommendation-supplement.xsl +227 -100
- data/lib/isodoc/itu/itu.recommendation.xsl +227 -100
- data/lib/isodoc/itu/itu.resolution.xsl +227 -100
- data/lib/isodoc/itu/itu.service-publication.xsl +227 -100
- data/lib/isodoc/itu/itu.technical-paper.xsl +227 -100
- data/lib/isodoc/itu/itu.technical-report.xsl +227 -100
- data/lib/isodoc/itu/metadata.rb +18 -17
- data/lib/isodoc/itu/presentation_xml_convert.rb +2 -2
- data/lib/isodoc/itu/xref.rb +7 -5
- data/lib/metanorma/itu/basicdoc.rng +0 -1
- data/lib/metanorma/itu/biblio.rng +11 -1
- data/lib/metanorma/itu/front_id.rb +15 -8
- data/lib/metanorma/itu/isodoc.rng +11 -0
- data/lib/metanorma/itu/validate.rb +2 -2
- data/lib/metanorma/itu/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: d0aff593cb44fbd43690c0dec7b796aae694c20641669d1a52e57e0108b2ec04
|
4
|
+
data.tar.gz: 67ec47347f5d85262cb552330a25578f5b2cc6ea98466ad5ba6317f93b3da23a
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 5cd80af4151d3c3a9e47a1ad5aae96df063a4e2b76bc67acc92754cadb856309dab054b0082ab0dfa086852e3308465a99b38e354b78a50e0aa51303dfc2872a
|
7
|
+
data.tar.gz: efc85fde805aa5f92f6670ef714c7c8361a4ba2e9dec95f907556897ac5ad255bb30185f769e094989e1c93b5fe12d247f6fdf41ec2cb8676e3949a738f1b02c
|
@@ -8,7 +8,7 @@ require_relative "./cleanup"
|
|
8
8
|
module IsoDoc
|
9
9
|
module ITU
|
10
10
|
module BaseConvert
|
11
|
-
FRONT_CLAUSE = "//*[parent::preface]"\
|
11
|
+
FRONT_CLAUSE = "//*[parent::preface]" \
|
12
12
|
"[not(local-name() = 'abstract')]".freeze
|
13
13
|
|
14
14
|
def preface(isoxml, out)
|
@@ -55,7 +55,7 @@ module IsoDoc
|
|
55
55
|
def annex_name(annex, name, div)
|
56
56
|
preceding_floating_titles(name, div)
|
57
57
|
r_a = @meta.get[:doctype_original] == "recommendation-annex"
|
58
|
-
div.h1
|
58
|
+
div.h1 class: r_a ? "RecommendationAnnex" : "Annex" do |t|
|
59
59
|
name&.children&.each { |c2| parse(c2, t) }
|
60
60
|
end
|
61
61
|
@meta.get[:doctype_original] == "resolution" or
|
@@ -64,7 +64,7 @@ module IsoDoc
|
|
64
64
|
|
65
65
|
def annex_obligation_subtitle(annex, div)
|
66
66
|
info = annex["obligation"] == "informative"
|
67
|
-
div.p
|
67
|
+
div.p class: "annex_obligation" do |p|
|
68
68
|
p << (info ? @i18n.inform_annex : @i18n.norm_annex)
|
69
69
|
.sub(/%/, @meta.get[:doctype] || "")
|
70
70
|
end
|
@@ -102,15 +102,15 @@ module IsoDoc
|
|
102
102
|
|
103
103
|
def middle_title_resolution(isoxml, out)
|
104
104
|
res = isoxml.at(ns("//bibdata/title[@type = 'resolution']"))
|
105
|
-
out.p(
|
105
|
+
out.p(align: "center", style: "text-align:center;") do |p|
|
106
106
|
res.children.each { |n| parse(n, p) }
|
107
107
|
end
|
108
|
-
out.p(
|
108
|
+
out.p(class: "zzSTDTitle2") { |p| p << @meta.get[:doctitle] }
|
109
109
|
middle_title_resolution_subtitle(isoxml, out)
|
110
110
|
end
|
111
111
|
|
112
112
|
def middle_title_resolution_subtitle(isoxml, out)
|
113
|
-
out.p(
|
113
|
+
out.p(align: "center", style: "text-align:center;") do |p|
|
114
114
|
p.i do |i|
|
115
115
|
i << "("
|
116
116
|
isoxml.at(ns("//bibdata/title[@type = 'resolution-placedate']"))
|
@@ -124,26 +124,26 @@ module IsoDoc
|
|
124
124
|
end
|
125
125
|
|
126
126
|
def middle_title_recommendation(isoxml, out)
|
127
|
-
out.p(
|
127
|
+
out.p(class: "zzSTDTitle1") do |p|
|
128
128
|
type = @meta.get[:doctype]
|
129
129
|
@meta.get[:unpublished] && @meta.get[:draft_new_doctype] and
|
130
130
|
type = @meta.get[:draft_new_doctype]
|
131
131
|
id = @meta.get[:docnumber] and p << "#{type} #{id}"
|
132
132
|
end
|
133
|
-
out.p(
|
133
|
+
out.p(class: "zzSTDTitle2") do |p|
|
134
134
|
p << @meta.get[:doctitle]
|
135
135
|
isoxml.xpath(ns("//note[@type = 'title-footnote']")).each do |f|
|
136
136
|
footnote_parse(f, p)
|
137
137
|
end
|
138
138
|
end
|
139
139
|
s = @meta.get[:docsubtitle] and
|
140
|
-
out.p(
|
140
|
+
out.p(class: "zzSTDTitle3") { |p| p << s }
|
141
141
|
end
|
142
142
|
|
143
143
|
def note_p_parse(node, div)
|
144
144
|
name = node&.at(ns("./name"))&.remove
|
145
145
|
div.p do |p|
|
146
|
-
name and p.span
|
146
|
+
name and p.span class: "note_label" do |s|
|
147
147
|
name.children.each { |n| parse(n, s) }
|
148
148
|
s << note_delim
|
149
149
|
end
|
@@ -155,7 +155,7 @@ module IsoDoc
|
|
155
155
|
def note_parse1(node, div)
|
156
156
|
name = node&.at(ns("./name"))&.remove
|
157
157
|
div.p do |p|
|
158
|
-
name and p.span
|
158
|
+
name and p.span class: "note_label" do |s|
|
159
159
|
name.children.each { |n| parse(n, s) }
|
160
160
|
end
|
161
161
|
end
|
@@ -88,22 +88,22 @@ exactly'></p>
|
|
88
88
|
|
89
89
|
<div style='mso-element:header' id=eh2>
|
90
90
|
<p class=MsoHeader align=left style='text-align:left;line-height:12.0pt;
|
91
|
-
mso-line-height-rule:exactly'><span lang=EN-GB
|
91
|
+
mso-line-height-rule:exactly'><span lang=EN-GB>{% if document_td or document_provisional %}{% if document_td %}{{ document_td }}{% endif %}{% if document_td and document_provisional %}; {% endif %}{% if document_provisional %}{{ document_provisional }}{% endif %}{% endif %}</span></p>
|
92
92
|
</div>
|
93
93
|
|
94
94
|
<div style='mso-element:header' id=eh2l>
|
95
95
|
<p class=MsoHeaderLandscape align=left style='text-align:left;line-height:12.0pt;
|
96
|
-
mso-line-height-rule:exactly'><span lang=EN-GB
|
96
|
+
mso-line-height-rule:exactly'><span lang=EN-GB>{% if document_td or document_provisional %}{% if document_td %}{{ document_td }}{% endif %}{% if document_td and document_provisional %}; {% endif %}{% if document_provisional %}{{ document_provisional }}{% endif %}{% endif %}</span></p>
|
97
97
|
</div>
|
98
98
|
|
99
99
|
<div style='mso-element:header' id=h2>
|
100
100
|
<p class=MsoHeader align=right style='text-align:right;line-height:12.0pt;
|
101
|
-
mso-line-height-rule:exactly'><span lang=EN-GB
|
101
|
+
mso-line-height-rule:exactly'><span lang=EN-GB>{% if document_td or document_provisional %}{% if document_td %}{{ document_td }}{% endif %}{% if document_td and document_provisional %}; {% endif %}{% if document_provisional %}{{ document_provisional }}{% endif %}{% endif %}</span></p>
|
102
102
|
</div>
|
103
103
|
|
104
104
|
<div style='mso-element:header' id=h2l>
|
105
105
|
<p class=MsoHeaderLandscape align=right style='text-align:right;line-height:12.0pt;
|
106
|
-
mso-line-height-rule:exactly'><span lang=EN-GB
|
106
|
+
mso-line-height-rule:exactly'><span lang=EN-GB>{% if document_td or document_provisional %}{% if document_td %}{{ document_td }}{% endif %}{% if document_td and document_provisional %}; {% endif %}{% if document_provisional %}{{ document_provisional }}{% endif %}{% endif %}</span></p>
|
107
107
|
</div>
|
108
108
|
|
109
109
|
<div style='mso-element:footer' id=ef2>
|
@@ -47,6 +47,8 @@
|
|
47
47
|
{% if amendmentid %}<div class="doc-subidentifier">{{ amendmentid }}</div>{% endif %}
|
48
48
|
{% if corrigendumid %}<div class="doc-subidentifier">{{ corrigendumid }}</div>{% endif %}
|
49
49
|
{% if edition %} <div> Revision {{ edition }}</div> {% endif %}
|
50
|
+
{% if docnumber_td %}<br/><span class="doc-subidentifier">TD number: {{docnumber_td}}</span>{%endif%}
|
51
|
+
{% if docnumber_provisional %}<br/><span class="doc-subidentifier">Provisional identifier: {{docnumber_provisional}}</span>{%endif%}
|
50
52
|
<div> {{ draftinfo }}</div>
|
51
53
|
</div>
|
52
54
|
{% if pubdate_monthyear %}
|
@@ -212,6 +212,8 @@
|
|
212
212
|
normal'><span lang="EN-US" style='font-size:30.0pt;mso-bidi-font-size:10.0pt;
|
213
213
|
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>
|
214
214
|
{% endif %}
|
215
|
+
{% if docnumber_td %}<br/><span class="doc-identifier" style='font-family:"Arial",sans-serif'>TD number: {{docnumber_td}}</span>{%endif%}
|
216
|
+
{% if docnumber_provisional %}<br/><span class="doc-identifier" style='font-family:"Arial",sans-serif'>Provisional identifier: {{docnumber_provisional}}</span>{%endif%}
|
215
217
|
</span></p>
|
216
218
|
</td>
|
217
219
|
<span style='mso-bookmark:_Hlk526346232'><span style='mso-bookmark:dnume'></span></span>
|
@@ -16,6 +16,8 @@ lang="EN-GB" style='font-size:10.0pt'>{{ annex_to_itu_ob }}</span></i></p>
|
|
16
16
|
<p class="MsoNormal" align="center" style='margin-top:0cm;text-align:center'><i><span
|
17
17
|
lang="EN-GB" style='font-size:10.0pt'>{{ number_abbrev }} {{ docnumeric }} – {{ pubdate_ddMMMyyyy }}</span></i></p>
|
18
18
|
{% endif %}
|
19
|
+
{% if docnumber_td %}<p><span class="doc-identifier">TD number: {{docnumber_td}}</span></p>{%endif%}
|
20
|
+
{% if docnumber_provisional %}<p><span class="doc-identifier">Provisional identifier: {{docnumber_provisional}}</span></p>{%endif%}
|
19
21
|
|
20
22
|
<p class="MEP"><span lang="EN-GB" style='font-size:10.0pt'><o:p> </o:p></span></p>
|
21
23
|
|
data/lib/isodoc/itu/i18n-ar.yaml
CHANGED
data/lib/isodoc/itu/i18n-de.yaml
CHANGED
data/lib/isodoc/itu/i18n-en.yaml
CHANGED
@@ -8,6 +8,7 @@ symbolsabbrev: Abbreviations and acronyms
|
|
8
8
|
abbrev: Abbreviations and acronyms
|
9
9
|
symbols: Abbreviations and acronyms
|
10
10
|
conventions: Conventions
|
11
|
+
abstract: Summary
|
11
12
|
elsewhere_terms: >-
|
12
13
|
This Recommendation uses the following terms defined elsewhere:
|
13
14
|
here_terms: >-
|
data/lib/isodoc/itu/i18n-es.yaml
CHANGED
@@ -8,6 +8,7 @@ symbolsabbrev: Abreviaciones y acrónimos
|
|
8
8
|
abbrev: Abreviaciones y acrónimos
|
9
9
|
symbols: Abreviaciones y acrónimos
|
10
10
|
conventions: Convenciones
|
11
|
+
abstract: Resumen
|
11
12
|
elsewhere_terms: >-
|
12
13
|
Esta Recomendación utiliza los siguientes términos definidos en otro lugar:
|
13
14
|
here_terms: >-
|
data/lib/isodoc/itu/i18n-fr.yaml
CHANGED
@@ -8,6 +8,7 @@ symbolsabbrev: Abréviations et acronymes
|
|
8
8
|
abbrev: Abréviations et acronymes
|
9
9
|
symbols: Abréviations et acronymes
|
10
10
|
conventions: Conventions
|
11
|
+
abstract: Résumé
|
11
12
|
elsewhere_terms: >-
|
12
13
|
La présente Recommandation utilise les termes suivants définis ailleurs:
|
13
14
|
here_terms: >-
|
data/lib/isodoc/itu/i18n-ru.yaml
CHANGED
@@ -8,6 +8,7 @@ symbolsabbrev: Сокращения и акронимы
|
|
8
8
|
abbrev: Сокращения и акронимы
|
9
9
|
symbols: Сокращения и акронимы
|
10
10
|
conventions: Соглашения
|
11
|
+
abstract: Резюме
|
11
12
|
elsewhere_terms: >-
|
12
13
|
Эта Рекомендация использует следующие термины, определенные в другом месте:
|
13
14
|
here_terms: >-
|