metanorma-iso 2.4.5 → 2.4.6

Sign up to get free protection for your applications and to get access to all the features.
@@ -1497,9 +1497,13 @@
1497
1497
  <xsl:otherwise>
1498
1498
 
1499
1499
  <fo:block-container font-weight="bold">
1500
+
1501
+ <!-- render 'Contents' outside if role="TOC" -->
1502
+ <xsl:apply-templates select="*[local-name() = 'title']"/>
1503
+
1500
1504
  <fo:block role="TOC">
1501
1505
 
1502
- <xsl:apply-templates/>
1506
+ <xsl:apply-templates select="node()[not(local-name() = 'title')]"/>
1503
1507
 
1504
1508
  <xsl:if test="count(*) = 1 and *[local-name() = 'title']"> <!-- if there isn't user ToC -->
1505
1509
 
@@ -1520,45 +1524,51 @@
1520
1524
  <xsl:if test="@level = 3">
1521
1525
  <xsl:attribute name="margin-top">-0.7pt</xsl:attribute>
1522
1526
  </xsl:if>
1523
- <fo:list-block>
1524
- <xsl:attribute name="margin-left"><xsl:value-of select="$margin-left * (@level - 1)"/>mm</xsl:attribute>
1525
- <xsl:if test="@level &gt;= 2 or @type = 'annex'">
1526
- <xsl:attribute name="font-weight">normal</xsl:attribute>
1527
- </xsl:if>
1528
- <xsl:attribute name="provisional-distance-between-starts">
1529
- <xsl:choose>
1530
- <!-- skip 0 section without subsections -->
1531
- <xsl:when test="@level &gt;= 3"><xsl:value-of select="$margin-left * 1.2"/>mm</xsl:when>
1532
- <xsl:when test="@section != ''"><xsl:value-of select="$margin-left"/>mm</xsl:when>
1533
- <xsl:otherwise>0mm</xsl:otherwise>
1534
- </xsl:choose>
1535
- </xsl:attribute>
1536
- <fo:list-item>
1537
- <fo:list-item-label end-indent="label-end()">
1538
- <fo:block>
1539
- <xsl:value-of select="@section"/>
1540
- </fo:block>
1541
- </fo:list-item-label>
1542
- <fo:list-item-body start-indent="body-start()">
1543
- <fo:block text-align-last="justify" margin-left="12mm" text-indent="-12mm">
1544
- <fo:basic-link internal-destination="{@id}" fox:alt-text="{title}">
1545
-
1546
- <xsl:apply-templates select="title"/>
1547
-
1548
- <fo:inline keep-together.within-line="always">
1549
- <fo:leader font-size="9pt" font-weight="normal" leader-pattern="dots"/>
1550
- <fo:inline>
1551
- <xsl:if test="@level = 1 and @type = 'annex'">
1552
- <xsl:attribute name="font-weight">bold</xsl:attribute>
1553
- </xsl:if>
1554
- <fo:page-number-citation ref-id="{@id}"/>
1527
+
1528
+ <fo:basic-link internal-destination="{@id}" fox:alt-text="{@section} {title}"> <!-- link at this level needs for PDF structure tags -->
1529
+
1530
+ <fo:list-block role="SKIP">
1531
+ <xsl:attribute name="margin-left"><xsl:value-of select="$margin-left * (@level - 1)"/>mm</xsl:attribute>
1532
+ <xsl:if test="@level &gt;= 2 or @type = 'annex'">
1533
+ <xsl:attribute name="font-weight">normal</xsl:attribute>
1534
+ </xsl:if>
1535
+ <xsl:attribute name="provisional-distance-between-starts">
1536
+ <xsl:choose>
1537
+ <!-- skip 0 section without subsections -->
1538
+ <xsl:when test="@level &gt;= 3"><xsl:value-of select="$margin-left * 1.2"/>mm</xsl:when>
1539
+ <xsl:when test="@section != ''"><xsl:value-of select="$margin-left"/>mm</xsl:when>
1540
+ <xsl:otherwise>0mm</xsl:otherwise>
1541
+ </xsl:choose>
1542
+ </xsl:attribute>
1543
+ <fo:list-item role="SKIP">
1544
+ <fo:list-item-label end-indent="label-end()" role="SKIP">
1545
+ <fo:block role="SKIP">
1546
+ <xsl:value-of select="@section"/>
1547
+ </fo:block>
1548
+ </fo:list-item-label>
1549
+ <fo:list-item-body start-indent="body-start()" role="SKIP">
1550
+ <fo:block text-align-last="justify" margin-left="12mm" text-indent="-12mm" role="SKIP">
1551
+ <fo:basic-link internal-destination="{@id}" fox:alt-text="{title}" role="SKIP">
1552
+
1553
+ <xsl:apply-templates select="title"/>
1554
+
1555
+ <fo:inline keep-together.within-line="always" role="SKIP">
1556
+ <fo:leader font-size="9pt" font-weight="normal" leader-pattern="dots"/>
1557
+ <fo:inline role="SKIP">
1558
+ <xsl:if test="@level = 1 and @type = 'annex'">
1559
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
1560
+ </xsl:if>
1561
+ <fo:wrapper role="artifact">
1562
+ <fo:page-number-citation ref-id="{@id}"/>
1563
+ </fo:wrapper>
1564
+ </fo:inline>
1555
1565
  </fo:inline>
1556
- </fo:inline>
1557
- </fo:basic-link>
1558
- </fo:block>
1559
- </fo:list-item-body>
1560
- </fo:list-item>
1561
- </fo:list-block>
1566
+ </fo:basic-link>
1567
+ </fo:block>
1568
+ </fo:list-item-body>
1569
+ </fo:list-item>
1570
+ </fo:list-block>
1571
+ </fo:basic-link>
1562
1572
  </fo:block>
1563
1573
 
1564
1574
  </xsl:for-each>
@@ -1592,16 +1602,16 @@
1592
1602
 
1593
1603
  <xsl:template match="iso:preface/iso:clause[@type = 'toc']/iso:title" priority="3">
1594
1604
  <fo:block text-align-last="justify" font-size="16pt" margin-top="10pt" margin-bottom="18pt">
1595
- <fo:inline font-size="16pt" font-weight="bold" role="H1">
1605
+ <fo:inline font-size="16pt" font-weight="bold" role="SKIP">
1596
1606
  <!-- Contents -->
1597
1607
  <!-- <xsl:call-template name="getLocalizedString">
1598
1608
  <xsl:with-param name="key">table_of_contents</xsl:with-param>
1599
1609
  </xsl:call-template> -->
1600
1610
  <xsl:apply-templates/>
1601
1611
  </fo:inline>
1602
- <fo:inline keep-together.within-line="always">
1612
+ <fo:inline keep-together.within-line="always" role="SKIP">
1603
1613
  <fo:leader leader-pattern="space"/>
1604
- <fo:inline font-weight="normal" font-size="10pt">
1614
+ <fo:inline font-weight="normal" font-size="10pt" role="SKIP">
1605
1615
  <!-- Page -->
1606
1616
  <xsl:call-template name="getLocalizedString">
1607
1617
  <xsl:with-param name="key">locality.page</xsl:with-param>
@@ -2031,6 +2041,9 @@
2031
2041
  <xsl:attribute name="margin-bottom">0pt</xsl:attribute>
2032
2042
  <xsl:attribute name="line-height">0</xsl:attribute>
2033
2043
  </xsl:if>
2044
+ <xsl:if test="ancestor::*[local-name() = 'li' or local-name() = 'td' or local-name() = 'th' or local-name() = 'dd']">
2045
+ <xsl:attribute name="role">SKIP</xsl:attribute>
2046
+ </xsl:if>
2034
2047
  <xsl:apply-templates>
2035
2048
  <xsl:with-param name="split_keep-within-line" select="$split_keep-within-line"/>
2036
2049
  </xsl:apply-templates>
@@ -3390,6 +3403,10 @@
3390
3403
  </xsl:attribute-set> <!-- formula-stem-number-style -->
3391
3404
  <!-- End Formula's styles -->
3392
3405
 
3406
+ <xsl:template name="refine_formula-stem-number-style">
3407
+
3408
+ </xsl:template>
3409
+
3393
3410
  <xsl:attribute-set name="image-style">
3394
3411
  <xsl:attribute name="text-align">center</xsl:attribute>
3395
3412
 
@@ -3886,13 +3903,13 @@
3886
3903
 
3887
3904
  <xsl:template name="processPrefaceSectionsDefault_Contents">
3888
3905
  <xsl:variable name="nodes_preface_">
3889
- <xsl:for-each select="/*/*[local-name()='preface']/*[not(local-name() = 'note' or local-name() = 'admonition')]">
3906
+ <xsl:for-each select="/*/*[local-name()='preface']/*[not(local-name() = 'note' or local-name() = 'admonition' or @type = 'toc')]">
3890
3907
  <node id="{@id}"/>
3891
3908
  </xsl:for-each>
3892
3909
  </xsl:variable>
3893
3910
  <xsl:variable name="nodes_preface" select="xalan:nodeset($nodes_preface_)"/>
3894
3911
 
3895
- <xsl:for-each select="/*/*[local-name()='preface']/*[not(local-name() = 'note' or local-name() = 'admonition')]">
3912
+ <xsl:for-each select="/*/*[local-name()='preface']/*[not(local-name() = 'note' or local-name() = 'admonition' or @type = 'toc')]">
3896
3913
  <xsl:sort select="@displayorder" data-type="number"/>
3897
3914
 
3898
3915
  <!-- process Section's title -->
@@ -3926,12 +3943,12 @@
3926
3943
  <xsl:apply-templates select="." mode="contents"/>
3927
3944
  </xsl:for-each>
3928
3945
 
3929
- <xsl:for-each select="/*/*[local-name()='annex']">
3946
+ <!-- <xsl:for-each select="/*/*[local-name()='annex']">
3930
3947
  <xsl:sort select="@displayorder" data-type="number"/>
3931
3948
  <xsl:apply-templates select="." mode="contents"/>
3932
- </xsl:for-each>
3949
+ </xsl:for-each> -->
3933
3950
 
3934
- <xsl:for-each select="/*/*[local-name()='bibliography']/*[not(@normative='true') and not(*[local-name()='references'][@normative='true'])][count(.//*[local-name() = 'bibitem'][not(@hidden) = 'true']) &gt; 0] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]][count(.//*[local-name() = 'bibitem'][not(@hidden) = 'true']) &gt; 0]">
3951
+ <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']) &gt; 0] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]][count(.//*[local-name() = 'bibitem'][not(@hidden) = 'true']) &gt; 0]">
3935
3952
  <xsl:sort select="@displayorder" data-type="number"/>
3936
3953
  <xsl:apply-templates select="." mode="contents"/>
3937
3954
  </xsl:for-each>
@@ -4383,7 +4400,7 @@
4383
4400
  <fo:table-row>
4384
4401
  <fo:table-cell column-number="2">
4385
4402
  <xsl:copy-of select="$table-preamble"/>
4386
- <fo:block>
4403
+ <fo:block role="SKIP">
4387
4404
  <xsl:call-template name="setTrackChangesStyles">
4388
4405
  <xsl:with-param name="isAdded" select="$isAdded"/>
4389
4406
  <xsl:with-param name="isDeleted" select="$isDeleted"/>
@@ -4431,7 +4448,7 @@
4431
4448
  <xsl:param name="continued"/>
4432
4449
  <xsl:if test="normalize-space() != ''">
4433
4450
 
4434
- <fo:block xsl:use-attribute-sets="table-name-style">
4451
+ <fo:block xsl:use-attribute-sets="table-name-style" role="SKIP">
4435
4452
 
4436
4453
  <xsl:call-template name="refine_table-name-style">
4437
4454
  <xsl:with-param name="continued" select="$continued"/>
@@ -4447,10 +4464,10 @@
4447
4464
  </xsl:choose>
4448
4465
 
4449
4466
  <xsl:if test="$continued = 'true'">
4450
- <fo:inline font-weight="bold" font-style="normal">
4467
+ <fo:inline font-weight="bold" font-style="normal" role="SKIP">
4451
4468
  <fo:retrieve-table-marker retrieve-class-name="table_number"/>
4452
4469
  </fo:inline>
4453
- <fo:inline font-weight="normal" font-style="italic">
4470
+ <fo:inline font-weight="normal" font-style="italic" role="SKIP">
4454
4471
  <xsl:text> </xsl:text>
4455
4472
  <fo:retrieve-table-marker retrieve-class-name="table_continued"/>
4456
4473
  </fo:inline>
@@ -4830,8 +4847,8 @@
4830
4847
  <xsl:template name="table-header-title">
4831
4848
  <xsl:param name="cols-count"/>
4832
4849
  <!-- row for title -->
4833
- <fo:table-row>
4834
- <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">
4850
+ <fo:table-row role="SKIP">
4851
+ <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">
4835
4852
 
4836
4853
  <xsl:call-template name="refine_table-header-title-style"/>
4837
4854
 
@@ -4840,7 +4857,7 @@
4840
4857
  </xsl:apply-templates>
4841
4858
 
4842
4859
  <xsl:if test="not(ancestor::*[local-name()='table']/*[local-name()='name'])"> <!-- to prevent empty fo:table-cell in case of missing table's name -->
4843
- <fo:block/>
4860
+ <fo:block role="SKIP"/>
4844
4861
  </xsl:if>
4845
4862
 
4846
4863
  <xsl:for-each select="ancestor::*[local-name()='table'][1]">
@@ -5047,24 +5064,24 @@
5047
5064
  <xsl:variable name="title_start" select="ancestor::*[local-name()='table'][1]/*[local-name()='name']/node()[1][self::text()]"/>
5048
5065
  <xsl:variable name="table_number" select="substring-before($title_start, '—')"/>
5049
5066
 
5050
- <fo:table-row height="0" keep-with-next.within-page="always">
5051
- <fo:table-cell>
5067
+ <fo:table-row height="0" keep-with-next.within-page="always" role="SKIP">
5068
+ <fo:table-cell role="SKIP">
5052
5069
 
5053
5070
  <fo:marker marker-class-name="table_number"/>
5054
5071
  <fo:marker marker-class-name="table_continued"/>
5055
5072
 
5056
- <fo:block/>
5073
+ <fo:block role="SKIP"/>
5057
5074
  </fo:table-cell>
5058
5075
  </fo:table-row>
5059
- <fo:table-row height="0" keep-with-next.within-page="always">
5060
- <fo:table-cell>
5076
+ <fo:table-row height="0" keep-with-next.within-page="always" role="SKIP">
5077
+ <fo:table-cell role="SKIP">
5061
5078
 
5062
5079
  <fo:marker marker-class-name="table_number"><xsl:value-of select="normalize-space(translate($table_number, ' ', ' '))"/></fo:marker>
5063
5080
 
5064
5081
  <fo:marker marker-class-name="table_continued">
5065
5082
  <xsl:value-of select="$title_continued"/>
5066
5083
  </fo:marker>
5067
- <fo:block/>
5084
+ <fo:block role="SKIP"/>
5068
5085
  </fo:table-cell>
5069
5086
  </fo:table-row>
5070
5087
 
@@ -5205,7 +5222,7 @@
5205
5222
 
5206
5223
  <xsl:call-template name="refine_table-header-cell-style"/>
5207
5224
 
5208
- <fo:block>
5225
+ <fo:block role="SKIP">
5209
5226
  <xsl:apply-templates/>
5210
5227
  </fo:block>
5211
5228
  </fo:table-cell>
@@ -5258,7 +5275,7 @@
5258
5275
  <xsl:attribute name="text-align">left</xsl:attribute>
5259
5276
  </xsl:if>
5260
5277
 
5261
- <fo:block>
5278
+ <fo:block role="SKIP">
5262
5279
 
5263
5280
  <xsl:if test="$isGenerateTableIF = 'true'">
5264
5281
  <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
@@ -6141,7 +6158,7 @@
6141
6158
  -->
6142
6159
  <fo:table-row>
6143
6160
  <fo:table-cell number-columns-spanned="2">
6144
- <fo:block>
6161
+ <fo:block role="SKIP">
6145
6162
  <xsl:call-template name="note"/>
6146
6163
  </fo:block>
6147
6164
  </fo:table-cell>
@@ -6206,7 +6223,7 @@
6206
6223
 
6207
6224
  <xsl:call-template name="refine_dt-cell-style"/>
6208
6225
 
6209
- <fo:block xsl:use-attribute-sets="dt-block-style">
6226
+ <fo:block xsl:use-attribute-sets="dt-block-style" role="SKIP">
6210
6227
  <xsl:copy-of select="@id"/>
6211
6228
 
6212
6229
  <xsl:if test="normalize-space($key_iso) = 'true'">
@@ -6236,7 +6253,7 @@
6236
6253
 
6237
6254
  <xsl:call-template name="refine_dd-cell-style"/>
6238
6255
 
6239
- <fo:block>
6256
+ <fo:block role="SKIP">
6240
6257
 
6241
6258
  <xsl:if test="$isGenerateTableIF = 'true'">
6242
6259
  <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
@@ -6378,10 +6395,19 @@
6378
6395
  <!-- ========================= -->
6379
6396
  <xsl:template match="*[local-name()='em']">
6380
6397
  <fo:inline font-style="italic">
6398
+ <xsl:call-template name="refine_italic_style"/>
6381
6399
  <xsl:apply-templates/>
6382
6400
  </fo:inline>
6383
6401
  </xsl:template>
6384
6402
 
6403
+ <xsl:template name="refine_italic_style">
6404
+
6405
+ <xsl:if test="ancestor::*[local-name() = 'item']">
6406
+ <xsl:attribute name="role">SKIP</xsl:attribute>
6407
+ </xsl:if>
6408
+
6409
+ </xsl:template>
6410
+
6385
6411
  <xsl:template match="*[local-name()='strong'] | *[local-name()='b']">
6386
6412
  <xsl:param name="split_keep-within-line"/>
6387
6413
  <fo:inline font-weight="bold">
@@ -6396,6 +6422,10 @@
6396
6422
 
6397
6423
  <xsl:template name="refine_strong_style">
6398
6424
 
6425
+ <xsl:if test="ancestor::*[local-name() = 'item']">
6426
+ <xsl:attribute name="role">SKIP</xsl:attribute>
6427
+ </xsl:if>
6428
+
6399
6429
  </xsl:template>
6400
6430
 
6401
6431
  <xsl:template match="*[local-name()='padding']">
@@ -6604,11 +6634,41 @@
6604
6634
 
6605
6635
  <xsl:template match="text()[ancestor::*[local-name()='smallcap']]">
6606
6636
  <xsl:variable name="text" select="normalize-space(.)"/>
6607
- <fo:inline font-size="75%">
6637
+ <fo:inline font-size="75%" role="SKIP">
6608
6638
  <xsl:if test="string-length($text) &gt; 0">
6609
- <xsl:call-template name="recursiveSmallCaps">
6610
- <xsl:with-param name="text" select="$text"/>
6611
- </xsl:call-template>
6639
+ <xsl:variable name="smallCapsText">
6640
+ <xsl:call-template name="recursiveSmallCaps">
6641
+ <xsl:with-param name="text" select="$text"/>
6642
+ </xsl:call-template>
6643
+ </xsl:variable>
6644
+ <!-- merge neighboring fo:inline -->
6645
+ <xsl:for-each select="xalan:nodeset($smallCapsText)/node()">
6646
+ <xsl:choose>
6647
+ <xsl:when test="self::fo:inline and preceding-sibling::node()[1][self::fo:inline]"><!-- <xsl:copy-of select="."/> --></xsl:when>
6648
+ <xsl:when test="self::fo:inline and @font-size">
6649
+ <xsl:variable name="curr_pos" select="count(preceding-sibling::node()) + 1"/>
6650
+ <!-- <curr_pos><xsl:value-of select="$curr_pos"/></curr_pos> -->
6651
+ <xsl:variable name="next_text_" select="count(following-sibling::node()[not(local-name() = 'inline')][1]/preceding-sibling::node())"/>
6652
+ <xsl:variable name="next_text">
6653
+ <xsl:choose>
6654
+ <xsl:when test="$next_text_ = 0">99999999</xsl:when>
6655
+ <xsl:otherwise><xsl:value-of select="$next_text_ + 1"/></xsl:otherwise>
6656
+ </xsl:choose>
6657
+ </xsl:variable>
6658
+ <!-- <next_text><xsl:value-of select="$next_text"/></next_text> -->
6659
+ <fo:inline>
6660
+ <xsl:copy-of select="@*"/>
6661
+ <xsl:copy-of select="./node()"/>
6662
+ <xsl:for-each select="following-sibling::node()[position() &lt; $next_text - $curr_pos]"> <!-- [self::fo:inline] -->
6663
+ <xsl:copy-of select="./node()"/>
6664
+ </xsl:for-each>
6665
+ </fo:inline>
6666
+ </xsl:when>
6667
+ <xsl:otherwise>
6668
+ <xsl:copy-of select="."/>
6669
+ </xsl:otherwise>
6670
+ </xsl:choose>
6671
+ </xsl:for-each>
6612
6672
  </xsl:if>
6613
6673
  </fo:inline>
6614
6674
  </xsl:template>
@@ -6620,7 +6680,7 @@
6620
6680
  <xsl:variable name="upperCase" select="java:toUpperCase(java:java.lang.String.new($char))"/>
6621
6681
  <xsl:choose>
6622
6682
  <xsl:when test="$char=$upperCase">
6623
- <fo:inline font-size="{100 div 0.75}%">
6683
+ <fo:inline font-size="{100 div 0.75}%" role="SKIP">
6624
6684
  <xsl:value-of select="$upperCase"/>
6625
6685
  </fo:inline>
6626
6686
  </xsl:when>
@@ -6853,6 +6913,10 @@
6853
6913
 
6854
6914
  <xsl:when test="not(contains($text, $separator))">
6855
6915
  <word>
6916
+ <xsl:if test="ancestor::*[local-name() = 'p'][@from_dl = 'true']">
6917
+ <xsl:text>
6918
+  </xsl:text> <!-- to add distance between dt and dd -->
6919
+ </xsl:if>
6856
6920
  <xsl:call-template name="enclose_text_in_tags">
6857
6921
  <xsl:with-param name="text" select="normalize-space($text)"/>
6858
6922
  <xsl:with-param name="tags" select="$tags"/>
@@ -6861,6 +6925,10 @@
6861
6925
  </xsl:when>
6862
6926
  <xsl:otherwise>
6863
6927
  <word>
6928
+ <xsl:if test="ancestor::*[local-name() = 'p'][@from_dl = 'true']">
6929
+ <xsl:text>
6930
+  </xsl:text> <!-- to add distance between dt and dd -->
6931
+ </xsl:if>
6864
6932
  <xsl:call-template name="enclose_text_in_tags">
6865
6933
  <xsl:with-param name="text" select="normalize-space(substring-before($text, $separator))"/>
6866
6934
  <xsl:with-param name="tags" select="$tags"/>
@@ -7044,6 +7112,10 @@
7044
7112
  <xsl:template name="getSimpleTable">
7045
7113
  <xsl:param name="id"/>
7046
7114
 
7115
+ <!-- <test0>
7116
+ <xsl:copy-of select="."/>
7117
+ </test0> -->
7118
+
7047
7119
  <xsl:variable name="simple-table">
7048
7120
 
7049
7121
  <!-- Step 0. replace <br/> to <p>...</p> -->
@@ -8096,7 +8168,7 @@
8096
8168
  <fo:table-body>
8097
8169
  <fo:table-row>
8098
8170
  <fo:table-cell display-align="center">
8099
- <fo:block xsl:use-attribute-sets="formula-stem-block-style">
8171
+ <fo:block xsl:use-attribute-sets="formula-stem-block-style" role="SKIP">
8100
8172
 
8101
8173
  <xsl:call-template name="refine_formula-stem-block-style"/>
8102
8174
 
@@ -8104,7 +8176,10 @@
8104
8176
  </fo:block>
8105
8177
  </fo:table-cell>
8106
8178
  <fo:table-cell display-align="center">
8107
- <fo:block xsl:use-attribute-sets="formula-stem-number-style">
8179
+ <fo:block xsl:use-attribute-sets="formula-stem-number-style" role="SKIP">
8180
+
8181
+ <xsl:call-template name="refine_formula-stem-number-style"/>
8182
+
8108
8183
  <xsl:apply-templates select="../*[local-name() = 'name']"/>
8109
8184
  </fo:block>
8110
8185
  </fo:table-cell>
@@ -9616,7 +9691,7 @@
9616
9691
  <!-- second td with sourcecode -->
9617
9692
  <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'] -->
9618
9693
  <fo:table-cell>
9619
- <fo:block>
9694
+ <fo:block role="SKIP">
9620
9695
  <xsl:apply-templates/>
9621
9696
  </fo:block>
9622
9697
  </fo:table-cell>
@@ -10105,7 +10180,7 @@
10105
10180
 
10106
10181
  <xsl:call-template name="setTableCellAttributes"/>
10107
10182
 
10108
- <fo:block>
10183
+ <fo:block role="SKIP">
10109
10184
  <xsl:apply-templates/>
10110
10185
  </fo:block>
10111
10186
  </fo:table-cell>
@@ -10127,7 +10202,7 @@
10127
10202
 
10128
10203
  <xsl:call-template name="setTableCellAttributes"/>
10129
10204
 
10130
- <fo:block>
10205
+ <fo:block role="SKIP">
10131
10206
  <xsl:apply-templates/>
10132
10207
  </fo:block>
10133
10208
  </fo:table-cell>
@@ -10903,7 +10978,48 @@
10903
10978
  </xsl:choose>
10904
10979
  </xsl:when>
10905
10980
  <xsl:when test="local-name(..) = 'ol' and @label"> <!-- for ordered lists 'ol', and if there is @label, for instance label="1.1.2" -->
10906
- <xsl:value-of select="@label"/>
10981
+
10982
+ <xsl:variable name="label">
10983
+
10984
+ <xsl:variable name="type" select="../@type"/>
10985
+
10986
+ <xsl:variable name="style_prefix_">
10987
+ <xsl:if test="$type = 'roman'">
10988
+ <!-- Example: (i) -->
10989
+ </xsl:if>
10990
+ </xsl:variable>
10991
+ <xsl:variable name="style_prefix" select="normalize-space($style_prefix_)"/>
10992
+
10993
+ <xsl:variable name="style_suffix_">
10994
+ <xsl:choose>
10995
+ <xsl:when test="$type = 'arabic'">
10996
+ )
10997
+ </xsl:when>
10998
+ <xsl:when test="$type = 'alphabet' or $type = 'alphabetic'">
10999
+ )
11000
+ </xsl:when>
11001
+ <xsl:when test="$type = 'alphabet_upper' or $type = 'alphabetic_upper'">
11002
+ .
11003
+ </xsl:when>
11004
+ <xsl:when test="$type = 'roman'">
11005
+ )
11006
+ </xsl:when>
11007
+ <xsl:when test="$type = 'roman_upper'">.</xsl:when> <!-- Example: I. -->
11008
+ </xsl:choose>
11009
+ </xsl:variable>
11010
+ <xsl:variable name="style_suffix" select="normalize-space($style_suffix_)"/>
11011
+
11012
+ <xsl:if test="$style_prefix != '' and not(starts-with(@label, $style_prefix))">
11013
+ <xsl:value-of select="$style_prefix"/>
11014
+ </xsl:if>
11015
+ <xsl:value-of select="@label"/>
11016
+ <xsl:if test="not(java:endsWith(java:java.lang.String.new(@label),$style_suffix))">
11017
+ <xsl:value-of select="$style_suffix"/>
11018
+ </xsl:if>
11019
+ </xsl:variable>
11020
+
11021
+ <xsl:value-of select="normalize-space($label)"/>
11022
+
10907
11023
  </xsl:when>
10908
11024
  <xsl:otherwise> <!-- for ordered lists 'ol' -->
10909
11025
 
@@ -11096,7 +11212,7 @@
11096
11212
  <xsl:call-template name="refine_list-item-style"/>
11097
11213
 
11098
11214
  <fo:list-item-label end-indent="label-end()">
11099
- <fo:block xsl:use-attribute-sets="list-item-label-style">
11215
+ <fo:block xsl:use-attribute-sets="list-item-label-style" role="SKIP">
11100
11216
 
11101
11217
  <xsl:call-template name="refine_list-item-label-style"/>
11102
11218
 
@@ -11110,7 +11226,7 @@
11110
11226
  </fo:block>
11111
11227
  </fo:list-item-label>
11112
11228
  <fo:list-item-body start-indent="body-start()" xsl:use-attribute-sets="list-item-body-style">
11113
- <fo:block>
11229
+ <fo:block role="SKIP">
11114
11230
 
11115
11231
  <xsl:call-template name="refine_list-item-body-style"/>
11116
11232
 
@@ -11389,10 +11505,10 @@
11389
11505
  <fo:table-body>
11390
11506
  <fo:table-row text-align="center" font-weight="bold" background-color="black" color="white">
11391
11507
 
11392
- <fo:table-cell border="1pt solid black"><fo:block>Date</fo:block></fo:table-cell>
11393
- <fo:table-cell border="1pt solid black"><fo:block>Type</fo:block></fo:table-cell>
11394
- <fo:table-cell border="1pt solid black"><fo:block>Change</fo:block></fo:table-cell>
11395
- <fo:table-cell border="1pt solid black"><fo:block>Pages</fo:block></fo:table-cell>
11508
+ <fo:table-cell border="1pt solid black"><fo:block role="SKIP">Date</fo:block></fo:table-cell>
11509
+ <fo:table-cell border="1pt solid black"><fo:block role="SKIP">Type</fo:block></fo:table-cell>
11510
+ <fo:table-cell border="1pt solid black"><fo:block role="SKIP">Change</fo:block></fo:table-cell>
11511
+ <fo:table-cell border="1pt solid black"><fo:block role="SKIP">Pages</fo:block></fo:table-cell>
11396
11512
  </fo:table-row>
11397
11513
  <xsl:apply-templates/>
11398
11514
  </fo:table-body>
@@ -11407,7 +11523,7 @@
11407
11523
 
11408
11524
  <xsl:template match="*[local-name() = 'errata']/*[local-name() = 'row']/*">
11409
11525
  <fo:table-cell border="1pt solid black" padding-left="1mm" padding-top="0.5mm">
11410
- <fo:block><xsl:apply-templates/></fo:block>
11526
+ <fo:block role="SKIP"><xsl:apply-templates/></fo:block>
11411
11527
  </fo:table-cell>
11412
11528
  </xsl:template>
11413
11529
  <!-- ============ -->
@@ -11478,8 +11594,8 @@
11478
11594
  <fo:list-block id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-list-style">
11479
11595
  <fo:list-item>
11480
11596
  <fo:list-item-label end-indent="label-end()">
11481
- <fo:block>
11482
- <fo:inline>
11597
+ <fo:block role="SKIP">
11598
+ <fo:inline role="SKIP">
11483
11599
 
11484
11600
  <xsl:apply-templates select="*[local-name() = 'biblio-tag']">
11485
11601
  <xsl:with-param name="biblio_tag_part">first</xsl:with-param>
@@ -11488,7 +11604,7 @@
11488
11604
  </fo:block>
11489
11605
  </fo:list-item-label>
11490
11606
  <fo:list-item-body start-indent="body-start()">
11491
- <fo:block xsl:use-attribute-sets="bibitem-non-normative-list-body-style">
11607
+ <fo:block xsl:use-attribute-sets="bibitem-non-normative-list-body-style" role="SKIP">
11492
11608
  <xsl:call-template name="processBibitem">
11493
11609
  <xsl:with-param name="biblio_tag_part">last</xsl:with-param>
11494
11610
  </xsl:call-template>
@@ -11710,7 +11826,7 @@
11710
11826
  <xsl:for-each select="*[local-name() = 'tab']">
11711
11827
  <xsl:variable name="current_id" select="generate-id()"/>
11712
11828
  <fo:table-cell>
11713
- <fo:block line-height-shift-adjustment="disregard-shifts">
11829
+ <fo:block line-height-shift-adjustment="disregard-shifts" role="SKIP">
11714
11830
  <xsl:call-template name="insert_basic_link">
11715
11831
  <xsl:with-param name="element">
11716
11832
  <fo:basic-link internal-destination="{$target}" fox:alt-text="{.}">
@@ -11728,7 +11844,7 @@
11728
11844
  </xsl:for-each>
11729
11845
  <!-- last column - for page numbers -->
11730
11846
  <fo:table-cell text-align="right" font-size="10pt" font-weight="bold" font-family="Arial">
11731
- <fo:block>
11847
+ <fo:block role="SKIP">
11732
11848
  <xsl:call-template name="insert_basic_link">
11733
11849
  <xsl:with-param name="element">
11734
11850
  <fo:basic-link internal-destination="{$target}" fox:alt-text="{.}">
@@ -0,0 +1,34 @@
1
+ == copyright-statement
2
+ === {% if stage_int >= 40 %}DOCUMENT PROTÉGÉ PAR COPYRIGHT{%else%}{blank}
3
+
4
+ [[boilerplate-year]]
5
+ &#xa9; span:std_publisher:[{{ agency }}] span:std_docNumber[{{ docyear }}]
6
+
7
+ [[boilerplate-message]]
8
+ Droits de reproduction réservés. Sauf indication contraire, ou requise dans le cadre de sa mise en œuvre,
9
+ aucune partie de cette publication ne
10
+ peut être reproduite ni utilisée sous quelque forme que ce soit et par aucun procédé, électronique
11
+ ou mécanique, y compris la photocopie, l’affichage sur l’internet ou sur un Intranet, sans
12
+ autorisation écrite préalable. Les demandes d’autorisation peuvent être adressées à l’ISO à
13
+ l’adresse ci-après ou au comité membre de l’ISO dans le pays du demandeur.
14
+
15
+ [[boilerplate-address]]
16
+ [align="left"]
17
+ ISO copyright office +
18
+ CP 401 &#x2022; Ch. de Blandonnet 8 +
19
+ CH-1214 Vernier, Geneva +
20
+ Tél: +41 22 749 01 11 +
21
+ Email: copyright@iso.org +
22
+ Website: www.iso.org
23
+
24
+ [[boilerplate-place]]
25
+ Publié en Suisse
26
+
27
+ {% if unpublished %}
28
+ == license-statement
29
+ === Avertissement
30
+
31
+ Ce document n'est pas une Norme internationale de l'ISO. Il est distribué pour examen et observations. Il est susceptible de modification sans préavis et ne peut être cité comme Norme internationale.
32
+
33
+ Les destinataires du présent projet sont invités à présenter, avec leurs observations, notification des droits de propriété dont ils auraient éventuellement connaissance et à fournir une documentation explicative.
34
+ {% endif %}