metanorma-iho 0.9.1 → 0.9.2

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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 0222564e4000d5ef484f0f0a82838f1c3ece8a0d2546e795e992c62dc69ae5fa
4
- data.tar.gz: 3db4ef3f58e77c33f55c228c6714c67ba8e278262f6de0706b2ee8ad784ff984
3
+ metadata.gz: 0240fc0c1d870d0b31ef54d36f29b6bfa56de1874540d7f1d5987dd032a665eb
4
+ data.tar.gz: c229c3681aa0630c8ac3304ec54314652640465f1d3acaf532bc72d393b0bd2f
5
5
  SHA512:
6
- metadata.gz: 4fc6726f6a56ad1fbf42489bddd54d972563e638dd83cbed938176d7ad98635a41a1e2be48f70a18f56c594a5adaf489badbafda07bd0b3d26297da7f0535369
7
- data.tar.gz: 5217fe26eda5262afd14ae27c9fcc4a651c172593d7c427ca7d2e60dcf35f67964dbe6309fa66708319a8dd174ffeaa28fcb5abb4a11b0def1da95b97fd72c4c
6
+ metadata.gz: d919916a3e7cca4b9a074e55b2d43e58e19d7f24ead704468a8e76761ab3d1a72ac303354019acd3868cf6a1b1e8ddd9290e62e747f390681544bd7aa915dfcf
7
+ data.tar.gz: 0ae84f1f4b86f685cf504be996c72add22eba009a10b199c97f28515ae197f0010b9bb26fc0bc836326dfd0f0c3be351b2a7fcfbe257e55fd6eb426e85f354ca
@@ -1359,6 +1359,10 @@
1359
1359
 
1360
1360
  </xsl:attribute-set>
1361
1361
 
1362
+ <xsl:template name="refine_termexample-style">
1363
+
1364
+ </xsl:template>
1365
+
1362
1366
  <xsl:attribute-set name="example-style">
1363
1367
 
1364
1368
  <!-- <xsl:attribute name="font-size">11pt</xsl:attribute> -->
@@ -2480,6 +2484,36 @@
2480
2484
  </xsl:for-each>
2481
2485
  </xsl:template>
2482
2486
 
2487
+ <xsl:template name="processMainSectionsDefault_flatxml">
2488
+ <xsl:for-each select="/*/*[local-name()='sections']/* | /*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']">
2489
+ <xsl:sort select="@displayorder" data-type="number"/>
2490
+ <xsl:variable name="flatxml">
2491
+ <xsl:apply-templates select="." mode="flatxml"/>
2492
+ </xsl:variable>
2493
+ <!-- debug_flatxml='<xsl:copy-of select="$flatxml"/>' -->
2494
+ <xsl:apply-templates select="xalan:nodeset($flatxml)/*"/>
2495
+
2496
+ </xsl:for-each>
2497
+
2498
+ <xsl:for-each select="/*/*[local-name()='annex']">
2499
+ <xsl:sort select="@displayorder" data-type="number"/>
2500
+ <xsl:variable name="flatxml">
2501
+ <xsl:apply-templates select="." mode="flatxml"/>
2502
+ </xsl:variable>
2503
+ <!-- debug_flatxml='<xsl:copy-of select="$flatxml"/>' -->
2504
+ <xsl:apply-templates select="xalan:nodeset($flatxml)/*"/>
2505
+ </xsl:for-each>
2506
+
2507
+ <xsl:for-each select="/*/*[local-name()='bibliography']/*[not(@normative='true')] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]]">
2508
+ <xsl:sort select="@displayorder" data-type="number"/>
2509
+ <xsl:variable name="flatxml">
2510
+ <xsl:apply-templates select="." mode="flatxml"/>
2511
+ </xsl:variable>
2512
+ <!-- debug_flatxml='<xsl:copy-of select="$flatxml"/>' -->
2513
+ <xsl:apply-templates select="xalan:nodeset($flatxml)/*"/>
2514
+ </xsl:for-each>
2515
+ </xsl:template>
2516
+
2483
2517
  <xsl:variable name="regex_standard_reference">([A-Z]{2,}(/[A-Z]{2,})* \d+(-\d+)*(:\d{4})?)</xsl:variable>
2484
2518
  <xsl:variable name="tag_fo_inline_keep-together_within-line_open">###fo:inline keep-together_within-line###</xsl:variable>
2485
2519
  <xsl:variable name="tag_fo_inline_keep-together_within-line_close">###/fo:inline keep-together_within-line###</xsl:variable>
@@ -4561,13 +4595,13 @@
4561
4595
  <tr>
4562
4596
  <td>
4563
4597
  <xsl:attribute name="id">
4564
- <xsl:value-of select="concat($id,'_',$row_number,'_1')"/>
4598
+ <xsl:value-of select="concat($id,'@',$row_number,'_1')"/>
4565
4599
  </xsl:attribute>
4566
4600
  <xsl:apply-templates/>
4567
4601
  </td>
4568
4602
  <td>
4569
4603
  <xsl:attribute name="id">
4570
- <xsl:value-of select="concat($id,'_',$row_number,'_2')"/>
4604
+ <xsl:value-of select="concat($id,'@',$row_number,'_2')"/>
4571
4605
  </xsl:attribute>
4572
4606
 
4573
4607
  <xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]">
@@ -5248,6 +5282,10 @@
5248
5282
  <fo:inline keep-with-next.within-line="always"><xsl:value-of select="."/></fo:inline>
5249
5283
  </xsl:template>
5250
5284
 
5285
+ <xsl:template match="*[local-name() = 'span'][contains(@style, 'text-transform:none')]//text()" priority="5">
5286
+ <xsl:value-of select="."/>
5287
+ </xsl:template>
5288
+
5251
5289
  <!-- ========================= -->
5252
5290
  <!-- END Rich text formatting -->
5253
5291
  <!-- ========================= -->
@@ -5878,7 +5916,7 @@
5878
5916
  </xsl:choose>
5879
5917
  </xsl:variable>
5880
5918
  <xsl:attribute name="id">
5881
- <xsl:value-of select="concat($id,'_',$row_number,'_',$col_number,'_',$divide)"/>
5919
+ <xsl:value-of select="concat($id,'@',$row_number,'_',$col_number,'_',$divide)"/>
5882
5920
  </xsl:attribute>
5883
5921
 
5884
5922
  <xsl:for-each select="*[local-name() = 'p']">
@@ -5886,7 +5924,7 @@
5886
5924
  <xsl:copy-of select="@*"/>
5887
5925
  <xsl:variable name="p_num" select="count(preceding-sibling::*[local-name() = 'p']) + 1"/>
5888
5926
  <xsl:attribute name="id">
5889
- <xsl:value-of select="concat($id,'_',$row_number,'_',$col_number,'_p_',$p_num,'_',$divide)"/>
5927
+ <xsl:value-of select="concat($id,'@',$row_number,'_',$col_number,'_p_',$p_num,'_',$divide)"/>
5890
5928
  </xsl:attribute>
5891
5929
 
5892
5930
  <!-- <xsl:copy-of select="node()" /> -->
@@ -5950,7 +5988,7 @@
5950
5988
  <xsl:variable name="num" select="count(preceding-sibling::word) + 1"/>
5951
5989
  <xsl:copy>
5952
5990
  <xsl:attribute name="id">
5953
- <xsl:value-of select="concat($id,'_',$row_number,'_',$col_number,'_word_',$num,'_',$divide)"/>
5991
+ <xsl:value-of select="concat($id,'@',$row_number,'_',$col_number,'_word_',$num,'_',$divide)"/>
5954
5992
  </xsl:attribute>
5955
5993
  <xsl:copy-of select="node()"/>
5956
5994
  </xsl:copy>
@@ -8752,7 +8790,7 @@
8752
8790
  <!-- ====== -->
8753
8791
  <xsl:template match="*[local-name() = 'termexample']">
8754
8792
  <fo:block id="{@id}" xsl:use-attribute-sets="termexample-style">
8755
-
8793
+ <xsl:call-template name="refine_termexample-style"/>
8756
8794
  <xsl:call-template name="setBlockSpanAll"/>
8757
8795
 
8758
8796
  <xsl:apply-templates select="*[local-name()='name']"/>
@@ -1359,6 +1359,10 @@
1359
1359
 
1360
1360
  </xsl:attribute-set>
1361
1361
 
1362
+ <xsl:template name="refine_termexample-style">
1363
+
1364
+ </xsl:template>
1365
+
1362
1366
  <xsl:attribute-set name="example-style">
1363
1367
 
1364
1368
  <!-- <xsl:attribute name="font-size">11pt</xsl:attribute> -->
@@ -2480,6 +2484,36 @@
2480
2484
  </xsl:for-each>
2481
2485
  </xsl:template>
2482
2486
 
2487
+ <xsl:template name="processMainSectionsDefault_flatxml">
2488
+ <xsl:for-each select="/*/*[local-name()='sections']/* | /*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']">
2489
+ <xsl:sort select="@displayorder" data-type="number"/>
2490
+ <xsl:variable name="flatxml">
2491
+ <xsl:apply-templates select="." mode="flatxml"/>
2492
+ </xsl:variable>
2493
+ <!-- debug_flatxml='<xsl:copy-of select="$flatxml"/>' -->
2494
+ <xsl:apply-templates select="xalan:nodeset($flatxml)/*"/>
2495
+
2496
+ </xsl:for-each>
2497
+
2498
+ <xsl:for-each select="/*/*[local-name()='annex']">
2499
+ <xsl:sort select="@displayorder" data-type="number"/>
2500
+ <xsl:variable name="flatxml">
2501
+ <xsl:apply-templates select="." mode="flatxml"/>
2502
+ </xsl:variable>
2503
+ <!-- debug_flatxml='<xsl:copy-of select="$flatxml"/>' -->
2504
+ <xsl:apply-templates select="xalan:nodeset($flatxml)/*"/>
2505
+ </xsl:for-each>
2506
+
2507
+ <xsl:for-each select="/*/*[local-name()='bibliography']/*[not(@normative='true')] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]]">
2508
+ <xsl:sort select="@displayorder" data-type="number"/>
2509
+ <xsl:variable name="flatxml">
2510
+ <xsl:apply-templates select="." mode="flatxml"/>
2511
+ </xsl:variable>
2512
+ <!-- debug_flatxml='<xsl:copy-of select="$flatxml"/>' -->
2513
+ <xsl:apply-templates select="xalan:nodeset($flatxml)/*"/>
2514
+ </xsl:for-each>
2515
+ </xsl:template>
2516
+
2483
2517
  <xsl:variable name="regex_standard_reference">([A-Z]{2,}(/[A-Z]{2,})* \d+(-\d+)*(:\d{4})?)</xsl:variable>
2484
2518
  <xsl:variable name="tag_fo_inline_keep-together_within-line_open">###fo:inline keep-together_within-line###</xsl:variable>
2485
2519
  <xsl:variable name="tag_fo_inline_keep-together_within-line_close">###/fo:inline keep-together_within-line###</xsl:variable>
@@ -4561,13 +4595,13 @@
4561
4595
  <tr>
4562
4596
  <td>
4563
4597
  <xsl:attribute name="id">
4564
- <xsl:value-of select="concat($id,'_',$row_number,'_1')"/>
4598
+ <xsl:value-of select="concat($id,'@',$row_number,'_1')"/>
4565
4599
  </xsl:attribute>
4566
4600
  <xsl:apply-templates/>
4567
4601
  </td>
4568
4602
  <td>
4569
4603
  <xsl:attribute name="id">
4570
- <xsl:value-of select="concat($id,'_',$row_number,'_2')"/>
4604
+ <xsl:value-of select="concat($id,'@',$row_number,'_2')"/>
4571
4605
  </xsl:attribute>
4572
4606
 
4573
4607
  <xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]">
@@ -5248,6 +5282,10 @@
5248
5282
  <fo:inline keep-with-next.within-line="always"><xsl:value-of select="."/></fo:inline>
5249
5283
  </xsl:template>
5250
5284
 
5285
+ <xsl:template match="*[local-name() = 'span'][contains(@style, 'text-transform:none')]//text()" priority="5">
5286
+ <xsl:value-of select="."/>
5287
+ </xsl:template>
5288
+
5251
5289
  <!-- ========================= -->
5252
5290
  <!-- END Rich text formatting -->
5253
5291
  <!-- ========================= -->
@@ -5878,7 +5916,7 @@
5878
5916
  </xsl:choose>
5879
5917
  </xsl:variable>
5880
5918
  <xsl:attribute name="id">
5881
- <xsl:value-of select="concat($id,'_',$row_number,'_',$col_number,'_',$divide)"/>
5919
+ <xsl:value-of select="concat($id,'@',$row_number,'_',$col_number,'_',$divide)"/>
5882
5920
  </xsl:attribute>
5883
5921
 
5884
5922
  <xsl:for-each select="*[local-name() = 'p']">
@@ -5886,7 +5924,7 @@
5886
5924
  <xsl:copy-of select="@*"/>
5887
5925
  <xsl:variable name="p_num" select="count(preceding-sibling::*[local-name() = 'p']) + 1"/>
5888
5926
  <xsl:attribute name="id">
5889
- <xsl:value-of select="concat($id,'_',$row_number,'_',$col_number,'_p_',$p_num,'_',$divide)"/>
5927
+ <xsl:value-of select="concat($id,'@',$row_number,'_',$col_number,'_p_',$p_num,'_',$divide)"/>
5890
5928
  </xsl:attribute>
5891
5929
 
5892
5930
  <!-- <xsl:copy-of select="node()" /> -->
@@ -5950,7 +5988,7 @@
5950
5988
  <xsl:variable name="num" select="count(preceding-sibling::word) + 1"/>
5951
5989
  <xsl:copy>
5952
5990
  <xsl:attribute name="id">
5953
- <xsl:value-of select="concat($id,'_',$row_number,'_',$col_number,'_word_',$num,'_',$divide)"/>
5991
+ <xsl:value-of select="concat($id,'@',$row_number,'_',$col_number,'_word_',$num,'_',$divide)"/>
5954
5992
  </xsl:attribute>
5955
5993
  <xsl:copy-of select="node()"/>
5956
5994
  </xsl:copy>
@@ -8752,7 +8790,7 @@
8752
8790
  <!-- ====== -->
8753
8791
  <xsl:template match="*[local-name() = 'termexample']">
8754
8792
  <fo:block id="{@id}" xsl:use-attribute-sets="termexample-style">
8755
-
8793
+ <xsl:call-template name="refine_termexample-style"/>
8756
8794
  <xsl:call-template name="setBlockSpanAll"/>
8757
8795
 
8758
8796
  <xsl:apply-templates select="*[local-name()='name']"/>
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module IHO
3
- VERSION = "0.9.1".freeze
3
+ VERSION = "0.9.2".freeze
4
4
  end
5
5
  end
@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
27
27
  spec.require_paths = ["lib"]
28
28
  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
29
29
 
30
- spec.add_dependency "metanorma-generic", "~> 2.6.0"
30
+ spec.add_dependency "metanorma-generic", "~> 2.6.1"
31
31
 
32
32
  spec.add_development_dependency "debug"
33
33
  spec.add_development_dependency "equivalent-xml", "~> 0.6"
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-iho
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.9.1
4
+ version: 0.9.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2024-02-05 00:00:00.000000000 Z
11
+ date: 2024-02-19 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: metanorma-generic
@@ -16,14 +16,14 @@ dependencies:
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: 2.6.0
19
+ version: 2.6.1
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - "~>"
25
25
  - !ruby/object:Gem::Version
26
- version: 2.6.0
26
+ version: 2.6.1
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: debug
29
29
  requirement: !ruby/object:Gem::Requirement