metanorma-ogc 1.4.4 → 1.4.5
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/asciidoctor/ogc/isodoc.rng +187 -26
- data/lib/isodoc/ogc/biblio.rb +1 -1
- data/lib/isodoc/ogc/ogc.abstract-specification-topic.xsl +60 -27
- data/lib/isodoc/ogc/ogc.best-practice.xsl +60 -27
- data/lib/isodoc/ogc/ogc.change-request-supporting-document.xsl +60 -27
- data/lib/isodoc/ogc/ogc.community-practice.xsl +60 -27
- data/lib/isodoc/ogc/ogc.community-standard.xsl +60 -27
- data/lib/isodoc/ogc/ogc.discussion-paper.xsl +60 -27
- data/lib/isodoc/ogc/ogc.engineering-report.xsl +60 -27
- data/lib/isodoc/ogc/ogc.other.xsl +60 -27
- data/lib/isodoc/ogc/ogc.policy.xsl +60 -27
- data/lib/isodoc/ogc/ogc.reference-model.xsl +60 -27
- data/lib/isodoc/ogc/ogc.release-notes.xsl +60 -27
- data/lib/isodoc/ogc/ogc.standard.xsl +60 -27
- data/lib/isodoc/ogc/ogc.test-suite.xsl +60 -27
- data/lib/isodoc/ogc/ogc.user-guide.xsl +60 -27
- data/lib/isodoc/ogc/ogc.white-paper.xsl +41 -11
- data/lib/isodoc/ogc/reqt.rb +1 -1
- data/lib/metanorma/ogc/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: 2cb1583cace9a2d58cc458ee480be7385034abb7666d511bcbe1a228908258fe
|
|
4
|
+
data.tar.gz: 882469c7bf396171ad9cd81599d0f9f49c9b591a040968da758fb0d2d7fd600e
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 114c8e43be8dfb2c3d4f088645111f93014b258881f1df9de256a3850e6853f2342acc3bfb8784e48f74e9524f2a3d94c33e0d8a1fc7d7939f76d9c32b4ec1e8
|
|
7
|
+
data.tar.gz: d070f02e1965aeb0c29d61a2010a90af3be5bd7614c31362d01befa59d212b26eb3b65479be5252caf5ab256511a4a66f2d3ed1b1f21b6db19d62aab2e239e87
|
|
@@ -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,52 +1833,210 @@
|
|
|
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
|
+
</choice>
|
|
1889
|
+
<zeroOrMore>
|
|
1890
|
+
<ref name="termsource"/>
|
|
1891
|
+
</zeroOrMore>
|
|
1892
|
+
</define>
|
|
1893
|
+
<define name="letter_symbol_designation">
|
|
1894
|
+
<element name="letter-symbol">
|
|
1847
1895
|
<optional>
|
|
1848
|
-
<attribute name="
|
|
1896
|
+
<attribute name="isInternational">
|
|
1897
|
+
<data type="boolean"/>
|
|
1898
|
+
</attribute>
|
|
1899
|
+
</optional>
|
|
1900
|
+
<element name="name">
|
|
1901
|
+
<oneOrMore>
|
|
1849
1902
|
<choice>
|
|
1850
|
-
<
|
|
1851
|
-
<
|
|
1852
|
-
<value>see</value>
|
|
1903
|
+
<ref name="PureTextElement"/>
|
|
1904
|
+
<ref name="stem"/>
|
|
1853
1905
|
</choice>
|
|
1906
|
+
</oneOrMore>
|
|
1907
|
+
</element>
|
|
1908
|
+
</element>
|
|
1909
|
+
</define>
|
|
1910
|
+
<define name="expression_designation">
|
|
1911
|
+
<element name="expression">
|
|
1912
|
+
<optional>
|
|
1913
|
+
<attribute name="language">
|
|
1914
|
+
<a:documentation>ISO-639</a:documentation>
|
|
1854
1915
|
</attribute>
|
|
1855
1916
|
</optional>
|
|
1856
|
-
<
|
|
1857
|
-
<
|
|
1858
|
-
|
|
1917
|
+
<optional>
|
|
1918
|
+
<attribute name="script">
|
|
1919
|
+
<a:documentation>ISO-15924</a:documentation>
|
|
1920
|
+
</attribute>
|
|
1921
|
+
</optional>
|
|
1922
|
+
<optional>
|
|
1923
|
+
<attribute name="type">
|
|
1924
|
+
<ref name="ExpressionDesignationType"/>
|
|
1925
|
+
</attribute>
|
|
1926
|
+
</optional>
|
|
1927
|
+
<optional>
|
|
1928
|
+
<attribute name="isInternational">
|
|
1929
|
+
<data type="boolean"/>
|
|
1930
|
+
</attribute>
|
|
1931
|
+
</optional>
|
|
1932
|
+
<element name="name">
|
|
1933
|
+
<oneOrMore>
|
|
1934
|
+
<choice>
|
|
1935
|
+
<ref name="PureTextElement"/>
|
|
1936
|
+
<ref name="stem"/>
|
|
1937
|
+
</choice>
|
|
1938
|
+
</oneOrMore>
|
|
1939
|
+
</element>
|
|
1940
|
+
<optional>
|
|
1941
|
+
<element name="abbreviationType">
|
|
1942
|
+
<ref name="AbbreviationType"/>
|
|
1943
|
+
</element>
|
|
1944
|
+
</optional>
|
|
1945
|
+
<optional>
|
|
1946
|
+
<element name="pronunciation">
|
|
1947
|
+
<ref name="LocalizedString"/>
|
|
1948
|
+
</element>
|
|
1949
|
+
</optional>
|
|
1950
|
+
<optional>
|
|
1951
|
+
<element name="grammarInfo">
|
|
1952
|
+
<ref name="Grammar"/>
|
|
1953
|
+
</element>
|
|
1954
|
+
</optional>
|
|
1859
1955
|
</element>
|
|
1860
1956
|
</define>
|
|
1861
|
-
<define name="
|
|
1862
|
-
<
|
|
1957
|
+
<define name="ExpressionDesignationType">
|
|
1958
|
+
<choice>
|
|
1959
|
+
<value>prefix</value>
|
|
1960
|
+
<value>suffix</value>
|
|
1961
|
+
<value>abbreviation</value>
|
|
1962
|
+
<value>full</value>
|
|
1963
|
+
</choice>
|
|
1964
|
+
</define>
|
|
1965
|
+
<define name="AbbreviationType">
|
|
1966
|
+
<choice>
|
|
1967
|
+
<value>truncation</value>
|
|
1968
|
+
<value>acronym</value>
|
|
1969
|
+
<value>initialism</value>
|
|
1970
|
+
</choice>
|
|
1971
|
+
</define>
|
|
1972
|
+
<define name="Grammar">
|
|
1973
|
+
<zeroOrMore>
|
|
1974
|
+
<element name="gender">
|
|
1975
|
+
<ref name="GrammarGender"/>
|
|
1976
|
+
</element>
|
|
1977
|
+
</zeroOrMore>
|
|
1978
|
+
<optional>
|
|
1979
|
+
<element name="isPreposition">
|
|
1980
|
+
<data type="boolean"/>
|
|
1981
|
+
</element>
|
|
1982
|
+
</optional>
|
|
1983
|
+
<optional>
|
|
1984
|
+
<element name="isParticiple">
|
|
1985
|
+
<data type="boolean"/>
|
|
1986
|
+
</element>
|
|
1987
|
+
</optional>
|
|
1988
|
+
<optional>
|
|
1989
|
+
<element name="isAdjective">
|
|
1990
|
+
<data type="boolean"/>
|
|
1991
|
+
</element>
|
|
1992
|
+
</optional>
|
|
1993
|
+
<optional>
|
|
1994
|
+
<element name="isVerb">
|
|
1995
|
+
<data type="boolean"/>
|
|
1996
|
+
</element>
|
|
1997
|
+
</optional>
|
|
1998
|
+
<optional>
|
|
1999
|
+
<element name="isAdverb">
|
|
2000
|
+
<data type="boolean"/>
|
|
2001
|
+
</element>
|
|
2002
|
+
</optional>
|
|
2003
|
+
<optional>
|
|
2004
|
+
<element name="isNoun">
|
|
2005
|
+
<data type="boolean"/>
|
|
2006
|
+
</element>
|
|
2007
|
+
</optional>
|
|
2008
|
+
<zeroOrMore>
|
|
2009
|
+
<element name="grammarvalue">
|
|
2010
|
+
<text/>
|
|
2011
|
+
</element>
|
|
2012
|
+
</zeroOrMore>
|
|
2013
|
+
</define>
|
|
2014
|
+
<define name="GrammarGender">
|
|
2015
|
+
<choice>
|
|
2016
|
+
<value>masculine</value>
|
|
2017
|
+
<value>feminine</value>
|
|
2018
|
+
<value>neuter</value>
|
|
2019
|
+
<value>common</value>
|
|
2020
|
+
</choice>
|
|
2021
|
+
</define>
|
|
2022
|
+
<define name="termdomain">
|
|
2023
|
+
<element name="domain">
|
|
1863
2024
|
<oneOrMore>
|
|
1864
2025
|
<ref name="TextElement"/>
|
|
1865
2026
|
</oneOrMore>
|
|
1866
2027
|
</element>
|
|
1867
2028
|
</define>
|
|
1868
|
-
<define name="
|
|
1869
|
-
<element name="
|
|
2029
|
+
<define name="termsubject">
|
|
2030
|
+
<element name="subject">
|
|
1870
2031
|
<oneOrMore>
|
|
1871
2032
|
<ref name="TextElement"/>
|
|
1872
2033
|
</oneOrMore>
|
|
1873
2034
|
</element>
|
|
1874
2035
|
</define>
|
|
1875
|
-
<define name="
|
|
1876
|
-
<element name="
|
|
2036
|
+
<define name="termusage">
|
|
2037
|
+
<element name="usageinfo">
|
|
1877
2038
|
<oneOrMore>
|
|
1878
|
-
<ref name="
|
|
2039
|
+
<ref name="BasicBlock"/>
|
|
1879
2040
|
</oneOrMore>
|
|
1880
2041
|
</element>
|
|
1881
2042
|
</define>
|
data/lib/isodoc/ogc/biblio.rb
CHANGED
|
@@ -1658,6 +1658,8 @@
|
|
|
1658
1658
|
|
|
1659
1659
|
<title-list-figures lang="en">List of Figures</title-list-figures>
|
|
1660
1660
|
|
|
1661
|
+
<title-table-figures lang="en">Table of Figures</title-table-figures>
|
|
1662
|
+
|
|
1661
1663
|
<title-list-recommendations lang="en">List of Recommendations</title-list-recommendations>
|
|
1662
1664
|
|
|
1663
1665
|
<title-acknowledgements lang="en">Acknowledgements</title-acknowledgements>
|
|
@@ -4562,6 +4564,7 @@
|
|
|
4562
4564
|
<xsl:otherwise>
|
|
4563
4565
|
<fo:block xsl:use-attribute-sets="image-style">
|
|
4564
4566
|
|
|
4567
|
+
|
|
4565
4568
|
<xsl:variable name="src">
|
|
4566
4569
|
<xsl:call-template name="image_src"/>
|
|
4567
4570
|
</xsl:variable>
|
|
@@ -4928,7 +4931,7 @@
|
|
|
4928
4931
|
<xsl:text> </xsl:text>
|
|
4929
4932
|
</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">
|
|
4930
4933
|
<xsl:value-of select="."/>
|
|
4931
|
-
</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']
|
|
4934
|
+
</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">
|
|
4932
4935
|
<xsl:value-of select="."/>
|
|
4933
4936
|
</xsl:template><xsl:template match="node()" mode="contents">
|
|
4934
4937
|
<xsl:apply-templates mode="contents"/>
|
|
@@ -5021,41 +5024,72 @@
|
|
|
5021
5024
|
|
|
5022
5025
|
|
|
5023
5026
|
|
|
5024
|
-
|
|
5025
|
-
|
|
5026
|
-
|
|
5027
|
-
|
|
5027
|
+
|
|
5028
|
+
|
|
5029
|
+
|
|
5030
|
+
|
|
5031
|
+
|
|
5032
|
+
<xsl:variable name="list_of_tables_">
|
|
5033
|
+
<xsl:for-each select="//*[local-name() = 'table'][@id and *[local-name() = 'name'] and contains(*[local-name() = 'name'], '—')]">
|
|
5034
|
+
<table id="{@id}"><xsl:apply-templates select="*[local-name() = 'name']" mode="bookmarks"/></table>
|
|
5035
|
+
</xsl:for-each>
|
|
5036
|
+
</xsl:variable>
|
|
5037
|
+
<xsl:variable name="list_of_tables" select="xalan:nodeset($list_of_tables_)"/>
|
|
5038
|
+
|
|
5039
|
+
<xsl:variable name="list_of_figures_">
|
|
5040
|
+
<xsl:for-each select="//*[local-name() = 'figure'][@id and *[local-name() = 'name'] and contains(*[local-name() = 'name'], '—')]">
|
|
5041
|
+
<figure id="{@id}"><xsl:apply-templates select="*[local-name() = 'name']" mode="bookmarks"/></figure>
|
|
5042
|
+
</xsl:for-each>
|
|
5043
|
+
</xsl:variable>
|
|
5044
|
+
<xsl:variable name="list_of_figures" select="xalan:nodeset($list_of_figures_)"/>
|
|
5045
|
+
|
|
5046
|
+
<xsl:if test="$list_of_tables//table or $list_of_figures/figure or //*[local-name() = 'table'][.//*[local-name() = 'p'][@class = 'RecommendationTitle']]">
|
|
5047
|
+
<fo:bookmark internal-destination="empty_bookmark">
|
|
5048
|
+
<fo:bookmark-title>—————</fo:bookmark-title>
|
|
5049
|
+
</fo:bookmark>
|
|
5050
|
+
</xsl:if>
|
|
5051
|
+
|
|
5052
|
+
<xsl:if test="$list_of_tables//table">
|
|
5053
|
+
<fo:bookmark internal-destination="empty_bookmark" starting-state="hide"> <!-- {$list_of_tables//table[1]/@id} -->
|
|
5054
|
+
<fo:bookmark-title>
|
|
5055
|
+
<xsl:call-template name="getTitle">
|
|
5056
|
+
<xsl:with-param name="name" select="'title-list-tables'"/>
|
|
5057
|
+
</xsl:call-template>
|
|
5058
|
+
</fo:bookmark-title>
|
|
5059
|
+
<xsl:for-each select="$list_of_tables//table">
|
|
5028
5060
|
<fo:bookmark internal-destination="{@id}">
|
|
5029
|
-
<fo:bookmark-title><xsl:
|
|
5061
|
+
<fo:bookmark-title><xsl:value-of select="."/></fo:bookmark-title>
|
|
5030
5062
|
</fo:bookmark>
|
|
5031
5063
|
</xsl:for-each>
|
|
5032
|
-
</fo:bookmark>
|
|
5064
|
+
</fo:bookmark>
|
|
5033
5065
|
</xsl:if>
|
|
5034
|
-
|
|
5035
|
-
|
|
5036
|
-
|
|
5037
|
-
<xsl:if test="//*[local-name() = 'table'][@id and *[local-name() = 'name']]">
|
|
5038
|
-
<fo:bookmark internal-destination="{//*[local-name() = 'table'][@id and *[local-name() = 'name']][1]/@id}" starting-state="hide">
|
|
5066
|
+
|
|
5067
|
+
<xsl:if test="$list_of_figures//figure">
|
|
5068
|
+
<fo:bookmark internal-destination="empty_bookmark" starting-state="hide"> <!-- {$list_of_figures//figure[1]/@id} -->
|
|
5039
5069
|
<fo:bookmark-title>
|
|
5040
|
-
|
|
5041
|
-
<xsl:
|
|
5042
|
-
|
|
5043
|
-
|
|
5070
|
+
|
|
5071
|
+
<xsl:call-template name="getTitle">
|
|
5072
|
+
<xsl:with-param name="name" select="'title-list-figures'"/>
|
|
5073
|
+
</xsl:call-template>
|
|
5074
|
+
|
|
5075
|
+
|
|
5044
5076
|
</fo:bookmark-title>
|
|
5045
|
-
<xsl:for-each select="
|
|
5077
|
+
<xsl:for-each select="$list_of_figures//figure">
|
|
5046
5078
|
<fo:bookmark internal-destination="{@id}">
|
|
5047
|
-
<fo:bookmark-title><xsl:
|
|
5079
|
+
<fo:bookmark-title><xsl:value-of select="."/></fo:bookmark-title>
|
|
5048
5080
|
</fo:bookmark>
|
|
5049
5081
|
</xsl:for-each>
|
|
5050
|
-
</fo:bookmark>
|
|
5082
|
+
</fo:bookmark>
|
|
5051
5083
|
</xsl:if>
|
|
5052
|
-
|
|
5053
|
-
|
|
5054
|
-
|
|
5055
|
-
|
|
5084
|
+
|
|
5085
|
+
|
|
5056
5086
|
<xsl:if test="//*[local-name() = 'table'][.//*[local-name() = 'p'][@class = 'RecommendationTitle']]">
|
|
5057
|
-
<fo:bookmark internal-destination="{//*[local-name() = 'table'][.//*[local-name() = 'p'][@class = 'RecommendationTitle']][1]/@id}
|
|
5058
|
-
<fo:bookmark-title>
|
|
5087
|
+
<fo:bookmark internal-destination="empty_bookmark" starting-state="hide"> <!-- {//*[local-name() = 'table'][.//*[local-name() = 'p'][@class = 'RecommendationTitle']][1]/@id} -->
|
|
5088
|
+
<fo:bookmark-title>
|
|
5089
|
+
<xsl:call-template name="getTitle">
|
|
5090
|
+
<xsl:with-param name="name" select="'title-list-recommendations'"/>
|
|
5091
|
+
</xsl:call-template>
|
|
5092
|
+
</fo:bookmark-title>
|
|
5059
5093
|
<xsl:for-each select="//*[local-name() = 'table'][.//*[local-name() = 'p'][@class = 'RecommendationTitle']]">
|
|
5060
5094
|
<xsl:variable name="table_id" select="@id"/>
|
|
5061
5095
|
<fo:bookmark internal-destination="{@id}">
|
|
@@ -5063,8 +5097,7 @@
|
|
|
5063
5097
|
</fo:bookmark>
|
|
5064
5098
|
</xsl:for-each>
|
|
5065
5099
|
</fo:bookmark>
|
|
5066
|
-
|
|
5067
|
-
</xsl:if>
|
|
5100
|
+
</xsl:if>
|
|
5068
5101
|
|
|
5069
5102
|
|
|
5070
5103
|
|
|
@@ -1658,6 +1658,8 @@
|
|
|
1658
1658
|
|
|
1659
1659
|
<title-list-figures lang="en">List of Figures</title-list-figures>
|
|
1660
1660
|
|
|
1661
|
+
<title-table-figures lang="en">Table of Figures</title-table-figures>
|
|
1662
|
+
|
|
1661
1663
|
<title-list-recommendations lang="en">List of Recommendations</title-list-recommendations>
|
|
1662
1664
|
|
|
1663
1665
|
<title-acknowledgements lang="en">Acknowledgements</title-acknowledgements>
|
|
@@ -4562,6 +4564,7 @@
|
|
|
4562
4564
|
<xsl:otherwise>
|
|
4563
4565
|
<fo:block xsl:use-attribute-sets="image-style">
|
|
4564
4566
|
|
|
4567
|
+
|
|
4565
4568
|
<xsl:variable name="src">
|
|
4566
4569
|
<xsl:call-template name="image_src"/>
|
|
4567
4570
|
</xsl:variable>
|
|
@@ -4928,7 +4931,7 @@
|
|
|
4928
4931
|
<xsl:text> </xsl:text>
|
|
4929
4932
|
</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">
|
|
4930
4933
|
<xsl:value-of select="."/>
|
|
4931
|
-
</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']
|
|
4934
|
+
</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">
|
|
4932
4935
|
<xsl:value-of select="."/>
|
|
4933
4936
|
</xsl:template><xsl:template match="node()" mode="contents">
|
|
4934
4937
|
<xsl:apply-templates mode="contents"/>
|
|
@@ -5021,41 +5024,72 @@
|
|
|
5021
5024
|
|
|
5022
5025
|
|
|
5023
5026
|
|
|
5024
|
-
|
|
5025
|
-
|
|
5026
|
-
|
|
5027
|
-
|
|
5027
|
+
|
|
5028
|
+
|
|
5029
|
+
|
|
5030
|
+
|
|
5031
|
+
|
|
5032
|
+
<xsl:variable name="list_of_tables_">
|
|
5033
|
+
<xsl:for-each select="//*[local-name() = 'table'][@id and *[local-name() = 'name'] and contains(*[local-name() = 'name'], '—')]">
|
|
5034
|
+
<table id="{@id}"><xsl:apply-templates select="*[local-name() = 'name']" mode="bookmarks"/></table>
|
|
5035
|
+
</xsl:for-each>
|
|
5036
|
+
</xsl:variable>
|
|
5037
|
+
<xsl:variable name="list_of_tables" select="xalan:nodeset($list_of_tables_)"/>
|
|
5038
|
+
|
|
5039
|
+
<xsl:variable name="list_of_figures_">
|
|
5040
|
+
<xsl:for-each select="//*[local-name() = 'figure'][@id and *[local-name() = 'name'] and contains(*[local-name() = 'name'], '—')]">
|
|
5041
|
+
<figure id="{@id}"><xsl:apply-templates select="*[local-name() = 'name']" mode="bookmarks"/></figure>
|
|
5042
|
+
</xsl:for-each>
|
|
5043
|
+
</xsl:variable>
|
|
5044
|
+
<xsl:variable name="list_of_figures" select="xalan:nodeset($list_of_figures_)"/>
|
|
5045
|
+
|
|
5046
|
+
<xsl:if test="$list_of_tables//table or $list_of_figures/figure or //*[local-name() = 'table'][.//*[local-name() = 'p'][@class = 'RecommendationTitle']]">
|
|
5047
|
+
<fo:bookmark internal-destination="empty_bookmark">
|
|
5048
|
+
<fo:bookmark-title>—————</fo:bookmark-title>
|
|
5049
|
+
</fo:bookmark>
|
|
5050
|
+
</xsl:if>
|
|
5051
|
+
|
|
5052
|
+
<xsl:if test="$list_of_tables//table">
|
|
5053
|
+
<fo:bookmark internal-destination="empty_bookmark" starting-state="hide"> <!-- {$list_of_tables//table[1]/@id} -->
|
|
5054
|
+
<fo:bookmark-title>
|
|
5055
|
+
<xsl:call-template name="getTitle">
|
|
5056
|
+
<xsl:with-param name="name" select="'title-list-tables'"/>
|
|
5057
|
+
</xsl:call-template>
|
|
5058
|
+
</fo:bookmark-title>
|
|
5059
|
+
<xsl:for-each select="$list_of_tables//table">
|
|
5028
5060
|
<fo:bookmark internal-destination="{@id}">
|
|
5029
|
-
<fo:bookmark-title><xsl:
|
|
5061
|
+
<fo:bookmark-title><xsl:value-of select="."/></fo:bookmark-title>
|
|
5030
5062
|
</fo:bookmark>
|
|
5031
5063
|
</xsl:for-each>
|
|
5032
|
-
</fo:bookmark>
|
|
5064
|
+
</fo:bookmark>
|
|
5033
5065
|
</xsl:if>
|
|
5034
|
-
|
|
5035
|
-
|
|
5036
|
-
|
|
5037
|
-
<xsl:if test="//*[local-name() = 'table'][@id and *[local-name() = 'name']]">
|
|
5038
|
-
<fo:bookmark internal-destination="{//*[local-name() = 'table'][@id and *[local-name() = 'name']][1]/@id}" starting-state="hide">
|
|
5066
|
+
|
|
5067
|
+
<xsl:if test="$list_of_figures//figure">
|
|
5068
|
+
<fo:bookmark internal-destination="empty_bookmark" starting-state="hide"> <!-- {$list_of_figures//figure[1]/@id} -->
|
|
5039
5069
|
<fo:bookmark-title>
|
|
5040
|
-
|
|
5041
|
-
<xsl:
|
|
5042
|
-
|
|
5043
|
-
|
|
5070
|
+
|
|
5071
|
+
<xsl:call-template name="getTitle">
|
|
5072
|
+
<xsl:with-param name="name" select="'title-list-figures'"/>
|
|
5073
|
+
</xsl:call-template>
|
|
5074
|
+
|
|
5075
|
+
|
|
5044
5076
|
</fo:bookmark-title>
|
|
5045
|
-
<xsl:for-each select="
|
|
5077
|
+
<xsl:for-each select="$list_of_figures//figure">
|
|
5046
5078
|
<fo:bookmark internal-destination="{@id}">
|
|
5047
|
-
<fo:bookmark-title><xsl:
|
|
5079
|
+
<fo:bookmark-title><xsl:value-of select="."/></fo:bookmark-title>
|
|
5048
5080
|
</fo:bookmark>
|
|
5049
5081
|
</xsl:for-each>
|
|
5050
|
-
</fo:bookmark>
|
|
5082
|
+
</fo:bookmark>
|
|
5051
5083
|
</xsl:if>
|
|
5052
|
-
|
|
5053
|
-
|
|
5054
|
-
|
|
5055
|
-
|
|
5084
|
+
|
|
5085
|
+
|
|
5056
5086
|
<xsl:if test="//*[local-name() = 'table'][.//*[local-name() = 'p'][@class = 'RecommendationTitle']]">
|
|
5057
|
-
<fo:bookmark internal-destination="{//*[local-name() = 'table'][.//*[local-name() = 'p'][@class = 'RecommendationTitle']][1]/@id}
|
|
5058
|
-
<fo:bookmark-title>
|
|
5087
|
+
<fo:bookmark internal-destination="empty_bookmark" starting-state="hide"> <!-- {//*[local-name() = 'table'][.//*[local-name() = 'p'][@class = 'RecommendationTitle']][1]/@id} -->
|
|
5088
|
+
<fo:bookmark-title>
|
|
5089
|
+
<xsl:call-template name="getTitle">
|
|
5090
|
+
<xsl:with-param name="name" select="'title-list-recommendations'"/>
|
|
5091
|
+
</xsl:call-template>
|
|
5092
|
+
</fo:bookmark-title>
|
|
5059
5093
|
<xsl:for-each select="//*[local-name() = 'table'][.//*[local-name() = 'p'][@class = 'RecommendationTitle']]">
|
|
5060
5094
|
<xsl:variable name="table_id" select="@id"/>
|
|
5061
5095
|
<fo:bookmark internal-destination="{@id}">
|
|
@@ -5063,8 +5097,7 @@
|
|
|
5063
5097
|
</fo:bookmark>
|
|
5064
5098
|
</xsl:for-each>
|
|
5065
5099
|
</fo:bookmark>
|
|
5066
|
-
|
|
5067
|
-
</xsl:if>
|
|
5100
|
+
</xsl:if>
|
|
5068
5101
|
|
|
5069
5102
|
|
|
5070
5103
|
|