metanorma-iso 1.5.2 → 1.5.3

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.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/lib/isodoc/iso/iso.amendment.xsl +202 -42
  3. data/lib/isodoc/iso/iso.international-standard.xsl +202 -42
  4. data/lib/metanorma/iso/version.rb +1 -1
  5. metadata +1 -1
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 7dc868b1792a227210079cc57a26f3d6a149738feb8cc1003a081f2db6a8c035
4
- data.tar.gz: 4ce69ed98d486e5618ad68bbac05b6b8589d8ac7b1b76bff90c4bed08b242315
3
+ metadata.gz: dd5b7686b3881431ec7fa1458bc81a17c0a27adbbc501544ebe072e8a972a71f
4
+ data.tar.gz: 203a1122661385da06e1cc8601783054b332a7e4d6beff447adcc74952d68a1e
5
5
  SHA512:
6
- metadata.gz: 8a759e049bbc37f0b3027a7ff7ed012e123645c28099e9b4c9af86cc3da964e7b121f69c4ae0d4b0d9d9a804009bb93c368716ad115ff45a761fa0d3cec89245
7
- data.tar.gz: cc1c85767b13826f10d1289621379892722166aa38008009577be1c6703b3ad194870db780f050457e73e0f76b301186d64469c935007c56539c23f78651bc17
6
+ metadata.gz: 7a3c94618bea757cc7f27bafd5c097e03d7a47f88e6f760665cdc9b7001c17edfa204d617a500898d246f59faecb07c54d20d316a18c4ae05309ea6901235499
7
+ data.tar.gz: 5dcb09685e984c9b82e80030bafbb6109b8ac7c6f8c355801a9634eb853db977acf0095ed09ea72f7d59d6e36c308f9c8b2996383bf079ac7ab11d0c93267129
data/lib/isodoc/iso/iso.amendment.xsl CHANGED
@@ -148,21 +148,8 @@
148
148
  -->
149
149
  <xsl:variable name="contents">
150
150
  <contents>
151
- <xsl:apply-templates select="/iso:iso-standard/iso:preface/node()" mode="contents"/>
152
-
153
- <xsl:apply-templates select="/iso:iso-standard/iso:sections/iso:clause[1]" mode="contents"/> <!-- [@id = '_scope'] -->
154
-
155
- <!-- Normative references -->
156
- <xsl:apply-templates select="/iso:iso-standard/iso:bibliography/iso:references[1]" mode="contents"/> <!-- [@id = '_normative_references'] -->
157
-
158
- <xsl:apply-templates select="/iso:iso-standard/iso:sections/*[position() &gt; 1]" mode="contents"/> <!-- @id != '_scope' -->
159
-
160
- <xsl:apply-templates select="/iso:iso-standard/iso:annex" mode="contents"/>
161
-
162
- <!-- Bibliography -->
163
- <xsl:apply-templates select="/iso:iso-standard/iso:bibliography/iso:references[position() &gt; 1]" mode="contents"/> <!-- @id = '_bibliography' -->
164
-
165
-
151
+ <xsl:call-template name="processPrefaceSectionsDefault_Contents"/>
152
+ <xsl:call-template name="processMainSectionsDefault_Contents"/>
166
153
  </contents>
167
154
  </xsl:variable>
168
155
 
@@ -1027,8 +1014,8 @@
1027
1014
  </xsl:otherwise>
1028
1015
  </xsl:choose>
1029
1016
 
1030
- <!-- Foreword, Introduction -->
1031
- <xsl:apply-templates select="/iso:iso-standard/iso:preface/node()"/>
1017
+ <!-- Foreword, Introduction -->
1018
+ <xsl:call-template name="processPrefaceSectionsDefault"/>
1032
1019
 
1033
1020
  </fo:flow>
1034
1021
  </fo:page-sequence>
@@ -1100,19 +1087,14 @@
1100
1087
  <!-- Clause(s) -->
1101
1088
  <fo:block>
1102
1089
 
1103
- <xsl:apply-templates select="/iso:iso-standard/iso:sections/iso:clause[1]"/> <!-- Scope -->
1104
-
1105
- <!-- Normative references -->
1106
- <xsl:apply-templates select="/iso:iso-standard/iso:bibliography/iso:references[1]"/>
1107
-
1108
- <!-- main sections -->
1109
- <xsl:apply-templates select="/iso:iso-standard/iso:sections/*[position() &gt; 1]"/>
1110
-
1111
- <!-- Annex(s) -->
1112
- <xsl:apply-templates select="/iso:iso-standard/iso:annex"/>
1113
-
1114
- <!-- Bibliography -->
1115
- <xsl:apply-templates select="/iso:iso-standard/iso:bibliography/iso:references[position() &gt; 1]"/>
1090
+ <xsl:choose>
1091
+ <xsl:when test="$doctype = 'amendment'">
1092
+ <xsl:apply-templates select="/iso:iso-standard/iso:sections/*"/>
1093
+ </xsl:when>
1094
+ <xsl:otherwise>
1095
+ <xsl:call-template name="processMainSectionsDefault"/>
1096
+ </xsl:otherwise>
1097
+ </xsl:choose>
1116
1098
 
1117
1099
  <fo:block id="lastBlock" font-size="1pt"> </fo:block>
1118
1100
  </fo:block>
@@ -1336,7 +1318,7 @@
1336
1318
  </xsl:template>
1337
1319
 
1338
1320
  <!-- Bibliography -->
1339
- <xsl:template match="iso:references[position() &gt; 1]/iso:title">
1321
+ <xsl:template match="iso:references[not(@normative='true')]/iso:title">
1340
1322
  <xsl:choose>
1341
1323
  <xsl:when test="$doctype = 'amendment'">
1342
1324
  <xsl:call-template name="titleAmendment"/>
@@ -1374,7 +1356,7 @@
1374
1356
  </xsl:variable>
1375
1357
 
1376
1358
  <xsl:choose>
1377
- <xsl:when test="$doctype = 'amendment'">
1359
+ <xsl:when test="$doctype = 'amendment' and not(ancestor::iso:preface)">
1378
1360
  <fo:block font-size="11pt" font-style="italic" margin-bottom="12pt" keep-with-next="always">
1379
1361
  <xsl:apply-templates/>
1380
1362
  </fo:block>
@@ -1516,13 +1498,13 @@
1516
1498
  <fo:inline font-size="80%" keep-with-previous.within-line="always" vertical-align="super">
1517
1499
  <fo:basic-link internal-destination="footnote_{@reference}_{$number}" fox:alt-text="footnote {@reference} {$number}">
1518
1500
  <!-- <xsl:value-of select="@reference"/> -->
1519
- <xsl:value-of select="$number + count(//iso:bibitem[ancestor::iso:references[@id='_normative_references']]/iso:note)"/><xsl:text>)</xsl:text>
1501
+ <xsl:value-of select="$number + count(//iso:bibitem[ancestor::iso:references[@normative='true']]/iso:note)"/><xsl:text>)</xsl:text>
1520
1502
  </fo:basic-link>
1521
1503
  </fo:inline>
1522
1504
  <fo:footnote-body>
1523
1505
  <fo:block font-size="10pt" margin-bottom="12pt">
1524
1506
  <fo:inline id="footnote_{@reference}_{$number}" keep-with-next.within-line="always" padding-right="3mm"> <!-- font-size="60%" alignment-baseline="hanging" -->
1525
- <xsl:value-of select="$number + count(//iso:bibitem[ancestor::iso:references[@id='_normative_references']]/iso:note)"/><xsl:text>)</xsl:text>
1507
+ <xsl:value-of select="$number + count(//iso:bibitem[ancestor::iso:references[@normative='true']]/iso:note)"/><xsl:text>)</xsl:text>
1526
1508
  </fo:inline>
1527
1509
  <xsl:for-each select="iso:p">
1528
1510
  <xsl:apply-templates/>
@@ -1638,9 +1620,14 @@
1638
1620
  </xsl:template>
1639
1621
 
1640
1622
 
1623
+ <xsl:template match="iso:references[@normative='true']">
1624
+ <fo:block id="{@id}">
1625
+ <xsl:apply-templates/>
1626
+ </fo:block>
1627
+ </xsl:template>
1641
1628
 
1642
1629
  <!-- <xsl:template match="iso:references[@id = '_bibliography']"> -->
1643
- <xsl:template match="iso:references[position() &gt; 1]">
1630
+ <xsl:template match="iso:references[not(@normative='true')]">
1644
1631
  <fo:block break-after="page"/>
1645
1632
  <fo:block id="{@id}">
1646
1633
  <xsl:apply-templates/>
@@ -1650,7 +1637,7 @@
1650
1637
 
1651
1638
  <!-- Example: [1] ISO 9:1995, Information and documentation – Transliteration of Cyrillic characters into Latin characters – Slavic and non-Slavic languages -->
1652
1639
  <!-- <xsl:template match="iso:references[@id = '_bibliography']/iso:bibitem"> -->
1653
- <xsl:template match="iso:references[position() &gt; 1]/iso:bibitem">
1640
+ <xsl:template match="iso:references[not(@normative='true')]/iso:bibitem">
1654
1641
  <fo:list-block margin-bottom="6pt" provisional-distance-between-starts="12mm">
1655
1642
  <fo:list-item>
1656
1643
  <fo:list-item-label end-indent="label-end()">
@@ -1689,10 +1676,10 @@
1689
1676
  </xsl:template>
1690
1677
 
1691
1678
  <!-- <xsl:template match="iso:references[@id = '_bibliography']/iso:bibitem" mode="contents"/> -->
1692
- <xsl:template match="iso:references[position() &gt; 1]/iso:bibitem" mode="contents"/>
1679
+ <xsl:template match="iso:references[not(@normative='true')]/iso:bibitem" mode="contents"/>
1693
1680
 
1694
1681
  <!-- <xsl:template match="iso:references[@id = '_bibliography']/iso:bibitem/iso:title"> -->
1695
- <xsl:template match="iso:references[position() &gt; 1]/iso:bibitem/iso:title">
1682
+ <xsl:template match="iso:references[not(@normative='true')]/iso:bibitem/iso:title">
1696
1683
  <fo:inline font-style="italic">
1697
1684
  <xsl:apply-templates/>
1698
1685
  </fo:inline>
@@ -2169,6 +2156,7 @@
2169
2156
  </xsl:attribute-set><xsl:attribute-set name="example-body-style">
2170
2157
 
2171
2158
 
2159
+
2172
2160
  </xsl:attribute-set><xsl:attribute-set name="example-name-style">
2173
2161
 
2174
2162
 
@@ -2185,6 +2173,8 @@
2185
2173
 
2186
2174
 
2187
2175
 
2176
+
2177
+
2188
2178
 
2189
2179
 
2190
2180
  </xsl:attribute-set><xsl:attribute-set name="example-p-style">
@@ -2203,6 +2193,8 @@
2203
2193
 
2204
2194
 
2205
2195
 
2196
+
2197
+
2206
2198
  </xsl:attribute-set><xsl:attribute-set name="termexample-name-style">
2207
2199
 
2208
2200
 
@@ -2227,6 +2219,7 @@
2227
2219
 
2228
2220
 
2229
2221
 
2222
+
2230
2223
  </xsl:attribute-set><xsl:attribute-set name="appendix-style">
2231
2224
 
2232
2225
  <xsl:attribute name="font-size">12pt</xsl:attribute>
@@ -2370,7 +2363,7 @@
2370
2363
 
2371
2364
 
2372
2365
 
2373
-
2366
+
2374
2367
  </xsl:attribute-set><xsl:attribute-set name="formula-style">
2375
2368
 
2376
2369
  </xsl:attribute-set><xsl:attribute-set name="image-style">
@@ -2415,7 +2408,43 @@
2415
2408
 
2416
2409
  <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
2417
2410
 
2418
- </xsl:attribute-set><xsl:template match="text()">
2411
+ </xsl:attribute-set><xsl:template name="processPrefaceSectionsDefault_Contents">
2412
+ <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='abstract']" mode="contents"/>
2413
+ <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='foreword']" mode="contents"/>
2414
+ <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='introduction']" mode="contents"/>
2415
+ <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name() != 'abstract' and local-name() != 'foreword' and local-name() != 'introduction' and local-name() != 'acknowledgements']" mode="contents"/>
2416
+ <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='acknowledgements']" mode="contents"/>
2417
+ </xsl:template><xsl:template name="processMainSectionsDefault_Contents">
2418
+ <xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name()='clause'][@type='scope']" mode="contents"/>
2419
+
2420
+ <!-- Normative references -->
2421
+ <xsl:apply-templates select="/*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']" mode="contents"/>
2422
+ <!-- Terms and definitions -->
2423
+ <xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name()='terms'] | /*/*[local-name()='sections']/*[local-name()='clause'][.//*[local-name()='terms']] | /*/*[local-name()='sections']/*[local-name()='definitions'] | /*/*[local-name()='sections']/*[local-name()='clause'][.//*[local-name()='definitions']]" mode="contents"/>
2424
+ <!-- Another main sections -->
2425
+ <xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name() != 'terms' and local-name() != 'definitions' and not(@type='scope') and not(local-name() = 'clause' and .//*[local-name()='terms']) and not(local-name() = 'clause' and .//*[local-name()='definitions'])]" mode="contents"/>
2426
+ <xsl:apply-templates select="/*/*[local-name()='annex']" mode="contents"/>
2427
+ <!-- Bibliography -->
2428
+ <xsl:apply-templates select="/*/*[local-name()='bibliography']/*[local-name()='references'][not(@normative='true')]" mode="contents"/>
2429
+ </xsl:template><xsl:template name="processPrefaceSectionsDefault">
2430
+ <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='abstract']"/>
2431
+ <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='foreword']"/>
2432
+ <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='introduction']"/>
2433
+ <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name() != 'abstract' and local-name() != 'foreword' and local-name() != 'introduction' and local-name() != 'acknowledgements']"/>
2434
+ <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='acknowledgements']"/>
2435
+ </xsl:template><xsl:template name="processMainSectionsDefault">
2436
+ <xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name()='clause'][@type='scope']"/>
2437
+
2438
+ <!-- Normative references -->
2439
+ <xsl:apply-templates select="/*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']"/>
2440
+ <!-- Terms and definitions -->
2441
+ <xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name()='terms'] | /*/*[local-name()='sections']/*[local-name()='clause'][.//*[local-name()='terms']] | /*/*[local-name()='sections']/*[local-name()='definitions'] | /*/*[local-name()='sections']/*[local-name()='clause'][.//*[local-name()='definitions']]"/>
2442
+ <!-- Another main sections -->
2443
+ <xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name() != 'terms' and local-name() != 'definitions' and not(@type='scope') and not(local-name() = 'clause' and .//*[local-name()='terms']) and not(local-name() = 'clause' and .//*[local-name()='definitions'])]"/>
2444
+ <xsl:apply-templates select="/*/*[local-name()='annex']"/>
2445
+ <!-- Bibliography -->
2446
+ <xsl:apply-templates select="/*/*[local-name()='bibliography']/*[local-name()='references'][not(@normative='true')]"/>
2447
+ </xsl:template><xsl:template match="text()">
2419
2448
  <xsl:value-of select="."/>
2420
2449
  </xsl:template><xsl:template match="*[local-name()='br']">
2421
2450
  <xsl:value-of select="$linebreak"/>
@@ -2498,6 +2527,7 @@
2498
2527
  <xsl:attribute name="margin-bottom">8pt</xsl:attribute>
2499
2528
 
2500
2529
 
2530
+
2501
2531
  <fo:table id="{@id}" table-layout="fixed" width="100%" margin-left="{$margin-left}mm" margin-right="{$margin-left}mm" table-omit-footer-at-break="true">
2502
2532
 
2503
2533
  <xsl:attribute name="border">1.5pt solid black</xsl:attribute>
@@ -2520,6 +2550,7 @@
2520
2550
 
2521
2551
 
2522
2552
 
2553
+
2523
2554
  <xsl:for-each select="xalan:nodeset($colwidths)//column">
2524
2555
  <xsl:choose>
2525
2556
  <xsl:when test=". = 1 or . = 0">
@@ -2809,6 +2840,14 @@
2809
2840
  </fo:table-row>
2810
2841
  </xsl:template><xsl:template match="*[local-name()='th']">
2811
2842
  <fo:table-cell text-align="{@align}" font-weight="bold" border="solid black 1pt" padding-left="1mm" display-align="center">
2843
+ <xsl:attribute name="text-align">
2844
+ <xsl:choose>
2845
+ <xsl:when test="@align">
2846
+ <xsl:value-of select="@align"/>
2847
+ </xsl:when>
2848
+ <xsl:otherwise>center</xsl:otherwise>
2849
+ </xsl:choose>
2850
+ </xsl:attribute>
2812
2851
 
2813
2852
  <xsl:attribute name="padding-top">1mm</xsl:attribute>
2814
2853
 
@@ -2819,6 +2858,7 @@
2819
2858
 
2820
2859
 
2821
2860
 
2861
+
2822
2862
  <xsl:if test="@colspan">
2823
2863
  <xsl:attribute name="number-columns-spanned">
2824
2864
  <xsl:value-of select="@colspan"/>
@@ -2835,6 +2875,14 @@
2835
2875
  </fo:table-cell>
2836
2876
  </xsl:template><xsl:template match="*[local-name()='td']">
2837
2877
  <fo:table-cell text-align="{@align}" display-align="center" border="solid black 1pt" padding-left="1mm">
2878
+ <xsl:attribute name="text-align">
2879
+ <xsl:choose>
2880
+ <xsl:when test="@align">
2881
+ <xsl:value-of select="@align"/>
2882
+ </xsl:when>
2883
+ <xsl:otherwise>left</xsl:otherwise>
2884
+ </xsl:choose>
2885
+ </xsl:attribute>
2838
2886
  <!-- and ancestor::*[local-name() = 'thead'] -->
2839
2887
  <xsl:attribute name="padding-top">0.5mm</xsl:attribute>
2840
2888
 
@@ -4073,6 +4121,117 @@
4073
4121
  <fo:block xsl:use-attribute-sets="recommendation-label-style">
4074
4122
  <xsl:apply-templates/>
4075
4123
  </fo:block>
4124
+ </xsl:template><xsl:template match="*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']">
4125
+ <fo:block-container margin-left="0mm" margin-right="0mm" margin-bottom="12pt">
4126
+ <fo:block-container margin-left="0mm" margin-right="0mm">
4127
+ <fo:table id="{@id}" table-layout="fixed" width="100%" border="0pt solid black">
4128
+ <xsl:variable name="simple-table">
4129
+ <xsl:call-template name="getSimpleTable"/>
4130
+ </xsl:variable>
4131
+ <xsl:variable name="cols-count" select="count(xalan:nodeset($simple-table)//tr[1]/td)"/>
4132
+ <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"/>
4135
+ </xsl:if>
4136
+ <xsl:apply-templates mode="requirement"/>
4137
+ </fo:table>
4138
+ <!-- fn processing -->
4139
+ <xsl:if test=".//*[local-name() = 'fn']">
4140
+ <xsl:for-each select="*[local-name() = 'tbody']">
4141
+ <fo:block font-size="90%" border-bottom="1.pt solid black">
4142
+ <xsl:call-template name="fn_display"/>
4143
+ </fo:block>
4144
+ </xsl:for-each>
4145
+ </xsl:if>
4146
+ </fo:block-container>
4147
+ </fo:block-container>
4148
+ </xsl:template><xsl:template match="*[local-name()='thead']" mode="requirement">
4149
+ <fo:table-header>
4150
+ <xsl:apply-templates mode="requirement"/>
4151
+ </fo:table-header>
4152
+ </xsl:template><xsl:template match="*[local-name()='tbody']" mode="requirement">
4153
+ <fo:table-body>
4154
+ <xsl:apply-templates mode="requirement"/>
4155
+ </fo:table-body>
4156
+ </xsl:template><xsl:template match="*[local-name()='tr']" mode="requirement">
4157
+ <fo:table-row>
4158
+ <xsl:apply-templates mode="requirement"/>
4159
+ </fo:table-row>
4160
+ </xsl:template><xsl:template match="*[local-name()='th']" mode="requirement">
4161
+ <fo:table-cell text-align="{@align}">
4162
+ <xsl:attribute name="text-align">
4163
+ <xsl:choose>
4164
+ <xsl:when test="@align">
4165
+ <xsl:value-of select="@align"/>
4166
+ </xsl:when>
4167
+ <xsl:otherwise>center</xsl:otherwise>
4168
+ </xsl:choose>
4169
+ </xsl:attribute>
4170
+ <xsl:if test="@colspan">
4171
+ <xsl:attribute name="number-columns-spanned">
4172
+ <xsl:value-of select="@colspan"/>
4173
+ </xsl:attribute>
4174
+ </xsl:if>
4175
+ <xsl:if test="@rowspan">
4176
+ <xsl:attribute name="number-rows-spanned">
4177
+ <xsl:value-of select="@rowspan"/>
4178
+ </xsl:attribute>
4179
+ </xsl:if>
4180
+
4181
+ <xsl:if test="ancestor::*[local-name()='table']/@type = 'recommend'">
4182
+ <xsl:attribute name="padding-top">0.5mm</xsl:attribute>
4183
+ <xsl:attribute name="background-color">rgb(165, 165, 165)</xsl:attribute>
4184
+ </xsl:if>
4185
+ <xsl:if test="ancestor::*[local-name()='table']/@type = 'recommendtest'">
4186
+ <xsl:attribute name="padding-top">0.5mm</xsl:attribute>
4187
+ <xsl:attribute name="background-color">rgb(201, 201, 201)</xsl:attribute>
4188
+ </xsl:if>
4189
+
4190
+ <fo:block>
4191
+ <xsl:apply-templates/>
4192
+ </fo:block>
4193
+ </fo:table-cell>
4194
+ </xsl:template><xsl:template match="*[local-name()='td']" mode="requirement">
4195
+ <fo:table-cell text-align="{@align}">
4196
+ <xsl:attribute name="text-align">
4197
+ <xsl:choose>
4198
+ <xsl:when test="@align">
4199
+ <xsl:value-of select="@align"/>
4200
+ </xsl:when>
4201
+ <xsl:otherwise>left</xsl:otherwise>
4202
+ </xsl:choose>
4203
+ </xsl:attribute>
4204
+ <xsl:if test="@colspan">
4205
+ <xsl:attribute name="number-columns-spanned">
4206
+ <xsl:value-of select="@colspan"/>
4207
+ </xsl:attribute>
4208
+ </xsl:if>
4209
+ <xsl:if test="@rowspan">
4210
+ <xsl:attribute name="number-rows-spanned">
4211
+ <xsl:value-of select="@rowspan"/>
4212
+ </xsl:attribute>
4213
+ </xsl:if>
4214
+
4215
+ <xsl:if test="ancestor::*[local-name()='table']/@type = 'recommend'">
4216
+ <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'])"> <!-- 2nd line and below -->
4219
+ <xsl:attribute name="background-color">rgb(201, 201, 201)</xsl:attribute>
4220
+ </xsl:if>
4221
+ </xsl:if>
4222
+
4223
+ <fo:block>
4224
+ <xsl:apply-templates/>
4225
+ </fo:block>
4226
+ </fo:table-cell>
4227
+ </xsl:template><xsl:template match="*[local-name() = 'p'][@class='RecommendationTitle' or @class = 'RecommendationTestTitle']" priority="2">
4228
+ <fo:block font-size="11pt" font-weight="bold" text-align="center" margin-bottom="4pt">
4229
+ <xsl:apply-templates/>
4230
+ </fo:block>
4231
+ </xsl:template><xsl:template match="*[local-name() = 'p'][ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']]">
4232
+ <fo:block margin-bottom="10pt">
4233
+ <xsl:apply-templates/>
4234
+ </fo:block>
4076
4235
  </xsl:template><xsl:template match="*[local-name() = 'termexample']">
4077
4236
  <fo:block id="{@id}" xsl:use-attribute-sets="termexample-style">
4078
4237
  <xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
@@ -4355,7 +4514,7 @@
4355
4514
  <fo:block id="{@id}">
4356
4515
  <xsl:apply-templates/>
4357
4516
  </fo:block>
4358
- </xsl:template><xsl:template match="/*/*[local-name() = 'bibliography']/*[local-name() = 'references'][@id = '_normative_references' or @id = '_references']">
4517
+ </xsl:template><xsl:template match="/*/*[local-name() = 'bibliography']/*[local-name() = 'references'][@normative='true']">
4359
4518
 
4360
4519
  <fo:block id="{@id}">
4361
4520
  <xsl:apply-templates/>
@@ -4609,7 +4768,8 @@
4609
4768
 
4610
4769
 
4611
4770
 
4612
-
4771
+
4772
+
4613
4773
  </xsl:variable>
4614
4774
  <xsl:if test="$documentNS != $XSLNS">
4615
4775
  <xsl:message>[WARNING]: Document namespace: '<xsl:value-of select="$documentNS"/>' doesn't equal to xslt namespace '<xsl:value-of select="$XSLNS"/>'</xsl:message>
data/lib/isodoc/iso/iso.international-standard.xsl CHANGED
@@ -148,21 +148,8 @@
148
148
  -->
149
149
  <xsl:variable name="contents">
150
150
  <contents>
151
- <xsl:apply-templates select="/iso:iso-standard/iso:preface/node()" mode="contents"/>
152
-
153
- <xsl:apply-templates select="/iso:iso-standard/iso:sections/iso:clause[1]" mode="contents"/> <!-- [@id = '_scope'] -->
154
-
155
- <!-- Normative references -->
156
- <xsl:apply-templates select="/iso:iso-standard/iso:bibliography/iso:references[1]" mode="contents"/> <!-- [@id = '_normative_references'] -->
157
-
158
- <xsl:apply-templates select="/iso:iso-standard/iso:sections/*[position() &gt; 1]" mode="contents"/> <!-- @id != '_scope' -->
159
-
160
- <xsl:apply-templates select="/iso:iso-standard/iso:annex" mode="contents"/>
161
-
162
- <!-- Bibliography -->
163
- <xsl:apply-templates select="/iso:iso-standard/iso:bibliography/iso:references[position() &gt; 1]" mode="contents"/> <!-- @id = '_bibliography' -->
164
-
165
-
151
+ <xsl:call-template name="processPrefaceSectionsDefault_Contents"/>
152
+ <xsl:call-template name="processMainSectionsDefault_Contents"/>
166
153
  </contents>
167
154
  </xsl:variable>
168
155
 
@@ -1027,8 +1014,8 @@
1027
1014
  </xsl:otherwise>
1028
1015
  </xsl:choose>
1029
1016
 
1030
- <!-- Foreword, Introduction -->
1031
- <xsl:apply-templates select="/iso:iso-standard/iso:preface/node()"/>
1017
+ <!-- Foreword, Introduction -->
1018
+ <xsl:call-template name="processPrefaceSectionsDefault"/>
1032
1019
 
1033
1020
  </fo:flow>
1034
1021
  </fo:page-sequence>
@@ -1100,19 +1087,14 @@
1100
1087
  <!-- Clause(s) -->
1101
1088
  <fo:block>
1102
1089
 
1103
- <xsl:apply-templates select="/iso:iso-standard/iso:sections/iso:clause[1]"/> <!-- Scope -->
1104
-
1105
- <!-- Normative references -->
1106
- <xsl:apply-templates select="/iso:iso-standard/iso:bibliography/iso:references[1]"/>
1107
-
1108
- <!-- main sections -->
1109
- <xsl:apply-templates select="/iso:iso-standard/iso:sections/*[position() &gt; 1]"/>
1110
-
1111
- <!-- Annex(s) -->
1112
- <xsl:apply-templates select="/iso:iso-standard/iso:annex"/>
1113
-
1114
- <!-- Bibliography -->
1115
- <xsl:apply-templates select="/iso:iso-standard/iso:bibliography/iso:references[position() &gt; 1]"/>
1090
+ <xsl:choose>
1091
+ <xsl:when test="$doctype = 'amendment'">
1092
+ <xsl:apply-templates select="/iso:iso-standard/iso:sections/*"/>
1093
+ </xsl:when>
1094
+ <xsl:otherwise>
1095
+ <xsl:call-template name="processMainSectionsDefault"/>
1096
+ </xsl:otherwise>
1097
+ </xsl:choose>
1116
1098
 
1117
1099
  <fo:block id="lastBlock" font-size="1pt"> </fo:block>
1118
1100
  </fo:block>
@@ -1336,7 +1318,7 @@
1336
1318
  </xsl:template>
1337
1319
 
1338
1320
  <!-- Bibliography -->
1339
- <xsl:template match="iso:references[position() &gt; 1]/iso:title">
1321
+ <xsl:template match="iso:references[not(@normative='true')]/iso:title">
1340
1322
  <xsl:choose>
1341
1323
  <xsl:when test="$doctype = 'amendment'">
1342
1324
  <xsl:call-template name="titleAmendment"/>
@@ -1374,7 +1356,7 @@
1374
1356
  </xsl:variable>
1375
1357
 
1376
1358
  <xsl:choose>
1377
- <xsl:when test="$doctype = 'amendment'">
1359
+ <xsl:when test="$doctype = 'amendment' and not(ancestor::iso:preface)">
1378
1360
  <fo:block font-size="11pt" font-style="italic" margin-bottom="12pt" keep-with-next="always">
1379
1361
  <xsl:apply-templates/>
1380
1362
  </fo:block>
@@ -1516,13 +1498,13 @@
1516
1498
  <fo:inline font-size="80%" keep-with-previous.within-line="always" vertical-align="super">
1517
1499
  <fo:basic-link internal-destination="footnote_{@reference}_{$number}" fox:alt-text="footnote {@reference} {$number}">
1518
1500
  <!-- <xsl:value-of select="@reference"/> -->
1519
- <xsl:value-of select="$number + count(//iso:bibitem[ancestor::iso:references[@id='_normative_references']]/iso:note)"/><xsl:text>)</xsl:text>
1501
+ <xsl:value-of select="$number + count(//iso:bibitem[ancestor::iso:references[@normative='true']]/iso:note)"/><xsl:text>)</xsl:text>
1520
1502
  </fo:basic-link>
1521
1503
  </fo:inline>
1522
1504
  <fo:footnote-body>
1523
1505
  <fo:block font-size="10pt" margin-bottom="12pt">
1524
1506
  <fo:inline id="footnote_{@reference}_{$number}" keep-with-next.within-line="always" padding-right="3mm"> <!-- font-size="60%" alignment-baseline="hanging" -->
1525
- <xsl:value-of select="$number + count(//iso:bibitem[ancestor::iso:references[@id='_normative_references']]/iso:note)"/><xsl:text>)</xsl:text>
1507
+ <xsl:value-of select="$number + count(//iso:bibitem[ancestor::iso:references[@normative='true']]/iso:note)"/><xsl:text>)</xsl:text>
1526
1508
  </fo:inline>
1527
1509
  <xsl:for-each select="iso:p">
1528
1510
  <xsl:apply-templates/>
@@ -1638,9 +1620,14 @@
1638
1620
  </xsl:template>
1639
1621
 
1640
1622
 
1623
+ <xsl:template match="iso:references[@normative='true']">
1624
+ <fo:block id="{@id}">
1625
+ <xsl:apply-templates/>
1626
+ </fo:block>
1627
+ </xsl:template>
1641
1628
 
1642
1629
  <!-- <xsl:template match="iso:references[@id = '_bibliography']"> -->
1643
- <xsl:template match="iso:references[position() &gt; 1]">
1630
+ <xsl:template match="iso:references[not(@normative='true')]">
1644
1631
  <fo:block break-after="page"/>
1645
1632
  <fo:block id="{@id}">
1646
1633
  <xsl:apply-templates/>
@@ -1650,7 +1637,7 @@
1650
1637
 
1651
1638
  <!-- Example: [1] ISO 9:1995, Information and documentation – Transliteration of Cyrillic characters into Latin characters – Slavic and non-Slavic languages -->
1652
1639
  <!-- <xsl:template match="iso:references[@id = '_bibliography']/iso:bibitem"> -->
1653
- <xsl:template match="iso:references[position() &gt; 1]/iso:bibitem">
1640
+ <xsl:template match="iso:references[not(@normative='true')]/iso:bibitem">
1654
1641
  <fo:list-block margin-bottom="6pt" provisional-distance-between-starts="12mm">
1655
1642
  <fo:list-item>
1656
1643
  <fo:list-item-label end-indent="label-end()">
@@ -1689,10 +1676,10 @@
1689
1676
  </xsl:template>
1690
1677
 
1691
1678
  <!-- <xsl:template match="iso:references[@id = '_bibliography']/iso:bibitem" mode="contents"/> -->
1692
- <xsl:template match="iso:references[position() &gt; 1]/iso:bibitem" mode="contents"/>
1679
+ <xsl:template match="iso:references[not(@normative='true')]/iso:bibitem" mode="contents"/>
1693
1680
 
1694
1681
  <!-- <xsl:template match="iso:references[@id = '_bibliography']/iso:bibitem/iso:title"> -->
1695
- <xsl:template match="iso:references[position() &gt; 1]/iso:bibitem/iso:title">
1682
+ <xsl:template match="iso:references[not(@normative='true')]/iso:bibitem/iso:title">
1696
1683
  <fo:inline font-style="italic">
1697
1684
  <xsl:apply-templates/>
1698
1685
  </fo:inline>
@@ -2169,6 +2156,7 @@
2169
2156
  </xsl:attribute-set><xsl:attribute-set name="example-body-style">
2170
2157
 
2171
2158
 
2159
+
2172
2160
  </xsl:attribute-set><xsl:attribute-set name="example-name-style">
2173
2161
 
2174
2162
 
@@ -2185,6 +2173,8 @@
2185
2173
 
2186
2174
 
2187
2175
 
2176
+
2177
+
2188
2178
 
2189
2179
 
2190
2180
  </xsl:attribute-set><xsl:attribute-set name="example-p-style">
@@ -2203,6 +2193,8 @@
2203
2193
 
2204
2194
 
2205
2195
 
2196
+
2197
+
2206
2198
  </xsl:attribute-set><xsl:attribute-set name="termexample-name-style">
2207
2199
 
2208
2200
 
@@ -2227,6 +2219,7 @@
2227
2219
 
2228
2220
 
2229
2221
 
2222
+
2230
2223
  </xsl:attribute-set><xsl:attribute-set name="appendix-style">
2231
2224
 
2232
2225
  <xsl:attribute name="font-size">12pt</xsl:attribute>
@@ -2370,7 +2363,7 @@
2370
2363
 
2371
2364
 
2372
2365
 
2373
-
2366
+
2374
2367
  </xsl:attribute-set><xsl:attribute-set name="formula-style">
2375
2368
 
2376
2369
  </xsl:attribute-set><xsl:attribute-set name="image-style">
@@ -2415,7 +2408,43 @@
2415
2408
 
2416
2409
  <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
2417
2410
 
2418
- </xsl:attribute-set><xsl:template match="text()">
2411
+ </xsl:attribute-set><xsl:template name="processPrefaceSectionsDefault_Contents">
2412
+ <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='abstract']" mode="contents"/>
2413
+ <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='foreword']" mode="contents"/>
2414
+ <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='introduction']" mode="contents"/>
2415
+ <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name() != 'abstract' and local-name() != 'foreword' and local-name() != 'introduction' and local-name() != 'acknowledgements']" mode="contents"/>
2416
+ <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='acknowledgements']" mode="contents"/>
2417
+ </xsl:template><xsl:template name="processMainSectionsDefault_Contents">
2418
+ <xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name()='clause'][@type='scope']" mode="contents"/>
2419
+
2420
+ <!-- Normative references -->
2421
+ <xsl:apply-templates select="/*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']" mode="contents"/>
2422
+ <!-- Terms and definitions -->
2423
+ <xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name()='terms'] | /*/*[local-name()='sections']/*[local-name()='clause'][.//*[local-name()='terms']] | /*/*[local-name()='sections']/*[local-name()='definitions'] | /*/*[local-name()='sections']/*[local-name()='clause'][.//*[local-name()='definitions']]" mode="contents"/>
2424
+ <!-- Another main sections -->
2425
+ <xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name() != 'terms' and local-name() != 'definitions' and not(@type='scope') and not(local-name() = 'clause' and .//*[local-name()='terms']) and not(local-name() = 'clause' and .//*[local-name()='definitions'])]" mode="contents"/>
2426
+ <xsl:apply-templates select="/*/*[local-name()='annex']" mode="contents"/>
2427
+ <!-- Bibliography -->
2428
+ <xsl:apply-templates select="/*/*[local-name()='bibliography']/*[local-name()='references'][not(@normative='true')]" mode="contents"/>
2429
+ </xsl:template><xsl:template name="processPrefaceSectionsDefault">
2430
+ <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='abstract']"/>
2431
+ <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='foreword']"/>
2432
+ <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='introduction']"/>
2433
+ <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name() != 'abstract' and local-name() != 'foreword' and local-name() != 'introduction' and local-name() != 'acknowledgements']"/>
2434
+ <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='acknowledgements']"/>
2435
+ </xsl:template><xsl:template name="processMainSectionsDefault">
2436
+ <xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name()='clause'][@type='scope']"/>
2437
+
2438
+ <!-- Normative references -->
2439
+ <xsl:apply-templates select="/*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']"/>
2440
+ <!-- Terms and definitions -->
2441
+ <xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name()='terms'] | /*/*[local-name()='sections']/*[local-name()='clause'][.//*[local-name()='terms']] | /*/*[local-name()='sections']/*[local-name()='definitions'] | /*/*[local-name()='sections']/*[local-name()='clause'][.//*[local-name()='definitions']]"/>
2442
+ <!-- Another main sections -->
2443
+ <xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name() != 'terms' and local-name() != 'definitions' and not(@type='scope') and not(local-name() = 'clause' and .//*[local-name()='terms']) and not(local-name() = 'clause' and .//*[local-name()='definitions'])]"/>
2444
+ <xsl:apply-templates select="/*/*[local-name()='annex']"/>
2445
+ <!-- Bibliography -->
2446
+ <xsl:apply-templates select="/*/*[local-name()='bibliography']/*[local-name()='references'][not(@normative='true')]"/>
2447
+ </xsl:template><xsl:template match="text()">
2419
2448
  <xsl:value-of select="."/>
2420
2449
  </xsl:template><xsl:template match="*[local-name()='br']">
2421
2450
  <xsl:value-of select="$linebreak"/>
@@ -2498,6 +2527,7 @@
2498
2527
  <xsl:attribute name="margin-bottom">8pt</xsl:attribute>
2499
2528
 
2500
2529
 
2530
+
2501
2531
  <fo:table id="{@id}" table-layout="fixed" width="100%" margin-left="{$margin-left}mm" margin-right="{$margin-left}mm" table-omit-footer-at-break="true">
2502
2532
 
2503
2533
  <xsl:attribute name="border">1.5pt solid black</xsl:attribute>
@@ -2520,6 +2550,7 @@
2520
2550
 
2521
2551
 
2522
2552
 
2553
+
2523
2554
  <xsl:for-each select="xalan:nodeset($colwidths)//column">
2524
2555
  <xsl:choose>
2525
2556
  <xsl:when test=". = 1 or . = 0">
@@ -2809,6 +2840,14 @@
2809
2840
  </fo:table-row>
2810
2841
  </xsl:template><xsl:template match="*[local-name()='th']">
2811
2842
  <fo:table-cell text-align="{@align}" font-weight="bold" border="solid black 1pt" padding-left="1mm" display-align="center">
2843
+ <xsl:attribute name="text-align">
2844
+ <xsl:choose>
2845
+ <xsl:when test="@align">
2846
+ <xsl:value-of select="@align"/>
2847
+ </xsl:when>
2848
+ <xsl:otherwise>center</xsl:otherwise>
2849
+ </xsl:choose>
2850
+ </xsl:attribute>
2812
2851
 
2813
2852
  <xsl:attribute name="padding-top">1mm</xsl:attribute>
2814
2853
 
@@ -2819,6 +2858,7 @@
2819
2858
 
2820
2859
 
2821
2860
 
2861
+
2822
2862
  <xsl:if test="@colspan">
2823
2863
  <xsl:attribute name="number-columns-spanned">
2824
2864
  <xsl:value-of select="@colspan"/>
@@ -2835,6 +2875,14 @@
2835
2875
  </fo:table-cell>
2836
2876
  </xsl:template><xsl:template match="*[local-name()='td']">
2837
2877
  <fo:table-cell text-align="{@align}" display-align="center" border="solid black 1pt" padding-left="1mm">
2878
+ <xsl:attribute name="text-align">
2879
+ <xsl:choose>
2880
+ <xsl:when test="@align">
2881
+ <xsl:value-of select="@align"/>
2882
+ </xsl:when>
2883
+ <xsl:otherwise>left</xsl:otherwise>
2884
+ </xsl:choose>
2885
+ </xsl:attribute>
2838
2886
  <!-- and ancestor::*[local-name() = 'thead'] -->
2839
2887
  <xsl:attribute name="padding-top">0.5mm</xsl:attribute>
2840
2888
 
@@ -4073,6 +4121,117 @@
4073
4121
  <fo:block xsl:use-attribute-sets="recommendation-label-style">
4074
4122
  <xsl:apply-templates/>
4075
4123
  </fo:block>
4124
+ </xsl:template><xsl:template match="*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']">
4125
+ <fo:block-container margin-left="0mm" margin-right="0mm" margin-bottom="12pt">
4126
+ <fo:block-container margin-left="0mm" margin-right="0mm">
4127
+ <fo:table id="{@id}" table-layout="fixed" width="100%" border="0pt solid black">
4128
+ <xsl:variable name="simple-table">
4129
+ <xsl:call-template name="getSimpleTable"/>
4130
+ </xsl:variable>
4131
+ <xsl:variable name="cols-count" select="count(xalan:nodeset($simple-table)//tr[1]/td)"/>
4132
+ <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"/>
4135
+ </xsl:if>
4136
+ <xsl:apply-templates mode="requirement"/>
4137
+ </fo:table>
4138
+ <!-- fn processing -->
4139
+ <xsl:if test=".//*[local-name() = 'fn']">
4140
+ <xsl:for-each select="*[local-name() = 'tbody']">
4141
+ <fo:block font-size="90%" border-bottom="1.pt solid black">
4142
+ <xsl:call-template name="fn_display"/>
4143
+ </fo:block>
4144
+ </xsl:for-each>
4145
+ </xsl:if>
4146
+ </fo:block-container>
4147
+ </fo:block-container>
4148
+ </xsl:template><xsl:template match="*[local-name()='thead']" mode="requirement">
4149
+ <fo:table-header>
4150
+ <xsl:apply-templates mode="requirement"/>
4151
+ </fo:table-header>
4152
+ </xsl:template><xsl:template match="*[local-name()='tbody']" mode="requirement">
4153
+ <fo:table-body>
4154
+ <xsl:apply-templates mode="requirement"/>
4155
+ </fo:table-body>
4156
+ </xsl:template><xsl:template match="*[local-name()='tr']" mode="requirement">
4157
+ <fo:table-row>
4158
+ <xsl:apply-templates mode="requirement"/>
4159
+ </fo:table-row>
4160
+ </xsl:template><xsl:template match="*[local-name()='th']" mode="requirement">
4161
+ <fo:table-cell text-align="{@align}">
4162
+ <xsl:attribute name="text-align">
4163
+ <xsl:choose>
4164
+ <xsl:when test="@align">
4165
+ <xsl:value-of select="@align"/>
4166
+ </xsl:when>
4167
+ <xsl:otherwise>center</xsl:otherwise>
4168
+ </xsl:choose>
4169
+ </xsl:attribute>
4170
+ <xsl:if test="@colspan">
4171
+ <xsl:attribute name="number-columns-spanned">
4172
+ <xsl:value-of select="@colspan"/>
4173
+ </xsl:attribute>
4174
+ </xsl:if>
4175
+ <xsl:if test="@rowspan">
4176
+ <xsl:attribute name="number-rows-spanned">
4177
+ <xsl:value-of select="@rowspan"/>
4178
+ </xsl:attribute>
4179
+ </xsl:if>
4180
+
4181
+ <xsl:if test="ancestor::*[local-name()='table']/@type = 'recommend'">
4182
+ <xsl:attribute name="padding-top">0.5mm</xsl:attribute>
4183
+ <xsl:attribute name="background-color">rgb(165, 165, 165)</xsl:attribute>
4184
+ </xsl:if>
4185
+ <xsl:if test="ancestor::*[local-name()='table']/@type = 'recommendtest'">
4186
+ <xsl:attribute name="padding-top">0.5mm</xsl:attribute>
4187
+ <xsl:attribute name="background-color">rgb(201, 201, 201)</xsl:attribute>
4188
+ </xsl:if>
4189
+
4190
+ <fo:block>
4191
+ <xsl:apply-templates/>
4192
+ </fo:block>
4193
+ </fo:table-cell>
4194
+ </xsl:template><xsl:template match="*[local-name()='td']" mode="requirement">
4195
+ <fo:table-cell text-align="{@align}">
4196
+ <xsl:attribute name="text-align">
4197
+ <xsl:choose>
4198
+ <xsl:when test="@align">
4199
+ <xsl:value-of select="@align"/>
4200
+ </xsl:when>
4201
+ <xsl:otherwise>left</xsl:otherwise>
4202
+ </xsl:choose>
4203
+ </xsl:attribute>
4204
+ <xsl:if test="@colspan">
4205
+ <xsl:attribute name="number-columns-spanned">
4206
+ <xsl:value-of select="@colspan"/>
4207
+ </xsl:attribute>
4208
+ </xsl:if>
4209
+ <xsl:if test="@rowspan">
4210
+ <xsl:attribute name="number-rows-spanned">
4211
+ <xsl:value-of select="@rowspan"/>
4212
+ </xsl:attribute>
4213
+ </xsl:if>
4214
+
4215
+ <xsl:if test="ancestor::*[local-name()='table']/@type = 'recommend'">
4216
+ <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'])"> <!-- 2nd line and below -->
4219
+ <xsl:attribute name="background-color">rgb(201, 201, 201)</xsl:attribute>
4220
+ </xsl:if>
4221
+ </xsl:if>
4222
+
4223
+ <fo:block>
4224
+ <xsl:apply-templates/>
4225
+ </fo:block>
4226
+ </fo:table-cell>
4227
+ </xsl:template><xsl:template match="*[local-name() = 'p'][@class='RecommendationTitle' or @class = 'RecommendationTestTitle']" priority="2">
4228
+ <fo:block font-size="11pt" font-weight="bold" text-align="center" margin-bottom="4pt">
4229
+ <xsl:apply-templates/>
4230
+ </fo:block>
4231
+ </xsl:template><xsl:template match="*[local-name() = 'p'][ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']]">
4232
+ <fo:block margin-bottom="10pt">
4233
+ <xsl:apply-templates/>
4234
+ </fo:block>
4076
4235
  </xsl:template><xsl:template match="*[local-name() = 'termexample']">
4077
4236
  <fo:block id="{@id}" xsl:use-attribute-sets="termexample-style">
4078
4237
  <xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
@@ -4355,7 +4514,7 @@
4355
4514
  <fo:block id="{@id}">
4356
4515
  <xsl:apply-templates/>
4357
4516
  </fo:block>
4358
- </xsl:template><xsl:template match="/*/*[local-name() = 'bibliography']/*[local-name() = 'references'][@id = '_normative_references' or @id = '_references']">
4517
+ </xsl:template><xsl:template match="/*/*[local-name() = 'bibliography']/*[local-name() = 'references'][@normative='true']">
4359
4518
 
4360
4519
  <fo:block id="{@id}">
4361
4520
  <xsl:apply-templates/>
@@ -4609,7 +4768,8 @@
4609
4768
 
4610
4769
 
4611
4770
 
4612
-
4771
+
4772
+
4613
4773
  </xsl:variable>
4614
4774
  <xsl:if test="$documentNS != $XSLNS">
4615
4775
  <xsl:message>[WARNING]: Document namespace: '<xsl:value-of select="$documentNS"/>' doesn't equal to xslt namespace '<xsl:value-of select="$XSLNS"/>'</xsl:message>
data/lib/metanorma/iso/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module ISO
3
- VERSION = "1.5.2".freeze
3
+ VERSION = "1.5.3".freeze
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-iso
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.5.2
4
+ version: 1.5.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.