metanorma-un 0.7.0 → 0.7.1

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 (7) hide show
  1. checksums.yaml +4 -4
  2. data/lib/asciidoctor/un/isodoc.rng +12 -1
  3. data/lib/isodoc/un/un.plenary-attachment.xsl +24 -8
  4. data/lib/isodoc/un/un.plenary.xsl +24 -8
  5. data/lib/isodoc/un/un.recommendation.xsl +24 -8
  6. data/lib/metanorma/un/version.rb +1 -1
  7. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: b0cb696b15a66bb44c638334d8097ff07da2693d42e8d94d37cfec6491d7cb3a
4
- data.tar.gz: c466c6a8ca6d3df99428a5c345bdb17a1f30f8b6ebace6607993eb6eefb2dd77
3
+ metadata.gz: 0021dd59134b1e29f4fefa8f42876e766cab44fd2c39b026f235235ce92dec9b
4
+ data.tar.gz: 2f760abef94975595bd6b2f9a1b4d4eebdaf014da1b8fb16e030afb65b11d83c
5
5
  SHA512:
6
- metadata.gz: c4b42efd4c3147edd4cae131822cedc94ea0c80ddcc27f02897107df0f5a38d771993c34d67ce56dd5de4c991fc5a642a2d975d4024778a1707f84b4c5fc95bd
7
- data.tar.gz: fd6b0ea1834904bcf513eb99b943ecb279ad2ee1a8d19f1b45084b48dbb9eef373e84251bf197ee075c4432209ffffd094f88fbd351769a7473c01433b77dfa3
6
+ metadata.gz: dba9f3ff9ceb09f78cddda3d6b7c0cccc20f52a12d32e076bfd914844d01ed0d2860cd1f8035744f2c9c047a3f38e8217d4c6d996b0bb7f35162ebde59a62454
7
+ data.tar.gz: 40bc6b1322e06fd459e7374eed5e9d4bd10b6d3c96829ed09c76a454cc73dd2181322cf134511a8a7227e38e451c01219a928e3a306ae2cef21dda63d9fa57d6
data/lib/asciidoctor/un/isodoc.rng CHANGED
@@ -2063,7 +2063,12 @@
2063
2063
  <define name="verbaldefinition">
2064
2064
  <element name="verbaldefinition">
2065
2065
  <oneOrMore>
2066
- <ref name="paragraph"/>
2066
+ <choice>
2067
+ <ref name="paragraph"/>
2068
+ <ref name="dl"/>
2069
+ <ref name="ol"/>
2070
+ <ref name="ul"/>
2071
+ </choice>
2067
2072
  </oneOrMore>
2068
2073
  <zeroOrMore>
2069
2074
  <ref name="termsource"/>
@@ -2163,6 +2168,12 @@
2163
2168
  <value>modified</value>
2164
2169
  </choice>
2165
2170
  </attribute>
2171
+ <attribute name="type">
2172
+ <choice>
2173
+ <value>authoritative</value>
2174
+ <value>lineage</value>
2175
+ </choice>
2176
+ </attribute>
2166
2177
  <ref name="origin"/>
2167
2178
  <optional>
2168
2179
  <ref name="modification"/>
data/lib/isodoc/un/un.plenary-attachment.xsl CHANGED
@@ -3104,6 +3104,7 @@
3104
3104
  <fo:table-cell>
3105
3105
 
3106
3106
  <fo:block margin-top="6pt">
3107
+ <xsl:copy-of select="@id"/>
3107
3108
 
3108
3109
 
3109
3110
  <xsl:if test="normalize-space($key_iso) = 'true'">
@@ -3952,14 +3953,18 @@
3952
3953
  </xsl:template><xsl:template match="*[local-name() = 'termnote']/*[local-name() = 'p']">
3953
3954
  <fo:inline><xsl:apply-templates/></fo:inline>
3954
3955
  </xsl:template><xsl:template match="*[local-name() = 'terms']">
3956
+ <!-- <xsl:message>'terms' <xsl:number/> processing...</xsl:message> -->
3955
3957
  <fo:block id="{@id}">
3956
3958
  <xsl:apply-templates/>
3957
3959
  </fo:block>
3958
3960
  </xsl:template><xsl:template match="*[local-name() = 'term']">
3961
+ <!-- <xsl:message>'term' <xsl:number/> processing, name=<xsl:value-of select="iso:name"/>, preferred=<xsl:value-of select="iso:preferred"/>...</xsl:message> -->
3959
3962
  <fo:block id="{@id}" xsl:use-attribute-sets="term-style">
3960
3963
 
3961
3964
 
3962
-
3965
+ <xsl:if test="parent::*[local-name() = 'term'] and not(preceding-sibling::*[local-name() = 'term'])">
3966
+
3967
+ </xsl:if>
3963
3968
  <xsl:apply-templates/>
3964
3969
  </fo:block>
3965
3970
  </xsl:template><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']" mode="presentation">
@@ -4933,7 +4938,8 @@
4933
4938
  </fo:block>
4934
4939
  </fo:table-cell>
4935
4940
  </xsl:template><xsl:template match="*[local-name() = 'p'][@class='RecommendationTitle' or @class = 'RecommendationTestTitle']" priority="2">
4936
- <fo:block font-size="11pt" color="rgb(237, 193, 35)"> <!-- font-weight="bold" margin-bottom="4pt" text-align="center" -->
4941
+ <fo:block font-size="11pt">
4942
+
4937
4943
  <xsl:apply-templates/>
4938
4944
  </fo:block>
4939
4945
  </xsl:template><xsl:template match="*[local-name() = 'p2'][ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']]">
@@ -5054,13 +5060,15 @@
5054
5060
  <!-- <xsl:apply-templates /> -->
5055
5061
  <xsl:copy-of select="$termsource_text"/>
5056
5062
  </xsl:when>
5057
- <xsl:otherwise>
5063
+ <xsl:otherwise>
5064
+
5058
5065
 
5059
5066
  <xsl:text>[</xsl:text>
5060
5067
 
5061
5068
  <!-- <xsl:apply-templates /> -->
5062
5069
  <xsl:copy-of select="$termsource_text"/>
5063
5070
 
5071
+
5064
5072
  <xsl:text>]</xsl:text>
5065
5073
 
5066
5074
  </xsl:otherwise>
@@ -5127,12 +5135,20 @@
5127
5135
  </xsl:template><xsl:template match="*[local-name() = 'author']">
5128
5136
  <xsl:text>— </xsl:text>
5129
5137
  <xsl:apply-templates/>
5130
- </xsl:template><xsl:template match="*[local-name() = 'eref']">
5138
+ </xsl:template><xsl:variable name="bibitem_hidden_">
5139
+ <xsl:for-each select="//*[local-name() = 'bibitem'][@hidden='true']">
5140
+ <xsl:copy-of select="."/>
5141
+ </xsl:for-each>
5142
+ <xsl:for-each select="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem']">
5143
+ <xsl:copy-of select="."/>
5144
+ </xsl:for-each>
5145
+ </xsl:variable><xsl:variable name="bibitem_hidden" select="xalan:nodeset($bibitem_hidden_)"/><xsl:template match="*[local-name() = 'eref']">
5131
5146
 
5132
5147
  <xsl:variable name="bibitemid">
5133
5148
  <xsl:choose>
5134
- <xsl:when test="//*[local-name() = 'bibitem'][@hidden='true' and @id = current()/@bibitemid]"/>
5135
- <xsl:when test="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"/>
5149
+ <!-- <xsl:when test="//*[local-name() = 'bibitem'][@hidden='true' and @id = current()/@bibitemid]"></xsl:when>
5150
+ <xsl:when test="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"></xsl:when> -->
5151
+ <xsl:when test="$bibitem_hidden/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"/>
5136
5152
  <xsl:otherwise><xsl:value-of select="@bibitemid"/></xsl:otherwise>
5137
5153
  </xsl:choose>
5138
5154
  </xsl:variable>
@@ -5223,10 +5239,10 @@
5223
5239
  </xsl:choose>
5224
5240
  </xsl:variable>
5225
5241
 
5226
- <xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/>
5242
+ <!-- <xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/> -->
5227
5243
 
5228
5244
  <xsl:choose>
5229
- <xsl:when test="$language = 'zh'">
5245
+ <xsl:when test="$lang = 'zh'">
5230
5246
  <fo:inline><xsl:value-of select="$tab_zh"/></fo:inline>
5231
5247
  </xsl:when>
5232
5248
  <xsl:when test="../../@inline-header = 'true'">
data/lib/isodoc/un/un.plenary.xsl CHANGED
@@ -3104,6 +3104,7 @@
3104
3104
  <fo:table-cell>
3105
3105
 
3106
3106
  <fo:block margin-top="6pt">
3107
+ <xsl:copy-of select="@id"/>
3107
3108
 
3108
3109
 
3109
3110
  <xsl:if test="normalize-space($key_iso) = 'true'">
@@ -3952,14 +3953,18 @@
3952
3953
  </xsl:template><xsl:template match="*[local-name() = 'termnote']/*[local-name() = 'p']">
3953
3954
  <fo:inline><xsl:apply-templates/></fo:inline>
3954
3955
  </xsl:template><xsl:template match="*[local-name() = 'terms']">
3956
+ <!-- <xsl:message>'terms' <xsl:number/> processing...</xsl:message> -->
3955
3957
  <fo:block id="{@id}">
3956
3958
  <xsl:apply-templates/>
3957
3959
  </fo:block>
3958
3960
  </xsl:template><xsl:template match="*[local-name() = 'term']">
3961
+ <!-- <xsl:message>'term' <xsl:number/> processing, name=<xsl:value-of select="iso:name"/>, preferred=<xsl:value-of select="iso:preferred"/>...</xsl:message> -->
3959
3962
  <fo:block id="{@id}" xsl:use-attribute-sets="term-style">
3960
3963
 
3961
3964
 
3962
-
3965
+ <xsl:if test="parent::*[local-name() = 'term'] and not(preceding-sibling::*[local-name() = 'term'])">
3966
+
3967
+ </xsl:if>
3963
3968
  <xsl:apply-templates/>
3964
3969
  </fo:block>
3965
3970
  </xsl:template><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']" mode="presentation">
@@ -4933,7 +4938,8 @@
4933
4938
  </fo:block>
4934
4939
  </fo:table-cell>
4935
4940
  </xsl:template><xsl:template match="*[local-name() = 'p'][@class='RecommendationTitle' or @class = 'RecommendationTestTitle']" priority="2">
4936
- <fo:block font-size="11pt" color="rgb(237, 193, 35)"> <!-- font-weight="bold" margin-bottom="4pt" text-align="center" -->
4941
+ <fo:block font-size="11pt">
4942
+
4937
4943
  <xsl:apply-templates/>
4938
4944
  </fo:block>
4939
4945
  </xsl:template><xsl:template match="*[local-name() = 'p2'][ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']]">
@@ -5054,13 +5060,15 @@
5054
5060
  <!-- <xsl:apply-templates /> -->
5055
5061
  <xsl:copy-of select="$termsource_text"/>
5056
5062
  </xsl:when>
5057
- <xsl:otherwise>
5063
+ <xsl:otherwise>
5064
+
5058
5065
 
5059
5066
  <xsl:text>[</xsl:text>
5060
5067
 
5061
5068
  <!-- <xsl:apply-templates /> -->
5062
5069
  <xsl:copy-of select="$termsource_text"/>
5063
5070
 
5071
+
5064
5072
  <xsl:text>]</xsl:text>
5065
5073
 
5066
5074
  </xsl:otherwise>
@@ -5127,12 +5135,20 @@
5127
5135
  </xsl:template><xsl:template match="*[local-name() = 'author']">
5128
5136
  <xsl:text>— </xsl:text>
5129
5137
  <xsl:apply-templates/>
5130
- </xsl:template><xsl:template match="*[local-name() = 'eref']">
5138
+ </xsl:template><xsl:variable name="bibitem_hidden_">
5139
+ <xsl:for-each select="//*[local-name() = 'bibitem'][@hidden='true']">
5140
+ <xsl:copy-of select="."/>
5141
+ </xsl:for-each>
5142
+ <xsl:for-each select="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem']">
5143
+ <xsl:copy-of select="."/>
5144
+ </xsl:for-each>
5145
+ </xsl:variable><xsl:variable name="bibitem_hidden" select="xalan:nodeset($bibitem_hidden_)"/><xsl:template match="*[local-name() = 'eref']">
5131
5146
 
5132
5147
  <xsl:variable name="bibitemid">
5133
5148
  <xsl:choose>
5134
- <xsl:when test="//*[local-name() = 'bibitem'][@hidden='true' and @id = current()/@bibitemid]"/>
5135
- <xsl:when test="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"/>
5149
+ <!-- <xsl:when test="//*[local-name() = 'bibitem'][@hidden='true' and @id = current()/@bibitemid]"></xsl:when>
5150
+ <xsl:when test="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"></xsl:when> -->
5151
+ <xsl:when test="$bibitem_hidden/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"/>
5136
5152
  <xsl:otherwise><xsl:value-of select="@bibitemid"/></xsl:otherwise>
5137
5153
  </xsl:choose>
5138
5154
  </xsl:variable>
@@ -5223,10 +5239,10 @@
5223
5239
  </xsl:choose>
5224
5240
  </xsl:variable>
5225
5241
 
5226
- <xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/>
5242
+ <!-- <xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/> -->
5227
5243
 
5228
5244
  <xsl:choose>
5229
- <xsl:when test="$language = 'zh'">
5245
+ <xsl:when test="$lang = 'zh'">
5230
5246
  <fo:inline><xsl:value-of select="$tab_zh"/></fo:inline>
5231
5247
  </xsl:when>
5232
5248
  <xsl:when test="../../@inline-header = 'true'">
data/lib/isodoc/un/un.recommendation.xsl CHANGED
@@ -3067,6 +3067,7 @@
3067
3067
  <fo:table-cell>
3068
3068
 
3069
3069
  <fo:block margin-top="6pt">
3070
+ <xsl:copy-of select="@id"/>
3070
3071
 
3071
3072
 
3072
3073
  <xsl:if test="normalize-space($key_iso) = 'true'">
@@ -3919,14 +3920,18 @@
3919
3920
  </xsl:template><xsl:template match="*[local-name() = 'termnote']/*[local-name() = 'p']">
3920
3921
  <fo:inline><xsl:apply-templates/></fo:inline>
3921
3922
  </xsl:template><xsl:template match="*[local-name() = 'terms']">
3923
+ <!-- <xsl:message>'terms' <xsl:number/> processing...</xsl:message> -->
3922
3924
  <fo:block id="{@id}">
3923
3925
  <xsl:apply-templates/>
3924
3926
  </fo:block>
3925
3927
  </xsl:template><xsl:template match="*[local-name() = 'term']">
3928
+ <!-- <xsl:message>'term' <xsl:number/> processing, name=<xsl:value-of select="iso:name"/>, preferred=<xsl:value-of select="iso:preferred"/>...</xsl:message> -->
3926
3929
  <fo:block id="{@id}" xsl:use-attribute-sets="term-style">
3927
3930
 
3928
3931
 
3929
-
3932
+ <xsl:if test="parent::*[local-name() = 'term'] and not(preceding-sibling::*[local-name() = 'term'])">
3933
+
3934
+ </xsl:if>
3930
3935
  <xsl:apply-templates/>
3931
3936
  </fo:block>
3932
3937
  </xsl:template><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']" mode="presentation">
@@ -4905,7 +4910,8 @@
4905
4910
  </fo:block>
4906
4911
  </fo:table-cell>
4907
4912
  </xsl:template><xsl:template match="*[local-name() = 'p'][@class='RecommendationTitle' or @class = 'RecommendationTestTitle']" priority="2">
4908
- <fo:block font-size="11pt" color="rgb(237, 193, 35)"> <!-- font-weight="bold" margin-bottom="4pt" text-align="center" -->
4913
+ <fo:block font-size="11pt">
4914
+
4909
4915
  <xsl:apply-templates/>
4910
4916
  </fo:block>
4911
4917
  </xsl:template><xsl:template match="*[local-name() = 'p2'][ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']]">
@@ -5026,13 +5032,15 @@
5026
5032
  <!-- <xsl:apply-templates /> -->
5027
5033
  <xsl:copy-of select="$termsource_text"/>
5028
5034
  </xsl:when>
5029
- <xsl:otherwise>
5035
+ <xsl:otherwise>
5036
+
5030
5037
 
5031
5038
  <xsl:text>[</xsl:text>
5032
5039
 
5033
5040
  <!-- <xsl:apply-templates /> -->
5034
5041
  <xsl:copy-of select="$termsource_text"/>
5035
5042
 
5043
+
5036
5044
  <xsl:text>]</xsl:text>
5037
5045
 
5038
5046
  </xsl:otherwise>
@@ -5099,12 +5107,20 @@
5099
5107
  </xsl:template><xsl:template match="*[local-name() = 'author']">
5100
5108
  <xsl:text>— </xsl:text>
5101
5109
  <xsl:apply-templates/>
5102
- </xsl:template><xsl:template match="*[local-name() = 'eref']">
5110
+ </xsl:template><xsl:variable name="bibitem_hidden_">
5111
+ <xsl:for-each select="//*[local-name() = 'bibitem'][@hidden='true']">
5112
+ <xsl:copy-of select="."/>
5113
+ </xsl:for-each>
5114
+ <xsl:for-each select="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem']">
5115
+ <xsl:copy-of select="."/>
5116
+ </xsl:for-each>
5117
+ </xsl:variable><xsl:variable name="bibitem_hidden" select="xalan:nodeset($bibitem_hidden_)"/><xsl:template match="*[local-name() = 'eref']">
5103
5118
 
5104
5119
  <xsl:variable name="bibitemid">
5105
5120
  <xsl:choose>
5106
- <xsl:when test="//*[local-name() = 'bibitem'][@hidden='true' and @id = current()/@bibitemid]"/>
5107
- <xsl:when test="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"/>
5121
+ <!-- <xsl:when test="//*[local-name() = 'bibitem'][@hidden='true' and @id = current()/@bibitemid]"></xsl:when>
5122
+ <xsl:when test="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"></xsl:when> -->
5123
+ <xsl:when test="$bibitem_hidden/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"/>
5108
5124
  <xsl:otherwise><xsl:value-of select="@bibitemid"/></xsl:otherwise>
5109
5125
  </xsl:choose>
5110
5126
  </xsl:variable>
@@ -5193,10 +5209,10 @@
5193
5209
  </xsl:choose>
5194
5210
  </xsl:variable>
5195
5211
 
5196
- <xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/>
5212
+ <!-- <xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/> -->
5197
5213
 
5198
5214
  <xsl:choose>
5199
- <xsl:when test="$language = 'zh'">
5215
+ <xsl:when test="$lang = 'zh'">
5200
5216
  <fo:inline><xsl:value-of select="$tab_zh"/></fo:inline>
5201
5217
  </xsl:when>
5202
5218
  <xsl:when test="../../@inline-header = 'true'">
data/lib/metanorma/un/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module UN
3
- VERSION = "0.7.0".freeze
3
+ VERSION = "0.7.1".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.7.0
4
+ version: 0.7.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2021-10-25 00:00:00.000000000 Z
11
+ date: 2021-11-04 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: iso-639