metanorma-itu 1.3.13 → 1.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 +4 -4
- data/lib/asciidoctor/itu/isodoc.rng +218 -27
- data/lib/asciidoctor/itu/validate.rb +33 -31
- data/lib/isodoc/itu/itu.implementers-guide.xsl +7 -1
- data/lib/isodoc/itu/itu.in-force.xsl +7 -1
- data/lib/isodoc/itu/itu.recommendation-annex.xsl +7 -1
- data/lib/isodoc/itu/itu.recommendation-supplement.xsl +7 -1
- data/lib/isodoc/itu/itu.recommendation.xsl +7 -1
- data/lib/isodoc/itu/itu.resolution.xsl +7 -1
- data/lib/isodoc/itu/itu.service-publication.xsl +7 -1
- data/lib/isodoc/itu/itu.technical-paper.xsl +7 -1
- data/lib/isodoc/itu/itu.technical-report.xsl +7 -1
- data/lib/isodoc/itu/terms.rb +9 -6
- data/lib/metanorma/itu/version.rb +1 -1
- metadata +3 -3
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 289ed3fed7e3c8d9a52e0de224e73db390c93a2378ae0a25c66d2ff12af255fd
|
|
4
|
+
data.tar.gz: fba11b78fa3488fc1f1ac9642d602e8eafc7bff0d4b9af09bbf929f868f89eb8
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: bf6c0f9873c415a381273594e030864096e5a7a58fd4a9771021fd8dff447abfeea3fa307f51025cf8a2fbb5e4d91da3ac562000ec466c26c82db973a6508da9
|
|
7
|
+
data.tar.gz: fd0be35b3e8a1e280a7098e5966bc3ff3f976708b15ea9bc5a46bf911e36b47d2ccd243eab31a23abfea88f83d0f8b6aebccaaad7052b3d7277d23c70b40093b
|
|
@@ -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>
|
|
@@ -8,18 +8,19 @@ module Asciidoctor
|
|
|
8
8
|
|
|
9
9
|
def doctype_validate(xmldoc)
|
|
10
10
|
doctype = xmldoc&.at("//bibdata/ext/doctype")&.text
|
|
11
|
-
%w(recommendation recommendation-supplement recommendation-amendment
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
11
|
+
%w(recommendation recommendation-supplement recommendation-amendment
|
|
12
|
+
recommendation-corrigendum recommendation-errata recommendation-annex
|
|
13
|
+
focus-group implementers-guide technical-paper technical-report
|
|
14
|
+
joint-itu-iso-iec service-publication).include? doctype or
|
|
15
|
+
@log.add("Document Attributes", nil,
|
|
16
|
+
"#{doctype} is not a recognised document type")
|
|
16
17
|
end
|
|
17
18
|
|
|
18
19
|
def stage_validate(xmldoc)
|
|
19
20
|
stage = xmldoc&.at("//bibdata/status/stage")&.text
|
|
20
|
-
%w(in-force superseded in-force-prepublished withdrawn
|
|
21
|
-
|
|
22
|
-
@log.add("Document Attributes", nil,
|
|
21
|
+
%w(in-force superseded in-force-prepublished withdrawn
|
|
22
|
+
draft).include? stage or
|
|
23
|
+
@log.add("Document Attributes", nil,
|
|
23
24
|
"#{stage} is not a recognised status")
|
|
24
25
|
end
|
|
25
26
|
|
|
@@ -40,12 +41,14 @@ module Asciidoctor
|
|
|
40
41
|
xmldoc.xpath("//bibdata/series/title").each do |s|
|
|
41
42
|
series = s.text.sub(/^[A-Z]: /, "")
|
|
42
43
|
t.downcase.include?(series.downcase) and
|
|
43
|
-
@log.add("Document Attributes", nil,
|
|
44
|
+
@log.add("Document Attributes", nil,
|
|
45
|
+
"Title includes series name #{series}")
|
|
44
46
|
end
|
|
45
47
|
end
|
|
46
48
|
|
|
47
49
|
def extract_text(node)
|
|
48
50
|
return "" if node.nil?
|
|
51
|
+
|
|
49
52
|
node1 = Nokogiri::XML.fragment(node.to_s)
|
|
50
53
|
node1.xpath("//link | //locality | //localityStack").each(&:remove)
|
|
51
54
|
ret = ""
|
|
@@ -58,7 +61,7 @@ module Asciidoctor
|
|
|
58
61
|
xmldoc.xpath("//preface/*").each do |c|
|
|
59
62
|
extract_text(c).split(/\.\s+/).each do |t|
|
|
60
63
|
/\b(shall|must)\b/i.match(t) and
|
|
61
|
-
@log.add("Style", c,
|
|
64
|
+
@log.add("Style", c,
|
|
62
65
|
"Requirement possibly in preface: #{t.strip}")
|
|
63
66
|
end
|
|
64
67
|
end
|
|
@@ -66,17 +69,17 @@ module Asciidoctor
|
|
|
66
69
|
|
|
67
70
|
# Editing Guidelines 9.4.3
|
|
68
71
|
# Supplanted by rendering
|
|
69
|
-
def numbers_validate(xmldoc)
|
|
70
|
-
end
|
|
72
|
+
def numbers_validate(xmldoc); end
|
|
71
73
|
|
|
72
|
-
def style_two_regex_not_prev(
|
|
74
|
+
def style_two_regex_not_prev(node, text, regex, regex_prev, warning)
|
|
73
75
|
return if text.nil?
|
|
76
|
+
|
|
74
77
|
arr = text.split(/\W+/)
|
|
75
78
|
arr.each_index do |i|
|
|
76
|
-
m =
|
|
77
|
-
m_prev = i.zero? ? nil :
|
|
79
|
+
m = regex.match arr[i]
|
|
80
|
+
m_prev = i.zero? ? nil : regex_prev.match(arr[i - 1])
|
|
78
81
|
if !m.nil? && m_prev.nil?
|
|
79
|
-
@log.add("Style",
|
|
82
|
+
@log.add("Style", node, "#{warning}: #{m[:num]}")
|
|
80
83
|
end
|
|
81
84
|
end
|
|
82
85
|
end
|
|
@@ -85,21 +88,19 @@ module Asciidoctor
|
|
|
85
88
|
s = xmldoc.at("//bibdata/ext/recommendationstatus/approvalstage") or
|
|
86
89
|
return
|
|
87
90
|
process = s["process"]
|
|
88
|
-
|
|
89
|
-
@log.add("Document Attributes", nil,
|
|
91
|
+
(process == "aap") && %w(determined in-force).include?(s.text) and
|
|
92
|
+
@log.add("Document Attributes", nil,
|
|
90
93
|
"Recommendation Status #{s.text} inconsistent with AAP")
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
@log.add("Document Attributes", nil,
|
|
94
|
+
(process == "tap") && !%w(determined in-force).include?(s.text) and
|
|
95
|
+
@log.add("Document Attributes", nil,
|
|
94
96
|
"Recommendation Status #{s.text} inconsistent with TAP")
|
|
95
|
-
end
|
|
96
97
|
end
|
|
97
98
|
|
|
98
99
|
def itu_identifier_validate(xmldoc)
|
|
99
|
-
|
|
100
|
+
xmldoc.xpath("//bibdata/docidentifier[@type = 'ITU']").each do |x|
|
|
100
101
|
/^ITU-[RTD] [AD-VX-Z]\.[0-9]+$/.match(x.text) or
|
|
101
102
|
@log.add("Style", nil, "#{x.text} does not match ITU document "\
|
|
102
|
-
|
|
103
|
+
"identifier conventions")
|
|
103
104
|
end
|
|
104
105
|
end
|
|
105
106
|
|
|
@@ -112,8 +113,9 @@ module Asciidoctor
|
|
|
112
113
|
def unnumbered_check(xmldoc)
|
|
113
114
|
doctype = xmldoc&.at("//bibdata/ext/doctype")&.text
|
|
114
115
|
xmldoc.xpath("//clause[@unnumbered = 'true']").each do |c|
|
|
115
|
-
next if doctype == "resolution"
|
|
116
|
+
next if (doctype == "resolution") && (c.parent.name == "sections") &&
|
|
116
117
|
!c.at("./preceding-sibling::clause")
|
|
118
|
+
|
|
117
119
|
@log.add("Style", c, "Unnumbered clause out of place")
|
|
118
120
|
end
|
|
119
121
|
end
|
|
@@ -128,18 +130,18 @@ module Asciidoctor
|
|
|
128
130
|
|
|
129
131
|
def termdef_style(xmldoc)
|
|
130
132
|
xmldoc.xpath("//term").each do |t|
|
|
131
|
-
para = t.at("./definition") || return
|
|
132
|
-
term = t.at("./preferred").text
|
|
133
|
+
para = t.at("./definition/verbaldefinition") || return
|
|
134
|
+
term = t.at("./preferred//name").text
|
|
133
135
|
termdef_warn(term, /^[A-Z][a-z]+/, t, term, "term is not lowercase")
|
|
134
|
-
termdef_warn(para.text, /^[a-z]/, t, term,
|
|
136
|
+
termdef_warn(para.text, /^[a-z]/, t, term,
|
|
135
137
|
"term definition does not start with capital")
|
|
136
|
-
termdef_warn(para.text, /[^.]$/, t, term,
|
|
138
|
+
termdef_warn(para.text, /[^.]$/, t, term,
|
|
137
139
|
"term definition does not end with period")
|
|
138
140
|
end
|
|
139
141
|
end
|
|
140
142
|
|
|
141
|
-
def termdef_warn(text,
|
|
142
|
-
|
|
143
|
+
def termdef_warn(text, regex, node, term, msg)
|
|
144
|
+
regex.match(text) && @log.add("Style", node, "#{term}: #{msg}")
|
|
143
145
|
end
|
|
144
146
|
end
|
|
145
147
|
end
|
|
@@ -2441,6 +2441,8 @@
|
|
|
2441
2441
|
|
|
2442
2442
|
<title-list-figures lang="en">List of Figures</title-list-figures>
|
|
2443
2443
|
|
|
2444
|
+
<title-table-figures lang="en">Table of Figures</title-table-figures>
|
|
2445
|
+
|
|
2444
2446
|
<title-list-recommendations lang="en">List of Recommendations</title-list-recommendations>
|
|
2445
2447
|
|
|
2446
2448
|
<title-acknowledgements lang="en">Acknowledgements</title-acknowledgements>
|
|
@@ -5334,6 +5336,7 @@
|
|
|
5334
5336
|
<xsl:otherwise>
|
|
5335
5337
|
<fo:block xsl:use-attribute-sets="image-style">
|
|
5336
5338
|
|
|
5339
|
+
|
|
5337
5340
|
<xsl:variable name="src">
|
|
5338
5341
|
<xsl:call-template name="image_src"/>
|
|
5339
5342
|
</xsl:variable>
|
|
@@ -5700,7 +5703,7 @@
|
|
|
5700
5703
|
<xsl:text> </xsl:text>
|
|
5701
5704
|
</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">
|
|
5702
5705
|
<xsl:value-of select="."/>
|
|
5703
|
-
</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']
|
|
5706
|
+
</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">
|
|
5704
5707
|
<xsl:value-of select="."/>
|
|
5705
5708
|
</xsl:template><xsl:template match="node()" mode="contents">
|
|
5706
5709
|
<xsl:apply-templates mode="contents"/>
|
|
@@ -5798,6 +5801,8 @@
|
|
|
5798
5801
|
|
|
5799
5802
|
|
|
5800
5803
|
|
|
5804
|
+
|
|
5805
|
+
|
|
5801
5806
|
</fo:bookmark-tree>
|
|
5802
5807
|
</xsl:if>
|
|
5803
5808
|
</xsl:template><xsl:template name="insertFigureBookmarks">
|
|
@@ -6348,6 +6353,7 @@
|
|
|
6348
6353
|
</xsl:choose>
|
|
6349
6354
|
</xsl:template><xsl:template match="*[local-name() = 'termsource']" name="termsource">
|
|
6350
6355
|
<fo:block xsl:use-attribute-sets="termsource-style">
|
|
6356
|
+
|
|
6351
6357
|
<!-- Example: [SOURCE: ISO 5127:2017, 3.1.6.02] -->
|
|
6352
6358
|
<xsl:variable name="termsource_text">
|
|
6353
6359
|
<xsl:apply-templates/>
|
|
@@ -2441,6 +2441,8 @@
|
|
|
2441
2441
|
|
|
2442
2442
|
<title-list-figures lang="en">List of Figures</title-list-figures>
|
|
2443
2443
|
|
|
2444
|
+
<title-table-figures lang="en">Table of Figures</title-table-figures>
|
|
2445
|
+
|
|
2444
2446
|
<title-list-recommendations lang="en">List of Recommendations</title-list-recommendations>
|
|
2445
2447
|
|
|
2446
2448
|
<title-acknowledgements lang="en">Acknowledgements</title-acknowledgements>
|
|
@@ -5334,6 +5336,7 @@
|
|
|
5334
5336
|
<xsl:otherwise>
|
|
5335
5337
|
<fo:block xsl:use-attribute-sets="image-style">
|
|
5336
5338
|
|
|
5339
|
+
|
|
5337
5340
|
<xsl:variable name="src">
|
|
5338
5341
|
<xsl:call-template name="image_src"/>
|
|
5339
5342
|
</xsl:variable>
|
|
@@ -5700,7 +5703,7 @@
|
|
|
5700
5703
|
<xsl:text> </xsl:text>
|
|
5701
5704
|
</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">
|
|
5702
5705
|
<xsl:value-of select="."/>
|
|
5703
|
-
</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']
|
|
5706
|
+
</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">
|
|
5704
5707
|
<xsl:value-of select="."/>
|
|
5705
5708
|
</xsl:template><xsl:template match="node()" mode="contents">
|
|
5706
5709
|
<xsl:apply-templates mode="contents"/>
|
|
@@ -5798,6 +5801,8 @@
|
|
|
5798
5801
|
|
|
5799
5802
|
|
|
5800
5803
|
|
|
5804
|
+
|
|
5805
|
+
|
|
5801
5806
|
</fo:bookmark-tree>
|
|
5802
5807
|
</xsl:if>
|
|
5803
5808
|
</xsl:template><xsl:template name="insertFigureBookmarks">
|
|
@@ -6348,6 +6353,7 @@
|
|
|
6348
6353
|
</xsl:choose>
|
|
6349
6354
|
</xsl:template><xsl:template match="*[local-name() = 'termsource']" name="termsource">
|
|
6350
6355
|
<fo:block xsl:use-attribute-sets="termsource-style">
|
|
6356
|
+
|
|
6351
6357
|
<!-- Example: [SOURCE: ISO 5127:2017, 3.1.6.02] -->
|
|
6352
6358
|
<xsl:variable name="termsource_text">
|
|
6353
6359
|
<xsl:apply-templates/>
|
|
@@ -2441,6 +2441,8 @@
|
|
|
2441
2441
|
|
|
2442
2442
|
<title-list-figures lang="en">List of Figures</title-list-figures>
|
|
2443
2443
|
|
|
2444
|
+
<title-table-figures lang="en">Table of Figures</title-table-figures>
|
|
2445
|
+
|
|
2444
2446
|
<title-list-recommendations lang="en">List of Recommendations</title-list-recommendations>
|
|
2445
2447
|
|
|
2446
2448
|
<title-acknowledgements lang="en">Acknowledgements</title-acknowledgements>
|
|
@@ -5334,6 +5336,7 @@
|
|
|
5334
5336
|
<xsl:otherwise>
|
|
5335
5337
|
<fo:block xsl:use-attribute-sets="image-style">
|
|
5336
5338
|
|
|
5339
|
+
|
|
5337
5340
|
<xsl:variable name="src">
|
|
5338
5341
|
<xsl:call-template name="image_src"/>
|
|
5339
5342
|
</xsl:variable>
|
|
@@ -5700,7 +5703,7 @@
|
|
|
5700
5703
|
<xsl:text> </xsl:text>
|
|
5701
5704
|
</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">
|
|
5702
5705
|
<xsl:value-of select="."/>
|
|
5703
|
-
</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']
|
|
5706
|
+
</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">
|
|
5704
5707
|
<xsl:value-of select="."/>
|
|
5705
5708
|
</xsl:template><xsl:template match="node()" mode="contents">
|
|
5706
5709
|
<xsl:apply-templates mode="contents"/>
|
|
@@ -5798,6 +5801,8 @@
|
|
|
5798
5801
|
|
|
5799
5802
|
|
|
5800
5803
|
|
|
5804
|
+
|
|
5805
|
+
|
|
5801
5806
|
</fo:bookmark-tree>
|
|
5802
5807
|
</xsl:if>
|
|
5803
5808
|
</xsl:template><xsl:template name="insertFigureBookmarks">
|
|
@@ -6348,6 +6353,7 @@
|
|
|
6348
6353
|
</xsl:choose>
|
|
6349
6354
|
</xsl:template><xsl:template match="*[local-name() = 'termsource']" name="termsource">
|
|
6350
6355
|
<fo:block xsl:use-attribute-sets="termsource-style">
|
|
6356
|
+
|
|
6351
6357
|
<!-- Example: [SOURCE: ISO 5127:2017, 3.1.6.02] -->
|
|
6352
6358
|
<xsl:variable name="termsource_text">
|
|
6353
6359
|
<xsl:apply-templates/>
|
|
@@ -2441,6 +2441,8 @@
|
|
|
2441
2441
|
|
|
2442
2442
|
<title-list-figures lang="en">List of Figures</title-list-figures>
|
|
2443
2443
|
|
|
2444
|
+
<title-table-figures lang="en">Table of Figures</title-table-figures>
|
|
2445
|
+
|
|
2444
2446
|
<title-list-recommendations lang="en">List of Recommendations</title-list-recommendations>
|
|
2445
2447
|
|
|
2446
2448
|
<title-acknowledgements lang="en">Acknowledgements</title-acknowledgements>
|
|
@@ -5334,6 +5336,7 @@
|
|
|
5334
5336
|
<xsl:otherwise>
|
|
5335
5337
|
<fo:block xsl:use-attribute-sets="image-style">
|
|
5336
5338
|
|
|
5339
|
+
|
|
5337
5340
|
<xsl:variable name="src">
|
|
5338
5341
|
<xsl:call-template name="image_src"/>
|
|
5339
5342
|
</xsl:variable>
|
|
@@ -5700,7 +5703,7 @@
|
|
|
5700
5703
|
<xsl:text> </xsl:text>
|
|
5701
5704
|
</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">
|
|
5702
5705
|
<xsl:value-of select="."/>
|
|
5703
|
-
</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']
|
|
5706
|
+
</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">
|
|
5704
5707
|
<xsl:value-of select="."/>
|
|
5705
5708
|
</xsl:template><xsl:template match="node()" mode="contents">
|
|
5706
5709
|
<xsl:apply-templates mode="contents"/>
|
|
@@ -5798,6 +5801,8 @@
|
|
|
5798
5801
|
|
|
5799
5802
|
|
|
5800
5803
|
|
|
5804
|
+
|
|
5805
|
+
|
|
5801
5806
|
</fo:bookmark-tree>
|
|
5802
5807
|
</xsl:if>
|
|
5803
5808
|
</xsl:template><xsl:template name="insertFigureBookmarks">
|
|
@@ -6348,6 +6353,7 @@
|
|
|
6348
6353
|
</xsl:choose>
|
|
6349
6354
|
</xsl:template><xsl:template match="*[local-name() = 'termsource']" name="termsource">
|
|
6350
6355
|
<fo:block xsl:use-attribute-sets="termsource-style">
|
|
6356
|
+
|
|
6351
6357
|
<!-- Example: [SOURCE: ISO 5127:2017, 3.1.6.02] -->
|
|
6352
6358
|
<xsl:variable name="termsource_text">
|
|
6353
6359
|
<xsl:apply-templates/>
|
|
@@ -2441,6 +2441,8 @@
|
|
|
2441
2441
|
|
|
2442
2442
|
<title-list-figures lang="en">List of Figures</title-list-figures>
|
|
2443
2443
|
|
|
2444
|
+
<title-table-figures lang="en">Table of Figures</title-table-figures>
|
|
2445
|
+
|
|
2444
2446
|
<title-list-recommendations lang="en">List of Recommendations</title-list-recommendations>
|
|
2445
2447
|
|
|
2446
2448
|
<title-acknowledgements lang="en">Acknowledgements</title-acknowledgements>
|
|
@@ -5334,6 +5336,7 @@
|
|
|
5334
5336
|
<xsl:otherwise>
|
|
5335
5337
|
<fo:block xsl:use-attribute-sets="image-style">
|
|
5336
5338
|
|
|
5339
|
+
|
|
5337
5340
|
<xsl:variable name="src">
|
|
5338
5341
|
<xsl:call-template name="image_src"/>
|
|
5339
5342
|
</xsl:variable>
|
|
@@ -5700,7 +5703,7 @@
|
|
|
5700
5703
|
<xsl:text> </xsl:text>
|
|
5701
5704
|
</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">
|
|
5702
5705
|
<xsl:value-of select="."/>
|
|
5703
|
-
</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']
|
|
5706
|
+
</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">
|
|
5704
5707
|
<xsl:value-of select="."/>
|
|
5705
5708
|
</xsl:template><xsl:template match="node()" mode="contents">
|
|
5706
5709
|
<xsl:apply-templates mode="contents"/>
|
|
@@ -5798,6 +5801,8 @@
|
|
|
5798
5801
|
|
|
5799
5802
|
|
|
5800
5803
|
|
|
5804
|
+
|
|
5805
|
+
|
|
5801
5806
|
</fo:bookmark-tree>
|
|
5802
5807
|
</xsl:if>
|
|
5803
5808
|
</xsl:template><xsl:template name="insertFigureBookmarks">
|
|
@@ -6348,6 +6353,7 @@
|
|
|
6348
6353
|
</xsl:choose>
|
|
6349
6354
|
</xsl:template><xsl:template match="*[local-name() = 'termsource']" name="termsource">
|
|
6350
6355
|
<fo:block xsl:use-attribute-sets="termsource-style">
|
|
6356
|
+
|
|
6351
6357
|
<!-- Example: [SOURCE: ISO 5127:2017, 3.1.6.02] -->
|
|
6352
6358
|
<xsl:variable name="termsource_text">
|
|
6353
6359
|
<xsl:apply-templates/>
|
|
@@ -2441,6 +2441,8 @@
|
|
|
2441
2441
|
|
|
2442
2442
|
<title-list-figures lang="en">List of Figures</title-list-figures>
|
|
2443
2443
|
|
|
2444
|
+
<title-table-figures lang="en">Table of Figures</title-table-figures>
|
|
2445
|
+
|
|
2444
2446
|
<title-list-recommendations lang="en">List of Recommendations</title-list-recommendations>
|
|
2445
2447
|
|
|
2446
2448
|
<title-acknowledgements lang="en">Acknowledgements</title-acknowledgements>
|
|
@@ -5334,6 +5336,7 @@
|
|
|
5334
5336
|
<xsl:otherwise>
|
|
5335
5337
|
<fo:block xsl:use-attribute-sets="image-style">
|
|
5336
5338
|
|
|
5339
|
+
|
|
5337
5340
|
<xsl:variable name="src">
|
|
5338
5341
|
<xsl:call-template name="image_src"/>
|
|
5339
5342
|
</xsl:variable>
|
|
@@ -5700,7 +5703,7 @@
|
|
|
5700
5703
|
<xsl:text> </xsl:text>
|
|
5701
5704
|
</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">
|
|
5702
5705
|
<xsl:value-of select="."/>
|
|
5703
|
-
</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']
|
|
5706
|
+
</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">
|
|
5704
5707
|
<xsl:value-of select="."/>
|
|
5705
5708
|
</xsl:template><xsl:template match="node()" mode="contents">
|
|
5706
5709
|
<xsl:apply-templates mode="contents"/>
|
|
@@ -5798,6 +5801,8 @@
|
|
|
5798
5801
|
|
|
5799
5802
|
|
|
5800
5803
|
|
|
5804
|
+
|
|
5805
|
+
|
|
5801
5806
|
</fo:bookmark-tree>
|
|
5802
5807
|
</xsl:if>
|
|
5803
5808
|
</xsl:template><xsl:template name="insertFigureBookmarks">
|
|
@@ -6348,6 +6353,7 @@
|
|
|
6348
6353
|
</xsl:choose>
|
|
6349
6354
|
</xsl:template><xsl:template match="*[local-name() = 'termsource']" name="termsource">
|
|
6350
6355
|
<fo:block xsl:use-attribute-sets="termsource-style">
|
|
6356
|
+
|
|
6351
6357
|
<!-- Example: [SOURCE: ISO 5127:2017, 3.1.6.02] -->
|
|
6352
6358
|
<xsl:variable name="termsource_text">
|
|
6353
6359
|
<xsl:apply-templates/>
|
|
@@ -2441,6 +2441,8 @@
|
|
|
2441
2441
|
|
|
2442
2442
|
<title-list-figures lang="en">List of Figures</title-list-figures>
|
|
2443
2443
|
|
|
2444
|
+
<title-table-figures lang="en">Table of Figures</title-table-figures>
|
|
2445
|
+
|
|
2444
2446
|
<title-list-recommendations lang="en">List of Recommendations</title-list-recommendations>
|
|
2445
2447
|
|
|
2446
2448
|
<title-acknowledgements lang="en">Acknowledgements</title-acknowledgements>
|
|
@@ -5334,6 +5336,7 @@
|
|
|
5334
5336
|
<xsl:otherwise>
|
|
5335
5337
|
<fo:block xsl:use-attribute-sets="image-style">
|
|
5336
5338
|
|
|
5339
|
+
|
|
5337
5340
|
<xsl:variable name="src">
|
|
5338
5341
|
<xsl:call-template name="image_src"/>
|
|
5339
5342
|
</xsl:variable>
|
|
@@ -5700,7 +5703,7 @@
|
|
|
5700
5703
|
<xsl:text> </xsl:text>
|
|
5701
5704
|
</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">
|
|
5702
5705
|
<xsl:value-of select="."/>
|
|
5703
|
-
</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']
|
|
5706
|
+
</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">
|
|
5704
5707
|
<xsl:value-of select="."/>
|
|
5705
5708
|
</xsl:template><xsl:template match="node()" mode="contents">
|
|
5706
5709
|
<xsl:apply-templates mode="contents"/>
|
|
@@ -5798,6 +5801,8 @@
|
|
|
5798
5801
|
|
|
5799
5802
|
|
|
5800
5803
|
|
|
5804
|
+
|
|
5805
|
+
|
|
5801
5806
|
</fo:bookmark-tree>
|
|
5802
5807
|
</xsl:if>
|
|
5803
5808
|
</xsl:template><xsl:template name="insertFigureBookmarks">
|
|
@@ -6348,6 +6353,7 @@
|
|
|
6348
6353
|
</xsl:choose>
|
|
6349
6354
|
</xsl:template><xsl:template match="*[local-name() = 'termsource']" name="termsource">
|
|
6350
6355
|
<fo:block xsl:use-attribute-sets="termsource-style">
|
|
6356
|
+
|
|
6351
6357
|
<!-- Example: [SOURCE: ISO 5127:2017, 3.1.6.02] -->
|
|
6352
6358
|
<xsl:variable name="termsource_text">
|
|
6353
6359
|
<xsl:apply-templates/>
|
|
@@ -2441,6 +2441,8 @@
|
|
|
2441
2441
|
|
|
2442
2442
|
<title-list-figures lang="en">List of Figures</title-list-figures>
|
|
2443
2443
|
|
|
2444
|
+
<title-table-figures lang="en">Table of Figures</title-table-figures>
|
|
2445
|
+
|
|
2444
2446
|
<title-list-recommendations lang="en">List of Recommendations</title-list-recommendations>
|
|
2445
2447
|
|
|
2446
2448
|
<title-acknowledgements lang="en">Acknowledgements</title-acknowledgements>
|
|
@@ -5334,6 +5336,7 @@
|
|
|
5334
5336
|
<xsl:otherwise>
|
|
5335
5337
|
<fo:block xsl:use-attribute-sets="image-style">
|
|
5336
5338
|
|
|
5339
|
+
|
|
5337
5340
|
<xsl:variable name="src">
|
|
5338
5341
|
<xsl:call-template name="image_src"/>
|
|
5339
5342
|
</xsl:variable>
|
|
@@ -5700,7 +5703,7 @@
|
|
|
5700
5703
|
<xsl:text> </xsl:text>
|
|
5701
5704
|
</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">
|
|
5702
5705
|
<xsl:value-of select="."/>
|
|
5703
|
-
</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']
|
|
5706
|
+
</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">
|
|
5704
5707
|
<xsl:value-of select="."/>
|
|
5705
5708
|
</xsl:template><xsl:template match="node()" mode="contents">
|
|
5706
5709
|
<xsl:apply-templates mode="contents"/>
|
|
@@ -5798,6 +5801,8 @@
|
|
|
5798
5801
|
|
|
5799
5802
|
|
|
5800
5803
|
|
|
5804
|
+
|
|
5805
|
+
|
|
5801
5806
|
</fo:bookmark-tree>
|
|
5802
5807
|
</xsl:if>
|
|
5803
5808
|
</xsl:template><xsl:template name="insertFigureBookmarks">
|
|
@@ -6348,6 +6353,7 @@
|
|
|
6348
6353
|
</xsl:choose>
|
|
6349
6354
|
</xsl:template><xsl:template match="*[local-name() = 'termsource']" name="termsource">
|
|
6350
6355
|
<fo:block xsl:use-attribute-sets="termsource-style">
|
|
6356
|
+
|
|
6351
6357
|
<!-- Example: [SOURCE: ISO 5127:2017, 3.1.6.02] -->
|
|
6352
6358
|
<xsl:variable name="termsource_text">
|
|
6353
6359
|
<xsl:apply-templates/>
|
|
@@ -2441,6 +2441,8 @@
|
|
|
2441
2441
|
|
|
2442
2442
|
<title-list-figures lang="en">List of Figures</title-list-figures>
|
|
2443
2443
|
|
|
2444
|
+
<title-table-figures lang="en">Table of Figures</title-table-figures>
|
|
2445
|
+
|
|
2444
2446
|
<title-list-recommendations lang="en">List of Recommendations</title-list-recommendations>
|
|
2445
2447
|
|
|
2446
2448
|
<title-acknowledgements lang="en">Acknowledgements</title-acknowledgements>
|
|
@@ -5334,6 +5336,7 @@
|
|
|
5334
5336
|
<xsl:otherwise>
|
|
5335
5337
|
<fo:block xsl:use-attribute-sets="image-style">
|
|
5336
5338
|
|
|
5339
|
+
|
|
5337
5340
|
<xsl:variable name="src">
|
|
5338
5341
|
<xsl:call-template name="image_src"/>
|
|
5339
5342
|
</xsl:variable>
|
|
@@ -5700,7 +5703,7 @@
|
|
|
5700
5703
|
<xsl:text> </xsl:text>
|
|
5701
5704
|
</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">
|
|
5702
5705
|
<xsl:value-of select="."/>
|
|
5703
|
-
</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']
|
|
5706
|
+
</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">
|
|
5704
5707
|
<xsl:value-of select="."/>
|
|
5705
5708
|
</xsl:template><xsl:template match="node()" mode="contents">
|
|
5706
5709
|
<xsl:apply-templates mode="contents"/>
|
|
@@ -5798,6 +5801,8 @@
|
|
|
5798
5801
|
|
|
5799
5802
|
|
|
5800
5803
|
|
|
5804
|
+
|
|
5805
|
+
|
|
5801
5806
|
</fo:bookmark-tree>
|
|
5802
5807
|
</xsl:if>
|
|
5803
5808
|
</xsl:template><xsl:template name="insertFigureBookmarks">
|
|
@@ -6348,6 +6353,7 @@
|
|
|
6348
6353
|
</xsl:choose>
|
|
6349
6354
|
</xsl:template><xsl:template match="*[local-name() = 'termsource']" name="termsource">
|
|
6350
6355
|
<fo:block xsl:use-attribute-sets="termsource-style">
|
|
6356
|
+
|
|
6351
6357
|
<!-- Example: [SOURCE: ISO 5127:2017, 3.1.6.02] -->
|
|
6352
6358
|
<xsl:variable name="termsource_text">
|
|
6353
6359
|
<xsl:apply-templates/>
|
data/lib/isodoc/itu/terms.rb
CHANGED
|
@@ -11,7 +11,7 @@ module IsoDoc
|
|
|
11
11
|
p << ": "
|
|
12
12
|
source and p << "#{bracket_opt(source.value)} "
|
|
13
13
|
end
|
|
14
|
-
defn
|
|
14
|
+
defn&.children&.each { |n| parse(n, div) }
|
|
15
15
|
end
|
|
16
16
|
|
|
17
17
|
def termdef_parse(node, out)
|
|
@@ -21,16 +21,19 @@ module IsoDoc
|
|
|
21
21
|
termdef_parse1(node, div, defn, source)
|
|
22
22
|
set_termdomain("")
|
|
23
23
|
node.children.each do |n|
|
|
24
|
-
next if %w(preferred definition termsource title
|
|
24
|
+
next if %w(preferred definition termsource title
|
|
25
|
+
name).include? n.name
|
|
26
|
+
|
|
25
27
|
parse(n, out)
|
|
26
28
|
end
|
|
27
29
|
end
|
|
28
30
|
end
|
|
29
31
|
|
|
30
|
-
def bracket_opt(
|
|
31
|
-
return
|
|
32
|
-
return
|
|
33
|
-
|
|
32
|
+
def bracket_opt(text)
|
|
33
|
+
return text if text.nil?
|
|
34
|
+
return text if /^\[.+\]$/.match?(text)
|
|
35
|
+
|
|
36
|
+
"[#{text}]"
|
|
34
37
|
end
|
|
35
38
|
|
|
36
39
|
def termnote_delim
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: metanorma-itu
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.
|
|
4
|
+
version: 1.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
|
+
date: 2021-10-25 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: htmlentities
|
|
@@ -370,7 +370,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
370
370
|
- !ruby/object:Gem::Version
|
|
371
371
|
version: '0'
|
|
372
372
|
requirements: []
|
|
373
|
-
rubygems_version: 3.
|
|
373
|
+
rubygems_version: 3.2.22
|
|
374
374
|
signing_key:
|
|
375
375
|
specification_version: 4
|
|
376
376
|
summary: Metanorma for the ITU
|