metanorma-iso 2.7.7 → 2.7.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/isodoc/iso/base_convert.rb +9 -0
- data/lib/isodoc/iso/html/style-human.css +44 -0
- data/lib/isodoc/iso/html/style-iso.css +44 -0
- data/lib/isodoc/iso/iso.amendment.xsl +30 -29
- data/lib/isodoc/iso/iso.international-standard.xsl +30 -29
- data/lib/isodoc/iso/presentation_xml_convert.rb +7 -0
- data/lib/metanorma/iso/version.rb +1 -1
- metadata +3 -3
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: f699952f5a18411406a7536e23ce0d0672877cd7af39b0d7286403a01c329c5f
|
|
4
|
+
data.tar.gz: 0c26429d82d533ccd2c30576bd61cecf695435a446481ba5d0efaa2438f4423e
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: f3ea74bdfe3760ac56d09298affc46c49f57c8e2c357992ebe7540d5680b21de2779053cdc420eb6cae3234333608ff15d16ca274a614b2a0105c0d8756ef46c
|
|
7
|
+
data.tar.gz: 92ab965ed306dcb367f40970f6aac0b3d32bcba61bbd4665ebdd13d54c4e62f0162f0d5ccdc16ace3e1f4310ac74a507909131d721c8d3ceebd2bde0ffb861b3
|
|
@@ -201,6 +201,15 @@ module IsoDoc
|
|
|
201
201
|
end
|
|
202
202
|
end
|
|
203
203
|
|
|
204
|
+
def table_cleanup(docxml)
|
|
205
|
+
super
|
|
206
|
+
docxml.xpath("//tfoot/div[@class = 'figdl']/p[@class = 'ListTitle']")
|
|
207
|
+
.each do |p|
|
|
208
|
+
p["align"] = "left"
|
|
209
|
+
end
|
|
210
|
+
docxml
|
|
211
|
+
end
|
|
212
|
+
|
|
204
213
|
def convert_i18n_init(docxml)
|
|
205
214
|
super
|
|
206
215
|
update_i18n(docxml)
|
|
@@ -176,6 +176,50 @@ table.rouge-line-table pre {
|
|
|
176
176
|
overflow-x: visible;
|
|
177
177
|
font-size: 100%; }
|
|
178
178
|
|
|
179
|
+
a.header {
|
|
180
|
+
color: inherit;
|
|
181
|
+
text-decoration: none; }
|
|
182
|
+
|
|
183
|
+
a.header:hover {
|
|
184
|
+
color: #a53221; }
|
|
185
|
+
|
|
186
|
+
a.header:visited {
|
|
187
|
+
color: inherit;
|
|
188
|
+
text-decoration: none; }
|
|
189
|
+
|
|
190
|
+
a.anchor {
|
|
191
|
+
position: absolute;
|
|
192
|
+
z-index: 1001;
|
|
193
|
+
width: 1.5ex;
|
|
194
|
+
margin-left: -1.5ex;
|
|
195
|
+
display: block;
|
|
196
|
+
text-decoration: none !important;
|
|
197
|
+
visibility: hidden;
|
|
198
|
+
text-align: center;
|
|
199
|
+
font-weight: 400; }
|
|
200
|
+
|
|
201
|
+
a.anchor::before {
|
|
202
|
+
content: "\00A7";
|
|
203
|
+
font-size: .85em;
|
|
204
|
+
display: block;
|
|
205
|
+
padding-top: .1em; }
|
|
206
|
+
|
|
207
|
+
h1 > a.anchor:hover,
|
|
208
|
+
h2 > a.anchor:hover,
|
|
209
|
+
h3 > a.anchor:hover,
|
|
210
|
+
h4 > a.anchor:hover,
|
|
211
|
+
h5 > a.anchor:hover,
|
|
212
|
+
h6 > a.anchor:hover,
|
|
213
|
+
.inline-header > a.anchor:hover,
|
|
214
|
+
h1:hover > a.anchor,
|
|
215
|
+
h2:hover > a.anchor,
|
|
216
|
+
h3:hover > a.anchor,
|
|
217
|
+
h4:hover > a.anchor,
|
|
218
|
+
h5:hover > a.anchor,
|
|
219
|
+
h6:hover > a.anchor,
|
|
220
|
+
.inline-header:hover > a.anchor {
|
|
221
|
+
visibility: visible; }
|
|
222
|
+
|
|
179
223
|
#standard-band {
|
|
180
224
|
background-color: #0AC442; }
|
|
181
225
|
|
|
@@ -176,6 +176,50 @@ table.rouge-line-table pre {
|
|
|
176
176
|
overflow-x: visible;
|
|
177
177
|
font-size: 100%; }
|
|
178
178
|
|
|
179
|
+
a.header {
|
|
180
|
+
color: inherit;
|
|
181
|
+
text-decoration: none; }
|
|
182
|
+
|
|
183
|
+
a.header:hover {
|
|
184
|
+
color: #a53221; }
|
|
185
|
+
|
|
186
|
+
a.header:visited {
|
|
187
|
+
color: inherit;
|
|
188
|
+
text-decoration: none; }
|
|
189
|
+
|
|
190
|
+
a.anchor {
|
|
191
|
+
position: absolute;
|
|
192
|
+
z-index: 1001;
|
|
193
|
+
width: 1.5ex;
|
|
194
|
+
margin-left: -1.5ex;
|
|
195
|
+
display: block;
|
|
196
|
+
text-decoration: none !important;
|
|
197
|
+
visibility: hidden;
|
|
198
|
+
text-align: center;
|
|
199
|
+
font-weight: 400; }
|
|
200
|
+
|
|
201
|
+
a.anchor::before {
|
|
202
|
+
content: "\00A7";
|
|
203
|
+
font-size: .85em;
|
|
204
|
+
display: block;
|
|
205
|
+
padding-top: .1em; }
|
|
206
|
+
|
|
207
|
+
h1 > a.anchor:hover,
|
|
208
|
+
h2 > a.anchor:hover,
|
|
209
|
+
h3 > a.anchor:hover,
|
|
210
|
+
h4 > a.anchor:hover,
|
|
211
|
+
h5 > a.anchor:hover,
|
|
212
|
+
h6 > a.anchor:hover,
|
|
213
|
+
.inline-header > a.anchor:hover,
|
|
214
|
+
h1:hover > a.anchor,
|
|
215
|
+
h2:hover > a.anchor,
|
|
216
|
+
h3:hover > a.anchor,
|
|
217
|
+
h4:hover > a.anchor,
|
|
218
|
+
h5:hover > a.anchor,
|
|
219
|
+
h6:hover > a.anchor,
|
|
220
|
+
.inline-header:hover > a.anchor {
|
|
221
|
+
visibility: visible; }
|
|
222
|
+
|
|
179
223
|
#standard-band {
|
|
180
224
|
background-color: #0AC442; }
|
|
181
225
|
|
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
</xsl:variable>
|
|
22
22
|
<xsl:variable name="column_gap">8.5mm</xsl:variable>
|
|
23
23
|
|
|
24
|
-
<xsl:variable name="docidentifierISO_undated"><xsl:if test="not($stage-abbreviation = '
|
|
24
|
+
<xsl:variable name="docidentifierISO_undated"><xsl:if test="not($stage-abbreviation = 'FDAMD' or $stage-abbreviation = 'FDAM' or $stage-abbreviation = 'DAMD' or $stage-abbreviation = 'DAM')"><xsl:value-of select="normalize-space(/iso:iso-standard/iso:bibdata/iso:docidentifier[@type = 'iso-undated'])"/></xsl:if></xsl:variable>
|
|
25
25
|
<xsl:variable name="docidentifierISO_">
|
|
26
26
|
<xsl:value-of select="$docidentifierISO_undated"/>
|
|
27
27
|
<xsl:if test="$docidentifierISO_undated = ''">
|
|
@@ -155,11 +155,12 @@
|
|
|
155
155
|
<xsl:variable name="stagename_abbreviation" select="normalize-space(/iso:iso-standard/iso:bibdata/iso:ext/iso:stagename/@abbreviation)"/>
|
|
156
156
|
<xsl:variable name="stagename_localized" select="normalize-space(/iso:iso-standard/iso:bibdata/iso:status/iso:stage[@language = $lang])"/>
|
|
157
157
|
<xsl:variable name="abbreviation" select="normalize-space(/iso:iso-standard/iso:bibdata/iso:status/iso:stage/@abbreviation)"/>
|
|
158
|
+
<xsl:variable name="abbreviation_uppercased" select="java:toUpperCase(java:java.lang.String.new($abbreviation))"/>
|
|
158
159
|
|
|
159
160
|
<xsl:variable name="stage-abbreviation">
|
|
160
161
|
<xsl:choose>
|
|
161
|
-
<xsl:when test="$
|
|
162
|
-
<xsl:value-of select="$
|
|
162
|
+
<xsl:when test="$abbreviation_uppercased != ''">
|
|
163
|
+
<xsl:value-of select="$abbreviation_uppercased"/>
|
|
163
164
|
</xsl:when>
|
|
164
165
|
<xsl:when test="$stage = 0 and $substage = 0">PWI</xsl:when>
|
|
165
166
|
<xsl:when test="$stage = 0">NWIP</xsl:when> <!-- NWIP (NP) -->
|
|
@@ -212,8 +213,8 @@
|
|
|
212
213
|
|
|
213
214
|
<xsl:variable name="stagename-header-coverpage">
|
|
214
215
|
<xsl:choose>
|
|
215
|
-
<xsl:when test="$stage-abbreviation = 'DIS' or $stage-abbreviation = '
|
|
216
|
-
<xsl:when test="$stage-abbreviation = 'FDIS' or $stage-abbreviation = '
|
|
216
|
+
<xsl:when test="$stage-abbreviation = 'DIS' or $stage-abbreviation = 'DAMD' or $stage-abbreviation = 'DAM' or starts-with($stage-abbreviation, 'DTS') or starts-with($stage-abbreviation, 'DTR') or $stagename_abbreviation = 'DIS'">DRAFT</xsl:when>
|
|
217
|
+
<xsl:when test="$stage-abbreviation = 'FDIS' or $stage-abbreviation = 'FDAMD' or $stage-abbreviation = 'FDAM' or starts-with($stage-abbreviation, 'FDTS') or starts-with($stage-abbreviation, 'FDTR') or $stagename_abbreviation = 'FDIS'">FINAL DRAFT</xsl:when>
|
|
217
218
|
<xsl:when test="$stage-abbreviation = 'PRF'"/>
|
|
218
219
|
<xsl:when test="$stage-abbreviation = 'IS'"/>
|
|
219
220
|
<xsl:otherwise>
|
|
@@ -1116,7 +1117,7 @@
|
|
|
1116
1117
|
</xsl:variable>
|
|
1117
1118
|
|
|
1118
1119
|
<xsl:choose>
|
|
1119
|
-
<xsl:when test="$stage-abbreviation = 'DIS' or $stage-abbreviation = '
|
|
1120
|
+
<xsl:when test="$stage-abbreviation = 'DIS'"> <!-- or $stage-abbreviation = 'DAMD' or $stage-abbreviation = 'DAM' -->
|
|
1120
1121
|
<xsl:value-of select="java:toUpperCase(java:java.lang.String.new($stagename))"/>
|
|
1121
1122
|
<xsl:value-of select="$linebreak"/>
|
|
1122
1123
|
<xsl:value-of select="$doctype_localized"/>
|
|
@@ -1190,7 +1191,7 @@
|
|
|
1190
1191
|
<xsl:call-template name="insertTitlesLangMain"/>
|
|
1191
1192
|
</fo:block>
|
|
1192
1193
|
|
|
1193
|
-
<xsl:if test="not($stage-abbreviation = '
|
|
1194
|
+
<xsl:if test="not($stage-abbreviation = 'FDAMD' or $stage-abbreviation = 'FDAM')">
|
|
1194
1195
|
<xsl:for-each select="xalan:nodeset($lang_other)/lang">
|
|
1195
1196
|
<xsl:variable name="lang_other" select="."/>
|
|
1196
1197
|
<fo:block font-size="12pt" role="SKIP"><xsl:value-of select="$linebreak"/></fo:block>
|
|
@@ -1203,7 +1204,7 @@
|
|
|
1203
1204
|
</xsl:for-each>
|
|
1204
1205
|
</xsl:if>
|
|
1205
1206
|
|
|
1206
|
-
<xsl:if test="$stage-abbreviation = 'NWIP' or $stage-abbreviation = 'NP' or $stage-abbreviation = 'PWI' or $stage-abbreviation = 'AWI' or $stage-abbreviation = 'WD' or $stage-abbreviation = 'CD' or $stage-abbreviation = 'FDIS' or $stagename_abbreviation = 'FDIS' or $stage-abbreviation = 'DIS' or $stage-abbreviation = '
|
|
1207
|
+
<xsl:if test="$stage-abbreviation = 'NWIP' or $stage-abbreviation = 'NP' or $stage-abbreviation = 'PWI' or $stage-abbreviation = 'AWI' or $stage-abbreviation = 'WD' or $stage-abbreviation = 'CD' or $stage-abbreviation = 'FDIS' or $stagename_abbreviation = 'FDIS' or $stage-abbreviation = 'DIS' or $stage-abbreviation = 'DAMD' or $stage-abbreviation = 'DAM' or $stagename_abbreviation = 'DIS'">
|
|
1207
1208
|
<fo:block margin-top="20mm">
|
|
1208
1209
|
<xsl:copy-of select="$ics"/>
|
|
1209
1210
|
</fo:block>
|
|
@@ -1215,7 +1216,7 @@
|
|
|
1215
1216
|
<fo:table-cell number-columns-spanned="2" padding-left="6mm">
|
|
1216
1217
|
<fo:block margin-top="2.5mm" line-height="1.1">
|
|
1217
1218
|
|
|
1218
|
-
<xsl:if test="not($stage-abbreviation = 'DIS' or $stage-abbreviation = '
|
|
1219
|
+
<xsl:if test="not($stage-abbreviation = 'DIS' or $stage-abbreviation = 'DAMD' or $stage-abbreviation = 'DAM')">
|
|
1219
1220
|
<xsl:variable name="edition_and_date">
|
|
1220
1221
|
<xsl:call-template name="insertEditionAndDate"/>
|
|
1221
1222
|
</xsl:variable>
|
|
@@ -1226,7 +1227,7 @@
|
|
|
1226
1227
|
</xsl:if>
|
|
1227
1228
|
</xsl:if>
|
|
1228
1229
|
|
|
1229
|
-
<xsl:if test="$doctype = 'amendment' and not($stage-abbreviation = '
|
|
1230
|
+
<xsl:if test="$doctype = 'amendment'"> <!-- and not($stage-abbreviation = 'FDAMD' or $stage-abbreviation = 'FDAM') -->
|
|
1230
1231
|
<fo:block font-size="18pt" font-weight="bold" margin-bottom="3mm">
|
|
1231
1232
|
<xsl:value-of select="$doctype_uppercased"/>
|
|
1232
1233
|
<xsl:text> </xsl:text>
|
|
@@ -1235,9 +1236,9 @@
|
|
|
1235
1236
|
<xsl:value-of select="$amendment-number"/><xsl:text> </xsl:text>
|
|
1236
1237
|
</xsl:if>
|
|
1237
1238
|
</fo:block>
|
|
1238
|
-
</xsl:if>
|
|
1239
|
-
|
|
1240
|
-
<xsl:if test="$doctype = 'amendment' and not($stage-abbreviation = '
|
|
1239
|
+
<!-- </xsl:if>
|
|
1240
|
+
|
|
1241
|
+
<xsl:if test="$doctype = 'amendment' and not($stage-abbreviation = 'FDAMD' or $stage-abbreviation = 'FDAM')"> -->
|
|
1241
1242
|
<xsl:if test="/iso:iso-standard/iso:bibdata/iso:date[@type = 'updated']">
|
|
1242
1243
|
<fo:block font-size="18pt" font-weight="bold" margin-bottom="3mm">
|
|
1243
1244
|
<xsl:value-of select="/iso:iso-standard/iso:bibdata/iso:date[@type = 'updated']"/>
|
|
@@ -1254,7 +1255,7 @@
|
|
|
1254
1255
|
</fo:block>
|
|
1255
1256
|
</xsl:if>
|
|
1256
1257
|
|
|
1257
|
-
<xsl:if test="$stage-abbreviation = 'DIS' or $stage-abbreviation = '
|
|
1258
|
+
<xsl:if test="$stage-abbreviation = 'DIS' or $stage-abbreviation = 'DAMD' or $stage-abbreviation = 'DAM' or $stagename_abbreviation = 'DIS' or $stage-abbreviation = 'FDIS' or $stage-abbreviation = 'FDAMD' or $stage-abbreviation = 'FDAM' or $stagename_abbreviation = 'FDIS' or $stage-abbreviation = 'NWIP' or $stage-abbreviation = 'NP' or $stage-abbreviation = 'PWI' or $stage-abbreviation = 'AWI' or $stage-abbreviation = 'WD' or $stage-abbreviation = 'CD'">
|
|
1258
1259
|
<xsl:if test="normalize-space($editorialgroup) != ''">
|
|
1259
1260
|
<fo:block margin-bottom="3mm">
|
|
1260
1261
|
<xsl:copy-of select="$editorialgroup"/>
|
|
@@ -1267,7 +1268,7 @@
|
|
|
1267
1268
|
</xsl:if>
|
|
1268
1269
|
</xsl:if>
|
|
1269
1270
|
|
|
1270
|
-
<xsl:if test="$stage-abbreviation = 'DIS' or $stage-abbreviation = '
|
|
1271
|
+
<xsl:if test="$stage-abbreviation = 'DIS' or $stage-abbreviation = 'DAMD' or $stage-abbreviation = 'DAM' or $stagename_abbreviation = 'DIS' or $stage-abbreviation = 'FDIS' or $stage-abbreviation = 'FDAMD' or $stage-abbreviation = 'FDAM' or $stagename_abbreviation = 'FDIS'">
|
|
1271
1272
|
|
|
1272
1273
|
<fo:block margin-bottom="3mm">
|
|
1273
1274
|
<!-- Voting begins on: -->
|
|
@@ -1398,7 +1399,7 @@
|
|
|
1398
1399
|
<fo:table-body role="SKIP">
|
|
1399
1400
|
<fo:table-row role="SKIP">
|
|
1400
1401
|
<fo:table-cell font-size="6.5pt" text-align="justify" display-align="after" padding-bottom="8mm" role="SKIP">
|
|
1401
|
-
<xsl:if test="$stage-abbreviation = '
|
|
1402
|
+
<xsl:if test="$stage-abbreviation = 'DAMD' or $stage-abbreviation = 'DAM'">
|
|
1402
1403
|
<xsl:attribute name="font-size">7pt</xsl:attribute>
|
|
1403
1404
|
</xsl:if>
|
|
1404
1405
|
<!-- margin-top="-30mm" -->
|
|
@@ -1523,7 +1524,7 @@
|
|
|
1523
1524
|
|
|
1524
1525
|
<xsl:choose>
|
|
1525
1526
|
<!-- COVER PAGE for DIS document only -->
|
|
1526
|
-
<xsl:when test="$stage-abbreviation = 'DIS' or $stage-abbreviation = '
|
|
1527
|
+
<xsl:when test="$stage-abbreviation = 'DIS' or $stage-abbreviation = 'DAMD' or $stage-abbreviation = 'DAM' or $stagename_abbreviation = 'DIS'">
|
|
1527
1528
|
<fo:flow flow-name="xsl-region-body">
|
|
1528
1529
|
<fo:block-container role="SKIP">
|
|
1529
1530
|
<fo:block margin-top="-1mm" font-size="20pt" text-align="right">
|
|
@@ -1623,10 +1624,10 @@
|
|
|
1623
1624
|
</fo:block-container>
|
|
1624
1625
|
</fo:flow>
|
|
1625
1626
|
|
|
1626
|
-
</xsl:when> <!-- END: $stage-abbreviation = 'DIS' '
|
|
1627
|
+
</xsl:when> <!-- END: $stage-abbreviation = 'DIS' 'DAMD' 'DAM'-->
|
|
1627
1628
|
<xsl:otherwise>
|
|
1628
1629
|
|
|
1629
|
-
<!-- COVER PAGE for all documents except DIS,
|
|
1630
|
+
<!-- COVER PAGE for all documents except DIS, DAMD and DAM -->
|
|
1630
1631
|
<fo:flow flow-name="xsl-region-body">
|
|
1631
1632
|
<fo:block-container role="SKIP">
|
|
1632
1633
|
<fo:table table-layout="fixed" width="100%" font-size="24pt" line-height="1" role="SKIP"> <!-- margin-bottom="35mm" -->
|
|
@@ -1668,7 +1669,7 @@
|
|
|
1668
1669
|
<fo:table-cell role="SKIP">
|
|
1669
1670
|
<fo:block text-align="left">
|
|
1670
1671
|
<xsl:choose>
|
|
1671
|
-
<xsl:when test="$stage-abbreviation = '
|
|
1672
|
+
<xsl:when test="$stage-abbreviation = 'FDAMD' or $stage-abbreviation = 'FDAM'"><xsl:value-of select="$doctype_uppercased"/></xsl:when>
|
|
1672
1673
|
<xsl:when test="$doctype = 'amendment'">
|
|
1673
1674
|
<xsl:value-of select="java:toUpperCase(java:java.lang.String.new(translate(/iso:iso-standard/iso:bibdata/iso:ext/iso:updates-document-type,'-',' ')))"/>
|
|
1674
1675
|
</xsl:when>
|
|
@@ -1701,7 +1702,7 @@
|
|
|
1701
1702
|
</fo:block>
|
|
1702
1703
|
<!-- <xsl:value-of select="$linebreak"/>
|
|
1703
1704
|
<xsl:value-of select="/iso:iso-standard/iso:bibdata/iso:version/iso:revision-date"/> -->
|
|
1704
|
-
<xsl:if test="$doctype = 'amendment' and not($stage-abbreviation = '
|
|
1705
|
+
<xsl:if test="$doctype = 'amendment' and not($stage-abbreviation = 'FDAMD' or $stage-abbreviation = 'FDAM')">
|
|
1705
1706
|
<fo:block text-align="right" margin-right="0.5mm" role="SKIP">
|
|
1706
1707
|
<fo:block font-weight="bold" margin-top="4pt" role="H1">
|
|
1707
1708
|
<xsl:value-of select="$doctype_uppercased"/>
|
|
@@ -1734,7 +1735,7 @@
|
|
|
1734
1735
|
<fo:table-cell role="SKIP"><fo:block role="SKIP"/></fo:table-cell>
|
|
1735
1736
|
<fo:table-cell number-columns-spanned="2" font-size="10pt" line-height="1.2" display-align="center" role="SKIP">
|
|
1736
1737
|
<fo:block role="SKIP">
|
|
1737
|
-
<xsl:if test="$stage-abbreviation = 'NWIP' or $stage-abbreviation = 'NP' or $stage-abbreviation = 'PWI' or $stage-abbreviation = 'AWI' or $stage-abbreviation = 'WD' or $stage-abbreviation = 'CD'
|
|
1738
|
+
<xsl:if test="$stage-abbreviation = 'NWIP' or $stage-abbreviation = 'NP' or $stage-abbreviation = 'PWI' or $stage-abbreviation = 'AWI' or $stage-abbreviation = 'WD' or $stage-abbreviation = 'CD'">
|
|
1738
1739
|
<fo:table table-layout="fixed" width="100%" role="SKIP">
|
|
1739
1740
|
<fo:table-column column-width="50%"/>
|
|
1740
1741
|
<fo:table-column column-width="50%"/>
|
|
@@ -1769,7 +1770,7 @@
|
|
|
1769
1770
|
<fo:table-row role="SKIP"> <!-- border="1pt solid black" height="150mm" -->
|
|
1770
1771
|
<fo:table-cell font-size="11pt" role="SKIP">
|
|
1771
1772
|
<fo:block role="SKIP">
|
|
1772
|
-
<xsl:if test="$stage-abbreviation = 'FDIS' or $stage-abbreviation = '
|
|
1773
|
+
<xsl:if test="$stage-abbreviation = 'FDIS' or $stage-abbreviation = 'FDAMD' or $stage-abbreviation = 'FDAM' or $stagename_abbreviation = 'FDIS'">
|
|
1773
1774
|
<fo:block-container border="0.5mm solid black" width="51mm" role="SKIP">
|
|
1774
1775
|
<fo:block margin="2mm" role="SKIP">
|
|
1775
1776
|
<fo:block margin-bottom="8pt"><xsl:copy-of select="$editorialgroup"/></fo:block>
|
|
@@ -1809,7 +1810,7 @@
|
|
|
1809
1810
|
<xsl:call-template name="insertTitlesLangMain"/>
|
|
1810
1811
|
</fo:block>
|
|
1811
1812
|
|
|
1812
|
-
<xsl:if test="not($stage-abbreviation = '
|
|
1813
|
+
<xsl:if test="not($stage-abbreviation = 'FDAMD' or $stage-abbreviation = 'FDAM')">
|
|
1813
1814
|
<xsl:for-each select="xalan:nodeset($lang_other)/lang">
|
|
1814
1815
|
<xsl:variable name="lang_other" select="."/>
|
|
1815
1816
|
|
|
@@ -2701,12 +2702,12 @@
|
|
|
2701
2702
|
</xsl:template>
|
|
2702
2703
|
|
|
2703
2704
|
<xsl:template name="insertDraftComments">
|
|
2704
|
-
<xsl:if test="$stagename_abbreviation = 'DIS' or $stage-abbreviation = 'DIS' or $stage-abbreviation = '
|
|
2705
|
+
<xsl:if test="$stagename_abbreviation = 'DIS' or $stage-abbreviation = 'DIS' or $stage-abbreviation = 'DAMD' or $stage-abbreviation = 'DAM' or $stage-abbreviation = 'NWIP' or $stage-abbreviation = 'NP' or $stage-abbreviation = 'PWI' or $stage-abbreviation = 'AWI' or $stage-abbreviation = 'WD' or $stage-abbreviation = 'CD'">
|
|
2705
2706
|
<fo:block margin-bottom="1.5mm">
|
|
2706
2707
|
<xsl:text>THIS DOCUMENT IS A DRAFT CIRCULATED FOR COMMENT AND APPROVAL. IT IS THEREFORE SUBJECT TO CHANGE AND MAY NOT BE REFERRED TO AS AN INTERNATIONAL STANDARD UNTIL PUBLISHED AS SUCH.</xsl:text>
|
|
2707
2708
|
</fo:block>
|
|
2708
2709
|
</xsl:if>
|
|
2709
|
-
<xsl:if test="$stagename_abbreviation = 'DIS' or $stagename_abbreviation = 'FDIS' or $stage-abbreviation = 'FDIS' or $stage-abbreviation = 'DIS' or $stage-abbreviation = '
|
|
2710
|
+
<xsl:if test="$stagename_abbreviation = 'DIS' or $stagename_abbreviation = 'FDIS' or $stage-abbreviation = 'FDIS' or $stage-abbreviation = 'DIS' or $stage-abbreviation = 'FDAMD' or $stage-abbreviation = 'FDAM' or $stage-abbreviation = 'DAMD' or $stage-abbreviation = 'DAM' or $stage-abbreviation = 'NWIP' or $stage-abbreviation = 'NP' or $stage-abbreviation = 'PWI' or $stage-abbreviation = 'AWI' or $stage-abbreviation = 'WD' or $stage-abbreviation = 'CD'">
|
|
2710
2711
|
<fo:block margin-bottom="1.5mm">
|
|
2711
2712
|
<xsl:text>RECIPIENTS OF THIS DRAFT ARE INVITED TO
|
|
2712
2713
|
SUBMIT, WITH THEIR COMMENTS, NOTIFICATION
|
|
@@ -2747,7 +2748,7 @@
|
|
|
2747
2748
|
</xsl:template>
|
|
2748
2749
|
|
|
2749
2750
|
<xsl:template name="insertCoverPageAdditionalNotes">
|
|
2750
|
-
<xsl:if test="$stage-abbreviation = 'NWIP' or $stage-abbreviation = 'NP' or $stage-abbreviation = 'PWI' or $stage-abbreviation = 'AWI' or $stage-abbreviation = 'WD' or $stage-abbreviation = 'CD' or $stage-abbreviation = 'FCD' or $stage-abbreviation = 'DIS' or $stage-abbreviation = 'FDIS' or $stage-abbreviation = '
|
|
2751
|
+
<xsl:if test="$stage-abbreviation = 'NWIP' or $stage-abbreviation = 'NP' or $stage-abbreviation = 'PWI' or $stage-abbreviation = 'AWI' or $stage-abbreviation = 'WD' or $stage-abbreviation = 'CD' or $stage-abbreviation = 'FCD' or $stage-abbreviation = 'DIS' or $stage-abbreviation = 'FDIS' or $stage-abbreviation = 'DAMD' or $stage-abbreviation = 'DAM' or $stagename_abbreviation = 'DIS' or $stagename_abbreviation = 'FDIS'">
|
|
2751
2752
|
<xsl:variable name="text">
|
|
2752
2753
|
<xsl:for-each select="/iso:iso-standard/iso:preface/iso:note[@coverpage='true']/iso:p">
|
|
2753
2754
|
<fo:block>
|
|
@@ -3100,7 +3101,7 @@
|
|
|
3100
3101
|
<xsl:text> </xsl:text><xsl:value-of select="$amendment-number"/>
|
|
3101
3102
|
</xsl:if>
|
|
3102
3103
|
|
|
3103
|
-
<xsl:if test="not($stage-abbreviation = '
|
|
3104
|
+
<xsl:if test="not($stage-abbreviation = 'DAMD' or $stage-abbreviation = 'DAM')">
|
|
3104
3105
|
<xsl:text>: </xsl:text>
|
|
3105
3106
|
<xsl:apply-templates/>
|
|
3106
3107
|
</xsl:if>
|
|
@@ -4075,7 +4076,7 @@
|
|
|
4075
4076
|
<xsl:template name="insertHeaderFirst">
|
|
4076
4077
|
<fo:static-content flow-name="header-first" role="artifact">
|
|
4077
4078
|
<xsl:choose>
|
|
4078
|
-
<xsl:when test="$stage-abbreviation = '
|
|
4079
|
+
<xsl:when test="$stage-abbreviation = 'FDAMD' or $stage-abbreviation = 'FDAM' or $stage-abbreviation = 'DAMD' or $stage-abbreviation = 'DAM'">
|
|
4079
4080
|
<fo:block-container height="24mm" display-align="before">
|
|
4080
4081
|
<fo:block font-size="{$font-size_header}" font-weight="bold" text-align="right" padding-top="12.5mm" line-height="1.1">
|
|
4081
4082
|
<xsl:call-template name="insertLayoutVersionAttributesTop"/>
|
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
</xsl:variable>
|
|
22
22
|
<xsl:variable name="column_gap">8.5mm</xsl:variable>
|
|
23
23
|
|
|
24
|
-
<xsl:variable name="docidentifierISO_undated"><xsl:if test="not($stage-abbreviation = '
|
|
24
|
+
<xsl:variable name="docidentifierISO_undated"><xsl:if test="not($stage-abbreviation = 'FDAMD' or $stage-abbreviation = 'FDAM' or $stage-abbreviation = 'DAMD' or $stage-abbreviation = 'DAM')"><xsl:value-of select="normalize-space(/iso:iso-standard/iso:bibdata/iso:docidentifier[@type = 'iso-undated'])"/></xsl:if></xsl:variable>
|
|
25
25
|
<xsl:variable name="docidentifierISO_">
|
|
26
26
|
<xsl:value-of select="$docidentifierISO_undated"/>
|
|
27
27
|
<xsl:if test="$docidentifierISO_undated = ''">
|
|
@@ -155,11 +155,12 @@
|
|
|
155
155
|
<xsl:variable name="stagename_abbreviation" select="normalize-space(/iso:iso-standard/iso:bibdata/iso:ext/iso:stagename/@abbreviation)"/>
|
|
156
156
|
<xsl:variable name="stagename_localized" select="normalize-space(/iso:iso-standard/iso:bibdata/iso:status/iso:stage[@language = $lang])"/>
|
|
157
157
|
<xsl:variable name="abbreviation" select="normalize-space(/iso:iso-standard/iso:bibdata/iso:status/iso:stage/@abbreviation)"/>
|
|
158
|
+
<xsl:variable name="abbreviation_uppercased" select="java:toUpperCase(java:java.lang.String.new($abbreviation))"/>
|
|
158
159
|
|
|
159
160
|
<xsl:variable name="stage-abbreviation">
|
|
160
161
|
<xsl:choose>
|
|
161
|
-
<xsl:when test="$
|
|
162
|
-
<xsl:value-of select="$
|
|
162
|
+
<xsl:when test="$abbreviation_uppercased != ''">
|
|
163
|
+
<xsl:value-of select="$abbreviation_uppercased"/>
|
|
163
164
|
</xsl:when>
|
|
164
165
|
<xsl:when test="$stage = 0 and $substage = 0">PWI</xsl:when>
|
|
165
166
|
<xsl:when test="$stage = 0">NWIP</xsl:when> <!-- NWIP (NP) -->
|
|
@@ -212,8 +213,8 @@
|
|
|
212
213
|
|
|
213
214
|
<xsl:variable name="stagename-header-coverpage">
|
|
214
215
|
<xsl:choose>
|
|
215
|
-
<xsl:when test="$stage-abbreviation = 'DIS' or $stage-abbreviation = '
|
|
216
|
-
<xsl:when test="$stage-abbreviation = 'FDIS' or $stage-abbreviation = '
|
|
216
|
+
<xsl:when test="$stage-abbreviation = 'DIS' or $stage-abbreviation = 'DAMD' or $stage-abbreviation = 'DAM' or starts-with($stage-abbreviation, 'DTS') or starts-with($stage-abbreviation, 'DTR') or $stagename_abbreviation = 'DIS'">DRAFT</xsl:when>
|
|
217
|
+
<xsl:when test="$stage-abbreviation = 'FDIS' or $stage-abbreviation = 'FDAMD' or $stage-abbreviation = 'FDAM' or starts-with($stage-abbreviation, 'FDTS') or starts-with($stage-abbreviation, 'FDTR') or $stagename_abbreviation = 'FDIS'">FINAL DRAFT</xsl:when>
|
|
217
218
|
<xsl:when test="$stage-abbreviation = 'PRF'"/>
|
|
218
219
|
<xsl:when test="$stage-abbreviation = 'IS'"/>
|
|
219
220
|
<xsl:otherwise>
|
|
@@ -1116,7 +1117,7 @@
|
|
|
1116
1117
|
</xsl:variable>
|
|
1117
1118
|
|
|
1118
1119
|
<xsl:choose>
|
|
1119
|
-
<xsl:when test="$stage-abbreviation = 'DIS' or $stage-abbreviation = '
|
|
1120
|
+
<xsl:when test="$stage-abbreviation = 'DIS'"> <!-- or $stage-abbreviation = 'DAMD' or $stage-abbreviation = 'DAM' -->
|
|
1120
1121
|
<xsl:value-of select="java:toUpperCase(java:java.lang.String.new($stagename))"/>
|
|
1121
1122
|
<xsl:value-of select="$linebreak"/>
|
|
1122
1123
|
<xsl:value-of select="$doctype_localized"/>
|
|
@@ -1190,7 +1191,7 @@
|
|
|
1190
1191
|
<xsl:call-template name="insertTitlesLangMain"/>
|
|
1191
1192
|
</fo:block>
|
|
1192
1193
|
|
|
1193
|
-
<xsl:if test="not($stage-abbreviation = '
|
|
1194
|
+
<xsl:if test="not($stage-abbreviation = 'FDAMD' or $stage-abbreviation = 'FDAM')">
|
|
1194
1195
|
<xsl:for-each select="xalan:nodeset($lang_other)/lang">
|
|
1195
1196
|
<xsl:variable name="lang_other" select="."/>
|
|
1196
1197
|
<fo:block font-size="12pt" role="SKIP"><xsl:value-of select="$linebreak"/></fo:block>
|
|
@@ -1203,7 +1204,7 @@
|
|
|
1203
1204
|
</xsl:for-each>
|
|
1204
1205
|
</xsl:if>
|
|
1205
1206
|
|
|
1206
|
-
<xsl:if test="$stage-abbreviation = 'NWIP' or $stage-abbreviation = 'NP' or $stage-abbreviation = 'PWI' or $stage-abbreviation = 'AWI' or $stage-abbreviation = 'WD' or $stage-abbreviation = 'CD' or $stage-abbreviation = 'FDIS' or $stagename_abbreviation = 'FDIS' or $stage-abbreviation = 'DIS' or $stage-abbreviation = '
|
|
1207
|
+
<xsl:if test="$stage-abbreviation = 'NWIP' or $stage-abbreviation = 'NP' or $stage-abbreviation = 'PWI' or $stage-abbreviation = 'AWI' or $stage-abbreviation = 'WD' or $stage-abbreviation = 'CD' or $stage-abbreviation = 'FDIS' or $stagename_abbreviation = 'FDIS' or $stage-abbreviation = 'DIS' or $stage-abbreviation = 'DAMD' or $stage-abbreviation = 'DAM' or $stagename_abbreviation = 'DIS'">
|
|
1207
1208
|
<fo:block margin-top="20mm">
|
|
1208
1209
|
<xsl:copy-of select="$ics"/>
|
|
1209
1210
|
</fo:block>
|
|
@@ -1215,7 +1216,7 @@
|
|
|
1215
1216
|
<fo:table-cell number-columns-spanned="2" padding-left="6mm">
|
|
1216
1217
|
<fo:block margin-top="2.5mm" line-height="1.1">
|
|
1217
1218
|
|
|
1218
|
-
<xsl:if test="not($stage-abbreviation = 'DIS' or $stage-abbreviation = '
|
|
1219
|
+
<xsl:if test="not($stage-abbreviation = 'DIS' or $stage-abbreviation = 'DAMD' or $stage-abbreviation = 'DAM')">
|
|
1219
1220
|
<xsl:variable name="edition_and_date">
|
|
1220
1221
|
<xsl:call-template name="insertEditionAndDate"/>
|
|
1221
1222
|
</xsl:variable>
|
|
@@ -1226,7 +1227,7 @@
|
|
|
1226
1227
|
</xsl:if>
|
|
1227
1228
|
</xsl:if>
|
|
1228
1229
|
|
|
1229
|
-
<xsl:if test="$doctype = 'amendment' and not($stage-abbreviation = '
|
|
1230
|
+
<xsl:if test="$doctype = 'amendment'"> <!-- and not($stage-abbreviation = 'FDAMD' or $stage-abbreviation = 'FDAM') -->
|
|
1230
1231
|
<fo:block font-size="18pt" font-weight="bold" margin-bottom="3mm">
|
|
1231
1232
|
<xsl:value-of select="$doctype_uppercased"/>
|
|
1232
1233
|
<xsl:text> </xsl:text>
|
|
@@ -1235,9 +1236,9 @@
|
|
|
1235
1236
|
<xsl:value-of select="$amendment-number"/><xsl:text> </xsl:text>
|
|
1236
1237
|
</xsl:if>
|
|
1237
1238
|
</fo:block>
|
|
1238
|
-
</xsl:if>
|
|
1239
|
-
|
|
1240
|
-
<xsl:if test="$doctype = 'amendment' and not($stage-abbreviation = '
|
|
1239
|
+
<!-- </xsl:if>
|
|
1240
|
+
|
|
1241
|
+
<xsl:if test="$doctype = 'amendment' and not($stage-abbreviation = 'FDAMD' or $stage-abbreviation = 'FDAM')"> -->
|
|
1241
1242
|
<xsl:if test="/iso:iso-standard/iso:bibdata/iso:date[@type = 'updated']">
|
|
1242
1243
|
<fo:block font-size="18pt" font-weight="bold" margin-bottom="3mm">
|
|
1243
1244
|
<xsl:value-of select="/iso:iso-standard/iso:bibdata/iso:date[@type = 'updated']"/>
|
|
@@ -1254,7 +1255,7 @@
|
|
|
1254
1255
|
</fo:block>
|
|
1255
1256
|
</xsl:if>
|
|
1256
1257
|
|
|
1257
|
-
<xsl:if test="$stage-abbreviation = 'DIS' or $stage-abbreviation = '
|
|
1258
|
+
<xsl:if test="$stage-abbreviation = 'DIS' or $stage-abbreviation = 'DAMD' or $stage-abbreviation = 'DAM' or $stagename_abbreviation = 'DIS' or $stage-abbreviation = 'FDIS' or $stage-abbreviation = 'FDAMD' or $stage-abbreviation = 'FDAM' or $stagename_abbreviation = 'FDIS' or $stage-abbreviation = 'NWIP' or $stage-abbreviation = 'NP' or $stage-abbreviation = 'PWI' or $stage-abbreviation = 'AWI' or $stage-abbreviation = 'WD' or $stage-abbreviation = 'CD'">
|
|
1258
1259
|
<xsl:if test="normalize-space($editorialgroup) != ''">
|
|
1259
1260
|
<fo:block margin-bottom="3mm">
|
|
1260
1261
|
<xsl:copy-of select="$editorialgroup"/>
|
|
@@ -1267,7 +1268,7 @@
|
|
|
1267
1268
|
</xsl:if>
|
|
1268
1269
|
</xsl:if>
|
|
1269
1270
|
|
|
1270
|
-
<xsl:if test="$stage-abbreviation = 'DIS' or $stage-abbreviation = '
|
|
1271
|
+
<xsl:if test="$stage-abbreviation = 'DIS' or $stage-abbreviation = 'DAMD' or $stage-abbreviation = 'DAM' or $stagename_abbreviation = 'DIS' or $stage-abbreviation = 'FDIS' or $stage-abbreviation = 'FDAMD' or $stage-abbreviation = 'FDAM' or $stagename_abbreviation = 'FDIS'">
|
|
1271
1272
|
|
|
1272
1273
|
<fo:block margin-bottom="3mm">
|
|
1273
1274
|
<!-- Voting begins on: -->
|
|
@@ -1398,7 +1399,7 @@
|
|
|
1398
1399
|
<fo:table-body role="SKIP">
|
|
1399
1400
|
<fo:table-row role="SKIP">
|
|
1400
1401
|
<fo:table-cell font-size="6.5pt" text-align="justify" display-align="after" padding-bottom="8mm" role="SKIP">
|
|
1401
|
-
<xsl:if test="$stage-abbreviation = '
|
|
1402
|
+
<xsl:if test="$stage-abbreviation = 'DAMD' or $stage-abbreviation = 'DAM'">
|
|
1402
1403
|
<xsl:attribute name="font-size">7pt</xsl:attribute>
|
|
1403
1404
|
</xsl:if>
|
|
1404
1405
|
<!-- margin-top="-30mm" -->
|
|
@@ -1523,7 +1524,7 @@
|
|
|
1523
1524
|
|
|
1524
1525
|
<xsl:choose>
|
|
1525
1526
|
<!-- COVER PAGE for DIS document only -->
|
|
1526
|
-
<xsl:when test="$stage-abbreviation = 'DIS' or $stage-abbreviation = '
|
|
1527
|
+
<xsl:when test="$stage-abbreviation = 'DIS' or $stage-abbreviation = 'DAMD' or $stage-abbreviation = 'DAM' or $stagename_abbreviation = 'DIS'">
|
|
1527
1528
|
<fo:flow flow-name="xsl-region-body">
|
|
1528
1529
|
<fo:block-container role="SKIP">
|
|
1529
1530
|
<fo:block margin-top="-1mm" font-size="20pt" text-align="right">
|
|
@@ -1623,10 +1624,10 @@
|
|
|
1623
1624
|
</fo:block-container>
|
|
1624
1625
|
</fo:flow>
|
|
1625
1626
|
|
|
1626
|
-
</xsl:when> <!-- END: $stage-abbreviation = 'DIS' '
|
|
1627
|
+
</xsl:when> <!-- END: $stage-abbreviation = 'DIS' 'DAMD' 'DAM'-->
|
|
1627
1628
|
<xsl:otherwise>
|
|
1628
1629
|
|
|
1629
|
-
<!-- COVER PAGE for all documents except DIS,
|
|
1630
|
+
<!-- COVER PAGE for all documents except DIS, DAMD and DAM -->
|
|
1630
1631
|
<fo:flow flow-name="xsl-region-body">
|
|
1631
1632
|
<fo:block-container role="SKIP">
|
|
1632
1633
|
<fo:table table-layout="fixed" width="100%" font-size="24pt" line-height="1" role="SKIP"> <!-- margin-bottom="35mm" -->
|
|
@@ -1668,7 +1669,7 @@
|
|
|
1668
1669
|
<fo:table-cell role="SKIP">
|
|
1669
1670
|
<fo:block text-align="left">
|
|
1670
1671
|
<xsl:choose>
|
|
1671
|
-
<xsl:when test="$stage-abbreviation = '
|
|
1672
|
+
<xsl:when test="$stage-abbreviation = 'FDAMD' or $stage-abbreviation = 'FDAM'"><xsl:value-of select="$doctype_uppercased"/></xsl:when>
|
|
1672
1673
|
<xsl:when test="$doctype = 'amendment'">
|
|
1673
1674
|
<xsl:value-of select="java:toUpperCase(java:java.lang.String.new(translate(/iso:iso-standard/iso:bibdata/iso:ext/iso:updates-document-type,'-',' ')))"/>
|
|
1674
1675
|
</xsl:when>
|
|
@@ -1701,7 +1702,7 @@
|
|
|
1701
1702
|
</fo:block>
|
|
1702
1703
|
<!-- <xsl:value-of select="$linebreak"/>
|
|
1703
1704
|
<xsl:value-of select="/iso:iso-standard/iso:bibdata/iso:version/iso:revision-date"/> -->
|
|
1704
|
-
<xsl:if test="$doctype = 'amendment' and not($stage-abbreviation = '
|
|
1705
|
+
<xsl:if test="$doctype = 'amendment' and not($stage-abbreviation = 'FDAMD' or $stage-abbreviation = 'FDAM')">
|
|
1705
1706
|
<fo:block text-align="right" margin-right="0.5mm" role="SKIP">
|
|
1706
1707
|
<fo:block font-weight="bold" margin-top="4pt" role="H1">
|
|
1707
1708
|
<xsl:value-of select="$doctype_uppercased"/>
|
|
@@ -1734,7 +1735,7 @@
|
|
|
1734
1735
|
<fo:table-cell role="SKIP"><fo:block role="SKIP"/></fo:table-cell>
|
|
1735
1736
|
<fo:table-cell number-columns-spanned="2" font-size="10pt" line-height="1.2" display-align="center" role="SKIP">
|
|
1736
1737
|
<fo:block role="SKIP">
|
|
1737
|
-
<xsl:if test="$stage-abbreviation = 'NWIP' or $stage-abbreviation = 'NP' or $stage-abbreviation = 'PWI' or $stage-abbreviation = 'AWI' or $stage-abbreviation = 'WD' or $stage-abbreviation = 'CD'
|
|
1738
|
+
<xsl:if test="$stage-abbreviation = 'NWIP' or $stage-abbreviation = 'NP' or $stage-abbreviation = 'PWI' or $stage-abbreviation = 'AWI' or $stage-abbreviation = 'WD' or $stage-abbreviation = 'CD'">
|
|
1738
1739
|
<fo:table table-layout="fixed" width="100%" role="SKIP">
|
|
1739
1740
|
<fo:table-column column-width="50%"/>
|
|
1740
1741
|
<fo:table-column column-width="50%"/>
|
|
@@ -1769,7 +1770,7 @@
|
|
|
1769
1770
|
<fo:table-row role="SKIP"> <!-- border="1pt solid black" height="150mm" -->
|
|
1770
1771
|
<fo:table-cell font-size="11pt" role="SKIP">
|
|
1771
1772
|
<fo:block role="SKIP">
|
|
1772
|
-
<xsl:if test="$stage-abbreviation = 'FDIS' or $stage-abbreviation = '
|
|
1773
|
+
<xsl:if test="$stage-abbreviation = 'FDIS' or $stage-abbreviation = 'FDAMD' or $stage-abbreviation = 'FDAM' or $stagename_abbreviation = 'FDIS'">
|
|
1773
1774
|
<fo:block-container border="0.5mm solid black" width="51mm" role="SKIP">
|
|
1774
1775
|
<fo:block margin="2mm" role="SKIP">
|
|
1775
1776
|
<fo:block margin-bottom="8pt"><xsl:copy-of select="$editorialgroup"/></fo:block>
|
|
@@ -1809,7 +1810,7 @@
|
|
|
1809
1810
|
<xsl:call-template name="insertTitlesLangMain"/>
|
|
1810
1811
|
</fo:block>
|
|
1811
1812
|
|
|
1812
|
-
<xsl:if test="not($stage-abbreviation = '
|
|
1813
|
+
<xsl:if test="not($stage-abbreviation = 'FDAMD' or $stage-abbreviation = 'FDAM')">
|
|
1813
1814
|
<xsl:for-each select="xalan:nodeset($lang_other)/lang">
|
|
1814
1815
|
<xsl:variable name="lang_other" select="."/>
|
|
1815
1816
|
|
|
@@ -2701,12 +2702,12 @@
|
|
|
2701
2702
|
</xsl:template>
|
|
2702
2703
|
|
|
2703
2704
|
<xsl:template name="insertDraftComments">
|
|
2704
|
-
<xsl:if test="$stagename_abbreviation = 'DIS' or $stage-abbreviation = 'DIS' or $stage-abbreviation = '
|
|
2705
|
+
<xsl:if test="$stagename_abbreviation = 'DIS' or $stage-abbreviation = 'DIS' or $stage-abbreviation = 'DAMD' or $stage-abbreviation = 'DAM' or $stage-abbreviation = 'NWIP' or $stage-abbreviation = 'NP' or $stage-abbreviation = 'PWI' or $stage-abbreviation = 'AWI' or $stage-abbreviation = 'WD' or $stage-abbreviation = 'CD'">
|
|
2705
2706
|
<fo:block margin-bottom="1.5mm">
|
|
2706
2707
|
<xsl:text>THIS DOCUMENT IS A DRAFT CIRCULATED FOR COMMENT AND APPROVAL. IT IS THEREFORE SUBJECT TO CHANGE AND MAY NOT BE REFERRED TO AS AN INTERNATIONAL STANDARD UNTIL PUBLISHED AS SUCH.</xsl:text>
|
|
2707
2708
|
</fo:block>
|
|
2708
2709
|
</xsl:if>
|
|
2709
|
-
<xsl:if test="$stagename_abbreviation = 'DIS' or $stagename_abbreviation = 'FDIS' or $stage-abbreviation = 'FDIS' or $stage-abbreviation = 'DIS' or $stage-abbreviation = '
|
|
2710
|
+
<xsl:if test="$stagename_abbreviation = 'DIS' or $stagename_abbreviation = 'FDIS' or $stage-abbreviation = 'FDIS' or $stage-abbreviation = 'DIS' or $stage-abbreviation = 'FDAMD' or $stage-abbreviation = 'FDAM' or $stage-abbreviation = 'DAMD' or $stage-abbreviation = 'DAM' or $stage-abbreviation = 'NWIP' or $stage-abbreviation = 'NP' or $stage-abbreviation = 'PWI' or $stage-abbreviation = 'AWI' or $stage-abbreviation = 'WD' or $stage-abbreviation = 'CD'">
|
|
2710
2711
|
<fo:block margin-bottom="1.5mm">
|
|
2711
2712
|
<xsl:text>RECIPIENTS OF THIS DRAFT ARE INVITED TO
|
|
2712
2713
|
SUBMIT, WITH THEIR COMMENTS, NOTIFICATION
|
|
@@ -2747,7 +2748,7 @@
|
|
|
2747
2748
|
</xsl:template>
|
|
2748
2749
|
|
|
2749
2750
|
<xsl:template name="insertCoverPageAdditionalNotes">
|
|
2750
|
-
<xsl:if test="$stage-abbreviation = 'NWIP' or $stage-abbreviation = 'NP' or $stage-abbreviation = 'PWI' or $stage-abbreviation = 'AWI' or $stage-abbreviation = 'WD' or $stage-abbreviation = 'CD' or $stage-abbreviation = 'FCD' or $stage-abbreviation = 'DIS' or $stage-abbreviation = 'FDIS' or $stage-abbreviation = '
|
|
2751
|
+
<xsl:if test="$stage-abbreviation = 'NWIP' or $stage-abbreviation = 'NP' or $stage-abbreviation = 'PWI' or $stage-abbreviation = 'AWI' or $stage-abbreviation = 'WD' or $stage-abbreviation = 'CD' or $stage-abbreviation = 'FCD' or $stage-abbreviation = 'DIS' or $stage-abbreviation = 'FDIS' or $stage-abbreviation = 'DAMD' or $stage-abbreviation = 'DAM' or $stagename_abbreviation = 'DIS' or $stagename_abbreviation = 'FDIS'">
|
|
2751
2752
|
<xsl:variable name="text">
|
|
2752
2753
|
<xsl:for-each select="/iso:iso-standard/iso:preface/iso:note[@coverpage='true']/iso:p">
|
|
2753
2754
|
<fo:block>
|
|
@@ -3100,7 +3101,7 @@
|
|
|
3100
3101
|
<xsl:text> </xsl:text><xsl:value-of select="$amendment-number"/>
|
|
3101
3102
|
</xsl:if>
|
|
3102
3103
|
|
|
3103
|
-
<xsl:if test="not($stage-abbreviation = '
|
|
3104
|
+
<xsl:if test="not($stage-abbreviation = 'DAMD' or $stage-abbreviation = 'DAM')">
|
|
3104
3105
|
<xsl:text>: </xsl:text>
|
|
3105
3106
|
<xsl:apply-templates/>
|
|
3106
3107
|
</xsl:if>
|
|
@@ -4075,7 +4076,7 @@
|
|
|
4075
4076
|
<xsl:template name="insertHeaderFirst">
|
|
4076
4077
|
<fo:static-content flow-name="header-first" role="artifact">
|
|
4077
4078
|
<xsl:choose>
|
|
4078
|
-
<xsl:when test="$stage-abbreviation = '
|
|
4079
|
+
<xsl:when test="$stage-abbreviation = 'FDAMD' or $stage-abbreviation = 'FDAM' or $stage-abbreviation = 'DAMD' or $stage-abbreviation = 'DAM'">
|
|
4079
4080
|
<fo:block-container height="24mm" display-align="before">
|
|
4080
4081
|
<fo:block font-size="{$font-size_header}" font-weight="bold" text-align="right" padding-top="12.5mm" line-height="1.1">
|
|
4081
4082
|
<xsl:call-template name="insertLayoutVersionAttributesTop"/>
|
|
@@ -160,6 +160,13 @@ module IsoDoc
|
|
|
160
160
|
dlist.remove
|
|
161
161
|
end
|
|
162
162
|
|
|
163
|
+
def table1(elem)
|
|
164
|
+
elem.xpath(ns(".//dl[@key = 'true'][not(./name)]")).each do |dl|
|
|
165
|
+
dl.children.first.previous = "<name>#{@i18n.key}</name>"
|
|
166
|
+
end
|
|
167
|
+
super
|
|
168
|
+
end
|
|
169
|
+
|
|
163
170
|
def toc_title(docxml)
|
|
164
171
|
%w(amendment technical-corrigendum).include?(@doctype) and return
|
|
165
172
|
super
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: metanorma-iso
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 2.7.
|
|
4
|
+
version: 2.7.8
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Ribose Inc.
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2024-
|
|
11
|
+
date: 2024-05-06 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: metanorma-standoc
|
|
@@ -394,7 +394,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
394
394
|
- !ruby/object:Gem::Version
|
|
395
395
|
version: '0'
|
|
396
396
|
requirements: []
|
|
397
|
-
rubygems_version: 3.3.
|
|
397
|
+
rubygems_version: 3.3.27
|
|
398
398
|
signing_key:
|
|
399
399
|
specification_version: 4
|
|
400
400
|
summary: metanorma-iso lets you write ISO standards in AsciiDoc.
|