metanorma-csa 2.5.4 → 2.5.5

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 (4) hide show
  1. checksums.yaml +4 -4
  2. data/lib/isodoc/csa/csa.standard.xsl +56 -33
  3. data/lib/metanorma/csa/version.rb +1 -1
  4. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 8360063811ebb744998ac0a3649a8a8ba9b4a7cac02cdbf456820fe5f02601d1
4
- data.tar.gz: 8ff5935509555602938f4884f0d9342e647c826faab7ec897fb423f1ba578c31
3
+ metadata.gz: eda49068d6d958778c8f329b793815b355b271f5f49f22f0d9d1d0798487161d
4
+ data.tar.gz: ca907bed88cd04c20538d250ea824a2a335c632e98f49bb125d38a1b8c743f51
5
5
  SHA512:
6
- metadata.gz: e1b138147e1f6326ee440d2ab98bdd96bbe0d9d9f1af270634a1669a41ba07967c7652fb9760b11528d6ae7345166ed3b8835da1149a211a7e87d0c80127234b
7
- data.tar.gz: 772bf908991c5010c66c693d4705c13b31b5b67b5cd237e02e68a378cbd2d4b1cd331123f754f27f80ce56c0cf5183723caec702ebab9913f57ba823c5081ce6
6
+ metadata.gz: 4fafdb26af786e6dcb2f0ad25478dfa6aa1ec49acc22d81cc64f390eedc3e59098381f09f18ae54a1fbfc53d06598152c2e4f6a5b1b8d1885e406d07c5f9f34d
7
+ data.tar.gz: 1e4113269015d96e128d8a247dbd6bb374eb8b28ec5a86a907bae8f6127bb7bb81de8ee32775e46b357059e3840415a5da1d7d16f09725edc99d408988ecb750
data/lib/isodoc/csa/csa.standard.xsl CHANGED
@@ -3993,10 +3993,14 @@
3993
3993
  <xsl:variable name="fn_styles">
3994
3994
  <xsl:choose>
3995
3995
  <xsl:when test="ancestor::*[local-name() = 'bibitem']">
3996
- <fn_styles xsl:use-attribute-sets="bibitem-note-fn-style"/>
3996
+ <fn_styles xsl:use-attribute-sets="bibitem-note-fn-style">
3997
+
3998
+ </fn_styles>
3997
3999
  </xsl:when>
3998
4000
  <xsl:otherwise>
3999
- <fn_styles xsl:use-attribute-sets="fn-num-style"/>
4001
+ <fn_styles xsl:use-attribute-sets="fn-num-style">
4002
+
4003
+ </fn_styles>
4000
4004
  </xsl:otherwise>
4001
4005
  </xsl:choose>
4002
4006
  </xsl:variable>
@@ -6859,6 +6863,7 @@
6859
6863
  <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'])">
6860
6864
  <xsl:attribute name="keep-together.within-line">always</xsl:attribute>
6861
6865
  </xsl:if>
6866
+
6862
6867
  <xsl:if test="parent::*[local-name() = 'add']">
6863
6868
  <xsl:call-template name="append_add-style"/>
6864
6869
  </xsl:if>
@@ -6967,48 +6972,48 @@
6967
6972
 
6968
6973
  <xsl:template match="*[local-name() = 'note']" name="note">
6969
6974
 
6970
- <fo:block-container id="{@id}" xsl:use-attribute-sets="note-style" role="SKIP">
6975
+ <fo:block-container id="{@id}" xsl:use-attribute-sets="note-style" role="SKIP">
6971
6976
 
6972
- <xsl:call-template name="setBlockSpanAll"/>
6977
+ <xsl:call-template name="setBlockSpanAll"/>
6973
6978
 
6974
- <xsl:call-template name="refine_note-style"/>
6979
+ <xsl:call-template name="refine_note-style"/>
6975
6980
 
6976
- <fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
6981
+ <fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
6977
6982
 
6978
- <xsl:if test="ancestor::csa:ul or ancestor::csa:ol and not(ancestor::csa:note[1]/following-sibling::*)">
6979
- <xsl:attribute name="margin-bottom">0pt</xsl:attribute>
6980
- </xsl:if>
6983
+ <xsl:if test="ancestor::csa:ul or ancestor::csa:ol and not(ancestor::csa:note[1]/following-sibling::*)">
6984
+ <xsl:attribute name="margin-bottom">0pt</xsl:attribute>
6985
+ </xsl:if>
6981
6986
 
6982
- <fo:block>
6987
+ <fo:block>
6983
6988
 
6984
- <xsl:call-template name="refine_note_block_style"/>
6989
+ <xsl:call-template name="refine_note_block_style"/>
6985
6990
 
6986
- <fo:inline xsl:use-attribute-sets="note-name-style" role="SKIP">
6991
+ <fo:inline xsl:use-attribute-sets="note-name-style" role="SKIP">
6987
6992
 
6988
- <xsl:call-template name="refine_note-name-style"/>
6993
+ <xsl:call-template name="refine_note-name-style"/>
6989
6994
 
6990
- <!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
6991
- <!-- <xsl:if test="*[not(local-name()='name')][1][node()[normalize-space() != ''][1][local-name() = 'add'] and node()[normalize-space() != ''][last()][local-name() = 'add']]"> -->
6992
- <xsl:if test="*[not(local-name()='name')][1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
6993
- <xsl:call-template name="append_add-style"/>
6994
- </xsl:if>
6995
+ <!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
6996
+ <!-- <xsl:if test="*[not(local-name()='name')][1][node()[normalize-space() != ''][1][local-name() = 'add'] and node()[normalize-space() != ''][last()][local-name() = 'add']]"> -->
6997
+ <xsl:if test="*[not(local-name()='name')][1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
6998
+ <xsl:call-template name="append_add-style"/>
6999
+ </xsl:if>
6995
7000
 
6996
- <!-- if note contains only one element and first and last childs are `add` ace-tag, then move start ace-tag before NOTE's name-->
6997
- <xsl:if test="count(*[not(local-name() = 'name')]) = 1 and *[not(local-name() = 'name')]/node()[last()][local-name() = 'add'][starts-with(text(), $ace_tag)]">
6998
- <xsl:apply-templates select="*[not(local-name() = 'name')]/node()[1][local-name() = 'add'][starts-with(text(), $ace_tag)]">
6999
- <xsl:with-param name="skip">false</xsl:with-param>
7000
- </xsl:apply-templates>
7001
- </xsl:if>
7001
+ <!-- if note contains only one element and first and last childs are `add` ace-tag, then move start ace-tag before NOTE's name-->
7002
+ <xsl:if test="count(*[not(local-name() = 'name')]) = 1 and *[not(local-name() = 'name')]/node()[last()][local-name() = 'add'][starts-with(text(), $ace_tag)]">
7003
+ <xsl:apply-templates select="*[not(local-name() = 'name')]/node()[1][local-name() = 'add'][starts-with(text(), $ace_tag)]">
7004
+ <xsl:with-param name="skip">false</xsl:with-param>
7005
+ </xsl:apply-templates>
7006
+ </xsl:if>
7002
7007
 
7003
- <xsl:apply-templates select="*[local-name() = 'name']"/>
7008
+ <xsl:apply-templates select="*[local-name() = 'name']"/>
7004
7009
 
7005
- </fo:inline>
7010
+ </fo:inline>
7006
7011
 
7007
- <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
7008
- </fo:block>
7012
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
7013
+ </fo:block>
7009
7014
 
7010
- </fo:block-container>
7011
- </fo:block-container>
7015
+ </fo:block-container>
7016
+ </fo:block-container>
7012
7017
 
7013
7018
  </xsl:template>
7014
7019
 
@@ -9410,6 +9415,7 @@
9410
9415
  </xsl:when>
9411
9416
  <xsl:when test="contains(normalize-space($fo_element), 'block')">
9412
9417
  <fo:block xsl:use-attribute-sets="example-name-style">
9418
+
9413
9419
  <xsl:apply-templates/>
9414
9420
  </fo:block>
9415
9421
  </xsl:when>
@@ -9425,6 +9431,7 @@
9425
9431
 
9426
9432
  <xsl:template match="*[local-name() = 'table']/*[local-name() = 'example']/*[local-name() = 'name']">
9427
9433
  <fo:inline xsl:use-attribute-sets="example-name-style">
9434
+
9428
9435
  <xsl:apply-templates/>
9429
9436
  </fo:inline>
9430
9437
  </xsl:template>
@@ -9795,12 +9802,14 @@
9795
9802
 
9796
9803
  <xsl:if test="parent::*[local-name() = 'term'] and not(preceding-sibling::*[local-name() = 'preferred'])"> <!-- if first preffered in term, then display term's name -->
9797
9804
  <fo:block xsl:use-attribute-sets="term-name-style" role="SKIP">
9805
+
9798
9806
  <xsl:apply-templates select="ancestor::*[local-name() = 'term'][1]/*[local-name() = 'name']"/>
9799
9807
  </fo:block>
9800
9808
  </xsl:if>
9801
9809
 
9802
9810
  <fo:block xsl:use-attribute-sets="preferred-term-style" role="SKIP">
9803
9811
  <xsl:call-template name="setStyle_preferred"/>
9812
+
9804
9813
  <xsl:apply-templates/>
9805
9814
  </fo:block>
9806
9815
  </fo:block>
@@ -12733,9 +12742,10 @@
12733
12742
  <xsl:template name="insertBackgroundPageImage">
12734
12743
  <xsl:param name="number">1</xsl:param>
12735
12744
  <xsl:param name="name">coverpage-image</xsl:param>
12745
+ <xsl:param name="suffix"/>
12736
12746
  <xsl:variable name="num" select="number($number)"/>
12737
12747
  <!-- background image -->
12738
- <fo:block-container absolute-position="fixed" left="0mm" top="0mm" font-size="0" id="__internal_layout__coverpage_{$name}_{$number}_{generate-id()}">
12748
+ <fo:block-container absolute-position="fixed" left="0mm" top="0mm" font-size="0" id="__internal_layout__coverpage{$suffix}_{$name}_{$number}_{generate-id()}">
12739
12749
  <fo:block>
12740
12750
  <xsl:for-each select="/*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name'] = $name][1]/*[local-name() = 'value']/*[local-name() = 'image'][$num]">
12741
12751
  <xsl:choose>
@@ -12801,16 +12811,29 @@
12801
12811
 
12802
12812
  <!-- END: insert cover page image -->
12803
12813
 
12814
+ <xsl:variable name="regex_ja_spec">[\uFF08\uFF09]</xsl:variable>
12804
12815
  <xsl:template name="insertVerticalChar">
12805
12816
  <xsl:param name="str"/>
12817
+ <xsl:param name="writing-mode">lr-tb</xsl:param>
12818
+ <xsl:param name="reference-orientation">90</xsl:param>
12806
12819
  <xsl:if test="string-length($str) &gt; 0">
12807
- <fo:inline-container writing-mode="lr-tb" text-align="center" alignment-baseline="central" reference-orientation="90" width="1em" margin="0" padding="0" text-indent="0mm" last-line-end-indent="0mm" start-indent="0mm" end-indent="0mm">
12820
+ <fo:inline-container text-align="center" alignment-baseline="central" width="1em" margin="0" padding="0" text-indent="0mm" last-line-end-indent="0mm" start-indent="0mm" end-indent="0mm">
12821
+ <xsl:if test="normalize-space($writing-mode) != ''">
12822
+ <xsl:attribute name="writing-mode"><xsl:value-of select="$writing-mode"/></xsl:attribute>
12823
+ <xsl:attribute name="reference-orientation">90</xsl:attribute>
12824
+ </xsl:if>
12825
+ <xsl:variable name="char" select="substring($str,1,1)"/>
12826
+ <xsl:if test="normalize-space(java:matches(java:java.lang.String.new($char), concat('(', $regex_ja_spec, '{1,})'))) = 'true'">
12827
+ <xsl:attribute name="reference-orientation">0</xsl:attribute>
12828
+ </xsl:if>
12808
12829
  <fo:block-container width="1em">
12809
- <fo:block line-height="1em"><xsl:value-of select="substring($str,1,1)"/></fo:block>
12830
+ <fo:block line-height="1em"><xsl:value-of select="$char"/></fo:block>
12810
12831
  </fo:block-container>
12811
12832
  </fo:inline-container>
12812
12833
  <xsl:call-template name="insertVerticalChar">
12813
12834
  <xsl:with-param name="str" select="substring($str, 2)"/>
12835
+ <xsl:with-param name="writing-mode" select="$writing-mode"/>
12836
+ <xsl:with-param name="reference-orientation" select="$reference-orientation"/>
12814
12837
  </xsl:call-template>
12815
12838
  </xsl:if>
12816
12839
  </xsl:template>
data/lib/metanorma/csa/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module Csa
3
- VERSION = "2.5.4".freeze
3
+ VERSION = "2.5.5".freeze
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-csa
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.5.4
4
+ version: 2.5.5
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-10-14 00:00:00.000000000 Z
11
+ date: 2024-10-28 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: metanorma-generic