metanorma-iec 2.2.12 → 2.2.13

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: cd8549ad9f88923dcaf3a906ab9b387a2f093e159b15104eae3239e9beb2f7ba
4
- data.tar.gz: fb9ff030c0bcb45e56db5e9534c04dc0781932a0e933d6f373c02aa6e4f015f7
3
+ metadata.gz: ab74b531cc7b5d522767524a33600245829e0989476057c1d2767d1dc218c6e0
4
+ data.tar.gz: c4e351590eba8d1acbb4d569fab9b886b31febfc013613a8baad3c31b46beffb
5
5
  SHA512:
6
- metadata.gz: 1377ff85a12247837f825c89e61716ab6a44351ab3ff1a01b5888439e06736e82b12346dabf7402a6a032c9b62ea8ad621422dbb9a61fbaf59cb86ebc5683a0c
7
- data.tar.gz: e6eb895d37129a5f673a9dbd3d067faf51e318817f1a226aafa87077e150d24f64c2b1e0dbe8668bee10d166823e42af661e0a2dca5a1591e53cee2c637feffb
6
+ metadata.gz: 654dd391978be139823cba89b9372953b67834cd283028398fb30686ff96708ba87d19281b5403118ad7c213ab276ca4a557d0818ff283c4250c7c3405f6feb0
7
+ data.tar.gz: 64f4328ead57cbf17f8c275645dc91233656016f2fb199876081beaaff4b8b540dbdc9e47e7556c08d8e3191f2f6d09dcb1b0d40f7b9a728784858aa6123d0f8
@@ -229,7 +229,7 @@
229
229
  <fo:static-content flow-name="left-region">
230
230
  <fo:block-container reference-orientation="90">
231
231
  <fo:block font-size="7pt" margin-left="3.5mm" margin-top="5.5mm">
232
- <xsl:value-of select="(//iec:iec-standard)[1]/iec:bibdata/iec:docidentifier[@type = 'iso-with-lang']"/>
232
+ <xsl:value-of select="(//iec:iec-standard)[1]/iec:bibdata/iec:docidentifier[@type = 'iso-revdate']"/>
233
233
  </fo:block>
234
234
  </fo:block-container>
235
235
  </fo:static-content>
@@ -990,7 +990,7 @@
990
990
  <xsl:otherwise><xsl:attribute name="padding-left">1mm</xsl:attribute> </xsl:otherwise>
991
991
  </xsl:choose>
992
992
  </fo:inline>
993
- <fo:inline keep-together.within-line="always" font-size="25pt" font-weight="bold" color="{$color_gray}" border-bottom="0.5pt solid {$color_gray}" padding-bottom="3.5mm" baseline-shift="5.5mm"><fo:leader leader-pattern="space"/><xsl:value-of select="//iec:iec-standard/iec:bibdata/iec:docidentifier[@type = 'iso' or @type = 'ISO']"/></fo:inline>
993
+ <fo:inline keep-together.within-line="always" font-size="25pt" font-weight="bold" color="{$color_gray}" border-bottom="0.5pt solid {$color_gray}" padding-bottom="3.5mm" baseline-shift="5.5mm"><fo:leader leader-pattern="space"/><xsl:value-of select="//iec:iec-standard/iec:bibdata/iec:docidentifier[@type = 'iso-undated']"/></fo:inline>
994
994
  </fo:block>
995
995
  <fo:block font-size="10.5pt" text-align="right" margin-top="0.5mm">
996
996
  <xsl:call-template name="capitalize">
@@ -3076,6 +3076,7 @@
3076
3076
  </xsl:attribute-set>
3077
3077
 
3078
3078
  <xsl:attribute-set name="figure-block-style">
3079
+ <xsl:attribute name="role">SKIP</xsl:attribute>
3079
3080
 
3080
3081
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
3081
3082
 
@@ -3086,6 +3087,7 @@
3086
3087
  </xsl:attribute-set>
3087
3088
 
3088
3089
  <xsl:attribute-set name="figure-name-style">
3090
+ <xsl:attribute name="role">Caption</xsl:attribute>
3089
3091
 
3090
3092
  <xsl:attribute name="font-weight">bold</xsl:attribute>
3091
3093
  <xsl:attribute name="text-align">center</xsl:attribute>
@@ -3140,6 +3142,7 @@
3140
3142
  </xsl:template>
3141
3143
 
3142
3144
  <xsl:attribute-set name="image-style">
3145
+ <xsl:attribute name="role">SKIP</xsl:attribute>
3143
3146
  <xsl:attribute name="text-align">center</xsl:attribute>
3144
3147
 
3145
3148
  </xsl:attribute-set>
@@ -3422,6 +3425,14 @@
3422
3425
 
3423
3426
  </xsl:attribute-set> <!-- bibitem-non-normative-list-style -->
3424
3427
 
3428
+ <xsl:attribute-set name="bibitem-non-normative-list-item-style">
3429
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
3430
+
3431
+ <xsl:attribute name="margin-top">5pt</xsl:attribute>
3432
+ <xsl:attribute name="margin-bottom">14pt</xsl:attribute>
3433
+
3434
+ </xsl:attribute-set>
3435
+
3425
3436
  <!-- bibitem in bibliography section (references/@normative="false"), list body -->
3426
3437
  <xsl:attribute-set name="bibitem-normative-list-body-style">
3427
3438
 
@@ -3825,14 +3836,14 @@
3825
3836
  <xsl:value-of select="$sep"/><xsl:value-of select="$zero_width_space"/>
3826
3837
  </xsl:when>
3827
3838
  <xsl:otherwise>
3828
- <fo:inline keep-together.within-line="always"><xsl:apply-templates/></fo:inline>
3839
+ <fo:inline keep-together.within-line="always" role="SKIP"><xsl:apply-templates/></fo:inline>
3829
3840
  </xsl:otherwise>
3830
3841
  </xsl:choose>
3831
3842
  </xsl:for-each>
3832
3843
  </xsl:when>
3833
3844
 
3834
3845
  <xsl:otherwise>
3835
- <fo:inline keep-together.within-line="always"><xsl:apply-templates/></fo:inline>
3846
+ <fo:inline keep-together.within-line="always" role="SKIP"><xsl:apply-templates/></fo:inline>
3836
3847
  </xsl:otherwise>
3837
3848
 
3838
3849
  </xsl:choose>
@@ -3842,7 +3853,7 @@
3842
3853
  <!-- Preface boilerplate sections processing -->
3843
3854
  <!-- ================================= -->
3844
3855
  <xsl:template match="*[local-name()='copyright-statement']">
3845
- <fo:block xsl:use-attribute-sets="copyright-statement-style">
3856
+ <fo:block xsl:use-attribute-sets="copyright-statement-style" role="SKIP">
3846
3857
  <xsl:apply-templates/>
3847
3858
  </fo:block>
3848
3859
  </xsl:template> <!-- copyright-statement -->
@@ -4015,7 +4026,7 @@
4015
4026
  </xsl:choose>
4016
4027
  </xsl:variable>
4017
4028
 
4018
- <fo:block-container xsl:use-attribute-sets="table-container-style">
4029
+ <fo:block-container xsl:use-attribute-sets="table-container-style" role="SKIP">
4019
4030
 
4020
4031
  <xsl:call-template name="refine_table-container-style">
4021
4032
  <xsl:with-param name="margin-side" select="$margin-side"/>
@@ -5121,7 +5132,7 @@
5121
5132
  </xsl:choose>
5122
5133
  </xsl:variable>
5123
5134
  <xsl:variable name="footnote_inline">
5124
- <fo:inline>
5135
+ <fo:inline role="Reference">
5125
5136
 
5126
5137
  <xsl:variable name="fn_styles">
5127
5138
  <xsl:choose>
@@ -5144,7 +5155,7 @@
5144
5155
 
5145
5156
  <xsl:call-template name="insert_basic_link">
5146
5157
  <xsl:with-param name="element">
5147
- <fo:basic-link internal-destination="{$ref_id}" fox:alt-text="footnote {$current_fn_number}">
5158
+ <fo:basic-link internal-destination="{$ref_id}" fox:alt-text="footnote {$current_fn_number}" role="Lbl">
5148
5159
  <xsl:copy-of select="$current_fn_number_text"/>
5149
5160
  </fo:basic-link>
5150
5161
  </xsl:with-param>
@@ -5157,17 +5168,17 @@
5157
5168
  <xsl:copy-of select="$footnote_inline"/>
5158
5169
  </xsl:when>
5159
5170
  <xsl:when test="$p_fn//fn[@gen_id = $gen_id] or normalize-space(@skip_footnote_body) = 'false'">
5160
- <fo:footnote xsl:use-attribute-sets="fn-style">
5171
+ <fo:footnote xsl:use-attribute-sets="fn-style" role="SKIP">
5161
5172
  <xsl:copy-of select="$footnote_inline"/>
5162
- <fo:footnote-body>
5173
+ <fo:footnote-body role="Note">
5163
5174
 
5164
- <fo:block-container xsl:use-attribute-sets="fn-container-body-style">
5175
+ <fo:block-container xsl:use-attribute-sets="fn-container-body-style" role="SKIP">
5165
5176
 
5166
- <fo:block xsl:use-attribute-sets="fn-body-style">
5177
+ <fo:block xsl:use-attribute-sets="fn-body-style" role="SKIP">
5167
5178
 
5168
5179
  <xsl:call-template name="refine_fn-body-style"/>
5169
5180
 
5170
- <fo:inline id="{$ref_id}" xsl:use-attribute-sets="fn-body-num-style">
5181
+ <fo:inline id="{$ref_id}" xsl:use-attribute-sets="fn-body-num-style" role="Lbl">
5171
5182
 
5172
5183
  <xsl:call-template name="refine_fn-body-num-style"/>
5173
5184
 
@@ -5429,11 +5440,11 @@
5429
5440
  </xsl:template>
5430
5441
 
5431
5442
  <xsl:template match="*[local-name()='fn']/text()[normalize-space() != '']">
5432
- <fo:inline><xsl:value-of select="."/></fo:inline>
5443
+ <fo:inline role="SKIP"><xsl:value-of select="."/></fo:inline>
5433
5444
  </xsl:template>
5434
5445
 
5435
5446
  <xsl:template match="*[local-name()='fn']//*[local-name()='p']">
5436
- <fo:inline>
5447
+ <fo:inline role="P">
5437
5448
  <xsl:apply-templates/>
5438
5449
  </fo:inline>
5439
5450
  </xsl:template>
@@ -5448,7 +5459,7 @@
5448
5459
  <xsl:variable name="isAdded" select="@added"/>
5449
5460
  <xsl:variable name="isDeleted" select="@deleted"/>
5450
5461
  <!-- <dl><xsl:copy-of select="."/></dl> -->
5451
- <fo:block-container xsl:use-attribute-sets="dl-block-style">
5462
+ <fo:block-container xsl:use-attribute-sets="dl-block-style" role="SKIP">
5452
5463
 
5453
5464
  <xsl:call-template name="setBlockSpanAll"/>
5454
5465
 
@@ -5483,7 +5494,7 @@
5483
5494
  <xsl:with-param name="isDeleted" select="$isDeleted"/>
5484
5495
  </xsl:call-template>
5485
5496
 
5486
- <fo:block-container margin-left="0mm">
5497
+ <fo:block-container margin-left="0mm" role="SKIP">
5487
5498
 
5488
5499
  <xsl:attribute name="margin-right">0mm</xsl:attribute>
5489
5500
 
@@ -5553,7 +5564,7 @@
5553
5564
 
5554
5565
  <!-- a few components -->
5555
5566
  <xsl:if test="$onlyOneComponent = 'false'">
5556
- <fo:block>
5567
+ <fo:block role="SKIP">
5557
5568
 
5558
5569
  <xsl:call-template name="refine_multicomponent_style"/>
5559
5570
 
@@ -5561,7 +5572,7 @@
5561
5572
  <xsl:attribute name="margin-top">0</xsl:attribute>
5562
5573
  </xsl:if>
5563
5574
 
5564
- <fo:block>
5575
+ <fo:block role="SKIP">
5565
5576
 
5566
5577
  <xsl:call-template name="refine_multicomponent_block_style"/>
5567
5578
 
@@ -6163,6 +6174,9 @@
6163
6174
 
6164
6175
  <xsl:template name="refine_strong_style">
6165
6176
 
6177
+ <xsl:if test="ancestor::*['preferred']">
6178
+ <xsl:attribute name="role">SKIP</xsl:attribute>
6179
+ </xsl:if>
6166
6180
  </xsl:template>
6167
6181
 
6168
6182
  <xsl:template match="*[local-name()='padding']">
@@ -7167,6 +7181,18 @@
7167
7181
  </xsl:copy>
7168
7182
  </xsl:template>
7169
7183
 
7184
+ <xsl:variable name="font_main_root_style">
7185
+ <root-style xsl:use-attribute-sets="root-style">
7186
+ </root-style>
7187
+ </xsl:variable>
7188
+ <xsl:variable name="font_main_root_style_font_family" select="xalan:nodeset($font_main_root_style)/root-style/@font-family"/>
7189
+ <xsl:variable name="font_main">
7190
+ <xsl:choose>
7191
+ <xsl:when test="contains($font_main_root_style_font_family, ',')"><xsl:value-of select="substring-before($font_main_root_style_font_family, ',')"/></xsl:when>
7192
+ <xsl:otherwise><xsl:value-of select="$font_main_root_style_font_family"/></xsl:otherwise>
7193
+ </xsl:choose>
7194
+ </xsl:variable>
7195
+
7170
7196
  <xsl:template match="*[local-name()='th' or local-name()='td']" mode="simple-table-id">
7171
7197
  <xsl:param name="id"/>
7172
7198
  <xsl:copy>
@@ -7205,6 +7231,33 @@
7205
7231
 
7206
7232
  <!-- td_text='<xsl:copy-of select="$td_text"/>' -->
7207
7233
 
7234
+ <xsl:variable name="words_with_width">
7235
+ <!-- calculate width for 'word' which contain text only (without formatting tags inside) -->
7236
+ <xsl:for-each select="xalan:nodeset($td_text)//*[local-name() = 'word'][normalize-space() != ''][not(*)]">
7237
+ <xsl:copy>
7238
+ <xsl:copy-of select="@*"/>
7239
+ <xsl:attribute name="width">
7240
+ <xsl:value-of select="java:org.metanorma.fop.Util.getStringWidth(., $font_main)"/> <!-- Example: 'Times New Roman' -->
7241
+ </xsl:attribute>
7242
+ <xsl:copy-of select="node()"/>
7243
+ </xsl:copy>
7244
+ </xsl:for-each>
7245
+ </xsl:variable>
7246
+
7247
+ <xsl:variable name="words_with_width_sorted">
7248
+ <xsl:for-each select="xalan:nodeset($words_with_width)//*[local-name() = 'word']">
7249
+ <xsl:sort select="@width" data-type="number" order="descending"/>
7250
+ <!-- select word maximal width only -->
7251
+ <xsl:if test="position() = 1">
7252
+ <xsl:copy-of select="."/>
7253
+ </xsl:if>
7254
+ </xsl:for-each>
7255
+ <!-- add 'word' with formatting tags inside -->
7256
+ <xsl:for-each select="xalan:nodeset($td_text)//*[local-name() = 'word'][normalize-space() != ''][*]">
7257
+ <xsl:copy-of select="."/>
7258
+ </xsl:for-each>
7259
+ </xsl:variable>
7260
+
7208
7261
  <xsl:variable name="words">
7209
7262
  <xsl:for-each select=".//*[local-name() = 'image' or local-name() = 'stem']">
7210
7263
  <word>
@@ -7212,9 +7265,12 @@
7212
7265
  </word>
7213
7266
  </xsl:for-each>
7214
7267
 
7215
- <xsl:for-each select="xalan:nodeset($td_text)//*[local-name() = 'word'][normalize-space() != '']">
7268
+ <xsl:for-each select="xalan:nodeset($words_with_width_sorted)//*[local-name() = 'word'][normalize-space() != '']">
7216
7269
  <xsl:copy-of select="."/>
7217
7270
  </xsl:for-each>
7271
+ <!-- <xsl:for-each select="xalan:nodeset($td_text)//*[local-name() = 'word'][normalize-space() != '']">
7272
+ <xsl:copy-of select="."/>
7273
+ </xsl:for-each> -->
7218
7274
 
7219
7275
  </xsl:variable>
7220
7276
 
@@ -7675,10 +7731,10 @@
7675
7731
  <xsl:copy>
7676
7732
  <xsl:apply-templates select="@*" mode="mathml"/>
7677
7733
  <xsl:if test="not(@lspace)">
7678
- <xsl:attribute name="lspace">0.4em</xsl:attribute>
7734
+ <xsl:attribute name="lspace">0.2em</xsl:attribute>
7679
7735
  </xsl:if>
7680
- <xsl:if test="not(@rspace)">
7681
- <xsl:attribute name="rspace">0.4em</xsl:attribute>
7736
+ <xsl:if test="not(@rspace) and not(following-sibling::*[1][self::mathml:mo and normalize-space(text()) = '|'])">
7737
+ <xsl:attribute name="rspace">0.2em</xsl:attribute>
7682
7738
  </xsl:if>
7683
7739
  <xsl:apply-templates mode="mathml"/>
7684
7740
  </xsl:copy>
@@ -7695,6 +7751,27 @@
7695
7751
  </xsl:copy>
7696
7752
  </xsl:template>
7697
7753
 
7754
+ <!-- increase space before '(' -->
7755
+ <xsl:template match="mathml:mo[normalize-space(text()) = '(']" mode="mathml">
7756
+ <xsl:copy>
7757
+ <xsl:apply-templates select="@*" mode="mathml"/>
7758
+ <xsl:if test="(preceding-sibling::* and not(preceding-sibling::*[1][self::mathml:mo])) or (../preceding-sibling::* and not(../preceding-sibling::*[1][self::mathml:mo]))">
7759
+ <xsl:if test="not(@lspace)">
7760
+ <xsl:attribute name="lspace">0.4em</xsl:attribute>
7761
+ <xsl:choose>
7762
+ <xsl:when test="preceding-sibling::*[1][self::mathml:mi or self::mathml:mstyle]">
7763
+ <xsl:attribute name="lspace">0.2em</xsl:attribute>
7764
+ </xsl:when>
7765
+ <xsl:when test="../preceding-sibling::*[1][self::mathml:mi or self::mathml:mstyle]">
7766
+ <xsl:attribute name="lspace">0.2em</xsl:attribute>
7767
+ </xsl:when>
7768
+ </xsl:choose>
7769
+ </xsl:if>
7770
+ </xsl:if>
7771
+ <xsl:apply-templates mode="mathml"/>
7772
+ </xsl:copy>
7773
+ </xsl:template>
7774
+
7698
7775
  <!-- Examples:
7699
7776
  <stem type="AsciiMath">x = 1</stem>
7700
7777
  <stem type="AsciiMath"><asciimath>x = 1</asciimath></stem>
@@ -7854,7 +7931,7 @@
7854
7931
  <!-- formula -->
7855
7932
  <!-- ====== -->
7856
7933
  <xsl:template match="*[local-name() = 'formula']" name="formula">
7857
- <fo:block-container margin-left="0mm">
7934
+ <fo:block-container margin-left="0mm" role="SKIP">
7858
7935
  <xsl:if test="parent::*[local-name() = 'note']">
7859
7936
  <xsl:attribute name="margin-left">
7860
7937
  <xsl:choose>
@@ -7864,7 +7941,7 @@
7864
7941
  </xsl:attribute>
7865
7942
 
7866
7943
  </xsl:if>
7867
- <fo:block-container margin-left="0mm">
7944
+ <fo:block-container margin-left="0mm" role="SKIP">
7868
7945
  <fo:block id="{@id}">
7869
7946
  <xsl:apply-templates select="node()[not(local-name() = 'name')]"/> <!-- formula's number will be process in 'stem' template -->
7870
7947
  </fo:block>
@@ -7944,13 +8021,13 @@
7944
8021
 
7945
8022
  <xsl:template match="*[local-name() = 'note']" name="note">
7946
8023
 
7947
- <fo:block-container id="{@id}" xsl:use-attribute-sets="note-style">
8024
+ <fo:block-container id="{@id}" xsl:use-attribute-sets="note-style" role="SKIP">
7948
8025
 
7949
8026
  <xsl:call-template name="setBlockSpanAll"/>
7950
8027
 
7951
8028
  <xsl:call-template name="refine_note-style"/>
7952
8029
 
7953
- <fo:block-container margin-left="0mm" margin-right="0mm">
8030
+ <fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
7954
8031
 
7955
8032
  <fo:block>
7956
8033
 
@@ -8114,12 +8191,13 @@
8114
8191
 
8115
8192
  <xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']">
8116
8193
  <xsl:if test="normalize-space() != ''">
8117
- <xsl:variable name="level">
8194
+ <!-- <xsl:variable name="level">
8118
8195
  <xsl:call-template name="getLevelTermName"/>
8119
8196
  </xsl:variable>
8120
8197
  <fo:inline role="H{$level}">
8121
- <xsl:apply-templates/>
8122
- </fo:inline>
8198
+ <xsl:apply-templates />
8199
+ </fo:inline> -->
8200
+ <xsl:apply-templates/>
8123
8201
  </xsl:if>
8124
8202
  </xsl:template>
8125
8203
  <!-- ====== -->
@@ -8143,7 +8221,7 @@
8143
8221
  <!-- Example: Dimensions in millimeters -->
8144
8222
  <xsl:apply-templates select="*[local-name() = 'note'][@type = 'units']"/>
8145
8223
 
8146
- <fo:block xsl:use-attribute-sets="figure-style">
8224
+ <fo:block xsl:use-attribute-sets="figure-style" role="SKIP">
8147
8225
  <xsl:apply-templates select="node()[not(local-name() = 'name') and not(local-name() = 'note' and @type = 'units')]"/>
8148
8226
  </fo:block>
8149
8227
  <xsl:for-each select="*[local-name() = 'note'][not(@type = 'units')]">
@@ -9291,7 +9369,7 @@
9291
9369
  </xsl:when>
9292
9370
 
9293
9371
  <xsl:otherwise>
9294
- <fo:block-container xsl:use-attribute-sets="sourcecode-container-style">
9372
+ <fo:block-container xsl:use-attribute-sets="sourcecode-container-style" role="SKIP">
9295
9373
 
9296
9374
  <xsl:if test="not(ancestor::*[local-name() = 'li']) or ancestor::*[local-name() = 'example']">
9297
9375
  <xsl:attribute name="margin-left">0mm</xsl:attribute>
@@ -9312,7 +9390,7 @@
9312
9390
  </xsl:attribute>
9313
9391
 
9314
9392
  </xsl:if>
9315
- <fo:block-container margin-left="0mm">
9393
+ <fo:block-container margin-left="0mm" role="SKIP">
9316
9394
 
9317
9395
  <fo:block xsl:use-attribute-sets="sourcecode-style">
9318
9396
 
@@ -9858,11 +9936,11 @@
9858
9936
  <!-- requirement, recommendation, permission table -->
9859
9937
  <!-- ========== -->
9860
9938
  <xsl:template match="*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']">
9861
- <fo:block-container margin-left="0mm" margin-right="0mm" margin-bottom="12pt">
9939
+ <fo:block-container margin-left="0mm" margin-right="0mm" margin-bottom="12pt" role="SKIP">
9862
9940
  <xsl:if test="ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']">
9863
9941
  <xsl:attribute name="margin-bottom">0pt</xsl:attribute>
9864
9942
  </xsl:if>
9865
- <fo:block-container margin-left="0mm" margin-right="0mm">
9943
+ <fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
9866
9944
  <fo:table id="{@id}" table-layout="fixed" width="100%"> <!-- border="1pt solid black" -->
9867
9945
  <xsl:if test="ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']">
9868
9946
  <!-- <xsl:attribute name="border">0.5pt solid black</xsl:attribute> -->
@@ -10024,7 +10102,7 @@
10024
10102
  -->
10025
10103
  <xsl:template match="*[local-name() = 'example']">
10026
10104
 
10027
- <fo:block-container id="{@id}" xsl:use-attribute-sets="example-style">
10105
+ <fo:block-container id="{@id}" xsl:use-attribute-sets="example-style" role="SKIP">
10028
10106
 
10029
10107
  <xsl:call-template name="setBlockSpanAll"/>
10030
10108
 
@@ -10041,7 +10119,7 @@
10041
10119
 
10042
10120
  </xsl:variable>
10043
10121
 
10044
- <fo:block-container margin-left="0mm">
10122
+ <fo:block-container margin-left="0mm" role="SKIP">
10045
10123
 
10046
10124
  <xsl:choose>
10047
10125
 
@@ -10054,8 +10132,8 @@
10054
10132
  </xsl:apply-templates>
10055
10133
  </fo:block>
10056
10134
 
10057
- <fo:block-container xsl:use-attribute-sets="example-body-style">
10058
- <fo:block-container margin-left="0mm" margin-right="0mm">
10135
+ <fo:block-container xsl:use-attribute-sets="example-body-style" role="SKIP">
10136
+ <fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
10059
10137
  <xsl:apply-templates select="node()[not(local-name() = 'name')]">
10060
10138
  <xsl:with-param name="fo_element" select="$fo_element"/>
10061
10139
  </xsl:apply-templates>
@@ -10108,8 +10186,8 @@
10108
10186
 
10109
10187
  <xsl:if test="*[not(local-name() = 'name')][position() &gt; 1]">
10110
10188
  <!-- display further elements in blocks -->
10111
- <fo:block-container xsl:use-attribute-sets="example-body-style">
10112
- <fo:block-container margin-left="0mm" margin-right="0mm">
10189
+ <fo:block-container xsl:use-attribute-sets="example-body-style" role="SKIP">
10190
+ <fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
10113
10191
  <xsl:apply-templates select="*[not(local-name() = 'name')][position() &gt; 1]">
10114
10192
  <xsl:with-param name="fo_element" select="'block'"/>
10115
10193
  </xsl:apply-templates>
@@ -10162,7 +10240,7 @@
10162
10240
  </xsl:variable>
10163
10241
  <xsl:choose>
10164
10242
  <xsl:when test="starts-with(normalize-space($element), 'block')">
10165
- <fo:block-container>
10243
+ <fo:block-container role="SKIP">
10166
10244
  <xsl:if test="ancestor::*[local-name() = 'li'] and contains(normalize-space($fo_element), 'block')">
10167
10245
  <xsl:attribute name="margin-left">0mm</xsl:attribute>
10168
10246
  <xsl:attribute name="margin-right">0mm</xsl:attribute>
@@ -10303,7 +10381,7 @@
10303
10381
  <!-- author -->
10304
10382
  <!-- ====== -->
10305
10383
  <xsl:template match="*[local-name() = 'quote']">
10306
- <fo:block-container margin-left="0mm">
10384
+ <fo:block-container margin-left="0mm" role="SKIP">
10307
10385
 
10308
10386
  <xsl:call-template name="setBlockSpanAll"/>
10309
10387
 
@@ -10313,12 +10391,12 @@
10313
10391
  </xsl:if>
10314
10392
  </xsl:if>
10315
10393
 
10316
- <fo:block-container margin-left="0mm">
10317
- <fo:block-container xsl:use-attribute-sets="quote-style">
10394
+ <fo:block-container margin-left="0mm" role="SKIP">
10395
+ <fo:block-container xsl:use-attribute-sets="quote-style" role="SKIP">
10318
10396
 
10319
10397
  <xsl:call-template name="refine_quote-style"/>
10320
10398
 
10321
- <fo:block-container margin-left="0mm" margin-right="0mm">
10399
+ <fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
10322
10400
  <fo:block role="BlockQuote">
10323
10401
  <xsl:apply-templates select="./node()[not(local-name() = 'author') and not(local-name() = 'source')]"/> <!-- process all nested nodes, except author and source -->
10324
10402
  </fo:block>
@@ -10476,10 +10554,10 @@
10476
10554
 
10477
10555
  <xsl:choose>
10478
10556
  <xsl:when test="$lang = 'zh'">
10479
- <fo:inline><xsl:value-of select="$tab_zh"/></fo:inline>
10557
+ <fo:inline role="SKIP"><xsl:value-of select="$tab_zh"/></fo:inline>
10480
10558
  </xsl:when>
10481
10559
  <xsl:when test="../../@inline-header = 'true'">
10482
- <fo:inline font-size="90%">
10560
+ <fo:inline font-size="90%" role="SKIP">
10483
10561
  <xsl:call-template name="insertNonBreakSpaces">
10484
10562
  <xsl:with-param name="count" select="$padding-right"/>
10485
10563
  </xsl:call-template>
@@ -10487,7 +10565,7 @@
10487
10565
  </xsl:when>
10488
10566
  <xsl:otherwise>
10489
10567
  <xsl:variable name="direction"><xsl:if test="$lang = 'ar'"><xsl:value-of select="$RLM"/></xsl:if></xsl:variable>
10490
- <fo:inline padding-right="{$padding-right}mm"><xsl:value-of select="$direction"/>​</fo:inline>
10568
+ <fo:inline padding-right="{$padding-right}mm" role="SKIP"><xsl:value-of select="$direction"/>​</fo:inline>
10491
10569
  </xsl:otherwise>
10492
10570
  </xsl:choose>
10493
10571
 
@@ -10521,12 +10599,12 @@
10521
10599
  </xsl:if>
10522
10600
 
10523
10601
  <xsl:if test="parent::*[local-name() = 'term'] and not(preceding-sibling::*[local-name() = 'preferred'])"> <!-- if first preffered in term, then display term's name -->
10524
- <fo:block xsl:use-attribute-sets="term-name-style">
10602
+ <fo:block xsl:use-attribute-sets="term-name-style" role="SKIP">
10525
10603
  <xsl:apply-templates select="ancestor::*[local-name() = 'term'][1]/*[local-name() = 'name']"/>
10526
10604
  </fo:block>
10527
10605
  </xsl:if>
10528
10606
 
10529
- <fo:block xsl:use-attribute-sets="preferred-term-style">
10607
+ <fo:block xsl:use-attribute-sets="preferred-term-style" role="SKIP">
10530
10608
  <xsl:call-template name="setStyle_preferred"/>
10531
10609
  <xsl:apply-templates/>
10532
10610
  </fo:block>
@@ -10567,7 +10645,7 @@
10567
10645
  <!-- definition -->
10568
10646
  <!-- ========== -->
10569
10647
  <xsl:template match="*[local-name() = 'definition']">
10570
- <fo:block xsl:use-attribute-sets="definition-style">
10648
+ <fo:block xsl:use-attribute-sets="definition-style" role="SKIP">
10571
10649
  <xsl:apply-templates/>
10572
10650
  </fo:block>
10573
10651
  </xsl:template>
@@ -10610,6 +10688,10 @@
10610
10688
 
10611
10689
  <xsl:template match="*[local-name() = 'clause']">
10612
10690
  <fo:block>
10691
+ <xsl:if test="parent::*[local-name() = 'copyright-statement']">
10692
+ <xsl:attribute name="role">SKIP</xsl:attribute>
10693
+ </xsl:if>
10694
+
10613
10695
  <xsl:call-template name="setId"/>
10614
10696
 
10615
10697
  <xsl:call-template name="setBlockSpanAll"/>
@@ -10848,7 +10930,7 @@
10848
10930
  <xsl:template match="*[local-name() = 'ul'] | *[local-name() = 'ol']">
10849
10931
  <xsl:choose>
10850
10932
  <xsl:when test="parent::*[local-name() = 'note'] or parent::*[local-name() = 'termnote']">
10851
- <fo:block-container>
10933
+ <fo:block-container role="SKIP">
10852
10934
  <xsl:attribute name="margin-left">
10853
10935
  <xsl:choose>
10854
10936
  <xsl:when test="not(ancestor::*[local-name() = 'table'])"><xsl:value-of select="$note-body-indent"/></xsl:when>
@@ -10858,7 +10940,7 @@
10858
10940
 
10859
10941
  <xsl:call-template name="refine_list_container_style"/>
10860
10942
 
10861
- <fo:block-container margin-left="0mm">
10943
+ <fo:block-container margin-left="0mm" role="SKIP">
10862
10944
  <fo:block>
10863
10945
  <xsl:apply-templates select="." mode="list"/>
10864
10946
  </fo:block>
@@ -10867,7 +10949,7 @@
10867
10949
  </xsl:when>
10868
10950
  <xsl:otherwise>
10869
10951
 
10870
- <fo:block>
10952
+ <fo:block role="SKIP">
10871
10953
  <xsl:apply-templates select="." mode="list"/>
10872
10954
  </fo:block>
10873
10955
 
@@ -11289,7 +11371,10 @@
11289
11371
  <!-- Reference sections (Normative References and Bibliography) -->
11290
11372
  <!-- ========================================================== -->
11291
11373
  <xsl:template match="*[local-name() = 'references'][@hidden='true']" priority="3"/>
11292
- <xsl:template match="*[local-name() = 'bibitem'][@hidden='true']" priority="3"/>
11374
+ <xsl:template match="*[local-name() = 'bibitem'][@hidden='true']" priority="3">
11375
+ <xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][local-name() = 'bibitem'] and 1 = 1)"/>
11376
+
11377
+ </xsl:template>
11293
11378
  <!-- don't display bibitem with @id starts with '_hidden', that was introduced for references integrity -->
11294
11379
  <xsl:template match="*[local-name() = 'bibitem'][starts-with(@id, 'hidden_bibitem_')]" priority="3"/>
11295
11380
 
@@ -11343,7 +11428,7 @@
11343
11428
 
11344
11429
  <!-- Bibliography (non-normative references) -->
11345
11430
  <xsl:template match="*[local-name() = 'references'][not(@normative='true')]/*[local-name() = 'bibitem']" name="bibitem_non_normative" priority="2">
11346
-
11431
+ <xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][local-name() = 'bibitem'] and 1 = 1)"/> <!-- current bibiitem is non-first -->
11347
11432
  <!-- $namespace = 'csd' or $namespace = 'gb' or $namespace = 'iec' or $namespace = 'ieee' or $namespace = 'iso' or $namespace = 'jcgm' or $namespace = 'm3d' or
11348
11433
  $namespace = 'mpfd' or $namespace = 'ogc' or $namespace = 'ogc-white-paper' -->
11349
11434
  <!-- Example: [1] ISO 9:1995, Information and documentation – Transliteration of Cyrillic characters into Latin characters – Slavic and non-Slavic languages -->
@@ -11371,6 +11456,35 @@
11371
11456
 
11372
11457
  </xsl:template> <!-- references[not(@normative='true')]/bibitem -->
11373
11458
 
11459
+ <xsl:template name="insertListItem_Bibitem">
11460
+ <xsl:choose>
11461
+ <xsl:when test="@hidden = 'true'"><!-- skip --></xsl:when>
11462
+ <xsl:otherwise>
11463
+ <fo:list-item id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-list-item-style">
11464
+ <fo:list-item-label end-indent="label-end()">
11465
+ <fo:block role="SKIP">
11466
+ <fo:inline role="SKIP">
11467
+ <xsl:apply-templates select="*[local-name() = 'biblio-tag']">
11468
+ <xsl:with-param name="biblio_tag_part">first</xsl:with-param>
11469
+ </xsl:apply-templates>
11470
+ </fo:inline>
11471
+ </fo:block>
11472
+ </fo:list-item-label>
11473
+ <fo:list-item-body start-indent="body-start()">
11474
+ <fo:block xsl:use-attribute-sets="bibitem-non-normative-list-body-style" role="SKIP">
11475
+ <xsl:call-template name="processBibitem">
11476
+ <xsl:with-param name="biblio_tag_part">last</xsl:with-param>
11477
+ </xsl:call-template>
11478
+ </fo:block>
11479
+ </fo:list-item-body>
11480
+ </fo:list-item>
11481
+ </xsl:otherwise>
11482
+ </xsl:choose>
11483
+ <xsl:apply-templates select="following-sibling::*[1][local-name() = 'bibitem']">
11484
+ <xsl:with-param name="skip">false</xsl:with-param>
11485
+ </xsl:apply-templates>
11486
+ </xsl:template>
11487
+
11374
11488
  <xsl:template name="processBibitem">
11375
11489
  <xsl:param name="biblio_tag_part">both</xsl:param>
11376
11490
 
@@ -11704,7 +11818,7 @@
11704
11818
 
11705
11819
  <xsl:call-template name="setBlockSpanAll"/>
11706
11820
 
11707
- <fo:block-container xsl:use-attribute-sets="admonition-container-style">
11821
+ <fo:block-container xsl:use-attribute-sets="admonition-container-style" role="SKIP">
11708
11822
 
11709
11823
  <fo:block text-align="justify">
11710
11824
  <fo:inline>
@@ -1,6 +1,6 @@
1
1
  module Metanorma
2
2
  module Iec
3
- VERSION = "2.2.12".freeze
3
+ VERSION = "2.2.13".freeze
4
4
  end
5
5
  end
6
6
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-iec
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.2.12
4
+ version: 2.2.13
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2023-06-19 00:00:00.000000000 Z
11
+ date: 2023-07-07 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: metanorma-iso