metanorma-cc 2.2.10 → 2.2.12
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/isodoc/cc/cc.standard.xsl +294 -93
- data/lib/metanorma/cc/boilerplate.adoc +34 -0
- data/lib/metanorma/cc/version.rb +1 -1
- data/metanorma.yml +1 -0
- metadata +3 -3
- data/lib/metanorma/cc/boilerplate.xml +0 -46
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 63bb488a52b4284eb51a916987018db4c9269604d866f60b5cd94ab51b9ae71f
|
4
|
+
data.tar.gz: d43eb8bfdd5ab07c1e1d461ecddfb09d4f3bf2b4d3bf97b47fdd23812aad9948
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 91ede49e29a574b32e39b1666bacc4b8135b5d465572f49e43c48f9f86d714c90d5b76ad568d182bae63c48490eb453d48e4a33059b57ed0e90a69062a709dae
|
7
|
+
data.tar.gz: b12b1abcd5bd61a562733f0f716172d21053ed3e4a6075900aa418e18ee2cc29116e58f0e7c105e5ca6113e9ab0f14ac3a9238092af8e80e17797c330635c4da
|
@@ -1507,6 +1507,7 @@
|
|
1507
1507
|
</xsl:attribute-set>
|
1508
1508
|
|
1509
1509
|
<xsl:attribute-set name="figure-block-style">
|
1510
|
+
<xsl:attribute name="role">SKIP</xsl:attribute>
|
1510
1511
|
|
1511
1512
|
<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
|
1512
1513
|
|
@@ -1517,6 +1518,7 @@
|
|
1517
1518
|
</xsl:attribute-set>
|
1518
1519
|
|
1519
1520
|
<xsl:attribute-set name="figure-name-style">
|
1521
|
+
<xsl:attribute name="role">Caption</xsl:attribute>
|
1520
1522
|
|
1521
1523
|
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
1522
1524
|
<xsl:attribute name="text-align">center</xsl:attribute>
|
@@ -1559,7 +1561,12 @@
|
|
1559
1561
|
</xsl:attribute-set> <!-- formula-stem-number-style -->
|
1560
1562
|
<!-- End Formula's styles -->
|
1561
1563
|
|
1564
|
+
<xsl:template name="refine_formula-stem-number-style">
|
1565
|
+
|
1566
|
+
</xsl:template>
|
1567
|
+
|
1562
1568
|
<xsl:attribute-set name="image-style">
|
1569
|
+
<xsl:attribute name="role">SKIP</xsl:attribute>
|
1563
1570
|
<xsl:attribute name="text-align">center</xsl:attribute>
|
1564
1571
|
|
1565
1572
|
</xsl:attribute-set>
|
@@ -1817,6 +1824,11 @@
|
|
1817
1824
|
|
1818
1825
|
</xsl:attribute-set> <!-- bibitem-non-normative-list-style -->
|
1819
1826
|
|
1827
|
+
<xsl:attribute-set name="bibitem-non-normative-list-item-style">
|
1828
|
+
<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
|
1829
|
+
|
1830
|
+
</xsl:attribute-set>
|
1831
|
+
|
1820
1832
|
<!-- bibitem in bibliography section (references/@normative="false"), list body -->
|
1821
1833
|
<xsl:attribute-set name="bibitem-normative-list-body-style">
|
1822
1834
|
|
@@ -2033,13 +2045,13 @@
|
|
2033
2045
|
|
2034
2046
|
<xsl:template name="processPrefaceSectionsDefault_Contents">
|
2035
2047
|
<xsl:variable name="nodes_preface_">
|
2036
|
-
<xsl:for-each select="/*/*[local-name()='preface']/*[not(local-name() = 'note' or local-name() = 'admonition')]">
|
2048
|
+
<xsl:for-each select="/*/*[local-name()='preface']/*[not(local-name() = 'note' or local-name() = 'admonition' or @type = 'toc')]">
|
2037
2049
|
<node id="{@id}"/>
|
2038
2050
|
</xsl:for-each>
|
2039
2051
|
</xsl:variable>
|
2040
2052
|
<xsl:variable name="nodes_preface" select="xalan:nodeset($nodes_preface_)"/>
|
2041
2053
|
|
2042
|
-
<xsl:for-each select="/*/*[local-name()='preface']/*[not(local-name() = 'note' or local-name() = 'admonition')]">
|
2054
|
+
<xsl:for-each select="/*/*[local-name()='preface']/*[not(local-name() = 'note' or local-name() = 'admonition' or @type = 'toc')]">
|
2043
2055
|
<xsl:sort select="@displayorder" data-type="number"/>
|
2044
2056
|
|
2045
2057
|
<!-- process Section's title -->
|
@@ -2073,12 +2085,12 @@
|
|
2073
2085
|
<xsl:apply-templates select="." mode="contents"/>
|
2074
2086
|
</xsl:for-each>
|
2075
2087
|
|
2076
|
-
<xsl:for-each select="/*/*[local-name()='annex']">
|
2088
|
+
<!-- <xsl:for-each select="/*/*[local-name()='annex']">
|
2077
2089
|
<xsl:sort select="@displayorder" data-type="number"/>
|
2078
2090
|
<xsl:apply-templates select="." mode="contents"/>
|
2079
|
-
</xsl:for-each>
|
2091
|
+
</xsl:for-each> -->
|
2080
2092
|
|
2081
|
-
<xsl:for-each select="/*/*[local-name()='bibliography']/*[not(@normative='true') and not(*[local-name()='references'][@normative='true'])][count(.//*[local-name() = 'bibitem'][not(@hidden) = 'true']) > 0] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]][count(.//*[local-name() = 'bibitem'][not(@hidden) = 'true']) > 0]">
|
2093
|
+
<xsl:for-each select="/*/*[local-name()='annex'] | /*/*[local-name()='bibliography']/*[not(@normative='true') and not(*[local-name()='references'][@normative='true'])][count(.//*[local-name() = 'bibitem'][not(@hidden) = 'true']) > 0] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]][count(.//*[local-name() = 'bibitem'][not(@hidden) = 'true']) > 0]">
|
2082
2094
|
<xsl:sort select="@displayorder" data-type="number"/>
|
2083
2095
|
<xsl:apply-templates select="." mode="contents"/>
|
2084
2096
|
</xsl:for-each>
|
@@ -2208,14 +2220,14 @@
|
|
2208
2220
|
<xsl:value-of select="$sep"/><xsl:value-of select="$zero_width_space"/>
|
2209
2221
|
</xsl:when>
|
2210
2222
|
<xsl:otherwise>
|
2211
|
-
<fo:inline keep-together.within-line="always"><xsl:apply-templates/></fo:inline>
|
2223
|
+
<fo:inline keep-together.within-line="always" role="SKIP"><xsl:apply-templates/></fo:inline>
|
2212
2224
|
</xsl:otherwise>
|
2213
2225
|
</xsl:choose>
|
2214
2226
|
</xsl:for-each>
|
2215
2227
|
</xsl:when>
|
2216
2228
|
|
2217
2229
|
<xsl:otherwise>
|
2218
|
-
<fo:inline keep-together.within-line="always"><xsl:apply-templates/></fo:inline>
|
2230
|
+
<fo:inline keep-together.within-line="always" role="SKIP"><xsl:apply-templates/></fo:inline>
|
2219
2231
|
</xsl:otherwise>
|
2220
2232
|
|
2221
2233
|
</xsl:choose>
|
@@ -2225,7 +2237,7 @@
|
|
2225
2237
|
<!-- Preface boilerplate sections processing -->
|
2226
2238
|
<!-- ================================= -->
|
2227
2239
|
<xsl:template match="*[local-name()='copyright-statement']">
|
2228
|
-
<fo:block xsl:use-attribute-sets="copyright-statement-style">
|
2240
|
+
<fo:block xsl:use-attribute-sets="copyright-statement-style" role="SKIP">
|
2229
2241
|
<xsl:apply-templates/>
|
2230
2242
|
</fo:block>
|
2231
2243
|
</xsl:template> <!-- copyright-statement -->
|
@@ -2395,7 +2407,7 @@
|
|
2395
2407
|
</xsl:choose>
|
2396
2408
|
</xsl:variable>
|
2397
2409
|
|
2398
|
-
<fo:block-container xsl:use-attribute-sets="table-container-style">
|
2410
|
+
<fo:block-container xsl:use-attribute-sets="table-container-style" role="SKIP">
|
2399
2411
|
|
2400
2412
|
<xsl:call-template name="refine_table-container-style">
|
2401
2413
|
<xsl:with-param name="margin-side" select="$margin-side"/>
|
@@ -2533,7 +2545,7 @@
|
|
2533
2545
|
<fo:table-row>
|
2534
2546
|
<fo:table-cell column-number="2">
|
2535
2547
|
<xsl:copy-of select="$table-preamble"/>
|
2536
|
-
<fo:block>
|
2548
|
+
<fo:block role="SKIP">
|
2537
2549
|
<xsl:call-template name="setTrackChangesStyles">
|
2538
2550
|
<xsl:with-param name="isAdded" select="$isAdded"/>
|
2539
2551
|
<xsl:with-param name="isDeleted" select="$isDeleted"/>
|
@@ -2576,7 +2588,7 @@
|
|
2576
2588
|
<xsl:param name="continued"/>
|
2577
2589
|
<xsl:if test="normalize-space() != ''">
|
2578
2590
|
|
2579
|
-
<fo:block xsl:use-attribute-sets="table-name-style">
|
2591
|
+
<fo:block xsl:use-attribute-sets="table-name-style" role="SKIP">
|
2580
2592
|
|
2581
2593
|
<xsl:call-template name="refine_table-name-style">
|
2582
2594
|
<xsl:with-param name="continued" select="$continued"/>
|
@@ -2961,8 +2973,8 @@
|
|
2961
2973
|
<xsl:template name="table-header-title">
|
2962
2974
|
<xsl:param name="cols-count"/>
|
2963
2975
|
<!-- row for title -->
|
2964
|
-
<fo:table-row>
|
2965
|
-
<fo:table-cell number-columns-spanned="{$cols-count}" border-left="1.5pt solid white" border-right="1.5pt solid white" border-top="1.5pt solid white" border-bottom="1.5pt solid black">
|
2976
|
+
<fo:table-row role="SKIP">
|
2977
|
+
<fo:table-cell number-columns-spanned="{$cols-count}" border-left="1.5pt solid white" border-right="1.5pt solid white" border-top="1.5pt solid white" border-bottom="1.5pt solid black" role="SKIP">
|
2966
2978
|
|
2967
2979
|
<xsl:call-template name="refine_table-header-title-style"/>
|
2968
2980
|
|
@@ -2971,7 +2983,7 @@
|
|
2971
2983
|
</xsl:apply-templates>
|
2972
2984
|
|
2973
2985
|
<xsl:if test="not(ancestor::*[local-name()='table']/*[local-name()='name'])"> <!-- to prevent empty fo:table-cell in case of missing table's name -->
|
2974
|
-
<fo:block/>
|
2986
|
+
<fo:block role="SKIP"/>
|
2975
2987
|
</xsl:if>
|
2976
2988
|
|
2977
2989
|
</fo:table-cell>
|
@@ -3282,7 +3294,7 @@
|
|
3282
3294
|
|
3283
3295
|
<xsl:call-template name="refine_table-header-cell-style"/>
|
3284
3296
|
|
3285
|
-
<fo:block>
|
3297
|
+
<fo:block role="SKIP">
|
3286
3298
|
<xsl:apply-templates/>
|
3287
3299
|
</fo:block>
|
3288
3300
|
</fo:table-cell>
|
@@ -3335,7 +3347,7 @@
|
|
3335
3347
|
<xsl:attribute name="text-align">left</xsl:attribute>
|
3336
3348
|
</xsl:if>
|
3337
3349
|
|
3338
|
-
<fo:block>
|
3350
|
+
<fo:block role="SKIP">
|
3339
3351
|
|
3340
3352
|
<xsl:if test="$isGenerateTableIF = 'true'">
|
3341
3353
|
<xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
|
@@ -3428,7 +3440,7 @@
|
|
3428
3440
|
</xsl:choose>
|
3429
3441
|
</xsl:variable>
|
3430
3442
|
<xsl:variable name="footnote_inline">
|
3431
|
-
<fo:inline>
|
3443
|
+
<fo:inline role="Reference">
|
3432
3444
|
|
3433
3445
|
<xsl:variable name="fn_styles">
|
3434
3446
|
<xsl:choose>
|
@@ -3451,7 +3463,7 @@
|
|
3451
3463
|
|
3452
3464
|
<xsl:call-template name="insert_basic_link">
|
3453
3465
|
<xsl:with-param name="element">
|
3454
|
-
<fo:basic-link internal-destination="{$ref_id}" fox:alt-text="footnote {$current_fn_number}">
|
3466
|
+
<fo:basic-link internal-destination="{$ref_id}" fox:alt-text="footnote {$current_fn_number}" role="Lbl">
|
3455
3467
|
<xsl:copy-of select="$current_fn_number_text"/>
|
3456
3468
|
</fo:basic-link>
|
3457
3469
|
</xsl:with-param>
|
@@ -3464,17 +3476,17 @@
|
|
3464
3476
|
<xsl:copy-of select="$footnote_inline"/>
|
3465
3477
|
</xsl:when>
|
3466
3478
|
<xsl:when test="$p_fn//fn[@gen_id = $gen_id] or normalize-space(@skip_footnote_body) = 'false'">
|
3467
|
-
<fo:footnote xsl:use-attribute-sets="fn-style">
|
3479
|
+
<fo:footnote xsl:use-attribute-sets="fn-style" role="SKIP">
|
3468
3480
|
<xsl:copy-of select="$footnote_inline"/>
|
3469
|
-
<fo:footnote-body>
|
3481
|
+
<fo:footnote-body role="Note">
|
3470
3482
|
|
3471
|
-
<fo:block-container xsl:use-attribute-sets="fn-container-body-style">
|
3483
|
+
<fo:block-container xsl:use-attribute-sets="fn-container-body-style" role="SKIP">
|
3472
3484
|
|
3473
|
-
<fo:block xsl:use-attribute-sets="fn-body-style">
|
3485
|
+
<fo:block xsl:use-attribute-sets="fn-body-style" role="SKIP">
|
3474
3486
|
|
3475
3487
|
<xsl:call-template name="refine_fn-body-style"/>
|
3476
3488
|
|
3477
|
-
<fo:inline id="{$ref_id}" xsl:use-attribute-sets="fn-body-num-style">
|
3489
|
+
<fo:inline id="{$ref_id}" xsl:use-attribute-sets="fn-body-num-style" role="Lbl">
|
3478
3490
|
|
3479
3491
|
<xsl:call-template name="refine_fn-body-num-style"/>
|
3480
3492
|
|
@@ -3736,11 +3748,11 @@
|
|
3736
3748
|
</xsl:template>
|
3737
3749
|
|
3738
3750
|
<xsl:template match="*[local-name()='fn']/text()[normalize-space() != '']">
|
3739
|
-
<fo:inline><xsl:value-of select="."/></fo:inline>
|
3751
|
+
<fo:inline role="SKIP"><xsl:value-of select="."/></fo:inline>
|
3740
3752
|
</xsl:template>
|
3741
3753
|
|
3742
3754
|
<xsl:template match="*[local-name()='fn']//*[local-name()='p']">
|
3743
|
-
<fo:inline>
|
3755
|
+
<fo:inline role="P">
|
3744
3756
|
<xsl:apply-templates/>
|
3745
3757
|
</fo:inline>
|
3746
3758
|
</xsl:template>
|
@@ -3755,7 +3767,7 @@
|
|
3755
3767
|
<xsl:variable name="isAdded" select="@added"/>
|
3756
3768
|
<xsl:variable name="isDeleted" select="@deleted"/>
|
3757
3769
|
<!-- <dl><xsl:copy-of select="."/></dl> -->
|
3758
|
-
<fo:block-container xsl:use-attribute-sets="dl-block-style">
|
3770
|
+
<fo:block-container xsl:use-attribute-sets="dl-block-style" role="SKIP">
|
3759
3771
|
|
3760
3772
|
<xsl:call-template name="setBlockSpanAll"/>
|
3761
3773
|
|
@@ -3790,7 +3802,7 @@
|
|
3790
3802
|
<xsl:with-param name="isDeleted" select="$isDeleted"/>
|
3791
3803
|
</xsl:call-template>
|
3792
3804
|
|
3793
|
-
<fo:block-container margin-left="0mm">
|
3805
|
+
<fo:block-container margin-left="0mm" role="SKIP">
|
3794
3806
|
|
3795
3807
|
<xsl:attribute name="margin-right">0mm</xsl:attribute>
|
3796
3808
|
|
@@ -3855,7 +3867,7 @@
|
|
3855
3867
|
|
3856
3868
|
<!-- a few components -->
|
3857
3869
|
<xsl:if test="$onlyOneComponent = 'false'">
|
3858
|
-
<fo:block>
|
3870
|
+
<fo:block role="SKIP">
|
3859
3871
|
|
3860
3872
|
<xsl:call-template name="refine_multicomponent_style"/>
|
3861
3873
|
|
@@ -3863,7 +3875,7 @@
|
|
3863
3875
|
<xsl:attribute name="margin-top">0</xsl:attribute>
|
3864
3876
|
</xsl:if>
|
3865
3877
|
|
3866
|
-
<fo:block>
|
3878
|
+
<fo:block role="SKIP">
|
3867
3879
|
|
3868
3880
|
<xsl:call-template name="refine_multicomponent_block_style"/>
|
3869
3881
|
|
@@ -4198,7 +4210,7 @@
|
|
4198
4210
|
-->
|
4199
4211
|
<fo:table-row>
|
4200
4212
|
<fo:table-cell number-columns-spanned="2">
|
4201
|
-
<fo:block>
|
4213
|
+
<fo:block role="SKIP">
|
4202
4214
|
<xsl:call-template name="note"/>
|
4203
4215
|
</fo:block>
|
4204
4216
|
</fo:table-cell>
|
@@ -4263,7 +4275,7 @@
|
|
4263
4275
|
|
4264
4276
|
<xsl:call-template name="refine_dt-cell-style"/>
|
4265
4277
|
|
4266
|
-
<fo:block xsl:use-attribute-sets="dt-block-style">
|
4278
|
+
<fo:block xsl:use-attribute-sets="dt-block-style" role="SKIP">
|
4267
4279
|
<xsl:copy-of select="@id"/>
|
4268
4280
|
|
4269
4281
|
<xsl:if test="normalize-space($key_iso) = 'true'">
|
@@ -4293,7 +4305,7 @@
|
|
4293
4305
|
|
4294
4306
|
<xsl:call-template name="refine_dd-cell-style"/>
|
4295
4307
|
|
4296
|
-
<fo:block>
|
4308
|
+
<fo:block role="SKIP">
|
4297
4309
|
|
4298
4310
|
<xsl:if test="$isGenerateTableIF = 'true'">
|
4299
4311
|
<xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
|
@@ -4458,6 +4470,9 @@
|
|
4458
4470
|
|
4459
4471
|
<xsl:template name="refine_strong_style">
|
4460
4472
|
|
4473
|
+
<xsl:if test="ancestor::*['preferred']">
|
4474
|
+
<xsl:attribute name="role">SKIP</xsl:attribute>
|
4475
|
+
</xsl:if>
|
4461
4476
|
</xsl:template>
|
4462
4477
|
|
4463
4478
|
<xsl:template match="*[local-name()='padding']">
|
@@ -4669,11 +4684,41 @@
|
|
4669
4684
|
|
4670
4685
|
<xsl:template match="text()[ancestor::*[local-name()='smallcap']]">
|
4671
4686
|
<xsl:variable name="text" select="normalize-space(.)"/>
|
4672
|
-
<fo:inline font-size="75%">
|
4687
|
+
<fo:inline font-size="75%" role="SKIP">
|
4673
4688
|
<xsl:if test="string-length($text) > 0">
|
4674
|
-
<xsl:
|
4675
|
-
<xsl:
|
4676
|
-
|
4689
|
+
<xsl:variable name="smallCapsText">
|
4690
|
+
<xsl:call-template name="recursiveSmallCaps">
|
4691
|
+
<xsl:with-param name="text" select="$text"/>
|
4692
|
+
</xsl:call-template>
|
4693
|
+
</xsl:variable>
|
4694
|
+
<!-- merge neighboring fo:inline -->
|
4695
|
+
<xsl:for-each select="xalan:nodeset($smallCapsText)/node()">
|
4696
|
+
<xsl:choose>
|
4697
|
+
<xsl:when test="self::fo:inline and preceding-sibling::node()[1][self::fo:inline]"><!-- <xsl:copy-of select="."/> --></xsl:when>
|
4698
|
+
<xsl:when test="self::fo:inline and @font-size">
|
4699
|
+
<xsl:variable name="curr_pos" select="count(preceding-sibling::node()) + 1"/>
|
4700
|
+
<!-- <curr_pos><xsl:value-of select="$curr_pos"/></curr_pos> -->
|
4701
|
+
<xsl:variable name="next_text_" select="count(following-sibling::node()[not(local-name() = 'inline')][1]/preceding-sibling::node())"/>
|
4702
|
+
<xsl:variable name="next_text">
|
4703
|
+
<xsl:choose>
|
4704
|
+
<xsl:when test="$next_text_ = 0">99999999</xsl:when>
|
4705
|
+
<xsl:otherwise><xsl:value-of select="$next_text_ + 1"/></xsl:otherwise>
|
4706
|
+
</xsl:choose>
|
4707
|
+
</xsl:variable>
|
4708
|
+
<!-- <next_text><xsl:value-of select="$next_text"/></next_text> -->
|
4709
|
+
<fo:inline>
|
4710
|
+
<xsl:copy-of select="@*"/>
|
4711
|
+
<xsl:copy-of select="./node()"/>
|
4712
|
+
<xsl:for-each select="following-sibling::node()[position() < $next_text - $curr_pos]"> <!-- [self::fo:inline] -->
|
4713
|
+
<xsl:copy-of select="./node()"/>
|
4714
|
+
</xsl:for-each>
|
4715
|
+
</fo:inline>
|
4716
|
+
</xsl:when>
|
4717
|
+
<xsl:otherwise>
|
4718
|
+
<xsl:copy-of select="."/>
|
4719
|
+
</xsl:otherwise>
|
4720
|
+
</xsl:choose>
|
4721
|
+
</xsl:for-each>
|
4677
4722
|
</xsl:if>
|
4678
4723
|
</fo:inline>
|
4679
4724
|
</xsl:template>
|
@@ -4685,7 +4730,7 @@
|
|
4685
4730
|
<xsl:variable name="upperCase" select="java:toUpperCase(java:java.lang.String.new($char))"/>
|
4686
4731
|
<xsl:choose>
|
4687
4732
|
<xsl:when test="$char=$upperCase">
|
4688
|
-
<fo:inline font-size="{100 div 0.75}%">
|
4733
|
+
<fo:inline font-size="{100 div 0.75}%" role="SKIP">
|
4689
4734
|
<xsl:value-of select="$upperCase"/>
|
4690
4735
|
</fo:inline>
|
4691
4736
|
</xsl:when>
|
@@ -4847,6 +4892,10 @@
|
|
4847
4892
|
|
4848
4893
|
<xsl:when test="not(contains($text, $separator))">
|
4849
4894
|
<word>
|
4895
|
+
<xsl:if test="ancestor::*[local-name() = 'p'][@from_dl = 'true']">
|
4896
|
+
<xsl:text>
|
4897
|
+
</xsl:text> <!-- to add distance between dt and dd -->
|
4898
|
+
</xsl:if>
|
4850
4899
|
<xsl:call-template name="enclose_text_in_tags">
|
4851
4900
|
<xsl:with-param name="text" select="normalize-space($text)"/>
|
4852
4901
|
<xsl:with-param name="tags" select="$tags"/>
|
@@ -4855,6 +4904,10 @@
|
|
4855
4904
|
</xsl:when>
|
4856
4905
|
<xsl:otherwise>
|
4857
4906
|
<word>
|
4907
|
+
<xsl:if test="ancestor::*[local-name() = 'p'][@from_dl = 'true']">
|
4908
|
+
<xsl:text>
|
4909
|
+
</xsl:text> <!-- to add distance between dt and dd -->
|
4910
|
+
</xsl:if>
|
4858
4911
|
<xsl:call-template name="enclose_text_in_tags">
|
4859
4912
|
<xsl:with-param name="text" select="normalize-space(substring-before($text, $separator))"/>
|
4860
4913
|
<xsl:with-param name="tags" select="$tags"/>
|
@@ -5038,6 +5091,10 @@
|
|
5038
5091
|
<xsl:template name="getSimpleTable">
|
5039
5092
|
<xsl:param name="id"/>
|
5040
5093
|
|
5094
|
+
<!-- <test0>
|
5095
|
+
<xsl:copy-of select="."/>
|
5096
|
+
</test0> -->
|
5097
|
+
|
5041
5098
|
<xsl:variable name="simple-table">
|
5042
5099
|
|
5043
5100
|
<!-- Step 0. replace <br/> to <p>...</p> -->
|
@@ -5350,6 +5407,18 @@
|
|
5350
5407
|
</xsl:copy>
|
5351
5408
|
</xsl:template>
|
5352
5409
|
|
5410
|
+
<xsl:variable name="font_main_root_style">
|
5411
|
+
<root-style xsl:use-attribute-sets="root-style">
|
5412
|
+
</root-style>
|
5413
|
+
</xsl:variable>
|
5414
|
+
<xsl:variable name="font_main_root_style_font_family" select="xalan:nodeset($font_main_root_style)/root-style/@font-family"/>
|
5415
|
+
<xsl:variable name="font_main">
|
5416
|
+
<xsl:choose>
|
5417
|
+
<xsl:when test="contains($font_main_root_style_font_family, ',')"><xsl:value-of select="substring-before($font_main_root_style_font_family, ',')"/></xsl:when>
|
5418
|
+
<xsl:otherwise><xsl:value-of select="$font_main_root_style_font_family"/></xsl:otherwise>
|
5419
|
+
</xsl:choose>
|
5420
|
+
</xsl:variable>
|
5421
|
+
|
5353
5422
|
<xsl:template match="*[local-name()='th' or local-name()='td']" mode="simple-table-id">
|
5354
5423
|
<xsl:param name="id"/>
|
5355
5424
|
<xsl:copy>
|
@@ -5388,6 +5457,33 @@
|
|
5388
5457
|
|
5389
5458
|
<!-- td_text='<xsl:copy-of select="$td_text"/>' -->
|
5390
5459
|
|
5460
|
+
<xsl:variable name="words_with_width">
|
5461
|
+
<!-- calculate width for 'word' which contain text only (without formatting tags inside) -->
|
5462
|
+
<xsl:for-each select="xalan:nodeset($td_text)//*[local-name() = 'word'][normalize-space() != ''][not(*)]">
|
5463
|
+
<xsl:copy>
|
5464
|
+
<xsl:copy-of select="@*"/>
|
5465
|
+
<xsl:attribute name="width">
|
5466
|
+
<xsl:value-of select="java:org.metanorma.fop.Util.getStringWidth(., $font_main)"/> <!-- Example: 'Times New Roman' -->
|
5467
|
+
</xsl:attribute>
|
5468
|
+
<xsl:copy-of select="node()"/>
|
5469
|
+
</xsl:copy>
|
5470
|
+
</xsl:for-each>
|
5471
|
+
</xsl:variable>
|
5472
|
+
|
5473
|
+
<xsl:variable name="words_with_width_sorted">
|
5474
|
+
<xsl:for-each select="xalan:nodeset($words_with_width)//*[local-name() = 'word']">
|
5475
|
+
<xsl:sort select="@width" data-type="number" order="descending"/>
|
5476
|
+
<!-- select word maximal width only -->
|
5477
|
+
<xsl:if test="position() = 1">
|
5478
|
+
<xsl:copy-of select="."/>
|
5479
|
+
</xsl:if>
|
5480
|
+
</xsl:for-each>
|
5481
|
+
<!-- add 'word' with formatting tags inside -->
|
5482
|
+
<xsl:for-each select="xalan:nodeset($td_text)//*[local-name() = 'word'][normalize-space() != ''][*]">
|
5483
|
+
<xsl:copy-of select="."/>
|
5484
|
+
</xsl:for-each>
|
5485
|
+
</xsl:variable>
|
5486
|
+
|
5391
5487
|
<xsl:variable name="words">
|
5392
5488
|
<xsl:for-each select=".//*[local-name() = 'image' or local-name() = 'stem']">
|
5393
5489
|
<word>
|
@@ -5395,9 +5491,12 @@
|
|
5395
5491
|
</word>
|
5396
5492
|
</xsl:for-each>
|
5397
5493
|
|
5398
|
-
<xsl:for-each select="xalan:nodeset($
|
5494
|
+
<xsl:for-each select="xalan:nodeset($words_with_width_sorted)//*[local-name() = 'word'][normalize-space() != '']">
|
5399
5495
|
<xsl:copy-of select="."/>
|
5400
5496
|
</xsl:for-each>
|
5497
|
+
<!-- <xsl:for-each select="xalan:nodeset($td_text)//*[local-name() = 'word'][normalize-space() != '']">
|
5498
|
+
<xsl:copy-of select="."/>
|
5499
|
+
</xsl:for-each> -->
|
5401
5500
|
|
5402
5501
|
</xsl:variable>
|
5403
5502
|
|
@@ -5858,10 +5957,10 @@
|
|
5858
5957
|
<xsl:copy>
|
5859
5958
|
<xsl:apply-templates select="@*" mode="mathml"/>
|
5860
5959
|
<xsl:if test="not(@lspace)">
|
5861
|
-
<xsl:attribute name="lspace">0.
|
5960
|
+
<xsl:attribute name="lspace">0.2em</xsl:attribute>
|
5862
5961
|
</xsl:if>
|
5863
|
-
<xsl:if test="not(@rspace)">
|
5864
|
-
<xsl:attribute name="rspace">0.
|
5962
|
+
<xsl:if test="not(@rspace) and not(following-sibling::*[1][self::mathml:mo and normalize-space(text()) = '|'])">
|
5963
|
+
<xsl:attribute name="rspace">0.2em</xsl:attribute>
|
5865
5964
|
</xsl:if>
|
5866
5965
|
<xsl:apply-templates mode="mathml"/>
|
5867
5966
|
</xsl:copy>
|
@@ -5878,6 +5977,27 @@
|
|
5878
5977
|
</xsl:copy>
|
5879
5978
|
</xsl:template>
|
5880
5979
|
|
5980
|
+
<!-- increase space before '(' -->
|
5981
|
+
<xsl:template match="mathml:mo[normalize-space(text()) = '(']" mode="mathml">
|
5982
|
+
<xsl:copy>
|
5983
|
+
<xsl:apply-templates select="@*" mode="mathml"/>
|
5984
|
+
<xsl:if test="(preceding-sibling::* and not(preceding-sibling::*[1][self::mathml:mo])) or (../preceding-sibling::* and not(../preceding-sibling::*[1][self::mathml:mo]))">
|
5985
|
+
<xsl:if test="not(@lspace)">
|
5986
|
+
<xsl:attribute name="lspace">0.4em</xsl:attribute>
|
5987
|
+
<xsl:choose>
|
5988
|
+
<xsl:when test="preceding-sibling::*[1][self::mathml:mi or self::mathml:mstyle]">
|
5989
|
+
<xsl:attribute name="lspace">0.2em</xsl:attribute>
|
5990
|
+
</xsl:when>
|
5991
|
+
<xsl:when test="../preceding-sibling::*[1][self::mathml:mi or self::mathml:mstyle]">
|
5992
|
+
<xsl:attribute name="lspace">0.2em</xsl:attribute>
|
5993
|
+
</xsl:when>
|
5994
|
+
</xsl:choose>
|
5995
|
+
</xsl:if>
|
5996
|
+
</xsl:if>
|
5997
|
+
<xsl:apply-templates mode="mathml"/>
|
5998
|
+
</xsl:copy>
|
5999
|
+
</xsl:template>
|
6000
|
+
|
5881
6001
|
<!-- Examples:
|
5882
6002
|
<stem type="AsciiMath">x = 1</stem>
|
5883
6003
|
<stem type="AsciiMath"><asciimath>x = 1</asciimath></stem>
|
@@ -6037,7 +6157,7 @@
|
|
6037
6157
|
<!-- formula -->
|
6038
6158
|
<!-- ====== -->
|
6039
6159
|
<xsl:template match="*[local-name() = 'formula']" name="formula">
|
6040
|
-
<fo:block-container margin-left="0mm">
|
6160
|
+
<fo:block-container margin-left="0mm" role="SKIP">
|
6041
6161
|
<xsl:if test="parent::*[local-name() = 'note']">
|
6042
6162
|
<xsl:attribute name="margin-left">
|
6043
6163
|
<xsl:choose>
|
@@ -6047,7 +6167,7 @@
|
|
6047
6167
|
</xsl:attribute>
|
6048
6168
|
|
6049
6169
|
</xsl:if>
|
6050
|
-
<fo:block-container margin-left="0mm">
|
6170
|
+
<fo:block-container margin-left="0mm" role="SKIP">
|
6051
6171
|
<fo:block id="{@id}">
|
6052
6172
|
<xsl:apply-templates select="node()[not(local-name() = 'name')]"/> <!-- formula's number will be process in 'stem' template -->
|
6053
6173
|
</fo:block>
|
@@ -6083,7 +6203,7 @@
|
|
6083
6203
|
<fo:table-body>
|
6084
6204
|
<fo:table-row>
|
6085
6205
|
<fo:table-cell display-align="center">
|
6086
|
-
<fo:block xsl:use-attribute-sets="formula-stem-block-style">
|
6206
|
+
<fo:block xsl:use-attribute-sets="formula-stem-block-style" role="SKIP">
|
6087
6207
|
|
6088
6208
|
<xsl:call-template name="refine_formula-stem-block-style"/>
|
6089
6209
|
|
@@ -6091,7 +6211,10 @@
|
|
6091
6211
|
</fo:block>
|
6092
6212
|
</fo:table-cell>
|
6093
6213
|
<fo:table-cell display-align="center">
|
6094
|
-
<fo:block xsl:use-attribute-sets="formula-stem-number-style">
|
6214
|
+
<fo:block xsl:use-attribute-sets="formula-stem-number-style" role="SKIP">
|
6215
|
+
|
6216
|
+
<xsl:call-template name="refine_formula-stem-number-style"/>
|
6217
|
+
|
6095
6218
|
<xsl:apply-templates select="../*[local-name() = 'name']"/>
|
6096
6219
|
</fo:block>
|
6097
6220
|
</fo:table-cell>
|
@@ -6124,13 +6247,13 @@
|
|
6124
6247
|
|
6125
6248
|
<xsl:template match="*[local-name() = 'note']" name="note">
|
6126
6249
|
|
6127
|
-
<fo:block-container id="{@id}" xsl:use-attribute-sets="note-style">
|
6250
|
+
<fo:block-container id="{@id}" xsl:use-attribute-sets="note-style" role="SKIP">
|
6128
6251
|
|
6129
6252
|
<xsl:call-template name="setBlockSpanAll"/>
|
6130
6253
|
|
6131
6254
|
<xsl:call-template name="refine_note-style"/>
|
6132
6255
|
|
6133
|
-
<fo:block-container margin-left="0mm" margin-right="0mm">
|
6256
|
+
<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
|
6134
6257
|
|
6135
6258
|
<fo:block>
|
6136
6259
|
|
@@ -6292,12 +6415,13 @@
|
|
6292
6415
|
|
6293
6416
|
<xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']">
|
6294
6417
|
<xsl:if test="normalize-space() != ''">
|
6295
|
-
<xsl:variable name="level">
|
6418
|
+
<!-- <xsl:variable name="level">
|
6296
6419
|
<xsl:call-template name="getLevelTermName"/>
|
6297
6420
|
</xsl:variable>
|
6298
6421
|
<fo:inline role="H{$level}">
|
6299
|
-
<xsl:apply-templates/>
|
6300
|
-
</fo:inline>
|
6422
|
+
<xsl:apply-templates />
|
6423
|
+
</fo:inline> -->
|
6424
|
+
<xsl:apply-templates/>
|
6301
6425
|
</xsl:if>
|
6302
6426
|
</xsl:template>
|
6303
6427
|
<!-- ====== -->
|
@@ -6321,7 +6445,7 @@
|
|
6321
6445
|
<!-- Example: Dimensions in millimeters -->
|
6322
6446
|
<xsl:apply-templates select="*[local-name() = 'note'][@type = 'units']"/>
|
6323
6447
|
|
6324
|
-
<fo:block xsl:use-attribute-sets="figure-style">
|
6448
|
+
<fo:block xsl:use-attribute-sets="figure-style" role="SKIP">
|
6325
6449
|
<xsl:apply-templates select="node()[not(local-name() = 'name') and not(local-name() = 'note' and @type = 'units')]"/>
|
6326
6450
|
</fo:block>
|
6327
6451
|
<xsl:for-each select="*[local-name() = 'note'][not(@type = 'units')]">
|
@@ -7457,7 +7581,7 @@
|
|
7457
7581
|
</xsl:when>
|
7458
7582
|
|
7459
7583
|
<xsl:otherwise>
|
7460
|
-
<fo:block-container xsl:use-attribute-sets="sourcecode-container-style">
|
7584
|
+
<fo:block-container xsl:use-attribute-sets="sourcecode-container-style" role="SKIP">
|
7461
7585
|
|
7462
7586
|
<xsl:if test="not(ancestor::*[local-name() = 'li']) or ancestor::*[local-name() = 'example']">
|
7463
7587
|
<xsl:attribute name="margin-left">0mm</xsl:attribute>
|
@@ -7478,7 +7602,7 @@
|
|
7478
7602
|
</xsl:attribute>
|
7479
7603
|
|
7480
7604
|
</xsl:if>
|
7481
|
-
<fo:block-container margin-left="0mm">
|
7605
|
+
<fo:block-container margin-left="0mm" role="SKIP">
|
7482
7606
|
|
7483
7607
|
<fo:block xsl:use-attribute-sets="sourcecode-style">
|
7484
7608
|
|
@@ -7602,7 +7726,7 @@
|
|
7602
7726
|
<!-- second td with sourcecode -->
|
7603
7727
|
<xsl:template match="*[local-name() = 'sourcecode'][@linenums = 'true']/*[local-name()='table']//*[local-name()='tr']/*[local-name()='td'][preceding-sibling::*]" priority="2"> <!-- *[local-name()='table'][@type = 'sourcecode'] -->
|
7604
7728
|
<fo:table-cell>
|
7605
|
-
<fo:block>
|
7729
|
+
<fo:block role="SKIP">
|
7606
7730
|
<xsl:apply-templates/>
|
7607
7731
|
</fo:block>
|
7608
7732
|
</fo:table-cell>
|
@@ -8024,11 +8148,11 @@
|
|
8024
8148
|
<!-- requirement, recommendation, permission table -->
|
8025
8149
|
<!-- ========== -->
|
8026
8150
|
<xsl:template match="*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']">
|
8027
|
-
<fo:block-container margin-left="0mm" margin-right="0mm" margin-bottom="12pt">
|
8151
|
+
<fo:block-container margin-left="0mm" margin-right="0mm" margin-bottom="12pt" role="SKIP">
|
8028
8152
|
<xsl:if test="ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']">
|
8029
8153
|
<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
|
8030
8154
|
</xsl:if>
|
8031
|
-
<fo:block-container margin-left="0mm" margin-right="0mm">
|
8155
|
+
<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
|
8032
8156
|
<fo:table id="{@id}" table-layout="fixed" width="100%"> <!-- border="1pt solid black" -->
|
8033
8157
|
<xsl:if test="ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']">
|
8034
8158
|
<!-- <xsl:attribute name="border">0.5pt solid black</xsl:attribute> -->
|
@@ -8089,7 +8213,7 @@
|
|
8089
8213
|
|
8090
8214
|
<xsl:call-template name="setTableCellAttributes"/>
|
8091
8215
|
|
8092
|
-
<fo:block>
|
8216
|
+
<fo:block role="SKIP">
|
8093
8217
|
<xsl:apply-templates/>
|
8094
8218
|
</fo:block>
|
8095
8219
|
</fo:table-cell>
|
@@ -8111,7 +8235,7 @@
|
|
8111
8235
|
|
8112
8236
|
<xsl:call-template name="setTableCellAttributes"/>
|
8113
8237
|
|
8114
|
-
<fo:block>
|
8238
|
+
<fo:block role="SKIP">
|
8115
8239
|
<xsl:apply-templates/>
|
8116
8240
|
</fo:block>
|
8117
8241
|
</fo:table-cell>
|
@@ -8190,7 +8314,7 @@
|
|
8190
8314
|
-->
|
8191
8315
|
<xsl:template match="*[local-name() = 'example']">
|
8192
8316
|
|
8193
|
-
<fo:block-container id="{@id}" xsl:use-attribute-sets="example-style">
|
8317
|
+
<fo:block-container id="{@id}" xsl:use-attribute-sets="example-style" role="SKIP">
|
8194
8318
|
|
8195
8319
|
<xsl:call-template name="setBlockSpanAll"/>
|
8196
8320
|
|
@@ -8201,7 +8325,7 @@
|
|
8201
8325
|
block
|
8202
8326
|
</xsl:variable>
|
8203
8327
|
|
8204
|
-
<fo:block-container margin-left="0mm">
|
8328
|
+
<fo:block-container margin-left="0mm" role="SKIP">
|
8205
8329
|
|
8206
8330
|
<xsl:choose>
|
8207
8331
|
|
@@ -8214,8 +8338,8 @@
|
|
8214
8338
|
</xsl:apply-templates>
|
8215
8339
|
</fo:block>
|
8216
8340
|
|
8217
|
-
<fo:block-container xsl:use-attribute-sets="example-body-style">
|
8218
|
-
<fo:block-container margin-left="0mm" margin-right="0mm">
|
8341
|
+
<fo:block-container xsl:use-attribute-sets="example-body-style" role="SKIP">
|
8342
|
+
<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
|
8219
8343
|
<xsl:apply-templates select="node()[not(local-name() = 'name')]">
|
8220
8344
|
<xsl:with-param name="fo_element" select="$fo_element"/>
|
8221
8345
|
</xsl:apply-templates>
|
@@ -8268,8 +8392,8 @@
|
|
8268
8392
|
|
8269
8393
|
<xsl:if test="*[not(local-name() = 'name')][position() > 1]">
|
8270
8394
|
<!-- display further elements in blocks -->
|
8271
|
-
<fo:block-container xsl:use-attribute-sets="example-body-style">
|
8272
|
-
<fo:block-container margin-left="0mm" margin-right="0mm">
|
8395
|
+
<fo:block-container xsl:use-attribute-sets="example-body-style" role="SKIP">
|
8396
|
+
<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
|
8273
8397
|
<xsl:apply-templates select="*[not(local-name() = 'name')][position() > 1]">
|
8274
8398
|
<xsl:with-param name="fo_element" select="'block'"/>
|
8275
8399
|
</xsl:apply-templates>
|
@@ -8322,7 +8446,7 @@
|
|
8322
8446
|
</xsl:variable>
|
8323
8447
|
<xsl:choose>
|
8324
8448
|
<xsl:when test="starts-with(normalize-space($element), 'block')">
|
8325
|
-
<fo:block-container>
|
8449
|
+
<fo:block-container role="SKIP">
|
8326
8450
|
<xsl:if test="ancestor::*[local-name() = 'li'] and contains(normalize-space($fo_element), 'block')">
|
8327
8451
|
<xsl:attribute name="margin-left">0mm</xsl:attribute>
|
8328
8452
|
<xsl:attribute name="margin-right">0mm</xsl:attribute>
|
@@ -8463,7 +8587,7 @@
|
|
8463
8587
|
<!-- author -->
|
8464
8588
|
<!-- ====== -->
|
8465
8589
|
<xsl:template match="*[local-name() = 'quote']">
|
8466
|
-
<fo:block-container margin-left="0mm">
|
8590
|
+
<fo:block-container margin-left="0mm" role="SKIP">
|
8467
8591
|
|
8468
8592
|
<xsl:call-template name="setBlockSpanAll"/>
|
8469
8593
|
|
@@ -8473,12 +8597,12 @@
|
|
8473
8597
|
</xsl:if>
|
8474
8598
|
</xsl:if>
|
8475
8599
|
|
8476
|
-
<fo:block-container margin-left="0mm">
|
8477
|
-
<fo:block-container xsl:use-attribute-sets="quote-style">
|
8600
|
+
<fo:block-container margin-left="0mm" role="SKIP">
|
8601
|
+
<fo:block-container xsl:use-attribute-sets="quote-style" role="SKIP">
|
8478
8602
|
|
8479
8603
|
<xsl:call-template name="refine_quote-style"/>
|
8480
8604
|
|
8481
|
-
<fo:block-container margin-left="0mm" margin-right="0mm">
|
8605
|
+
<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
|
8482
8606
|
<fo:block role="BlockQuote">
|
8483
8607
|
<xsl:apply-templates select="./node()[not(local-name() = 'author') and not(local-name() = 'source')]"/> <!-- process all nested nodes, except author and source -->
|
8484
8608
|
</fo:block>
|
@@ -8638,10 +8762,10 @@
|
|
8638
8762
|
|
8639
8763
|
<xsl:choose>
|
8640
8764
|
<xsl:when test="$lang = 'zh'">
|
8641
|
-
<fo:inline><xsl:value-of select="$tab_zh"/></fo:inline>
|
8765
|
+
<fo:inline role="SKIP"><xsl:value-of select="$tab_zh"/></fo:inline>
|
8642
8766
|
</xsl:when>
|
8643
8767
|
<xsl:when test="../../@inline-header = 'true'">
|
8644
|
-
<fo:inline font-size="90%">
|
8768
|
+
<fo:inline font-size="90%" role="SKIP">
|
8645
8769
|
<xsl:call-template name="insertNonBreakSpaces">
|
8646
8770
|
<xsl:with-param name="count" select="$padding-right"/>
|
8647
8771
|
</xsl:call-template>
|
@@ -8649,7 +8773,7 @@
|
|
8649
8773
|
</xsl:when>
|
8650
8774
|
<xsl:otherwise>
|
8651
8775
|
<xsl:variable name="direction"><xsl:if test="$lang = 'ar'"><xsl:value-of select="$RLM"/></xsl:if></xsl:variable>
|
8652
|
-
<fo:inline padding-right="{$padding-right}mm"><xsl:value-of select="$direction"/></fo:inline>
|
8776
|
+
<fo:inline padding-right="{$padding-right}mm" role="SKIP"><xsl:value-of select="$direction"/></fo:inline>
|
8653
8777
|
</xsl:otherwise>
|
8654
8778
|
</xsl:choose>
|
8655
8779
|
|
@@ -8684,12 +8808,12 @@
|
|
8684
8808
|
<fo:block font-size="{normalize-space($font-size)}" role="H{$levelTerm}" xsl:use-attribute-sets="preferred-block-style">
|
8685
8809
|
|
8686
8810
|
<xsl:if test="parent::*[local-name() = 'term'] and not(preceding-sibling::*[local-name() = 'preferred'])"> <!-- if first preffered in term, then display term's name -->
|
8687
|
-
<fo:block xsl:use-attribute-sets="term-name-style">
|
8811
|
+
<fo:block xsl:use-attribute-sets="term-name-style" role="SKIP">
|
8688
8812
|
<xsl:apply-templates select="ancestor::*[local-name() = 'term'][1]/*[local-name() = 'name']"/>
|
8689
8813
|
</fo:block>
|
8690
8814
|
</xsl:if>
|
8691
8815
|
|
8692
|
-
<fo:block xsl:use-attribute-sets="preferred-term-style">
|
8816
|
+
<fo:block xsl:use-attribute-sets="preferred-term-style" role="SKIP">
|
8693
8817
|
<xsl:call-template name="setStyle_preferred"/>
|
8694
8818
|
<xsl:apply-templates/>
|
8695
8819
|
</fo:block>
|
@@ -8730,7 +8854,7 @@
|
|
8730
8854
|
<!-- definition -->
|
8731
8855
|
<!-- ========== -->
|
8732
8856
|
<xsl:template match="*[local-name() = 'definition']">
|
8733
|
-
<fo:block xsl:use-attribute-sets="definition-style">
|
8857
|
+
<fo:block xsl:use-attribute-sets="definition-style" role="SKIP">
|
8734
8858
|
<xsl:apply-templates/>
|
8735
8859
|
</fo:block>
|
8736
8860
|
</xsl:template>
|
@@ -8778,6 +8902,10 @@
|
|
8778
8902
|
|
8779
8903
|
<xsl:template match="*[local-name() = 'clause']">
|
8780
8904
|
<fo:block>
|
8905
|
+
<xsl:if test="parent::*[local-name() = 'copyright-statement']">
|
8906
|
+
<xsl:attribute name="role">SKIP</xsl:attribute>
|
8907
|
+
</xsl:if>
|
8908
|
+
|
8781
8909
|
<xsl:call-template name="setId"/>
|
8782
8910
|
|
8783
8911
|
<xsl:call-template name="setBlockSpanAll"/>
|
@@ -8891,7 +9019,48 @@
|
|
8891
9019
|
</xsl:choose>
|
8892
9020
|
</xsl:when>
|
8893
9021
|
<xsl:when test="local-name(..) = 'ol' and @label"> <!-- for ordered lists 'ol', and if there is @label, for instance label="1.1.2" -->
|
8894
|
-
|
9022
|
+
|
9023
|
+
<xsl:variable name="label">
|
9024
|
+
|
9025
|
+
<xsl:variable name="type" select="../@type"/>
|
9026
|
+
|
9027
|
+
<xsl:variable name="style_prefix_">
|
9028
|
+
<xsl:if test="$type = 'roman'">
|
9029
|
+
<!-- Example: (i) -->
|
9030
|
+
</xsl:if>
|
9031
|
+
</xsl:variable>
|
9032
|
+
<xsl:variable name="style_prefix" select="normalize-space($style_prefix_)"/>
|
9033
|
+
|
9034
|
+
<xsl:variable name="style_suffix_">
|
9035
|
+
<xsl:choose>
|
9036
|
+
<xsl:when test="$type = 'arabic'">
|
9037
|
+
)
|
9038
|
+
</xsl:when>
|
9039
|
+
<xsl:when test="$type = 'alphabet' or $type = 'alphabetic'">
|
9040
|
+
)
|
9041
|
+
</xsl:when>
|
9042
|
+
<xsl:when test="$type = 'alphabet_upper' or $type = 'alphabetic_upper'">
|
9043
|
+
.
|
9044
|
+
</xsl:when>
|
9045
|
+
<xsl:when test="$type = 'roman'">
|
9046
|
+
)
|
9047
|
+
</xsl:when>
|
9048
|
+
<xsl:when test="$type = 'roman_upper'">.</xsl:when> <!-- Example: I. -->
|
9049
|
+
</xsl:choose>
|
9050
|
+
</xsl:variable>
|
9051
|
+
<xsl:variable name="style_suffix" select="normalize-space($style_suffix_)"/>
|
9052
|
+
|
9053
|
+
<xsl:if test="$style_prefix != '' and not(starts-with(@label, $style_prefix))">
|
9054
|
+
<xsl:value-of select="$style_prefix"/>
|
9055
|
+
</xsl:if>
|
9056
|
+
<xsl:value-of select="@label"/>
|
9057
|
+
<xsl:if test="not(java:endsWith(java:java.lang.String.new(@label),$style_suffix))">
|
9058
|
+
<xsl:value-of select="$style_suffix"/>
|
9059
|
+
</xsl:if>
|
9060
|
+
</xsl:variable>
|
9061
|
+
|
9062
|
+
<xsl:value-of select="normalize-space($label)"/>
|
9063
|
+
|
8895
9064
|
</xsl:when>
|
8896
9065
|
<xsl:otherwise> <!-- for ordered lists 'ol' -->
|
8897
9066
|
|
@@ -8973,7 +9142,7 @@
|
|
8973
9142
|
<xsl:template match="*[local-name() = 'ul'] | *[local-name() = 'ol']">
|
8974
9143
|
<xsl:choose>
|
8975
9144
|
<xsl:when test="parent::*[local-name() = 'note'] or parent::*[local-name() = 'termnote']">
|
8976
|
-
<fo:block-container>
|
9145
|
+
<fo:block-container role="SKIP">
|
8977
9146
|
<xsl:attribute name="margin-left">
|
8978
9147
|
<xsl:choose>
|
8979
9148
|
<xsl:when test="not(ancestor::*[local-name() = 'table'])"><xsl:value-of select="$note-body-indent"/></xsl:when>
|
@@ -8983,7 +9152,7 @@
|
|
8983
9152
|
|
8984
9153
|
<xsl:call-template name="refine_list_container_style"/>
|
8985
9154
|
|
8986
|
-
<fo:block-container margin-left="0mm">
|
9155
|
+
<fo:block-container margin-left="0mm" role="SKIP">
|
8987
9156
|
<fo:block>
|
8988
9157
|
<xsl:apply-templates select="." mode="list"/>
|
8989
9158
|
</fo:block>
|
@@ -8992,7 +9161,7 @@
|
|
8992
9161
|
</xsl:when>
|
8993
9162
|
<xsl:otherwise>
|
8994
9163
|
|
8995
|
-
<fo:block>
|
9164
|
+
<fo:block role="SKIP">
|
8996
9165
|
<xsl:apply-templates select="." mode="list"/>
|
8997
9166
|
</fo:block>
|
8998
9167
|
|
@@ -9084,7 +9253,7 @@
|
|
9084
9253
|
<xsl:call-template name="refine_list-item-style"/>
|
9085
9254
|
|
9086
9255
|
<fo:list-item-label end-indent="label-end()">
|
9087
|
-
<fo:block xsl:use-attribute-sets="list-item-label-style">
|
9256
|
+
<fo:block xsl:use-attribute-sets="list-item-label-style" role="SKIP">
|
9088
9257
|
|
9089
9258
|
<xsl:call-template name="refine_list-item-label-style"/>
|
9090
9259
|
|
@@ -9098,7 +9267,7 @@
|
|
9098
9267
|
</fo:block>
|
9099
9268
|
</fo:list-item-label>
|
9100
9269
|
<fo:list-item-body start-indent="body-start()" xsl:use-attribute-sets="list-item-body-style">
|
9101
|
-
<fo:block>
|
9270
|
+
<fo:block role="SKIP">
|
9102
9271
|
|
9103
9272
|
<xsl:call-template name="refine_list-item-body-style"/>
|
9104
9273
|
|
@@ -9377,10 +9546,10 @@
|
|
9377
9546
|
<fo:table-body>
|
9378
9547
|
<fo:table-row text-align="center" font-weight="bold" background-color="black" color="white">
|
9379
9548
|
|
9380
|
-
<fo:table-cell border="1pt solid black"><fo:block>Date</fo:block></fo:table-cell>
|
9381
|
-
<fo:table-cell border="1pt solid black"><fo:block>Type</fo:block></fo:table-cell>
|
9382
|
-
<fo:table-cell border="1pt solid black"><fo:block>Change</fo:block></fo:table-cell>
|
9383
|
-
<fo:table-cell border="1pt solid black"><fo:block>Pages</fo:block></fo:table-cell>
|
9549
|
+
<fo:table-cell border="1pt solid black"><fo:block role="SKIP">Date</fo:block></fo:table-cell>
|
9550
|
+
<fo:table-cell border="1pt solid black"><fo:block role="SKIP">Type</fo:block></fo:table-cell>
|
9551
|
+
<fo:table-cell border="1pt solid black"><fo:block role="SKIP">Change</fo:block></fo:table-cell>
|
9552
|
+
<fo:table-cell border="1pt solid black"><fo:block role="SKIP">Pages</fo:block></fo:table-cell>
|
9384
9553
|
</fo:table-row>
|
9385
9554
|
<xsl:apply-templates/>
|
9386
9555
|
</fo:table-body>
|
@@ -9395,7 +9564,7 @@
|
|
9395
9564
|
|
9396
9565
|
<xsl:template match="*[local-name() = 'errata']/*[local-name() = 'row']/*">
|
9397
9566
|
<fo:table-cell border="1pt solid black" padding-left="1mm" padding-top="0.5mm">
|
9398
|
-
<fo:block><xsl:apply-templates/></fo:block>
|
9567
|
+
<fo:block role="SKIP"><xsl:apply-templates/></fo:block>
|
9399
9568
|
</fo:table-cell>
|
9400
9569
|
</xsl:template>
|
9401
9570
|
<!-- ============ -->
|
@@ -9410,7 +9579,10 @@
|
|
9410
9579
|
<!-- Reference sections (Normative References and Bibliography) -->
|
9411
9580
|
<!-- ========================================================== -->
|
9412
9581
|
<xsl:template match="*[local-name() = 'references'][@hidden='true']" priority="3"/>
|
9413
|
-
<xsl:template match="*[local-name() = 'bibitem'][@hidden='true']" priority="3"
|
9582
|
+
<xsl:template match="*[local-name() = 'bibitem'][@hidden='true']" priority="3">
|
9583
|
+
<xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][local-name() = 'bibitem'] and 1 = 1)"/>
|
9584
|
+
|
9585
|
+
</xsl:template>
|
9414
9586
|
<!-- don't display bibitem with @id starts with '_hidden', that was introduced for references integrity -->
|
9415
9587
|
<xsl:template match="*[local-name() = 'bibitem'][starts-with(@id, 'hidden_bibitem_')]" priority="3"/>
|
9416
9588
|
|
@@ -9459,15 +9631,15 @@
|
|
9459
9631
|
|
9460
9632
|
<!-- Bibliography (non-normative references) -->
|
9461
9633
|
<xsl:template match="*[local-name() = 'references'][not(@normative='true')]/*[local-name() = 'bibitem']" name="bibitem_non_normative" priority="2">
|
9462
|
-
|
9634
|
+
<xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][local-name() = 'bibitem'] and 1 = 1)"/> <!-- current bibiitem is non-first -->
|
9463
9635
|
<!-- $namespace = 'csd' or $namespace = 'gb' or $namespace = 'iec' or $namespace = 'ieee' or $namespace = 'iso' or $namespace = 'jcgm' or $namespace = 'm3d' or
|
9464
9636
|
$namespace = 'mpfd' or $namespace = 'ogc' or $namespace = 'ogc-white-paper' -->
|
9465
9637
|
<!-- Example: [1] ISO 9:1995, Information and documentation – Transliteration of Cyrillic characters into Latin characters – Slavic and non-Slavic languages -->
|
9466
9638
|
<fo:list-block id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-list-style">
|
9467
9639
|
<fo:list-item>
|
9468
9640
|
<fo:list-item-label end-indent="label-end()">
|
9469
|
-
<fo:block>
|
9470
|
-
<fo:inline>
|
9641
|
+
<fo:block role="SKIP">
|
9642
|
+
<fo:inline role="SKIP">
|
9471
9643
|
|
9472
9644
|
<xsl:apply-templates select="*[local-name() = 'biblio-tag']">
|
9473
9645
|
<xsl:with-param name="biblio_tag_part">first</xsl:with-param>
|
@@ -9476,7 +9648,7 @@
|
|
9476
9648
|
</fo:block>
|
9477
9649
|
</fo:list-item-label>
|
9478
9650
|
<fo:list-item-body start-indent="body-start()">
|
9479
|
-
<fo:block xsl:use-attribute-sets="bibitem-non-normative-list-body-style">
|
9651
|
+
<fo:block xsl:use-attribute-sets="bibitem-non-normative-list-body-style" role="SKIP">
|
9480
9652
|
<xsl:call-template name="processBibitem">
|
9481
9653
|
<xsl:with-param name="biblio_tag_part">last</xsl:with-param>
|
9482
9654
|
</xsl:call-template>
|
@@ -9487,6 +9659,35 @@
|
|
9487
9659
|
|
9488
9660
|
</xsl:template> <!-- references[not(@normative='true')]/bibitem -->
|
9489
9661
|
|
9662
|
+
<xsl:template name="insertListItem_Bibitem">
|
9663
|
+
<xsl:choose>
|
9664
|
+
<xsl:when test="@hidden = 'true'"><!-- skip --></xsl:when>
|
9665
|
+
<xsl:otherwise>
|
9666
|
+
<fo:list-item id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-list-item-style">
|
9667
|
+
<fo:list-item-label end-indent="label-end()">
|
9668
|
+
<fo:block role="SKIP">
|
9669
|
+
<fo:inline role="SKIP">
|
9670
|
+
<xsl:apply-templates select="*[local-name() = 'biblio-tag']">
|
9671
|
+
<xsl:with-param name="biblio_tag_part">first</xsl:with-param>
|
9672
|
+
</xsl:apply-templates>
|
9673
|
+
</fo:inline>
|
9674
|
+
</fo:block>
|
9675
|
+
</fo:list-item-label>
|
9676
|
+
<fo:list-item-body start-indent="body-start()">
|
9677
|
+
<fo:block xsl:use-attribute-sets="bibitem-non-normative-list-body-style" role="SKIP">
|
9678
|
+
<xsl:call-template name="processBibitem">
|
9679
|
+
<xsl:with-param name="biblio_tag_part">last</xsl:with-param>
|
9680
|
+
</xsl:call-template>
|
9681
|
+
</fo:block>
|
9682
|
+
</fo:list-item-body>
|
9683
|
+
</fo:list-item>
|
9684
|
+
</xsl:otherwise>
|
9685
|
+
</xsl:choose>
|
9686
|
+
<xsl:apply-templates select="following-sibling::*[1][local-name() = 'bibitem']">
|
9687
|
+
<xsl:with-param name="skip">false</xsl:with-param>
|
9688
|
+
</xsl:apply-templates>
|
9689
|
+
</xsl:template>
|
9690
|
+
|
9490
9691
|
<xsl:template name="processBibitem">
|
9491
9692
|
<xsl:param name="biblio_tag_part">both</xsl:param>
|
9492
9693
|
|
@@ -9698,7 +9899,7 @@
|
|
9698
9899
|
<xsl:for-each select="*[local-name() = 'tab']">
|
9699
9900
|
<xsl:variable name="current_id" select="generate-id()"/>
|
9700
9901
|
<fo:table-cell>
|
9701
|
-
<fo:block line-height-shift-adjustment="disregard-shifts">
|
9902
|
+
<fo:block line-height-shift-adjustment="disregard-shifts" role="SKIP">
|
9702
9903
|
<xsl:call-template name="insert_basic_link">
|
9703
9904
|
<xsl:with-param name="element">
|
9704
9905
|
<fo:basic-link internal-destination="{$target}" fox:alt-text="{.}">
|
@@ -9716,7 +9917,7 @@
|
|
9716
9917
|
</xsl:for-each>
|
9717
9918
|
<!-- last column - for page numbers -->
|
9718
9919
|
<fo:table-cell text-align="right" font-size="10pt" font-weight="bold" font-family="Arial">
|
9719
|
-
<fo:block>
|
9920
|
+
<fo:block role="SKIP">
|
9720
9921
|
<xsl:call-template name="insert_basic_link">
|
9721
9922
|
<xsl:with-param name="element">
|
9722
9923
|
<fo:basic-link internal-destination="{$target}" fox:alt-text="{.}">
|
@@ -0,0 +1,34 @@
|
|
1
|
+
== copyright-statement
|
2
|
+
=== {blank}
|
3
|
+
© {{ docyear }} The Calendaring and Scheduling Consortium, Inc.
|
4
|
+
|
5
|
+
{% if unpublished %}
|
6
|
+
== license-statement
|
7
|
+
=== Warning for Drafts
|
8
|
+
This document is not a CalConnect Standard. It is distributed for review and
|
9
|
+
comment, and is subject to change without notice and may not be referred to as
|
10
|
+
a Standard. Recipients of this draft are invited to submit, with their
|
11
|
+
comments, notification of any relevant patent rights of which they are aware
|
12
|
+
and to provide supporting documentation.
|
13
|
+
{% endif %}
|
14
|
+
|
15
|
+
== legal-statement
|
16
|
+
=== {blank}
|
17
|
+
All rights reserved. Unless otherwise specified, no part of this
|
18
|
+
publication may be reproduced or utilized otherwise in any form or by any
|
19
|
+
means, electronic or mechanical, including photocopying, or posting on the
|
20
|
+
internet or an intranet, without prior written permission. Permission can
|
21
|
+
be requested from the address below.
|
22
|
+
|
23
|
+
== feedback-statement
|
24
|
+
=== {blank}
|
25
|
+
[[boilerplate-name]]
|
26
|
+
The Calendaring and Scheduling Consortium, Inc.
|
27
|
+
[[boilerplate-address]]
|
28
|
+
4390 Chaffin Lane +
|
29
|
+
McKinleyville +
|
30
|
+
California 95519 +
|
31
|
+
United States of America +
|
32
|
+
+
|
33
|
+
copyright@calconnect.org +
|
34
|
+
https://www.calconnect.org[www.calconnect.org]
|
data/lib/metanorma/cc/version.rb
CHANGED
data/metanorma.yml
CHANGED
@@ -26,6 +26,7 @@ header: lib/isodoc/cc/html/header.html
|
|
26
26
|
wordcoverpage: lib/isodoc/cc/html/word_cc_titlepage.html
|
27
27
|
wordintropage: lib/isodoc/cc/html/word_cc_intro.html
|
28
28
|
wordstylesheet: lib/isodoc/cc/html/wordstyle.scss
|
29
|
+
boilerplate: lib/metanorma/cc/boilerplate.adoc
|
29
30
|
webfont:
|
30
31
|
- "https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,400i,700"
|
31
32
|
- "https://fonts.googleapis.com/css2?family=Source+Code+Pro:ital,wght@0,400;0,700;1,400;1,700"
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: metanorma-cc
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.2.
|
4
|
+
version: 2.2.12
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Ribose Inc.
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2023-
|
11
|
+
date: 2023-07-07 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: metanorma-generic
|
@@ -215,7 +215,7 @@ files:
|
|
215
215
|
- lib/metanorma/cc/basicdoc.rng
|
216
216
|
- lib/metanorma/cc/biblio-standoc.rng
|
217
217
|
- lib/metanorma/cc/biblio.rng
|
218
|
-
- lib/metanorma/cc/boilerplate.
|
218
|
+
- lib/metanorma/cc/boilerplate.adoc
|
219
219
|
- lib/metanorma/cc/cc.rng
|
220
220
|
- lib/metanorma/cc/converter.rb
|
221
221
|
- lib/metanorma/cc/isodoc.rng
|
@@ -1,46 +0,0 @@
|
|
1
|
-
<boilerplate>
|
2
|
-
<copyright-statement>
|
3
|
-
<clause>
|
4
|
-
<p>© {{ docyear }} The Calendaring and Scheduling Consortium, Inc. </p>
|
5
|
-
</clause>
|
6
|
-
</copyright-statement>
|
7
|
-
|
8
|
-
{% if unpublished %}
|
9
|
-
<license-statement>
|
10
|
-
<clause>
|
11
|
-
<title>Warning for Drafts</title>
|
12
|
-
<p>This document is not a CalConnect Standard. It is distributed for review and
|
13
|
-
comment, and is subject to change without notice and may not be referred to as
|
14
|
-
a Standard. Recipients of this draft are invited to submit, with their
|
15
|
-
comments, notification of any relevant patent rights of which they are aware
|
16
|
-
and to provide supporting documentation.
|
17
|
-
</p>
|
18
|
-
</clause>
|
19
|
-
</license-statement>
|
20
|
-
{% endif %}
|
21
|
-
|
22
|
-
<legal-statement>
|
23
|
-
<clause>
|
24
|
-
<p>All rights reserved. Unless otherwise specified, no part of this
|
25
|
-
publication may be reproduced or utilized otherwise in any form or by any
|
26
|
-
means, electronic or mechanical, including photocopying, or posting on the
|
27
|
-
internet or an intranet, without prior written permission. Permission can
|
28
|
-
be requested from the address below. </p>
|
29
|
-
</clause>
|
30
|
-
</legal-statement>
|
31
|
-
|
32
|
-
<feedback-statement>
|
33
|
-
<clause>
|
34
|
-
<p id="boilerplate-name">The Calendaring and Scheduling Consortium, Inc.</p>
|
35
|
-
<p id="boilerplate-address">4390 Chaffin Lane<br />
|
36
|
-
McKinleyville<br />
|
37
|
-
California 95519<br />
|
38
|
-
United States of America<br />
|
39
|
-
<br />
|
40
|
-
<link target="mailto:copyright@calconnect.org">copyright@calconnect.org</link><br />
|
41
|
-
<link target="www.calconnect.org">www.calconnect.org</link>
|
42
|
-
</p>
|
43
|
-
</clause>
|
44
|
-
</feedback-statement>
|
45
|
-
</boilerplate>
|
46
|
-
|