metanorma-iec 2.0.6 → 2.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 853d28e406c62d6a579dd28f8cb61c8e94dc133441a98fd7c0bb77a76452387b
-  data.tar.gz: 7114e1a86ee395f61c13a0f05a1813068da20bda5ca3f402fb91302969a31967
+  metadata.gz: fd38c355c3d2dd1cdf7e109be5e326c18f18c9f5d7b9f5cbe815c58687eafd56
+  data.tar.gz: 8441df7cd2ba4eed2d0015391b06b4058fb74f428a7e8cd27beeafe6d10d7f6b
 SHA512:
-  metadata.gz: a9068350394bd65e4b2593a50ad7a367ba5e55cb1b9a63a60a9a627850052a75a2f57c61199f19cc32667574fca04c163b05d1122fcf07dfd55fb2d8c72a746f
-  data.tar.gz: abe4a8a6c92df9930eb7be164f93a7fe44dc176b274a7fa06c38a71e22c81016d7a0eae5e71d16be7a1f2c49d5bf99112cfcf0c7e9a3f9f77017ab466280f6bc
+  metadata.gz: f568d89fbe727d8b21040c8f56a2457ac08acc67b598e2a9ad8a03a03ff67974162ad687096df66d6eb6c153dd72abec30ec717307fbdf59373954dfbc28b66e
+  data.tar.gz: af527efbfcdeb9cd6ffa68bfe1f598b08fb57201bd217a90f860e62e20e3588f5a7ec4e90f7e263634f9dba417ed6c15db332ce913a718466da9dd98f03383f0

data/lib/isodoc/iec/iec.international-standard.xsl

@@ -3343,8 +3343,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']">
@@ -7033,7 +7052,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/iec/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module Iec
-    VERSION = "2.0.6".freeze
+    VERSION = "2.0.7".freeze
   end
 end
 

data/spec/isodoc/ref_spec.rb

@@ -220,7 +220,7 @@ RSpec.describe IsoDoc::Iec do
           <note><name>NOTE</name><p>This is another annotation of document ISSN.</p></note>
           <bibitem id="ISO3696" type="standard">
             <title format="text/plain">Water for analytical laboratory use</title>
-            <docidentifier type='metanorma-ordinal'>[1]</docidentifier>
+            <docidentifier type='metanorma-ordinal'>[3]</docidentifier>
             <docidentifier type="ISO">ISO 3696</docidentifier>
             <contributor>
               <role type="publisher"/>
@@ -235,7 +235,7 @@ RSpec.describe IsoDoc::Iec do
           </bibitem>
           <bibitem id="ref11">
             <title>Internet Calendaring and Scheduling Core Object Specification (iCalendar)</title>
-            <docidentifier type='metanorma-ordinal'>[2]</docidentifier>
+            <docidentifier type='metanorma-ordinal'>[4]</docidentifier>
             <docidentifier type="IETF">IETF RFC 10</docidentifier>
           </bibitem>
           <bibitem id="ref12">
@@ -337,7 +337,7 @@ RSpec.describe IsoDoc::Iec do
                 </p>
               </div>
               <p id='ISO3696' class='Biblio'>
-                [1]&#160; ISO 3696,
+                [3]&#160; ISO 3696,
                 <i>Water for analytical laboratory use</i>
               </p>
               <p id='ref10' class='Biblio'>
@@ -354,7 +354,7 @@ RSpec.describe IsoDoc::Iec do
                 )
               </p>
               <p id='ref11' class='Biblio'>
-                [2]&#160; IETF RFC 10,
+                [4]&#160; IETF RFC 10,
                 <i>Internet Calendaring and Scheduling Core Object Specification (iCalendar)</i>
               </p>
               <p id='ref12' class='Biblio'>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iec
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.0.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 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-iso