metanorma-iho 0.6.3 → 0.6.4
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/isodoc/iho/iho.specification.xsl +113 -71
- data/lib/isodoc/iho/iho.standard.xsl +113 -71
- data/lib/metanorma/iho/isodoc.rng +16 -0
- data/lib/metanorma/iho/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 5161d7cc65c40e09368460250df3e374f78e012b60162cc458eb137b29a3872f
|
4
|
+
data.tar.gz: '068e14d994c6e5a17a4f08824e428a31be3fd7e6889c9e647a98ce1ebc0d0c63'
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 47b64816583168678380726ae4f0f2945029e9ec41e4b2e8ff98027f4e680dbc86041d2ed123851ebe05913cfb3be9dbfdd0a23a60fdaa59e97023a47fa156c0
|
7
|
+
data.tar.gz: c7bbdb9e666df911e69054ce11a12b12b5b394fea5439b8c8e771b07c9922256ba36c2840178137f28b3d17b99c4255511a947494bc35ad06ecdd8b5c9871ece
|
@@ -1108,7 +1108,10 @@
|
|
1108
1108
|
|
1109
1109
|
</xsl:attribute-set><xsl:attribute-set name="requirement-style">
|
1110
1110
|
|
1111
|
+
|
1111
1112
|
</xsl:attribute-set><xsl:attribute-set name="requirement-name-style">
|
1113
|
+
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
1114
|
+
|
1112
1115
|
|
1113
1116
|
</xsl:attribute-set><xsl:attribute-set name="requirement-label-style">
|
1114
1117
|
|
@@ -1215,6 +1218,7 @@
|
|
1215
1218
|
|
1216
1219
|
<xsl:attribute name="padding-right">5mm</xsl:attribute>
|
1217
1220
|
|
1221
|
+
|
1218
1222
|
|
1219
1223
|
|
1220
1224
|
</xsl:attribute-set><xsl:variable name="table-border_">
|
@@ -1552,7 +1556,8 @@
|
|
1552
1556
|
|
1553
1557
|
|
1554
1558
|
|
1555
|
-
|
1559
|
+
|
1560
|
+
|
1556
1561
|
|
1557
1562
|
<xsl:attribute name="margin-top">8pt</xsl:attribute>
|
1558
1563
|
<xsl:attribute name="margin-bottom">8pt</xsl:attribute>
|
@@ -1568,6 +1573,7 @@
|
|
1568
1573
|
</xsl:attribute-set><xsl:attribute-set name="termnote-style">
|
1569
1574
|
|
1570
1575
|
|
1576
|
+
|
1571
1577
|
|
1572
1578
|
|
1573
1579
|
<xsl:attribute name="font-size">10pt</xsl:attribute>
|
@@ -2021,7 +2027,10 @@
|
|
2021
2027
|
|
2022
2028
|
|
2023
2029
|
|
2024
|
-
|
2030
|
+
<!-- <xsl:if test="$namespace = 'ieee'">
|
2031
|
+
<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
|
2032
|
+
<xsl:attribute name="provisional-distance-between-starts">9.5mm</xsl:attribute>
|
2033
|
+
</xsl:if> -->
|
2025
2034
|
|
2026
2035
|
<xsl:attribute name="line-height">115%</xsl:attribute>
|
2027
2036
|
|
@@ -3207,80 +3216,88 @@
|
|
3207
3216
|
</xsl:choose>
|
3208
3217
|
</xsl:variable>
|
3209
3218
|
|
3210
|
-
|
3211
|
-
|
3212
|
-
|
3219
|
+
|
3220
|
+
<xsl:variable name="tableWithNotesAndFootnotes">
|
3221
|
+
|
3222
|
+
<fo:table keep-with-previous="always">
|
3223
|
+
<xsl:for-each select="xalan:nodeset($table_attributes)/table_attributes/@*">
|
3224
|
+
<xsl:variable name="name" select="local-name()"/>
|
3225
|
+
<xsl:choose>
|
3226
|
+
<xsl:when test="$name = 'border-top'">
|
3227
|
+
<xsl:attribute name="{$name}">0pt solid black</xsl:attribute>
|
3228
|
+
</xsl:when>
|
3229
|
+
<xsl:when test="$name = 'border'">
|
3230
|
+
<xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
|
3231
|
+
<xsl:attribute name="border-top">0pt solid black</xsl:attribute>
|
3232
|
+
</xsl:when>
|
3233
|
+
<xsl:otherwise>
|
3234
|
+
<xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
|
3235
|
+
</xsl:otherwise>
|
3236
|
+
</xsl:choose>
|
3237
|
+
</xsl:for-each>
|
3238
|
+
|
3239
|
+
|
3240
|
+
|
3213
3241
|
<xsl:choose>
|
3214
|
-
<xsl:when test="$name
|
3215
|
-
<xsl:
|
3216
|
-
|
3217
|
-
|
3218
|
-
<xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
|
3219
|
-
<xsl:attribute name="border-top">0pt solid black</xsl:attribute>
|
3242
|
+
<xsl:when test="xalan:nodeset($colgroup)//*[local-name()='col']">
|
3243
|
+
<xsl:for-each select="xalan:nodeset($colgroup)//*[local-name()='col']">
|
3244
|
+
<fo:table-column column-width="{@width}"/>
|
3245
|
+
</xsl:for-each>
|
3220
3246
|
</xsl:when>
|
3221
3247
|
<xsl:otherwise>
|
3222
|
-
|
3248
|
+
<!-- $colwidths=<xsl:copy-of select="$colwidths"/> -->
|
3249
|
+
<xsl:call-template name="insertTableColumnWidth">
|
3250
|
+
<xsl:with-param name="colwidths" select="$colwidths"/>
|
3251
|
+
</xsl:call-template>
|
3223
3252
|
</xsl:otherwise>
|
3224
3253
|
</xsl:choose>
|
3225
|
-
|
3226
|
-
|
3227
|
-
|
3228
|
-
|
3229
|
-
|
3230
|
-
|
3231
|
-
<xsl:for-each select="xalan:nodeset($colgroup)//*[local-name()='col']">
|
3232
|
-
<fo:table-column column-width="{@width}"/>
|
3233
|
-
</xsl:for-each>
|
3234
|
-
</xsl:when>
|
3235
|
-
<xsl:otherwise>
|
3236
|
-
<!-- $colwidths=<xsl:copy-of select="$colwidths"/> -->
|
3237
|
-
<xsl:call-template name="insertTableColumnWidth">
|
3238
|
-
<xsl:with-param name="colwidths" select="$colwidths"/>
|
3239
|
-
</xsl:call-template>
|
3240
|
-
</xsl:otherwise>
|
3241
|
-
</xsl:choose>
|
3242
|
-
|
3243
|
-
<fo:table-body>
|
3244
|
-
<fo:table-row>
|
3245
|
-
<fo:table-cell xsl:use-attribute-sets="table-footer-cell-style" number-columns-spanned="{$cols-count}">
|
3246
|
-
|
3247
|
-
|
3254
|
+
|
3255
|
+
<fo:table-body>
|
3256
|
+
<fo:table-row>
|
3257
|
+
<fo:table-cell xsl:use-attribute-sets="table-footer-cell-style" number-columns-spanned="{$cols-count}">
|
3258
|
+
|
3259
|
+
|
3248
3260
|
|
3249
|
-
|
3250
|
-
|
3251
|
-
<!-- fn will be processed inside 'note' processing -->
|
3252
|
-
|
3253
|
-
|
3254
|
-
|
3255
|
-
|
3256
|
-
|
3257
|
-
|
3258
|
-
<!-- for BSI (not PAS) display Notes before footnotes -->
|
3259
|
-
|
3260
|
-
|
3261
|
-
<!-- except gb and bsi -->
|
3262
|
-
|
3263
|
-
<xsl:apply-templates select="../*[local-name()='note']"/>
|
3264
3261
|
|
3265
|
-
|
3266
|
-
|
3267
|
-
<!-- horizontal row separator -->
|
3268
|
-
|
3269
|
-
|
3270
|
-
<!-- fn processing -->
|
3271
|
-
|
3272
|
-
<xsl:call-template name="table_fn_display"/>
|
3273
3262
|
|
3274
|
-
|
3275
|
-
|
3276
|
-
|
3277
|
-
|
3278
|
-
|
3279
|
-
|
3280
|
-
|
3281
|
-
|
3282
|
-
|
3283
|
-
|
3263
|
+
<!-- fn will be processed inside 'note' processing -->
|
3264
|
+
|
3265
|
+
|
3266
|
+
|
3267
|
+
|
3268
|
+
|
3269
|
+
|
3270
|
+
<!-- for BSI (not PAS) display Notes before footnotes -->
|
3271
|
+
|
3272
|
+
|
3273
|
+
<!-- except gb and bsi -->
|
3274
|
+
|
3275
|
+
<xsl:apply-templates select="../*[local-name()='note']"/>
|
3276
|
+
|
3277
|
+
|
3278
|
+
|
3279
|
+
<!-- horizontal row separator -->
|
3280
|
+
|
3281
|
+
|
3282
|
+
<!-- fn processing -->
|
3283
|
+
|
3284
|
+
<xsl:call-template name="table_fn_display"/>
|
3285
|
+
|
3286
|
+
|
3287
|
+
|
3288
|
+
<!-- for PAS display Notes after footnotes -->
|
3289
|
+
|
3290
|
+
|
3291
|
+
</fo:table-cell>
|
3292
|
+
</fo:table-row>
|
3293
|
+
</fo:table-body>
|
3294
|
+
|
3295
|
+
</fo:table>
|
3296
|
+
</xsl:variable>
|
3297
|
+
|
3298
|
+
<xsl:if test="normalize-space($tableWithNotesAndFootnotes) != ''">
|
3299
|
+
<xsl:copy-of select="$tableWithNotesAndFootnotes"/>
|
3300
|
+
</xsl:if>
|
3284
3301
|
|
3285
3302
|
|
3286
3303
|
|
@@ -3574,6 +3591,7 @@
|
|
3574
3591
|
<xsl:variable name="footnote_inline">
|
3575
3592
|
<fo:inline xsl:use-attribute-sets="fn-num-style">
|
3576
3593
|
|
3594
|
+
|
3577
3595
|
<fo:basic-link internal-destination="{$ref_id}" fox:alt-text="footnote {$current_fn_number}">
|
3578
3596
|
<xsl:value-of select="$current_fn_number_text"/>
|
3579
3597
|
</fo:basic-link>
|
@@ -3595,8 +3613,12 @@
|
|
3595
3613
|
<fo:block xsl:use-attribute-sets="fn-body-style">
|
3596
3614
|
|
3597
3615
|
|
3616
|
+
|
3598
3617
|
<fo:inline id="{$ref_id}" xsl:use-attribute-sets="fn-body-num-style">
|
3599
3618
|
|
3619
|
+
|
3620
|
+
|
3621
|
+
|
3600
3622
|
<xsl:value-of select="$current_fn_number_text"/>
|
3601
3623
|
</fo:inline>
|
3602
3624
|
<xsl:apply-templates/>
|
@@ -5285,6 +5307,8 @@
|
|
5285
5307
|
|
5286
5308
|
|
5287
5309
|
|
5310
|
+
|
5311
|
+
|
5288
5312
|
<xsl:choose>
|
5289
5313
|
<xsl:when test="$target_text = ''">
|
5290
5314
|
<xsl:apply-templates/>
|
@@ -5496,6 +5520,7 @@
|
|
5496
5520
|
|
5497
5521
|
|
5498
5522
|
|
5523
|
+
|
5499
5524
|
<!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
|
5500
5525
|
<!-- <xsl:if test="*[not(local-name()='name')][1][node()[normalize-space() != ''][1][local-name() = 'add'] and node()[normalize-space() != ''][last()][local-name() = 'add']]"> -->
|
5501
5526
|
<xsl:if test="*[not(local-name()='name')][1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
|
@@ -5518,6 +5543,7 @@
|
|
5518
5543
|
<xsl:otherwise>
|
5519
5544
|
|
5520
5545
|
|
5546
|
+
|
5521
5547
|
</xsl:otherwise>
|
5522
5548
|
</xsl:choose>
|
5523
5549
|
</xsl:variable>
|
@@ -5535,6 +5561,7 @@
|
|
5535
5561
|
<xsl:otherwise>
|
5536
5562
|
|
5537
5563
|
|
5564
|
+
|
5538
5565
|
</xsl:otherwise>
|
5539
5566
|
</xsl:choose>
|
5540
5567
|
</xsl:variable>
|
@@ -6310,6 +6337,9 @@
|
|
6310
6337
|
<fo:block xsl:use-attribute-sets="figure-name-style">
|
6311
6338
|
|
6312
6339
|
|
6340
|
+
|
6341
|
+
|
6342
|
+
|
6313
6343
|
<xsl:apply-templates/>
|
6314
6344
|
</fo:block>
|
6315
6345
|
</xsl:if>
|
@@ -6370,7 +6400,7 @@
|
|
6370
6400
|
<xsl:apply-templates/>
|
6371
6401
|
</xsl:otherwise>
|
6372
6402
|
</xsl:choose>
|
6373
|
-
</xsl:template><xsl:template match="*[local-name() = 'fn']" mode="contents"/><xsl:template match="*[local-name() = 'fn']" mode="bookmarks"/><xsl:template match="*[local-name() = 'fn']" mode="contents_item"/><xsl:template match="*[local-name() = 'xref']" mode="contents">
|
6403
|
+
</xsl:template><xsl:template match="*[local-name() = 'fn']" mode="contents"/><xsl:template match="*[local-name() = 'fn']" mode="bookmarks"/><xsl:template match="*[local-name() = 'fn']" mode="contents_item"/><xsl:template match="*[local-name() = 'xref'] | *[local-name() = 'eref']" mode="contents">
|
6374
6404
|
<xsl:value-of select="."/>
|
6375
6405
|
</xsl:template><xsl:template match="*[local-name() = 'review']" mode="contents_item"/><xsl:template match="*[local-name() = 'tab']" mode="contents_item">
|
6376
6406
|
<xsl:text> </xsl:text>
|
@@ -6446,6 +6476,9 @@
|
|
6446
6476
|
<!-- 9 -->
|
6447
6477
|
|
6448
6478
|
|
6479
|
+
<!-- <xsl:if test="$namespace = 'ieee'">
|
6480
|
+
<xsl:if test="$doctype = 'standard' and $stage = 'published'">8</xsl:if>
|
6481
|
+
</xsl:if> -->
|
6449
6482
|
|
6450
6483
|
|
6451
6484
|
|
@@ -6890,10 +6923,14 @@
|
|
6890
6923
|
</xsl:template><xsl:template match="*[local-name() = 'termexample']/*[local-name() = 'p']">
|
6891
6924
|
<xsl:variable name="element">inline
|
6892
6925
|
|
6926
|
+
|
6893
6927
|
</xsl:variable>
|
6894
6928
|
<xsl:choose>
|
6895
6929
|
<xsl:when test="contains($element, 'block')">
|
6896
6930
|
<fo:block xsl:use-attribute-sets="example-p-style">
|
6931
|
+
|
6932
|
+
|
6933
|
+
|
6897
6934
|
<xsl:apply-templates/>
|
6898
6935
|
</fo:block>
|
6899
6936
|
</xsl:when>
|
@@ -7001,6 +7038,7 @@
|
|
7001
7038
|
</xsl:if>
|
7002
7039
|
<fo:block xsl:use-attribute-sets="example-p-style">
|
7003
7040
|
|
7041
|
+
|
7004
7042
|
<xsl:apply-templates/>
|
7005
7043
|
</fo:block>
|
7006
7044
|
</fo:block-container>
|
@@ -7157,6 +7195,8 @@
|
|
7157
7195
|
|
7158
7196
|
|
7159
7197
|
|
7198
|
+
|
7199
|
+
|
7160
7200
|
<fo:basic-link fox:alt-text="{@citeas}">
|
7161
7201
|
<xsl:if test="normalize-space(@citeas) = ''">
|
7162
7202
|
<xsl:attribute name="fox:alt-text"><xsl:value-of select="."/></xsl:attribute>
|
@@ -7572,6 +7612,8 @@
|
|
7572
7612
|
|
7573
7613
|
|
7574
7614
|
|
7615
|
+
|
7616
|
+
|
7575
7617
|
<!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
|
7576
7618
|
<xsl:if test="*[1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
|
7577
7619
|
<xsl:call-template name="append_add-style"/>
|
@@ -7846,7 +7888,7 @@
|
|
7846
7888
|
</fo:list-block>
|
7847
7889
|
|
7848
7890
|
|
7849
|
-
</xsl:template><xsl:template match="*[local-name() = 'references'][not(@normative='true')]/*[local-name() = 'bibitem']" priority="2">
|
7891
|
+
</xsl:template><xsl:template match="*[local-name() = 'references'][not(@normative='true')]/*[local-name() = 'bibitem']" name="bibitem_non_normative" priority="2">
|
7850
7892
|
|
7851
7893
|
|
7852
7894
|
<xsl:call-template name="bibitem"/>
|
@@ -8574,7 +8616,7 @@
|
|
8574
8616
|
<dc:description>
|
8575
8617
|
<xsl:variable name="abstract">
|
8576
8618
|
|
8577
|
-
<xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*[local-name() = 'abstract']//text()"/>
|
8619
|
+
<xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*[local-name() = 'abstract']//text()[not(ancestor::*[local-name() = 'title'])]"/>
|
8578
8620
|
|
8579
8621
|
</xsl:variable>
|
8580
8622
|
<xsl:value-of select="normalize-space($abstract)"/>
|
@@ -1108,7 +1108,10 @@
|
|
1108
1108
|
|
1109
1109
|
</xsl:attribute-set><xsl:attribute-set name="requirement-style">
|
1110
1110
|
|
1111
|
+
|
1111
1112
|
</xsl:attribute-set><xsl:attribute-set name="requirement-name-style">
|
1113
|
+
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
1114
|
+
|
1112
1115
|
|
1113
1116
|
</xsl:attribute-set><xsl:attribute-set name="requirement-label-style">
|
1114
1117
|
|
@@ -1215,6 +1218,7 @@
|
|
1215
1218
|
|
1216
1219
|
<xsl:attribute name="padding-right">5mm</xsl:attribute>
|
1217
1220
|
|
1221
|
+
|
1218
1222
|
|
1219
1223
|
|
1220
1224
|
</xsl:attribute-set><xsl:variable name="table-border_">
|
@@ -1552,7 +1556,8 @@
|
|
1552
1556
|
|
1553
1557
|
|
1554
1558
|
|
1555
|
-
|
1559
|
+
|
1560
|
+
|
1556
1561
|
|
1557
1562
|
<xsl:attribute name="margin-top">8pt</xsl:attribute>
|
1558
1563
|
<xsl:attribute name="margin-bottom">8pt</xsl:attribute>
|
@@ -1568,6 +1573,7 @@
|
|
1568
1573
|
</xsl:attribute-set><xsl:attribute-set name="termnote-style">
|
1569
1574
|
|
1570
1575
|
|
1576
|
+
|
1571
1577
|
|
1572
1578
|
|
1573
1579
|
<xsl:attribute name="font-size">10pt</xsl:attribute>
|
@@ -2021,7 +2027,10 @@
|
|
2021
2027
|
|
2022
2028
|
|
2023
2029
|
|
2024
|
-
|
2030
|
+
<!-- <xsl:if test="$namespace = 'ieee'">
|
2031
|
+
<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
|
2032
|
+
<xsl:attribute name="provisional-distance-between-starts">9.5mm</xsl:attribute>
|
2033
|
+
</xsl:if> -->
|
2025
2034
|
|
2026
2035
|
<xsl:attribute name="line-height">115%</xsl:attribute>
|
2027
2036
|
|
@@ -3207,80 +3216,88 @@
|
|
3207
3216
|
</xsl:choose>
|
3208
3217
|
</xsl:variable>
|
3209
3218
|
|
3210
|
-
|
3211
|
-
|
3212
|
-
|
3219
|
+
|
3220
|
+
<xsl:variable name="tableWithNotesAndFootnotes">
|
3221
|
+
|
3222
|
+
<fo:table keep-with-previous="always">
|
3223
|
+
<xsl:for-each select="xalan:nodeset($table_attributes)/table_attributes/@*">
|
3224
|
+
<xsl:variable name="name" select="local-name()"/>
|
3225
|
+
<xsl:choose>
|
3226
|
+
<xsl:when test="$name = 'border-top'">
|
3227
|
+
<xsl:attribute name="{$name}">0pt solid black</xsl:attribute>
|
3228
|
+
</xsl:when>
|
3229
|
+
<xsl:when test="$name = 'border'">
|
3230
|
+
<xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
|
3231
|
+
<xsl:attribute name="border-top">0pt solid black</xsl:attribute>
|
3232
|
+
</xsl:when>
|
3233
|
+
<xsl:otherwise>
|
3234
|
+
<xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
|
3235
|
+
</xsl:otherwise>
|
3236
|
+
</xsl:choose>
|
3237
|
+
</xsl:for-each>
|
3238
|
+
|
3239
|
+
|
3240
|
+
|
3213
3241
|
<xsl:choose>
|
3214
|
-
<xsl:when test="$name
|
3215
|
-
<xsl:
|
3216
|
-
|
3217
|
-
|
3218
|
-
<xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
|
3219
|
-
<xsl:attribute name="border-top">0pt solid black</xsl:attribute>
|
3242
|
+
<xsl:when test="xalan:nodeset($colgroup)//*[local-name()='col']">
|
3243
|
+
<xsl:for-each select="xalan:nodeset($colgroup)//*[local-name()='col']">
|
3244
|
+
<fo:table-column column-width="{@width}"/>
|
3245
|
+
</xsl:for-each>
|
3220
3246
|
</xsl:when>
|
3221
3247
|
<xsl:otherwise>
|
3222
|
-
|
3248
|
+
<!-- $colwidths=<xsl:copy-of select="$colwidths"/> -->
|
3249
|
+
<xsl:call-template name="insertTableColumnWidth">
|
3250
|
+
<xsl:with-param name="colwidths" select="$colwidths"/>
|
3251
|
+
</xsl:call-template>
|
3223
3252
|
</xsl:otherwise>
|
3224
3253
|
</xsl:choose>
|
3225
|
-
|
3226
|
-
|
3227
|
-
|
3228
|
-
|
3229
|
-
|
3230
|
-
|
3231
|
-
<xsl:for-each select="xalan:nodeset($colgroup)//*[local-name()='col']">
|
3232
|
-
<fo:table-column column-width="{@width}"/>
|
3233
|
-
</xsl:for-each>
|
3234
|
-
</xsl:when>
|
3235
|
-
<xsl:otherwise>
|
3236
|
-
<!-- $colwidths=<xsl:copy-of select="$colwidths"/> -->
|
3237
|
-
<xsl:call-template name="insertTableColumnWidth">
|
3238
|
-
<xsl:with-param name="colwidths" select="$colwidths"/>
|
3239
|
-
</xsl:call-template>
|
3240
|
-
</xsl:otherwise>
|
3241
|
-
</xsl:choose>
|
3242
|
-
|
3243
|
-
<fo:table-body>
|
3244
|
-
<fo:table-row>
|
3245
|
-
<fo:table-cell xsl:use-attribute-sets="table-footer-cell-style" number-columns-spanned="{$cols-count}">
|
3246
|
-
|
3247
|
-
|
3254
|
+
|
3255
|
+
<fo:table-body>
|
3256
|
+
<fo:table-row>
|
3257
|
+
<fo:table-cell xsl:use-attribute-sets="table-footer-cell-style" number-columns-spanned="{$cols-count}">
|
3258
|
+
|
3259
|
+
|
3248
3260
|
|
3249
|
-
|
3250
|
-
|
3251
|
-
<!-- fn will be processed inside 'note' processing -->
|
3252
|
-
|
3253
|
-
|
3254
|
-
|
3255
|
-
|
3256
|
-
|
3257
|
-
|
3258
|
-
<!-- for BSI (not PAS) display Notes before footnotes -->
|
3259
|
-
|
3260
|
-
|
3261
|
-
<!-- except gb and bsi -->
|
3262
|
-
|
3263
|
-
<xsl:apply-templates select="../*[local-name()='note']"/>
|
3264
3261
|
|
3265
|
-
|
3266
|
-
|
3267
|
-
<!-- horizontal row separator -->
|
3268
|
-
|
3269
|
-
|
3270
|
-
<!-- fn processing -->
|
3271
|
-
|
3272
|
-
<xsl:call-template name="table_fn_display"/>
|
3273
3262
|
|
3274
|
-
|
3275
|
-
|
3276
|
-
|
3277
|
-
|
3278
|
-
|
3279
|
-
|
3280
|
-
|
3281
|
-
|
3282
|
-
|
3283
|
-
|
3263
|
+
<!-- fn will be processed inside 'note' processing -->
|
3264
|
+
|
3265
|
+
|
3266
|
+
|
3267
|
+
|
3268
|
+
|
3269
|
+
|
3270
|
+
<!-- for BSI (not PAS) display Notes before footnotes -->
|
3271
|
+
|
3272
|
+
|
3273
|
+
<!-- except gb and bsi -->
|
3274
|
+
|
3275
|
+
<xsl:apply-templates select="../*[local-name()='note']"/>
|
3276
|
+
|
3277
|
+
|
3278
|
+
|
3279
|
+
<!-- horizontal row separator -->
|
3280
|
+
|
3281
|
+
|
3282
|
+
<!-- fn processing -->
|
3283
|
+
|
3284
|
+
<xsl:call-template name="table_fn_display"/>
|
3285
|
+
|
3286
|
+
|
3287
|
+
|
3288
|
+
<!-- for PAS display Notes after footnotes -->
|
3289
|
+
|
3290
|
+
|
3291
|
+
</fo:table-cell>
|
3292
|
+
</fo:table-row>
|
3293
|
+
</fo:table-body>
|
3294
|
+
|
3295
|
+
</fo:table>
|
3296
|
+
</xsl:variable>
|
3297
|
+
|
3298
|
+
<xsl:if test="normalize-space($tableWithNotesAndFootnotes) != ''">
|
3299
|
+
<xsl:copy-of select="$tableWithNotesAndFootnotes"/>
|
3300
|
+
</xsl:if>
|
3284
3301
|
|
3285
3302
|
|
3286
3303
|
|
@@ -3574,6 +3591,7 @@
|
|
3574
3591
|
<xsl:variable name="footnote_inline">
|
3575
3592
|
<fo:inline xsl:use-attribute-sets="fn-num-style">
|
3576
3593
|
|
3594
|
+
|
3577
3595
|
<fo:basic-link internal-destination="{$ref_id}" fox:alt-text="footnote {$current_fn_number}">
|
3578
3596
|
<xsl:value-of select="$current_fn_number_text"/>
|
3579
3597
|
</fo:basic-link>
|
@@ -3595,8 +3613,12 @@
|
|
3595
3613
|
<fo:block xsl:use-attribute-sets="fn-body-style">
|
3596
3614
|
|
3597
3615
|
|
3616
|
+
|
3598
3617
|
<fo:inline id="{$ref_id}" xsl:use-attribute-sets="fn-body-num-style">
|
3599
3618
|
|
3619
|
+
|
3620
|
+
|
3621
|
+
|
3600
3622
|
<xsl:value-of select="$current_fn_number_text"/>
|
3601
3623
|
</fo:inline>
|
3602
3624
|
<xsl:apply-templates/>
|
@@ -5285,6 +5307,8 @@
|
|
5285
5307
|
|
5286
5308
|
|
5287
5309
|
|
5310
|
+
|
5311
|
+
|
5288
5312
|
<xsl:choose>
|
5289
5313
|
<xsl:when test="$target_text = ''">
|
5290
5314
|
<xsl:apply-templates/>
|
@@ -5496,6 +5520,7 @@
|
|
5496
5520
|
|
5497
5521
|
|
5498
5522
|
|
5523
|
+
|
5499
5524
|
<!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
|
5500
5525
|
<!-- <xsl:if test="*[not(local-name()='name')][1][node()[normalize-space() != ''][1][local-name() = 'add'] and node()[normalize-space() != ''][last()][local-name() = 'add']]"> -->
|
5501
5526
|
<xsl:if test="*[not(local-name()='name')][1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
|
@@ -5518,6 +5543,7 @@
|
|
5518
5543
|
<xsl:otherwise>
|
5519
5544
|
|
5520
5545
|
|
5546
|
+
|
5521
5547
|
</xsl:otherwise>
|
5522
5548
|
</xsl:choose>
|
5523
5549
|
</xsl:variable>
|
@@ -5535,6 +5561,7 @@
|
|
5535
5561
|
<xsl:otherwise>
|
5536
5562
|
|
5537
5563
|
|
5564
|
+
|
5538
5565
|
</xsl:otherwise>
|
5539
5566
|
</xsl:choose>
|
5540
5567
|
</xsl:variable>
|
@@ -6310,6 +6337,9 @@
|
|
6310
6337
|
<fo:block xsl:use-attribute-sets="figure-name-style">
|
6311
6338
|
|
6312
6339
|
|
6340
|
+
|
6341
|
+
|
6342
|
+
|
6313
6343
|
<xsl:apply-templates/>
|
6314
6344
|
</fo:block>
|
6315
6345
|
</xsl:if>
|
@@ -6370,7 +6400,7 @@
|
|
6370
6400
|
<xsl:apply-templates/>
|
6371
6401
|
</xsl:otherwise>
|
6372
6402
|
</xsl:choose>
|
6373
|
-
</xsl:template><xsl:template match="*[local-name() = 'fn']" mode="contents"/><xsl:template match="*[local-name() = 'fn']" mode="bookmarks"/><xsl:template match="*[local-name() = 'fn']" mode="contents_item"/><xsl:template match="*[local-name() = 'xref']" mode="contents">
|
6403
|
+
</xsl:template><xsl:template match="*[local-name() = 'fn']" mode="contents"/><xsl:template match="*[local-name() = 'fn']" mode="bookmarks"/><xsl:template match="*[local-name() = 'fn']" mode="contents_item"/><xsl:template match="*[local-name() = 'xref'] | *[local-name() = 'eref']" mode="contents">
|
6374
6404
|
<xsl:value-of select="."/>
|
6375
6405
|
</xsl:template><xsl:template match="*[local-name() = 'review']" mode="contents_item"/><xsl:template match="*[local-name() = 'tab']" mode="contents_item">
|
6376
6406
|
<xsl:text> </xsl:text>
|
@@ -6446,6 +6476,9 @@
|
|
6446
6476
|
<!-- 9 -->
|
6447
6477
|
|
6448
6478
|
|
6479
|
+
<!-- <xsl:if test="$namespace = 'ieee'">
|
6480
|
+
<xsl:if test="$doctype = 'standard' and $stage = 'published'">8</xsl:if>
|
6481
|
+
</xsl:if> -->
|
6449
6482
|
|
6450
6483
|
|
6451
6484
|
|
@@ -6890,10 +6923,14 @@
|
|
6890
6923
|
</xsl:template><xsl:template match="*[local-name() = 'termexample']/*[local-name() = 'p']">
|
6891
6924
|
<xsl:variable name="element">inline
|
6892
6925
|
|
6926
|
+
|
6893
6927
|
</xsl:variable>
|
6894
6928
|
<xsl:choose>
|
6895
6929
|
<xsl:when test="contains($element, 'block')">
|
6896
6930
|
<fo:block xsl:use-attribute-sets="example-p-style">
|
6931
|
+
|
6932
|
+
|
6933
|
+
|
6897
6934
|
<xsl:apply-templates/>
|
6898
6935
|
</fo:block>
|
6899
6936
|
</xsl:when>
|
@@ -7001,6 +7038,7 @@
|
|
7001
7038
|
</xsl:if>
|
7002
7039
|
<fo:block xsl:use-attribute-sets="example-p-style">
|
7003
7040
|
|
7041
|
+
|
7004
7042
|
<xsl:apply-templates/>
|
7005
7043
|
</fo:block>
|
7006
7044
|
</fo:block-container>
|
@@ -7157,6 +7195,8 @@
|
|
7157
7195
|
|
7158
7196
|
|
7159
7197
|
|
7198
|
+
|
7199
|
+
|
7160
7200
|
<fo:basic-link fox:alt-text="{@citeas}">
|
7161
7201
|
<xsl:if test="normalize-space(@citeas) = ''">
|
7162
7202
|
<xsl:attribute name="fox:alt-text"><xsl:value-of select="."/></xsl:attribute>
|
@@ -7572,6 +7612,8 @@
|
|
7572
7612
|
|
7573
7613
|
|
7574
7614
|
|
7615
|
+
|
7616
|
+
|
7575
7617
|
<!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
|
7576
7618
|
<xsl:if test="*[1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
|
7577
7619
|
<xsl:call-template name="append_add-style"/>
|
@@ -7846,7 +7888,7 @@
|
|
7846
7888
|
</fo:list-block>
|
7847
7889
|
|
7848
7890
|
|
7849
|
-
</xsl:template><xsl:template match="*[local-name() = 'references'][not(@normative='true')]/*[local-name() = 'bibitem']" priority="2">
|
7891
|
+
</xsl:template><xsl:template match="*[local-name() = 'references'][not(@normative='true')]/*[local-name() = 'bibitem']" name="bibitem_non_normative" priority="2">
|
7850
7892
|
|
7851
7893
|
|
7852
7894
|
<xsl:call-template name="bibitem"/>
|
@@ -8574,7 +8616,7 @@
|
|
8574
8616
|
<dc:description>
|
8575
8617
|
<xsl:variable name="abstract">
|
8576
8618
|
|
8577
|
-
<xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*[local-name() = 'abstract']//text()"/>
|
8619
|
+
<xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*[local-name() = 'abstract']//text()[not(ancestor::*[local-name() = 'title'])]"/>
|
8578
8620
|
|
8579
8621
|
</xsl:variable>
|
8580
8622
|
<xsl:value-of select="normalize-space($abstract)"/>
|
@@ -69,6 +69,17 @@
|
|
69
69
|
</zeroOrMore>
|
70
70
|
</element>
|
71
71
|
</define>
|
72
|
+
<define name="AdmonitionType">
|
73
|
+
<choice>
|
74
|
+
<value>warning</value>
|
75
|
+
<value>note</value>
|
76
|
+
<value>tip</value>
|
77
|
+
<value>important</value>
|
78
|
+
<value>caution</value>
|
79
|
+
<value>statement</value>
|
80
|
+
<value>editorial</value>
|
81
|
+
</choice>
|
82
|
+
</define>
|
72
83
|
<define name="index">
|
73
84
|
<element name="index">
|
74
85
|
<optional>
|
@@ -116,6 +127,11 @@
|
|
116
127
|
<data type="boolean"/>
|
117
128
|
</attribute>
|
118
129
|
</optional>
|
130
|
+
<optional>
|
131
|
+
<attribute name="suppress_identifier">
|
132
|
+
<data type="boolean"/>
|
133
|
+
</attribute>
|
134
|
+
</optional>
|
119
135
|
<ref name="BibliographicItem"/>
|
120
136
|
</element>
|
121
137
|
</define>
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: metanorma-iho
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.6.
|
4
|
+
version: 0.6.4
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Ribose Inc.
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2022-
|
11
|
+
date: 2022-07-04 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: metanorma-generic
|