metanorma-jis 0.0.8 → 0.0.10
Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 1de2bc967e67625628eeb0c66b75e2c1276b28be7c03df0c367c4fde7aaf2f53
|
|
4
|
+
data.tar.gz: aa258e98b60ce190b9d34921a016d16bb9e0e898340cb8e6fe545dc45733482f
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 14cae6306705404f86143d4e8d1fa0601167727aed32dd4801dcb59c75f85f8c811145eaf331ab10173edbbfc245f4241372c75a24e4c484584199d7fb555f74
|
|
7
|
+
data.tar.gz: 6378fa36481856db9419b5fc0eb94ab23340c425d6187546d52b7b55a135e5bc4f23d691687ea2b87b85743ec752c1b71c44b6055ba9f0833c1357ccea567f28
|
|
@@ -97,7 +97,7 @@ h1, h2, h3, h4, h5, h6 {
|
|
|
97
97
|
|
|
98
98
|
blockquote, q {
|
|
99
99
|
quotes: none; }
|
|
100
|
-
blockquote
|
|
100
|
+
blockquote::before, blockquote::after, q::before, q::after {
|
|
101
101
|
content: '';
|
|
102
102
|
content: none; }
|
|
103
103
|
|
|
@@ -120,14 +120,18 @@ b, strong {
|
|
|
120
120
|
div.document-stage-band, div.document-type-band {
|
|
121
121
|
background-color: #333333; }
|
|
122
122
|
|
|
123
|
-
a.FootnoteRef + a.FootnoteRef
|
|
123
|
+
a.FootnoteRef + a.FootnoteRef::before {
|
|
124
124
|
content: ", ";
|
|
125
125
|
vertical-align: super; }
|
|
126
126
|
|
|
127
|
-
a.TableFootnoteRef + a.TableFootnoteRef
|
|
127
|
+
a.TableFootnoteRef + a.TableFootnoteRef::before {
|
|
128
128
|
content: ", ";
|
|
129
129
|
vertical-align: super; }
|
|
130
130
|
|
|
131
|
+
a.TableFootnoteRef, span.TableFootnoteRef,
|
|
132
|
+
a.FootnoteRef, span.FootnoteRef {
|
|
133
|
+
vertical-align: super; }
|
|
134
|
+
|
|
131
135
|
.addition {
|
|
132
136
|
color: blue; }
|
|
133
137
|
|
|
@@ -97,7 +97,7 @@ h1, h2, h3, h4, h5, h6 {
|
|
|
97
97
|
|
|
98
98
|
blockquote, q {
|
|
99
99
|
quotes: none; }
|
|
100
|
-
blockquote
|
|
100
|
+
blockquote::before, blockquote::after, q::before, q::after {
|
|
101
101
|
content: '';
|
|
102
102
|
content: none; }
|
|
103
103
|
|
|
@@ -120,14 +120,18 @@ b, strong {
|
|
|
120
120
|
div.document-stage-band, div.document-type-band {
|
|
121
121
|
background-color: #333333; }
|
|
122
122
|
|
|
123
|
-
a.FootnoteRef + a.FootnoteRef
|
|
123
|
+
a.FootnoteRef + a.FootnoteRef::before {
|
|
124
124
|
content: ", ";
|
|
125
125
|
vertical-align: super; }
|
|
126
126
|
|
|
127
|
-
a.TableFootnoteRef + a.TableFootnoteRef
|
|
127
|
+
a.TableFootnoteRef + a.TableFootnoteRef::before {
|
|
128
128
|
content: ", ";
|
|
129
129
|
vertical-align: super; }
|
|
130
130
|
|
|
131
|
+
a.TableFootnoteRef, span.TableFootnoteRef,
|
|
132
|
+
a.FootnoteRef, span.FootnoteRef {
|
|
133
|
+
vertical-align: super; }
|
|
134
|
+
|
|
131
135
|
.addition {
|
|
132
136
|
color: blue; }
|
|
133
137
|
|
|
@@ -1167,6 +1167,46 @@
|
|
|
1167
1167
|
</xsl:if>
|
|
1168
1168
|
</xsl:template>
|
|
1169
1169
|
|
|
1170
|
+
<xsl:template match="*[local-name() = 'span'][@class = 'surname' or @class = 'givenname']" mode="update_xml_step1" priority="2">
|
|
1171
|
+
<xsl:copy>
|
|
1172
|
+
<xsl:apply-templates select="@* | node()" mode="update_xml_step1"/>
|
|
1173
|
+
</xsl:copy>
|
|
1174
|
+
</xsl:template>
|
|
1175
|
+
|
|
1176
|
+
<xsl:template match="jis:clause[@type = 'contributors']//jis:table//jis:span[@class = 'surname']/text()[string-length() < 3]" priority="2">
|
|
1177
|
+
<xsl:choose>
|
|
1178
|
+
<xsl:when test="string-length() = 1">
|
|
1179
|
+
<xsl:value-of select="concat(.,' ')"/>
|
|
1180
|
+
</xsl:when>
|
|
1181
|
+
<xsl:when test="string-length() = 2">
|
|
1182
|
+
<xsl:value-of select="concat(substring(.,1,1), ' ', substring(., 2))"/>
|
|
1183
|
+
</xsl:when>
|
|
1184
|
+
</xsl:choose>
|
|
1185
|
+
<xsl:if test="../following-sibling::node()[1][self::jis:span and @class = 'surname']"> <!-- if no space between surname and given name -->
|
|
1186
|
+
<xsl:text> </xsl:text>
|
|
1187
|
+
</xsl:if>
|
|
1188
|
+
</xsl:template>
|
|
1189
|
+
|
|
1190
|
+
<xsl:template match="jis:clause[@type = 'contributors']//jis:table//jis:span[@class = 'givenname']/text()[string-length() < 3]" priority="2">
|
|
1191
|
+
<xsl:choose>
|
|
1192
|
+
<xsl:when test="string-length() = 1">
|
|
1193
|
+
<xsl:value-of select="concat(' ', .)"/>
|
|
1194
|
+
</xsl:when>
|
|
1195
|
+
<xsl:when test="string-length() = 2">
|
|
1196
|
+
<xsl:value-of select="concat(substring(.,1,1), ' ', substring(., 2))"/>
|
|
1197
|
+
</xsl:when>
|
|
1198
|
+
<xsl:otherwise>
|
|
1199
|
+
<xsl:value-of select="."/>
|
|
1200
|
+
</xsl:otherwise>
|
|
1201
|
+
</xsl:choose>
|
|
1202
|
+
</xsl:template>
|
|
1203
|
+
|
|
1204
|
+
<!-- space between surname and givenname replace by 'ideographic space' -->
|
|
1205
|
+
<!-- and following-sibling::node()[1][self::jis:span and @class = 'givenname'] -->
|
|
1206
|
+
<xsl:template match="jis:clause[@type = 'contributors']//jis:table//node()[preceding-sibling::node()[1][self::jis:span and @class = 'surname']][. = ' ']" priority="2">
|
|
1207
|
+
<xsl:text> </xsl:text>
|
|
1208
|
+
</xsl:template>
|
|
1209
|
+
|
|
1170
1210
|
<xsl:template name="makePagedXML">
|
|
1171
1211
|
<xsl:param name="structured_xml"/>
|
|
1172
1212
|
<xsl:choose>
|
|
@@ -1571,19 +1611,32 @@
|
|
|
1571
1611
|
<xsl:variable name="titles_">
|
|
1572
1612
|
|
|
1573
1613
|
<!-- These titles of Table of contents renders different than determined in localized-strings -->
|
|
1574
|
-
<title-toc lang="en">
|
|
1575
|
-
|
|
1576
|
-
|
|
1577
|
-
|
|
1614
|
+
<!-- <title-toc lang="en">
|
|
1615
|
+
<xsl:if test="$namespace = 'csd' or $namespace = 'ieee' or $namespace = 'iho' or $namespace = 'mpfd' or $namespace = 'ogc' or $namespace = 'unece-rec'">
|
|
1616
|
+
<xsl:text>Contents</xsl:text>
|
|
1617
|
+
</xsl:if>
|
|
1618
|
+
<xsl:if test="$namespace = 'csa' or $namespace = 'm3d' or $namespace = 'nist-sp' or $namespace = 'ogc-white-paper'">
|
|
1619
|
+
<xsl:text>Table of Contents</xsl:text>
|
|
1620
|
+
</xsl:if>
|
|
1621
|
+
<xsl:if test="$namespace = 'gb'">
|
|
1622
|
+
<xsl:text>Table of contents</xsl:text>
|
|
1623
|
+
</xsl:if>
|
|
1624
|
+
</title-toc> -->
|
|
1625
|
+
<title-toc lang="en">Table of contents</title-toc>
|
|
1626
|
+
<!-- <title-toc lang="fr">
|
|
1578
1627
|
<xsl:text>Sommaire</xsl:text>
|
|
1579
|
-
</title-toc>
|
|
1580
|
-
<title-toc lang="zh">
|
|
1581
|
-
|
|
1628
|
+
</title-toc> -->
|
|
1629
|
+
<!-- <title-toc lang="zh">
|
|
1630
|
+
<xsl:choose>
|
|
1631
|
+
<xsl:when test="$namespace = 'gb'">
|
|
1632
|
+
<xsl:text>目次</xsl:text>
|
|
1633
|
+
</xsl:when>
|
|
1634
|
+
<xsl:otherwise>
|
|
1582
1635
|
<xsl:text>Contents</xsl:text>
|
|
1583
|
-
|
|
1584
|
-
|
|
1585
|
-
|
|
1586
|
-
<title-
|
|
1636
|
+
</xsl:otherwise>
|
|
1637
|
+
</xsl:choose>
|
|
1638
|
+
</title-toc> -->
|
|
1639
|
+
<title-toc lang="zh">目次</title-toc>
|
|
1587
1640
|
|
|
1588
1641
|
<title-part lang="en">
|
|
1589
1642
|
|
|
@@ -1599,20 +1652,6 @@
|
|
|
1599
1652
|
<title-subpart lang="en">Sub-part #</title-subpart>
|
|
1600
1653
|
<title-subpart lang="fr">Partie de sub #</title-subpart>
|
|
1601
1654
|
|
|
1602
|
-
<title-list-tables lang="en">List of Tables</title-list-tables>
|
|
1603
|
-
|
|
1604
|
-
<title-list-figures lang="en">List of Figures</title-list-figures>
|
|
1605
|
-
|
|
1606
|
-
<title-table-figures lang="en">Table of Figures</title-table-figures>
|
|
1607
|
-
|
|
1608
|
-
<title-list-recommendations lang="en">List of Recommendations</title-list-recommendations>
|
|
1609
|
-
|
|
1610
|
-
<title-summary lang="en">Summary</title-summary>
|
|
1611
|
-
|
|
1612
|
-
<title-continued lang="ru">(продолжение)</title-continued>
|
|
1613
|
-
<title-continued lang="en">(continued)</title-continued>
|
|
1614
|
-
<title-continued lang="fr">(continué)</title-continued>
|
|
1615
|
-
|
|
1616
1655
|
</xsl:variable>
|
|
1617
1656
|
<xsl:variable name="titles" select="xalan:nodeset($titles_)"/>
|
|
1618
1657
|
|
|
@@ -1620,8 +1659,8 @@
|
|
|
1620
1659
|
<xsl:variable name="toc_table_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'toc'][@type='table']/*[local-name() = 'title']"/>
|
|
1621
1660
|
<xsl:value-of select="$toc_table_title"/>
|
|
1622
1661
|
<xsl:if test="normalize-space($toc_table_title) = ''">
|
|
1623
|
-
<xsl:call-template name="
|
|
1624
|
-
<xsl:with-param name="
|
|
1662
|
+
<xsl:call-template name="getLocalizedString">
|
|
1663
|
+
<xsl:with-param name="key">toc_tables</xsl:with-param>
|
|
1625
1664
|
</xsl:call-template>
|
|
1626
1665
|
</xsl:if>
|
|
1627
1666
|
</xsl:variable>
|
|
@@ -1630,8 +1669,8 @@
|
|
|
1630
1669
|
<xsl:variable name="toc_figure_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'toc'][@type='figure']/*[local-name() = 'title']"/>
|
|
1631
1670
|
<xsl:value-of select="$toc_figure_title"/>
|
|
1632
1671
|
<xsl:if test="normalize-space($toc_figure_title) = ''">
|
|
1633
|
-
<xsl:call-template name="
|
|
1634
|
-
<xsl:with-param name="
|
|
1672
|
+
<xsl:call-template name="getLocalizedString">
|
|
1673
|
+
<xsl:with-param name="key">toc_figures</xsl:with-param>
|
|
1635
1674
|
</xsl:call-template>
|
|
1636
1675
|
</xsl:if>
|
|
1637
1676
|
</xsl:variable>
|
|
@@ -1640,8 +1679,8 @@
|
|
|
1640
1679
|
<xsl:variable name="toc_requirement_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'toc'][@type='requirement']/*[local-name() = 'title']"/>
|
|
1641
1680
|
<xsl:value-of select="$toc_requirement_title"/>
|
|
1642
1681
|
<xsl:if test="normalize-space($toc_requirement_title) = ''">
|
|
1643
|
-
<xsl:call-template name="
|
|
1644
|
-
<xsl:with-param name="
|
|
1682
|
+
<xsl:call-template name="getLocalizedString">
|
|
1683
|
+
<xsl:with-param name="key">toc_recommendations</xsl:with-param>
|
|
1645
1684
|
</xsl:call-template>
|
|
1646
1685
|
</xsl:if>
|
|
1647
1686
|
</xsl:variable>
|
|
@@ -2387,6 +2426,7 @@
|
|
|
2387
2426
|
</xsl:attribute-set>
|
|
2388
2427
|
|
|
2389
2428
|
<xsl:attribute-set name="figure-block-style">
|
|
2429
|
+
<xsl:attribute name="role">SKIP</xsl:attribute>
|
|
2390
2430
|
|
|
2391
2431
|
</xsl:attribute-set>
|
|
2392
2432
|
|
|
@@ -2395,6 +2435,7 @@
|
|
|
2395
2435
|
</xsl:attribute-set>
|
|
2396
2436
|
|
|
2397
2437
|
<xsl:attribute-set name="figure-name-style">
|
|
2438
|
+
<xsl:attribute name="role">Caption</xsl:attribute>
|
|
2398
2439
|
|
|
2399
2440
|
<xsl:attribute name="font-family">IPAexGothic</xsl:attribute>
|
|
2400
2441
|
<xsl:attribute name="text-align">center</xsl:attribute>
|
|
@@ -2444,6 +2485,7 @@
|
|
|
2444
2485
|
</xsl:template>
|
|
2445
2486
|
|
|
2446
2487
|
<xsl:attribute-set name="image-style">
|
|
2488
|
+
<xsl:attribute name="role">SKIP</xsl:attribute>
|
|
2447
2489
|
<xsl:attribute name="text-align">center</xsl:attribute>
|
|
2448
2490
|
|
|
2449
2491
|
</xsl:attribute-set>
|
|
@@ -2707,6 +2749,11 @@
|
|
|
2707
2749
|
|
|
2708
2750
|
</xsl:attribute-set> <!-- bibitem-non-normative-list-style -->
|
|
2709
2751
|
|
|
2752
|
+
<xsl:attribute-set name="bibitem-non-normative-list-item-style">
|
|
2753
|
+
<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
|
|
2754
|
+
|
|
2755
|
+
</xsl:attribute-set>
|
|
2756
|
+
|
|
2710
2757
|
<!-- bibitem in bibliography section (references/@normative="false"), list body -->
|
|
2711
2758
|
<xsl:attribute-set name="bibitem-normative-list-body-style">
|
|
2712
2759
|
|
|
@@ -3098,14 +3145,14 @@
|
|
|
3098
3145
|
<xsl:value-of select="$sep"/><xsl:value-of select="$zero_width_space"/>
|
|
3099
3146
|
</xsl:when>
|
|
3100
3147
|
<xsl:otherwise>
|
|
3101
|
-
<fo:inline keep-together.within-line="always"><xsl:apply-templates/></fo:inline>
|
|
3148
|
+
<fo:inline keep-together.within-line="always" role="SKIP"><xsl:apply-templates/></fo:inline>
|
|
3102
3149
|
</xsl:otherwise>
|
|
3103
3150
|
</xsl:choose>
|
|
3104
3151
|
</xsl:for-each>
|
|
3105
3152
|
</xsl:when>
|
|
3106
3153
|
|
|
3107
3154
|
<xsl:otherwise>
|
|
3108
|
-
<fo:inline keep-together.within-line="always"><xsl:apply-templates/></fo:inline>
|
|
3155
|
+
<fo:inline keep-together.within-line="always" role="SKIP"><xsl:apply-templates/></fo:inline>
|
|
3109
3156
|
</xsl:otherwise>
|
|
3110
3157
|
|
|
3111
3158
|
</xsl:choose>
|
|
@@ -3115,7 +3162,7 @@
|
|
|
3115
3162
|
<!-- Preface boilerplate sections processing -->
|
|
3116
3163
|
<!-- ================================= -->
|
|
3117
3164
|
<xsl:template match="*[local-name()='copyright-statement']">
|
|
3118
|
-
<fo:block xsl:use-attribute-sets="copyright-statement-style">
|
|
3165
|
+
<fo:block xsl:use-attribute-sets="copyright-statement-style" role="SKIP">
|
|
3119
3166
|
<xsl:apply-templates/>
|
|
3120
3167
|
</fo:block>
|
|
3121
3168
|
</xsl:template> <!-- copyright-statement -->
|
|
@@ -3285,7 +3332,7 @@
|
|
|
3285
3332
|
</xsl:choose>
|
|
3286
3333
|
</xsl:variable>
|
|
3287
3334
|
|
|
3288
|
-
<fo:block-container xsl:use-attribute-sets="table-container-style">
|
|
3335
|
+
<fo:block-container xsl:use-attribute-sets="table-container-style" role="SKIP">
|
|
3289
3336
|
|
|
3290
3337
|
<xsl:call-template name="refine_table-container-style">
|
|
3291
3338
|
<xsl:with-param name="margin-side" select="$margin-side"/>
|
|
@@ -4300,7 +4347,7 @@
|
|
|
4300
4347
|
</xsl:choose>
|
|
4301
4348
|
</xsl:variable>
|
|
4302
4349
|
<xsl:variable name="footnote_inline">
|
|
4303
|
-
<fo:inline>
|
|
4350
|
+
<fo:inline role="Reference">
|
|
4304
4351
|
|
|
4305
4352
|
<xsl:variable name="fn_styles">
|
|
4306
4353
|
<xsl:choose>
|
|
@@ -4323,7 +4370,7 @@
|
|
|
4323
4370
|
|
|
4324
4371
|
<xsl:call-template name="insert_basic_link">
|
|
4325
4372
|
<xsl:with-param name="element">
|
|
4326
|
-
<fo:basic-link internal-destination="{$ref_id}" fox:alt-text="footnote {$current_fn_number}">
|
|
4373
|
+
<fo:basic-link internal-destination="{$ref_id}" fox:alt-text="footnote {$current_fn_number}" role="Lbl">
|
|
4327
4374
|
<xsl:copy-of select="$current_fn_number_text"/>
|
|
4328
4375
|
</fo:basic-link>
|
|
4329
4376
|
</xsl:with-param>
|
|
@@ -4336,17 +4383,17 @@
|
|
|
4336
4383
|
<xsl:copy-of select="$footnote_inline"/>
|
|
4337
4384
|
</xsl:when>
|
|
4338
4385
|
<xsl:when test="$p_fn//fn[@gen_id = $gen_id] or normalize-space(@skip_footnote_body) = 'false'">
|
|
4339
|
-
<fo:footnote xsl:use-attribute-sets="fn-style">
|
|
4386
|
+
<fo:footnote xsl:use-attribute-sets="fn-style" role="SKIP">
|
|
4340
4387
|
<xsl:copy-of select="$footnote_inline"/>
|
|
4341
|
-
<fo:footnote-body>
|
|
4388
|
+
<fo:footnote-body role="Note">
|
|
4342
4389
|
|
|
4343
|
-
<fo:block-container xsl:use-attribute-sets="fn-container-body-style">
|
|
4390
|
+
<fo:block-container xsl:use-attribute-sets="fn-container-body-style" role="SKIP">
|
|
4344
4391
|
|
|
4345
|
-
<fo:block xsl:use-attribute-sets="fn-body-style">
|
|
4392
|
+
<fo:block xsl:use-attribute-sets="fn-body-style" role="SKIP">
|
|
4346
4393
|
|
|
4347
4394
|
<xsl:call-template name="refine_fn-body-style"/>
|
|
4348
4395
|
|
|
4349
|
-
<fo:inline id="{$ref_id}" xsl:use-attribute-sets="fn-body-num-style">
|
|
4396
|
+
<fo:inline id="{$ref_id}" xsl:use-attribute-sets="fn-body-num-style" role="Lbl">
|
|
4350
4397
|
|
|
4351
4398
|
<xsl:call-template name="refine_fn-body-num-style"/>
|
|
4352
4399
|
|
|
@@ -4622,11 +4669,11 @@
|
|
|
4622
4669
|
</xsl:template>
|
|
4623
4670
|
|
|
4624
4671
|
<xsl:template match="*[local-name()='fn']/text()[normalize-space() != '']">
|
|
4625
|
-
<fo:inline><xsl:value-of select="."/></fo:inline>
|
|
4672
|
+
<fo:inline role="SKIP"><xsl:value-of select="."/></fo:inline>
|
|
4626
4673
|
</xsl:template>
|
|
4627
4674
|
|
|
4628
4675
|
<xsl:template match="*[local-name()='fn']//*[local-name()='p']">
|
|
4629
|
-
<fo:inline>
|
|
4676
|
+
<fo:inline role="P">
|
|
4630
4677
|
<xsl:apply-templates/>
|
|
4631
4678
|
</fo:inline>
|
|
4632
4679
|
</xsl:template>
|
|
@@ -4641,7 +4688,7 @@
|
|
|
4641
4688
|
<xsl:variable name="isAdded" select="@added"/>
|
|
4642
4689
|
<xsl:variable name="isDeleted" select="@deleted"/>
|
|
4643
4690
|
<!-- <dl><xsl:copy-of select="."/></dl> -->
|
|
4644
|
-
<fo:block-container xsl:use-attribute-sets="dl-block-style">
|
|
4691
|
+
<fo:block-container xsl:use-attribute-sets="dl-block-style" role="SKIP">
|
|
4645
4692
|
|
|
4646
4693
|
<xsl:call-template name="setBlockSpanAll"/>
|
|
4647
4694
|
|
|
@@ -4676,7 +4723,7 @@
|
|
|
4676
4723
|
<xsl:with-param name="isDeleted" select="$isDeleted"/>
|
|
4677
4724
|
</xsl:call-template>
|
|
4678
4725
|
|
|
4679
|
-
<fo:block-container margin-left="0mm">
|
|
4726
|
+
<fo:block-container margin-left="0mm" role="SKIP">
|
|
4680
4727
|
|
|
4681
4728
|
<xsl:attribute name="margin-right">0mm</xsl:attribute>
|
|
4682
4729
|
|
|
@@ -4741,7 +4788,7 @@
|
|
|
4741
4788
|
|
|
4742
4789
|
<!-- a few components -->
|
|
4743
4790
|
<xsl:if test="$onlyOneComponent = 'false'">
|
|
4744
|
-
<fo:block>
|
|
4791
|
+
<fo:block role="SKIP">
|
|
4745
4792
|
|
|
4746
4793
|
<xsl:call-template name="refine_multicomponent_style"/>
|
|
4747
4794
|
|
|
@@ -4749,7 +4796,7 @@
|
|
|
4749
4796
|
<xsl:attribute name="margin-top">0</xsl:attribute>
|
|
4750
4797
|
</xsl:if>
|
|
4751
4798
|
|
|
4752
|
-
<fo:block>
|
|
4799
|
+
<fo:block role="SKIP">
|
|
4753
4800
|
|
|
4754
4801
|
<xsl:call-template name="refine_multicomponent_block_style"/>
|
|
4755
4802
|
|
|
@@ -5346,6 +5393,9 @@
|
|
|
5346
5393
|
|
|
5347
5394
|
<xsl:attribute name="font-family">Times New Roman</xsl:attribute>
|
|
5348
5395
|
|
|
5396
|
+
<xsl:if test="ancestor::*['preferred']">
|
|
5397
|
+
<xsl:attribute name="role">SKIP</xsl:attribute>
|
|
5398
|
+
</xsl:if>
|
|
5349
5399
|
</xsl:template>
|
|
5350
5400
|
|
|
5351
5401
|
<xsl:template match="*[local-name()='padding']">
|
|
@@ -5390,7 +5440,7 @@
|
|
|
5390
5440
|
<xsl:variable name="regex_url_start">^(http://|https://|www\.)?(.*)</xsl:variable>
|
|
5391
5441
|
<xsl:template match="*[local-name()='tt']/text()" priority="2">
|
|
5392
5442
|
<xsl:choose>
|
|
5393
|
-
<xsl:when test="java:replaceAll(java:java.lang.String.new(.),
|
|
5443
|
+
<xsl:when test="java:replaceAll(java:java.lang.String.new(.), $regex_url_start, '$2') != ''">
|
|
5394
5444
|
<!-- url -->
|
|
5395
5445
|
<xsl:call-template name="add-zero-spaces-link-java"/>
|
|
5396
5446
|
</xsl:when>
|
|
@@ -5856,10 +5906,13 @@
|
|
|
5856
5906
|
</xsl:choose>
|
|
5857
5907
|
</xsl:variable>
|
|
5858
5908
|
|
|
5909
|
+
<!-- replace sequence #x200B to one ​ -->
|
|
5910
|
+
<xsl:variable name="text10" select="java:replaceAll(java:java.lang.String.new($text9), '\u200b{2,}', '')"/>
|
|
5911
|
+
|
|
5859
5912
|
<!-- replace sequence #x200B and space TO space -->
|
|
5860
|
-
<xsl:variable name="
|
|
5913
|
+
<xsl:variable name="text11" select="java:replaceAll(java:java.lang.String.new($text10), '\u200b ', ' ')"/>
|
|
5861
5914
|
|
|
5862
|
-
<xsl:value-of select="$
|
|
5915
|
+
<xsl:value-of select="$text11"/>
|
|
5863
5916
|
</xsl:template>
|
|
5864
5917
|
|
|
5865
5918
|
<xsl:template name="add-zero-spaces-link-java">
|
|
@@ -5869,8 +5922,12 @@
|
|
|
5869
5922
|
<xsl:variable name="url_continue" select="java:replaceAll(java:java.lang.String.new($text), $regex_url_start, '$2')"/>
|
|
5870
5923
|
<!-- add zero-width space (#x200B) after characters: dash, dot, colon, equal, underscore, em dash, thin space, comma, slash, @ -->
|
|
5871
5924
|
<xsl:variable name="url" select="java:replaceAll(java:java.lang.String.new($url_continue),'(-|\.|:|=|_|—| |,|/|@)','$1')"/>
|
|
5925
|
+
|
|
5926
|
+
<!-- replace sequence #x200B to one ​ -->
|
|
5927
|
+
<xsl:variable name="url2" select="java:replaceAll(java:java.lang.String.new($url), '\u200b{2,}', '')"/>
|
|
5928
|
+
|
|
5872
5929
|
<!-- remove zero-width space at the end -->
|
|
5873
|
-
<xsl:value-of select="java:replaceAll(java:java.lang.String.new($
|
|
5930
|
+
<xsl:value-of select="java:replaceAll(java:java.lang.String.new($url2), '$', '')"/>
|
|
5874
5931
|
</xsl:template>
|
|
5875
5932
|
|
|
5876
5933
|
<!-- add zero space after dash character (for table's entries) -->
|
|
@@ -6281,6 +6338,18 @@
|
|
|
6281
6338
|
</xsl:copy>
|
|
6282
6339
|
</xsl:template>
|
|
6283
6340
|
|
|
6341
|
+
<xsl:variable name="font_main_root_style">
|
|
6342
|
+
<root-style xsl:use-attribute-sets="root-style">
|
|
6343
|
+
</root-style>
|
|
6344
|
+
</xsl:variable>
|
|
6345
|
+
<xsl:variable name="font_main_root_style_font_family" select="xalan:nodeset($font_main_root_style)/root-style/@font-family"/>
|
|
6346
|
+
<xsl:variable name="font_main">
|
|
6347
|
+
<xsl:choose>
|
|
6348
|
+
<xsl:when test="contains($font_main_root_style_font_family, ',')"><xsl:value-of select="substring-before($font_main_root_style_font_family, ',')"/></xsl:when>
|
|
6349
|
+
<xsl:otherwise><xsl:value-of select="$font_main_root_style_font_family"/></xsl:otherwise>
|
|
6350
|
+
</xsl:choose>
|
|
6351
|
+
</xsl:variable>
|
|
6352
|
+
|
|
6284
6353
|
<xsl:template match="*[local-name()='th' or local-name()='td']" mode="simple-table-id">
|
|
6285
6354
|
<xsl:param name="id"/>
|
|
6286
6355
|
<xsl:copy>
|
|
@@ -6319,6 +6388,33 @@
|
|
|
6319
6388
|
|
|
6320
6389
|
<!-- td_text='<xsl:copy-of select="$td_text"/>' -->
|
|
6321
6390
|
|
|
6391
|
+
<xsl:variable name="words_with_width">
|
|
6392
|
+
<!-- calculate width for 'word' which contain text only (without formatting tags inside) -->
|
|
6393
|
+
<xsl:for-each select="xalan:nodeset($td_text)//*[local-name() = 'word'][normalize-space() != ''][not(*)]">
|
|
6394
|
+
<xsl:copy>
|
|
6395
|
+
<xsl:copy-of select="@*"/>
|
|
6396
|
+
<xsl:attribute name="width">
|
|
6397
|
+
<xsl:value-of select="java:org.metanorma.fop.Util.getStringWidth(., $font_main)"/> <!-- Example: 'Times New Roman' -->
|
|
6398
|
+
</xsl:attribute>
|
|
6399
|
+
<xsl:copy-of select="node()"/>
|
|
6400
|
+
</xsl:copy>
|
|
6401
|
+
</xsl:for-each>
|
|
6402
|
+
</xsl:variable>
|
|
6403
|
+
|
|
6404
|
+
<xsl:variable name="words_with_width_sorted">
|
|
6405
|
+
<xsl:for-each select="xalan:nodeset($words_with_width)//*[local-name() = 'word']">
|
|
6406
|
+
<xsl:sort select="@width" data-type="number" order="descending"/>
|
|
6407
|
+
<!-- select word maximal width only -->
|
|
6408
|
+
<xsl:if test="position() = 1">
|
|
6409
|
+
<xsl:copy-of select="."/>
|
|
6410
|
+
</xsl:if>
|
|
6411
|
+
</xsl:for-each>
|
|
6412
|
+
<!-- add 'word' with formatting tags inside -->
|
|
6413
|
+
<xsl:for-each select="xalan:nodeset($td_text)//*[local-name() = 'word'][normalize-space() != ''][*]">
|
|
6414
|
+
<xsl:copy-of select="."/>
|
|
6415
|
+
</xsl:for-each>
|
|
6416
|
+
</xsl:variable>
|
|
6417
|
+
|
|
6322
6418
|
<xsl:variable name="words">
|
|
6323
6419
|
<xsl:for-each select=".//*[local-name() = 'image' or local-name() = 'stem']">
|
|
6324
6420
|
<word>
|
|
@@ -6326,9 +6422,12 @@
|
|
|
6326
6422
|
</word>
|
|
6327
6423
|
</xsl:for-each>
|
|
6328
6424
|
|
|
6329
|
-
<xsl:for-each select="xalan:nodeset($
|
|
6425
|
+
<xsl:for-each select="xalan:nodeset($words_with_width_sorted)//*[local-name() = 'word'][normalize-space() != '']">
|
|
6330
6426
|
<xsl:copy-of select="."/>
|
|
6331
6427
|
</xsl:for-each>
|
|
6428
|
+
<!-- <xsl:for-each select="xalan:nodeset($td_text)//*[local-name() = 'word'][normalize-space() != '']">
|
|
6429
|
+
<xsl:copy-of select="."/>
|
|
6430
|
+
</xsl:for-each> -->
|
|
6332
6431
|
|
|
6333
6432
|
</xsl:variable>
|
|
6334
6433
|
|
|
@@ -6789,10 +6888,10 @@
|
|
|
6789
6888
|
<xsl:copy>
|
|
6790
6889
|
<xsl:apply-templates select="@*" mode="mathml"/>
|
|
6791
6890
|
<xsl:if test="not(@lspace)">
|
|
6792
|
-
<xsl:attribute name="lspace">0.
|
|
6891
|
+
<xsl:attribute name="lspace">0.2em</xsl:attribute>
|
|
6793
6892
|
</xsl:if>
|
|
6794
|
-
<xsl:if test="not(@rspace)">
|
|
6795
|
-
<xsl:attribute name="rspace">0.
|
|
6893
|
+
<xsl:if test="not(@rspace) and not(following-sibling::*[1][self::mathml:mo and normalize-space(text()) = '|'])">
|
|
6894
|
+
<xsl:attribute name="rspace">0.2em</xsl:attribute>
|
|
6796
6895
|
</xsl:if>
|
|
6797
6896
|
<xsl:apply-templates mode="mathml"/>
|
|
6798
6897
|
</xsl:copy>
|
|
@@ -6809,6 +6908,27 @@
|
|
|
6809
6908
|
</xsl:copy>
|
|
6810
6909
|
</xsl:template>
|
|
6811
6910
|
|
|
6911
|
+
<!-- increase space before '(' -->
|
|
6912
|
+
<xsl:template match="mathml:mo[normalize-space(text()) = '(']" mode="mathml">
|
|
6913
|
+
<xsl:copy>
|
|
6914
|
+
<xsl:apply-templates select="@*" mode="mathml"/>
|
|
6915
|
+
<xsl:if test="(preceding-sibling::* and not(preceding-sibling::*[1][self::mathml:mo])) or (../preceding-sibling::* and not(../preceding-sibling::*[1][self::mathml:mo]))">
|
|
6916
|
+
<xsl:if test="not(@lspace)">
|
|
6917
|
+
<xsl:attribute name="lspace">0.4em</xsl:attribute>
|
|
6918
|
+
<xsl:choose>
|
|
6919
|
+
<xsl:when test="preceding-sibling::*[1][self::mathml:mi or self::mathml:mstyle]">
|
|
6920
|
+
<xsl:attribute name="lspace">0.2em</xsl:attribute>
|
|
6921
|
+
</xsl:when>
|
|
6922
|
+
<xsl:when test="../preceding-sibling::*[1][self::mathml:mi or self::mathml:mstyle]">
|
|
6923
|
+
<xsl:attribute name="lspace">0.2em</xsl:attribute>
|
|
6924
|
+
</xsl:when>
|
|
6925
|
+
</xsl:choose>
|
|
6926
|
+
</xsl:if>
|
|
6927
|
+
</xsl:if>
|
|
6928
|
+
<xsl:apply-templates mode="mathml"/>
|
|
6929
|
+
</xsl:copy>
|
|
6930
|
+
</xsl:template>
|
|
6931
|
+
|
|
6812
6932
|
<!-- Examples:
|
|
6813
6933
|
<stem type="AsciiMath">x = 1</stem>
|
|
6814
6934
|
<stem type="AsciiMath"><asciimath>x = 1</asciimath></stem>
|
|
@@ -6968,7 +7088,7 @@
|
|
|
6968
7088
|
<!-- formula -->
|
|
6969
7089
|
<!-- ====== -->
|
|
6970
7090
|
<xsl:template match="*[local-name() = 'formula']" name="formula">
|
|
6971
|
-
<fo:block-container margin-left="0mm">
|
|
7091
|
+
<fo:block-container margin-left="0mm" role="SKIP">
|
|
6972
7092
|
<xsl:if test="parent::*[local-name() = 'note']">
|
|
6973
7093
|
<xsl:attribute name="margin-left">
|
|
6974
7094
|
<xsl:choose>
|
|
@@ -6978,7 +7098,7 @@
|
|
|
6978
7098
|
</xsl:attribute>
|
|
6979
7099
|
|
|
6980
7100
|
</xsl:if>
|
|
6981
|
-
<fo:block-container margin-left="0mm">
|
|
7101
|
+
<fo:block-container margin-left="0mm" role="SKIP">
|
|
6982
7102
|
<fo:block id="{@id}">
|
|
6983
7103
|
<xsl:apply-templates select="node()[not(local-name() = 'name')]"/> <!-- formula's number will be process in 'stem' template -->
|
|
6984
7104
|
</fo:block>
|
|
@@ -7058,13 +7178,13 @@
|
|
|
7058
7178
|
|
|
7059
7179
|
<xsl:template match="*[local-name() = 'note']" name="note">
|
|
7060
7180
|
|
|
7061
|
-
<fo:block-container id="{@id}" xsl:use-attribute-sets="note-style">
|
|
7181
|
+
<fo:block-container id="{@id}" xsl:use-attribute-sets="note-style" role="SKIP">
|
|
7062
7182
|
|
|
7063
7183
|
<xsl:call-template name="setBlockSpanAll"/>
|
|
7064
7184
|
|
|
7065
7185
|
<xsl:call-template name="refine_note-style"/>
|
|
7066
7186
|
|
|
7067
|
-
<fo:block-container margin-left="0mm" margin-right="0mm">
|
|
7187
|
+
<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
|
|
7068
7188
|
|
|
7069
7189
|
<fo:list-block>
|
|
7070
7190
|
<xsl:attribute name="provisional-distance-between-starts">
|
|
@@ -7102,12 +7222,12 @@
|
|
|
7102
7222
|
<xsl:variable name="num"><xsl:number/></xsl:variable>
|
|
7103
7223
|
<xsl:choose>
|
|
7104
7224
|
<xsl:when test="$num = 1"> <!-- display first NOTE's paragraph in the same line with label NOTE -->
|
|
7105
|
-
<fo:inline xsl:use-attribute-sets="note-p-style">
|
|
7225
|
+
<fo:inline xsl:use-attribute-sets="note-p-style" role="SKIP">
|
|
7106
7226
|
<xsl:apply-templates/>
|
|
7107
7227
|
</fo:inline>
|
|
7108
7228
|
</xsl:when>
|
|
7109
7229
|
<xsl:otherwise>
|
|
7110
|
-
<fo:block xsl:use-attribute-sets="note-p-style">
|
|
7230
|
+
<fo:block xsl:use-attribute-sets="note-p-style" role="SKIP">
|
|
7111
7231
|
<xsl:apply-templates/>
|
|
7112
7232
|
</fo:block>
|
|
7113
7233
|
</xsl:otherwise>
|
|
@@ -7221,12 +7341,13 @@
|
|
|
7221
7341
|
|
|
7222
7342
|
<xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']">
|
|
7223
7343
|
<xsl:if test="normalize-space() != ''">
|
|
7224
|
-
<xsl:variable name="level">
|
|
7344
|
+
<!-- <xsl:variable name="level">
|
|
7225
7345
|
<xsl:call-template name="getLevelTermName"/>
|
|
7226
7346
|
</xsl:variable>
|
|
7227
7347
|
<fo:inline role="H{$level}">
|
|
7228
|
-
<xsl:apply-templates/>
|
|
7229
|
-
</fo:inline>
|
|
7348
|
+
<xsl:apply-templates />
|
|
7349
|
+
</fo:inline> -->
|
|
7350
|
+
<xsl:apply-templates/>
|
|
7230
7351
|
</xsl:if>
|
|
7231
7352
|
</xsl:template>
|
|
7232
7353
|
<!-- ====== -->
|
|
@@ -7250,7 +7371,7 @@
|
|
|
7250
7371
|
<!-- Example: Dimensions in millimeters -->
|
|
7251
7372
|
<xsl:apply-templates select="*[local-name() = 'note'][@type = 'units']"/>
|
|
7252
7373
|
|
|
7253
|
-
<fo:block xsl:use-attribute-sets="figure-style">
|
|
7374
|
+
<fo:block xsl:use-attribute-sets="figure-style" role="SKIP">
|
|
7254
7375
|
<xsl:apply-templates select="node()[not(local-name() = 'name') and not(local-name() = 'note' and @type = 'units')]"/>
|
|
7255
7376
|
</fo:block>
|
|
7256
7377
|
<xsl:for-each select="*[local-name() = 'note'][not(@type = 'units')]">
|
|
@@ -8383,7 +8504,7 @@
|
|
|
8383
8504
|
</xsl:when>
|
|
8384
8505
|
|
|
8385
8506
|
<xsl:otherwise>
|
|
8386
|
-
<fo:block-container xsl:use-attribute-sets="sourcecode-container-style">
|
|
8507
|
+
<fo:block-container xsl:use-attribute-sets="sourcecode-container-style" role="SKIP">
|
|
8387
8508
|
|
|
8388
8509
|
<xsl:if test="not(ancestor::*[local-name() = 'li']) or ancestor::*[local-name() = 'example']">
|
|
8389
8510
|
<xsl:attribute name="margin-left">0mm</xsl:attribute>
|
|
@@ -8404,7 +8525,7 @@
|
|
|
8404
8525
|
</xsl:attribute>
|
|
8405
8526
|
|
|
8406
8527
|
</xsl:if>
|
|
8407
|
-
<fo:block-container margin-left="0mm">
|
|
8528
|
+
<fo:block-container margin-left="0mm" role="SKIP">
|
|
8408
8529
|
|
|
8409
8530
|
<fo:block xsl:use-attribute-sets="sourcecode-style">
|
|
8410
8531
|
|
|
@@ -8950,11 +9071,11 @@
|
|
|
8950
9071
|
<!-- requirement, recommendation, permission table -->
|
|
8951
9072
|
<!-- ========== -->
|
|
8952
9073
|
<xsl:template match="*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']">
|
|
8953
|
-
<fo:block-container margin-left="0mm" margin-right="0mm" margin-bottom="12pt">
|
|
9074
|
+
<fo:block-container margin-left="0mm" margin-right="0mm" margin-bottom="12pt" role="SKIP">
|
|
8954
9075
|
<xsl:if test="ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']">
|
|
8955
9076
|
<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
|
|
8956
9077
|
</xsl:if>
|
|
8957
|
-
<fo:block-container margin-left="0mm" margin-right="0mm">
|
|
9078
|
+
<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
|
|
8958
9079
|
<fo:table id="{@id}" table-layout="fixed" width="100%"> <!-- border="1pt solid black" -->
|
|
8959
9080
|
<xsl:if test="ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']">
|
|
8960
9081
|
<!-- <xsl:attribute name="border">0.5pt solid black</xsl:attribute> -->
|
|
@@ -9116,7 +9237,7 @@
|
|
|
9116
9237
|
-->
|
|
9117
9238
|
<xsl:template match="*[local-name() = 'example']">
|
|
9118
9239
|
|
|
9119
|
-
<fo:block-container id="{@id}" xsl:use-attribute-sets="example-style">
|
|
9240
|
+
<fo:block-container id="{@id}" xsl:use-attribute-sets="example-style" role="SKIP">
|
|
9120
9241
|
|
|
9121
9242
|
<xsl:call-template name="setBlockSpanAll"/>
|
|
9122
9243
|
|
|
@@ -9127,7 +9248,7 @@
|
|
|
9127
9248
|
list
|
|
9128
9249
|
</xsl:variable>
|
|
9129
9250
|
|
|
9130
|
-
<fo:block-container margin-left="0mm">
|
|
9251
|
+
<fo:block-container margin-left="0mm" role="SKIP">
|
|
9131
9252
|
|
|
9132
9253
|
<xsl:choose>
|
|
9133
9254
|
|
|
@@ -9140,8 +9261,8 @@
|
|
|
9140
9261
|
</xsl:apply-templates>
|
|
9141
9262
|
</fo:block>
|
|
9142
9263
|
|
|
9143
|
-
<fo:block-container xsl:use-attribute-sets="example-body-style">
|
|
9144
|
-
<fo:block-container margin-left="0mm" margin-right="0mm">
|
|
9264
|
+
<fo:block-container xsl:use-attribute-sets="example-body-style" role="SKIP">
|
|
9265
|
+
<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
|
|
9145
9266
|
<xsl:apply-templates select="node()[not(local-name() = 'name')]">
|
|
9146
9267
|
<xsl:with-param name="fo_element" select="$fo_element"/>
|
|
9147
9268
|
</xsl:apply-templates>
|
|
@@ -9194,8 +9315,8 @@
|
|
|
9194
9315
|
|
|
9195
9316
|
<xsl:if test="*[not(local-name() = 'name')][position() > 1]">
|
|
9196
9317
|
<!-- display further elements in blocks -->
|
|
9197
|
-
<fo:block-container xsl:use-attribute-sets="example-body-style">
|
|
9198
|
-
<fo:block-container margin-left="0mm" margin-right="0mm">
|
|
9318
|
+
<fo:block-container xsl:use-attribute-sets="example-body-style" role="SKIP">
|
|
9319
|
+
<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
|
|
9199
9320
|
<xsl:apply-templates select="*[not(local-name() = 'name')][position() > 1]">
|
|
9200
9321
|
<xsl:with-param name="fo_element" select="'block'"/>
|
|
9201
9322
|
</xsl:apply-templates>
|
|
@@ -9248,7 +9369,7 @@
|
|
|
9248
9369
|
</xsl:variable>
|
|
9249
9370
|
<xsl:choose>
|
|
9250
9371
|
<xsl:when test="starts-with(normalize-space($element), 'block')">
|
|
9251
|
-
<fo:block-container>
|
|
9372
|
+
<fo:block-container role="SKIP">
|
|
9252
9373
|
<xsl:if test="ancestor::*[local-name() = 'li'] and contains(normalize-space($fo_element), 'block')">
|
|
9253
9374
|
<xsl:attribute name="margin-left">0mm</xsl:attribute>
|
|
9254
9375
|
<xsl:attribute name="margin-right">0mm</xsl:attribute>
|
|
@@ -9389,7 +9510,7 @@
|
|
|
9389
9510
|
<!-- author -->
|
|
9390
9511
|
<!-- ====== -->
|
|
9391
9512
|
<xsl:template match="*[local-name() = 'quote']">
|
|
9392
|
-
<fo:block-container margin-left="0mm">
|
|
9513
|
+
<fo:block-container margin-left="0mm" role="SKIP">
|
|
9393
9514
|
|
|
9394
9515
|
<xsl:call-template name="setBlockSpanAll"/>
|
|
9395
9516
|
|
|
@@ -9399,12 +9520,12 @@
|
|
|
9399
9520
|
</xsl:if>
|
|
9400
9521
|
</xsl:if>
|
|
9401
9522
|
|
|
9402
|
-
<fo:block-container margin-left="0mm">
|
|
9403
|
-
<fo:block-container xsl:use-attribute-sets="quote-style">
|
|
9523
|
+
<fo:block-container margin-left="0mm" role="SKIP">
|
|
9524
|
+
<fo:block-container xsl:use-attribute-sets="quote-style" role="SKIP">
|
|
9404
9525
|
|
|
9405
9526
|
<xsl:call-template name="refine_quote-style"/>
|
|
9406
9527
|
|
|
9407
|
-
<fo:block-container margin-left="0mm" margin-right="0mm">
|
|
9528
|
+
<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
|
|
9408
9529
|
<fo:block role="BlockQuote">
|
|
9409
9530
|
<xsl:apply-templates select="./node()[not(local-name() = 'author') and not(local-name() = 'source')]"/> <!-- process all nested nodes, except author and source -->
|
|
9410
9531
|
</fo:block>
|
|
@@ -9560,10 +9681,10 @@
|
|
|
9560
9681
|
|
|
9561
9682
|
<xsl:choose>
|
|
9562
9683
|
<xsl:when test="$lang = 'zh'">
|
|
9563
|
-
<fo:inline><xsl:value-of select="$tab_zh"/></fo:inline>
|
|
9684
|
+
<fo:inline role="SKIP"><xsl:value-of select="$tab_zh"/></fo:inline>
|
|
9564
9685
|
</xsl:when>
|
|
9565
9686
|
<xsl:when test="../../@inline-header = 'true'">
|
|
9566
|
-
<fo:inline font-size="90%">
|
|
9687
|
+
<fo:inline font-size="90%" role="SKIP">
|
|
9567
9688
|
<xsl:call-template name="insertNonBreakSpaces">
|
|
9568
9689
|
<xsl:with-param name="count" select="$padding-right"/>
|
|
9569
9690
|
</xsl:call-template>
|
|
@@ -9571,7 +9692,7 @@
|
|
|
9571
9692
|
</xsl:when>
|
|
9572
9693
|
<xsl:otherwise>
|
|
9573
9694
|
<xsl:variable name="direction"><xsl:if test="$lang = 'ar'"><xsl:value-of select="$RLM"/></xsl:if></xsl:variable>
|
|
9574
|
-
<fo:inline padding-right="{$padding-right}mm"><xsl:value-of select="$direction"/></fo:inline>
|
|
9695
|
+
<fo:inline padding-right="{$padding-right}mm" role="SKIP"><xsl:value-of select="$direction"/></fo:inline>
|
|
9575
9696
|
</xsl:otherwise>
|
|
9576
9697
|
</xsl:choose>
|
|
9577
9698
|
|
|
@@ -9601,12 +9722,12 @@
|
|
|
9601
9722
|
<fo:block font-size="{normalize-space($font-size)}" role="H{$levelTerm}" xsl:use-attribute-sets="preferred-block-style">
|
|
9602
9723
|
|
|
9603
9724
|
<xsl:if test="parent::*[local-name() = 'term'] and not(preceding-sibling::*[local-name() = 'preferred'])"> <!-- if first preffered in term, then display term's name -->
|
|
9604
|
-
<fo:block xsl:use-attribute-sets="term-name-style">
|
|
9725
|
+
<fo:block xsl:use-attribute-sets="term-name-style" role="SKIP">
|
|
9605
9726
|
<xsl:apply-templates select="ancestor::*[local-name() = 'term'][1]/*[local-name() = 'name']"/>
|
|
9606
9727
|
</fo:block>
|
|
9607
9728
|
</xsl:if>
|
|
9608
9729
|
|
|
9609
|
-
<fo:block xsl:use-attribute-sets="preferred-term-style">
|
|
9730
|
+
<fo:block xsl:use-attribute-sets="preferred-term-style" role="SKIP">
|
|
9610
9731
|
<xsl:call-template name="setStyle_preferred"/>
|
|
9611
9732
|
<xsl:apply-templates/>
|
|
9612
9733
|
</fo:block>
|
|
@@ -9647,7 +9768,7 @@
|
|
|
9647
9768
|
<!-- definition -->
|
|
9648
9769
|
<!-- ========== -->
|
|
9649
9770
|
<xsl:template match="*[local-name() = 'definition']">
|
|
9650
|
-
<fo:block xsl:use-attribute-sets="definition-style">
|
|
9771
|
+
<fo:block xsl:use-attribute-sets="definition-style" role="SKIP">
|
|
9651
9772
|
<xsl:apply-templates/>
|
|
9652
9773
|
</fo:block>
|
|
9653
9774
|
</xsl:template>
|
|
@@ -9690,6 +9811,10 @@
|
|
|
9690
9811
|
|
|
9691
9812
|
<xsl:template match="*[local-name() = 'clause']">
|
|
9692
9813
|
<fo:block>
|
|
9814
|
+
<xsl:if test="parent::*[local-name() = 'copyright-statement']">
|
|
9815
|
+
<xsl:attribute name="role">SKIP</xsl:attribute>
|
|
9816
|
+
</xsl:if>
|
|
9817
|
+
|
|
9693
9818
|
<xsl:call-template name="setId"/>
|
|
9694
9819
|
|
|
9695
9820
|
<xsl:call-template name="setBlockSpanAll"/>
|
|
@@ -9927,7 +10052,7 @@
|
|
|
9927
10052
|
<xsl:template match="*[local-name() = 'ul'] | *[local-name() = 'ol']">
|
|
9928
10053
|
<xsl:choose>
|
|
9929
10054
|
<xsl:when test="parent::*[local-name() = 'note'] or parent::*[local-name() = 'termnote']">
|
|
9930
|
-
<fo:block-container>
|
|
10055
|
+
<fo:block-container role="SKIP">
|
|
9931
10056
|
<xsl:attribute name="margin-left">
|
|
9932
10057
|
<xsl:choose>
|
|
9933
10058
|
<xsl:when test="not(ancestor::*[local-name() = 'table'])"><xsl:value-of select="$note-body-indent"/></xsl:when>
|
|
@@ -9937,7 +10062,7 @@
|
|
|
9937
10062
|
|
|
9938
10063
|
<xsl:call-template name="refine_list_container_style"/>
|
|
9939
10064
|
|
|
9940
|
-
<fo:block-container margin-left="0mm">
|
|
10065
|
+
<fo:block-container margin-left="0mm" role="SKIP">
|
|
9941
10066
|
<fo:block>
|
|
9942
10067
|
<xsl:apply-templates select="." mode="list"/>
|
|
9943
10068
|
</fo:block>
|
|
@@ -9946,11 +10071,11 @@
|
|
|
9946
10071
|
</xsl:when>
|
|
9947
10072
|
<xsl:otherwise>
|
|
9948
10073
|
|
|
9949
|
-
<fo:block-container>
|
|
10074
|
+
<fo:block-container role="SKIP">
|
|
9950
10075
|
<xsl:if test="ancestor::jis:ol or ancestor::jis:ul">
|
|
9951
10076
|
<xsl:attribute name="margin-left">3.5mm</xsl:attribute>
|
|
9952
10077
|
</xsl:if>
|
|
9953
|
-
<fo:block-container margin-left="0mm">
|
|
10078
|
+
<fo:block-container margin-left="0mm" role="SKIP">
|
|
9954
10079
|
<fo:block>
|
|
9955
10080
|
<xsl:apply-templates select="." mode="list"/>
|
|
9956
10081
|
</fo:block>
|
|
@@ -10371,7 +10496,10 @@
|
|
|
10371
10496
|
<!-- Reference sections (Normative References and Bibliography) -->
|
|
10372
10497
|
<!-- ========================================================== -->
|
|
10373
10498
|
<xsl:template match="*[local-name() = 'references'][@hidden='true']" priority="3"/>
|
|
10374
|
-
<xsl:template match="*[local-name() = 'bibitem'][@hidden='true']" priority="3"
|
|
10499
|
+
<xsl:template match="*[local-name() = 'bibitem'][@hidden='true']" priority="3">
|
|
10500
|
+
<xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][local-name() = 'bibitem'] and 1 = 1)"/>
|
|
10501
|
+
|
|
10502
|
+
</xsl:template>
|
|
10375
10503
|
<!-- don't display bibitem with @id starts with '_hidden', that was introduced for references integrity -->
|
|
10376
10504
|
<xsl:template match="*[local-name() = 'bibitem'][starts-with(@id, 'hidden_bibitem_')]" priority="3"/>
|
|
10377
10505
|
|
|
@@ -10422,8 +10550,8 @@
|
|
|
10422
10550
|
<!-- Normative references -->
|
|
10423
10551
|
<xsl:template match="*[local-name() = 'references'][@normative='true']/*[local-name() = 'bibitem']" name="bibitem" priority="2">
|
|
10424
10552
|
|
|
10425
|
-
<fo:block-container margin-left="6mm">
|
|
10426
|
-
<fo:block-container margin-left="0mm">
|
|
10553
|
+
<fo:block-container margin-left="6mm" role="SKIP">
|
|
10554
|
+
<fo:block-container margin-left="0mm" role="SKIP">
|
|
10427
10555
|
<fo:block id="{@id}" xsl:use-attribute-sets="bibitem-normative-style">
|
|
10428
10556
|
<xsl:call-template name="processBibitem"/>
|
|
10429
10557
|
</fo:block>
|
|
@@ -10434,7 +10562,7 @@
|
|
|
10434
10562
|
|
|
10435
10563
|
<!-- Bibliography (non-normative references) -->
|
|
10436
10564
|
<xsl:template match="*[local-name() = 'references'][not(@normative='true')]/*[local-name() = 'bibitem']" name="bibitem_non_normative" priority="2">
|
|
10437
|
-
|
|
10565
|
+
<xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][local-name() = 'bibitem'] and 1 = 1)"/> <!-- current bibiitem is non-first -->
|
|
10438
10566
|
<!-- $namespace = 'csd' or $namespace = 'gb' or $namespace = 'iec' or $namespace = 'ieee' or $namespace = 'iso' or $namespace = 'jcgm' or $namespace = 'm3d' or
|
|
10439
10567
|
$namespace = 'mpfd' or $namespace = 'ogc' or $namespace = 'ogc-white-paper' -->
|
|
10440
10568
|
<!-- Example: [1] ISO 9:1995, Information and documentation – Transliteration of Cyrillic characters into Latin characters – Slavic and non-Slavic languages -->
|
|
@@ -10462,6 +10590,35 @@
|
|
|
10462
10590
|
|
|
10463
10591
|
</xsl:template> <!-- references[not(@normative='true')]/bibitem -->
|
|
10464
10592
|
|
|
10593
|
+
<xsl:template name="insertListItem_Bibitem">
|
|
10594
|
+
<xsl:choose>
|
|
10595
|
+
<xsl:when test="@hidden = 'true'"><!-- skip --></xsl:when>
|
|
10596
|
+
<xsl:otherwise>
|
|
10597
|
+
<fo:list-item id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-list-item-style">
|
|
10598
|
+
<fo:list-item-label end-indent="label-end()">
|
|
10599
|
+
<fo:block role="SKIP">
|
|
10600
|
+
<fo:inline role="SKIP">
|
|
10601
|
+
<xsl:apply-templates select="*[local-name() = 'biblio-tag']">
|
|
10602
|
+
<xsl:with-param name="biblio_tag_part">first</xsl:with-param>
|
|
10603
|
+
</xsl:apply-templates>
|
|
10604
|
+
</fo:inline>
|
|
10605
|
+
</fo:block>
|
|
10606
|
+
</fo:list-item-label>
|
|
10607
|
+
<fo:list-item-body start-indent="body-start()">
|
|
10608
|
+
<fo:block xsl:use-attribute-sets="bibitem-non-normative-list-body-style" role="SKIP">
|
|
10609
|
+
<xsl:call-template name="processBibitem">
|
|
10610
|
+
<xsl:with-param name="biblio_tag_part">last</xsl:with-param>
|
|
10611
|
+
</xsl:call-template>
|
|
10612
|
+
</fo:block>
|
|
10613
|
+
</fo:list-item-body>
|
|
10614
|
+
</fo:list-item>
|
|
10615
|
+
</xsl:otherwise>
|
|
10616
|
+
</xsl:choose>
|
|
10617
|
+
<xsl:apply-templates select="following-sibling::*[1][local-name() = 'bibitem']">
|
|
10618
|
+
<xsl:with-param name="skip">false</xsl:with-param>
|
|
10619
|
+
</xsl:apply-templates>
|
|
10620
|
+
</xsl:template>
|
|
10621
|
+
|
|
10465
10622
|
<xsl:template name="processBibitem">
|
|
10466
10623
|
<xsl:param name="biblio_tag_part">both</xsl:param>
|
|
10467
10624
|
|
|
@@ -10794,9 +10951,9 @@
|
|
|
10794
10951
|
|
|
10795
10952
|
<xsl:call-template name="setBlockSpanAll"/>
|
|
10796
10953
|
|
|
10797
|
-
<fo:block-container xsl:use-attribute-sets="admonition-container-style">
|
|
10954
|
+
<fo:block-container xsl:use-attribute-sets="admonition-container-style" role="SKIP">
|
|
10798
10955
|
|
|
10799
|
-
<fo:block-container margin-left="0mm" margin-right="0mm">
|
|
10956
|
+
<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
|
|
10800
10957
|
<fo:block>
|
|
10801
10958
|
<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
|
|
10802
10959
|
</fo:block>
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: metanorma-jis
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.0.
|
|
4
|
+
version: 0.0.10
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Ribose Inc.
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2023-
|
|
11
|
+
date: 2023-07-24 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: metanorma-iso
|