metanorma-cc 2.0.6 → 2.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa2c9dce7ea4be7d9d9e0ecb41409259b969b3e8aadac3a4c7ce4c24b3b28c56
-  data.tar.gz: be0b9e664feb6820742fd5a87b78accc36011f196ede0d5cb8f5b3d683d0f837
+  metadata.gz: e03855ceedb587dd377335bd4d13945ac4bcbcf8fef6676d8e4cd91ce20a2d04
+  data.tar.gz: c64f52e63bed46a65c852e9dd21b4ddd38e8a828529d645645f1b53c7cefb92b
 SHA512:
-  metadata.gz: 1ae65d5c95a76259cf80ae730aae3691664c915dc03a7d3245993c806d39f2c01035d8b944901786b16006e3f7211ec85dcf65efc583d1a2be8848d587c3e673
-  data.tar.gz: 2a020aee734ba96c89a07c9c884341316ff4bb8304d4193cabb60c2fb228efeec284456b8b8b1f1712cea3ef2456e0743dee4ac9dd7cf93895d25fef10974f5e
+  metadata.gz: cbfabc84c6c9db02d89a591d12cf7d01d95f90c5037fa5e363a0bc24d19ae81e2e6025b60975519f673a57c00b67c7638d0c4a8056e747d61b0210c9f332fd0c
+  data.tar.gz: 1fb644c1b338180a6515181c55f53c4186fd99564d7378e833bdd1812566930e9248aa3cc446b5eb0c19c75365e59733d3af543b2f63f9a682da478e22e7aa4b

data/lib/isodoc/cc/cc.standard.xsl

@@ -1915,8 +1915,27 @@
 			<xsl:sort select="@displayorder" data-type="number"/>
 			<xsl:apply-templates select="."/>
 		</xsl:for-each>
-	</xsl:template><xsl:template match="text()">
-		<xsl:value-of select="."/>
+	</xsl:template><xsl:variable name="tag_open">###fo:inline###</xsl:variable><xsl:variable name="tag_close">###/fo:inline###</xsl:variable><xsl:template match="text()" name="text">
+		<xsl:variable name="regex_standard_reference">([A-Z]{2,}(/[A-Z]{2,})* \d+(-\d+)*(:\d{4})?)</xsl:variable>
+		<xsl:variable name="text" select="java:replaceAll(java:java.lang.String.new(.),$regex_standard_reference,concat($tag_open,'$1',$tag_close))"/>
+		<xsl:call-template name="replace_fo_inline">
+			<xsl:with-param name="text" select="$text"/>
+		</xsl:call-template>
+	</xsl:template><xsl:template name="replace_fo_inline">
+		<xsl:param name="text"/>
+		<xsl:choose>
+			<xsl:when test="contains($text, $tag_open)">
+				<xsl:value-of select="substring-before($text, $tag_open)"/>
+				<xsl:text disable-output-escaping="yes">&lt;fo:inline keep-together.within-line="always"&gt;</xsl:text>
+				<xsl:variable name="text_after" select="substring-after($text, $tag_open)"/>
+				<xsl:value-of select="substring-before($text_after, $tag_close)"/>
+				<xsl:text disable-output-escaping="yes">&lt;/fo:inline&gt;</xsl:text>
+				<xsl:call-template name="replace_fo_inline">
+					<xsl:with-param name="text" select="substring-after($text_after, $tag_close)"/>
+				</xsl:call-template>
+			</xsl:when>
+			<xsl:otherwise><xsl:value-of select="$text"/></xsl:otherwise>
+		</xsl:choose>
 	</xsl:template><xsl:template match="*[local-name()='br']">
 		<xsl:value-of select="$linebreak"/>
 	</xsl:template><xsl:template match="*[local-name()='copyright-statement']">
@@ -5537,7 +5556,8 @@
 		<fo:inline><xsl:apply-templates/></fo:inline>
 	</xsl:template><xsl:template match="*[local-name() = 'modification']/text()">
 		<xsl:if test="normalize-space() != ''">
-			<xsl:value-of select="."/>
+			<!-- <xsl:value-of select="."/> -->
+			<xsl:call-template name="text"/>
 		</xsl:if>
 	</xsl:template><xsl:template match="*[local-name() = 'quote']">		
 		<fo:block-container margin-left="0mm">

data/lib/metanorma/cc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module CC
-    VERSION = "2.0.6".freeze
+    VERSION = "2.0.7".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-cc
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.0.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-21 00:00:00.000000000 Z
+date: 2022-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-generic