metanorma-iso 2.9.5 → 2.9.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 (6) hide show
  1. checksums.yaml +4 -4
  2. data/lib/isodoc/iso/iso.amendment.xsl +31 -9
  3. data/lib/isodoc/iso/iso.international-standard.xsl +31 -9
  4. data/lib/metanorma/iso/cleanup.rb +2 -1
  5. data/lib/metanorma/iso/version.rb +1 -1
  6. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 1fe83bad2a7399c95b11c24d60ba37fb5068570bb7da9af1cf0bee99380dfc3f
4
- data.tar.gz: a7b5bee127f589a01fbe2d4161c2ab1dfc3b7f2c03ca96d9294871dbbd25640c
3
+ metadata.gz: 02b8536c8dedc08d06356682d97dc203baa51f10136f1d8f5bd4166418f8ae0c
4
+ data.tar.gz: 46cd7825f277c494a45a626f16b72a7471d4894a6d85bb8fa58f184be73fa030
5
5
  SHA512:
6
- metadata.gz: 2990837a34da1911b1070d458e735411235e6d2619993a95f2db33608ade897e289d4bb22e13897e5cfa5fd8b1ad60d129d5c65b5a85821dd556be724b202ca1
7
- data.tar.gz: 808778fb664c374ce55a916da7b7e3389614ccd5a78297d525aed3926005256edceab2f72b80a4b50f194cdf270706fd4ec89071176b1f29b2484bd870fb9cf7
6
+ metadata.gz: 040eb6a7c0a9ed836363a87d63bd539093c56eb41d8e0e8770c11f64ecf3bf02ffa46a631b8db1a47877818a937f15fe31459c043ff8ab851dc4e07b3cd615ca
7
+ data.tar.gz: 0436551ec589f985bdf87d0028f68466000582a644ccbc9212427c5ac7e1dbef6e75f7c5fb11b5678f66ba84ffa333d5ca9bdd82dabf3ea5a2586a46d99a668c
data/lib/isodoc/iso/iso.amendment.xsl CHANGED
@@ -11274,9 +11274,14 @@
11274
11274
 
11275
11275
  <xsl:variable name="simple-table">
11276
11276
 
11277
+ <xsl:variable name="table_without_semantic_elements">
11278
+ <xsl:apply-templates mode="update_xml_pres"/>
11279
+ </xsl:variable>
11280
+
11277
11281
  <!-- Step 0. replace <br/> to <p>...</p> -->
11278
11282
  <xsl:variable name="table_without_br">
11279
- <xsl:apply-templates mode="table-without-br"/>
11283
+ <!-- <xsl:apply-templates mode="table-without-br"/> -->
11284
+ <xsl:apply-templates select="xalan:nodeset($table_without_semantic_elements)" mode="table-without-br"/>
11280
11285
  </xsl:variable>
11281
11286
 
11282
11287
  <!-- Step 1. colspan processing -->
@@ -17441,16 +17446,30 @@
17441
17446
 
17442
17447
  <xsl:template match="*[local-name() = 'fmt-name']"/>
17443
17448
  <xsl:template match="*[local-name() = 'fmt-name']" mode="update_xml_step1">
17444
- <xsl:element name="name" namespace="{$namespace_full}">
17445
- <xsl:copy-of select="@*"/>
17446
- <xsl:apply-templates mode="update_xml_step1"/>
17447
- </xsl:element>
17449
+ <xsl:choose>
17450
+ <xsl:when test="local-name(..) = 'p' and ancestor::*[local-name() = 'table']">
17451
+ <xsl:apply-templates mode="update_xml_step1"/>
17452
+ </xsl:when>
17453
+ <xsl:otherwise>
17454
+ <xsl:element name="name" namespace="{$namespace_full}">
17455
+ <xsl:copy-of select="@*"/>
17456
+ <xsl:apply-templates mode="update_xml_step1"/>
17457
+ </xsl:element>
17458
+ </xsl:otherwise>
17459
+ </xsl:choose>
17448
17460
  </xsl:template>
17449
17461
  <xsl:template match="*[local-name() = 'fmt-name']" mode="update_xml_pres">
17450
- <xsl:element name="name" namespace="{$namespace_full}">
17451
- <xsl:copy-of select="@*"/>
17452
- <xsl:apply-templates mode="update_xml_pres"/>
17453
- </xsl:element>
17462
+ <xsl:choose>
17463
+ <xsl:when test="local-name(..) = 'p' and ancestor::*[local-name() = 'table']">
17464
+ <xsl:apply-templates mode="update_xml_step1"/>
17465
+ </xsl:when>
17466
+ <xsl:otherwise>
17467
+ <xsl:element name="name" namespace="{$namespace_full}">
17468
+ <xsl:copy-of select="@*"/>
17469
+ <xsl:apply-templates mode="update_xml_pres"/>
17470
+ </xsl:element>
17471
+ </xsl:otherwise>
17472
+ </xsl:choose>
17454
17473
  </xsl:template>
17455
17474
 
17456
17475
  <xsl:template match="*[local-name() = 'fmt-preferred']"/>
@@ -17548,6 +17567,9 @@
17548
17567
  <xsl:apply-templates mode="update_xml_pres"/>
17549
17568
  </xsl:template>
17550
17569
 
17570
+ <xsl:template match="*[local-name() = 'semx']">
17571
+ <xsl:apply-templates/>
17572
+ </xsl:template>
17551
17573
  <xsl:template match="*[local-name() = 'semx']" mode="update_xml_step1">
17552
17574
  <xsl:apply-templates mode="update_xml_step1"/>
17553
17575
  </xsl:template>
data/lib/isodoc/iso/iso.international-standard.xsl CHANGED
@@ -11274,9 +11274,14 @@
11274
11274
 
11275
11275
  <xsl:variable name="simple-table">
11276
11276
 
11277
+ <xsl:variable name="table_without_semantic_elements">
11278
+ <xsl:apply-templates mode="update_xml_pres"/>
11279
+ </xsl:variable>
11280
+
11277
11281
  <!-- Step 0. replace <br/> to <p>...</p> -->
11278
11282
  <xsl:variable name="table_without_br">
11279
- <xsl:apply-templates mode="table-without-br"/>
11283
+ <!-- <xsl:apply-templates mode="table-without-br"/> -->
11284
+ <xsl:apply-templates select="xalan:nodeset($table_without_semantic_elements)" mode="table-without-br"/>
11280
11285
  </xsl:variable>
11281
11286
 
11282
11287
  <!-- Step 1. colspan processing -->
@@ -17441,16 +17446,30 @@
17441
17446
 
17442
17447
  <xsl:template match="*[local-name() = 'fmt-name']"/>
17443
17448
  <xsl:template match="*[local-name() = 'fmt-name']" mode="update_xml_step1">
17444
- <xsl:element name="name" namespace="{$namespace_full}">
17445
- <xsl:copy-of select="@*"/>
17446
- <xsl:apply-templates mode="update_xml_step1"/>
17447
- </xsl:element>
17449
+ <xsl:choose>
17450
+ <xsl:when test="local-name(..) = 'p' and ancestor::*[local-name() = 'table']">
17451
+ <xsl:apply-templates mode="update_xml_step1"/>
17452
+ </xsl:when>
17453
+ <xsl:otherwise>
17454
+ <xsl:element name="name" namespace="{$namespace_full}">
17455
+ <xsl:copy-of select="@*"/>
17456
+ <xsl:apply-templates mode="update_xml_step1"/>
17457
+ </xsl:element>
17458
+ </xsl:otherwise>
17459
+ </xsl:choose>
17448
17460
  </xsl:template>
17449
17461
  <xsl:template match="*[local-name() = 'fmt-name']" mode="update_xml_pres">
17450
- <xsl:element name="name" namespace="{$namespace_full}">
17451
- <xsl:copy-of select="@*"/>
17452
- <xsl:apply-templates mode="update_xml_pres"/>
17453
- </xsl:element>
17462
+ <xsl:choose>
17463
+ <xsl:when test="local-name(..) = 'p' and ancestor::*[local-name() = 'table']">
17464
+ <xsl:apply-templates mode="update_xml_step1"/>
17465
+ </xsl:when>
17466
+ <xsl:otherwise>
17467
+ <xsl:element name="name" namespace="{$namespace_full}">
17468
+ <xsl:copy-of select="@*"/>
17469
+ <xsl:apply-templates mode="update_xml_pres"/>
17470
+ </xsl:element>
17471
+ </xsl:otherwise>
17472
+ </xsl:choose>
17454
17473
  </xsl:template>
17455
17474
 
17456
17475
  <xsl:template match="*[local-name() = 'fmt-preferred']"/>
@@ -17548,6 +17567,9 @@
17548
17567
  <xsl:apply-templates mode="update_xml_pres"/>
17549
17568
  </xsl:template>
17550
17569
 
17570
+ <xsl:template match="*[local-name() = 'semx']">
17571
+ <xsl:apply-templates/>
17572
+ </xsl:template>
17551
17573
  <xsl:template match="*[local-name() = 'semx']" mode="update_xml_step1">
17552
17574
  <xsl:apply-templates mode="update_xml_step1"/>
17553
17575
  </xsl:template>
data/lib/metanorma/iso/cleanup.rb CHANGED
@@ -42,7 +42,8 @@ module Metanorma
42
42
  end
43
43
 
44
44
  TERM_CLAUSE =
45
- "//sections//terms[not(preceding-sibling::clause)] | " \
45
+ "//sections/terms | " \
46
+ "//sections/clause//terms[not(preceding-sibling::clause)] | " \
46
47
  "//sections//clause[descendant::terms][not(descendant::definitions)][@type = 'terms'] | " \
47
48
  "//sections/clause[not(@type = 'terms')][not(descendant::definitions)]//terms".freeze
48
49
 
data/lib/metanorma/iso/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module Iso
3
- VERSION = "2.9.5".freeze
3
+ VERSION = "2.9.6".freeze
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-iso
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.9.5
4
+ version: 2.9.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2025-01-20 00:00:00.000000000 Z
11
+ date: 2025-02-03 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: metanorma-standoc