metanorma-ogc 1.3.3 → 1.3.4
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/workflows/rake.yml +12 -11
- data/.hound.yml +3 -1
- data/.rubocop.yml +3 -5
- data/lib/asciidoctor/ogc/isodoc.rng +16 -0
- data/lib/asciidoctor/ogc/ogc.rng +12 -14
- data/lib/isodoc/ogc/ogc.abstract-specification-topic.xsl +44 -9
- data/lib/isodoc/ogc/ogc.best-practice.xsl +44 -9
- data/lib/isodoc/ogc/ogc.change-request-supporting-document.xsl +44 -9
- data/lib/isodoc/ogc/ogc.community-practice.xsl +44 -9
- data/lib/isodoc/ogc/ogc.community-standard.xsl +44 -9
- data/lib/isodoc/ogc/ogc.discussion-paper.xsl +44 -9
- data/lib/isodoc/ogc/ogc.engineering-report.xsl +44 -9
- data/lib/isodoc/ogc/ogc.other.xsl +44 -9
- data/lib/isodoc/ogc/ogc.policy.xsl +44 -9
- data/lib/isodoc/ogc/ogc.reference-model.xsl +44 -9
- data/lib/isodoc/ogc/ogc.release-notes.xsl +44 -9
- data/lib/isodoc/ogc/ogc.standard.xsl +44 -9
- data/lib/isodoc/ogc/ogc.test-suite.xsl +44 -9
- data/lib/isodoc/ogc/ogc.user-guide.xsl +44 -9
- data/lib/isodoc/ogc/ogc.white-paper.xsl +44 -9
- data/lib/metanorma/ogc/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 81ed0dec50afce67f2d5b901a85ef55b241d47fe1db7bd8114626b1bf4ef5605
|
4
|
+
data.tar.gz: d48a1c18a0827649c3eb5593850894351c8d2d7a4ae11a2952b9a1e177a1318e
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: d4fe28bc39e3230bfaacc19e74ef2bcc2ba9a87e4bb877800b317b3b70d9c1cfc4cf8d70f1ee82253c244fd88a0997dea6530f35f055117320e1262b12985c4c
|
7
|
+
data.tar.gz: b70c19972e82141c8ea88a6a376db9fa4537cbcd88330bc713b80f61786eeee55c04f89a0955e6b4306bfbf31e0a5082be30f228cb6613b3c6a305eee7e2e5e4
|
data/.github/workflows/rake.yml
CHANGED
@@ -16,19 +16,9 @@ jobs:
|
|
16
16
|
strategy:
|
17
17
|
fail-fast: false
|
18
18
|
matrix:
|
19
|
-
ruby: [ '2.7', '2.6', '2.5', '2.4' ]
|
19
|
+
ruby: [ '3.0', '2.7', '2.6', '2.5', '2.4' ]
|
20
20
|
os: [ ubuntu-latest, windows-latest, macos-latest ]
|
21
21
|
experimental: [ false ]
|
22
|
-
include:
|
23
|
-
- ruby: '3.0'
|
24
|
-
os: 'ubuntu-latest'
|
25
|
-
experimental: true
|
26
|
-
- ruby: '3.0'
|
27
|
-
os: 'windows-latest'
|
28
|
-
experimental: true
|
29
|
-
- ruby: '3.0'
|
30
|
-
os: 'macos-latest'
|
31
|
-
experimental: true
|
32
22
|
steps:
|
33
23
|
- uses: actions/checkout@v2
|
34
24
|
with:
|
@@ -40,3 +30,14 @@ jobs:
|
|
40
30
|
bundler-cache: true
|
41
31
|
|
42
32
|
- run: bundle exec rake
|
33
|
+
|
34
|
+
tests-passed:
|
35
|
+
needs: rake
|
36
|
+
runs-on: ubuntu-latest
|
37
|
+
steps:
|
38
|
+
- uses: peter-evans/repository-dispatch@v1
|
39
|
+
with:
|
40
|
+
token: ${{ secrets.METANORMA_CI_PAT_TOKEN || secrets.GITHUB_TOKEN }}
|
41
|
+
repository: ${{ github.repository }}
|
42
|
+
event-type: tests-passed
|
43
|
+
client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}"}'
|
data/.hound.yml
CHANGED
data/.rubocop.yml
CHANGED
@@ -1,12 +1,10 @@
|
|
1
|
-
#
|
2
|
-
# https://github.com/
|
3
|
-
# All project-specific additions and overrides should be specified in this file.
|
1
|
+
# Auto-generated by Cimas: Do not edit it manually!
|
2
|
+
# See https://github.com/metanorma/cimas
|
4
3
|
inherit_from:
|
5
4
|
- https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
|
6
5
|
|
7
6
|
# local repo-specific modifications
|
7
|
+
# ...
|
8
8
|
|
9
9
|
AllCops:
|
10
|
-
DisplayCopNames: false
|
11
|
-
StyleGuideCopsOnly: false
|
12
10
|
TargetRubyVersion: 2.4
|
@@ -45,6 +45,11 @@
|
|
45
45
|
<optional>
|
46
46
|
<attribute name="alt"/>
|
47
47
|
</optional>
|
48
|
+
<optional>
|
49
|
+
<attribute name="updatetype">
|
50
|
+
<data type="boolean"/>
|
51
|
+
</attribute>
|
52
|
+
</optional>
|
48
53
|
<text/>
|
49
54
|
</element>
|
50
55
|
</define>
|
@@ -543,6 +548,9 @@
|
|
543
548
|
</define>
|
544
549
|
<define name="BibDataExtensionType">
|
545
550
|
<ref name="doctype"/>
|
551
|
+
<optional>
|
552
|
+
<ref name="docsubtype"/>
|
553
|
+
</optional>
|
546
554
|
<optional>
|
547
555
|
<ref name="editorialgroup"/>
|
548
556
|
</optional>
|
@@ -890,6 +898,14 @@
|
|
890
898
|
</define>
|
891
899
|
</include>
|
892
900
|
<!-- end overrides -->
|
901
|
+
<define name="docsubtype">
|
902
|
+
<element name="docsubtype">
|
903
|
+
<ref name="DocumentSubtype"/>
|
904
|
+
</element>
|
905
|
+
</define>
|
906
|
+
<define name="DocumentSubtype">
|
907
|
+
<text/>
|
908
|
+
</define>
|
893
909
|
<define name="colgroup">
|
894
910
|
<element name="colgroup">
|
895
911
|
<oneOrMore>
|
data/lib/asciidoctor/ogc/ogc.rng
CHANGED
@@ -79,20 +79,18 @@
|
|
79
79
|
</zeroOrMore>
|
80
80
|
</element>
|
81
81
|
</define>
|
82
|
-
<define name="
|
83
|
-
<
|
84
|
-
<
|
85
|
-
|
86
|
-
|
87
|
-
|
88
|
-
|
89
|
-
|
90
|
-
|
91
|
-
|
92
|
-
|
93
|
-
|
94
|
-
</choice>
|
95
|
-
</element>
|
82
|
+
<define name="DocumentSubtype">
|
83
|
+
<choice>
|
84
|
+
<value>conceptual-model</value>
|
85
|
+
<value>conceptual-model-and-encoding</value>
|
86
|
+
<value>conceptual-model-and-implementation</value>
|
87
|
+
<value>encoding</value>
|
88
|
+
<value>extension</value>
|
89
|
+
<value>implementation</value>
|
90
|
+
<value>profile</value>
|
91
|
+
<value>profile-with-extension</value>
|
92
|
+
<value>general</value>
|
93
|
+
</choice>
|
96
94
|
</define>
|
97
95
|
<define name="submitters">
|
98
96
|
<element name="submitters">
|
@@ -1628,6 +1628,7 @@
|
|
1628
1628
|
|
1629
1629
|
|
1630
1630
|
|
1631
|
+
|
1631
1632
|
<!-- <xsl:attribute name="color">rgb(33, 55, 92)</xsl:attribute> -->
|
1632
1633
|
<xsl:attribute name="text-decoration">underline</xsl:attribute>
|
1633
1634
|
|
@@ -1735,6 +1736,7 @@
|
|
1735
1736
|
|
1736
1737
|
|
1737
1738
|
|
1739
|
+
|
1738
1740
|
</xsl:attribute-set><xsl:attribute-set name="example-body-style">
|
1739
1741
|
|
1740
1742
|
|
@@ -1754,9 +1756,7 @@
|
|
1754
1756
|
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
1755
1757
|
|
1756
1758
|
|
1757
|
-
|
1758
|
-
|
1759
|
-
|
1759
|
+
|
1760
1760
|
|
1761
1761
|
|
1762
1762
|
|
@@ -1805,6 +1805,7 @@
|
|
1805
1805
|
|
1806
1806
|
|
1807
1807
|
|
1808
|
+
|
1808
1809
|
</xsl:attribute-set><xsl:attribute-set name="appendix-style">
|
1809
1810
|
|
1810
1811
|
<xsl:attribute name="font-size">12pt</xsl:attribute>
|
@@ -1828,12 +1829,14 @@
|
|
1828
1829
|
|
1829
1830
|
|
1830
1831
|
|
1832
|
+
|
1831
1833
|
</xsl:attribute-set><xsl:attribute-set name="eref-style">
|
1832
1834
|
|
1833
1835
|
|
1834
1836
|
|
1835
1837
|
|
1836
1838
|
|
1839
|
+
|
1837
1840
|
</xsl:attribute-set><xsl:attribute-set name="note-style">
|
1838
1841
|
|
1839
1842
|
|
@@ -1933,11 +1936,13 @@
|
|
1933
1936
|
|
1934
1937
|
|
1935
1938
|
|
1939
|
+
|
1936
1940
|
</xsl:attribute-set><xsl:attribute-set name="origin-style">
|
1937
1941
|
|
1938
1942
|
|
1939
1943
|
|
1940
1944
|
|
1945
|
+
|
1941
1946
|
</xsl:attribute-set><xsl:attribute-set name="term-style">
|
1942
1947
|
|
1943
1948
|
</xsl:attribute-set><xsl:attribute-set name="figure-name-style">
|
@@ -2010,8 +2015,10 @@
|
|
2010
2015
|
<xsl:attribute name="font-size">11pt</xsl:attribute>
|
2011
2016
|
|
2012
2017
|
|
2018
|
+
|
2013
2019
|
</xsl:attribute-set><xsl:attribute-set name="deprecates-style">
|
2014
2020
|
|
2021
|
+
|
2015
2022
|
</xsl:attribute-set><xsl:attribute-set name="definition-style">
|
2016
2023
|
|
2017
2024
|
<xsl:attribute name="space-after">6pt</xsl:attribute>
|
@@ -2790,6 +2797,7 @@
|
|
2790
2797
|
|
2791
2798
|
|
2792
2799
|
|
2800
|
+
|
2793
2801
|
<xsl:if test="$lang = 'ar'">
|
2794
2802
|
<xsl:attribute name="padding-right">1mm</xsl:attribute>
|
2795
2803
|
</xsl:if>
|
@@ -3166,6 +3174,7 @@
|
|
3166
3174
|
|
3167
3175
|
|
3168
3176
|
|
3177
|
+
|
3169
3178
|
<xsl:variable name="title-key">
|
3170
3179
|
|
3171
3180
|
|
@@ -3452,6 +3461,8 @@
|
|
3452
3461
|
|
3453
3462
|
<xsl:apply-templates/>
|
3454
3463
|
</fo:inline>
|
3464
|
+
</xsl:template><xsl:template match="*[local-name()='padding']">
|
3465
|
+
<fo:inline padding-right="{@value}"> </fo:inline>
|
3455
3466
|
</xsl:template><xsl:template match="*[local-name()='sup']">
|
3456
3467
|
<fo:inline font-size="80%" vertical-align="super">
|
3457
3468
|
<xsl:apply-templates/>
|
@@ -3944,6 +3955,16 @@
|
|
3944
3955
|
<mathml:mspace width="0.5ex"/>
|
3945
3956
|
</xsl:template><xsl:template match="mathml:math/*[local-name()='unit']" mode="mathml"/><xsl:template match="mathml:math/*[local-name()='prefix']" mode="mathml"/><xsl:template match="mathml:math/*[local-name()='dimension']" mode="mathml"/><xsl:template match="mathml:math/*[local-name()='quantity']" mode="mathml"/><xsl:template match="*[local-name()='localityStack']"/><xsl:template match="*[local-name()='link']" name="link">
|
3946
3957
|
<xsl:variable name="target">
|
3958
|
+
<xsl:choose>
|
3959
|
+
<xsl:when test="@updatetype = 'true'">
|
3960
|
+
<xsl:value-of select="concat(normalize-space(@target), '.pdf')"/>
|
3961
|
+
</xsl:when>
|
3962
|
+
<xsl:otherwise>
|
3963
|
+
<xsl:value-of select="normalize-space(@target)"/>
|
3964
|
+
</xsl:otherwise>
|
3965
|
+
</xsl:choose>
|
3966
|
+
</xsl:variable>
|
3967
|
+
<xsl:variable name="target_text">
|
3947
3968
|
<xsl:choose>
|
3948
3969
|
<xsl:when test="starts-with(normalize-space(@target), 'mailto:')">
|
3949
3970
|
<xsl:value-of select="normalize-space(substring-after(@target, 'mailto:'))"/>
|
@@ -3956,19 +3977,19 @@
|
|
3956
3977
|
<fo:inline xsl:use-attribute-sets="link-style">
|
3957
3978
|
|
3958
3979
|
<xsl:choose>
|
3959
|
-
<xsl:when test="$
|
3980
|
+
<xsl:when test="$target_text = ''">
|
3960
3981
|
<xsl:apply-templates/>
|
3961
3982
|
</xsl:when>
|
3962
3983
|
<xsl:otherwise>
|
3963
|
-
<fo:basic-link external-destination="{
|
3984
|
+
<fo:basic-link external-destination="{$target}" fox:alt-text="{$target}">
|
3964
3985
|
<xsl:choose>
|
3965
3986
|
<xsl:when test="normalize-space(.) = ''">
|
3966
|
-
<!-- <xsl:value-of select="$target"/> -->
|
3967
3987
|
<xsl:call-template name="add-zero-spaces-link-java">
|
3968
|
-
<xsl:with-param name="text" select="$
|
3988
|
+
<xsl:with-param name="text" select="$target_text"/>
|
3969
3989
|
</xsl:call-template>
|
3970
3990
|
</xsl:when>
|
3971
3991
|
<xsl:otherwise>
|
3992
|
+
<!-- output text from <link>text</link> -->
|
3972
3993
|
<xsl:apply-templates/>
|
3973
3994
|
</xsl:otherwise>
|
3974
3995
|
</xsl:choose>
|
@@ -4593,6 +4614,7 @@
|
|
4593
4614
|
</xsl:template><xsl:template match="*[local-name()='sourcecode']" name="sourcecode">
|
4594
4615
|
|
4595
4616
|
<fo:block-container margin-left="0mm">
|
4617
|
+
<xsl:copy-of select="@id"/>
|
4596
4618
|
<xsl:if test="parent::*[local-name() = 'note']">
|
4597
4619
|
<xsl:attribute name="margin-left">
|
4598
4620
|
<xsl:choose>
|
@@ -4878,6 +4900,7 @@
|
|
4878
4900
|
</xsl:template><xsl:template match="*[local-name() = 'example']">
|
4879
4901
|
<fo:block id="{@id}" xsl:use-attribute-sets="example-style">
|
4880
4902
|
|
4903
|
+
|
4881
4904
|
<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
|
4882
4905
|
|
4883
4906
|
<xsl:variable name="element">
|
@@ -4986,12 +5009,13 @@
|
|
4986
5009
|
|
4987
5010
|
|
4988
5011
|
|
5012
|
+
|
4989
5013
|
<xsl:call-template name="getTitle">
|
4990
5014
|
<xsl:with-param name="name" select="'title-source'"/>
|
4991
5015
|
</xsl:call-template>
|
5016
|
+
<xsl:text>: </xsl:text>
|
4992
5017
|
|
4993
5018
|
|
4994
|
-
<xsl:text>: </xsl:text>
|
4995
5019
|
</fo:inline>
|
4996
5020
|
|
4997
5021
|
<fo:inline xsl:use-attribute-sets="origin-style">
|
@@ -5104,6 +5128,7 @@
|
|
5104
5128
|
|
5105
5129
|
|
5106
5130
|
|
5131
|
+
|
5107
5132
|
<xsl:choose>
|
5108
5133
|
<xsl:when test="$depth = 2">2</xsl:when>
|
5109
5134
|
<xsl:otherwise>1</xsl:otherwise>
|
@@ -5927,6 +5952,9 @@
|
|
5927
5952
|
<xsl:when test="parent::*[local-name() = 'preface']">
|
5928
5953
|
<xsl:value-of select="$level_total - 1"/>
|
5929
5954
|
</xsl:when>
|
5955
|
+
<xsl:when test="ancestor::*[local-name() = 'preface'] and not(ancestor::*[local-name() = 'foreword']) and not(ancestor::*[local-name() = 'introduction'])"> <!-- for preface/clause -->
|
5956
|
+
<xsl:value-of select="$level_total - 1"/>
|
5957
|
+
</xsl:when>
|
5930
5958
|
<xsl:when test="ancestor::*[local-name() = 'preface']">
|
5931
5959
|
<xsl:value-of select="$level_total - 2"/>
|
5932
5960
|
</xsl:when>
|
@@ -6067,7 +6095,14 @@
|
|
6067
6095
|
<xsl:when test="/*/*[local-name() = 'localized-strings']/*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]">
|
6068
6096
|
<xsl:value-of select="/*/*[local-name() = 'localized-strings']/*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
|
6069
6097
|
</xsl:when>
|
6070
|
-
<xsl:otherwise
|
6098
|
+
<xsl:otherwise>
|
6099
|
+
<xsl:variable name="key_">
|
6100
|
+
<xsl:call-template name="capitalize">
|
6101
|
+
<xsl:with-param name="str" select="translate($key, '_', ' ')"/>
|
6102
|
+
</xsl:call-template>
|
6103
|
+
</xsl:variable>
|
6104
|
+
<xsl:value-of select="$key_"/>
|
6105
|
+
</xsl:otherwise>
|
6071
6106
|
</xsl:choose>
|
6072
6107
|
|
6073
6108
|
</xsl:template><xsl:template name="setTrackChangesStyles">
|
@@ -1628,6 +1628,7 @@
|
|
1628
1628
|
|
1629
1629
|
|
1630
1630
|
|
1631
|
+
|
1631
1632
|
<!-- <xsl:attribute name="color">rgb(33, 55, 92)</xsl:attribute> -->
|
1632
1633
|
<xsl:attribute name="text-decoration">underline</xsl:attribute>
|
1633
1634
|
|
@@ -1735,6 +1736,7 @@
|
|
1735
1736
|
|
1736
1737
|
|
1737
1738
|
|
1739
|
+
|
1738
1740
|
</xsl:attribute-set><xsl:attribute-set name="example-body-style">
|
1739
1741
|
|
1740
1742
|
|
@@ -1754,9 +1756,7 @@
|
|
1754
1756
|
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
1755
1757
|
|
1756
1758
|
|
1757
|
-
|
1758
|
-
|
1759
|
-
|
1759
|
+
|
1760
1760
|
|
1761
1761
|
|
1762
1762
|
|
@@ -1805,6 +1805,7 @@
|
|
1805
1805
|
|
1806
1806
|
|
1807
1807
|
|
1808
|
+
|
1808
1809
|
</xsl:attribute-set><xsl:attribute-set name="appendix-style">
|
1809
1810
|
|
1810
1811
|
<xsl:attribute name="font-size">12pt</xsl:attribute>
|
@@ -1828,12 +1829,14 @@
|
|
1828
1829
|
|
1829
1830
|
|
1830
1831
|
|
1832
|
+
|
1831
1833
|
</xsl:attribute-set><xsl:attribute-set name="eref-style">
|
1832
1834
|
|
1833
1835
|
|
1834
1836
|
|
1835
1837
|
|
1836
1838
|
|
1839
|
+
|
1837
1840
|
</xsl:attribute-set><xsl:attribute-set name="note-style">
|
1838
1841
|
|
1839
1842
|
|
@@ -1933,11 +1936,13 @@
|
|
1933
1936
|
|
1934
1937
|
|
1935
1938
|
|
1939
|
+
|
1936
1940
|
</xsl:attribute-set><xsl:attribute-set name="origin-style">
|
1937
1941
|
|
1938
1942
|
|
1939
1943
|
|
1940
1944
|
|
1945
|
+
|
1941
1946
|
</xsl:attribute-set><xsl:attribute-set name="term-style">
|
1942
1947
|
|
1943
1948
|
</xsl:attribute-set><xsl:attribute-set name="figure-name-style">
|
@@ -2010,8 +2015,10 @@
|
|
2010
2015
|
<xsl:attribute name="font-size">11pt</xsl:attribute>
|
2011
2016
|
|
2012
2017
|
|
2018
|
+
|
2013
2019
|
</xsl:attribute-set><xsl:attribute-set name="deprecates-style">
|
2014
2020
|
|
2021
|
+
|
2015
2022
|
</xsl:attribute-set><xsl:attribute-set name="definition-style">
|
2016
2023
|
|
2017
2024
|
<xsl:attribute name="space-after">6pt</xsl:attribute>
|
@@ -2790,6 +2797,7 @@
|
|
2790
2797
|
|
2791
2798
|
|
2792
2799
|
|
2800
|
+
|
2793
2801
|
<xsl:if test="$lang = 'ar'">
|
2794
2802
|
<xsl:attribute name="padding-right">1mm</xsl:attribute>
|
2795
2803
|
</xsl:if>
|
@@ -3166,6 +3174,7 @@
|
|
3166
3174
|
|
3167
3175
|
|
3168
3176
|
|
3177
|
+
|
3169
3178
|
<xsl:variable name="title-key">
|
3170
3179
|
|
3171
3180
|
|
@@ -3452,6 +3461,8 @@
|
|
3452
3461
|
|
3453
3462
|
<xsl:apply-templates/>
|
3454
3463
|
</fo:inline>
|
3464
|
+
</xsl:template><xsl:template match="*[local-name()='padding']">
|
3465
|
+
<fo:inline padding-right="{@value}"> </fo:inline>
|
3455
3466
|
</xsl:template><xsl:template match="*[local-name()='sup']">
|
3456
3467
|
<fo:inline font-size="80%" vertical-align="super">
|
3457
3468
|
<xsl:apply-templates/>
|
@@ -3944,6 +3955,16 @@
|
|
3944
3955
|
<mathml:mspace width="0.5ex"/>
|
3945
3956
|
</xsl:template><xsl:template match="mathml:math/*[local-name()='unit']" mode="mathml"/><xsl:template match="mathml:math/*[local-name()='prefix']" mode="mathml"/><xsl:template match="mathml:math/*[local-name()='dimension']" mode="mathml"/><xsl:template match="mathml:math/*[local-name()='quantity']" mode="mathml"/><xsl:template match="*[local-name()='localityStack']"/><xsl:template match="*[local-name()='link']" name="link">
|
3946
3957
|
<xsl:variable name="target">
|
3958
|
+
<xsl:choose>
|
3959
|
+
<xsl:when test="@updatetype = 'true'">
|
3960
|
+
<xsl:value-of select="concat(normalize-space(@target), '.pdf')"/>
|
3961
|
+
</xsl:when>
|
3962
|
+
<xsl:otherwise>
|
3963
|
+
<xsl:value-of select="normalize-space(@target)"/>
|
3964
|
+
</xsl:otherwise>
|
3965
|
+
</xsl:choose>
|
3966
|
+
</xsl:variable>
|
3967
|
+
<xsl:variable name="target_text">
|
3947
3968
|
<xsl:choose>
|
3948
3969
|
<xsl:when test="starts-with(normalize-space(@target), 'mailto:')">
|
3949
3970
|
<xsl:value-of select="normalize-space(substring-after(@target, 'mailto:'))"/>
|
@@ -3956,19 +3977,19 @@
|
|
3956
3977
|
<fo:inline xsl:use-attribute-sets="link-style">
|
3957
3978
|
|
3958
3979
|
<xsl:choose>
|
3959
|
-
<xsl:when test="$
|
3980
|
+
<xsl:when test="$target_text = ''">
|
3960
3981
|
<xsl:apply-templates/>
|
3961
3982
|
</xsl:when>
|
3962
3983
|
<xsl:otherwise>
|
3963
|
-
<fo:basic-link external-destination="{
|
3984
|
+
<fo:basic-link external-destination="{$target}" fox:alt-text="{$target}">
|
3964
3985
|
<xsl:choose>
|
3965
3986
|
<xsl:when test="normalize-space(.) = ''">
|
3966
|
-
<!-- <xsl:value-of select="$target"/> -->
|
3967
3987
|
<xsl:call-template name="add-zero-spaces-link-java">
|
3968
|
-
<xsl:with-param name="text" select="$
|
3988
|
+
<xsl:with-param name="text" select="$target_text"/>
|
3969
3989
|
</xsl:call-template>
|
3970
3990
|
</xsl:when>
|
3971
3991
|
<xsl:otherwise>
|
3992
|
+
<!-- output text from <link>text</link> -->
|
3972
3993
|
<xsl:apply-templates/>
|
3973
3994
|
</xsl:otherwise>
|
3974
3995
|
</xsl:choose>
|
@@ -4593,6 +4614,7 @@
|
|
4593
4614
|
</xsl:template><xsl:template match="*[local-name()='sourcecode']" name="sourcecode">
|
4594
4615
|
|
4595
4616
|
<fo:block-container margin-left="0mm">
|
4617
|
+
<xsl:copy-of select="@id"/>
|
4596
4618
|
<xsl:if test="parent::*[local-name() = 'note']">
|
4597
4619
|
<xsl:attribute name="margin-left">
|
4598
4620
|
<xsl:choose>
|
@@ -4878,6 +4900,7 @@
|
|
4878
4900
|
</xsl:template><xsl:template match="*[local-name() = 'example']">
|
4879
4901
|
<fo:block id="{@id}" xsl:use-attribute-sets="example-style">
|
4880
4902
|
|
4903
|
+
|
4881
4904
|
<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
|
4882
4905
|
|
4883
4906
|
<xsl:variable name="element">
|
@@ -4986,12 +5009,13 @@
|
|
4986
5009
|
|
4987
5010
|
|
4988
5011
|
|
5012
|
+
|
4989
5013
|
<xsl:call-template name="getTitle">
|
4990
5014
|
<xsl:with-param name="name" select="'title-source'"/>
|
4991
5015
|
</xsl:call-template>
|
5016
|
+
<xsl:text>: </xsl:text>
|
4992
5017
|
|
4993
5018
|
|
4994
|
-
<xsl:text>: </xsl:text>
|
4995
5019
|
</fo:inline>
|
4996
5020
|
|
4997
5021
|
<fo:inline xsl:use-attribute-sets="origin-style">
|
@@ -5104,6 +5128,7 @@
|
|
5104
5128
|
|
5105
5129
|
|
5106
5130
|
|
5131
|
+
|
5107
5132
|
<xsl:choose>
|
5108
5133
|
<xsl:when test="$depth = 2">2</xsl:when>
|
5109
5134
|
<xsl:otherwise>1</xsl:otherwise>
|
@@ -5927,6 +5952,9 @@
|
|
5927
5952
|
<xsl:when test="parent::*[local-name() = 'preface']">
|
5928
5953
|
<xsl:value-of select="$level_total - 1"/>
|
5929
5954
|
</xsl:when>
|
5955
|
+
<xsl:when test="ancestor::*[local-name() = 'preface'] and not(ancestor::*[local-name() = 'foreword']) and not(ancestor::*[local-name() = 'introduction'])"> <!-- for preface/clause -->
|
5956
|
+
<xsl:value-of select="$level_total - 1"/>
|
5957
|
+
</xsl:when>
|
5930
5958
|
<xsl:when test="ancestor::*[local-name() = 'preface']">
|
5931
5959
|
<xsl:value-of select="$level_total - 2"/>
|
5932
5960
|
</xsl:when>
|
@@ -6067,7 +6095,14 @@
|
|
6067
6095
|
<xsl:when test="/*/*[local-name() = 'localized-strings']/*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]">
|
6068
6096
|
<xsl:value-of select="/*/*[local-name() = 'localized-strings']/*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
|
6069
6097
|
</xsl:when>
|
6070
|
-
<xsl:otherwise
|
6098
|
+
<xsl:otherwise>
|
6099
|
+
<xsl:variable name="key_">
|
6100
|
+
<xsl:call-template name="capitalize">
|
6101
|
+
<xsl:with-param name="str" select="translate($key, '_', ' ')"/>
|
6102
|
+
</xsl:call-template>
|
6103
|
+
</xsl:variable>
|
6104
|
+
<xsl:value-of select="$key_"/>
|
6105
|
+
</xsl:otherwise>
|
6071
6106
|
</xsl:choose>
|
6072
6107
|
|
6073
6108
|
</xsl:template><xsl:template name="setTrackChangesStyles">
|