metanorma-itu 2.2.11 → 2.2.13
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/isodoc/itu/itu.implementers-guide.xsl +167 -46
- data/lib/isodoc/itu/itu.in-force.xsl +167 -46
- data/lib/isodoc/itu/itu.recommendation-annex.xsl +167 -46
- data/lib/isodoc/itu/itu.recommendation-supplement.xsl +167 -46
- data/lib/isodoc/itu/itu.recommendation.xsl +167 -46
- data/lib/isodoc/itu/itu.resolution.xsl +167 -46
- data/lib/isodoc/itu/itu.service-publication.xsl +167 -46
- data/lib/isodoc/itu/itu.technical-paper.xsl +167 -46
- data/lib/isodoc/itu/itu.technical-report.xsl +167 -46
- data/lib/metanorma/itu/boilerplate.adoc +50 -0
- data/lib/metanorma/itu/converter.rb +4 -0
- data/lib/metanorma/itu/isodoc.rng +18 -0
- data/lib/metanorma/itu/version.rb +1 -1
- metadata +3 -3
- data/lib/metanorma/itu/boilerplate.xml +0 -52
@@ -363,6 +363,9 @@
|
|
363
363
|
<fo:page-sequence master-reference="SP-first-page" force-page-count="no-force">
|
364
364
|
<fo:flow flow-name="xsl-region-body">
|
365
365
|
<fo:block font-size="10pt" font-style="italic" text-align="center">
|
366
|
+
<xsl:if test="$lang = 'ar'"> <!-- to prevent rendering `###` due the missing Arabic glyphs in the italic font (Times New Roman) -->
|
367
|
+
<xsl:attribute name="font-style">normal</xsl:attribute>
|
368
|
+
</xsl:if>
|
366
369
|
<fo:block>
|
367
370
|
<xsl:call-template name="getLocalizedString">
|
368
371
|
<xsl:with-param name="key">annex_to_itu_ob</xsl:with-param>
|
@@ -1095,6 +1098,9 @@
|
|
1095
1098
|
<xsl:variable name="subtitle" select="/itu:itu-standard/itu:bibdata/itu:title[@type = 'subtitle' and @language = $lang]"/>
|
1096
1099
|
<xsl:if test="$subtitle != ''">
|
1097
1100
|
<fo:block margin-top="18pt" font-weight="normal" font-style="italic">
|
1101
|
+
<xsl:if test="$lang = 'ar'"> <!-- to prevent rendering `###` due the missing Arabic glyphs in the italic font (Times New Roman) -->
|
1102
|
+
<xsl:attribute name="font-style">normal</xsl:attribute>
|
1103
|
+
</xsl:if>
|
1098
1104
|
<xsl:value-of select="$subtitle"/>
|
1099
1105
|
</fo:block>
|
1100
1106
|
</xsl:if>
|
@@ -1103,6 +1109,9 @@
|
|
1103
1109
|
<xsl:if test="$doctype = 'resolution' and $resolution-placedate != ''">
|
1104
1110
|
<fo:block font-size="11pt" margin-top="6pt" font-weight="normal">
|
1105
1111
|
<fo:inline font-style="italic">
|
1112
|
+
<xsl:if test="$lang = 'ar'"> <!-- to prevent rendering `###` due the missing Arabic glyphs in the italic font (Times New Roman) -->
|
1113
|
+
<xsl:attribute name="font-style">normal</xsl:attribute>
|
1114
|
+
</xsl:if>
|
1106
1115
|
<xsl:text>(</xsl:text><xsl:value-of select="$resolution-placedate"/><xsl:text>)</xsl:text>
|
1107
1116
|
</fo:inline>
|
1108
1117
|
<xsl:apply-templates select="/itu:itu-standard/itu:bibdata/itu:note[@type = 'title-footnote']" mode="title_footnote"/>
|
@@ -1483,6 +1492,9 @@
|
|
1483
1492
|
|
1484
1493
|
<xsl:template match="itu:clause[@id='draft-warning']/itu:title" mode="caution">
|
1485
1494
|
<fo:block font-size="16pt" font-family="Times New Roman" font-style="italic" font-weight="bold" text-align="center" space-after="6pt" role="H1">
|
1495
|
+
<xsl:if test="$lang = 'ar'"> <!-- to prevent rendering `###` due the missing Arabic glyphs in the italic font (Times New Roman) -->
|
1496
|
+
<xsl:attribute name="font-style">normal</xsl:attribute>
|
1497
|
+
</xsl:if>
|
1486
1498
|
<xsl:apply-templates/>
|
1487
1499
|
<xsl:apply-templates select="following-sibling::*[1][local-name() = 'variant-title'][@type = 'sub']" mode="subtitle"/>
|
1488
1500
|
</fo:block>
|
@@ -3153,6 +3165,10 @@
|
|
3153
3165
|
</xsl:attribute-set> <!-- formula-stem-number-style -->
|
3154
3166
|
<!-- End Formula's styles -->
|
3155
3167
|
|
3168
|
+
<xsl:template name="refine_formula-stem-number-style">
|
3169
|
+
|
3170
|
+
</xsl:template>
|
3171
|
+
|
3156
3172
|
<xsl:attribute-set name="image-style">
|
3157
3173
|
<xsl:attribute name="text-align">center</xsl:attribute>
|
3158
3174
|
|
@@ -3653,13 +3669,13 @@
|
|
3653
3669
|
|
3654
3670
|
<xsl:template name="processPrefaceSectionsDefault_Contents">
|
3655
3671
|
<xsl:variable name="nodes_preface_">
|
3656
|
-
<xsl:for-each select="/*/*[local-name()='preface']/*[not(local-name() = 'note' or local-name() = 'admonition')]">
|
3672
|
+
<xsl:for-each select="/*/*[local-name()='preface']/*[not(local-name() = 'note' or local-name() = 'admonition' or @type = 'toc')]">
|
3657
3673
|
<node id="{@id}"/>
|
3658
3674
|
</xsl:for-each>
|
3659
3675
|
</xsl:variable>
|
3660
3676
|
<xsl:variable name="nodes_preface" select="xalan:nodeset($nodes_preface_)"/>
|
3661
3677
|
|
3662
|
-
<xsl:for-each select="/*/*[local-name()='preface']/*[not(local-name() = 'note' or local-name() = 'admonition')]">
|
3678
|
+
<xsl:for-each select="/*/*[local-name()='preface']/*[not(local-name() = 'note' or local-name() = 'admonition' or @type = 'toc')]">
|
3663
3679
|
<xsl:sort select="@displayorder" data-type="number"/>
|
3664
3680
|
|
3665
3681
|
<!-- process Section's title -->
|
@@ -3693,12 +3709,12 @@
|
|
3693
3709
|
<xsl:apply-templates select="." mode="contents"/>
|
3694
3710
|
</xsl:for-each>
|
3695
3711
|
|
3696
|
-
<xsl:for-each select="/*/*[local-name()='annex']">
|
3712
|
+
<!-- <xsl:for-each select="/*/*[local-name()='annex']">
|
3697
3713
|
<xsl:sort select="@displayorder" data-type="number"/>
|
3698
3714
|
<xsl:apply-templates select="." mode="contents"/>
|
3699
|
-
</xsl:for-each>
|
3715
|
+
</xsl:for-each> -->
|
3700
3716
|
|
3701
|
-
<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]">
|
3717
|
+
<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]">
|
3702
3718
|
<xsl:sort select="@displayorder" data-type="number"/>
|
3703
3719
|
<xsl:apply-templates select="." mode="contents"/>
|
3704
3720
|
</xsl:for-each>
|
@@ -4077,7 +4093,7 @@
|
|
4077
4093
|
</xsl:attribute>
|
4078
4094
|
</xsl:for-each>
|
4079
4095
|
|
4080
|
-
<xsl:variable name="isNoteOrFnExist" select="./*[local-name()='note'] or .//*[local-name()='fn'][local-name(..) != 'name'] or ./*[local-name()='source']"/>
|
4096
|
+
<xsl:variable name="isNoteOrFnExist" select="./*[local-name()='note'] or ./*[local-name()='example'] or .//*[local-name()='fn'][local-name(..) != 'name'] or ./*[local-name()='source']"/>
|
4081
4097
|
<xsl:if test="$isNoteOrFnExist = 'true'">
|
4082
4098
|
<xsl:attribute name="border-bottom">0pt solid black</xsl:attribute> <!-- set 0pt border, because there is a separete table below for footer -->
|
4083
4099
|
</xsl:if>
|
@@ -4121,7 +4137,7 @@
|
|
4121
4137
|
<xsl:apply-templates select="*[local-name()='thead']" mode="process_tbody"/>
|
4122
4138
|
</xsl:when>
|
4123
4139
|
<xsl:otherwise>
|
4124
|
-
<xsl:apply-templates select="node()[not(local-name() = 'name') and not(local-name() = 'note') and not(local-name() = 'dl') and not(local-name() = 'source') and not(local-name() = 'p') and not(local-name() = 'thead') and not(local-name() = 'tfoot')]"/> <!-- process all table' elements, except name, header, footer, note, source and dl which render separaterely -->
|
4140
|
+
<xsl:apply-templates select="node()[not(local-name() = 'name') and not(local-name() = 'note') and not(local-name() = 'example') and not(local-name() = 'dl') and not(local-name() = 'source') and not(local-name() = 'p') and not(local-name() = 'thead') and not(local-name() = 'tfoot')]"/> <!-- process all table' elements, except name, header, footer, note, source and dl which render separaterely -->
|
4125
4141
|
</xsl:otherwise>
|
4126
4142
|
</xsl:choose>
|
4127
4143
|
|
@@ -4166,7 +4182,7 @@
|
|
4166
4182
|
<fo:table-row>
|
4167
4183
|
<fo:table-cell column-number="2">
|
4168
4184
|
<xsl:copy-of select="$table-preamble"/>
|
4169
|
-
<fo:block>
|
4185
|
+
<fo:block role="SKIP">
|
4170
4186
|
<xsl:call-template name="setTrackChangesStyles">
|
4171
4187
|
<xsl:with-param name="isAdded" select="$isAdded"/>
|
4172
4188
|
<xsl:with-param name="isDeleted" select="$isDeleted"/>
|
@@ -4209,7 +4225,7 @@
|
|
4209
4225
|
<xsl:param name="continued"/>
|
4210
4226
|
<xsl:if test="normalize-space() != ''">
|
4211
4227
|
|
4212
|
-
<fo:block xsl:use-attribute-sets="table-name-style">
|
4228
|
+
<fo:block xsl:use-attribute-sets="table-name-style" role="SKIP">
|
4213
4229
|
|
4214
4230
|
<xsl:call-template name="refine_table-name-style">
|
4215
4231
|
<xsl:with-param name="continued" select="$continued"/>
|
@@ -4594,8 +4610,8 @@
|
|
4594
4610
|
<xsl:template name="table-header-title">
|
4595
4611
|
<xsl:param name="cols-count"/>
|
4596
4612
|
<!-- row for title -->
|
4597
|
-
<fo:table-row>
|
4598
|
-
<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">
|
4613
|
+
<fo:table-row role="SKIP">
|
4614
|
+
<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">
|
4599
4615
|
|
4600
4616
|
<xsl:call-template name="refine_table-header-title-style"/>
|
4601
4617
|
|
@@ -4604,7 +4620,7 @@
|
|
4604
4620
|
</xsl:apply-templates>
|
4605
4621
|
|
4606
4622
|
<xsl:if test="not(ancestor::*[local-name()='table']/*[local-name()='name'])"> <!-- to prevent empty fo:table-cell in case of missing table's name -->
|
4607
|
-
<fo:block/>
|
4623
|
+
<fo:block role="SKIP"/>
|
4608
4624
|
</xsl:if>
|
4609
4625
|
|
4610
4626
|
</fo:table-cell>
|
@@ -4639,7 +4655,7 @@
|
|
4639
4655
|
<xsl:param name="colwidths"/>
|
4640
4656
|
<xsl:param name="colgroup"/>
|
4641
4657
|
|
4642
|
-
<xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ../*[local-name()='dl'] or ..//*[local-name()='fn'][local-name(..) != 'name'] or ../*[local-name()='source'] or ../*[local-name()='p']"/>
|
4658
|
+
<xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ../*[local-name()='example'] or ../*[local-name()='dl'] or ..//*[local-name()='fn'][local-name(..) != 'name'] or ../*[local-name()='source'] or ../*[local-name()='p']"/>
|
4643
4659
|
|
4644
4660
|
<xsl:variable name="isNoteOrFnExistShowAfterTable">
|
4645
4661
|
|
@@ -4712,7 +4728,7 @@
|
|
4712
4728
|
<!-- fn will be processed inside 'note' processing -->
|
4713
4729
|
|
4714
4730
|
<xsl:if test="$doctype = 'service-publication'">
|
4715
|
-
<fo:block margin-top="7pt" margin-bottom="2pt"><fo:inline>____________</fo:inline></fo:block>
|
4731
|
+
<fo:block margin-top="7pt" margin-bottom="2pt" role="SKIP"><fo:inline>____________</fo:inline></fo:block>
|
4716
4732
|
</xsl:if>
|
4717
4733
|
|
4718
4734
|
<!-- for BSI (not PAS) display Notes before footnotes -->
|
@@ -4722,6 +4738,7 @@
|
|
4722
4738
|
<xsl:apply-templates select="../*[local-name()='p']"/>
|
4723
4739
|
<xsl:apply-templates select="../*[local-name()='dl']"/>
|
4724
4740
|
<xsl:apply-templates select="../*[local-name()='note']"/>
|
4741
|
+
<xsl:apply-templates select="../*[local-name()='example']"/>
|
4725
4742
|
<xsl:apply-templates select="../*[local-name()='source']"/>
|
4726
4743
|
|
4727
4744
|
<xsl:variable name="isDisplayRowSeparator">
|
@@ -4730,7 +4747,7 @@
|
|
4730
4747
|
|
4731
4748
|
<!-- horizontal row separator -->
|
4732
4749
|
<xsl:if test="normalize-space($isDisplayRowSeparator) = 'true'">
|
4733
|
-
<xsl:if test="../*[local-name()='note'] and normalize-space($table_fn_block) != ''">
|
4750
|
+
<xsl:if test="(../*[local-name()='note'] or ../*[local-name()='example']) and normalize-space($table_fn_block) != ''">
|
4734
4751
|
<fo:block-container border-top="0.5pt solid black" padding-left="1mm" padding-right="1mm">
|
4735
4752
|
|
4736
4753
|
<xsl:call-template name="setBordersTableArray"/>
|
@@ -4928,7 +4945,7 @@
|
|
4928
4945
|
|
4929
4946
|
<xsl:call-template name="refine_table-header-cell-style"/>
|
4930
4947
|
|
4931
|
-
<fo:block>
|
4948
|
+
<fo:block role="SKIP">
|
4932
4949
|
<xsl:apply-templates/>
|
4933
4950
|
</fo:block>
|
4934
4951
|
</fo:table-cell>
|
@@ -4981,7 +4998,7 @@
|
|
4981
4998
|
<xsl:attribute name="text-align">left</xsl:attribute>
|
4982
4999
|
</xsl:if>
|
4983
5000
|
|
4984
|
-
<fo:block>
|
5001
|
+
<fo:block role="SKIP">
|
4985
5002
|
|
4986
5003
|
<xsl:if test="$isGenerateTableIF = 'true'">
|
4987
5004
|
<xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
|
@@ -4995,13 +5012,13 @@
|
|
4995
5012
|
</fo:table-cell>
|
4996
5013
|
</xsl:template> <!-- td -->
|
4997
5014
|
|
4998
|
-
<xsl:template match="*[local-name()='table']/*[local-name()='note']" priority="2">
|
5015
|
+
<xsl:template match="*[local-name()='table']/*[local-name()='note' or local-name() = 'example']" priority="2">
|
4999
5016
|
|
5000
5017
|
<fo:block xsl:use-attribute-sets="table-note-style">
|
5001
5018
|
|
5002
5019
|
<xsl:call-template name="refine_table-note-style"/>
|
5003
5020
|
|
5004
|
-
<!-- Table's note name (NOTE, for example) -->
|
5021
|
+
<!-- Table's note/example name (NOTE, for example) -->
|
5005
5022
|
<fo:inline xsl:use-attribute-sets="table-note-name-style">
|
5006
5023
|
|
5007
5024
|
<xsl:call-template name="refine_table-note-name-style"/>
|
@@ -5015,7 +5032,7 @@
|
|
5015
5032
|
|
5016
5033
|
</xsl:template> <!-- table/note -->
|
5017
5034
|
|
5018
|
-
<xsl:template match="*[local-name()='table']/*[local-name()='note']/*[local-name()='p']" priority="2">
|
5035
|
+
<xsl:template match="*[local-name()='table']/*[local-name()='note' or local-name()='example']/*[local-name()='p']" priority="2">
|
5019
5036
|
<xsl:apply-templates/>
|
5020
5037
|
</xsl:template>
|
5021
5038
|
|
@@ -5856,7 +5873,7 @@
|
|
5856
5873
|
-->
|
5857
5874
|
<fo:table-row>
|
5858
5875
|
<fo:table-cell number-columns-spanned="2">
|
5859
|
-
<fo:block>
|
5876
|
+
<fo:block role="SKIP">
|
5860
5877
|
<xsl:call-template name="note"/>
|
5861
5878
|
</fo:block>
|
5862
5879
|
</fo:table-cell>
|
@@ -5921,7 +5938,7 @@
|
|
5921
5938
|
|
5922
5939
|
<xsl:call-template name="refine_dt-cell-style"/>
|
5923
5940
|
|
5924
|
-
<fo:block xsl:use-attribute-sets="dt-block-style">
|
5941
|
+
<fo:block xsl:use-attribute-sets="dt-block-style" role="SKIP">
|
5925
5942
|
<xsl:copy-of select="@id"/>
|
5926
5943
|
|
5927
5944
|
<xsl:if test="normalize-space($key_iso) = 'true'">
|
@@ -5951,7 +5968,7 @@
|
|
5951
5968
|
|
5952
5969
|
<xsl:call-template name="refine_dd-cell-style"/>
|
5953
5970
|
|
5954
|
-
<fo:block>
|
5971
|
+
<fo:block role="SKIP">
|
5955
5972
|
|
5956
5973
|
<xsl:if test="$isGenerateTableIF = 'true'">
|
5957
5974
|
<xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
|
@@ -6095,10 +6112,19 @@
|
|
6095
6112
|
<!-- ========================= -->
|
6096
6113
|
<xsl:template match="*[local-name()='em']">
|
6097
6114
|
<fo:inline font-style="italic">
|
6115
|
+
<xsl:call-template name="refine_italic_style"/>
|
6098
6116
|
<xsl:apply-templates/>
|
6099
6117
|
</fo:inline>
|
6100
6118
|
</xsl:template>
|
6101
6119
|
|
6120
|
+
<xsl:template name="refine_italic_style">
|
6121
|
+
|
6122
|
+
<xsl:if test="$lang = 'ar'"> <!-- to prevent rendering `###` due the missing Arabic glyphs in the italic font (Times New Roman) -->
|
6123
|
+
<xsl:attribute name="font-style">normal</xsl:attribute>
|
6124
|
+
</xsl:if>
|
6125
|
+
|
6126
|
+
</xsl:template>
|
6127
|
+
|
6102
6128
|
<xsl:template match="*[local-name()='strong'] | *[local-name()='b']">
|
6103
6129
|
<xsl:param name="split_keep-within-line"/>
|
6104
6130
|
<fo:inline font-weight="bold">
|
@@ -6321,11 +6347,41 @@
|
|
6321
6347
|
|
6322
6348
|
<xsl:template match="text()[ancestor::*[local-name()='smallcap']]">
|
6323
6349
|
<xsl:variable name="text" select="normalize-space(.)"/>
|
6324
|
-
<fo:inline font-size="75%">
|
6350
|
+
<fo:inline font-size="75%" role="SKIP">
|
6325
6351
|
<xsl:if test="string-length($text) > 0">
|
6326
|
-
<xsl:
|
6327
|
-
<xsl:
|
6328
|
-
|
6352
|
+
<xsl:variable name="smallCapsText">
|
6353
|
+
<xsl:call-template name="recursiveSmallCaps">
|
6354
|
+
<xsl:with-param name="text" select="$text"/>
|
6355
|
+
</xsl:call-template>
|
6356
|
+
</xsl:variable>
|
6357
|
+
<!-- merge neighboring fo:inline -->
|
6358
|
+
<xsl:for-each select="xalan:nodeset($smallCapsText)/node()">
|
6359
|
+
<xsl:choose>
|
6360
|
+
<xsl:when test="self::fo:inline and preceding-sibling::node()[1][self::fo:inline]"><!-- <xsl:copy-of select="."/> --></xsl:when>
|
6361
|
+
<xsl:when test="self::fo:inline and @font-size">
|
6362
|
+
<xsl:variable name="curr_pos" select="count(preceding-sibling::node()) + 1"/>
|
6363
|
+
<!-- <curr_pos><xsl:value-of select="$curr_pos"/></curr_pos> -->
|
6364
|
+
<xsl:variable name="next_text_" select="count(following-sibling::node()[not(local-name() = 'inline')][1]/preceding-sibling::node())"/>
|
6365
|
+
<xsl:variable name="next_text">
|
6366
|
+
<xsl:choose>
|
6367
|
+
<xsl:when test="$next_text_ = 0">99999999</xsl:when>
|
6368
|
+
<xsl:otherwise><xsl:value-of select="$next_text_ + 1"/></xsl:otherwise>
|
6369
|
+
</xsl:choose>
|
6370
|
+
</xsl:variable>
|
6371
|
+
<!-- <next_text><xsl:value-of select="$next_text"/></next_text> -->
|
6372
|
+
<fo:inline>
|
6373
|
+
<xsl:copy-of select="@*"/>
|
6374
|
+
<xsl:copy-of select="./node()"/>
|
6375
|
+
<xsl:for-each select="following-sibling::node()[position() < $next_text - $curr_pos]"> <!-- [self::fo:inline] -->
|
6376
|
+
<xsl:copy-of select="./node()"/>
|
6377
|
+
</xsl:for-each>
|
6378
|
+
</fo:inline>
|
6379
|
+
</xsl:when>
|
6380
|
+
<xsl:otherwise>
|
6381
|
+
<xsl:copy-of select="."/>
|
6382
|
+
</xsl:otherwise>
|
6383
|
+
</xsl:choose>
|
6384
|
+
</xsl:for-each>
|
6329
6385
|
</xsl:if>
|
6330
6386
|
</fo:inline>
|
6331
6387
|
</xsl:template>
|
@@ -6337,7 +6393,7 @@
|
|
6337
6393
|
<xsl:variable name="upperCase" select="java:toUpperCase(java:java.lang.String.new($char))"/>
|
6338
6394
|
<xsl:choose>
|
6339
6395
|
<xsl:when test="$char=$upperCase">
|
6340
|
-
<fo:inline font-size="{100 div 0.75}%">
|
6396
|
+
<fo:inline font-size="{100 div 0.75}%" role="SKIP">
|
6341
6397
|
<xsl:value-of select="$upperCase"/>
|
6342
6398
|
</fo:inline>
|
6343
6399
|
</xsl:when>
|
@@ -6499,6 +6555,10 @@
|
|
6499
6555
|
|
6500
6556
|
<xsl:when test="not(contains($text, $separator))">
|
6501
6557
|
<word>
|
6558
|
+
<xsl:if test="ancestor::*[local-name() = 'p'][@from_dl = 'true']">
|
6559
|
+
<xsl:text>
|
6560
|
+
</xsl:text> <!-- to add distance between dt and dd -->
|
6561
|
+
</xsl:if>
|
6502
6562
|
<xsl:call-template name="enclose_text_in_tags">
|
6503
6563
|
<xsl:with-param name="text" select="normalize-space($text)"/>
|
6504
6564
|
<xsl:with-param name="tags" select="$tags"/>
|
@@ -6507,6 +6567,10 @@
|
|
6507
6567
|
</xsl:when>
|
6508
6568
|
<xsl:otherwise>
|
6509
6569
|
<word>
|
6570
|
+
<xsl:if test="ancestor::*[local-name() = 'p'][@from_dl = 'true']">
|
6571
|
+
<xsl:text>
|
6572
|
+
</xsl:text> <!-- to add distance between dt and dd -->
|
6573
|
+
</xsl:if>
|
6510
6574
|
<xsl:call-template name="enclose_text_in_tags">
|
6511
6575
|
<xsl:with-param name="text" select="normalize-space(substring-before($text, $separator))"/>
|
6512
6576
|
<xsl:with-param name="tags" select="$tags"/>
|
@@ -6690,6 +6754,10 @@
|
|
6690
6754
|
<xsl:template name="getSimpleTable">
|
6691
6755
|
<xsl:param name="id"/>
|
6692
6756
|
|
6757
|
+
<!-- <test0>
|
6758
|
+
<xsl:copy-of select="."/>
|
6759
|
+
</test0> -->
|
6760
|
+
|
6693
6761
|
<xsl:variable name="simple-table">
|
6694
6762
|
|
6695
6763
|
<!-- Step 0. replace <br/> to <p>...</p> -->
|
@@ -7735,7 +7803,7 @@
|
|
7735
7803
|
<fo:table-body>
|
7736
7804
|
<fo:table-row>
|
7737
7805
|
<fo:table-cell display-align="center">
|
7738
|
-
<fo:block xsl:use-attribute-sets="formula-stem-block-style">
|
7806
|
+
<fo:block xsl:use-attribute-sets="formula-stem-block-style" role="SKIP">
|
7739
7807
|
|
7740
7808
|
<xsl:call-template name="refine_formula-stem-block-style"/>
|
7741
7809
|
|
@@ -7743,7 +7811,10 @@
|
|
7743
7811
|
</fo:block>
|
7744
7812
|
</fo:table-cell>
|
7745
7813
|
<fo:table-cell display-align="center">
|
7746
|
-
<fo:block xsl:use-attribute-sets="formula-stem-number-style">
|
7814
|
+
<fo:block xsl:use-attribute-sets="formula-stem-number-style" role="SKIP">
|
7815
|
+
|
7816
|
+
<xsl:call-template name="refine_formula-stem-number-style"/>
|
7817
|
+
|
7747
7818
|
<xsl:apply-templates select="../*[local-name() = 'name']"/>
|
7748
7819
|
</fo:block>
|
7749
7820
|
</fo:table-cell>
|
@@ -9261,7 +9332,7 @@
|
|
9261
9332
|
<!-- second td with sourcecode -->
|
9262
9333
|
<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'] -->
|
9263
9334
|
<fo:table-cell>
|
9264
|
-
<fo:block>
|
9335
|
+
<fo:block role="SKIP">
|
9265
9336
|
<xsl:apply-templates/>
|
9266
9337
|
</fo:block>
|
9267
9338
|
</fo:table-cell>
|
@@ -9748,7 +9819,7 @@
|
|
9748
9819
|
|
9749
9820
|
<xsl:call-template name="setTableCellAttributes"/>
|
9750
9821
|
|
9751
|
-
<fo:block>
|
9822
|
+
<fo:block role="SKIP">
|
9752
9823
|
<xsl:apply-templates/>
|
9753
9824
|
</fo:block>
|
9754
9825
|
</fo:table-cell>
|
@@ -9770,7 +9841,7 @@
|
|
9770
9841
|
|
9771
9842
|
<xsl:call-template name="setTableCellAttributes"/>
|
9772
9843
|
|
9773
|
-
<fo:block>
|
9844
|
+
<fo:block role="SKIP">
|
9774
9845
|
<xsl:apply-templates/>
|
9775
9846
|
</fo:block>
|
9776
9847
|
</fo:table-cell>
|
@@ -9965,6 +10036,12 @@
|
|
9965
10036
|
|
9966
10037
|
</xsl:template>
|
9967
10038
|
|
10039
|
+
<xsl:template match="*[local-name() = 'table']/*[local-name() = 'example']/*[local-name() = 'name']">
|
10040
|
+
<fo:inline xsl:use-attribute-sets="example-name-style">
|
10041
|
+
<xsl:apply-templates/>
|
10042
|
+
</fo:inline>
|
10043
|
+
</xsl:template>
|
10044
|
+
|
9968
10045
|
<xsl:template match="*[local-name() = 'example']/*[local-name() = 'p']">
|
9969
10046
|
<xsl:param name="fo_element">block</xsl:param>
|
9970
10047
|
|
@@ -10545,6 +10622,50 @@
|
|
10545
10622
|
<xsl:otherwise><xsl:call-template name="setULLabel"/></xsl:otherwise>
|
10546
10623
|
</xsl:choose>
|
10547
10624
|
</xsl:when>
|
10625
|
+
<xsl:when test="local-name(..) = 'ol' and @label"> <!-- for ordered lists 'ol', and if there is @label, for instance label="1.1.2" -->
|
10626
|
+
|
10627
|
+
<xsl:variable name="label">
|
10628
|
+
|
10629
|
+
<xsl:variable name="type" select="../@type"/>
|
10630
|
+
|
10631
|
+
<xsl:variable name="style_prefix_">
|
10632
|
+
<xsl:if test="$type = 'roman'">
|
10633
|
+
<!-- Example: (i) -->
|
10634
|
+
</xsl:if>
|
10635
|
+
</xsl:variable>
|
10636
|
+
<xsl:variable name="style_prefix" select="normalize-space($style_prefix_)"/>
|
10637
|
+
|
10638
|
+
<xsl:variable name="style_suffix_">
|
10639
|
+
<xsl:choose>
|
10640
|
+
<xsl:when test="$type = 'arabic'">
|
10641
|
+
)
|
10642
|
+
</xsl:when>
|
10643
|
+
<xsl:when test="$type = 'alphabet' or $type = 'alphabetic'">
|
10644
|
+
)
|
10645
|
+
</xsl:when>
|
10646
|
+
<xsl:when test="$type = 'alphabet_upper' or $type = 'alphabetic_upper'">
|
10647
|
+
.
|
10648
|
+
</xsl:when>
|
10649
|
+
<xsl:when test="$type = 'roman'">
|
10650
|
+
)
|
10651
|
+
</xsl:when>
|
10652
|
+
<xsl:when test="$type = 'roman_upper'">.</xsl:when> <!-- Example: I. -->
|
10653
|
+
</xsl:choose>
|
10654
|
+
</xsl:variable>
|
10655
|
+
<xsl:variable name="style_suffix" select="normalize-space($style_suffix_)"/>
|
10656
|
+
|
10657
|
+
<xsl:if test="$style_prefix != '' and not(starts-with(@label, $style_prefix))">
|
10658
|
+
<xsl:value-of select="$style_prefix"/>
|
10659
|
+
</xsl:if>
|
10660
|
+
<xsl:value-of select="@label"/>
|
10661
|
+
<xsl:if test="not(java:endsWith(java:java.lang.String.new(@label),$style_suffix))">
|
10662
|
+
<xsl:value-of select="$style_suffix"/>
|
10663
|
+
</xsl:if>
|
10664
|
+
</xsl:variable>
|
10665
|
+
|
10666
|
+
<xsl:value-of select="normalize-space($label)"/>
|
10667
|
+
|
10668
|
+
</xsl:when>
|
10548
10669
|
<xsl:otherwise> <!-- for ordered lists 'ol' -->
|
10549
10670
|
|
10550
10671
|
<!-- Example: for BSI <?list-start 2?> -->
|
@@ -10602,10 +10723,10 @@
|
|
10602
10723
|
<xsl:when test="$type = 'arabic'">
|
10603
10724
|
1)
|
10604
10725
|
</xsl:when>
|
10605
|
-
<xsl:when test="$type = 'alphabet'">
|
10726
|
+
<xsl:when test="$type = 'alphabet' or $type = 'alphabetic'">
|
10606
10727
|
a)
|
10607
10728
|
</xsl:when>
|
10608
|
-
<xsl:when test="$type = 'alphabet_upper'">
|
10729
|
+
<xsl:when test="$type = 'alphabet_upper' or $type = 'alphabetic_upper'">
|
10609
10730
|
A.
|
10610
10731
|
</xsl:when>
|
10611
10732
|
<xsl:when test="$type = 'roman'">
|
@@ -10736,7 +10857,7 @@
|
|
10736
10857
|
<xsl:call-template name="refine_list-item-style"/>
|
10737
10858
|
|
10738
10859
|
<fo:list-item-label end-indent="label-end()">
|
10739
|
-
<fo:block xsl:use-attribute-sets="list-item-label-style">
|
10860
|
+
<fo:block xsl:use-attribute-sets="list-item-label-style" role="SKIP">
|
10740
10861
|
|
10741
10862
|
<xsl:call-template name="refine_list-item-label-style"/>
|
10742
10863
|
|
@@ -10750,7 +10871,7 @@
|
|
10750
10871
|
</fo:block>
|
10751
10872
|
</fo:list-item-label>
|
10752
10873
|
<fo:list-item-body start-indent="body-start()" xsl:use-attribute-sets="list-item-body-style">
|
10753
|
-
<fo:block>
|
10874
|
+
<fo:block role="SKIP">
|
10754
10875
|
|
10755
10876
|
<xsl:call-template name="refine_list-item-body-style"/>
|
10756
10877
|
|
@@ -11029,10 +11150,10 @@
|
|
11029
11150
|
<fo:table-body>
|
11030
11151
|
<fo:table-row text-align="center" font-weight="bold" background-color="black" color="white">
|
11031
11152
|
|
11032
|
-
<fo:table-cell border="1pt solid black"><fo:block>Date</fo:block></fo:table-cell>
|
11033
|
-
<fo:table-cell border="1pt solid black"><fo:block>Type</fo:block></fo:table-cell>
|
11034
|
-
<fo:table-cell border="1pt solid black"><fo:block>Change</fo:block></fo:table-cell>
|
11035
|
-
<fo:table-cell border="1pt solid black"><fo:block>Pages</fo:block></fo:table-cell>
|
11153
|
+
<fo:table-cell border="1pt solid black"><fo:block role="SKIP">Date</fo:block></fo:table-cell>
|
11154
|
+
<fo:table-cell border="1pt solid black"><fo:block role="SKIP">Type</fo:block></fo:table-cell>
|
11155
|
+
<fo:table-cell border="1pt solid black"><fo:block role="SKIP">Change</fo:block></fo:table-cell>
|
11156
|
+
<fo:table-cell border="1pt solid black"><fo:block role="SKIP">Pages</fo:block></fo:table-cell>
|
11036
11157
|
</fo:table-row>
|
11037
11158
|
<xsl:apply-templates/>
|
11038
11159
|
</fo:table-body>
|
@@ -11047,7 +11168,7 @@
|
|
11047
11168
|
|
11048
11169
|
<xsl:template match="*[local-name() = 'errata']/*[local-name() = 'row']/*">
|
11049
11170
|
<fo:table-cell border="1pt solid black" padding-left="1mm" padding-top="0.5mm">
|
11050
|
-
<fo:block><xsl:apply-templates/></fo:block>
|
11171
|
+
<fo:block role="SKIP"><xsl:apply-templates/></fo:block>
|
11051
11172
|
</fo:table-cell>
|
11052
11173
|
</xsl:template>
|
11053
11174
|
<!-- ============ -->
|
@@ -11150,8 +11271,8 @@
|
|
11150
11271
|
<fo:table-column column-width="80%"/>
|
11151
11272
|
<fo:table-body>
|
11152
11273
|
<fo:table-row>
|
11153
|
-
<fo:table-cell><fo:block><xsl:value-of select="$bibitem_label"/></fo:block></fo:table-cell>
|
11154
|
-
<fo:table-cell><fo:block><xsl:copy-of select="$bibitem_body"/></fo:block></fo:table-cell>
|
11274
|
+
<fo:table-cell><fo:block role="SKIP"><xsl:value-of select="$bibitem_label"/></fo:block></fo:table-cell>
|
11275
|
+
<fo:table-cell><fo:block role="SKIP"><xsl:copy-of select="$bibitem_body"/></fo:block></fo:table-cell>
|
11155
11276
|
</fo:table-row>
|
11156
11277
|
</fo:table-body>
|
11157
11278
|
</fo:table>
|
@@ -11378,7 +11499,7 @@
|
|
11378
11499
|
<xsl:for-each select="*[local-name() = 'tab']">
|
11379
11500
|
<xsl:variable name="current_id" select="generate-id()"/>
|
11380
11501
|
<fo:table-cell>
|
11381
|
-
<fo:block line-height-shift-adjustment="disregard-shifts">
|
11502
|
+
<fo:block line-height-shift-adjustment="disregard-shifts" role="SKIP">
|
11382
11503
|
<xsl:call-template name="insert_basic_link">
|
11383
11504
|
<xsl:with-param name="element">
|
11384
11505
|
<fo:basic-link internal-destination="{$target}" fox:alt-text="{.}">
|
@@ -11396,7 +11517,7 @@
|
|
11396
11517
|
</xsl:for-each>
|
11397
11518
|
<!-- last column - for page numbers -->
|
11398
11519
|
<fo:table-cell text-align="right" font-size="10pt" font-weight="bold" font-family="Arial">
|
11399
|
-
<fo:block>
|
11520
|
+
<fo:block role="SKIP">
|
11400
11521
|
<xsl:call-template name="insert_basic_link">
|
11401
11522
|
<xsl:with-param name="element">
|
11402
11523
|
<fo:basic-link internal-destination="{$target}" fox:alt-text="{.}">
|