metanorma-iso 1.5.10 → 1.5.11
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/workflows/macos.yml +9 -1
- data/.github/workflows/ubuntu.yml +8 -0
- data/.github/workflows/windows.yml +7 -0
- data/lib/asciidoctor/iso/boilerplate-fr.xml +40 -0
- data/lib/asciidoctor/iso/boilerplate.xml +1 -0
- data/lib/asciidoctor/iso/cleanup.rb +5 -0
- data/lib/asciidoctor/iso/isodoc.rng +1 -43
- data/lib/isodoc/iso/html/header.html +8 -16
- data/lib/isodoc/iso/html/style-human.css +4 -0
- data/lib/isodoc/iso/html/style-iso.css +4 -0
- data/lib/isodoc/iso/i18n-en.yaml +3 -0
- data/lib/isodoc/iso/i18n-fr.yaml +3 -0
- data/lib/isodoc/iso/i18n-zh-Hans.yaml +4 -0
- data/lib/isodoc/iso/iso.amendment.xsl +27 -3
- data/lib/isodoc/iso/iso.international-standard.xsl +27 -3
- data/lib/isodoc/iso/metadata.rb +19 -19
- data/lib/metanorma/iso/version.rb +1 -1
- data/spec/asciidoctor-iso/base_spec.rb +22 -12
- data/spec/isodoc/amd_spec.rb +187 -22
- data/spec/isodoc/i18n_spec.rb +9 -22
- data/spec/isodoc/inline_spec.rb +1 -1
- data/spec/isodoc/metadata_spec.rb +168 -3
- data/spec/isodoc/postproc_spec.rb +2 -5
- data/spec/isodoc/ref_spec.rb +2 -5
- data/spec/spec_helper.rb +17 -1
- metadata +3 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: b55ad63091753ec601585409d6eb07ecb5036273c4c0a25d4dc8933d1f8fe68e
|
|
4
|
+
data.tar.gz: e4926508e1cbd008d5f8f9daf99746dd31fe599726ac3b40c3fbe21417425d92
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 5e91a33a23750e3f6bcc4a7b41b31a6543ab59bd28f7c82bc683e4e18c6e1ba0944b8662d29b74f95e548eac55da5d7b40bb842574d1739aba494e0058e07e3c
|
|
7
|
+
data.tar.gz: d8c09a90f76d6d5872010b54001af4c7a8d8ebd809cef8c6c6d09e75bb303c7717d5f74f8e10230ed9a6dbbc47f166383ade0215d2f876dd948a202b08ada08c
|
data/.github/workflows/macos.yml
CHANGED
|
@@ -29,9 +29,17 @@ jobs:
|
|
|
29
29
|
uses: actions/setup-ruby@v1
|
|
30
30
|
with:
|
|
31
31
|
ruby-version: ${{ matrix.ruby }}
|
|
32
|
+
- name: Cache gems
|
|
33
|
+
uses: actions/cache@preview
|
|
34
|
+
with:
|
|
35
|
+
path: vendor/bundle
|
|
36
|
+
key: ${{ runner.os }}-${{ matrix.ruby }}-gem-${{ hashFiles('Gemfile') }}
|
|
37
|
+
restore-keys: |
|
|
38
|
+
${{ runner.os }}-${{ matrix.ruby }}-gem-
|
|
32
39
|
- name: Update gems
|
|
33
40
|
run: |
|
|
34
|
-
|
|
41
|
+
gem install bundler
|
|
42
|
+
bundle config --local path vendor/bundle
|
|
35
43
|
bundle install --jobs 4 --retry 3
|
|
36
44
|
- name: Install PlantUML
|
|
37
45
|
run: |
|
|
@@ -29,9 +29,17 @@ jobs:
|
|
|
29
29
|
uses: actions/setup-ruby@v1
|
|
30
30
|
with:
|
|
31
31
|
ruby-version: ${{ matrix.ruby }}
|
|
32
|
+
- name: Cache gems
|
|
33
|
+
uses: actions/cache@preview
|
|
34
|
+
with:
|
|
35
|
+
path: vendor/bundle
|
|
36
|
+
key: ${{ runner.os }}-${{ matrix.ruby }}-gem-${{ hashFiles('Gemfile') }}
|
|
37
|
+
restore-keys: |
|
|
38
|
+
${{ runner.os }}-${{ matrix.ruby }}-gem-
|
|
32
39
|
- name: Update gems
|
|
33
40
|
run: |
|
|
34
41
|
gem install bundler
|
|
42
|
+
bundle config --local path vendor/bundle
|
|
35
43
|
bundle install --jobs 4 --retry 3
|
|
36
44
|
- name: Install PlantUML
|
|
37
45
|
uses: nick-invision/retry@v1
|
|
@@ -29,6 +29,13 @@ jobs:
|
|
|
29
29
|
uses: actions/setup-ruby@v1
|
|
30
30
|
with:
|
|
31
31
|
ruby-version: ${{ matrix.ruby }}
|
|
32
|
+
- name: Cache gems
|
|
33
|
+
uses: actions/cache@preview
|
|
34
|
+
with:
|
|
35
|
+
path: vendor/bundle
|
|
36
|
+
key: ${{ runner.os }}-${{ matrix.ruby }}-gem-${{ hashFiles('Gemfile') }}
|
|
37
|
+
restore-keys: |
|
|
38
|
+
${{ runner.os }}-${{ matrix.ruby }}-gem-
|
|
32
39
|
- name: Update gems
|
|
33
40
|
shell: pwsh
|
|
34
41
|
run: |
|
|
@@ -0,0 +1,40 @@
|
|
|
1
|
+
<boilerplate>
|
|
2
|
+
<copyright-statement>
|
|
3
|
+
<clause>
|
|
4
|
+
<title>DOCUMENT PROTÉGÉ PAR COPYRIGHT</title>
|
|
5
|
+
<p id="boilerplate-year">© {{ agency }} {{ docyear }}</p>
|
|
6
|
+
|
|
7
|
+
<p id="boilerplate-message">
|
|
8
|
+
Droits de reproduction réservés. Sauf indication contraire, aucune partie de cette publication ne
|
|
9
|
+
peut être reproduite ni utilisée sous quelque forme que ce soit et par aucun procédé, électronique
|
|
10
|
+
ou mécanique, y compris la photocopie, l’affichage sur l’internet ou sur un Intranet, sans
|
|
11
|
+
autorisation écrite préalable. Les demandes d’autorisation peuvent être adressées à l’ISO à
|
|
12
|
+
l’adresse ci-après ou au comité membre de l’ISO dans le pays du demandeur.
|
|
13
|
+
</p>
|
|
14
|
+
|
|
15
|
+
<p id="boilerplate-address" align="left">
|
|
16
|
+
ISO copyright office<br/>
|
|
17
|
+
Ch. de Blandonnet 8 • CP 401<br/>
|
|
18
|
+
CH-1214 Vernier, Geneva, Switzerland<br/>
|
|
19
|
+
Tel. + 41 22 749 01 11<br/>
|
|
20
|
+
Fax + 41 22 749 09 47<br/>
|
|
21
|
+
Email: copyright@iso.org<br/>
|
|
22
|
+
Website: www.iso.org
|
|
23
|
+
</p>
|
|
24
|
+
<p id="boilerplate-place">
|
|
25
|
+
Publié en Suisse
|
|
26
|
+
</p>
|
|
27
|
+
</clause>
|
|
28
|
+
</copyright-statement>
|
|
29
|
+
|
|
30
|
+
{% if unpublished %}
|
|
31
|
+
<license-statement>
|
|
32
|
+
<clause>
|
|
33
|
+
<title>Avertissement</title>
|
|
34
|
+
|
|
35
|
+
<p>Ce document n'est pas une Norme internationale de l'ISO. Il est distribué pour examen et observations. Il est susceptible de modification sans préavis et ne peut être cité comme Norme internationale.</p>
|
|
36
|
+
<p>Les destinataires du présent projet sont invités à présenter, avec leurs observations, notification des droits de propriété dont ils auraient éventuellement connaissance et à fournir une documentation explicative.</p>
|
|
37
|
+
</clause>
|
|
38
|
+
</license-statement>
|
|
39
|
+
{% endif %}
|
|
40
|
+
</boilerplate>
|
|
@@ -1164,49 +1164,7 @@
|
|
|
1164
1164
|
</define>
|
|
1165
1165
|
<define name="annex">
|
|
1166
1166
|
<element name="annex">
|
|
1167
|
-
<
|
|
1168
|
-
<attribute name="id">
|
|
1169
|
-
<data type="ID"/>
|
|
1170
|
-
</attribute>
|
|
1171
|
-
</optional>
|
|
1172
|
-
<optional>
|
|
1173
|
-
<attribute name="language"/>
|
|
1174
|
-
</optional>
|
|
1175
|
-
<optional>
|
|
1176
|
-
<attribute name="script"/>
|
|
1177
|
-
</optional>
|
|
1178
|
-
<optional>
|
|
1179
|
-
<attribute name="inline-header">
|
|
1180
|
-
<data type="boolean"/>
|
|
1181
|
-
</attribute>
|
|
1182
|
-
</optional>
|
|
1183
|
-
<attribute name="obligation">
|
|
1184
|
-
<choice>
|
|
1185
|
-
<value>normative</value>
|
|
1186
|
-
<value>informative</value>
|
|
1187
|
-
</choice>
|
|
1188
|
-
</attribute>
|
|
1189
|
-
<optional>
|
|
1190
|
-
<ref name="section-title"/>
|
|
1191
|
-
</optional>
|
|
1192
|
-
<group>
|
|
1193
|
-
<group>
|
|
1194
|
-
<zeroOrMore>
|
|
1195
|
-
<ref name="BasicBlock"/>
|
|
1196
|
-
</zeroOrMore>
|
|
1197
|
-
<zeroOrMore>
|
|
1198
|
-
<ref name="note"/>
|
|
1199
|
-
</zeroOrMore>
|
|
1200
|
-
</group>
|
|
1201
|
-
<zeroOrMore>
|
|
1202
|
-
<choice>
|
|
1203
|
-
<ref name="annex-subsection"/>
|
|
1204
|
-
<ref name="terms"/>
|
|
1205
|
-
<ref name="definitions"/>
|
|
1206
|
-
<ref name="references"/>
|
|
1207
|
-
</choice>
|
|
1208
|
-
</zeroOrMore>
|
|
1209
|
-
</group>
|
|
1167
|
+
<ref name="Annex-Section"/>
|
|
1210
1168
|
</element>
|
|
1211
1169
|
</define>
|
|
1212
1170
|
<define name="terms">
|
|
@@ -74,7 +74,7 @@ mso-line-height-rule:exactly'><span lang=EN-GB>{{ docnumber_reference }}{{ draft
|
|
|
74
74
|
|
|
75
75
|
<p class=MsoHeader style='margin-bottom:18.0pt'><span lang=EN-GB
|
|
76
76
|
style='font-size:10.0pt;mso-bidi-font-size:11.0pt;font-weight:normal'>©
|
|
77
|
-
{{ agency }} {{ docyear }} –
|
|
77
|
+
{{ agency }} {{ docyear }} – {{ all_rights_reserved }}</span><span lang=EN-GB
|
|
78
78
|
style='font-weight:normal'><o:p></o:p></span></p>
|
|
79
79
|
|
|
80
80
|
</div>
|
|
@@ -93,7 +93,7 @@ style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
|
|
|
93
93
|
mso-bidi-font-size:11.0pt'><span style='mso-element:field-end'></span></span></b><![endif]--><span
|
|
94
94
|
lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
|
|
95
95
|
style='mso-tab-count:1'> </span>©
|
|
96
|
-
{{ agency }} {{ docyear }} –
|
|
96
|
+
{{ agency }} {{ docyear }} – {{ all_rights_reserved }}<o:p></o:p></span></p>
|
|
97
97
|
|
|
98
98
|
</div>
|
|
99
99
|
|
|
@@ -129,7 +129,7 @@ lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
|
|
|
129
129
|
style='mso-element:field-end'></span></span><![endif]--><span lang=EN-GB
|
|
130
130
|
style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span style='mso-tab-count:
|
|
131
131
|
1'> </span>©
|
|
132
|
-
{{ agency }} {{ docyear }} –
|
|
132
|
+
{{ agency }} {{ docyear }} – {{ all_rights_reserved }}<o:p></o:p></span></p>
|
|
133
133
|
</div>
|
|
134
134
|
|
|
135
135
|
<div style='mso-element:footer' id=ef2l>
|
|
@@ -144,7 +144,7 @@ lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
|
|
|
144
144
|
style='mso-element:field-end'></span></span><![endif]--><span lang=EN-GB
|
|
145
145
|
style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span style='mso-tab-count:
|
|
146
146
|
1'> </span>©
|
|
147
|
-
{{ agency }} {{ docyear }} –
|
|
147
|
+
{{ agency }} {{ docyear }} – {{ all_rights_reserved }}<o:p></o:p></span></p>
|
|
148
148
|
</div>
|
|
149
149
|
|
|
150
150
|
<div style='mso-element:footer' id=f2>
|
|
@@ -188,7 +188,7 @@ style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
|
|
|
188
188
|
mso-bidi-font-size:11.0pt'><span style='mso-element:field-end'></span></span></b><![endif]--><span
|
|
189
189
|
lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
|
|
190
190
|
style='mso-tab-count:1'> </span>©
|
|
191
|
-
{{ agency }} {{ docyear }} –
|
|
191
|
+
{{ agency }} {{ docyear }} – {{ all_rights_reserved }}<o:p></o:p></span></p>
|
|
192
192
|
</div>
|
|
193
193
|
|
|
194
194
|
<div style='mso-element:footer' id=ef3l>
|
|
@@ -204,7 +204,7 @@ style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
|
|
|
204
204
|
mso-bidi-font-size:11.0pt'><span style='mso-element:field-end'></span></span></b><![endif]--><span
|
|
205
205
|
lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
|
|
206
206
|
style='mso-tab-count:1'> </span>©
|
|
207
|
-
{{ agency }} {{ docyear }} –
|
|
207
|
+
{{ agency }} {{ docyear }} – {{ all_rights_reserved }}<o:p></o:p></span></p>
|
|
208
208
|
</div>
|
|
209
209
|
|
|
210
210
|
<div style='mso-element:footer' id=f3>
|
|
@@ -246,18 +246,10 @@ lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><o:p></o:p></span>
|
|
|
246
246
|
{% endif %}
|
|
247
247
|
|
|
248
248
|
<p class=MsoFooter style='margin-top:0cm'><span lang=EN-AU style='font-size:
|
|
249
|
-
10.0pt;mso-ansi-language:EN-AU'>
|
|
250
|
-
lang=EN-AU style='font-size:10.0pt;mso-ansi-language:EN-AU'><span
|
|
251
|
-
style='mso-element:field-begin'></span><span style='mso-spacerun:yes'> </span>NUMPAGES<span
|
|
252
|
-
style='mso-spacerun:yes'> </span>\* MERGEFORMAT <span style='mso-element:field-separator'></span></span><![endif]--><span
|
|
253
|
-
lang=EN-AU style='font-size:10.0pt;mso-ansi-language:EN-AU'><span
|
|
254
|
-
style='mso-no-proof:yes'>26</span></span><!--[if supportFields]><span
|
|
255
|
-
lang=EN-AU style='font-size:10.0pt;mso-ansi-language:EN-AU'><span
|
|
256
|
-
style='mso-element:field-end'></span></span><![endif]--><span lang=EN-AU
|
|
257
|
-
style='font-size:10.0pt;mso-ansi-language:EN-AU'> pages<o:p></o:p></span></p>
|
|
249
|
+
10.0pt;mso-ansi-language:EN-AU'>{{ price_based_on | replace: "%", "<span style='mso-element:field-begin'></span><span style='mso-spacerun:yes'> </span>NUMPAGES<span style='mso-spacerun:yes'> </span>\* MERGEFORMAT <span style='mso-element:field-separator'></span><span style='mso-no-proof:yes'>26</span><span style='mso-element:field-end'></span>" }}</span></p>
|
|
258
250
|
|
|
259
251
|
<p class=MsoFooter><span lang=EN-AU style='font-size:10.0pt;'>©
|
|
260
|
-
{{ agency }} {{ docyear }} –
|
|
252
|
+
{{ agency }} {{ docyear }} – {{ all_rights_reserved }}<o:p></o:p></span></p>
|
|
261
253
|
|
|
262
254
|
</div>
|
|
263
255
|
|
|
@@ -111,6 +111,10 @@ b, strong {
|
|
|
111
111
|
div.document-stage-band, div.document-type-band {
|
|
112
112
|
background-color: #333333; }
|
|
113
113
|
|
|
114
|
+
a.FootnoteRef + a.FootnoteRef:before {
|
|
115
|
+
content: ", ";
|
|
116
|
+
vertical-align: super; }
|
|
117
|
+
|
|
114
118
|
#standard-band {
|
|
115
119
|
background-color: #0AC442; }
|
|
116
120
|
|
|
@@ -111,6 +111,10 @@ b, strong {
|
|
|
111
111
|
div.document-stage-band, div.document-type-band {
|
|
112
112
|
background-color: #333333; }
|
|
113
113
|
|
|
114
|
+
a.FootnoteRef + a.FootnoteRef:before {
|
|
115
|
+
content: ", ";
|
|
116
|
+
vertical-align: super; }
|
|
117
|
+
|
|
114
118
|
#standard-band {
|
|
115
119
|
background-color: #0AC442; }
|
|
116
120
|
|
data/lib/isodoc/iso/i18n-en.yaml
CHANGED
data/lib/isodoc/iso/i18n-fr.yaml
CHANGED
|
@@ -2395,6 +2395,7 @@
|
|
|
2395
2395
|
|
|
2396
2396
|
|
|
2397
2397
|
|
|
2398
|
+
|
|
2398
2399
|
</xsl:attribute-set><xsl:variable name="note-body-indent">10mm</xsl:variable><xsl:variable name="note-body-indent-table">5mm</xsl:variable><xsl:attribute-set name="note-name-style">
|
|
2399
2400
|
|
|
2400
2401
|
|
|
@@ -2960,12 +2961,26 @@
|
|
|
2960
2961
|
|
|
2961
2962
|
|
|
2962
2963
|
|
|
2963
|
-
<!-- except gb and bipm -->
|
|
2964
2964
|
|
|
2965
|
-
<xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
|
|
2966
2965
|
|
|
2967
2966
|
|
|
2967
|
+
<!-- except gb -->
|
|
2968
|
+
|
|
2969
|
+
<xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
|
|
2970
|
+
|
|
2968
2971
|
|
|
2972
|
+
<!-- show Note under table in preface (ex. abstract) sections -->
|
|
2973
|
+
<!-- empty, because notes show at page side in main sections -->
|
|
2974
|
+
<!-- <xsl:if test="$namespace = 'bipm'">
|
|
2975
|
+
<xsl:choose>
|
|
2976
|
+
<xsl:when test="ancestor::*[local-name()='preface']">
|
|
2977
|
+
<xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
|
|
2978
|
+
</xsl:when>
|
|
2979
|
+
<xsl:otherwise>
|
|
2980
|
+
<fo:block/>
|
|
2981
|
+
</xsl:otherwise>
|
|
2982
|
+
</xsl:choose>
|
|
2983
|
+
</xsl:if> -->
|
|
2969
2984
|
|
|
2970
2985
|
|
|
2971
2986
|
<!-- horizontal row separator -->
|
|
@@ -3030,7 +3045,11 @@
|
|
|
3030
3045
|
|
|
3031
3046
|
|
|
3032
3047
|
|
|
3033
|
-
|
|
3048
|
+
|
|
3049
|
+
|
|
3050
|
+
|
|
3051
|
+
|
|
3052
|
+
<!-- except gb -->
|
|
3034
3053
|
|
|
3035
3054
|
<xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
|
|
3036
3055
|
|
|
@@ -3165,6 +3184,9 @@
|
|
|
3165
3184
|
|
|
3166
3185
|
|
|
3167
3186
|
|
|
3187
|
+
<!-- <xsl:if test="$namespace = 'bipm'">
|
|
3188
|
+
<xsl:attribute name="height">8mm</xsl:attribute>
|
|
3189
|
+
</xsl:if> -->
|
|
3168
3190
|
|
|
3169
3191
|
<xsl:apply-templates/>
|
|
3170
3192
|
</fo:table-row>
|
|
@@ -4305,6 +4327,8 @@
|
|
|
4305
4327
|
|
|
4306
4328
|
|
|
4307
4329
|
|
|
4330
|
+
|
|
4331
|
+
|
|
4308
4332
|
<fo:inline xsl:use-attribute-sets="note-name-style">
|
|
4309
4333
|
<xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
|
|
4310
4334
|
</fo:inline>
|
|
@@ -2395,6 +2395,7 @@
|
|
|
2395
2395
|
|
|
2396
2396
|
|
|
2397
2397
|
|
|
2398
|
+
|
|
2398
2399
|
</xsl:attribute-set><xsl:variable name="note-body-indent">10mm</xsl:variable><xsl:variable name="note-body-indent-table">5mm</xsl:variable><xsl:attribute-set name="note-name-style">
|
|
2399
2400
|
|
|
2400
2401
|
|
|
@@ -2960,12 +2961,26 @@
|
|
|
2960
2961
|
|
|
2961
2962
|
|
|
2962
2963
|
|
|
2963
|
-
<!-- except gb and bipm -->
|
|
2964
2964
|
|
|
2965
|
-
<xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
|
|
2966
2965
|
|
|
2967
2966
|
|
|
2967
|
+
<!-- except gb -->
|
|
2968
|
+
|
|
2969
|
+
<xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
|
|
2970
|
+
|
|
2968
2971
|
|
|
2972
|
+
<!-- show Note under table in preface (ex. abstract) sections -->
|
|
2973
|
+
<!-- empty, because notes show at page side in main sections -->
|
|
2974
|
+
<!-- <xsl:if test="$namespace = 'bipm'">
|
|
2975
|
+
<xsl:choose>
|
|
2976
|
+
<xsl:when test="ancestor::*[local-name()='preface']">
|
|
2977
|
+
<xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
|
|
2978
|
+
</xsl:when>
|
|
2979
|
+
<xsl:otherwise>
|
|
2980
|
+
<fo:block/>
|
|
2981
|
+
</xsl:otherwise>
|
|
2982
|
+
</xsl:choose>
|
|
2983
|
+
</xsl:if> -->
|
|
2969
2984
|
|
|
2970
2985
|
|
|
2971
2986
|
<!-- horizontal row separator -->
|
|
@@ -3030,7 +3045,11 @@
|
|
|
3030
3045
|
|
|
3031
3046
|
|
|
3032
3047
|
|
|
3033
|
-
|
|
3048
|
+
|
|
3049
|
+
|
|
3050
|
+
|
|
3051
|
+
|
|
3052
|
+
<!-- except gb -->
|
|
3034
3053
|
|
|
3035
3054
|
<xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
|
|
3036
3055
|
|
|
@@ -3165,6 +3184,9 @@
|
|
|
3165
3184
|
|
|
3166
3185
|
|
|
3167
3186
|
|
|
3187
|
+
<!-- <xsl:if test="$namespace = 'bipm'">
|
|
3188
|
+
<xsl:attribute name="height">8mm</xsl:attribute>
|
|
3189
|
+
</xsl:if> -->
|
|
3168
3190
|
|
|
3169
3191
|
<xsl:apply-templates/>
|
|
3170
3192
|
</fo:table-row>
|
|
@@ -4305,6 +4327,8 @@
|
|
|
4305
4327
|
|
|
4306
4328
|
|
|
4307
4329
|
|
|
4330
|
+
|
|
4331
|
+
|
|
4308
4332
|
<fo:inline xsl:use-attribute-sets="note-name-style">
|
|
4309
4333
|
<xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
|
|
4310
4334
|
</fo:inline>
|
data/lib/isodoc/iso/metadata.rb
CHANGED
|
@@ -5,15 +5,13 @@ module IsoDoc
|
|
|
5
5
|
class Metadata < IsoDoc::Metadata
|
|
6
6
|
def initialize(lang, script, i18n)
|
|
7
7
|
super
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
obsoletes_part: nil
|
|
16
|
-
}
|
|
8
|
+
set(:tc, "XXXX")
|
|
9
|
+
set(:sc, "XXXX")
|
|
10
|
+
set(:wg, "XXXX")
|
|
11
|
+
set(:editorialgroup, [])
|
|
12
|
+
set(:secretariat, "XXX")
|
|
13
|
+
set(:obsoletes, nil)
|
|
14
|
+
set(:obsoletes_part, nil)
|
|
17
15
|
end
|
|
18
16
|
|
|
19
17
|
def status_abbrev(stage, substage, iter, draft, doctype)
|
|
@@ -133,33 +131,35 @@ module IsoDoc
|
|
|
133
131
|
end
|
|
134
132
|
|
|
135
133
|
def title(isoxml, _out)
|
|
136
|
-
|
|
134
|
+
lang = @lang == "fr" ? "fr" : "en"
|
|
135
|
+
intro, main, part, amd = title_parts(isoxml, lang)
|
|
137
136
|
partnumber, subpartnumber, amdnumber, corrnumber = title_nums(isoxml)
|
|
138
137
|
|
|
139
138
|
set(:doctitlemain, @c.encode(main ? main.text : "", :hexadecimal))
|
|
140
|
-
main = compose_title(main, intro, part, partnumber, subpartnumber,
|
|
139
|
+
main = compose_title(main, intro, part, partnumber, subpartnumber, lang)
|
|
141
140
|
set(:doctitle, main)
|
|
142
141
|
set(:doctitleintro, @c.encode(intro ? intro.text : "", :hexadecimal)) if intro
|
|
143
|
-
set(:doctitlepartlabel, part_prefix(partnumber, subpartnumber,
|
|
142
|
+
set(:doctitlepartlabel, part_prefix(partnumber, subpartnumber, lang))
|
|
144
143
|
set(:doctitlepart, @c.encode(part.text, :hexadecimal)) if part
|
|
145
|
-
set(:doctitleamdlabel, amd_prefix(amdnumber,
|
|
144
|
+
set(:doctitleamdlabel, amd_prefix(amdnumber, lang)) if amdnumber
|
|
146
145
|
set(:doctitleamd, @c.encode(amd.text, :hexadecimal)) if amd
|
|
147
|
-
set(:doctitlecorrlabel, corr_prefix(corrnumber,
|
|
146
|
+
set(:doctitlecorrlabel, corr_prefix(corrnumber, lang)) if corrnumber
|
|
148
147
|
end
|
|
149
148
|
|
|
150
149
|
def subtitle(isoxml, _out)
|
|
151
|
-
|
|
150
|
+
lang = @lang == "fr" ? "en" : "fr"
|
|
151
|
+
intro, main, part, amd = title_parts(isoxml, lang)
|
|
152
152
|
partnumber, subpartnumber, amdnumber, corrnumber = title_nums(isoxml)
|
|
153
153
|
|
|
154
154
|
set(:docsubtitlemain, @c.encode(main ? main.text : "", :hexadecimal))
|
|
155
|
-
main = compose_title(main, intro, part, partnumber, subpartnumber,
|
|
155
|
+
main = compose_title(main, intro, part, partnumber, subpartnumber, lang)
|
|
156
156
|
set(:docsubtitle, main)
|
|
157
157
|
set(:docsubtitleintro, @c.encode(intro ? intro.text : "", :hexadecimal)) if intro
|
|
158
|
-
set(:docsubtitlepartlabel, part_prefix(partnumber, subpartnumber,
|
|
158
|
+
set(:docsubtitlepartlabel, part_prefix(partnumber, subpartnumber, lang))
|
|
159
159
|
set(:docsubtitlepart, @c.encode(part.text, :hexadecimal)) if part
|
|
160
|
-
set(:docsubtitleamdlabel, amd_prefix(amdnumber,
|
|
160
|
+
set(:docsubtitleamdlabel, amd_prefix(amdnumber, lang)) if amdnumber
|
|
161
161
|
set(:docsubtitleamd, @c.encode(amd.text, :hexadecimal)) if amd
|
|
162
|
-
set(:docsubtitlecorrlabel, corr_prefix(corrnumber,
|
|
162
|
+
set(:docsubtitlecorrlabel, corr_prefix(corrnumber, lang)) if corrnumber
|
|
163
163
|
end
|
|
164
164
|
|
|
165
165
|
def author(xml, _out)
|