metanorma-cc 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/cc/cc.standard.xsl +53 -30
  3. data/lib/metanorma/cc/version.rb +1 -1
  4. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: b2b31d0ca70ffb8903d190d7d3087f046dea778e8f7b053f547c77575df1d3a1
4
- data.tar.gz: 21528facf9965a72f2aea590f444a4865ecf763e25dc6e2a868a23070c8b9946
3
+ metadata.gz: e22f11cfa5e2e467e47a6d442c7818f76b45f919026461a5263bbaf346b376ff
4
+ data.tar.gz: 465e093c6cf1e1312bc5769b8177d7a8f7931b81b0ff32b9b568fd0d221c72d7
5
5
  SHA512:
6
- metadata.gz: 8eda576b445cfb830153034c92892d889fd337e8796eb123283336cfb1c8d13cb8278ae32cb9f833ace1c96e8350bbe4bfb5f0f2adb0a344bd25120d0e1a66cc
7
- data.tar.gz: df11767ebbdd870b1b98e70376e385c8fb93cee07b021beb58a58187c2b8c212e6da7f09963879eb7b292903995102bd9c3c257be9eb8f623d32a78bf22b9977
6
+ metadata.gz: 0663d0949e1f1b2e23a825772f4dadba6de3263f8c21d8ddcc3d60e5647639c3fec12ad92325b2d5d09b1f2cd2a89988929959edd11c11e8c7ce8ba9ea0813cb
7
+ data.tar.gz: aca4755276d4e110ab4d9f51f9b0d2be5d5932b2bcd03b437705f848ec4f549f9b2864f5d0e897f37f215388b4a7ae5691ce80d45e26f8e7f823873992b0f4a9
data/lib/isodoc/cc/cc.standard.xsl CHANGED
@@ -3984,10 +3984,14 @@
3984
3984
  <xsl:variable name="fn_styles">
3985
3985
  <xsl:choose>
3986
3986
  <xsl:when test="ancestor::*[local-name() = 'bibitem']">
3987
- <fn_styles xsl:use-attribute-sets="bibitem-note-fn-style"/>
3987
+ <fn_styles xsl:use-attribute-sets="bibitem-note-fn-style">
3988
+
3989
+ </fn_styles>
3988
3990
  </xsl:when>
3989
3991
  <xsl:otherwise>
3990
- <fn_styles xsl:use-attribute-sets="fn-num-style"/>
3992
+ <fn_styles xsl:use-attribute-sets="fn-num-style">
3993
+
3994
+ </fn_styles>
3991
3995
  </xsl:otherwise>
3992
3996
  </xsl:choose>
3993
3997
  </xsl:variable>
@@ -6851,6 +6855,7 @@
6851
6855
  <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'])">
6852
6856
  <xsl:attribute name="keep-together.within-line">always</xsl:attribute>
6853
6857
  </xsl:if>
6858
+
6854
6859
  <xsl:if test="parent::*[local-name() = 'add']">
6855
6860
  <xsl:call-template name="append_add-style"/>
6856
6861
  </xsl:if>
@@ -6959,44 +6964,44 @@
6959
6964
 
6960
6965
  <xsl:template match="*[local-name() = 'note']" name="note">
6961
6966
 
6962
- <fo:block-container id="{@id}" xsl:use-attribute-sets="note-style" role="SKIP">
6967
+ <fo:block-container id="{@id}" xsl:use-attribute-sets="note-style" role="SKIP">
6963
6968
 
6964
- <xsl:call-template name="setBlockSpanAll"/>
6969
+ <xsl:call-template name="setBlockSpanAll"/>
6965
6970
 
6966
- <xsl:call-template name="refine_note-style"/>
6971
+ <xsl:call-template name="refine_note-style"/>
6967
6972
 
6968
- <fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
6973
+ <fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
6969
6974
 
6970
- <fo:block>
6975
+ <fo:block>
6971
6976
 
6972
- <xsl:call-template name="refine_note_block_style"/>
6977
+ <xsl:call-template name="refine_note_block_style"/>
6973
6978
 
6974
- <fo:inline xsl:use-attribute-sets="note-name-style" role="SKIP">
6979
+ <fo:inline xsl:use-attribute-sets="note-name-style" role="SKIP">
6975
6980
 
6976
- <xsl:call-template name="refine_note-name-style"/>
6981
+ <xsl:call-template name="refine_note-name-style"/>
6977
6982
 
6978
- <!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
6979
- <!-- <xsl:if test="*[not(local-name()='name')][1][node()[normalize-space() != ''][1][local-name() = 'add'] and node()[normalize-space() != ''][last()][local-name() = 'add']]"> -->
6980
- <xsl:if test="*[not(local-name()='name')][1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
6981
- <xsl:call-template name="append_add-style"/>
6982
- </xsl:if>
6983
+ <!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
6984
+ <!-- <xsl:if test="*[not(local-name()='name')][1][node()[normalize-space() != ''][1][local-name() = 'add'] and node()[normalize-space() != ''][last()][local-name() = 'add']]"> -->
6985
+ <xsl:if test="*[not(local-name()='name')][1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
6986
+ <xsl:call-template name="append_add-style"/>
6987
+ </xsl:if>
6983
6988
 
6984
- <!-- if note contains only one element and first and last childs are `add` ace-tag, then move start ace-tag before NOTE's name-->
6985
- <xsl:if test="count(*[not(local-name() = 'name')]) = 1 and *[not(local-name() = 'name')]/node()[last()][local-name() = 'add'][starts-with(text(), $ace_tag)]">
6986
- <xsl:apply-templates select="*[not(local-name() = 'name')]/node()[1][local-name() = 'add'][starts-with(text(), $ace_tag)]">
6987
- <xsl:with-param name="skip">false</xsl:with-param>
6988
- </xsl:apply-templates>
6989
- </xsl:if>
6989
+ <!-- if note contains only one element and first and last childs are `add` ace-tag, then move start ace-tag before NOTE's name-->
6990
+ <xsl:if test="count(*[not(local-name() = 'name')]) = 1 and *[not(local-name() = 'name')]/node()[last()][local-name() = 'add'][starts-with(text(), $ace_tag)]">
6991
+ <xsl:apply-templates select="*[not(local-name() = 'name')]/node()[1][local-name() = 'add'][starts-with(text(), $ace_tag)]">
6992
+ <xsl:with-param name="skip">false</xsl:with-param>
6993
+ </xsl:apply-templates>
6994
+ </xsl:if>
6990
6995
 
6991
- <xsl:apply-templates select="*[local-name() = 'name']"/>
6996
+ <xsl:apply-templates select="*[local-name() = 'name']"/>
6992
6997
 
6993
- </fo:inline>
6998
+ </fo:inline>
6994
6999
 
6995
- <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
6996
- </fo:block>
7000
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
7001
+ </fo:block>
6997
7002
 
6998
- </fo:block-container>
6999
- </fo:block-container>
7003
+ </fo:block-container>
7004
+ </fo:block-container>
7000
7005
 
7001
7006
  </xsl:template>
7002
7007
 
@@ -9399,6 +9404,7 @@
9399
9404
  </xsl:when>
9400
9405
  <xsl:when test="contains(normalize-space($fo_element), 'block')">
9401
9406
  <fo:block xsl:use-attribute-sets="example-name-style">
9407
+
9402
9408
  <xsl:apply-templates/>
9403
9409
  </fo:block>
9404
9410
  </xsl:when>
@@ -9414,6 +9420,7 @@
9414
9420
 
9415
9421
  <xsl:template match="*[local-name() = 'table']/*[local-name() = 'example']/*[local-name() = 'name']">
9416
9422
  <fo:inline xsl:use-attribute-sets="example-name-style">
9423
+
9417
9424
  <xsl:apply-templates/>
9418
9425
  </fo:inline>
9419
9426
  </xsl:template>
@@ -9791,12 +9798,14 @@
9791
9798
 
9792
9799
  <xsl:if test="parent::*[local-name() = 'term'] and not(preceding-sibling::*[local-name() = 'preferred'])"> <!-- if first preffered in term, then display term's name -->
9793
9800
  <fo:block xsl:use-attribute-sets="term-name-style" role="SKIP">
9801
+
9794
9802
  <xsl:apply-templates select="ancestor::*[local-name() = 'term'][1]/*[local-name() = 'name']"/>
9795
9803
  </fo:block>
9796
9804
  </xsl:if>
9797
9805
 
9798
9806
  <fo:block xsl:use-attribute-sets="preferred-term-style" role="SKIP">
9799
9807
  <xsl:call-template name="setStyle_preferred"/>
9808
+
9800
9809
  <xsl:apply-templates/>
9801
9810
  </fo:block>
9802
9811
  </fo:block>
@@ -12753,9 +12762,10 @@
12753
12762
  <xsl:template name="insertBackgroundPageImage">
12754
12763
  <xsl:param name="number">1</xsl:param>
12755
12764
  <xsl:param name="name">coverpage-image</xsl:param>
12765
+ <xsl:param name="suffix"/>
12756
12766
  <xsl:variable name="num" select="number($number)"/>
12757
12767
  <!-- background image -->
12758
- <fo:block-container absolute-position="fixed" left="0mm" top="0mm" font-size="0" id="__internal_layout__coverpage_{$name}_{$number}_{generate-id()}">
12768
+ <fo:block-container absolute-position="fixed" left="0mm" top="0mm" font-size="0" id="__internal_layout__coverpage{$suffix}_{$name}_{$number}_{generate-id()}">
12759
12769
  <fo:block>
12760
12770
  <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]">
12761
12771
  <xsl:choose>
@@ -12821,16 +12831,29 @@
12821
12831
 
12822
12832
  <!-- END: insert cover page image -->
12823
12833
 
12834
+ <xsl:variable name="regex_ja_spec">[\uFF08\uFF09]</xsl:variable>
12824
12835
  <xsl:template name="insertVerticalChar">
12825
12836
  <xsl:param name="str"/>
12837
+ <xsl:param name="writing-mode">lr-tb</xsl:param>
12838
+ <xsl:param name="reference-orientation">90</xsl:param>
12826
12839
  <xsl:if test="string-length($str) &gt; 0">
12827
- <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">
12840
+ <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">
12841
+ <xsl:if test="normalize-space($writing-mode) != ''">
12842
+ <xsl:attribute name="writing-mode"><xsl:value-of select="$writing-mode"/></xsl:attribute>
12843
+ <xsl:attribute name="reference-orientation">90</xsl:attribute>
12844
+ </xsl:if>
12845
+ <xsl:variable name="char" select="substring($str,1,1)"/>
12846
+ <xsl:if test="normalize-space(java:matches(java:java.lang.String.new($char), concat('(', $regex_ja_spec, '{1,})'))) = 'true'">
12847
+ <xsl:attribute name="reference-orientation">0</xsl:attribute>
12848
+ </xsl:if>
12828
12849
  <fo:block-container width="1em">
12829
- <fo:block line-height="1em"><xsl:value-of select="substring($str,1,1)"/></fo:block>
12850
+ <fo:block line-height="1em"><xsl:value-of select="$char"/></fo:block>
12830
12851
  </fo:block-container>
12831
12852
  </fo:inline-container>
12832
12853
  <xsl:call-template name="insertVerticalChar">
12833
12854
  <xsl:with-param name="str" select="substring($str, 2)"/>
12855
+ <xsl:with-param name="writing-mode" select="$writing-mode"/>
12856
+ <xsl:with-param name="reference-orientation" select="$reference-orientation"/>
12834
12857
  </xsl:call-template>
12835
12858
  </xsl:if>
12836
12859
  </xsl:template>
data/lib/metanorma/cc/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module Cc
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-cc
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