metanorma-un 0.8.6 → 0.8.7

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 (6) hide show
  1. checksums.yaml +4 -4
  2. data/lib/isodoc/un/un.plenary-attachment.xsl +23 -3
  3. data/lib/isodoc/un/un.plenary.xsl +23 -3
  4. data/lib/isodoc/un/un.recommendation.xsl +23 -3
  5. data/lib/metanorma/un/version.rb +1 -1
  6. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 76f964b245971dfcfeed8afb937bca5d822f7494c2d2d257a61c62c8c353b4df
4
- data.tar.gz: 7c605fdba61ea8cb2e22158c5dda7170afaade780d35d4e79cd049a0181e0d60
3
+ metadata.gz: ba4084264415215b21e84838b56d4b26a86a7fa0f8917f449f11b621eb2e8219
4
+ data.tar.gz: 572850950b31f5ba76f88404b6af7ef79e40cda2b8056fd7da6eeb7fa8b18fa8
5
5
  SHA512:
6
- metadata.gz: 8965e8ab1cdf01fcff84a20f8e89b87772e16c71b02e4ad9691422f023c19784be786c41db1d32c9f9773421055ad22e9d1df3b8d9cc91a601c42018489b727e
7
- data.tar.gz: cebab50be2be058a1085d5e9b68bd8e66d46560bd7df58ce0efb6f4d90442dc004d528943e1283ecd91f652432000577f041d391def3e6983bcc13d799e18101
6
+ metadata.gz: e88c1ff785691b5c2d50f48d9a3ec160ded4f14f0c09df0d0a928fca37dc6522b1dbbdae6091b51985b8f0546ec0b9cb7a11a2c2469bdb4c7a0c42dabd12b739
7
+ data.tar.gz: b49745dae7076fb8068a7a2c98dd9484bbb87bb4430951a3bab16eda2069a46c60c29cb33dc5df1be35bc566ce027279328e47dcae7ab74e5a6cc0223db7d28b
data/lib/isodoc/un/un.plenary-attachment.xsl CHANGED
@@ -2188,8 +2188,27 @@
2188
2188
  <xsl:sort select="@displayorder" data-type="number"/>
2189
2189
  <xsl:apply-templates select="."/>
2190
2190
  </xsl:for-each>
2191
- </xsl:template><xsl:template match="text()">
2192
- <xsl:value-of select="."/>
2191
+ </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">
2192
+ <xsl:variable name="regex_standard_reference">([A-Z]{2,}(/[A-Z]{2,})* \d+(-\d+)*(:\d{4})?)</xsl:variable>
2193
+ <xsl:variable name="text" select="java:replaceAll(java:java.lang.String.new(.),$regex_standard_reference,concat($tag_open,'$1',$tag_close))"/>
2194
+ <xsl:call-template name="replace_fo_inline">
2195
+ <xsl:with-param name="text" select="$text"/>
2196
+ </xsl:call-template>
2197
+ </xsl:template><xsl:template name="replace_fo_inline">
2198
+ <xsl:param name="text"/>
2199
+ <xsl:choose>
2200
+ <xsl:when test="contains($text, $tag_open)">
2201
+ <xsl:value-of select="substring-before($text, $tag_open)"/>
2202
+ <xsl:text disable-output-escaping="yes">&lt;fo:inline keep-together.within-line="always"&gt;</xsl:text>
2203
+ <xsl:variable name="text_after" select="substring-after($text, $tag_open)"/>
2204
+ <xsl:value-of select="substring-before($text_after, $tag_close)"/>
2205
+ <xsl:text disable-output-escaping="yes">&lt;/fo:inline&gt;</xsl:text>
2206
+ <xsl:call-template name="replace_fo_inline">
2207
+ <xsl:with-param name="text" select="substring-after($text_after, $tag_close)"/>
2208
+ </xsl:call-template>
2209
+ </xsl:when>
2210
+ <xsl:otherwise><xsl:value-of select="$text"/></xsl:otherwise>
2211
+ </xsl:choose>
2193
2212
  </xsl:template><xsl:template match="*[local-name()='br']">
2194
2213
  <xsl:value-of select="$linebreak"/>
2195
2214
  </xsl:template><xsl:template match="*[local-name()='copyright-statement']">
@@ -5842,7 +5861,8 @@
5842
5861
  <fo:inline><xsl:apply-templates/></fo:inline>
5843
5862
  </xsl:template><xsl:template match="*[local-name() = 'modification']/text()">
5844
5863
  <xsl:if test="normalize-space() != ''">
5845
- <xsl:value-of select="."/>
5864
+ <!-- <xsl:value-of select="."/> -->
5865
+ <xsl:call-template name="text"/>
5846
5866
  </xsl:if>
5847
5867
  </xsl:template><xsl:template match="*[local-name() = 'quote']">
5848
5868
  <fo:block-container margin-left="0mm">
data/lib/isodoc/un/un.plenary.xsl CHANGED
@@ -2188,8 +2188,27 @@
2188
2188
  <xsl:sort select="@displayorder" data-type="number"/>
2189
2189
  <xsl:apply-templates select="."/>
2190
2190
  </xsl:for-each>
2191
- </xsl:template><xsl:template match="text()">
2192
- <xsl:value-of select="."/>
2191
+ </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">
2192
+ <xsl:variable name="regex_standard_reference">([A-Z]{2,}(/[A-Z]{2,})* \d+(-\d+)*(:\d{4})?)</xsl:variable>
2193
+ <xsl:variable name="text" select="java:replaceAll(java:java.lang.String.new(.),$regex_standard_reference,concat($tag_open,'$1',$tag_close))"/>
2194
+ <xsl:call-template name="replace_fo_inline">
2195
+ <xsl:with-param name="text" select="$text"/>
2196
+ </xsl:call-template>
2197
+ </xsl:template><xsl:template name="replace_fo_inline">
2198
+ <xsl:param name="text"/>
2199
+ <xsl:choose>
2200
+ <xsl:when test="contains($text, $tag_open)">
2201
+ <xsl:value-of select="substring-before($text, $tag_open)"/>
2202
+ <xsl:text disable-output-escaping="yes">&lt;fo:inline keep-together.within-line="always"&gt;</xsl:text>
2203
+ <xsl:variable name="text_after" select="substring-after($text, $tag_open)"/>
2204
+ <xsl:value-of select="substring-before($text_after, $tag_close)"/>
2205
+ <xsl:text disable-output-escaping="yes">&lt;/fo:inline&gt;</xsl:text>
2206
+ <xsl:call-template name="replace_fo_inline">
2207
+ <xsl:with-param name="text" select="substring-after($text_after, $tag_close)"/>
2208
+ </xsl:call-template>
2209
+ </xsl:when>
2210
+ <xsl:otherwise><xsl:value-of select="$text"/></xsl:otherwise>
2211
+ </xsl:choose>
2193
2212
  </xsl:template><xsl:template match="*[local-name()='br']">
2194
2213
  <xsl:value-of select="$linebreak"/>
2195
2214
  </xsl:template><xsl:template match="*[local-name()='copyright-statement']">
@@ -5842,7 +5861,8 @@
5842
5861
  <fo:inline><xsl:apply-templates/></fo:inline>
5843
5862
  </xsl:template><xsl:template match="*[local-name() = 'modification']/text()">
5844
5863
  <xsl:if test="normalize-space() != ''">
5845
- <xsl:value-of select="."/>
5864
+ <!-- <xsl:value-of select="."/> -->
5865
+ <xsl:call-template name="text"/>
5846
5866
  </xsl:if>
5847
5867
  </xsl:template><xsl:template match="*[local-name() = 'quote']">
5848
5868
  <fo:block-container margin-left="0mm">
data/lib/isodoc/un/un.recommendation.xsl CHANGED
@@ -2247,8 +2247,27 @@
2247
2247
  <xsl:sort select="@displayorder" data-type="number"/>
2248
2248
  <xsl:apply-templates select="."/>
2249
2249
  </xsl:for-each>
2250
- </xsl:template><xsl:template match="text()">
2251
- <xsl:value-of select="."/>
2250
+ </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">
2251
+ <xsl:variable name="regex_standard_reference">([A-Z]{2,}(/[A-Z]{2,})* \d+(-\d+)*(:\d{4})?)</xsl:variable>
2252
+ <xsl:variable name="text" select="java:replaceAll(java:java.lang.String.new(.),$regex_standard_reference,concat($tag_open,'$1',$tag_close))"/>
2253
+ <xsl:call-template name="replace_fo_inline">
2254
+ <xsl:with-param name="text" select="$text"/>
2255
+ </xsl:call-template>
2256
+ </xsl:template><xsl:template name="replace_fo_inline">
2257
+ <xsl:param name="text"/>
2258
+ <xsl:choose>
2259
+ <xsl:when test="contains($text, $tag_open)">
2260
+ <xsl:value-of select="substring-before($text, $tag_open)"/>
2261
+ <xsl:text disable-output-escaping="yes">&lt;fo:inline keep-together.within-line="always"&gt;</xsl:text>
2262
+ <xsl:variable name="text_after" select="substring-after($text, $tag_open)"/>
2263
+ <xsl:value-of select="substring-before($text_after, $tag_close)"/>
2264
+ <xsl:text disable-output-escaping="yes">&lt;/fo:inline&gt;</xsl:text>
2265
+ <xsl:call-template name="replace_fo_inline">
2266
+ <xsl:with-param name="text" select="substring-after($text_after, $tag_close)"/>
2267
+ </xsl:call-template>
2268
+ </xsl:when>
2269
+ <xsl:otherwise><xsl:value-of select="$text"/></xsl:otherwise>
2270
+ </xsl:choose>
2252
2271
  </xsl:template><xsl:template match="*[local-name()='br']">
2253
2272
  <xsl:value-of select="$linebreak"/>
2254
2273
  </xsl:template><xsl:template match="*[local-name()='copyright-statement']">
@@ -5935,7 +5954,8 @@
5935
5954
  <fo:inline><xsl:apply-templates/></fo:inline>
5936
5955
  </xsl:template><xsl:template match="*[local-name() = 'modification']/text()">
5937
5956
  <xsl:if test="normalize-space() != ''">
5938
- <xsl:value-of select="."/>
5957
+ <!-- <xsl:value-of select="."/> -->
5958
+ <xsl:call-template name="text"/>
5939
5959
  </xsl:if>
5940
5960
  </xsl:template><xsl:template match="*[local-name() = 'quote']">
5941
5961
  <fo:block-container margin-left="0mm">
data/lib/metanorma/un/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module UN
3
- VERSION = "0.8.6".freeze
3
+ VERSION = "0.8.7".freeze
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-un
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.8.6
4
+ version: 0.8.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2022-03-21 00:00:00.000000000 Z
11
+ date: 2022-04-04 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: iso-639