metanorma-ribose 2.0.6 → 2.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6761d38048bebfb77cb9c87b081f032f2e5b1a2c7ead8ae40aed4d8ed5852035
-  data.tar.gz: 80606d37f6866a7e4757ffa96e191797881233671f1a86f067264f64b619fe28
+  metadata.gz: 06f3ac2765345f6611750588e9950f4d77f552665142fc737ce5fe8be375001c
+  data.tar.gz: bb2b7c923e2945cbf3f0bdbb7a490d6042e753901301eb13559530b179a8287d
 SHA512:
-  metadata.gz: e2c47150ee0f8b722a429aeab9b0ed17559ad1ca033699a8912d9a385e7ab683e91d5787d2de71fc24157c51db55b31ad55219ea64244804d148c0ea9a2a9f7f
-  data.tar.gz: 442301d3d936b02edf99de150d594dbb84cbee319917765860f3342c3b228671dd774aee16bf081f7625514df358401d3cc45ad616de3572dfe087adb693cb90
+  metadata.gz: 745b5a44ef93701355dcddd77f59acdc3a256ca17b9d4d4c6b921cb43704ff19a949aa195197762ddb45aaa46361f5c8a8819b450f90910b8c41d616af50459a
+  data.tar.gz: 38c1ce002c351d4e6a31f8c88f56a5ebd5910620d6d5e75231c354ba901a9a46a07d2712b791933b7ebad492f805e4939f4ffef098a18066574d9640e26ac8b2

data/lib/isodoc/ribose/ribose.standard.xsl

@@ -2666,8 +2666,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']">
@@ -6254,7 +6273,7 @@
 		<xsl:variable name="element">
 			
 				<xsl:choose>
-					<xsl:when test="$num = 1">inline</xsl:when>
+					<xsl:when test="$num = 1 and not(contains($fo_element, 'block'))">inline</xsl:when>
 					<xsl:otherwise>block</xsl:otherwise>
 				</xsl:choose>
 			
@@ -6346,7 +6365,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/ribose/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ribose
 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