metanorma-bipm 2.2.10 → 2.2.12

Sign up to get free protection for your applications and to get access to all the features.
@@ -4903,6 +4903,10 @@
4903
4903
  </xsl:attribute-set> <!-- formula-stem-number-style -->
4904
4904
  <!-- End Formula's styles -->
4905
4905
 
4906
+ <xsl:template name="refine_formula-stem-number-style">
4907
+
4908
+ </xsl:template>
4909
+
4906
4910
  <xsl:attribute-set name="image-style">
4907
4911
  <xsl:attribute name="text-align">center</xsl:attribute>
4908
4912
 
@@ -5406,13 +5410,13 @@
5406
5410
 
5407
5411
  <xsl:template name="processPrefaceSectionsDefault_Contents">
5408
5412
  <xsl:variable name="nodes_preface_">
5409
- <xsl:for-each select="/*/*[local-name()='preface']/*[not(local-name() = 'note' or local-name() = 'admonition')]">
5413
+ <xsl:for-each select="/*/*[local-name()='preface']/*[not(local-name() = 'note' or local-name() = 'admonition' or @type = 'toc')]">
5410
5414
  <node id="{@id}"/>
5411
5415
  </xsl:for-each>
5412
5416
  </xsl:variable>
5413
5417
  <xsl:variable name="nodes_preface" select="xalan:nodeset($nodes_preface_)"/>
5414
5418
 
5415
- <xsl:for-each select="/*/*[local-name()='preface']/*[not(local-name() = 'note' or local-name() = 'admonition')]">
5419
+ <xsl:for-each select="/*/*[local-name()='preface']/*[not(local-name() = 'note' or local-name() = 'admonition' or @type = 'toc')]">
5416
5420
  <xsl:sort select="@displayorder" data-type="number"/>
5417
5421
 
5418
5422
  <!-- process Section's title -->
@@ -5446,12 +5450,12 @@
5446
5450
  <xsl:apply-templates select="." mode="contents"/>
5447
5451
  </xsl:for-each>
5448
5452
 
5449
- <xsl:for-each select="/*/*[local-name()='annex']">
5453
+ <!-- <xsl:for-each select="/*/*[local-name()='annex']">
5450
5454
  <xsl:sort select="@displayorder" data-type="number"/>
5451
5455
  <xsl:apply-templates select="." mode="contents"/>
5452
- </xsl:for-each>
5456
+ </xsl:for-each> -->
5453
5457
 
5454
- <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]">
5458
+ <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]">
5455
5459
  <xsl:sort select="@displayorder" data-type="number"/>
5456
5460
  <xsl:apply-templates select="." mode="contents"/>
5457
5461
  </xsl:for-each>
@@ -5829,7 +5833,7 @@
5829
5833
  </xsl:attribute>
5830
5834
  </xsl:for-each>
5831
5835
 
5832
- <xsl:variable name="isNoteOrFnExist" select="./*[local-name()='note'] or .//*[local-name()='fn'][local-name(..) != 'name'] or ./*[local-name()='source']"/>
5836
+ <xsl:variable name="isNoteOrFnExist" select="./*[local-name()='note'] or ./*[local-name()='example'] or .//*[local-name()='fn'][local-name(..) != 'name'] or ./*[local-name()='source']"/>
5833
5837
  <xsl:if test="$isNoteOrFnExist = 'true'">
5834
5838
  <xsl:attribute name="border-bottom">0pt solid black</xsl:attribute> <!-- set 0pt border, because there is a separete table below for footer -->
5835
5839
  </xsl:if>
@@ -5873,7 +5877,7 @@
5873
5877
  <xsl:apply-templates select="*[local-name()='thead']" mode="process_tbody"/>
5874
5878
  </xsl:when>
5875
5879
  <xsl:otherwise>
5876
- <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 -->
5880
+ <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 -->
5877
5881
  </xsl:otherwise>
5878
5882
  </xsl:choose>
5879
5883
 
@@ -6359,8 +6363,8 @@
6359
6363
  <xsl:template name="table-header-title">
6360
6364
  <xsl:param name="cols-count"/>
6361
6365
  <!-- row for title -->
6362
- <fo:table-row>
6363
- <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">
6366
+ <fo:table-row role="SKIP">
6367
+ <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">
6364
6368
 
6365
6369
  <xsl:call-template name="refine_table-header-title-style"/>
6366
6370
 
@@ -6369,7 +6373,7 @@
6369
6373
  </xsl:apply-templates>
6370
6374
 
6371
6375
  <xsl:if test="not(ancestor::*[local-name()='table']/*[local-name()='name'])"> <!-- to prevent empty fo:table-cell in case of missing table's name -->
6372
- <fo:block/>
6376
+ <fo:block role="SKIP"/>
6373
6377
  </xsl:if>
6374
6378
 
6375
6379
  </fo:table-cell>
@@ -6404,7 +6408,7 @@
6404
6408
  <xsl:param name="colwidths"/>
6405
6409
  <xsl:param name="colgroup"/>
6406
6410
 
6407
- <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']"/>
6411
+ <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']"/>
6408
6412
 
6409
6413
  <xsl:variable name="isNoteOrFnExistShowAfterTable">
6410
6414
 
@@ -6471,7 +6475,7 @@
6471
6475
  <!-- fn will be processed inside 'note' processing -->
6472
6476
 
6473
6477
  <xsl:if test="count(ancestor::bipm:table//*[local-name()='note']) &gt; 1">
6474
- <fo:block font-weight="bold">
6478
+ <fo:block font-weight="bold" role="SKIP">
6475
6479
  <xsl:variable name="curr_lang" select="ancestor::bipm:bipm-standard/bipm:bibdata/bipm:language"/>
6476
6480
  <xsl:choose>
6477
6481
  <xsl:when test="$curr_lang = 'fr'">Remarques</xsl:when>
@@ -6487,6 +6491,7 @@
6487
6491
  <xsl:apply-templates select="../*[local-name()='p']"/>
6488
6492
  <xsl:apply-templates select="../*[local-name()='dl']"/>
6489
6493
  <xsl:apply-templates select="../*[local-name()='note']"/>
6494
+ <xsl:apply-templates select="../*[local-name()='example']"/>
6490
6495
  <xsl:apply-templates select="../*[local-name()='source']"/>
6491
6496
 
6492
6497
  <xsl:variable name="isDisplayRowSeparator">
@@ -6495,7 +6500,7 @@
6495
6500
 
6496
6501
  <!-- horizontal row separator -->
6497
6502
  <xsl:if test="normalize-space($isDisplayRowSeparator) = 'true'">
6498
- <xsl:if test="../*[local-name()='note'] and normalize-space($table_fn_block) != ''">
6503
+ <xsl:if test="(../*[local-name()='note'] or ../*[local-name()='example']) and normalize-space($table_fn_block) != ''">
6499
6504
  <fo:block-container border-top="0.5pt solid black" padding-left="1mm" padding-right="1mm">
6500
6505
 
6501
6506
  <xsl:call-template name="setBordersTableArray"/>
@@ -6696,7 +6701,7 @@
6696
6701
 
6697
6702
  <xsl:call-template name="refine_table-header-cell-style"/>
6698
6703
 
6699
- <fo:block>
6704
+ <fo:block role="SKIP">
6700
6705
  <xsl:apply-templates/>
6701
6706
  </fo:block>
6702
6707
  </fo:table-cell>
@@ -6749,7 +6754,7 @@
6749
6754
  <xsl:attribute name="text-align">left</xsl:attribute>
6750
6755
  </xsl:if>
6751
6756
 
6752
- <fo:block>
6757
+ <fo:block role="SKIP">
6753
6758
 
6754
6759
  <xsl:if test="$isGenerateTableIF = 'true'">
6755
6760
  <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
@@ -6772,13 +6777,13 @@
6772
6777
  </fo:table-cell>
6773
6778
  </xsl:template> <!-- td -->
6774
6779
 
6775
- <xsl:template match="*[local-name()='table']/*[local-name()='note']" priority="2">
6780
+ <xsl:template match="*[local-name()='table']/*[local-name()='note' or local-name() = 'example']" priority="2">
6776
6781
 
6777
6782
  <fo:block xsl:use-attribute-sets="table-note-style">
6778
6783
 
6779
6784
  <xsl:call-template name="refine_table-note-style"/>
6780
6785
 
6781
- <!-- Table's note name (NOTE, for example) -->
6786
+ <!-- Table's note/example name (NOTE, for example) -->
6782
6787
  <fo:inline xsl:use-attribute-sets="table-note-name-style">
6783
6788
 
6784
6789
  <xsl:call-template name="refine_table-note-name-style"/>
@@ -6796,7 +6801,7 @@
6796
6801
 
6797
6802
  </xsl:template> <!-- table/note -->
6798
6803
 
6799
- <xsl:template match="*[local-name()='table']/*[local-name()='note']/*[local-name()='p']" priority="2">
6804
+ <xsl:template match="*[local-name()='table']/*[local-name()='note' or local-name()='example']/*[local-name()='p']" priority="2">
6800
6805
  <xsl:apply-templates/>
6801
6806
  </xsl:template>
6802
6807
 
@@ -7634,7 +7639,7 @@
7634
7639
  -->
7635
7640
  <fo:table-row>
7636
7641
  <fo:table-cell number-columns-spanned="2">
7637
- <fo:block>
7642
+ <fo:block role="SKIP">
7638
7643
  <xsl:call-template name="note"/>
7639
7644
  </fo:block>
7640
7645
  </fo:table-cell>
@@ -7699,7 +7704,7 @@
7699
7704
 
7700
7705
  <xsl:call-template name="refine_dt-cell-style"/>
7701
7706
 
7702
- <fo:block xsl:use-attribute-sets="dt-block-style">
7707
+ <fo:block xsl:use-attribute-sets="dt-block-style" role="SKIP">
7703
7708
  <xsl:copy-of select="@id"/>
7704
7709
 
7705
7710
  <xsl:if test="normalize-space($key_iso) = 'true'">
@@ -7729,7 +7734,7 @@
7729
7734
 
7730
7735
  <xsl:call-template name="refine_dd-cell-style"/>
7731
7736
 
7732
- <fo:block>
7737
+ <fo:block role="SKIP">
7733
7738
 
7734
7739
  <xsl:if test="$isGenerateTableIF = 'true'">
7735
7740
  <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
@@ -7871,10 +7876,15 @@
7871
7876
  <!-- ========================= -->
7872
7877
  <xsl:template match="*[local-name()='em']">
7873
7878
  <fo:inline font-style="italic">
7879
+ <xsl:call-template name="refine_italic_style"/>
7874
7880
  <xsl:apply-templates/>
7875
7881
  </fo:inline>
7876
7882
  </xsl:template>
7877
7883
 
7884
+ <xsl:template name="refine_italic_style">
7885
+
7886
+ </xsl:template>
7887
+
7878
7888
  <xsl:template match="*[local-name()='strong'] | *[local-name()='b']">
7879
7889
  <xsl:param name="split_keep-within-line"/>
7880
7890
  <fo:inline font-weight="bold">
@@ -8097,11 +8107,41 @@
8097
8107
 
8098
8108
  <xsl:template match="text()[ancestor::*[local-name()='smallcap']]">
8099
8109
  <xsl:variable name="text" select="normalize-space(.)"/>
8100
- <fo:inline font-size="75%">
8110
+ <fo:inline font-size="75%" role="SKIP">
8101
8111
  <xsl:if test="string-length($text) &gt; 0">
8102
- <xsl:call-template name="recursiveSmallCaps">
8103
- <xsl:with-param name="text" select="$text"/>
8104
- </xsl:call-template>
8112
+ <xsl:variable name="smallCapsText">
8113
+ <xsl:call-template name="recursiveSmallCaps">
8114
+ <xsl:with-param name="text" select="$text"/>
8115
+ </xsl:call-template>
8116
+ </xsl:variable>
8117
+ <!-- merge neighboring fo:inline -->
8118
+ <xsl:for-each select="xalan:nodeset($smallCapsText)/node()">
8119
+ <xsl:choose>
8120
+ <xsl:when test="self::fo:inline and preceding-sibling::node()[1][self::fo:inline]"><!-- <xsl:copy-of select="."/> --></xsl:when>
8121
+ <xsl:when test="self::fo:inline and @font-size">
8122
+ <xsl:variable name="curr_pos" select="count(preceding-sibling::node()) + 1"/>
8123
+ <!-- <curr_pos><xsl:value-of select="$curr_pos"/></curr_pos> -->
8124
+ <xsl:variable name="next_text_" select="count(following-sibling::node()[not(local-name() = 'inline')][1]/preceding-sibling::node())"/>
8125
+ <xsl:variable name="next_text">
8126
+ <xsl:choose>
8127
+ <xsl:when test="$next_text_ = 0">99999999</xsl:when>
8128
+ <xsl:otherwise><xsl:value-of select="$next_text_ + 1"/></xsl:otherwise>
8129
+ </xsl:choose>
8130
+ </xsl:variable>
8131
+ <!-- <next_text><xsl:value-of select="$next_text"/></next_text> -->
8132
+ <fo:inline>
8133
+ <xsl:copy-of select="@*"/>
8134
+ <xsl:copy-of select="./node()"/>
8135
+ <xsl:for-each select="following-sibling::node()[position() &lt; $next_text - $curr_pos]"> <!-- [self::fo:inline] -->
8136
+ <xsl:copy-of select="./node()"/>
8137
+ </xsl:for-each>
8138
+ </fo:inline>
8139
+ </xsl:when>
8140
+ <xsl:otherwise>
8141
+ <xsl:copy-of select="."/>
8142
+ </xsl:otherwise>
8143
+ </xsl:choose>
8144
+ </xsl:for-each>
8105
8145
  </xsl:if>
8106
8146
  </fo:inline>
8107
8147
  </xsl:template>
@@ -8113,7 +8153,7 @@
8113
8153
  <xsl:variable name="upperCase" select="java:toUpperCase(java:java.lang.String.new($char))"/>
8114
8154
  <xsl:choose>
8115
8155
  <xsl:when test="$char=$upperCase">
8116
- <fo:inline font-size="{100 div 0.75}%">
8156
+ <fo:inline font-size="{100 div 0.75}%" role="SKIP">
8117
8157
  <xsl:value-of select="$upperCase"/>
8118
8158
  </fo:inline>
8119
8159
  </xsl:when>
@@ -8275,6 +8315,10 @@
8275
8315
 
8276
8316
  <xsl:when test="not(contains($text, $separator))">
8277
8317
  <word>
8318
+ <xsl:if test="ancestor::*[local-name() = 'p'][@from_dl = 'true']">
8319
+ <xsl:text>
8320
+  </xsl:text> <!-- to add distance between dt and dd -->
8321
+ </xsl:if>
8278
8322
  <xsl:call-template name="enclose_text_in_tags">
8279
8323
  <xsl:with-param name="text" select="normalize-space($text)"/>
8280
8324
  <xsl:with-param name="tags" select="$tags"/>
@@ -8283,6 +8327,10 @@
8283
8327
  </xsl:when>
8284
8328
  <xsl:otherwise>
8285
8329
  <word>
8330
+ <xsl:if test="ancestor::*[local-name() = 'p'][@from_dl = 'true']">
8331
+ <xsl:text>
8332
+  </xsl:text> <!-- to add distance between dt and dd -->
8333
+ </xsl:if>
8286
8334
  <xsl:call-template name="enclose_text_in_tags">
8287
8335
  <xsl:with-param name="text" select="normalize-space(substring-before($text, $separator))"/>
8288
8336
  <xsl:with-param name="tags" select="$tags"/>
@@ -8357,7 +8405,10 @@
8357
8405
  </xsl:choose>
8358
8406
  </xsl:variable>
8359
8407
 
8360
- <xsl:value-of select="$text9"/>
8408
+ <!-- replace sequence #x200B and space TO space -->
8409
+ <xsl:variable name="text10" select="java:replaceAll(java:java.lang.String.new($text9), '\u200b ', ' ')"/>
8410
+
8411
+ <xsl:value-of select="$text10"/>
8361
8412
  </xsl:template>
8362
8413
 
8363
8414
  <xsl:template name="add-zero-spaces-link-java">
@@ -8463,6 +8514,10 @@
8463
8514
  <xsl:template name="getSimpleTable">
8464
8515
  <xsl:param name="id"/>
8465
8516
 
8517
+ <!-- <test0>
8518
+ <xsl:copy-of select="."/>
8519
+ </test0> -->
8520
+
8466
8521
  <xsl:variable name="simple-table">
8467
8522
 
8468
8523
  <!-- Step 0. replace <br/> to <p>...</p> -->
@@ -9478,7 +9533,7 @@
9478
9533
  <xsl:call-template name="insert_basic_link">
9479
9534
  <xsl:with-param name="element">
9480
9535
  <fo:basic-link internal-destination="{@target}" fox:alt-text="{@target}" xsl:use-attribute-sets="xref-style">
9481
- <xsl:if test="string-length(normalize-space()) &lt; 30 and not(contains(normalize-space(), 'http://')) and not(contains(normalize-space(), 'https://'))">
9536
+ <xsl:if test="string-length(normalize-space()) &lt; 30 and not(contains(normalize-space(), 'http://')) and not(contains(normalize-space(), 'https://')) and not(ancestor::*[local-name() = 'table' or local-name() = 'dl'])">
9482
9537
  <xsl:attribute name="keep-together.within-line">always</xsl:attribute>
9483
9538
  </xsl:if>
9484
9539
  <xsl:if test="parent::*[local-name() = 'add']">
@@ -9540,7 +9595,7 @@
9540
9595
  <fo:table-body>
9541
9596
  <fo:table-row>
9542
9597
  <fo:table-cell display-align="center">
9543
- <fo:block xsl:use-attribute-sets="formula-stem-block-style">
9598
+ <fo:block xsl:use-attribute-sets="formula-stem-block-style" role="SKIP">
9544
9599
 
9545
9600
  <xsl:call-template name="refine_formula-stem-block-style"/>
9546
9601
 
@@ -9548,7 +9603,10 @@
9548
9603
  </fo:block>
9549
9604
  </fo:table-cell>
9550
9605
  <fo:table-cell display-align="center">
9551
- <fo:block xsl:use-attribute-sets="formula-stem-number-style">
9606
+ <fo:block xsl:use-attribute-sets="formula-stem-number-style" role="SKIP">
9607
+
9608
+ <xsl:call-template name="refine_formula-stem-number-style"/>
9609
+
9552
9610
  <xsl:apply-templates select="../*[local-name() = 'name']"/>
9553
9611
  </fo:block>
9554
9612
  </fo:table-cell>
@@ -11095,7 +11153,7 @@
11095
11153
  <!-- second td with sourcecode -->
11096
11154
  <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'] -->
11097
11155
  <fo:table-cell>
11098
- <fo:block>
11156
+ <fo:block role="SKIP">
11099
11157
  <xsl:apply-templates/>
11100
11158
  </fo:block>
11101
11159
  </fo:table-cell>
@@ -11582,7 +11640,7 @@
11582
11640
 
11583
11641
  <xsl:call-template name="setTableCellAttributes"/>
11584
11642
 
11585
- <fo:block>
11643
+ <fo:block role="SKIP">
11586
11644
  <xsl:apply-templates/>
11587
11645
  </fo:block>
11588
11646
  </fo:table-cell>
@@ -11604,7 +11662,7 @@
11604
11662
 
11605
11663
  <xsl:call-template name="setTableCellAttributes"/>
11606
11664
 
11607
- <fo:block>
11665
+ <fo:block role="SKIP">
11608
11666
  <xsl:apply-templates/>
11609
11667
  </fo:block>
11610
11668
  </fo:table-cell>
@@ -11799,6 +11857,12 @@
11799
11857
 
11800
11858
  </xsl:template>
11801
11859
 
11860
+ <xsl:template match="*[local-name() = 'table']/*[local-name() = 'example']/*[local-name() = 'name']">
11861
+ <fo:inline xsl:use-attribute-sets="example-name-style">
11862
+ <xsl:apply-templates/>
11863
+ </fo:inline>
11864
+ </xsl:template>
11865
+
11802
11866
  <xsl:template match="*[local-name() = 'example']/*[local-name() = 'p']">
11803
11867
  <xsl:param name="fo_element">block</xsl:param>
11804
11868
 
@@ -12376,6 +12440,50 @@
12376
12440
  <xsl:otherwise><xsl:call-template name="setULLabel"/></xsl:otherwise>
12377
12441
  </xsl:choose>
12378
12442
  </xsl:when>
12443
+ <xsl:when test="local-name(..) = 'ol' and @label"> <!-- for ordered lists 'ol', and if there is @label, for instance label="1.1.2" -->
12444
+
12445
+ <xsl:variable name="label">
12446
+
12447
+ <xsl:variable name="type" select="../@type"/>
12448
+
12449
+ <xsl:variable name="style_prefix_">
12450
+ <xsl:if test="$type = 'roman'">
12451
+ ( <!-- Example: (i) -->
12452
+ </xsl:if>
12453
+ </xsl:variable>
12454
+ <xsl:variable name="style_prefix" select="normalize-space($style_prefix_)"/>
12455
+
12456
+ <xsl:variable name="style_suffix_">
12457
+ <xsl:choose>
12458
+ <xsl:when test="$type = 'arabic'">
12459
+ .
12460
+ </xsl:when>
12461
+ <xsl:when test="$type = 'alphabet' or $type = 'alphabetic'">
12462
+ )
12463
+ </xsl:when>
12464
+ <xsl:when test="$type = 'alphabet_upper' or $type = 'alphabetic_upper'">
12465
+ .
12466
+ </xsl:when>
12467
+ <xsl:when test="$type = 'roman'">
12468
+ )
12469
+ </xsl:when>
12470
+ <xsl:when test="$type = 'roman_upper'">.</xsl:when> <!-- Example: I. -->
12471
+ </xsl:choose>
12472
+ </xsl:variable>
12473
+ <xsl:variable name="style_suffix" select="normalize-space($style_suffix_)"/>
12474
+
12475
+ <xsl:if test="$style_prefix != '' and not(starts-with(@label, $style_prefix))">
12476
+ <xsl:value-of select="$style_prefix"/>
12477
+ </xsl:if>
12478
+ <xsl:value-of select="@label"/>
12479
+ <xsl:if test="not(java:endsWith(java:java.lang.String.new(@label),$style_suffix))">
12480
+ <xsl:value-of select="$style_suffix"/>
12481
+ </xsl:if>
12482
+ </xsl:variable>
12483
+
12484
+ <xsl:value-of select="normalize-space($label)"/>
12485
+
12486
+ </xsl:when>
12379
12487
  <xsl:otherwise> <!-- for ordered lists 'ol' -->
12380
12488
 
12381
12489
  <!-- Example: for BSI <?list-start 2?> -->
@@ -12433,10 +12541,10 @@
12433
12541
  <xsl:when test="$type = 'arabic'">
12434
12542
  1.
12435
12543
  </xsl:when>
12436
- <xsl:when test="$type = 'alphabet'">
12544
+ <xsl:when test="$type = 'alphabet' or $type = 'alphabetic'">
12437
12545
  a)
12438
12546
  </xsl:when>
12439
- <xsl:when test="$type = 'alphabet_upper'">
12547
+ <xsl:when test="$type = 'alphabet_upper' or $type = 'alphabetic_upper'">
12440
12548
  A.
12441
12549
  </xsl:when>
12442
12550
  <xsl:when test="$type = 'roman'">
@@ -12569,7 +12677,7 @@
12569
12677
  <xsl:call-template name="refine_list-item-style"/>
12570
12678
 
12571
12679
  <fo:list-item-label end-indent="label-end()">
12572
- <fo:block xsl:use-attribute-sets="list-item-label-style">
12680
+ <fo:block xsl:use-attribute-sets="list-item-label-style" role="SKIP">
12573
12681
 
12574
12682
  <xsl:call-template name="refine_list-item-label-style"/>
12575
12683
 
@@ -12578,12 +12686,12 @@
12578
12686
  <xsl:call-template name="append_add-style"/>
12579
12687
  </xsl:if>
12580
12688
 
12581
- <xsl:call-template name="getListItemFormat"/>
12689
+ <xsl:call-template name="getListItemFormat"/>
12582
12690
 
12583
12691
  </fo:block>
12584
12692
  </fo:list-item-label>
12585
12693
  <fo:list-item-body start-indent="body-start()" xsl:use-attribute-sets="list-item-body-style">
12586
- <fo:block>
12694
+ <fo:block role="SKIP">
12587
12695
 
12588
12696
  <xsl:call-template name="refine_list-item-body-style"/>
12589
12697
 
@@ -12862,10 +12970,10 @@
12862
12970
  <fo:table-body>
12863
12971
  <fo:table-row text-align="center" font-weight="bold" background-color="black" color="white">
12864
12972
 
12865
- <fo:table-cell border="1pt solid black"><fo:block>Date</fo:block></fo:table-cell>
12866
- <fo:table-cell border="1pt solid black"><fo:block>Type</fo:block></fo:table-cell>
12867
- <fo:table-cell border="1pt solid black"><fo:block>Change</fo:block></fo:table-cell>
12868
- <fo:table-cell border="1pt solid black"><fo:block>Pages</fo:block></fo:table-cell>
12973
+ <fo:table-cell border="1pt solid black"><fo:block role="SKIP">Date</fo:block></fo:table-cell>
12974
+ <fo:table-cell border="1pt solid black"><fo:block role="SKIP">Type</fo:block></fo:table-cell>
12975
+ <fo:table-cell border="1pt solid black"><fo:block role="SKIP">Change</fo:block></fo:table-cell>
12976
+ <fo:table-cell border="1pt solid black"><fo:block role="SKIP">Pages</fo:block></fo:table-cell>
12869
12977
  </fo:table-row>
12870
12978
  <xsl:apply-templates/>
12871
12979
  </fo:table-body>
@@ -12880,7 +12988,7 @@
12880
12988
 
12881
12989
  <xsl:template match="*[local-name() = 'errata']/*[local-name() = 'row']/*">
12882
12990
  <fo:table-cell border="1pt solid black" padding-left="1mm" padding-top="0.5mm">
12883
- <fo:block><xsl:apply-templates/></fo:block>
12991
+ <fo:block role="SKIP"><xsl:apply-templates/></fo:block>
12884
12992
  </fo:table-cell>
12885
12993
  </xsl:template>
12886
12994
  <!-- ============ -->
@@ -13181,7 +13289,7 @@
13181
13289
  <xsl:for-each select="*[local-name() = 'tab']">
13182
13290
  <xsl:variable name="current_id" select="generate-id()"/>
13183
13291
  <fo:table-cell>
13184
- <fo:block line-height-shift-adjustment="disregard-shifts">
13292
+ <fo:block line-height-shift-adjustment="disregard-shifts" role="SKIP">
13185
13293
  <xsl:call-template name="insert_basic_link">
13186
13294
  <xsl:with-param name="element">
13187
13295
  <fo:basic-link internal-destination="{$target}" fox:alt-text="{.}">
@@ -13199,7 +13307,7 @@
13199
13307
  </xsl:for-each>
13200
13308
  <!-- last column - for page numbers -->
13201
13309
  <fo:table-cell text-align="right" font-size="10pt" font-weight="bold" font-family="Arial">
13202
- <fo:block>
13310
+ <fo:block role="SKIP">
13203
13311
  <xsl:call-template name="insert_basic_link">
13204
13312
  <xsl:with-param name="element">
13205
13313
  <fo:basic-link internal-destination="{$target}" fox:alt-text="{.}">
@@ -18,7 +18,9 @@ norm_with_refs_pref:
18
18
  document (including any amendments) applies.
19
19
  all_rights_reserved: All rights reserved
20
20
  table_of_contents: Contents
21
- source: Adapted from
21
+ source: ""
22
+ adapted_from: "Adapted from: "
23
+ modified_from: "Modified from: "
22
24
  note: "Note:"
23
25
  prefacenote: "NOTE:"
24
26
  listnote: "Note:"
@@ -41,7 +41,9 @@ norm_with_refs_pref:
41
41
  Les documents suivants cités dans le texte sont indispensables pour l'application de ce document. Pour les références datées, seule l’édition citée s’applique. Pour les références non datées, la dernière édition du document de référence s’applique (y compris les éventuels amendements).
42
42
  all_rights_reserved: Tous droits réservés
43
43
  table_of_contents: Table des matières
44
- source: Adapté de
44
+ source: ""
45
+ adapted_from: "Adapté de: "
46
+ modified_from: "Modifié de: "
45
47
  note: "Note:"
46
48
  prefacenote: "NOTE:"
47
49
  listnote: "Remarque:"