metanorma-iho 0.3.13 → 0.4.0

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: fd0972e55380fed70b3ebab2671522a8b916fa6a3d64af73a949890c175d869d
4
- data.tar.gz: 37cfc6c4d8966d151d41bdb6a4727594efb65f9ec29be47595389b82aa06846e
3
+ metadata.gz: 8d1579affb0725e9ca072a2d6f57bd6330b1782f5085410f92a134df01e7110b
4
+ data.tar.gz: f75313120eff7a38ea54df21596fcb8e46899eac2023bb861755edc050850b30
5
5
  SHA512:
6
- metadata.gz: b563ec8e426e88873bf1313a3c4133fb78a2ef1b0b1475ccd733ff5264b292bf48f9564d76734881183b12e95732c1c63e9a0460b162d26616c640df3a6d95b6
7
- data.tar.gz: 5a5d4d609d7d53c552f01521ebb5f7ff0cf7f85440e4262a56b157e1608c1effce51c73cb570de27667d9f0a943eb990a2e524956a2634d98103b7ba844b9f3e
6
+ metadata.gz: 959aa9a734bbe40c2cccdaf083f03da7b223509e184db9f02b73893d8cdfb5cf42f281d9dab61a4da2c88ed867a01ba3496197c515e67fb404409a98914774ba
7
+ data.tar.gz: faf55192532d6fc1553bddab53af70f230f322a868d6b0fcb63949224c1562ec5aea7aca2477bb00ee15fa2cdf5c0c4a2cba941eeea0ab07d616781b7294db40
@@ -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>
@@ -70,7 +70,7 @@ module IsoDoc
70
70
  end
71
71
 
72
72
  def extract_uri(bib)
73
- bib.at(ns("./uri"))
73
+ bib.at(ns("./uri[@type = 'src']")) || bib.at(ns("./uri"))
74
74
  end
75
75
 
76
76
  def omit_docid_prefix(prefix)
@@ -1062,6 +1062,8 @@
1062
1062
 
1063
1063
  <title-list-figures lang="en">List of Figures</title-list-figures>
1064
1064
 
1065
+ <title-table-figures lang="en">Table of Figures</title-table-figures>
1066
+
1065
1067
  <title-list-recommendations lang="en">List of Recommendations</title-list-recommendations>
1066
1068
 
1067
1069
  <title-acknowledgements lang="en">Acknowledgements</title-acknowledgements>
@@ -3880,6 +3882,7 @@
3880
3882
  <xsl:otherwise>
3881
3883
  <fo:block xsl:use-attribute-sets="image-style">
3882
3884
 
3885
+
3883
3886
  <xsl:variable name="src">
3884
3887
  <xsl:call-template name="image_src"/>
3885
3888
  </xsl:variable>
@@ -4246,7 +4249,7 @@
4246
4249
  <xsl:text> </xsl:text>
4247
4250
  </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">
4248
4251
  <xsl:value-of select="."/>
4249
- </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">
4252
+ </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">
4250
4253
  <xsl:value-of select="."/>
4251
4254
  </xsl:template><xsl:template match="node()" mode="contents">
4252
4255
  <xsl:apply-templates mode="contents"/>
@@ -4344,6 +4347,8 @@
4344
4347
 
4345
4348
 
4346
4349
 
4350
+
4351
+
4347
4352
  </fo:bookmark-tree>
4348
4353
  </xsl:if>
4349
4354
  </xsl:template><xsl:template name="insertFigureBookmarks">
@@ -4894,6 +4899,7 @@
4894
4899
  </xsl:choose>
4895
4900
  </xsl:template><xsl:template match="*[local-name() = 'termsource']" name="termsource">
4896
4901
  <fo:block xsl:use-attribute-sets="termsource-style">
4902
+
4897
4903
  <!-- Example: [SOURCE: ISO 5127:2017, 3.1.6.02] -->
4898
4904
  <xsl:variable name="termsource_text">
4899
4905
  <xsl:apply-templates/>
@@ -1062,6 +1062,8 @@
1062
1062
 
1063
1063
  <title-list-figures lang="en">List of Figures</title-list-figures>
1064
1064
 
1065
+ <title-table-figures lang="en">Table of Figures</title-table-figures>
1066
+
1065
1067
  <title-list-recommendations lang="en">List of Recommendations</title-list-recommendations>
1066
1068
 
1067
1069
  <title-acknowledgements lang="en">Acknowledgements</title-acknowledgements>
@@ -3880,6 +3882,7 @@
3880
3882
  <xsl:otherwise>
3881
3883
  <fo:block xsl:use-attribute-sets="image-style">
3882
3884
 
3885
+
3883
3886
  <xsl:variable name="src">
3884
3887
  <xsl:call-template name="image_src"/>
3885
3888
  </xsl:variable>
@@ -4246,7 +4249,7 @@
4246
4249
  <xsl:text> </xsl:text>
4247
4250
  </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">
4248
4251
  <xsl:value-of select="."/>
4249
- </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">
4252
+ </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">
4250
4253
  <xsl:value-of select="."/>
4251
4254
  </xsl:template><xsl:template match="node()" mode="contents">
4252
4255
  <xsl:apply-templates mode="contents"/>
@@ -4344,6 +4347,8 @@
4344
4347
 
4345
4348
 
4346
4349
 
4350
+
4351
+
4347
4352
  </fo:bookmark-tree>
4348
4353
  </xsl:if>
4349
4354
  </xsl:template><xsl:template name="insertFigureBookmarks">
@@ -4894,6 +4899,7 @@
4894
4899
  </xsl:choose>
4895
4900
  </xsl:template><xsl:template match="*[local-name() = 'termsource']" name="termsource">
4896
4901
  <fo:block xsl:use-attribute-sets="termsource-style">
4902
+
4897
4903
  <!-- Example: [SOURCE: ISO 5127:2017, 3.1.6.02] -->
4898
4904
  <xsl:variable name="termsource_text">
4899
4905
  <xsl:apply-templates/>
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module IHO
3
- VERSION = "0.3.13".freeze
3
+ VERSION = "0.4.0".freeze
4
4
  end
5
5
  end
@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
27
27
  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
28
28
 
29
29
  spec.add_dependency "htmlentities", "~> 4.3.4"
30
- spec.add_dependency "metanorma-generic", "~> 1.10.2"
30
+ spec.add_dependency "metanorma-generic", "~> 1.11.0"
31
31
 
32
32
  spec.add_development_dependency "byebug", "~> 9.1"
33
33
  spec.add_development_dependency "equivalent-xml", "~> 0.6"
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-iho
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.13
4
+ version: 0.4.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: htmlentities
@@ -30,14 +30,14 @@ dependencies:
30
30
  requirements:
31
31
  - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: 1.10.2
33
+ version: 1.11.0
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - "~>"
39
39
  - !ruby/object:Gem::Version
40
- version: 1.10.2
40
+ version: 1.11.0
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: byebug
43
43
  requirement: !ruby/object:Gem::Requirement
@@ -261,7 +261,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
261
261
  - !ruby/object:Gem::Version
262
262
  version: '0'
263
263
  requirements: []
264
- rubygems_version: 3.1.4
264
+ rubygems_version: 3.2.22
265
265
  signing_key:
266
266
  specification_version: 4
267
267
  summary: metanorma-iho lets you write IHO in AsciiDoc.