metanorma-iso 1.5.4 → 1.5.5
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/iso.amendment.xsl +95 -19
- data/lib/isodoc/iso/iso.international-standard.xsl +95 -19
- data/lib/metanorma/iso/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: bcabff05127bffd43a5d6ebdf493e749261b503d4ea4c74e1695bd60fbbc296f
|
|
4
|
+
data.tar.gz: 9fd41efb199ed745ef98c7ccddec6601c4ed6346ac925f572fde2b6525c0dc01
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: b2b4b8a9cf7350d82696a4872993319ae18df5ac2db23929177518522c63f1e0742c0368a326986579c40df1ff071406806af6ccb7bd2c103db59dac8923c8c7
|
|
7
|
+
data.tar.gz: 30232402dfe7f6a7e86cc13337003c794ef3754cbb1a44986647526cee9bafb25e8cbac5838576ca04f242a2f47978e835dcfd5bec91cc252c9ac682d9dae50a
|
|
@@ -3366,14 +3366,36 @@
|
|
|
3366
3366
|
<fo:table-cell>
|
|
3367
3367
|
<fo:block>
|
|
3368
3368
|
|
|
3369
|
-
|
|
3369
|
+
<!-- <xsl:if test="$namespace = 'nist-cswp' or $namespace = 'nist-sp'">
|
|
3370
|
+
<xsl:if test="local-name(*[1]) != 'stem'">
|
|
3371
|
+
<xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]" mode="process"/>
|
|
3372
|
+
</xsl:if>
|
|
3373
|
+
</xsl:if> -->
|
|
3370
3374
|
|
|
3371
3375
|
<xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]" mode="process"/>
|
|
3372
3376
|
|
|
3373
3377
|
</fo:block>
|
|
3374
3378
|
</fo:table-cell>
|
|
3375
3379
|
</fo:table-row>
|
|
3376
|
-
|
|
3380
|
+
<!-- <xsl:if test="$namespace = 'nist-cswp' or $namespace = 'nist-sp'">
|
|
3381
|
+
<xsl:if test="local-name(*[1]) = 'stem'">
|
|
3382
|
+
<fo:table-row>
|
|
3383
|
+
<fo:table-cell>
|
|
3384
|
+
<fo:block margin-top="6pt">
|
|
3385
|
+
<xsl:if test="normalize-space($key_iso) = 'true'">
|
|
3386
|
+
<xsl:attribute name="margin-top">0</xsl:attribute>
|
|
3387
|
+
</xsl:if>
|
|
3388
|
+
<xsl:text> </xsl:text>
|
|
3389
|
+
</fo:block>
|
|
3390
|
+
</fo:table-cell>
|
|
3391
|
+
<fo:table-cell>
|
|
3392
|
+
<fo:block>
|
|
3393
|
+
<xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]" mode="process"/>
|
|
3394
|
+
</fo:block>
|
|
3395
|
+
</fo:table-cell>
|
|
3396
|
+
</fo:table-row>
|
|
3397
|
+
</xsl:if>
|
|
3398
|
+
</xsl:if> -->
|
|
3377
3399
|
</xsl:template><xsl:template match="*[local-name()='dd']" mode="dl"/><xsl:template match="*[local-name()='dd']" mode="dl_process">
|
|
3378
3400
|
<xsl:apply-templates/>
|
|
3379
3401
|
</xsl:template><xsl:template match="*[local-name()='dd']"/><xsl:template match="*[local-name()='dd']" mode="process">
|
|
@@ -4123,22 +4145,30 @@
|
|
|
4123
4145
|
</fo:block>
|
|
4124
4146
|
</xsl:template><xsl:template match="*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']">
|
|
4125
4147
|
<fo:block-container margin-left="0mm" margin-right="0mm" margin-bottom="12pt">
|
|
4148
|
+
<xsl:if test="ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']">
|
|
4149
|
+
<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
|
|
4150
|
+
</xsl:if>
|
|
4126
4151
|
<fo:block-container margin-left="0mm" margin-right="0mm">
|
|
4127
|
-
<fo:table id="{@id}" table-layout="fixed" width="100%" border="
|
|
4152
|
+
<fo:table id="{@id}" table-layout="fixed" width="100%" border="1pt solid black">
|
|
4153
|
+
<xsl:if test="ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']">
|
|
4154
|
+
<xsl:attribute name="border">0.5pt solid black</xsl:attribute>
|
|
4155
|
+
</xsl:if>
|
|
4128
4156
|
<xsl:variable name="simple-table">
|
|
4129
4157
|
<xsl:call-template name="getSimpleTable"/>
|
|
4130
4158
|
</xsl:variable>
|
|
4131
4159
|
<xsl:variable name="cols-count" select="count(xalan:nodeset($simple-table)//tr[1]/td)"/>
|
|
4132
4160
|
<xsl:if test="$cols-count = 2 and not(ancestor::*[local-name()='table'])">
|
|
4133
|
-
<fo:table-column column-width="35mm"/>
|
|
4134
|
-
<fo:table-column column-width="115mm"/>
|
|
4161
|
+
<!-- <fo:table-column column-width="35mm"/>
|
|
4162
|
+
<fo:table-column column-width="115mm"/> -->
|
|
4163
|
+
<fo:table-column column-width="25%"/>
|
|
4164
|
+
<fo:table-column column-width="75%"/>
|
|
4135
4165
|
</xsl:if>
|
|
4136
4166
|
<xsl:apply-templates mode="requirement"/>
|
|
4137
4167
|
</fo:table>
|
|
4138
4168
|
<!-- fn processing -->
|
|
4139
4169
|
<xsl:if test=".//*[local-name() = 'fn']">
|
|
4140
4170
|
<xsl:for-each select="*[local-name() = 'tbody']">
|
|
4141
|
-
<fo:block font-size="90%" border-bottom="
|
|
4171
|
+
<fo:block font-size="90%" border-bottom="1pt solid black">
|
|
4142
4172
|
<xsl:call-template name="fn_display"/>
|
|
4143
4173
|
</fo:block>
|
|
4144
4174
|
</xsl:for-each>
|
|
@@ -4154,17 +4184,20 @@
|
|
|
4154
4184
|
<xsl:apply-templates mode="requirement"/>
|
|
4155
4185
|
</fo:table-body>
|
|
4156
4186
|
</xsl:template><xsl:template match="*[local-name()='tr']" mode="requirement">
|
|
4157
|
-
<fo:table-row>
|
|
4187
|
+
<fo:table-row height="7mm">
|
|
4188
|
+
<xsl:if test="parent::*[local-name()='thead'] and not(ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission'])">
|
|
4189
|
+
<xsl:attribute name="border">1pt solid black</xsl:attribute>
|
|
4190
|
+
</xsl:if>
|
|
4158
4191
|
<xsl:apply-templates mode="requirement"/>
|
|
4159
4192
|
</fo:table-row>
|
|
4160
4193
|
</xsl:template><xsl:template match="*[local-name()='th']" mode="requirement">
|
|
4161
|
-
<fo:table-cell text-align="{@align}">
|
|
4194
|
+
<fo:table-cell text-align="{@align}" display-align="center" padding="1mm" padding-left="2mm" border="0.5pt solid black">
|
|
4162
4195
|
<xsl:attribute name="text-align">
|
|
4163
4196
|
<xsl:choose>
|
|
4164
4197
|
<xsl:when test="@align">
|
|
4165
4198
|
<xsl:value-of select="@align"/>
|
|
4166
4199
|
</xsl:when>
|
|
4167
|
-
<xsl:otherwise>
|
|
4200
|
+
<xsl:otherwise>left</xsl:otherwise>
|
|
4168
4201
|
</xsl:choose>
|
|
4169
4202
|
</xsl:attribute>
|
|
4170
4203
|
<xsl:if test="@colspan">
|
|
@@ -4178,21 +4211,25 @@
|
|
|
4178
4211
|
</xsl:attribute>
|
|
4179
4212
|
</xsl:if>
|
|
4180
4213
|
|
|
4181
|
-
<xsl:if test="ancestor::*[local-name()='table']/@type = 'recommend'">
|
|
4214
|
+
<!-- <xsl:if test="ancestor::*[local-name()='table']/@type = 'recommend'">
|
|
4182
4215
|
<xsl:attribute name="padding-top">0.5mm</xsl:attribute>
|
|
4183
4216
|
<xsl:attribute name="background-color">rgb(165, 165, 165)</xsl:attribute>
|
|
4184
4217
|
</xsl:if>
|
|
4185
4218
|
<xsl:if test="ancestor::*[local-name()='table']/@type = 'recommendtest'">
|
|
4186
4219
|
<xsl:attribute name="padding-top">0.5mm</xsl:attribute>
|
|
4187
4220
|
<xsl:attribute name="background-color">rgb(201, 201, 201)</xsl:attribute>
|
|
4188
|
-
</xsl:if>
|
|
4221
|
+
</xsl:if> -->
|
|
4189
4222
|
|
|
4190
4223
|
<fo:block>
|
|
4191
4224
|
<xsl:apply-templates/>
|
|
4192
4225
|
</fo:block>
|
|
4193
4226
|
</fo:table-cell>
|
|
4194
4227
|
</xsl:template><xsl:template match="*[local-name()='td']" mode="requirement">
|
|
4195
|
-
<fo:table-cell text-align="{@align}">
|
|
4228
|
+
<fo:table-cell text-align="{@align}" display-align="center" padding="1mm" padding-left="2mm" border="0.5pt solid black">
|
|
4229
|
+
<xsl:if test="*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']">
|
|
4230
|
+
<xsl:attribute name="padding">0mm</xsl:attribute>
|
|
4231
|
+
<xsl:attribute name="padding-left">0mm</xsl:attribute>
|
|
4232
|
+
</xsl:if>
|
|
4196
4233
|
<xsl:attribute name="text-align">
|
|
4197
4234
|
<xsl:choose>
|
|
4198
4235
|
<xsl:when test="@align">
|
|
@@ -4212,24 +4249,25 @@
|
|
|
4212
4249
|
</xsl:attribute>
|
|
4213
4250
|
</xsl:if>
|
|
4214
4251
|
|
|
4215
|
-
<xsl:if test="ancestor::*[local-name()='table']/@type = 'recommend'">
|
|
4252
|
+
<!-- <xsl:if test="ancestor::*[local-name()='table']/@type = 'recommend'">
|
|
4216
4253
|
<xsl:attribute name="padding-left">0.5mm</xsl:attribute>
|
|
4217
|
-
<xsl:attribute name="padding-top">0.5mm</xsl:attribute>
|
|
4218
|
-
<xsl:if test="parent::*[local-name()='tr']/preceding-sibling::*[local-name()='tr'] and not(*[local-name()='table'])">
|
|
4254
|
+
<xsl:attribute name="padding-top">0.5mm</xsl:attribute>
|
|
4255
|
+
<xsl:if test="parent::*[local-name()='tr']/preceding-sibling::*[local-name()='tr'] and not(*[local-name()='table'])">
|
|
4219
4256
|
<xsl:attribute name="background-color">rgb(201, 201, 201)</xsl:attribute>
|
|
4220
4257
|
</xsl:if>
|
|
4221
|
-
</xsl:if>
|
|
4258
|
+
</xsl:if> -->
|
|
4259
|
+
<!-- 2nd line and below -->
|
|
4222
4260
|
|
|
4223
4261
|
<fo:block>
|
|
4224
4262
|
<xsl:apply-templates/>
|
|
4225
4263
|
</fo:block>
|
|
4226
4264
|
</fo:table-cell>
|
|
4227
4265
|
</xsl:template><xsl:template match="*[local-name() = 'p'][@class='RecommendationTitle' or @class = 'RecommendationTestTitle']" priority="2">
|
|
4228
|
-
<fo:block font-size="11pt" font-weight="bold"
|
|
4266
|
+
<fo:block font-size="11pt" font-weight="bold"> <!-- margin-bottom="4pt" text-align="center" -->
|
|
4229
4267
|
<xsl:apply-templates/>
|
|
4230
4268
|
</fo:block>
|
|
4231
|
-
</xsl:template><xsl:template match="*[local-name() = '
|
|
4232
|
-
<fo:block margin-bottom="10pt"
|
|
4269
|
+
</xsl:template><xsl:template match="*[local-name() = 'p2'][ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']]">
|
|
4270
|
+
<fo:block> <!-- margin-bottom="10pt" -->
|
|
4233
4271
|
<xsl:apply-templates/>
|
|
4234
4272
|
</fo:block>
|
|
4235
4273
|
</xsl:template><xsl:template match="*[local-name() = 'termexample']">
|
|
@@ -4563,6 +4601,44 @@
|
|
|
4563
4601
|
<fo:table-cell border="1pt solid black" padding-left="1mm" padding-top="0.5mm">
|
|
4564
4602
|
<fo:block><xsl:apply-templates/></fo:block>
|
|
4565
4603
|
</fo:table-cell>
|
|
4604
|
+
</xsl:template><xsl:template name="processBibitem">
|
|
4605
|
+
|
|
4606
|
+
</xsl:template><xsl:template name="processPersonalAuthor">
|
|
4607
|
+
<xsl:choose>
|
|
4608
|
+
<xsl:when test="*[local-name() = 'name']/*[local-name() = 'completename']">
|
|
4609
|
+
<author>
|
|
4610
|
+
<xsl:apply-templates select="*[local-name() = 'name']/*[local-name() = 'completename']"/>
|
|
4611
|
+
</author>
|
|
4612
|
+
</xsl:when>
|
|
4613
|
+
<xsl:when test="*[local-name() = 'name']/*[local-name() = 'surname'] and *[local-name() = 'name']/*[local-name() = 'initial']">
|
|
4614
|
+
<author>
|
|
4615
|
+
<xsl:apply-templates select="*[local-name() = 'name']/*[local-name() = 'surname']"/>
|
|
4616
|
+
<xsl:text> </xsl:text>
|
|
4617
|
+
<xsl:apply-templates select="*[local-name() = 'name']/*[local-name() = 'initial']" mode="strip"/>
|
|
4618
|
+
</author>
|
|
4619
|
+
</xsl:when>
|
|
4620
|
+
<xsl:when test="*[local-name() = 'name']/*[local-name() = 'surname'] and *[local-name() = 'name']/*[local-name() = 'forename']">
|
|
4621
|
+
<author>
|
|
4622
|
+
<xsl:apply-templates select="*[local-name() = 'name']/*[local-name() = 'surname']"/>
|
|
4623
|
+
<xsl:text> </xsl:text>
|
|
4624
|
+
<xsl:apply-templates select="*[local-name() = 'name']/*[local-name() = 'forename']" mode="strip"/>
|
|
4625
|
+
</author>
|
|
4626
|
+
</xsl:when>
|
|
4627
|
+
<xsl:otherwise>
|
|
4628
|
+
<xsl:apply-templates/>
|
|
4629
|
+
</xsl:otherwise>
|
|
4630
|
+
</xsl:choose>
|
|
4631
|
+
</xsl:template><xsl:template name="renderDate">
|
|
4632
|
+
<xsl:if test="normalize-space(*[local-name() = 'on']) != ''">
|
|
4633
|
+
<xsl:value-of select="*[local-name() = 'on']"/>
|
|
4634
|
+
</xsl:if>
|
|
4635
|
+
<xsl:if test="normalize-space(*[local-name() = 'from']) != ''">
|
|
4636
|
+
<xsl:value-of select="concat(*[local-name() = 'from'], '–', *[local-name() = 'to'])"/>
|
|
4637
|
+
</xsl:if>
|
|
4638
|
+
</xsl:template><xsl:template match="*[local-name() = 'name']/*[local-name() = 'initial']/text()" mode="strip">
|
|
4639
|
+
<xsl:value-of select="translate(.,'. ','')"/>
|
|
4640
|
+
</xsl:template><xsl:template match="*[local-name() = 'name']/*[local-name() = 'forename']/text()" mode="strip">
|
|
4641
|
+
<xsl:value-of select="substring(.,1,1)"/>
|
|
4566
4642
|
</xsl:template><xsl:template name="convertDate">
|
|
4567
4643
|
<xsl:param name="date"/>
|
|
4568
4644
|
<xsl:param name="format" select="'short'"/>
|
|
@@ -3366,14 +3366,36 @@
|
|
|
3366
3366
|
<fo:table-cell>
|
|
3367
3367
|
<fo:block>
|
|
3368
3368
|
|
|
3369
|
-
|
|
3369
|
+
<!-- <xsl:if test="$namespace = 'nist-cswp' or $namespace = 'nist-sp'">
|
|
3370
|
+
<xsl:if test="local-name(*[1]) != 'stem'">
|
|
3371
|
+
<xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]" mode="process"/>
|
|
3372
|
+
</xsl:if>
|
|
3373
|
+
</xsl:if> -->
|
|
3370
3374
|
|
|
3371
3375
|
<xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]" mode="process"/>
|
|
3372
3376
|
|
|
3373
3377
|
</fo:block>
|
|
3374
3378
|
</fo:table-cell>
|
|
3375
3379
|
</fo:table-row>
|
|
3376
|
-
|
|
3380
|
+
<!-- <xsl:if test="$namespace = 'nist-cswp' or $namespace = 'nist-sp'">
|
|
3381
|
+
<xsl:if test="local-name(*[1]) = 'stem'">
|
|
3382
|
+
<fo:table-row>
|
|
3383
|
+
<fo:table-cell>
|
|
3384
|
+
<fo:block margin-top="6pt">
|
|
3385
|
+
<xsl:if test="normalize-space($key_iso) = 'true'">
|
|
3386
|
+
<xsl:attribute name="margin-top">0</xsl:attribute>
|
|
3387
|
+
</xsl:if>
|
|
3388
|
+
<xsl:text> </xsl:text>
|
|
3389
|
+
</fo:block>
|
|
3390
|
+
</fo:table-cell>
|
|
3391
|
+
<fo:table-cell>
|
|
3392
|
+
<fo:block>
|
|
3393
|
+
<xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]" mode="process"/>
|
|
3394
|
+
</fo:block>
|
|
3395
|
+
</fo:table-cell>
|
|
3396
|
+
</fo:table-row>
|
|
3397
|
+
</xsl:if>
|
|
3398
|
+
</xsl:if> -->
|
|
3377
3399
|
</xsl:template><xsl:template match="*[local-name()='dd']" mode="dl"/><xsl:template match="*[local-name()='dd']" mode="dl_process">
|
|
3378
3400
|
<xsl:apply-templates/>
|
|
3379
3401
|
</xsl:template><xsl:template match="*[local-name()='dd']"/><xsl:template match="*[local-name()='dd']" mode="process">
|
|
@@ -4123,22 +4145,30 @@
|
|
|
4123
4145
|
</fo:block>
|
|
4124
4146
|
</xsl:template><xsl:template match="*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']">
|
|
4125
4147
|
<fo:block-container margin-left="0mm" margin-right="0mm" margin-bottom="12pt">
|
|
4148
|
+
<xsl:if test="ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']">
|
|
4149
|
+
<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
|
|
4150
|
+
</xsl:if>
|
|
4126
4151
|
<fo:block-container margin-left="0mm" margin-right="0mm">
|
|
4127
|
-
<fo:table id="{@id}" table-layout="fixed" width="100%" border="
|
|
4152
|
+
<fo:table id="{@id}" table-layout="fixed" width="100%" border="1pt solid black">
|
|
4153
|
+
<xsl:if test="ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']">
|
|
4154
|
+
<xsl:attribute name="border">0.5pt solid black</xsl:attribute>
|
|
4155
|
+
</xsl:if>
|
|
4128
4156
|
<xsl:variable name="simple-table">
|
|
4129
4157
|
<xsl:call-template name="getSimpleTable"/>
|
|
4130
4158
|
</xsl:variable>
|
|
4131
4159
|
<xsl:variable name="cols-count" select="count(xalan:nodeset($simple-table)//tr[1]/td)"/>
|
|
4132
4160
|
<xsl:if test="$cols-count = 2 and not(ancestor::*[local-name()='table'])">
|
|
4133
|
-
<fo:table-column column-width="35mm"/>
|
|
4134
|
-
<fo:table-column column-width="115mm"/>
|
|
4161
|
+
<!-- <fo:table-column column-width="35mm"/>
|
|
4162
|
+
<fo:table-column column-width="115mm"/> -->
|
|
4163
|
+
<fo:table-column column-width="25%"/>
|
|
4164
|
+
<fo:table-column column-width="75%"/>
|
|
4135
4165
|
</xsl:if>
|
|
4136
4166
|
<xsl:apply-templates mode="requirement"/>
|
|
4137
4167
|
</fo:table>
|
|
4138
4168
|
<!-- fn processing -->
|
|
4139
4169
|
<xsl:if test=".//*[local-name() = 'fn']">
|
|
4140
4170
|
<xsl:for-each select="*[local-name() = 'tbody']">
|
|
4141
|
-
<fo:block font-size="90%" border-bottom="
|
|
4171
|
+
<fo:block font-size="90%" border-bottom="1pt solid black">
|
|
4142
4172
|
<xsl:call-template name="fn_display"/>
|
|
4143
4173
|
</fo:block>
|
|
4144
4174
|
</xsl:for-each>
|
|
@@ -4154,17 +4184,20 @@
|
|
|
4154
4184
|
<xsl:apply-templates mode="requirement"/>
|
|
4155
4185
|
</fo:table-body>
|
|
4156
4186
|
</xsl:template><xsl:template match="*[local-name()='tr']" mode="requirement">
|
|
4157
|
-
<fo:table-row>
|
|
4187
|
+
<fo:table-row height="7mm">
|
|
4188
|
+
<xsl:if test="parent::*[local-name()='thead'] and not(ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission'])">
|
|
4189
|
+
<xsl:attribute name="border">1pt solid black</xsl:attribute>
|
|
4190
|
+
</xsl:if>
|
|
4158
4191
|
<xsl:apply-templates mode="requirement"/>
|
|
4159
4192
|
</fo:table-row>
|
|
4160
4193
|
</xsl:template><xsl:template match="*[local-name()='th']" mode="requirement">
|
|
4161
|
-
<fo:table-cell text-align="{@align}">
|
|
4194
|
+
<fo:table-cell text-align="{@align}" display-align="center" padding="1mm" padding-left="2mm" border="0.5pt solid black">
|
|
4162
4195
|
<xsl:attribute name="text-align">
|
|
4163
4196
|
<xsl:choose>
|
|
4164
4197
|
<xsl:when test="@align">
|
|
4165
4198
|
<xsl:value-of select="@align"/>
|
|
4166
4199
|
</xsl:when>
|
|
4167
|
-
<xsl:otherwise>
|
|
4200
|
+
<xsl:otherwise>left</xsl:otherwise>
|
|
4168
4201
|
</xsl:choose>
|
|
4169
4202
|
</xsl:attribute>
|
|
4170
4203
|
<xsl:if test="@colspan">
|
|
@@ -4178,21 +4211,25 @@
|
|
|
4178
4211
|
</xsl:attribute>
|
|
4179
4212
|
</xsl:if>
|
|
4180
4213
|
|
|
4181
|
-
<xsl:if test="ancestor::*[local-name()='table']/@type = 'recommend'">
|
|
4214
|
+
<!-- <xsl:if test="ancestor::*[local-name()='table']/@type = 'recommend'">
|
|
4182
4215
|
<xsl:attribute name="padding-top">0.5mm</xsl:attribute>
|
|
4183
4216
|
<xsl:attribute name="background-color">rgb(165, 165, 165)</xsl:attribute>
|
|
4184
4217
|
</xsl:if>
|
|
4185
4218
|
<xsl:if test="ancestor::*[local-name()='table']/@type = 'recommendtest'">
|
|
4186
4219
|
<xsl:attribute name="padding-top">0.5mm</xsl:attribute>
|
|
4187
4220
|
<xsl:attribute name="background-color">rgb(201, 201, 201)</xsl:attribute>
|
|
4188
|
-
</xsl:if>
|
|
4221
|
+
</xsl:if> -->
|
|
4189
4222
|
|
|
4190
4223
|
<fo:block>
|
|
4191
4224
|
<xsl:apply-templates/>
|
|
4192
4225
|
</fo:block>
|
|
4193
4226
|
</fo:table-cell>
|
|
4194
4227
|
</xsl:template><xsl:template match="*[local-name()='td']" mode="requirement">
|
|
4195
|
-
<fo:table-cell text-align="{@align}">
|
|
4228
|
+
<fo:table-cell text-align="{@align}" display-align="center" padding="1mm" padding-left="2mm" border="0.5pt solid black">
|
|
4229
|
+
<xsl:if test="*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']">
|
|
4230
|
+
<xsl:attribute name="padding">0mm</xsl:attribute>
|
|
4231
|
+
<xsl:attribute name="padding-left">0mm</xsl:attribute>
|
|
4232
|
+
</xsl:if>
|
|
4196
4233
|
<xsl:attribute name="text-align">
|
|
4197
4234
|
<xsl:choose>
|
|
4198
4235
|
<xsl:when test="@align">
|
|
@@ -4212,24 +4249,25 @@
|
|
|
4212
4249
|
</xsl:attribute>
|
|
4213
4250
|
</xsl:if>
|
|
4214
4251
|
|
|
4215
|
-
<xsl:if test="ancestor::*[local-name()='table']/@type = 'recommend'">
|
|
4252
|
+
<!-- <xsl:if test="ancestor::*[local-name()='table']/@type = 'recommend'">
|
|
4216
4253
|
<xsl:attribute name="padding-left">0.5mm</xsl:attribute>
|
|
4217
|
-
<xsl:attribute name="padding-top">0.5mm</xsl:attribute>
|
|
4218
|
-
<xsl:if test="parent::*[local-name()='tr']/preceding-sibling::*[local-name()='tr'] and not(*[local-name()='table'])">
|
|
4254
|
+
<xsl:attribute name="padding-top">0.5mm</xsl:attribute>
|
|
4255
|
+
<xsl:if test="parent::*[local-name()='tr']/preceding-sibling::*[local-name()='tr'] and not(*[local-name()='table'])">
|
|
4219
4256
|
<xsl:attribute name="background-color">rgb(201, 201, 201)</xsl:attribute>
|
|
4220
4257
|
</xsl:if>
|
|
4221
|
-
</xsl:if>
|
|
4258
|
+
</xsl:if> -->
|
|
4259
|
+
<!-- 2nd line and below -->
|
|
4222
4260
|
|
|
4223
4261
|
<fo:block>
|
|
4224
4262
|
<xsl:apply-templates/>
|
|
4225
4263
|
</fo:block>
|
|
4226
4264
|
</fo:table-cell>
|
|
4227
4265
|
</xsl:template><xsl:template match="*[local-name() = 'p'][@class='RecommendationTitle' or @class = 'RecommendationTestTitle']" priority="2">
|
|
4228
|
-
<fo:block font-size="11pt" font-weight="bold"
|
|
4266
|
+
<fo:block font-size="11pt" font-weight="bold"> <!-- margin-bottom="4pt" text-align="center" -->
|
|
4229
4267
|
<xsl:apply-templates/>
|
|
4230
4268
|
</fo:block>
|
|
4231
|
-
</xsl:template><xsl:template match="*[local-name() = '
|
|
4232
|
-
<fo:block margin-bottom="10pt"
|
|
4269
|
+
</xsl:template><xsl:template match="*[local-name() = 'p2'][ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']]">
|
|
4270
|
+
<fo:block> <!-- margin-bottom="10pt" -->
|
|
4233
4271
|
<xsl:apply-templates/>
|
|
4234
4272
|
</fo:block>
|
|
4235
4273
|
</xsl:template><xsl:template match="*[local-name() = 'termexample']">
|
|
@@ -4563,6 +4601,44 @@
|
|
|
4563
4601
|
<fo:table-cell border="1pt solid black" padding-left="1mm" padding-top="0.5mm">
|
|
4564
4602
|
<fo:block><xsl:apply-templates/></fo:block>
|
|
4565
4603
|
</fo:table-cell>
|
|
4604
|
+
</xsl:template><xsl:template name="processBibitem">
|
|
4605
|
+
|
|
4606
|
+
</xsl:template><xsl:template name="processPersonalAuthor">
|
|
4607
|
+
<xsl:choose>
|
|
4608
|
+
<xsl:when test="*[local-name() = 'name']/*[local-name() = 'completename']">
|
|
4609
|
+
<author>
|
|
4610
|
+
<xsl:apply-templates select="*[local-name() = 'name']/*[local-name() = 'completename']"/>
|
|
4611
|
+
</author>
|
|
4612
|
+
</xsl:when>
|
|
4613
|
+
<xsl:when test="*[local-name() = 'name']/*[local-name() = 'surname'] and *[local-name() = 'name']/*[local-name() = 'initial']">
|
|
4614
|
+
<author>
|
|
4615
|
+
<xsl:apply-templates select="*[local-name() = 'name']/*[local-name() = 'surname']"/>
|
|
4616
|
+
<xsl:text> </xsl:text>
|
|
4617
|
+
<xsl:apply-templates select="*[local-name() = 'name']/*[local-name() = 'initial']" mode="strip"/>
|
|
4618
|
+
</author>
|
|
4619
|
+
</xsl:when>
|
|
4620
|
+
<xsl:when test="*[local-name() = 'name']/*[local-name() = 'surname'] and *[local-name() = 'name']/*[local-name() = 'forename']">
|
|
4621
|
+
<author>
|
|
4622
|
+
<xsl:apply-templates select="*[local-name() = 'name']/*[local-name() = 'surname']"/>
|
|
4623
|
+
<xsl:text> </xsl:text>
|
|
4624
|
+
<xsl:apply-templates select="*[local-name() = 'name']/*[local-name() = 'forename']" mode="strip"/>
|
|
4625
|
+
</author>
|
|
4626
|
+
</xsl:when>
|
|
4627
|
+
<xsl:otherwise>
|
|
4628
|
+
<xsl:apply-templates/>
|
|
4629
|
+
</xsl:otherwise>
|
|
4630
|
+
</xsl:choose>
|
|
4631
|
+
</xsl:template><xsl:template name="renderDate">
|
|
4632
|
+
<xsl:if test="normalize-space(*[local-name() = 'on']) != ''">
|
|
4633
|
+
<xsl:value-of select="*[local-name() = 'on']"/>
|
|
4634
|
+
</xsl:if>
|
|
4635
|
+
<xsl:if test="normalize-space(*[local-name() = 'from']) != ''">
|
|
4636
|
+
<xsl:value-of select="concat(*[local-name() = 'from'], '–', *[local-name() = 'to'])"/>
|
|
4637
|
+
</xsl:if>
|
|
4638
|
+
</xsl:template><xsl:template match="*[local-name() = 'name']/*[local-name() = 'initial']/text()" mode="strip">
|
|
4639
|
+
<xsl:value-of select="translate(.,'. ','')"/>
|
|
4640
|
+
</xsl:template><xsl:template match="*[local-name() = 'name']/*[local-name() = 'forename']/text()" mode="strip">
|
|
4641
|
+
<xsl:value-of select="substring(.,1,1)"/>
|
|
4566
4642
|
</xsl:template><xsl:template name="convertDate">
|
|
4567
4643
|
<xsl:param name="date"/>
|
|
4568
4644
|
<xsl:param name="format" select="'short'"/>
|