metanorma-un 0.6.13 → 0.7.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: b7090558cbfbf23662a7b4c3d74d37e8f36f6ed5e9fd2533f4a60727b649103b
4
- data.tar.gz: a66d7b14762d4d72ba18f136b5d21f6c9630e248bee55a4b77ba6ed609b55ee1
3
+ metadata.gz: b0cb696b15a66bb44c638334d8097ff07da2693d42e8d94d37cfec6491d7cb3a
4
+ data.tar.gz: c466c6a8ca6d3df99428a5c345bdb17a1f30f8b6ebace6607993eb6eefb2dd77
5
5
  SHA512:
6
- metadata.gz: 5489ca83efa7a1c79205c2ece2e831176280ba0ee916147ca0d8e5f35c34adb863a5ac6115e375c2462036c6baae47861dda1d359d70048ac4a934d74525fe9b
7
- data.tar.gz: 25ddfbdf217fef36a89c60690b9f5592e30980fbcb9f505ceada556b7817dbe9813b4b0b773bf9cbdbfaf3c9e69913600925b81ce01a8744b9109c02b7e80cc3
6
+ metadata.gz: c4b42efd4c3147edd4cae131822cedc94ea0c80ddcc27f02897107df0f5a38d771993c34d67ce56dd5de4c991fc5a642a2d975d4024778a1707f84b4c5fc95bd
7
+ data.tar.gz: fd6b0ea1834904bcf513eb99b943ecb279ad2ee1a8d19f1b45084b48dbb9eef373e84251bf197ee075c4432209ffffd094f88fbd351769a7473c01433b77dfa3
@@ -17,7 +17,7 @@
17
17
  these elements; we just want one namespace for any child grammars
18
18
  of this.
19
19
  -->
20
- <grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
20
+ <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
21
21
  <include href="reqt.rng"/>
22
22
  <!-- include "biblio.rnc" { } -->
23
23
  <include href="basicdoc.rng">
@@ -1803,17 +1803,20 @@
1803
1803
  <ref name="admitted"/>
1804
1804
  </zeroOrMore>
1805
1805
  <zeroOrMore>
1806
- <ref name="related"/>
1806
+ <ref name="deprecates"/>
1807
1807
  </zeroOrMore>
1808
1808
  <zeroOrMore>
1809
- <ref name="deprecates"/>
1809
+ <ref name="related"/>
1810
1810
  </zeroOrMore>
1811
1811
  <optional>
1812
1812
  <ref name="termdomain"/>
1813
1813
  </optional>
1814
- <zeroOrMore>
1815
- <ref name="termgrammar"/>
1816
- </zeroOrMore>
1814
+ <optional>
1815
+ <ref name="termsubject"/>
1816
+ </optional>
1817
+ <optional>
1818
+ <ref name="termusage"/>
1819
+ </optional>
1817
1820
  <oneOrMore>
1818
1821
  <ref name="termdefinition"/>
1819
1822
  </oneOrMore>
@@ -1830,41 +1833,200 @@
1830
1833
  </define>
1831
1834
  <define name="preferred">
1832
1835
  <element name="preferred">
1833
- <oneOrMore>
1834
- <ref name="TextElement"/>
1835
- </oneOrMore>
1836
+ <ref name="Designation"/>
1836
1837
  </element>
1837
1838
  </define>
1838
1839
  <define name="admitted">
1839
1840
  <element name="admitted">
1840
- <oneOrMore>
1841
- <ref name="TextElement"/>
1842
- </oneOrMore>
1841
+ <ref name="Designation"/>
1843
1842
  </element>
1844
1843
  </define>
1845
1844
  <define name="related">
1846
1845
  <element name="related">
1846
+ <attribute name="type">
1847
+ <ref name="RelatedTermType"/>
1848
+ </attribute>
1849
+ <element name="preferred">
1850
+ <ref name="Designation"/>
1851
+ </element>
1852
+ <choice>
1853
+ <ref name="eref"/>
1854
+ <ref name="xref"/>
1855
+ <ref name="termref"/>
1856
+ </choice>
1857
+ </element>
1858
+ </define>
1859
+ <define name="RelatedTermType">
1860
+ <choice>
1861
+ <value>deprecates</value>
1862
+ <value>supersedes</value>
1863
+ <value>narrower</value>
1864
+ <value>broader</value>
1865
+ <value>equivalent</value>
1866
+ <value>compare</value>
1867
+ <value>contrast</value>
1868
+ <value>see</value>
1869
+ </choice>
1870
+ </define>
1871
+ <define name="deprecates">
1872
+ <element name="deprecates">
1873
+ <ref name="Designation"/>
1874
+ </element>
1875
+ </define>
1876
+ <define name="Designation">
1877
+ <optional>
1878
+ <attribute name="absent">
1879
+ <data type="boolean"/>
1880
+ </attribute>
1881
+ </optional>
1882
+ <optional>
1883
+ <attribute name="geographicArea"/>
1884
+ </optional>
1885
+ <choice>
1886
+ <ref name="expression_designation"/>
1887
+ <ref name="letter_symbol_designation"/>
1888
+ <ref name="graphical_symbol_designation"/>
1889
+ </choice>
1890
+ <zeroOrMore>
1891
+ <ref name="termsource"/>
1892
+ </zeroOrMore>
1893
+ </define>
1894
+ <define name="letter_symbol_designation">
1895
+ <element name="letter-symbol">
1847
1896
  <optional>
1848
- <attribute name="type">
1897
+ <attribute name="isInternational">
1898
+ <data type="boolean"/>
1899
+ </attribute>
1900
+ </optional>
1901
+ <element name="name">
1902
+ <oneOrMore>
1849
1903
  <choice>
1850
- <value>compare</value>
1851
- <value>contrast</value>
1852
- <value>see</value>
1904
+ <ref name="PureTextElement"/>
1905
+ <ref name="stem"/>
1853
1906
  </choice>
1907
+ </oneOrMore>
1908
+ </element>
1909
+ </element>
1910
+ </define>
1911
+ <define name="graphical_symbol_designation">
1912
+ <element name="graphical-symbol">
1913
+ <optional>
1914
+ <attribute name="isInternational">
1915
+ <data type="boolean"/>
1854
1916
  </attribute>
1855
1917
  </optional>
1856
- <oneOrMore>
1857
- <ref name="TextElement"/>
1858
- </oneOrMore>
1918
+ <ref name="figure"/>
1859
1919
  </element>
1860
1920
  </define>
1861
- <define name="deprecates">
1862
- <element name="deprecates">
1863
- <oneOrMore>
1864
- <ref name="TextElement"/>
1865
- </oneOrMore>
1921
+ <define name="expression_designation">
1922
+ <element name="expression">
1923
+ <optional>
1924
+ <attribute name="language">
1925
+ <a:documentation>ISO-639</a:documentation>
1926
+ </attribute>
1927
+ </optional>
1928
+ <optional>
1929
+ <attribute name="script">
1930
+ <a:documentation>ISO-15924</a:documentation>
1931
+ </attribute>
1932
+ </optional>
1933
+ <optional>
1934
+ <attribute name="type">
1935
+ <ref name="ExpressionDesignationType"/>
1936
+ </attribute>
1937
+ </optional>
1938
+ <optional>
1939
+ <attribute name="isInternational">
1940
+ <data type="boolean"/>
1941
+ </attribute>
1942
+ </optional>
1943
+ <element name="name">
1944
+ <zeroOrMore>
1945
+ <ref name="PureTextElement"/>
1946
+ </zeroOrMore>
1947
+ </element>
1948
+ <optional>
1949
+ <element name="abbreviationType">
1950
+ <ref name="AbbreviationType"/>
1951
+ </element>
1952
+ </optional>
1953
+ <optional>
1954
+ <element name="pronunciation">
1955
+ <ref name="LocalizedString"/>
1956
+ </element>
1957
+ </optional>
1958
+ <optional>
1959
+ <element name="grammarInfo">
1960
+ <ref name="Grammar"/>
1961
+ </element>
1962
+ </optional>
1866
1963
  </element>
1867
1964
  </define>
1965
+ <define name="ExpressionDesignationType">
1966
+ <choice>
1967
+ <value>prefix</value>
1968
+ <value>suffix</value>
1969
+ <value>abbreviation</value>
1970
+ <value>full</value>
1971
+ </choice>
1972
+ </define>
1973
+ <define name="AbbreviationType">
1974
+ <choice>
1975
+ <value>truncation</value>
1976
+ <value>acronym</value>
1977
+ <value>initialism</value>
1978
+ </choice>
1979
+ </define>
1980
+ <define name="Grammar">
1981
+ <zeroOrMore>
1982
+ <element name="gender">
1983
+ <ref name="GrammarGender"/>
1984
+ </element>
1985
+ </zeroOrMore>
1986
+ <optional>
1987
+ <element name="isPreposition">
1988
+ <data type="boolean"/>
1989
+ </element>
1990
+ </optional>
1991
+ <optional>
1992
+ <element name="isParticiple">
1993
+ <data type="boolean"/>
1994
+ </element>
1995
+ </optional>
1996
+ <optional>
1997
+ <element name="isAdjective">
1998
+ <data type="boolean"/>
1999
+ </element>
2000
+ </optional>
2001
+ <optional>
2002
+ <element name="isVerb">
2003
+ <data type="boolean"/>
2004
+ </element>
2005
+ </optional>
2006
+ <optional>
2007
+ <element name="isAdverb">
2008
+ <data type="boolean"/>
2009
+ </element>
2010
+ </optional>
2011
+ <optional>
2012
+ <element name="isNoun">
2013
+ <data type="boolean"/>
2014
+ </element>
2015
+ </optional>
2016
+ <zeroOrMore>
2017
+ <element name="grammarvalue">
2018
+ <text/>
2019
+ </element>
2020
+ </zeroOrMore>
2021
+ </define>
2022
+ <define name="GrammarGender">
2023
+ <choice>
2024
+ <value>masculine</value>
2025
+ <value>feminine</value>
2026
+ <value>neuter</value>
2027
+ <value>common</value>
2028
+ </choice>
2029
+ </define>
1868
2030
  <define name="termdomain">
1869
2031
  <element name="domain">
1870
2032
  <oneOrMore>
@@ -1872,18 +2034,47 @@
1872
2034
  </oneOrMore>
1873
2035
  </element>
1874
2036
  </define>
1875
- <define name="termgrammar">
1876
- <element name="grammar">
2037
+ <define name="termsubject">
2038
+ <element name="subject">
1877
2039
  <oneOrMore>
1878
2040
  <ref name="TextElement"/>
1879
2041
  </oneOrMore>
1880
2042
  </element>
1881
2043
  </define>
2044
+ <define name="termusage">
2045
+ <element name="usageinfo">
2046
+ <oneOrMore>
2047
+ <ref name="BasicBlock"/>
2048
+ </oneOrMore>
2049
+ </element>
2050
+ </define>
1882
2051
  <define name="termdefinition">
1883
2052
  <element name="definition">
2053
+ <choice>
2054
+ <ref name="verbaldefinition"/>
2055
+ <ref name="nonverbalrep"/>
2056
+ <group>
2057
+ <ref name="verbaldefinition"/>
2058
+ <ref name="nonverbalrep"/>
2059
+ </group>
2060
+ </choice>
2061
+ </element>
2062
+ </define>
2063
+ <define name="verbaldefinition">
2064
+ <element name="verbaldefinition">
2065
+ <oneOrMore>
2066
+ <ref name="paragraph"/>
2067
+ </oneOrMore>
2068
+ <zeroOrMore>
2069
+ <ref name="termsource"/>
2070
+ </zeroOrMore>
2071
+ </element>
2072
+ </define>
2073
+ <define name="nonverbalrep">
2074
+ <element name="nonverbalrepresentation">
1884
2075
  <oneOrMore>
1885
2076
  <choice>
1886
- <ref name="paragraph"/>
2077
+ <ref name="table"/>
1887
2078
  <ref name="figure"/>
1888
2079
  <ref name="formula"/>
1889
2080
  </choice>
@@ -1205,6 +1205,8 @@
1205
1205
 
1206
1206
  <title-list-figures lang="en">List of Figures</title-list-figures>
1207
1207
 
1208
+ <title-table-figures lang="en">Table of Figures</title-table-figures>
1209
+
1208
1210
  <title-list-recommendations lang="en">List of Recommendations</title-list-recommendations>
1209
1211
 
1210
1212
  <title-acknowledgements lang="en">Acknowledgements</title-acknowledgements>
@@ -4019,6 +4021,7 @@
4019
4021
  <xsl:otherwise>
4020
4022
  <fo:block xsl:use-attribute-sets="image-style">
4021
4023
 
4024
+
4022
4025
  <xsl:variable name="src">
4023
4026
  <xsl:call-template name="image_src"/>
4024
4027
  </xsl:variable>
@@ -4385,7 +4388,7 @@
4385
4388
  <xsl:text> </xsl:text>
4386
4389
  </xsl:template><xsl:template match="*[local-name() = 'figure' or local-name() = 'table' or local-name() = 'permission' or local-name() = 'recommendation' or local-name() = 'requirement']/*[local-name() = 'name']/text()" mode="contents" priority="2">
4387
4390
  <xsl:value-of select="."/>
4388
- </xsl:template><xsl:template match="*[local-name() = 'figure' or local-name() = 'table' or local-name() = 'permission' or local-name() = 'recommendation' or local-name() = 'requirement']/*[local-name() = 'name']/text()" mode="bookmarks" priority="2">
4391
+ </xsl:template><xsl:template match="*[local-name() = 'figure' or local-name() = 'table' or local-name() = 'permission' or local-name() = 'recommendation' or local-name() = 'requirement']/*[local-name() = 'name']//text()" mode="bookmarks" priority="2">
4389
4392
  <xsl:value-of select="."/>
4390
4393
  </xsl:template><xsl:template match="node()" mode="contents">
4391
4394
  <xsl:apply-templates mode="contents"/>
@@ -4483,6 +4486,8 @@
4483
4486
 
4484
4487
 
4485
4488
 
4489
+
4490
+
4486
4491
  </fo:bookmark-tree>
4487
4492
  </xsl:if>
4488
4493
  </xsl:template><xsl:template name="insertFigureBookmarks">
@@ -5038,6 +5043,7 @@
5038
5043
  </xsl:choose>
5039
5044
  </xsl:template><xsl:template match="*[local-name() = 'termsource']" name="termsource">
5040
5045
  <fo:block xsl:use-attribute-sets="termsource-style">
5046
+
5041
5047
  <!-- Example: [SOURCE: ISO 5127:2017, 3.1.6.02] -->
5042
5048
  <xsl:variable name="termsource_text">
5043
5049
  <xsl:apply-templates/>
@@ -1205,6 +1205,8 @@
1205
1205
 
1206
1206
  <title-list-figures lang="en">List of Figures</title-list-figures>
1207
1207
 
1208
+ <title-table-figures lang="en">Table of Figures</title-table-figures>
1209
+
1208
1210
  <title-list-recommendations lang="en">List of Recommendations</title-list-recommendations>
1209
1211
 
1210
1212
  <title-acknowledgements lang="en">Acknowledgements</title-acknowledgements>
@@ -4019,6 +4021,7 @@
4019
4021
  <xsl:otherwise>
4020
4022
  <fo:block xsl:use-attribute-sets="image-style">
4021
4023
 
4024
+
4022
4025
  <xsl:variable name="src">
4023
4026
  <xsl:call-template name="image_src"/>
4024
4027
  </xsl:variable>
@@ -4385,7 +4388,7 @@
4385
4388
  <xsl:text> </xsl:text>
4386
4389
  </xsl:template><xsl:template match="*[local-name() = 'figure' or local-name() = 'table' or local-name() = 'permission' or local-name() = 'recommendation' or local-name() = 'requirement']/*[local-name() = 'name']/text()" mode="contents" priority="2">
4387
4390
  <xsl:value-of select="."/>
4388
- </xsl:template><xsl:template match="*[local-name() = 'figure' or local-name() = 'table' or local-name() = 'permission' or local-name() = 'recommendation' or local-name() = 'requirement']/*[local-name() = 'name']/text()" mode="bookmarks" priority="2">
4391
+ </xsl:template><xsl:template match="*[local-name() = 'figure' or local-name() = 'table' or local-name() = 'permission' or local-name() = 'recommendation' or local-name() = 'requirement']/*[local-name() = 'name']//text()" mode="bookmarks" priority="2">
4389
4392
  <xsl:value-of select="."/>
4390
4393
  </xsl:template><xsl:template match="node()" mode="contents">
4391
4394
  <xsl:apply-templates mode="contents"/>
@@ -4483,6 +4486,8 @@
4483
4486
 
4484
4487
 
4485
4488
 
4489
+
4490
+
4486
4491
  </fo:bookmark-tree>
4487
4492
  </xsl:if>
4488
4493
  </xsl:template><xsl:template name="insertFigureBookmarks">
@@ -5038,6 +5043,7 @@
5038
5043
  </xsl:choose>
5039
5044
  </xsl:template><xsl:template match="*[local-name() = 'termsource']" name="termsource">
5040
5045
  <fo:block xsl:use-attribute-sets="termsource-style">
5046
+
5041
5047
  <!-- Example: [SOURCE: ISO 5127:2017, 3.1.6.02] -->
5042
5048
  <xsl:variable name="termsource_text">
5043
5049
  <xsl:apply-templates/>
@@ -1162,6 +1162,8 @@
1162
1162
 
1163
1163
  <title-list-figures lang="en">List of Figures</title-list-figures>
1164
1164
 
1165
+ <title-table-figures lang="en">Table of Figures</title-table-figures>
1166
+
1165
1167
  <title-list-recommendations lang="en">List of Recommendations</title-list-recommendations>
1166
1168
 
1167
1169
  <title-acknowledgements lang="en">Acknowledgements</title-acknowledgements>
@@ -3986,6 +3988,7 @@
3986
3988
  <xsl:otherwise>
3987
3989
  <fo:block xsl:use-attribute-sets="image-style">
3988
3990
 
3991
+
3989
3992
  <xsl:if test="ancestor::un:admonition">
3990
3993
  <xsl:attribute name="margin-top">-12mm</xsl:attribute>
3991
3994
  <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
@@ -4357,7 +4360,7 @@
4357
4360
  <xsl:text> </xsl:text>
4358
4361
  </xsl:template><xsl:template match="*[local-name() = 'figure' or local-name() = 'table' or local-name() = 'permission' or local-name() = 'recommendation' or local-name() = 'requirement']/*[local-name() = 'name']/text()" mode="contents" priority="2">
4359
4362
  <xsl:value-of select="."/>
4360
- </xsl:template><xsl:template match="*[local-name() = 'figure' or local-name() = 'table' or local-name() = 'permission' or local-name() = 'recommendation' or local-name() = 'requirement']/*[local-name() = 'name']/text()" mode="bookmarks" priority="2">
4363
+ </xsl:template><xsl:template match="*[local-name() = 'figure' or local-name() = 'table' or local-name() = 'permission' or local-name() = 'recommendation' or local-name() = 'requirement']/*[local-name() = 'name']//text()" mode="bookmarks" priority="2">
4361
4364
  <xsl:value-of select="."/>
4362
4365
  </xsl:template><xsl:template match="node()" mode="contents">
4363
4366
  <xsl:apply-templates mode="contents"/>
@@ -4455,6 +4458,8 @@
4455
4458
 
4456
4459
 
4457
4460
 
4461
+
4462
+
4458
4463
  </fo:bookmark-tree>
4459
4464
  </xsl:if>
4460
4465
  </xsl:template><xsl:template name="insertFigureBookmarks">
@@ -5010,6 +5015,7 @@
5010
5015
  </xsl:choose>
5011
5016
  </xsl:template><xsl:template match="*[local-name() = 'termsource']" name="termsource">
5012
5017
  <fo:block xsl:use-attribute-sets="termsource-style">
5018
+
5013
5019
  <!-- Example: [SOURCE: ISO 5127:2017, 3.1.6.02] -->
5014
5020
  <xsl:variable name="termsource_text">
5015
5021
  <xsl:apply-templates/>
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module UN
3
- VERSION = "0.6.13".freeze
3
+ VERSION = "0.7.0".freeze
4
4
  end
5
5
  end
@@ -30,8 +30,7 @@ Gem::Specification.new do |spec|
30
30
  spec.add_dependency "roman-numerals"
31
31
  spec.add_dependency "twitter_cldr"
32
32
 
33
- spec.add_dependency "isodoc", "~> 1.7.0"
34
- spec.add_dependency "metanorma-standoc", "~> 1.10.0"
33
+ spec.add_dependency "metanorma-standoc", "~> 1.11.0"
35
34
 
36
35
  spec.add_development_dependency "byebug", "~> 9.1"
37
36
  spec.add_development_dependency "equivalent-xml", "~> 0.6"
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.6.13
4
+ version: 0.7.0
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-11 00:00:00.000000000 Z
11
+ date: 2021-10-25 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: iso-639
@@ -52,34 +52,20 @@ dependencies:
52
52
  - - ">="
53
53
  - !ruby/object:Gem::Version
54
54
  version: '0'
55
- - !ruby/object:Gem::Dependency
56
- name: isodoc
57
- requirement: !ruby/object:Gem::Requirement
58
- requirements:
59
- - - "~>"
60
- - !ruby/object:Gem::Version
61
- version: 1.7.0
62
- type: :runtime
63
- prerelease: false
64
- version_requirements: !ruby/object:Gem::Requirement
65
- requirements:
66
- - - "~>"
67
- - !ruby/object:Gem::Version
68
- version: 1.7.0
69
55
  - !ruby/object:Gem::Dependency
70
56
  name: metanorma-standoc
71
57
  requirement: !ruby/object:Gem::Requirement
72
58
  requirements:
73
59
  - - "~>"
74
60
  - !ruby/object:Gem::Version
75
- version: 1.10.0
61
+ version: 1.11.0
76
62
  type: :runtime
77
63
  prerelease: false
78
64
  version_requirements: !ruby/object:Gem::Requirement
79
65
  requirements:
80
66
  - - "~>"
81
67
  - !ruby/object:Gem::Version
82
- version: 1.10.0
68
+ version: 1.11.0
83
69
  - !ruby/object:Gem::Dependency
84
70
  name: byebug
85
71
  requirement: !ruby/object:Gem::Requirement
@@ -306,7 +292,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
306
292
  - !ruby/object:Gem::Version
307
293
  version: '0'
308
294
  requirements: []
309
- rubygems_version: 3.1.4
295
+ rubygems_version: 3.2.22
310
296
  signing_key:
311
297
  specification_version: 4
312
298
  summary: Metanorma for UN.