metanorma-itu 2.8.5 → 2.8.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (13) hide show
  1. checksums.yaml +4 -4
  2. data/lib/isodoc/itu/itu.implementers-guide.xsl +81 -2
  3. data/lib/isodoc/itu/itu.in-force.xsl +81 -2
  4. data/lib/isodoc/itu/itu.recommendation-annex.xsl +81 -2
  5. data/lib/isodoc/itu/itu.recommendation-supplement.xsl +81 -2
  6. data/lib/isodoc/itu/itu.recommendation.xsl +81 -2
  7. data/lib/isodoc/itu/itu.resolution.xsl +81 -2
  8. data/lib/isodoc/itu/itu.service-publication.xsl +81 -2
  9. data/lib/isodoc/itu/itu.technical-paper.xsl +81 -2
  10. data/lib/isodoc/itu/itu.technical-report.xsl +81 -2
  11. data/lib/isodoc/itu/presentation_section.rb +14 -66
  12. data/lib/metanorma/itu/version.rb +1 -1
  13. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: e9beadc1757498926938bd9ed4ec9854a2c3d9ef6eb807a23ef439dbd7bd8ccd
4
- data.tar.gz: 179382a92d8e711cc57a317f12f68c1fc9ce573d0ad58e070faac7cbafadc3ac
3
+ metadata.gz: 6c90902604bc7595629aab447f819c8aa365b2d88bcfdd916c75f249f29b0a8c
4
+ data.tar.gz: b0c8ce84b486a5edb5a3ffff29b9289c25caebaf49cd258faeef98a42ca8f689
5
5
  SHA512:
6
- metadata.gz: 403b767d5d035963b5b0ef3135fcaacfed8dd8c4032a3f9f835b37079a40ebc8fbd55b82fc67cd5a4383043f4151fd2572b8b005352ea7ff5e8b0392d9107fc6
7
- data.tar.gz: bbd5937f48fce57149b1bd58c46654ec268025a9394cd682b8a67c31f6cdba419c20ff26ac2ad14623cce1e5537bcbe080ab490e3f28466f5b03c56d979deb19
6
+ metadata.gz: ebed4f7693b075eb8121005178f2be913bbda87ac321b6d7d1f78cb3611fd017e21c137e7e3d9e718afdde5f4144b34bd8bb3f4a049be4c127c01ab7dc893886
7
+ data.tar.gz: b19909608492c4ec559bbfe5a9cb8933f954110455a22a885bf0b4dbdfdc0718e64f3a7e1e75e98b7e35e5982edcae7609878795a09807f3c82d3a4c6281b84a
data/lib/isodoc/itu/itu.implementers-guide.xsl CHANGED
@@ -2042,6 +2042,9 @@
2042
2042
  <xsl:variable name="title">
2043
2043
  <xsl:call-template name="getName"/>
2044
2044
  </xsl:variable>
2045
+ <xsl:variable name="variant_title">
2046
+ <xsl:copy-of select="mn:variant-title[@type = 'toc']/node()"/>
2047
+ </xsl:variable>
2045
2048
 
2046
2049
  <mnx:item level="{$level}" section="{$section}" type="{$type}" display="{$display}">
2047
2050
  <xsl:call-template name="setId"/>
@@ -2049,7 +2052,14 @@
2049
2052
  <xsl:attribute name="level">1</xsl:attribute>
2050
2053
  </xsl:if>
2051
2054
  <mnx:title>
2052
- <xsl:apply-templates select="xalan:nodeset($title)" mode="contents_item"/>
2055
+ <xsl:choose>
2056
+ <xsl:when test="normalize-space($variant_title) != ''">
2057
+ <xsl:apply-templates select="xalan:nodeset($variant_title)" mode="contents_item"/>
2058
+ </xsl:when>
2059
+ <xsl:otherwise>
2060
+ <xsl:apply-templates select="xalan:nodeset($title)" mode="contents_item"/>
2061
+ </xsl:otherwise>
2062
+ </xsl:choose>
2053
2063
  </mnx:title>
2054
2064
  <xsl:if test="$type != 'indexsect'">
2055
2065
  <xsl:apply-templates mode="contents"/>
@@ -3587,7 +3597,24 @@
3587
3597
  <xsl:template match="mn:metanorma-extension/*[local-name() = 'UnitsML']" mode="update_xml_step1"/>
3588
3598
 
3589
3599
  <!-- remove image/emf -->
3590
- <xsl:template match="mn:image/mn:emf" mode="update_xml_step1"/>
3600
+ <xsl:template match="mn:image//mn:emf" mode="update_xml_step1"/>
3601
+
3602
+ <!-- https://github.com/metanorma/metanorma/issues/540 -->
3603
+ <xsl:template match="mn:image[mn:altsource]" priority="3" mode="update_xml_step1">
3604
+ <xsl:copy>
3605
+ <xsl:apply-templates select="@*" mode="update_xml_step1"/>
3606
+ <xsl:choose>
3607
+ <xsl:when test="mn:altsource[contains(@tag, 'pdf')]">
3608
+ <xsl:apply-templates select="mn:altsource[contains(@tag, 'pdf')]/@*" mode="update_xml_step1"/>
3609
+ <xsl:apply-templates select="mn:altsource[contains(@tag, 'pdf')]/node()" mode="update_xml_step1"/>
3610
+ </xsl:when>
3611
+ <xsl:otherwise>
3612
+ <xsl:apply-templates select="mn:altsource[contains(@tag, 'default')]/@*" mode="update_xml_step1"/>
3613
+ <xsl:apply-templates select="mn:altsource[contains(@tag, 'default')]/node()" mode="update_xml_step1"/>
3614
+ </xsl:otherwise>
3615
+ </xsl:choose>
3616
+ </xsl:copy>
3617
+ </xsl:template>
3591
3618
 
3592
3619
  <!-- remove preprocess-xslt -->
3593
3620
  <xsl:template match="mn:preprocess-xslt" mode="update_xml_step1"/>
@@ -3815,6 +3842,15 @@
3815
3842
  </xsl:choose>
3816
3843
  </xsl:template>
3817
3844
 
3845
+ <!-- https://github.com/metanorma/metanorma-iso/issues/1535 -->
3846
+ <xsl:template match="mn:ol[mn:fmt-ol]" mode="update_xml_step1">
3847
+ <xsl:apply-templates select="mn:fmt-ol" mode="update_xml_step1"/>
3848
+ </xsl:template>
3849
+
3850
+ <xsl:template match="mn:ul[mn:fmt-ul]" mode="update_xml_step1">
3851
+ <xsl:apply-templates select="mn:fmt-ul" mode="update_xml_step1"/>
3852
+ </xsl:template>
3853
+
3818
3854
  <!-- li/fmt-name -->
3819
3855
  <xsl:template match="mn:li/mn:fmt-name" priority="2" mode="update_xml_step1">
3820
3856
  <xsl:attribute name="label"><xsl:value-of select="."/></xsl:attribute>
@@ -7114,6 +7150,8 @@
7114
7150
  <xsl:if test="$doctype = 'service-publication'">
7115
7151
  <xsl:attribute name="border">1pt solid rgb(211,211,211)</xsl:attribute>
7116
7152
  </xsl:if>
7153
+
7154
+ <xsl:call-template name="setNoBordersForTableList"/>
7117
7155
  </xsl:template> <!-- refine_table-style -->
7118
7156
 
7119
7157
  <xsl:attribute-set name="table-number-style">
@@ -7152,12 +7190,16 @@
7152
7190
  <xsl:if test="$doctype = 'service-publication'">
7153
7191
  <xsl:attribute name="border-bottom">1.1pt solid black</xsl:attribute>
7154
7192
  </xsl:if>
7193
+
7194
+ <xsl:call-template name="setNoBordersForTableList"/>
7155
7195
  </xsl:template> <!-- refine_table-header-row-style -->
7156
7196
 
7157
7197
  <xsl:attribute-set name="table-footer-row-style" use-attribute-sets="table-row-style">
7158
7198
  </xsl:attribute-set>
7159
7199
 
7160
7200
  <xsl:template name="refine_table-footer-row-style">
7201
+
7202
+ <xsl:call-template name="setNoBordersForTableList"/>
7161
7203
  </xsl:template> <!-- refine_table-footer-row-style -->
7162
7204
 
7163
7205
  <xsl:attribute-set name="table-body-row-style" use-attribute-sets="table-row-style">
@@ -7167,6 +7209,8 @@
7167
7209
  <xsl:template name="refine_table-body-row-style">
7168
7210
 
7169
7211
  <xsl:call-template name="setBordersTableArray"/>
7212
+
7213
+ <xsl:call-template name="setNoBordersForTableList"/>
7170
7214
  </xsl:template> <!-- refine_table-body-row-style -->
7171
7215
 
7172
7216
  <xsl:attribute-set name="table-header-cell-style">
@@ -7196,6 +7240,16 @@
7196
7240
  </xsl:if>
7197
7241
 
7198
7242
  <xsl:call-template name="setTableCellAttributes"/>
7243
+
7244
+ <xsl:if test="ancestor::mn:fmt-ol or ancestor::mn:fmt-ul">
7245
+ <xsl:attribute name="display-align">before</xsl:attribute>
7246
+ <xsl:attribute name="text-align">left</xsl:attribute>
7247
+ <xsl:if test="following-sibling::*">
7248
+ <xsl:attribute name="padding-right">4mm</xsl:attribute>
7249
+ </xsl:if>
7250
+ <xsl:call-template name="setNoBordersForTableList"/>
7251
+ </xsl:if>
7252
+
7199
7253
  </xsl:template> <!-- refine_table-header-cell-style -->
7200
7254
 
7201
7255
  <xsl:attribute-set name="table-cell-style">
@@ -7222,6 +7276,15 @@
7222
7276
  <xsl:attribute name="padding-top">1mm</xsl:attribute>
7223
7277
  </xsl:if>
7224
7278
 
7279
+ <xsl:if test="ancestor::mn:fmt-ol or ancestor::mn:fmt-ul">
7280
+ <xsl:attribute name="display-align">before</xsl:attribute>
7281
+ <xsl:attribute name="text-align">left</xsl:attribute>
7282
+ <xsl:if test="following-sibling::*">
7283
+ <xsl:attribute name="padding-right">4mm</xsl:attribute>
7284
+ </xsl:if>
7285
+ <xsl:call-template name="setNoBordersForTableList"/>
7286
+ </xsl:if>
7287
+
7225
7288
  </xsl:template> <!-- refine_table-cell-style -->
7226
7289
 
7227
7290
  <xsl:attribute-set name="table-footer-cell-style">
@@ -7241,6 +7304,8 @@
7241
7304
  <xsl:if test="$doctype = 'service-publication'">
7242
7305
  <xsl:attribute name="border">none</xsl:attribute>
7243
7306
  </xsl:if>
7307
+
7308
+ <xsl:call-template name="setNoBordersForTableList"/>
7244
7309
  </xsl:template> <!-- refine_table-footer-cell-style -->
7245
7310
 
7246
7311
  <xsl:attribute-set name="table-note-style">
@@ -7285,6 +7350,16 @@
7285
7350
  <xsl:template name="refine_table-fn-body-style">
7286
7351
  </xsl:template>
7287
7352
 
7353
+ <xsl:template name="setNoBordersForTableList">
7354
+ <xsl:if test="ancestor::mn:fmt-ol or ancestor::mn:fmt-ul">
7355
+ <xsl:attribute name="border">none</xsl:attribute>
7356
+ <xsl:attribute name="border-top">none</xsl:attribute>
7357
+ <xsl:attribute name="border-bottom">none</xsl:attribute>
7358
+ <xsl:attribute name="border-left">none</xsl:attribute>
7359
+ <xsl:attribute name="border-right">none</xsl:attribute>
7360
+ </xsl:if>
7361
+ </xsl:template>
7362
+
7288
7363
  <!-- ========================== -->
7289
7364
  <!-- END Table styles -->
7290
7365
  <!-- ========================== -->
@@ -12899,6 +12974,10 @@
12899
12974
  </fo:list-item>
12900
12975
  </xsl:template>
12901
12976
 
12977
+ <xsl:template match="mn:fmt-ol | mn:fmt-ul">
12978
+ <xsl:apply-templates/>
12979
+ </xsl:template>
12980
+
12902
12981
  <!-- ===================================== -->
12903
12982
  <!-- END Lists processing -->
12904
12983
  <!-- ===================================== -->
data/lib/isodoc/itu/itu.in-force.xsl CHANGED
@@ -2042,6 +2042,9 @@
2042
2042
  <xsl:variable name="title">
2043
2043
  <xsl:call-template name="getName"/>
2044
2044
  </xsl:variable>
2045
+ <xsl:variable name="variant_title">
2046
+ <xsl:copy-of select="mn:variant-title[@type = 'toc']/node()"/>
2047
+ </xsl:variable>
2045
2048
 
2046
2049
  <mnx:item level="{$level}" section="{$section}" type="{$type}" display="{$display}">
2047
2050
  <xsl:call-template name="setId"/>
@@ -2049,7 +2052,14 @@
2049
2052
  <xsl:attribute name="level">1</xsl:attribute>
2050
2053
  </xsl:if>
2051
2054
  <mnx:title>
2052
- <xsl:apply-templates select="xalan:nodeset($title)" mode="contents_item"/>
2055
+ <xsl:choose>
2056
+ <xsl:when test="normalize-space($variant_title) != ''">
2057
+ <xsl:apply-templates select="xalan:nodeset($variant_title)" mode="contents_item"/>
2058
+ </xsl:when>
2059
+ <xsl:otherwise>
2060
+ <xsl:apply-templates select="xalan:nodeset($title)" mode="contents_item"/>
2061
+ </xsl:otherwise>
2062
+ </xsl:choose>
2053
2063
  </mnx:title>
2054
2064
  <xsl:if test="$type != 'indexsect'">
2055
2065
  <xsl:apply-templates mode="contents"/>
@@ -3587,7 +3597,24 @@
3587
3597
  <xsl:template match="mn:metanorma-extension/*[local-name() = 'UnitsML']" mode="update_xml_step1"/>
3588
3598
 
3589
3599
  <!-- remove image/emf -->
3590
- <xsl:template match="mn:image/mn:emf" mode="update_xml_step1"/>
3600
+ <xsl:template match="mn:image//mn:emf" mode="update_xml_step1"/>
3601
+
3602
+ <!-- https://github.com/metanorma/metanorma/issues/540 -->
3603
+ <xsl:template match="mn:image[mn:altsource]" priority="3" mode="update_xml_step1">
3604
+ <xsl:copy>
3605
+ <xsl:apply-templates select="@*" mode="update_xml_step1"/>
3606
+ <xsl:choose>
3607
+ <xsl:when test="mn:altsource[contains(@tag, 'pdf')]">
3608
+ <xsl:apply-templates select="mn:altsource[contains(@tag, 'pdf')]/@*" mode="update_xml_step1"/>
3609
+ <xsl:apply-templates select="mn:altsource[contains(@tag, 'pdf')]/node()" mode="update_xml_step1"/>
3610
+ </xsl:when>
3611
+ <xsl:otherwise>
3612
+ <xsl:apply-templates select="mn:altsource[contains(@tag, 'default')]/@*" mode="update_xml_step1"/>
3613
+ <xsl:apply-templates select="mn:altsource[contains(@tag, 'default')]/node()" mode="update_xml_step1"/>
3614
+ </xsl:otherwise>
3615
+ </xsl:choose>
3616
+ </xsl:copy>
3617
+ </xsl:template>
3591
3618
 
3592
3619
  <!-- remove preprocess-xslt -->
3593
3620
  <xsl:template match="mn:preprocess-xslt" mode="update_xml_step1"/>
@@ -3815,6 +3842,15 @@
3815
3842
  </xsl:choose>
3816
3843
  </xsl:template>
3817
3844
 
3845
+ <!-- https://github.com/metanorma/metanorma-iso/issues/1535 -->
3846
+ <xsl:template match="mn:ol[mn:fmt-ol]" mode="update_xml_step1">
3847
+ <xsl:apply-templates select="mn:fmt-ol" mode="update_xml_step1"/>
3848
+ </xsl:template>
3849
+
3850
+ <xsl:template match="mn:ul[mn:fmt-ul]" mode="update_xml_step1">
3851
+ <xsl:apply-templates select="mn:fmt-ul" mode="update_xml_step1"/>
3852
+ </xsl:template>
3853
+
3818
3854
  <!-- li/fmt-name -->
3819
3855
  <xsl:template match="mn:li/mn:fmt-name" priority="2" mode="update_xml_step1">
3820
3856
  <xsl:attribute name="label"><xsl:value-of select="."/></xsl:attribute>
@@ -7114,6 +7150,8 @@
7114
7150
  <xsl:if test="$doctype = 'service-publication'">
7115
7151
  <xsl:attribute name="border">1pt solid rgb(211,211,211)</xsl:attribute>
7116
7152
  </xsl:if>
7153
+
7154
+ <xsl:call-template name="setNoBordersForTableList"/>
7117
7155
  </xsl:template> <!-- refine_table-style -->
7118
7156
 
7119
7157
  <xsl:attribute-set name="table-number-style">
@@ -7152,12 +7190,16 @@
7152
7190
  <xsl:if test="$doctype = 'service-publication'">
7153
7191
  <xsl:attribute name="border-bottom">1.1pt solid black</xsl:attribute>
7154
7192
  </xsl:if>
7193
+
7194
+ <xsl:call-template name="setNoBordersForTableList"/>
7155
7195
  </xsl:template> <!-- refine_table-header-row-style -->
7156
7196
 
7157
7197
  <xsl:attribute-set name="table-footer-row-style" use-attribute-sets="table-row-style">
7158
7198
  </xsl:attribute-set>
7159
7199
 
7160
7200
  <xsl:template name="refine_table-footer-row-style">
7201
+
7202
+ <xsl:call-template name="setNoBordersForTableList"/>
7161
7203
  </xsl:template> <!-- refine_table-footer-row-style -->
7162
7204
 
7163
7205
  <xsl:attribute-set name="table-body-row-style" use-attribute-sets="table-row-style">
@@ -7167,6 +7209,8 @@
7167
7209
  <xsl:template name="refine_table-body-row-style">
7168
7210
 
7169
7211
  <xsl:call-template name="setBordersTableArray"/>
7212
+
7213
+ <xsl:call-template name="setNoBordersForTableList"/>
7170
7214
  </xsl:template> <!-- refine_table-body-row-style -->
7171
7215
 
7172
7216
  <xsl:attribute-set name="table-header-cell-style">
@@ -7196,6 +7240,16 @@
7196
7240
  </xsl:if>
7197
7241
 
7198
7242
  <xsl:call-template name="setTableCellAttributes"/>
7243
+
7244
+ <xsl:if test="ancestor::mn:fmt-ol or ancestor::mn:fmt-ul">
7245
+ <xsl:attribute name="display-align">before</xsl:attribute>
7246
+ <xsl:attribute name="text-align">left</xsl:attribute>
7247
+ <xsl:if test="following-sibling::*">
7248
+ <xsl:attribute name="padding-right">4mm</xsl:attribute>
7249
+ </xsl:if>
7250
+ <xsl:call-template name="setNoBordersForTableList"/>
7251
+ </xsl:if>
7252
+
7199
7253
  </xsl:template> <!-- refine_table-header-cell-style -->
7200
7254
 
7201
7255
  <xsl:attribute-set name="table-cell-style">
@@ -7222,6 +7276,15 @@
7222
7276
  <xsl:attribute name="padding-top">1mm</xsl:attribute>
7223
7277
  </xsl:if>
7224
7278
 
7279
+ <xsl:if test="ancestor::mn:fmt-ol or ancestor::mn:fmt-ul">
7280
+ <xsl:attribute name="display-align">before</xsl:attribute>
7281
+ <xsl:attribute name="text-align">left</xsl:attribute>
7282
+ <xsl:if test="following-sibling::*">
7283
+ <xsl:attribute name="padding-right">4mm</xsl:attribute>
7284
+ </xsl:if>
7285
+ <xsl:call-template name="setNoBordersForTableList"/>
7286
+ </xsl:if>
7287
+
7225
7288
  </xsl:template> <!-- refine_table-cell-style -->
7226
7289
 
7227
7290
  <xsl:attribute-set name="table-footer-cell-style">
@@ -7241,6 +7304,8 @@
7241
7304
  <xsl:if test="$doctype = 'service-publication'">
7242
7305
  <xsl:attribute name="border">none</xsl:attribute>
7243
7306
  </xsl:if>
7307
+
7308
+ <xsl:call-template name="setNoBordersForTableList"/>
7244
7309
  </xsl:template> <!-- refine_table-footer-cell-style -->
7245
7310
 
7246
7311
  <xsl:attribute-set name="table-note-style">
@@ -7285,6 +7350,16 @@
7285
7350
  <xsl:template name="refine_table-fn-body-style">
7286
7351
  </xsl:template>
7287
7352
 
7353
+ <xsl:template name="setNoBordersForTableList">
7354
+ <xsl:if test="ancestor::mn:fmt-ol or ancestor::mn:fmt-ul">
7355
+ <xsl:attribute name="border">none</xsl:attribute>
7356
+ <xsl:attribute name="border-top">none</xsl:attribute>
7357
+ <xsl:attribute name="border-bottom">none</xsl:attribute>
7358
+ <xsl:attribute name="border-left">none</xsl:attribute>
7359
+ <xsl:attribute name="border-right">none</xsl:attribute>
7360
+ </xsl:if>
7361
+ </xsl:template>
7362
+
7288
7363
  <!-- ========================== -->
7289
7364
  <!-- END Table styles -->
7290
7365
  <!-- ========================== -->
@@ -12899,6 +12974,10 @@
12899
12974
  </fo:list-item>
12900
12975
  </xsl:template>
12901
12976
 
12977
+ <xsl:template match="mn:fmt-ol | mn:fmt-ul">
12978
+ <xsl:apply-templates/>
12979
+ </xsl:template>
12980
+
12902
12981
  <!-- ===================================== -->
12903
12982
  <!-- END Lists processing -->
12904
12983
  <!-- ===================================== -->
data/lib/isodoc/itu/itu.recommendation-annex.xsl CHANGED
@@ -2042,6 +2042,9 @@
2042
2042
  <xsl:variable name="title">
2043
2043
  <xsl:call-template name="getName"/>
2044
2044
  </xsl:variable>
2045
+ <xsl:variable name="variant_title">
2046
+ <xsl:copy-of select="mn:variant-title[@type = 'toc']/node()"/>
2047
+ </xsl:variable>
2045
2048
 
2046
2049
  <mnx:item level="{$level}" section="{$section}" type="{$type}" display="{$display}">
2047
2050
  <xsl:call-template name="setId"/>
@@ -2049,7 +2052,14 @@
2049
2052
  <xsl:attribute name="level">1</xsl:attribute>
2050
2053
  </xsl:if>
2051
2054
  <mnx:title>
2052
- <xsl:apply-templates select="xalan:nodeset($title)" mode="contents_item"/>
2055
+ <xsl:choose>
2056
+ <xsl:when test="normalize-space($variant_title) != ''">
2057
+ <xsl:apply-templates select="xalan:nodeset($variant_title)" mode="contents_item"/>
2058
+ </xsl:when>
2059
+ <xsl:otherwise>
2060
+ <xsl:apply-templates select="xalan:nodeset($title)" mode="contents_item"/>
2061
+ </xsl:otherwise>
2062
+ </xsl:choose>
2053
2063
  </mnx:title>
2054
2064
  <xsl:if test="$type != 'indexsect'">
2055
2065
  <xsl:apply-templates mode="contents"/>
@@ -3587,7 +3597,24 @@
3587
3597
  <xsl:template match="mn:metanorma-extension/*[local-name() = 'UnitsML']" mode="update_xml_step1"/>
3588
3598
 
3589
3599
  <!-- remove image/emf -->
3590
- <xsl:template match="mn:image/mn:emf" mode="update_xml_step1"/>
3600
+ <xsl:template match="mn:image//mn:emf" mode="update_xml_step1"/>
3601
+
3602
+ <!-- https://github.com/metanorma/metanorma/issues/540 -->
3603
+ <xsl:template match="mn:image[mn:altsource]" priority="3" mode="update_xml_step1">
3604
+ <xsl:copy>
3605
+ <xsl:apply-templates select="@*" mode="update_xml_step1"/>
3606
+ <xsl:choose>
3607
+ <xsl:when test="mn:altsource[contains(@tag, 'pdf')]">
3608
+ <xsl:apply-templates select="mn:altsource[contains(@tag, 'pdf')]/@*" mode="update_xml_step1"/>
3609
+ <xsl:apply-templates select="mn:altsource[contains(@tag, 'pdf')]/node()" mode="update_xml_step1"/>
3610
+ </xsl:when>
3611
+ <xsl:otherwise>
3612
+ <xsl:apply-templates select="mn:altsource[contains(@tag, 'default')]/@*" mode="update_xml_step1"/>
3613
+ <xsl:apply-templates select="mn:altsource[contains(@tag, 'default')]/node()" mode="update_xml_step1"/>
3614
+ </xsl:otherwise>
3615
+ </xsl:choose>
3616
+ </xsl:copy>
3617
+ </xsl:template>
3591
3618
 
3592
3619
  <!-- remove preprocess-xslt -->
3593
3620
  <xsl:template match="mn:preprocess-xslt" mode="update_xml_step1"/>
@@ -3815,6 +3842,15 @@
3815
3842
  </xsl:choose>
3816
3843
  </xsl:template>
3817
3844
 
3845
+ <!-- https://github.com/metanorma/metanorma-iso/issues/1535 -->
3846
+ <xsl:template match="mn:ol[mn:fmt-ol]" mode="update_xml_step1">
3847
+ <xsl:apply-templates select="mn:fmt-ol" mode="update_xml_step1"/>
3848
+ </xsl:template>
3849
+
3850
+ <xsl:template match="mn:ul[mn:fmt-ul]" mode="update_xml_step1">
3851
+ <xsl:apply-templates select="mn:fmt-ul" mode="update_xml_step1"/>
3852
+ </xsl:template>
3853
+
3818
3854
  <!-- li/fmt-name -->
3819
3855
  <xsl:template match="mn:li/mn:fmt-name" priority="2" mode="update_xml_step1">
3820
3856
  <xsl:attribute name="label"><xsl:value-of select="."/></xsl:attribute>
@@ -7114,6 +7150,8 @@
7114
7150
  <xsl:if test="$doctype = 'service-publication'">
7115
7151
  <xsl:attribute name="border">1pt solid rgb(211,211,211)</xsl:attribute>
7116
7152
  </xsl:if>
7153
+
7154
+ <xsl:call-template name="setNoBordersForTableList"/>
7117
7155
  </xsl:template> <!-- refine_table-style -->
7118
7156
 
7119
7157
  <xsl:attribute-set name="table-number-style">
@@ -7152,12 +7190,16 @@
7152
7190
  <xsl:if test="$doctype = 'service-publication'">
7153
7191
  <xsl:attribute name="border-bottom">1.1pt solid black</xsl:attribute>
7154
7192
  </xsl:if>
7193
+
7194
+ <xsl:call-template name="setNoBordersForTableList"/>
7155
7195
  </xsl:template> <!-- refine_table-header-row-style -->
7156
7196
 
7157
7197
  <xsl:attribute-set name="table-footer-row-style" use-attribute-sets="table-row-style">
7158
7198
  </xsl:attribute-set>
7159
7199
 
7160
7200
  <xsl:template name="refine_table-footer-row-style">
7201
+
7202
+ <xsl:call-template name="setNoBordersForTableList"/>
7161
7203
  </xsl:template> <!-- refine_table-footer-row-style -->
7162
7204
 
7163
7205
  <xsl:attribute-set name="table-body-row-style" use-attribute-sets="table-row-style">
@@ -7167,6 +7209,8 @@
7167
7209
  <xsl:template name="refine_table-body-row-style">
7168
7210
 
7169
7211
  <xsl:call-template name="setBordersTableArray"/>
7212
+
7213
+ <xsl:call-template name="setNoBordersForTableList"/>
7170
7214
  </xsl:template> <!-- refine_table-body-row-style -->
7171
7215
 
7172
7216
  <xsl:attribute-set name="table-header-cell-style">
@@ -7196,6 +7240,16 @@
7196
7240
  </xsl:if>
7197
7241
 
7198
7242
  <xsl:call-template name="setTableCellAttributes"/>
7243
+
7244
+ <xsl:if test="ancestor::mn:fmt-ol or ancestor::mn:fmt-ul">
7245
+ <xsl:attribute name="display-align">before</xsl:attribute>
7246
+ <xsl:attribute name="text-align">left</xsl:attribute>
7247
+ <xsl:if test="following-sibling::*">
7248
+ <xsl:attribute name="padding-right">4mm</xsl:attribute>
7249
+ </xsl:if>
7250
+ <xsl:call-template name="setNoBordersForTableList"/>
7251
+ </xsl:if>
7252
+
7199
7253
  </xsl:template> <!-- refine_table-header-cell-style -->
7200
7254
 
7201
7255
  <xsl:attribute-set name="table-cell-style">
@@ -7222,6 +7276,15 @@
7222
7276
  <xsl:attribute name="padding-top">1mm</xsl:attribute>
7223
7277
  </xsl:if>
7224
7278
 
7279
+ <xsl:if test="ancestor::mn:fmt-ol or ancestor::mn:fmt-ul">
7280
+ <xsl:attribute name="display-align">before</xsl:attribute>
7281
+ <xsl:attribute name="text-align">left</xsl:attribute>
7282
+ <xsl:if test="following-sibling::*">
7283
+ <xsl:attribute name="padding-right">4mm</xsl:attribute>
7284
+ </xsl:if>
7285
+ <xsl:call-template name="setNoBordersForTableList"/>
7286
+ </xsl:if>
7287
+
7225
7288
  </xsl:template> <!-- refine_table-cell-style -->
7226
7289
 
7227
7290
  <xsl:attribute-set name="table-footer-cell-style">
@@ -7241,6 +7304,8 @@
7241
7304
  <xsl:if test="$doctype = 'service-publication'">
7242
7305
  <xsl:attribute name="border">none</xsl:attribute>
7243
7306
  </xsl:if>
7307
+
7308
+ <xsl:call-template name="setNoBordersForTableList"/>
7244
7309
  </xsl:template> <!-- refine_table-footer-cell-style -->
7245
7310
 
7246
7311
  <xsl:attribute-set name="table-note-style">
@@ -7285,6 +7350,16 @@
7285
7350
  <xsl:template name="refine_table-fn-body-style">
7286
7351
  </xsl:template>
7287
7352
 
7353
+ <xsl:template name="setNoBordersForTableList">
7354
+ <xsl:if test="ancestor::mn:fmt-ol or ancestor::mn:fmt-ul">
7355
+ <xsl:attribute name="border">none</xsl:attribute>
7356
+ <xsl:attribute name="border-top">none</xsl:attribute>
7357
+ <xsl:attribute name="border-bottom">none</xsl:attribute>
7358
+ <xsl:attribute name="border-left">none</xsl:attribute>
7359
+ <xsl:attribute name="border-right">none</xsl:attribute>
7360
+ </xsl:if>
7361
+ </xsl:template>
7362
+
7288
7363
  <!-- ========================== -->
7289
7364
  <!-- END Table styles -->
7290
7365
  <!-- ========================== -->
@@ -12899,6 +12974,10 @@
12899
12974
  </fo:list-item>
12900
12975
  </xsl:template>
12901
12976
 
12977
+ <xsl:template match="mn:fmt-ol | mn:fmt-ul">
12978
+ <xsl:apply-templates/>
12979
+ </xsl:template>
12980
+
12902
12981
  <!-- ===================================== -->
12903
12982
  <!-- END Lists processing -->
12904
12983
  <!-- ===================================== -->