metanorma-iso 1.9.6 → 1.10.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 +4 -4
- data/lib/asciidoctor/iso/isodoc.rng +218 -27
- data/lib/asciidoctor/iso/validate.rb +7 -7
- data/lib/asciidoctor/iso/validate_section.rb +1 -1
- data/lib/isodoc/iso/iso.amendment.xsl +7 -1
- data/lib/isodoc/iso/iso.international-standard.xsl +7 -1
- data/lib/metanorma/iso/version.rb +1 -1
- data/metanorma-iso.gemspec +1 -2
- data/spec/asciidoctor/base_spec.rb +2 -2
- data/spec/asciidoctor/blocks_spec.rb +28 -14
- data/spec/asciidoctor/cleanup_spec.rb +34 -20
- data/spec/asciidoctor/inline_spec.rb +10 -2
- data/spec/asciidoctor/section_spec.rb +3 -3
- data/spec/isodoc/i18n_spec.rb +4 -4
- data/spec/isodoc/inline_spec.rb +2 -2
- data/spec/isodoc/section_spec.rb +1 -1
- data/spec/isodoc/terms_spec.rb +11 -11
- data/spec/isodoc/xref_spec.rb +1397 -1376
- data/spec/metanorma/processor_spec.rb +4 -1
- data/spec/spec_helper.rb +2 -1
- metadata +5 -20
- data/spec/vcr_cassettes/docrels.yml +0 -393
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 80f036674b2fadf0f45d564dee4050674cf69babf4d88c6ee84986e82ed8a5ce
|
|
4
|
+
data.tar.gz: 491de6c6a6b92a4ce05212833f6acd5e2de4094973e4f8e3c44e2981ca983fce
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: d08a1c0909b6c0c0fafa0748132851eea415c110d6ce6bac821364df0a5c257adf30d3a86649ee2ed9d92a8dec6f1986fccfa39414aaf1a376f1a9e057ea6659
|
|
7
|
+
data.tar.gz: 21fda2fe4ceec7d933d3f960dc19b4a2758e4e8cf4aa713e65da4e66d1447d55b34e08fe150dea6abd4d0c2c5e18d1d4acd961fc5200d3c632167278fe62348f
|
|
@@ -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="
|
|
1806
|
+
<ref name="deprecates"/>
|
|
1807
1807
|
</zeroOrMore>
|
|
1808
1808
|
<zeroOrMore>
|
|
1809
|
-
<ref name="
|
|
1809
|
+
<ref name="related"/>
|
|
1810
1810
|
</zeroOrMore>
|
|
1811
1811
|
<optional>
|
|
1812
1812
|
<ref name="termdomain"/>
|
|
1813
1813
|
</optional>
|
|
1814
|
-
<
|
|
1815
|
-
<ref name="
|
|
1816
|
-
</
|
|
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
|
-
<
|
|
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
|
-
<
|
|
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="
|
|
1897
|
+
<attribute name="isInternational">
|
|
1898
|
+
<data type="boolean"/>
|
|
1899
|
+
</attribute>
|
|
1900
|
+
</optional>
|
|
1901
|
+
<element name="name">
|
|
1902
|
+
<oneOrMore>
|
|
1849
1903
|
<choice>
|
|
1850
|
-
<
|
|
1851
|
-
<
|
|
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
|
-
<
|
|
1857
|
-
<ref name="TextElement"/>
|
|
1858
|
-
</oneOrMore>
|
|
1918
|
+
<ref name="figure"/>
|
|
1859
1919
|
</element>
|
|
1860
1920
|
</define>
|
|
1861
|
-
<define name="
|
|
1862
|
-
<element name="
|
|
1863
|
-
<
|
|
1864
|
-
<
|
|
1865
|
-
|
|
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="
|
|
1876
|
-
<element name="
|
|
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="
|
|
2077
|
+
<ref name="table"/>
|
|
1887
2078
|
<ref name="figure"/>
|
|
1888
2079
|
<ref name="formula"/>
|
|
1889
2080
|
</choice>
|
|
@@ -63,7 +63,7 @@ module Asciidoctor
|
|
|
63
63
|
def locality_erefs_validate(root)
|
|
64
64
|
root.xpath("//eref[descendant::locality]").each do |t|
|
|
65
65
|
if /^(ISO|IEC)/.match?(t["citeas"]) &&
|
|
66
|
-
|
|
66
|
+
!/: ?(\d+{4}|–)$/.match?(t["citeas"])
|
|
67
67
|
@log.add("Style", t,
|
|
68
68
|
"undated reference #{t['citeas']} should not contain "\
|
|
69
69
|
"specific elements")
|
|
@@ -78,8 +78,8 @@ module Asciidoctor
|
|
|
78
78
|
# ISO/IEC DIR 2, 16.5.6
|
|
79
79
|
def termdef_style(xmldoc)
|
|
80
80
|
xmldoc.xpath("//term").each do |t|
|
|
81
|
-
para = t.at("./definition") || return
|
|
82
|
-
term = t.at("./preferred").text
|
|
81
|
+
para = t.at("./definition/verbaldefinition") || return
|
|
82
|
+
term = t.at("./preferred//name").text
|
|
83
83
|
termdef_warn(para.text, /\A(the|a)\b/i, t, term,
|
|
84
84
|
"term definition starts with article")
|
|
85
85
|
termdef_warn(para.text, /\.\Z/i, t, term,
|
|
@@ -90,10 +90,10 @@ module Asciidoctor
|
|
|
90
90
|
def doctype_validate(xmldoc)
|
|
91
91
|
doctype = xmldoc&.at("//bibdata/ext/doctype")&.text
|
|
92
92
|
%w(international-standard technical-specification technical-report
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
93
|
+
publicly-available-specification international-workshop-agreement
|
|
94
|
+
guide amendment technical-corrigendum).include? doctype or
|
|
95
|
+
@log.add("Document Attributes", nil,
|
|
96
|
+
"#{doctype} is not a recognised document type")
|
|
97
97
|
end
|
|
98
98
|
|
|
99
99
|
def script_validate(xmldoc)
|
|
@@ -216,7 +216,7 @@ module Asciidoctor
|
|
|
216
216
|
|
|
217
217
|
def asset_style(root)
|
|
218
218
|
root.xpath("//example | //termexample").each { |e| example_style(e) }
|
|
219
|
-
root.xpath("//definition").each { |e| definition_style(e) }
|
|
219
|
+
root.xpath("//definition/verbaldefinition").each { |e| definition_style(e) }
|
|
220
220
|
root.xpath("//note").each { |e| note_style(e) }
|
|
221
221
|
root.xpath("//fn").each { |e| footnote_style(e) }
|
|
222
222
|
root.xpath(ASSETS_TO_STYLE).each { |e| style(e, extract_text(e)) }
|
|
@@ -2260,6 +2260,8 @@
|
|
|
2260
2260
|
|
|
2261
2261
|
<title-list-figures lang="en">List of Figures</title-list-figures>
|
|
2262
2262
|
|
|
2263
|
+
<title-table-figures lang="en">Table of Figures</title-table-figures>
|
|
2264
|
+
|
|
2263
2265
|
<title-list-recommendations lang="en">List of Recommendations</title-list-recommendations>
|
|
2264
2266
|
|
|
2265
2267
|
<title-acknowledgements lang="en">Acknowledgements</title-acknowledgements>
|
|
@@ -5208,6 +5210,7 @@
|
|
|
5208
5210
|
<xsl:otherwise>
|
|
5209
5211
|
<fo:block xsl:use-attribute-sets="image-style">
|
|
5210
5212
|
|
|
5213
|
+
|
|
5211
5214
|
<xsl:variable name="src">
|
|
5212
5215
|
<xsl:call-template name="image_src"/>
|
|
5213
5216
|
</xsl:variable>
|
|
@@ -5574,7 +5577,7 @@
|
|
|
5574
5577
|
<xsl:text> </xsl:text>
|
|
5575
5578
|
</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">
|
|
5576
5579
|
<xsl:value-of select="."/>
|
|
5577
|
-
</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']
|
|
5580
|
+
</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">
|
|
5578
5581
|
<xsl:value-of select="."/>
|
|
5579
5582
|
</xsl:template><xsl:template match="node()" mode="contents">
|
|
5580
5583
|
<xsl:apply-templates mode="contents"/>
|
|
@@ -5672,6 +5675,8 @@
|
|
|
5672
5675
|
|
|
5673
5676
|
|
|
5674
5677
|
|
|
5678
|
+
|
|
5679
|
+
|
|
5675
5680
|
</fo:bookmark-tree>
|
|
5676
5681
|
</xsl:if>
|
|
5677
5682
|
</xsl:template><xsl:template name="insertFigureBookmarks">
|
|
@@ -6227,6 +6232,7 @@
|
|
|
6227
6232
|
</xsl:choose>
|
|
6228
6233
|
</xsl:template><xsl:template match="*[local-name() = 'termsource']" name="termsource">
|
|
6229
6234
|
<fo:block xsl:use-attribute-sets="termsource-style">
|
|
6235
|
+
|
|
6230
6236
|
<!-- Example: [SOURCE: ISO 5127:2017, 3.1.6.02] -->
|
|
6231
6237
|
<xsl:variable name="termsource_text">
|
|
6232
6238
|
<xsl:apply-templates/>
|
|
@@ -2260,6 +2260,8 @@
|
|
|
2260
2260
|
|
|
2261
2261
|
<title-list-figures lang="en">List of Figures</title-list-figures>
|
|
2262
2262
|
|
|
2263
|
+
<title-table-figures lang="en">Table of Figures</title-table-figures>
|
|
2264
|
+
|
|
2263
2265
|
<title-list-recommendations lang="en">List of Recommendations</title-list-recommendations>
|
|
2264
2266
|
|
|
2265
2267
|
<title-acknowledgements lang="en">Acknowledgements</title-acknowledgements>
|
|
@@ -5208,6 +5210,7 @@
|
|
|
5208
5210
|
<xsl:otherwise>
|
|
5209
5211
|
<fo:block xsl:use-attribute-sets="image-style">
|
|
5210
5212
|
|
|
5213
|
+
|
|
5211
5214
|
<xsl:variable name="src">
|
|
5212
5215
|
<xsl:call-template name="image_src"/>
|
|
5213
5216
|
</xsl:variable>
|
|
@@ -5574,7 +5577,7 @@
|
|
|
5574
5577
|
<xsl:text> </xsl:text>
|
|
5575
5578
|
</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">
|
|
5576
5579
|
<xsl:value-of select="."/>
|
|
5577
|
-
</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']
|
|
5580
|
+
</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">
|
|
5578
5581
|
<xsl:value-of select="."/>
|
|
5579
5582
|
</xsl:template><xsl:template match="node()" mode="contents">
|
|
5580
5583
|
<xsl:apply-templates mode="contents"/>
|
|
@@ -5672,6 +5675,8 @@
|
|
|
5672
5675
|
|
|
5673
5676
|
|
|
5674
5677
|
|
|
5678
|
+
|
|
5679
|
+
|
|
5675
5680
|
</fo:bookmark-tree>
|
|
5676
5681
|
</xsl:if>
|
|
5677
5682
|
</xsl:template><xsl:template name="insertFigureBookmarks">
|
|
@@ -6227,6 +6232,7 @@
|
|
|
6227
6232
|
</xsl:choose>
|
|
6228
6233
|
</xsl:template><xsl:template match="*[local-name() = 'termsource']" name="termsource">
|
|
6229
6234
|
<fo:block xsl:use-attribute-sets="termsource-style">
|
|
6235
|
+
|
|
6230
6236
|
<!-- Example: [SOURCE: ISO 5127:2017, 3.1.6.02] -->
|
|
6231
6237
|
<xsl:variable name="termsource_text">
|
|
6232
6238
|
<xsl:apply-templates/>
|
data/metanorma-iso.gemspec
CHANGED
|
@@ -29,8 +29,7 @@ Gem::Specification.new do |spec|
|
|
|
29
29
|
spec.test_files = `git ls-files -- {spec}/*`.split("\n")
|
|
30
30
|
spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
|
|
31
31
|
|
|
32
|
-
spec.add_dependency "
|
|
33
|
-
spec.add_dependency "metanorma-standoc", "~> 1.10.0"
|
|
32
|
+
spec.add_dependency "metanorma-standoc", "~> 1.11.0"
|
|
34
33
|
spec.add_dependency "mnconvert", "~> 1.8.0"
|
|
35
34
|
spec.add_dependency "ruby-jing"
|
|
36
35
|
spec.add_dependency "tokenizer", "~> 0.3.0"
|
|
@@ -713,7 +713,7 @@ RSpec.describe Asciidoctor::ISO do
|
|
|
713
713
|
</copyright>
|
|
714
714
|
<relation type='obsoletes'>
|
|
715
715
|
<bibitem type='standard'>
|
|
716
|
-
<fetched
|
|
716
|
+
<fetched>#{Date.today}</fetched>
|
|
717
717
|
<title type='title-intro' format='text/plain' language='en' script='Latn'>Natural rubber latex concentrate</title>
|
|
718
718
|
<title type='title-main' format='text/plain' language='en' script='Latn'>Determination of alkalinity</title>
|
|
719
719
|
<title type='main' format='text/plain' language='en' script='Latn'>
|
|
@@ -790,7 +790,7 @@ RSpec.describe Asciidoctor::ISO do
|
|
|
790
790
|
</relation>
|
|
791
791
|
<relation type='obsoletes'>
|
|
792
792
|
<bibitem type='standard'>
|
|
793
|
-
<fetched
|
|
793
|
+
<fetched>#{Date.today}</fetched>
|
|
794
794
|
<title type='title-intro' format='text/plain' language='en' script='Latn'>Natural rubber latex concentrate</title>
|
|
795
795
|
<title type='title-main' format='text/plain' language='en' script='Latn'>Determination of dry rubber content</title>
|
|
796
796
|
<title type='main' format='text/plain' language='en' script='Latn'>
|
|
@@ -133,7 +133,7 @@ RSpec.describe Asciidoctor::ISO do
|
|
|
133
133
|
<p id="foreword">Foreword</p>
|
|
134
134
|
<review date="20170101T00:00:00Z" from="foreword" id="_" reviewer="ISO" to="foreword">
|
|
135
135
|
<p id="_">A Foreword shall appear in each document. The generic text is shown here. It does not contain requirements, recommendations or permissions.</p>
|
|
136
|
-
<p id="_">For further information on the Foreword, see
|
|
136
|
+
<p id="_">For further information on the Foreword, see
|
|
137
137
|
<strong>ISO/IEC Directives, Part 2, 2016, Clause 12.</strong></p>
|
|
138
138
|
</review>
|
|
139
139
|
</sections>
|
|
@@ -158,9 +158,9 @@ RSpec.describe Asciidoctor::ISO do
|
|
|
158
158
|
<sections>
|
|
159
159
|
<terms id="_" obligation="normative">
|
|
160
160
|
<title>Terms and definitions</title>
|
|
161
|
-
#{TERM_BOILERPLATE}
|
|
161
|
+
#{TERM_BOILERPLATE}
|
|
162
162
|
<term id="term-term1">
|
|
163
|
-
<preferred>Term1</preferred>
|
|
163
|
+
<preferred><expression><name>Term1</name></expression></preferred>
|
|
164
164
|
<termnote id="_">
|
|
165
165
|
<p id="_">This is a note</p></termnote>
|
|
166
166
|
</term>
|
|
@@ -283,7 +283,7 @@ RSpec.describe Asciidoctor::ISO do
|
|
|
283
283
|
<title>Terms and definitions</title>
|
|
284
284
|
#{TERM_BOILERPLATE}
|
|
285
285
|
<term id="term-term1">
|
|
286
|
-
<preferred>Term1</preferred>
|
|
286
|
+
<preferred><expression><name>Term1</name></expression></preferred>
|
|
287
287
|
<termexample id="_">
|
|
288
288
|
<p id="_">This is an example</p></termexample>
|
|
289
289
|
</term>
|
|
@@ -521,6 +521,8 @@ RSpec.describe Asciidoctor::ISO do
|
|
|
521
521
|
|
|
522
522
|
=== Term1
|
|
523
523
|
|
|
524
|
+
Definition
|
|
525
|
+
|
|
524
526
|
[.source]
|
|
525
527
|
<<ISO2191,section=1>>
|
|
526
528
|
INPUT
|
|
@@ -531,8 +533,13 @@ RSpec.describe Asciidoctor::ISO do
|
|
|
531
533
|
<title>Terms and definitions</title>
|
|
532
534
|
#{TERM_BOILERPLATE}
|
|
533
535
|
<term id="term-term1">
|
|
534
|
-
<preferred>Term1</preferred>
|
|
535
|
-
|
|
536
|
+
<preferred><expression><name>Term1</name></expression></preferred>
|
|
537
|
+
<definition>
|
|
538
|
+
<verbaldefinition>
|
|
539
|
+
<p id='_'>Definition</p>
|
|
540
|
+
</verbaldefinition>
|
|
541
|
+
</definition>
|
|
542
|
+
<termsource status='identical' type='authoritative'>
|
|
536
543
|
<origin bibitemid="ISO2191" citeas="" type="inline">
|
|
537
544
|
<localityStack>
|
|
538
545
|
<locality type="section">
|
|
@@ -556,6 +563,8 @@ RSpec.describe Asciidoctor::ISO do
|
|
|
556
563
|
|
|
557
564
|
=== Term1
|
|
558
565
|
|
|
566
|
+
Definition
|
|
567
|
+
|
|
559
568
|
[.source]
|
|
560
569
|
<<ISO2191,section=1>>, with adjustments
|
|
561
570
|
INPUT
|
|
@@ -566,8 +575,13 @@ RSpec.describe Asciidoctor::ISO do
|
|
|
566
575
|
<title>Terms and definitions</title>
|
|
567
576
|
#{TERM_BOILERPLATE}
|
|
568
577
|
<term id="term-term1">
|
|
569
|
-
<preferred>Term1</preferred>
|
|
570
|
-
|
|
578
|
+
<preferred><expression><name>Term1</name></expression></preferred>
|
|
579
|
+
<definition>
|
|
580
|
+
<verbaldefinition>
|
|
581
|
+
<p id='_'>Definition</p>
|
|
582
|
+
</verbaldefinition>
|
|
583
|
+
</definition>
|
|
584
|
+
<termsource status='modified' type='authoritative'>
|
|
571
585
|
<origin bibitemid="ISO2191" citeas="" type="inline">
|
|
572
586
|
<localityStack>
|
|
573
587
|
<locality type="section">
|
|
@@ -607,15 +621,15 @@ RSpec.describe Asciidoctor::ISO do
|
|
|
607
621
|
<title>Terms and definitions</title>
|
|
608
622
|
#{TERM_BOILERPLATE}
|
|
609
623
|
<term id='term-term1'>
|
|
610
|
-
<preferred>Term1</preferred>
|
|
611
|
-
<definition>
|
|
624
|
+
<preferred><expression><name>Term1</name></expression></preferred>
|
|
625
|
+
<definition><verbaldefinition>
|
|
612
626
|
<p id='_'>definition</p>
|
|
613
|
-
</definition>
|
|
627
|
+
</verbaldefinition></definition>
|
|
614
628
|
<term id='term-term11'>
|
|
615
|
-
<preferred>Term11</preferred>
|
|
616
|
-
<definition>
|
|
629
|
+
<preferred><expression><name>Term11</name></expression></preferred>
|
|
630
|
+
<definition><verbaldefinition>
|
|
617
631
|
<p id='_'>definition2</p>
|
|
618
|
-
</definition>
|
|
632
|
+
</verbaldefinition></definition>
|
|
619
633
|
</term>
|
|
620
634
|
</term>
|
|
621
635
|
</terms>
|