metanorma-un 0.9.4 → 0.9.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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: df3815b88029cc96a399f52d78b99f3beee7b1c520bd26c5701e5ad87886541b
4
- data.tar.gz: 7fc79df9dcec92fed9716a91670d69ca9b0a90b4a324148ef58d789ffb762c88
3
+ metadata.gz: b3c52c1eee77e915cb2903479ad0aaae4873263f13ccb8673dd9fac8a7f8d4dc
4
+ data.tar.gz: 96e33cf095bd6a10a1ea8e0688d81a905e2b39dd5d45405c41a362a985715d87
5
5
  SHA512:
6
- metadata.gz: d5b31dad2389adc30a7e7b5f3c07afd1d86d606cbe066e28e0f37dd4ab89720b7379c683e524b09a72d8ba7a3f25ea049a7b364a93d4ee6978fec2e62af8b69f
7
- data.tar.gz: 663176c19ae386e3a973e23c734c7152e5f4528d9226224664dd07aca227739054513d74a079556402ffb838d5958d8190786b88f4a2c4a53e5a90e6209df866
6
+ metadata.gz: 67ec689fe9c704020966288afb0b7cbe91ae5fb78f24d19075987600aef83716d417ee491ef7b958cda77272628336218254e9f2ae9cddb96f0f9d7426884d19
7
+ data.tar.gz: 0af387388c4b3ec39eeecfc77b7a9cf16f8e3a848ac8f375da0f23733eeb106a1cc3ef095c596aec81665e97f9effb01c1a8c29b42fba80ec07f6c35b4a946e9
@@ -2020,10 +2020,12 @@
2020
2020
  </xsl:attribute-set><xsl:attribute-set name="bibitem-normative-list-body-style">
2021
2021
 
2022
2022
 
2023
+
2023
2024
  </xsl:attribute-set><xsl:attribute-set name="bibitem-non-normative-list-body-style">
2024
2025
 
2025
2026
 
2026
2027
 
2028
+
2027
2029
  </xsl:attribute-set><xsl:attribute-set name="bibitem-note-fn-style">
2028
2030
  <xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
2029
2031
  <xsl:attribute name="font-size">65%</xsl:attribute>
@@ -2650,6 +2652,14 @@
2650
2652
 
2651
2653
 
2652
2654
 
2655
+ <xsl:if test="*[local-name()='bookmark']"> <!-- special case: table/bookmark -->
2656
+ <fo:block keep-with-previous="always" line-height="0.1">
2657
+ <xsl:for-each select="*[local-name()='bookmark']">
2658
+ <xsl:call-template name="bookmark"/>
2659
+ </xsl:for-each>
2660
+ </fo:block>
2661
+ </xsl:if>
2662
+
2653
2663
  </fo:block-container>
2654
2664
  </xsl:variable>
2655
2665
 
@@ -6455,7 +6465,7 @@
6455
6465
 
6456
6466
 
6457
6467
  <!-- <xsl:if test="$namespace = 'ieee'">
6458
- <xsl:if test="$doctype = 'standard' and $stage = 'published'">8</xsl:if>
6468
+ <xsl:if test="$current_template = 'standard'">8</xsl:if>
6459
6469
  </xsl:if> -->
6460
6470
 
6461
6471
 
@@ -7788,7 +7798,7 @@
7788
7798
  </xsl:template><xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'li']/text()">
7789
7799
  <!-- to split by '_' and other chars -->
7790
7800
  <xsl:call-template name="add-zero-spaces-java"/>
7791
- </xsl:template><xsl:template match="*[local-name() = 'bookmark']" name="bookmark">
7801
+ </xsl:template><xsl:template match="*[local-name() = 'table']/*[local-name() = 'bookmark']" priority="2"/><xsl:template match="*[local-name() = 'bookmark']" name="bookmark">
7792
7802
  <!-- <fo:inline id="{@id}" font-size="1pt"/> -->
7793
7803
  <fo:inline id="{@id}" font-size="1pt"><xsl:value-of select="$hair_space"/></fo:inline>
7794
7804
  <!-- we need to add zero-width space, otherwise this fo:inline is missing in IF xml -->
@@ -8530,6 +8540,7 @@
8530
8540
  </xsl:call-template>
8531
8541
  </xsl:template><xsl:template name="insertKeywords">
8532
8542
  <xsl:param name="sorting" select="'true'"/>
8543
+ <xsl:param name="meta" select="'false'"/>
8533
8544
  <xsl:param name="charAtEnd" select="'.'"/>
8534
8545
  <xsl:param name="charDelim" select="', '"/>
8535
8546
  <xsl:choose>
@@ -8537,6 +8548,7 @@
8537
8548
  <xsl:for-each select="//*[contains(local-name(), '-standard')]/*[local-name() = 'bibdata']//*[local-name() = 'keyword']">
8538
8549
  <xsl:sort data-type="text" order="ascending"/>
8539
8550
  <xsl:call-template name="insertKeyword">
8551
+ <xsl:with-param name="meta" select="$meta"/>
8540
8552
  <xsl:with-param name="charAtEnd" select="$charAtEnd"/>
8541
8553
  <xsl:with-param name="charDelim" select="$charDelim"/>
8542
8554
  </xsl:call-template>
@@ -8545,6 +8557,7 @@
8545
8557
  <xsl:otherwise>
8546
8558
  <xsl:for-each select="//*[contains(local-name(), '-standard')]/*[local-name() = 'bibdata']//*[local-name() = 'keyword']">
8547
8559
  <xsl:call-template name="insertKeyword">
8560
+ <xsl:with-param name="meta" select="$meta"/>
8548
8561
  <xsl:with-param name="charAtEnd" select="$charAtEnd"/>
8549
8562
  <xsl:with-param name="charDelim" select="$charDelim"/>
8550
8563
  </xsl:call-template>
@@ -8554,7 +8567,15 @@
8554
8567
  </xsl:template><xsl:template name="insertKeyword">
8555
8568
  <xsl:param name="charAtEnd"/>
8556
8569
  <xsl:param name="charDelim"/>
8557
- <xsl:apply-templates/>
8570
+ <xsl:param name="meta"/>
8571
+ <xsl:choose>
8572
+ <xsl:when test="$meta = 'true'">
8573
+ <xsl:value-of select="."/>
8574
+ </xsl:when>
8575
+ <xsl:otherwise>
8576
+ <xsl:apply-templates/>
8577
+ </xsl:otherwise>
8578
+ </xsl:choose>
8558
8579
  <xsl:choose>
8559
8580
  <xsl:when test="position() != last()"><xsl:value-of select="$charDelim"/></xsl:when>
8560
8581
  <xsl:otherwise><xsl:value-of select="$charAtEnd"/></xsl:otherwise>
@@ -8605,7 +8626,9 @@
8605
8626
  <xsl:value-of select="normalize-space($abstract)"/>
8606
8627
  </dc:description>
8607
8628
  <pdf:Keywords>
8608
- <xsl:call-template name="insertKeywords"/>
8629
+ <xsl:call-template name="insertKeywords">
8630
+ <xsl:with-param name="meta">true</xsl:with-param>
8631
+ </xsl:call-template>
8609
8632
  </pdf:Keywords>
8610
8633
  </rdf:Description>
8611
8634
  <rdf:Description xmlns:xmp="http://ns.adobe.com/xap/1.0/" rdf:about="">
@@ -2020,10 +2020,12 @@
2020
2020
  </xsl:attribute-set><xsl:attribute-set name="bibitem-normative-list-body-style">
2021
2021
 
2022
2022
 
2023
+
2023
2024
  </xsl:attribute-set><xsl:attribute-set name="bibitem-non-normative-list-body-style">
2024
2025
 
2025
2026
 
2026
2027
 
2028
+
2027
2029
  </xsl:attribute-set><xsl:attribute-set name="bibitem-note-fn-style">
2028
2030
  <xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
2029
2031
  <xsl:attribute name="font-size">65%</xsl:attribute>
@@ -2650,6 +2652,14 @@
2650
2652
 
2651
2653
 
2652
2654
 
2655
+ <xsl:if test="*[local-name()='bookmark']"> <!-- special case: table/bookmark -->
2656
+ <fo:block keep-with-previous="always" line-height="0.1">
2657
+ <xsl:for-each select="*[local-name()='bookmark']">
2658
+ <xsl:call-template name="bookmark"/>
2659
+ </xsl:for-each>
2660
+ </fo:block>
2661
+ </xsl:if>
2662
+
2653
2663
  </fo:block-container>
2654
2664
  </xsl:variable>
2655
2665
 
@@ -6455,7 +6465,7 @@
6455
6465
 
6456
6466
 
6457
6467
  <!-- <xsl:if test="$namespace = 'ieee'">
6458
- <xsl:if test="$doctype = 'standard' and $stage = 'published'">8</xsl:if>
6468
+ <xsl:if test="$current_template = 'standard'">8</xsl:if>
6459
6469
  </xsl:if> -->
6460
6470
 
6461
6471
 
@@ -7788,7 +7798,7 @@
7788
7798
  </xsl:template><xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'li']/text()">
7789
7799
  <!-- to split by '_' and other chars -->
7790
7800
  <xsl:call-template name="add-zero-spaces-java"/>
7791
- </xsl:template><xsl:template match="*[local-name() = 'bookmark']" name="bookmark">
7801
+ </xsl:template><xsl:template match="*[local-name() = 'table']/*[local-name() = 'bookmark']" priority="2"/><xsl:template match="*[local-name() = 'bookmark']" name="bookmark">
7792
7802
  <!-- <fo:inline id="{@id}" font-size="1pt"/> -->
7793
7803
  <fo:inline id="{@id}" font-size="1pt"><xsl:value-of select="$hair_space"/></fo:inline>
7794
7804
  <!-- we need to add zero-width space, otherwise this fo:inline is missing in IF xml -->
@@ -8530,6 +8540,7 @@
8530
8540
  </xsl:call-template>
8531
8541
  </xsl:template><xsl:template name="insertKeywords">
8532
8542
  <xsl:param name="sorting" select="'true'"/>
8543
+ <xsl:param name="meta" select="'false'"/>
8533
8544
  <xsl:param name="charAtEnd" select="'.'"/>
8534
8545
  <xsl:param name="charDelim" select="', '"/>
8535
8546
  <xsl:choose>
@@ -8537,6 +8548,7 @@
8537
8548
  <xsl:for-each select="//*[contains(local-name(), '-standard')]/*[local-name() = 'bibdata']//*[local-name() = 'keyword']">
8538
8549
  <xsl:sort data-type="text" order="ascending"/>
8539
8550
  <xsl:call-template name="insertKeyword">
8551
+ <xsl:with-param name="meta" select="$meta"/>
8540
8552
  <xsl:with-param name="charAtEnd" select="$charAtEnd"/>
8541
8553
  <xsl:with-param name="charDelim" select="$charDelim"/>
8542
8554
  </xsl:call-template>
@@ -8545,6 +8557,7 @@
8545
8557
  <xsl:otherwise>
8546
8558
  <xsl:for-each select="//*[contains(local-name(), '-standard')]/*[local-name() = 'bibdata']//*[local-name() = 'keyword']">
8547
8559
  <xsl:call-template name="insertKeyword">
8560
+ <xsl:with-param name="meta" select="$meta"/>
8548
8561
  <xsl:with-param name="charAtEnd" select="$charAtEnd"/>
8549
8562
  <xsl:with-param name="charDelim" select="$charDelim"/>
8550
8563
  </xsl:call-template>
@@ -8554,7 +8567,15 @@
8554
8567
  </xsl:template><xsl:template name="insertKeyword">
8555
8568
  <xsl:param name="charAtEnd"/>
8556
8569
  <xsl:param name="charDelim"/>
8557
- <xsl:apply-templates/>
8570
+ <xsl:param name="meta"/>
8571
+ <xsl:choose>
8572
+ <xsl:when test="$meta = 'true'">
8573
+ <xsl:value-of select="."/>
8574
+ </xsl:when>
8575
+ <xsl:otherwise>
8576
+ <xsl:apply-templates/>
8577
+ </xsl:otherwise>
8578
+ </xsl:choose>
8558
8579
  <xsl:choose>
8559
8580
  <xsl:when test="position() != last()"><xsl:value-of select="$charDelim"/></xsl:when>
8560
8581
  <xsl:otherwise><xsl:value-of select="$charAtEnd"/></xsl:otherwise>
@@ -8605,7 +8626,9 @@
8605
8626
  <xsl:value-of select="normalize-space($abstract)"/>
8606
8627
  </dc:description>
8607
8628
  <pdf:Keywords>
8608
- <xsl:call-template name="insertKeywords"/>
8629
+ <xsl:call-template name="insertKeywords">
8630
+ <xsl:with-param name="meta">true</xsl:with-param>
8631
+ </xsl:call-template>
8609
8632
  </pdf:Keywords>
8610
8633
  </rdf:Description>
8611
8634
  <rdf:Description xmlns:xmp="http://ns.adobe.com/xap/1.0/" rdf:about="">
@@ -2079,10 +2079,12 @@
2079
2079
  </xsl:attribute-set><xsl:attribute-set name="bibitem-normative-list-body-style">
2080
2080
 
2081
2081
 
2082
+
2082
2083
  </xsl:attribute-set><xsl:attribute-set name="bibitem-non-normative-list-body-style">
2083
2084
 
2084
2085
 
2085
2086
 
2087
+
2086
2088
  </xsl:attribute-set><xsl:attribute-set name="bibitem-note-fn-style">
2087
2089
  <xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
2088
2090
  <xsl:attribute name="font-size">65%</xsl:attribute>
@@ -2718,6 +2720,14 @@
2718
2720
 
2719
2721
 
2720
2722
 
2723
+ <xsl:if test="*[local-name()='bookmark']"> <!-- special case: table/bookmark -->
2724
+ <fo:block keep-with-previous="always" line-height="0.1">
2725
+ <xsl:for-each select="*[local-name()='bookmark']">
2726
+ <xsl:call-template name="bookmark"/>
2727
+ </xsl:for-each>
2728
+ </fo:block>
2729
+ </xsl:if>
2730
+
2721
2731
  </fo:block-container>
2722
2732
  </xsl:variable>
2723
2733
 
@@ -6548,7 +6558,7 @@
6548
6558
 
6549
6559
 
6550
6560
  <!-- <xsl:if test="$namespace = 'ieee'">
6551
- <xsl:if test="$doctype = 'standard' and $stage = 'published'">8</xsl:if>
6561
+ <xsl:if test="$current_template = 'standard'">8</xsl:if>
6552
6562
  </xsl:if> -->
6553
6563
 
6554
6564
 
@@ -7881,7 +7891,7 @@
7881
7891
  </xsl:template><xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'li']/text()">
7882
7892
  <!-- to split by '_' and other chars -->
7883
7893
  <xsl:call-template name="add-zero-spaces-java"/>
7884
- </xsl:template><xsl:template match="*[local-name() = 'bookmark']" name="bookmark">
7894
+ </xsl:template><xsl:template match="*[local-name() = 'table']/*[local-name() = 'bookmark']" priority="2"/><xsl:template match="*[local-name() = 'bookmark']" name="bookmark">
7885
7895
  <!-- <fo:inline id="{@id}" font-size="1pt"/> -->
7886
7896
  <fo:inline id="{@id}" font-size="1pt"><xsl:value-of select="$hair_space"/></fo:inline>
7887
7897
  <!-- we need to add zero-width space, otherwise this fo:inline is missing in IF xml -->
@@ -8625,6 +8635,7 @@
8625
8635
  </xsl:call-template>
8626
8636
  </xsl:template><xsl:template name="insertKeywords">
8627
8637
  <xsl:param name="sorting" select="'true'"/>
8638
+ <xsl:param name="meta" select="'false'"/>
8628
8639
  <xsl:param name="charAtEnd" select="'.'"/>
8629
8640
  <xsl:param name="charDelim" select="', '"/>
8630
8641
  <xsl:choose>
@@ -8632,6 +8643,7 @@
8632
8643
  <xsl:for-each select="//*[contains(local-name(), '-standard')]/*[local-name() = 'bibdata']//*[local-name() = 'keyword']">
8633
8644
  <xsl:sort data-type="text" order="ascending"/>
8634
8645
  <xsl:call-template name="insertKeyword">
8646
+ <xsl:with-param name="meta" select="$meta"/>
8635
8647
  <xsl:with-param name="charAtEnd" select="$charAtEnd"/>
8636
8648
  <xsl:with-param name="charDelim" select="$charDelim"/>
8637
8649
  </xsl:call-template>
@@ -8640,6 +8652,7 @@
8640
8652
  <xsl:otherwise>
8641
8653
  <xsl:for-each select="//*[contains(local-name(), '-standard')]/*[local-name() = 'bibdata']//*[local-name() = 'keyword']">
8642
8654
  <xsl:call-template name="insertKeyword">
8655
+ <xsl:with-param name="meta" select="$meta"/>
8643
8656
  <xsl:with-param name="charAtEnd" select="$charAtEnd"/>
8644
8657
  <xsl:with-param name="charDelim" select="$charDelim"/>
8645
8658
  </xsl:call-template>
@@ -8649,7 +8662,15 @@
8649
8662
  </xsl:template><xsl:template name="insertKeyword">
8650
8663
  <xsl:param name="charAtEnd"/>
8651
8664
  <xsl:param name="charDelim"/>
8652
- <xsl:apply-templates/>
8665
+ <xsl:param name="meta"/>
8666
+ <xsl:choose>
8667
+ <xsl:when test="$meta = 'true'">
8668
+ <xsl:value-of select="."/>
8669
+ </xsl:when>
8670
+ <xsl:otherwise>
8671
+ <xsl:apply-templates/>
8672
+ </xsl:otherwise>
8673
+ </xsl:choose>
8653
8674
  <xsl:choose>
8654
8675
  <xsl:when test="position() != last()"><xsl:value-of select="$charDelim"/></xsl:when>
8655
8676
  <xsl:otherwise><xsl:value-of select="$charAtEnd"/></xsl:otherwise>
@@ -8700,7 +8721,9 @@
8700
8721
  <xsl:value-of select="normalize-space($abstract)"/>
8701
8722
  </dc:description>
8702
8723
  <pdf:Keywords>
8703
- <xsl:call-template name="insertKeywords"/>
8724
+ <xsl:call-template name="insertKeywords">
8725
+ <xsl:with-param name="meta">true</xsl:with-param>
8726
+ </xsl:call-template>
8704
8727
  </pdf:Keywords>
8705
8728
  </rdf:Description>
8706
8729
  <rdf:Description xmlns:xmp="http://ns.adobe.com/xap/1.0/" rdf:about="">
@@ -2504,6 +2504,16 @@
2504
2504
  <text/>
2505
2505
  </element>
2506
2506
  </optional>
2507
+ <optional>
2508
+ <element name="amendment">
2509
+ <text/>
2510
+ </element>
2511
+ </optional>
2512
+ <optional>
2513
+ <element name="corrigendum">
2514
+ <text/>
2515
+ </element>
2516
+ </optional>
2507
2517
  <optional>
2508
2518
  <element name="language">
2509
2519
  <text/>
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module UN
3
- VERSION = "0.9.4".freeze
3
+ VERSION = "0.9.5".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.9.4
4
+ version: 0.9.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: 2022-07-04 00:00:00.000000000 Z
11
+ date: 2022-07-18 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: iso-639