metanorma-ribose 1.7.5 → 1.7.6
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/.github/workflows/rake.yml +1 -1
- data/lib/asciidoctor/ribose/isodoc.rng +18 -1
- data/lib/isodoc/ribose/ribose.standard.xsl +412 -145
- data/lib/metanorma/ribose/version.rb +1 -1
- data/metanorma-ribose.gemspec +1 -1
- metadata +4 -4
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 62b740f989d4069f648958b45e7eb94a550fd6b9bba77938fd097763f08bc327
|
|
4
|
+
data.tar.gz: 8e4450e474fc622ebcd152328af68181f2044730e7186e6efc6bd9c875ed4d8e
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: ee05d487fe6866c3e942aff7c0f7fa4058df23ac3b4cfc244236f4791f101f2b16e11d90f060440c262b4890085439de70a72d2be4a5d80391fa4e2d8432ed47
|
|
7
|
+
data.tar.gz: f9ef5fde31668bcd03631a13034b1e5f58ae62638ddd2a4e64ed87c83fb5eee066348c54d5026a4104acd949a72e2a4d2909b24577d87176ef762ebef7dbd9fd
|
data/.github/workflows/rake.yml
CHANGED
|
@@ -955,7 +955,24 @@
|
|
|
955
955
|
<define name="concept">
|
|
956
956
|
<element name="concept">
|
|
957
957
|
<optional>
|
|
958
|
-
<
|
|
958
|
+
<element name="refterm">
|
|
959
|
+
<zeroOrMore>
|
|
960
|
+
<choice>
|
|
961
|
+
<ref name="PureTextElement"/>
|
|
962
|
+
<ref name="stem"/>
|
|
963
|
+
</choice>
|
|
964
|
+
</zeroOrMore>
|
|
965
|
+
</element>
|
|
966
|
+
</optional>
|
|
967
|
+
<optional>
|
|
968
|
+
<element name="renderterm">
|
|
969
|
+
<zeroOrMore>
|
|
970
|
+
<choice>
|
|
971
|
+
<ref name="PureTextElement"/>
|
|
972
|
+
<ref name="stem"/>
|
|
973
|
+
</choice>
|
|
974
|
+
</zeroOrMore>
|
|
975
|
+
</element>
|
|
959
976
|
</optional>
|
|
960
977
|
<choice>
|
|
961
978
|
<ref name="eref"/>
|
|
@@ -7,8 +7,12 @@
|
|
|
7
7
|
<xsl:variable name="images" select="document($svg_images)"/>
|
|
8
8
|
<xsl:param name="basepath"/>
|
|
9
9
|
|
|
10
|
-
<xsl:variable name="pageWidth" select="
|
|
11
|
-
<xsl:variable name="pageHeight" select="
|
|
10
|
+
<xsl:variable name="pageWidth" select="215.9"/>
|
|
11
|
+
<xsl:variable name="pageHeight" select="279.4"/>
|
|
12
|
+
<xsl:variable name="marginLeftRight1" select="29"/>
|
|
13
|
+
<xsl:variable name="marginLeftRight2" select="29"/>
|
|
14
|
+
<xsl:variable name="marginTop" select="14"/>
|
|
15
|
+
<xsl:variable name="marginBottom" select="22"/>
|
|
12
16
|
|
|
13
17
|
|
|
14
18
|
|
|
@@ -62,11 +66,11 @@
|
|
|
62
66
|
|
|
63
67
|
<xsl:template match="/">
|
|
64
68
|
<xsl:call-template name="namespaceCheck"/>
|
|
65
|
-
<fo:root font-family="
|
|
69
|
+
<fo:root font-family="OpenSans, STIX Two Math" font-weight="300" font-size="11pt" color="rgb(88, 88, 90)" xml:lang="{$lang}">
|
|
66
70
|
<fo:layout-master-set>
|
|
67
71
|
|
|
68
72
|
<!-- Cover page -->
|
|
69
|
-
<fo:simple-page-master master-name="cover-page" page-width="{$pageWidth}" page-height="{$pageHeight}">
|
|
73
|
+
<fo:simple-page-master master-name="cover-page" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
70
74
|
<fo:region-body margin-top="176mm" margin-bottom="11.5mm" margin-left="13mm" margin-right="78mm"/>
|
|
71
75
|
<fo:region-before region-name="cover-page-header" extent="176mm"/>
|
|
72
76
|
<fo:region-after region-name="cover-page-footer" extent="11.5mm"/>
|
|
@@ -75,14 +79,14 @@
|
|
|
75
79
|
</fo:simple-page-master>
|
|
76
80
|
|
|
77
81
|
<!-- ToC -->
|
|
78
|
-
<fo:simple-page-master master-name="toc-odd" page-width="{$pageWidth}" page-height="{$pageHeight}">
|
|
82
|
+
<fo:simple-page-master master-name="toc-odd" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
79
83
|
<fo:region-body margin-top="14mm" margin-bottom="26.5mm" margin-left="61mm" margin-right="12mm"/>
|
|
80
84
|
<fo:region-before region-name="header-toc-odd" extent="14mm"/>
|
|
81
85
|
<fo:region-after region-name="footer-odd" extent="12.5mm"/>
|
|
82
86
|
<fo:region-start region-name="left-region" extent="13mm"/>
|
|
83
87
|
<fo:region-end region-name="right-region" extent="12mm"/>
|
|
84
88
|
</fo:simple-page-master>
|
|
85
|
-
<fo:simple-page-master master-name="toc-even" page-width="{$pageWidth}" page-height="{$pageHeight}">
|
|
89
|
+
<fo:simple-page-master master-name="toc-even" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
86
90
|
<fo:region-body margin-top="14mm" margin-bottom="85mm" margin-left="61mm" margin-right="12mm"/>
|
|
87
91
|
<fo:region-before region-name="header-toc-even" extent="14mm"/>
|
|
88
92
|
<fo:region-after region-name="footer-even" extent="12.5mm"/>
|
|
@@ -98,8 +102,8 @@
|
|
|
98
102
|
|
|
99
103
|
|
|
100
104
|
|
|
101
|
-
<fo:simple-page-master master-name="first" page-width="{$pageWidth}" page-height="{$pageHeight}">
|
|
102
|
-
<fo:region-body margin-top="14mm" margin-bottom="85mm" margin-left="
|
|
105
|
+
<fo:simple-page-master master-name="first" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
106
|
+
<fo:region-body margin-top="14mm" margin-bottom="85mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/>
|
|
103
107
|
<fo:region-before region-name="header-LB-yellow" extent="14mm"/>
|
|
104
108
|
<fo:region-after region-name="footer-even" extent="12.5mm"/>
|
|
105
109
|
<fo:region-start region-name="left-region" extent="13mm"/>
|
|
@@ -107,15 +111,15 @@
|
|
|
107
111
|
</fo:simple-page-master>
|
|
108
112
|
|
|
109
113
|
<!-- Page 2 and 3: (left bottom + right top, yellow) -->
|
|
110
|
-
<fo:simple-page-master master-name="page2" page-width="{$pageWidth}" page-height="{$pageHeight}">
|
|
111
|
-
<fo:region-body margin-top="
|
|
114
|
+
<fo:simple-page-master master-name="page2" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
115
|
+
<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/>
|
|
112
116
|
<fo:region-before region-name="header-LB-yellow" extent="14mm"/>
|
|
113
117
|
<fo:region-after region-name="footer-even" extent="12.5mm"/>
|
|
114
118
|
<fo:region-start region-name="left-region" extent="13mm"/>
|
|
115
119
|
<fo:region-end region-name="right-region" extent="12mm"/>
|
|
116
120
|
</fo:simple-page-master>
|
|
117
|
-
<fo:simple-page-master master-name="page3" page-width="{$pageWidth}" page-height="{$pageHeight}">
|
|
118
|
-
<fo:region-body margin-top="
|
|
121
|
+
<fo:simple-page-master master-name="page3" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
122
|
+
<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/>
|
|
119
123
|
<fo:region-before region-name="header-RT-yellow" extent="14mm"/>
|
|
120
124
|
<fo:region-after region-name="footer-odd" extent="12.5mm"/>
|
|
121
125
|
<fo:region-start region-name="left-region" extent="13mm"/>
|
|
@@ -123,15 +127,15 @@
|
|
|
123
127
|
</fo:simple-page-master>
|
|
124
128
|
|
|
125
129
|
<!-- Page 4 and 5: (left top + right bottom, blue) -->
|
|
126
|
-
<fo:simple-page-master master-name="page4" page-width="{$pageWidth}" page-height="{$pageHeight}">
|
|
127
|
-
<fo:region-body margin-top="
|
|
130
|
+
<fo:simple-page-master master-name="page4" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
131
|
+
<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/>
|
|
128
132
|
<fo:region-before region-name="header-LT-blue" extent="14mm"/>
|
|
129
133
|
<fo:region-after region-name="footer-even" extent="12.5mm"/>
|
|
130
134
|
<fo:region-start region-name="left-region" extent="13mm"/>
|
|
131
135
|
<fo:region-end region-name="right-region" extent="12mm"/>
|
|
132
136
|
</fo:simple-page-master>
|
|
133
|
-
<fo:simple-page-master master-name="page5" page-width="{$pageWidth}" page-height="{$pageHeight}">
|
|
134
|
-
<fo:region-body margin-top="
|
|
137
|
+
<fo:simple-page-master master-name="page5" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
138
|
+
<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/>
|
|
135
139
|
<fo:region-before region-name="header-RB-blue" extent="14mm"/>
|
|
136
140
|
<fo:region-after region-name="footer-odd" extent="12.5mm"/>
|
|
137
141
|
<fo:region-start region-name="left-region" extent="13mm"/>
|
|
@@ -139,15 +143,15 @@
|
|
|
139
143
|
</fo:simple-page-master>
|
|
140
144
|
|
|
141
145
|
<!-- Page 6 and 7: (left bottom + right top, orange) -->
|
|
142
|
-
<fo:simple-page-master master-name="page6" page-width="{$pageWidth}" page-height="{$pageHeight}">
|
|
143
|
-
<fo:region-body margin-top="
|
|
146
|
+
<fo:simple-page-master master-name="page6" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
147
|
+
<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/>
|
|
144
148
|
<fo:region-before region-name="header-LB-orange" extent="14mm"/>
|
|
145
149
|
<fo:region-after region-name="footer-even" extent="12.5mm"/>
|
|
146
150
|
<fo:region-start region-name="left-region" extent="13mm"/>
|
|
147
151
|
<fo:region-end region-name="right-region" extent="12mm"/>
|
|
148
152
|
</fo:simple-page-master>
|
|
149
|
-
<fo:simple-page-master master-name="page7" page-width="{$pageWidth}" page-height="{$pageHeight}">
|
|
150
|
-
<fo:region-body margin-top="
|
|
153
|
+
<fo:simple-page-master master-name="page7" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
154
|
+
<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/>
|
|
151
155
|
<fo:region-before region-name="header-RT-orange" extent="14mm"/>
|
|
152
156
|
<fo:region-after region-name="footer-odd" extent="12.5mm"/>
|
|
153
157
|
<fo:region-start region-name="left-region" extent="13mm"/>
|
|
@@ -155,135 +159,135 @@
|
|
|
155
159
|
</fo:simple-page-master>
|
|
156
160
|
|
|
157
161
|
<!-- Page 8 and 9: (left top + right bottom, yellow) -->
|
|
158
|
-
<fo:simple-page-master master-name="page8" page-width="{$pageWidth}" page-height="{$pageHeight}">
|
|
159
|
-
<fo:region-body margin-top="
|
|
162
|
+
<fo:simple-page-master master-name="page8" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
163
|
+
<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/>
|
|
160
164
|
<fo:region-before region-name="header-LT-yellow" extent="14mm"/>
|
|
161
165
|
<fo:region-after region-name="footer-even" extent="12.5mm"/>
|
|
162
166
|
<fo:region-start region-name="left-region" extent="13mm"/>
|
|
163
167
|
<fo:region-end region-name="right-region" extent="12mm"/>
|
|
164
168
|
</fo:simple-page-master>
|
|
165
|
-
<fo:simple-page-master master-name="page9" page-width="{$pageWidth}" page-height="{$pageHeight}">
|
|
166
|
-
<fo:region-body margin-top="
|
|
169
|
+
<fo:simple-page-master master-name="page9" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
170
|
+
<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/>
|
|
167
171
|
<fo:region-before region-name="header-RB-yellow" extent="14mm"/>
|
|
168
172
|
<fo:region-after region-name="footer-odd" extent="12.5mm"/>
|
|
169
173
|
<fo:region-start region-name="left-region" extent="13mm"/>
|
|
170
174
|
<fo:region-end region-name="right-region" extent="12mm"/>
|
|
171
175
|
</fo:simple-page-master>
|
|
172
176
|
|
|
173
|
-
<fo:simple-page-master master-name="page10" page-width="{$pageWidth}" page-height="{$pageHeight}">
|
|
174
|
-
<fo:region-body margin-top="
|
|
177
|
+
<fo:simple-page-master master-name="page10" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
178
|
+
<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/>
|
|
175
179
|
<fo:region-before region-name="header-LB-blue" extent="14mm"/>
|
|
176
180
|
<fo:region-after region-name="footer-even" extent="12.5mm"/>
|
|
177
181
|
<fo:region-start region-name="left-region" extent="13mm"/>
|
|
178
182
|
<fo:region-end region-name="right-region" extent="12mm"/>
|
|
179
183
|
</fo:simple-page-master>
|
|
180
|
-
<fo:simple-page-master master-name="page11" page-width="{$pageWidth}" page-height="{$pageHeight}">
|
|
181
|
-
<fo:region-body margin-top="
|
|
184
|
+
<fo:simple-page-master master-name="page11" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
185
|
+
<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/>
|
|
182
186
|
<fo:region-before region-name="header-RT-blue" extent="14mm"/>
|
|
183
187
|
<fo:region-after region-name="footer-odd" extent="12.5mm"/>
|
|
184
188
|
<fo:region-start region-name="left-region" extent="13mm"/>
|
|
185
189
|
<fo:region-end region-name="right-region" extent="12mm"/>
|
|
186
190
|
</fo:simple-page-master>
|
|
187
191
|
|
|
188
|
-
<fo:simple-page-master master-name="page12" page-width="{$pageWidth}" page-height="{$pageHeight}">
|
|
189
|
-
<fo:region-body margin-top="
|
|
192
|
+
<fo:simple-page-master master-name="page12" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
193
|
+
<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/>
|
|
190
194
|
<fo:region-before region-name="header-LT-orange" extent="14mm"/>
|
|
191
195
|
<fo:region-after region-name="footer-even" extent="12.5mm"/>
|
|
192
196
|
<fo:region-start region-name="left-region" extent="13mm"/>
|
|
193
197
|
<fo:region-end region-name="right-region" extent="12mm"/>
|
|
194
198
|
</fo:simple-page-master>
|
|
195
|
-
<fo:simple-page-master master-name="page13" page-width="{$pageWidth}" page-height="{$pageHeight}">
|
|
196
|
-
<fo:region-body margin-top="
|
|
199
|
+
<fo:simple-page-master master-name="page13" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
200
|
+
<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/>
|
|
197
201
|
<fo:region-before region-name="header-RB-orange" extent="14mm"/>
|
|
198
202
|
<fo:region-after region-name="footer-odd" extent="12.5mm"/>
|
|
199
203
|
<fo:region-start region-name="left-region" extent="13mm"/>
|
|
200
204
|
<fo:region-end region-name="right-region" extent="12mm"/>
|
|
201
205
|
</fo:simple-page-master>
|
|
202
206
|
|
|
203
|
-
<fo:simple-page-master master-name="page14" page-width="{$pageWidth}" page-height="{$pageHeight}">
|
|
204
|
-
<fo:region-body margin-top="
|
|
207
|
+
<fo:simple-page-master master-name="page14" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
208
|
+
<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/>
|
|
205
209
|
<fo:region-before region-name="header-LB-yellow" extent="14mm"/>
|
|
206
210
|
<fo:region-after region-name="footer-even" extent="12.5mm"/>
|
|
207
211
|
<fo:region-start region-name="left-region" extent="13mm"/>
|
|
208
212
|
<fo:region-end region-name="right-region" extent="12mm"/>
|
|
209
213
|
</fo:simple-page-master>
|
|
210
|
-
<fo:simple-page-master master-name="page15" page-width="{$pageWidth}" page-height="{$pageHeight}">
|
|
211
|
-
<fo:region-body margin-top="
|
|
214
|
+
<fo:simple-page-master master-name="page15" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
215
|
+
<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/>
|
|
212
216
|
<fo:region-before region-name="header-RT-yellow" extent="14mm"/>
|
|
213
217
|
<fo:region-after region-name="footer-odd" extent="12.5mm"/>
|
|
214
218
|
<fo:region-start region-name="left-region" extent="13mm"/>
|
|
215
219
|
<fo:region-end region-name="right-region" extent="12mm"/>
|
|
216
220
|
</fo:simple-page-master>
|
|
217
221
|
|
|
218
|
-
<fo:simple-page-master master-name="page16" page-width="{$pageWidth}" page-height="{$pageHeight}">
|
|
219
|
-
<fo:region-body margin-top="
|
|
222
|
+
<fo:simple-page-master master-name="page16" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
223
|
+
<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/>
|
|
220
224
|
<fo:region-before region-name="header-LT-blue" extent="14mm"/>
|
|
221
225
|
<fo:region-after region-name="footer-even" extent="12.5mm"/>
|
|
222
226
|
<fo:region-start region-name="left-region" extent="13mm"/>
|
|
223
227
|
<fo:region-end region-name="right-region" extent="12mm"/>
|
|
224
228
|
</fo:simple-page-master>
|
|
225
|
-
<fo:simple-page-master master-name="page17" page-width="{$pageWidth}" page-height="{$pageHeight}">
|
|
226
|
-
<fo:region-body margin-top="
|
|
229
|
+
<fo:simple-page-master master-name="page17" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
230
|
+
<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/>
|
|
227
231
|
<fo:region-before region-name="header-RB-blue" extent="14mm"/>
|
|
228
232
|
<fo:region-after region-name="footer-odd" extent="12.5mm"/>
|
|
229
233
|
<fo:region-start region-name="left-region" extent="13mm"/>
|
|
230
234
|
<fo:region-end region-name="right-region" extent="12mm"/>
|
|
231
235
|
</fo:simple-page-master>
|
|
232
236
|
|
|
233
|
-
<fo:simple-page-master master-name="page18" page-width="{$pageWidth}" page-height="{$pageHeight}">
|
|
234
|
-
<fo:region-body margin-top="
|
|
237
|
+
<fo:simple-page-master master-name="page18" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
238
|
+
<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/>
|
|
235
239
|
<fo:region-before region-name="header-LB-orange" extent="14mm"/>
|
|
236
240
|
<fo:region-after region-name="footer-even" extent="12.5mm"/>
|
|
237
241
|
<fo:region-start region-name="left-region" extent="13mm"/>
|
|
238
242
|
<fo:region-end region-name="right-region" extent="12mm"/>
|
|
239
243
|
</fo:simple-page-master>
|
|
240
|
-
<fo:simple-page-master master-name="page19" page-width="{$pageWidth}" page-height="{$pageHeight}">
|
|
241
|
-
<fo:region-body margin-top="
|
|
244
|
+
<fo:simple-page-master master-name="page19" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
245
|
+
<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/>
|
|
242
246
|
<fo:region-before region-name="header-RT-orange" extent="14mm"/>
|
|
243
247
|
<fo:region-after region-name="footer-odd" extent="12.5mm"/>
|
|
244
248
|
<fo:region-start region-name="left-region" extent="13mm"/>
|
|
245
249
|
<fo:region-end region-name="right-region" extent="12mm"/>
|
|
246
250
|
</fo:simple-page-master>
|
|
247
251
|
|
|
248
|
-
<fo:simple-page-master master-name="page20" page-width="{$pageWidth}" page-height="{$pageHeight}">
|
|
249
|
-
<fo:region-body margin-top="
|
|
252
|
+
<fo:simple-page-master master-name="page20" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
253
|
+
<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/>
|
|
250
254
|
<fo:region-before region-name="header-LT-yellow" extent="14mm"/>
|
|
251
255
|
<fo:region-after region-name="footer-even" extent="12.5mm"/>
|
|
252
256
|
<fo:region-start region-name="left-region" extent="13mm"/>
|
|
253
257
|
<fo:region-end region-name="right-region" extent="12mm"/>
|
|
254
258
|
</fo:simple-page-master>
|
|
255
|
-
<fo:simple-page-master master-name="page21" page-width="{$pageWidth}" page-height="{$pageHeight}">
|
|
256
|
-
<fo:region-body margin-top="
|
|
259
|
+
<fo:simple-page-master master-name="page21" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
260
|
+
<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/>
|
|
257
261
|
<fo:region-before region-name="header-RB-yellow" extent="14mm"/>
|
|
258
262
|
<fo:region-after region-name="footer-odd" extent="12.5mm"/>
|
|
259
263
|
<fo:region-start region-name="left-region" extent="13mm"/>
|
|
260
264
|
<fo:region-end region-name="right-region" extent="12mm"/>
|
|
261
265
|
</fo:simple-page-master>
|
|
262
266
|
|
|
263
|
-
<fo:simple-page-master master-name="page22" page-width="{$pageWidth}" page-height="{$pageHeight}">
|
|
264
|
-
<fo:region-body margin-top="
|
|
267
|
+
<fo:simple-page-master master-name="page22" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
268
|
+
<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/>
|
|
265
269
|
<fo:region-before region-name="header-LB-blue" extent="14mm"/>
|
|
266
270
|
<fo:region-after region-name="footer-even" extent="12.5mm"/>
|
|
267
271
|
<fo:region-start region-name="left-region" extent="13mm"/>
|
|
268
272
|
<fo:region-end region-name="right-region" extent="12mm"/>
|
|
269
273
|
</fo:simple-page-master>
|
|
270
|
-
<fo:simple-page-master master-name="page23" page-width="{$pageWidth}" page-height="{$pageHeight}">
|
|
271
|
-
<fo:region-body margin-top="
|
|
274
|
+
<fo:simple-page-master master-name="page23" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
275
|
+
<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/>
|
|
272
276
|
<fo:region-before region-name="header-RT-blue" extent="14mm"/>
|
|
273
277
|
<fo:region-after region-name="footer-odd" extent="12.5mm"/>
|
|
274
278
|
<fo:region-start region-name="left-region" extent="13mm"/>
|
|
275
279
|
<fo:region-end region-name="right-region" extent="12mm"/>
|
|
276
280
|
</fo:simple-page-master>
|
|
277
281
|
|
|
278
|
-
<fo:simple-page-master master-name="page24" page-width="{$pageWidth}" page-height="{$pageHeight}">
|
|
279
|
-
<fo:region-body margin-top="
|
|
282
|
+
<fo:simple-page-master master-name="page24" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
283
|
+
<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/>
|
|
280
284
|
<fo:region-before region-name="header-LT-orange" extent="14mm"/>
|
|
281
285
|
<fo:region-after region-name="footer-even" extent="12.5mm"/>
|
|
282
286
|
<fo:region-start region-name="left-region" extent="13mm"/>
|
|
283
287
|
<fo:region-end region-name="right-region" extent="12mm"/>
|
|
284
288
|
</fo:simple-page-master>
|
|
285
|
-
<fo:simple-page-master master-name="page25" page-width="{$pageWidth}" page-height="{$pageHeight}">
|
|
286
|
-
<fo:region-body margin-top="
|
|
289
|
+
<fo:simple-page-master master-name="page25" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
290
|
+
<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/>
|
|
287
291
|
<fo:region-before region-name="header-RB-orange" extent="14mm"/>
|
|
288
292
|
<fo:region-after region-name="footer-odd" extent="12.5mm"/>
|
|
289
293
|
<fo:region-start region-name="left-region" extent="13mm"/>
|
|
@@ -316,7 +320,7 @@
|
|
|
316
320
|
<!-- background image -->
|
|
317
321
|
<fo:block-container absolute-position="fixed" left="0mm" top="0mm" font-size="0">
|
|
318
322
|
<fo:block>
|
|
319
|
-
<fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-Cover-Background))}" width="{$pageWidth}" content-height="scale-to-fit" scaling="uniform" fox:alt-text="Image Front"/>
|
|
323
|
+
<fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-Cover-Background))}" width="{$pageWidth}mm" content-height="scale-to-fit" scaling="uniform" fox:alt-text="Image Front"/>
|
|
320
324
|
</fo:block>
|
|
321
325
|
</fo:block-container>
|
|
322
326
|
|
|
@@ -387,16 +391,16 @@
|
|
|
387
391
|
</fo:block>
|
|
388
392
|
</fo:block-container>
|
|
389
393
|
|
|
390
|
-
<!-- title and
|
|
394
|
+
<!-- title and version -->
|
|
391
395
|
<fo:block-container height="60mm" display-align="center">
|
|
392
396
|
<xsl:variable name="title" select="/rsd:rsd-standard/rsd:bibdata/rsd:title[@language = $lang]"/>
|
|
393
397
|
<xsl:if test="string-length($title) > 80">
|
|
394
398
|
<xsl:attribute name="margin-right">-30mm</xsl:attribute>
|
|
395
399
|
</xsl:if>
|
|
396
|
-
<fo:block font-size="
|
|
400
|
+
<fo:block font-size="27pt" font-weight="bold">
|
|
397
401
|
<xsl:apply-templates select="/rsd:rsd-standard/rsd:bibdata/rsd:title[@language = $lang]" mode="cover_page"/>
|
|
398
402
|
</fo:block>
|
|
399
|
-
<fo:block space-before="9pt" font-size="16.8pt" font-weight="
|
|
403
|
+
<fo:block space-before="9pt" font-size="16.8pt" font-weight="600">
|
|
400
404
|
<xsl:value-of select="$docnumber_version"/>
|
|
401
405
|
</fo:block>
|
|
402
406
|
</fo:block-container>
|
|
@@ -408,50 +412,52 @@
|
|
|
408
412
|
<fo:page-sequence master-reference="document" force-page-count="no-force"> <!-- master-reference="toc" -->
|
|
409
413
|
<xsl:call-template name="insertHeaderFooter"/>
|
|
410
414
|
<fo:flow flow-name="xsl-region-body">
|
|
415
|
+
<xsl:if test="xalan:nodeset($contents)//item[@display = 'true']">
|
|
411
416
|
<!-- <fo:block-container absolute-position="fixed" left="13mm" top="15mm"> -->
|
|
412
|
-
<fo:block font-size="
|
|
417
|
+
<fo:block font-size="27pt" font-weight="bold" color="black" margin-left="-15mm" margin-bottom="13mm">
|
|
413
418
|
<xsl:call-template name="getLocalizedString">
|
|
414
419
|
<xsl:with-param name="key">table_of_contents</xsl:with-param>
|
|
415
420
|
</xsl:call-template>
|
|
416
421
|
</fo:block>
|
|
417
422
|
<!-- </fo:block-container> -->
|
|
418
423
|
|
|
419
|
-
|
|
420
|
-
|
|
421
|
-
|
|
422
|
-
|
|
423
|
-
|
|
424
|
-
|
|
425
|
-
|
|
424
|
+
<fo:block-container margin-left="32mm" margin-right="-17mm">
|
|
425
|
+
<fo:block-container margin-left="0mm" margin-right="0mm">
|
|
426
|
+
<xsl:for-each select="xalan:nodeset($contents)//item[@display = 'true']">
|
|
427
|
+
<fo:block font-size="13pt">
|
|
428
|
+
<xsl:if test="@level = 1">
|
|
429
|
+
<xsl:if test="preceding-sibling::item[@display = 'true' and @level = 1]">
|
|
430
|
+
<xsl:attribute name="space-before">16pt</xsl:attribute>
|
|
431
|
+
</xsl:if>
|
|
432
|
+
<xsl:attribute name="space-after">4pt</xsl:attribute>
|
|
433
|
+
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
|
434
|
+
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
|
435
|
+
<xsl:attribute name="color">black</xsl:attribute>
|
|
436
|
+
</xsl:if>
|
|
437
|
+
<xsl:if test="@level = 2">
|
|
438
|
+
<xsl:attribute name="margin-left">16.5mm</xsl:attribute>
|
|
439
|
+
<xsl:attribute name="space-before">4pt</xsl:attribute>
|
|
440
|
+
<xsl:attribute name="space-after">5pt</xsl:attribute>
|
|
426
441
|
</xsl:if>
|
|
427
|
-
<
|
|
428
|
-
|
|
429
|
-
|
|
430
|
-
|
|
431
|
-
|
|
432
|
-
|
|
433
|
-
|
|
434
|
-
|
|
435
|
-
|
|
436
|
-
|
|
437
|
-
|
|
438
|
-
|
|
439
|
-
<xsl:value-of select="@section"/>
|
|
440
|
-
<xsl:text> </xsl:text>
|
|
441
|
-
<xsl:apply-templates select="title"/>
|
|
442
|
-
<xsl:text> </xsl:text>
|
|
443
|
-
<fo:inline>
|
|
444
|
-
<fo:leader leader-pattern="rule" rule-thickness="0.2mm"/>
|
|
445
|
-
<fo:inline padding-left="2mm"><fo:page-number-citation ref-id="{@id}"/></fo:inline>
|
|
446
|
-
</fo:inline>
|
|
447
|
-
</fo:basic-link>
|
|
442
|
+
<fo:block text-align-last="justify">
|
|
443
|
+
<fo:basic-link internal-destination="{@id}" fox:alt-text="{title}">
|
|
444
|
+
<xsl:value-of select="@section"/>
|
|
445
|
+
<xsl:text> </xsl:text>
|
|
446
|
+
<xsl:apply-templates select="title"/>
|
|
447
|
+
<xsl:text> </xsl:text>
|
|
448
|
+
<fo:inline>
|
|
449
|
+
<fo:leader leader-pattern="rule" rule-thickness="0.2mm"/>
|
|
450
|
+
<fo:inline padding-left="2mm"><fo:page-number-citation ref-id="{@id}"/></fo:inline>
|
|
451
|
+
</fo:inline>
|
|
452
|
+
</fo:basic-link>
|
|
453
|
+
</fo:block>
|
|
448
454
|
</fo:block>
|
|
449
|
-
</
|
|
450
|
-
</
|
|
455
|
+
</xsl:for-each>
|
|
456
|
+
</fo:block-container>
|
|
451
457
|
</fo:block-container>
|
|
452
|
-
|
|
453
|
-
|
|
454
|
-
|
|
458
|
+
|
|
459
|
+
<fo:block break-after="page"/>
|
|
460
|
+
</xsl:if>
|
|
455
461
|
<fo:block margin-bottom="12pt"> </fo:block>
|
|
456
462
|
|
|
457
463
|
<xsl:apply-templates select="/rsd:rsd-standard/rsd:boilerplate/rsd:legal-statement"/>
|
|
@@ -667,9 +673,9 @@
|
|
|
667
673
|
<xsl:choose>
|
|
668
674
|
<!-- <xsl:when test="ancestor::rsd:preface and $level >= 2">12pt</xsl:when>
|
|
669
675
|
<xsl:when test="ancestor::rsd:preface">13pt</xsl:when> -->
|
|
670
|
-
<xsl:when test="$level = 1">
|
|
671
|
-
<xsl:when test="$level = 2">
|
|
672
|
-
<xsl:when test="$level >= 3">
|
|
676
|
+
<xsl:when test="$level = 1">22pt</xsl:when>
|
|
677
|
+
<xsl:when test="$level = 2">13pt</xsl:when>
|
|
678
|
+
<xsl:when test="$level >= 3">11pt</xsl:when>
|
|
673
679
|
<xsl:otherwise>16pt</xsl:otherwise>
|
|
674
680
|
</xsl:choose>
|
|
675
681
|
</xsl:variable>
|
|
@@ -677,7 +683,7 @@
|
|
|
677
683
|
<xsl:variable name="font-weight">
|
|
678
684
|
<xsl:choose>
|
|
679
685
|
<xsl:when test="$level >= 4">normal</xsl:when>
|
|
680
|
-
<xsl:otherwise>
|
|
686
|
+
<xsl:otherwise>bold</xsl:otherwise> <!-- 600 - semibold-->
|
|
681
687
|
</xsl:choose>
|
|
682
688
|
</xsl:variable>
|
|
683
689
|
|
|
@@ -1013,7 +1019,7 @@
|
|
|
1013
1019
|
<xsl:template match="rsd:li">
|
|
1014
1020
|
<fo:list-item space-after="4pt">
|
|
1015
1021
|
<fo:list-item-label end-indent="label-end()">
|
|
1016
|
-
<fo:block color="{$color_blue}" font-weight="
|
|
1022
|
+
<fo:block color="{$color_blue}" font-weight="bold">
|
|
1017
1023
|
<xsl:choose>
|
|
1018
1024
|
<xsl:when test="local-name(..) = 'ul' and (../ancestor::rsd:ul or ../ancestor::rsd:ol)">-</xsl:when> <!-- — dash -->
|
|
1019
1025
|
<xsl:when test="local-name(..) = 'ul'">•</xsl:when> <!-- — dash -->
|
|
@@ -1049,6 +1055,9 @@
|
|
|
1049
1055
|
|
|
1050
1056
|
<xsl:template match="rsd:ul/rsd:note | rsd:ol/rsd:note" priority="2">
|
|
1051
1057
|
<fo:list-item font-size="10pt">
|
|
1058
|
+
<xsl:if test="ancestor::rsd:table">
|
|
1059
|
+
<xsl:attribute name="font-size">8pt</xsl:attribute>
|
|
1060
|
+
</xsl:if>
|
|
1052
1061
|
<fo:list-item-label><fo:block/></fo:list-item-label>
|
|
1053
1062
|
<fo:list-item-body>
|
|
1054
1063
|
<fo:block>
|
|
@@ -1067,11 +1076,11 @@
|
|
|
1067
1076
|
</xsl:variable>
|
|
1068
1077
|
<xsl:variable name="font-size">
|
|
1069
1078
|
<xsl:choose>
|
|
1070
|
-
<xsl:when test="$level >= 2">
|
|
1079
|
+
<xsl:when test="$level >= 2">13pt</xsl:when>
|
|
1071
1080
|
<xsl:otherwise>12pt</xsl:otherwise>
|
|
1072
1081
|
</xsl:choose>
|
|
1073
1082
|
</xsl:variable>
|
|
1074
|
-
<fo:block font-weight="
|
|
1083
|
+
<fo:block font-weight="bold" color="black" font-size="{$font-size}" keep-with-next="always"> <!-- 600 - semibold -->
|
|
1075
1084
|
<xsl:if test="preceding-sibling::*[1][self::rsd:name]">
|
|
1076
1085
|
<xsl:attribute name="space-before">11mm</xsl:attribute>
|
|
1077
1086
|
<fo:inline padding-right="1mm">
|
|
@@ -1102,7 +1111,7 @@
|
|
|
1102
1111
|
</xsl:choose>
|
|
1103
1112
|
</xsl:attribute>
|
|
1104
1113
|
<fo:block padding-top="1mm" padding-bottom="0.5mm">
|
|
1105
|
-
<fo:inline font-size="
|
|
1114
|
+
<fo:inline font-size="11pt" font-weight="300">
|
|
1106
1115
|
<xsl:value-of select="java:toUpperCase(java:java.lang.String.new($term_kind))"/>
|
|
1107
1116
|
</fo:inline>
|
|
1108
1117
|
</fo:block>
|
|
@@ -1122,8 +1131,8 @@
|
|
|
1122
1131
|
<fo:table-row>
|
|
1123
1132
|
<fo:table-cell text-align="left">
|
|
1124
1133
|
<fo:block margin-left="-15mm"> <!-- Bibliography section title -->
|
|
1125
|
-
<xsl:attribute name="font-size">
|
|
1126
|
-
<xsl:attribute name="font-weight">
|
|
1134
|
+
<xsl:attribute name="font-size">22pt</xsl:attribute>
|
|
1135
|
+
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
|
1127
1136
|
<xsl:attribute name="margin-bottom">16pt</xsl:attribute>
|
|
1128
1137
|
<xsl:attribute name="color">black</xsl:attribute>
|
|
1129
1138
|
<xsl:attribute name="line-height">125%</xsl:attribute>
|
|
@@ -1216,7 +1225,7 @@
|
|
|
1216
1225
|
<xsl:choose>
|
|
1217
1226
|
<xsl:when test="contains(., '—')">
|
|
1218
1227
|
<xsl:variable name="name_number" select="normalize-space(translate(substring-before(., '—'), ' ', ' '))"/>
|
|
1219
|
-
<fo:inline font-weight="
|
|
1228
|
+
<fo:inline font-weight="bold" font-style="normal" color="black"><xsl:value-of select="java:toUpperCase(java:java.lang.String.new($name_number))"/><xsl:text>:</xsl:text></fo:inline>
|
|
1220
1229
|
<xsl:value-of select="substring-after(., '—')"/>
|
|
1221
1230
|
</xsl:when>
|
|
1222
1231
|
<xsl:otherwise>
|
|
@@ -1357,7 +1366,7 @@
|
|
|
1357
1366
|
</xsl:call-template>
|
|
1358
1367
|
</xsl:variable>
|
|
1359
1368
|
<fo:static-content flow-name="footer-odd">
|
|
1360
|
-
<fo:block-container font-size="
|
|
1369
|
+
<fo:block-container font-size="8pt" height="100%" color="black">
|
|
1361
1370
|
<fo:block text-align-last="justify" margin-right="1mm">
|
|
1362
1371
|
<fo:inline padding-right="11mm"><fo:page-number/></fo:inline>
|
|
1363
1372
|
<xsl:value-of select="$footerText"/>
|
|
@@ -1369,7 +1378,7 @@
|
|
|
1369
1378
|
</fo:block-container>
|
|
1370
1379
|
</fo:static-content>
|
|
1371
1380
|
<fo:static-content flow-name="footer-even">
|
|
1372
|
-
<fo:block-container font-size="
|
|
1381
|
+
<fo:block-container font-size="8pt" height="100%" color="black">
|
|
1373
1382
|
<fo:block text-align-last="justify" margin-right="1mm">
|
|
1374
1383
|
<fo:inline padding-right="11mm"><fo:page-number/></fo:inline>
|
|
1375
1384
|
<fo:inline>
|
|
@@ -1621,7 +1630,7 @@
|
|
|
1621
1630
|
|
|
1622
1631
|
|
|
1623
1632
|
<xsl:attribute name="color"><xsl:value-of select="$color_blue"/></xsl:attribute>
|
|
1624
|
-
<xsl:attribute name="font-weight">
|
|
1633
|
+
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
|
1625
1634
|
<xsl:attribute name="text-decoration">underline</xsl:attribute>
|
|
1626
1635
|
|
|
1627
1636
|
|
|
@@ -1708,7 +1717,7 @@
|
|
|
1708
1717
|
|
|
1709
1718
|
|
|
1710
1719
|
|
|
1711
|
-
<xsl:attribute name="font-weight">
|
|
1720
|
+
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
|
1712
1721
|
<xsl:attribute name="color"><xsl:value-of select="$color_blue"/></xsl:attribute>
|
|
1713
1722
|
<xsl:attribute name="padding-right">0.5mm</xsl:attribute>
|
|
1714
1723
|
|
|
@@ -1739,7 +1748,7 @@
|
|
|
1739
1748
|
|
|
1740
1749
|
|
|
1741
1750
|
|
|
1742
|
-
<xsl:attribute name="font-weight">
|
|
1751
|
+
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
|
1743
1752
|
<xsl:attribute name="color"><xsl:value-of select="$color_blue"/></xsl:attribute>
|
|
1744
1753
|
<xsl:attribute name="padding-right">0.5mm</xsl:attribute>
|
|
1745
1754
|
|
|
@@ -1802,6 +1811,7 @@
|
|
|
1802
1811
|
|
|
1803
1812
|
|
|
1804
1813
|
|
|
1814
|
+
|
|
1805
1815
|
</xsl:attribute-set><xsl:attribute-set name="note-style">
|
|
1806
1816
|
|
|
1807
1817
|
|
|
@@ -1836,7 +1846,7 @@
|
|
|
1836
1846
|
|
|
1837
1847
|
|
|
1838
1848
|
|
|
1839
|
-
<xsl:attribute name="font-weight">
|
|
1849
|
+
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
|
1840
1850
|
<xsl:attribute name="color"><xsl:value-of select="$color_blue"/></xsl:attribute>
|
|
1841
1851
|
<xsl:attribute name="padding-right">0.5mm</xsl:attribute>
|
|
1842
1852
|
|
|
@@ -1872,7 +1882,7 @@
|
|
|
1872
1882
|
|
|
1873
1883
|
|
|
1874
1884
|
|
|
1875
|
-
<xsl:attribute name="font-weight">
|
|
1885
|
+
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
|
1876
1886
|
<xsl:attribute name="color"><xsl:value-of select="$color_blue"/></xsl:attribute>
|
|
1877
1887
|
<xsl:attribute name="padding-right">0.5mm</xsl:attribute>
|
|
1878
1888
|
|
|
@@ -1991,13 +2001,13 @@
|
|
|
1991
2001
|
|
|
1992
2002
|
|
|
1993
2003
|
|
|
1994
|
-
<xsl:attribute name="font-weight">
|
|
2004
|
+
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
|
1995
2005
|
<xsl:attribute name="color">black</xsl:attribute>
|
|
1996
2006
|
|
|
1997
2007
|
</xsl:attribute-set><xsl:attribute-set name="deprecates-style">
|
|
1998
2008
|
|
|
1999
2009
|
|
|
2000
|
-
<xsl:attribute name="font-weight">
|
|
2010
|
+
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
|
2001
2011
|
<xsl:attribute name="color">black</xsl:attribute>
|
|
2002
2012
|
|
|
2003
2013
|
</xsl:attribute-set><xsl:attribute-set name="definition-style">
|
|
@@ -2038,14 +2048,15 @@
|
|
|
2038
2048
|
<xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name()='clause'][@type='scope']" mode="contents"/>
|
|
2039
2049
|
|
|
2040
2050
|
<!-- Normative references -->
|
|
2041
|
-
<xsl:apply-templates select="/*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']" mode="contents"/>
|
|
2051
|
+
<xsl:apply-templates select="/*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true'] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][@normative='true']]" mode="contents"/>
|
|
2042
2052
|
<!-- Terms and definitions -->
|
|
2043
2053
|
<xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name()='terms'] | /*/*[local-name()='sections']/*[local-name()='clause'][.//*[local-name()='terms']] | /*/*[local-name()='sections']/*[local-name()='definitions'] | /*/*[local-name()='sections']/*[local-name()='clause'][.//*[local-name()='definitions']]" mode="contents"/>
|
|
2044
2054
|
<!-- Another main sections -->
|
|
2045
2055
|
<xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name() != 'terms' and local-name() != 'definitions' and not(@type='scope') and not(local-name() = 'clause' and .//*[local-name()='terms']) and not(local-name() = 'clause' and .//*[local-name()='definitions'])]" mode="contents"/>
|
|
2046
2056
|
<xsl:apply-templates select="/*/*[local-name()='annex']" mode="contents"/>
|
|
2047
2057
|
<!-- Bibliography -->
|
|
2048
|
-
<xsl:apply-templates select="/*/*[local-name()='bibliography']/*[local-name()='references'][not(@normative='true')]" mode="contents"/>
|
|
2058
|
+
<xsl:apply-templates select="/*/*[local-name()='bibliography']/*[local-name()='references'][not(@normative='true')] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]]" mode="contents"/>
|
|
2059
|
+
|
|
2049
2060
|
</xsl:template><xsl:template name="processPrefaceSectionsDefault">
|
|
2050
2061
|
<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='abstract']"/>
|
|
2051
2062
|
<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='foreword']"/>
|
|
@@ -2191,7 +2202,7 @@
|
|
|
2191
2202
|
|
|
2192
2203
|
|
|
2193
2204
|
<attribute name="border">0pt solid black</attribute>
|
|
2194
|
-
<attribute name="font-size">
|
|
2205
|
+
<attribute name="font-size">8pt</attribute>
|
|
2195
2206
|
|
|
2196
2207
|
</xsl:variable>
|
|
2197
2208
|
|
|
@@ -2840,6 +2851,7 @@
|
|
|
2840
2851
|
|
|
2841
2852
|
|
|
2842
2853
|
|
|
2854
|
+
|
|
2843
2855
|
<xsl:attribute name="border">0pt solid black</xsl:attribute>
|
|
2844
2856
|
<xsl:attribute name="padding-top">0.5mm</xsl:attribute>
|
|
2845
2857
|
|
|
@@ -2874,6 +2886,9 @@
|
|
|
2874
2886
|
|
|
2875
2887
|
|
|
2876
2888
|
|
|
2889
|
+
<xsl:attribute name="font-size">8pt</xsl:attribute>
|
|
2890
|
+
|
|
2891
|
+
|
|
2877
2892
|
<fo:inline padding-right="2mm">
|
|
2878
2893
|
|
|
2879
2894
|
|
|
@@ -2915,6 +2930,7 @@
|
|
|
2915
2930
|
|
|
2916
2931
|
|
|
2917
2932
|
|
|
2933
|
+
|
|
2918
2934
|
<xsl:value-of select="@reference"/>
|
|
2919
2935
|
|
|
2920
2936
|
|
|
@@ -3059,6 +3075,9 @@
|
|
|
3059
3075
|
|
|
3060
3076
|
|
|
3061
3077
|
|
|
3078
|
+
|
|
3079
|
+
|
|
3080
|
+
|
|
3062
3081
|
<xsl:attribute name="font-size">70%</xsl:attribute>
|
|
3063
3082
|
<xsl:attribute name="vertical-align">super</xsl:attribute>
|
|
3064
3083
|
<xsl:attribute name="font-style">italic</xsl:attribute>
|
|
@@ -3388,7 +3407,7 @@
|
|
|
3388
3407
|
|
|
3389
3408
|
|
|
3390
3409
|
<xsl:attribute name="margin-top">0pt</xsl:attribute>
|
|
3391
|
-
<xsl:attribute name="font-weight">
|
|
3410
|
+
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
|
3392
3411
|
<xsl:attribute name="color"><xsl:value-of select="$color_blue"/></xsl:attribute>
|
|
3393
3412
|
|
|
3394
3413
|
<xsl:apply-templates/>
|
|
@@ -3974,12 +3993,13 @@
|
|
|
3974
3993
|
<fo:inline xsl:use-attribute-sets="link-style">
|
|
3975
3994
|
|
|
3976
3995
|
|
|
3977
|
-
<xsl:if test="
|
|
3996
|
+
<xsl:if test="ancestor::*[local-name() = 'bibitem']">
|
|
3978
3997
|
<xsl:attribute name="color">black</xsl:attribute>
|
|
3979
3998
|
<xsl:attribute name="text-decoration">none</xsl:attribute>
|
|
3980
3999
|
<xsl:attribute name="font-weight">300</xsl:attribute>
|
|
3981
4000
|
</xsl:if>
|
|
3982
4001
|
|
|
4002
|
+
|
|
3983
4003
|
<xsl:choose>
|
|
3984
4004
|
<xsl:when test="$target_text = ''">
|
|
3985
4005
|
<xsl:apply-templates/>
|
|
@@ -4346,6 +4366,234 @@
|
|
|
4346
4366
|
<xsl:param name="height"/>
|
|
4347
4367
|
<line xmlns="http://www.w3.org/2000/svg" x1="0" y1="0" x2="{$width}" y2="{$height}" style="stroke: rgb(255, 0, 0); stroke-width:4px; "/>
|
|
4348
4368
|
<line xmlns="http://www.w3.org/2000/svg" x1="0" y1="{$height}" x2="{$width}" y2="0" style="stroke: rgb(255, 0, 0); stroke-width:4px; "/>
|
|
4369
|
+
</xsl:template><xsl:variable name="figure_name_height">14</xsl:variable><xsl:variable name="width_effective" select="$pageWidth - $marginLeftRight1 - $marginLeftRight2"/><xsl:variable name="height_effective" select="$pageHeight - $marginTop - $marginBottom - $figure_name_height"/><xsl:variable name="image_dpi" select="96"/><xsl:variable name="width_effective_px" select="$width_effective div 25.4 * $image_dpi"/><xsl:variable name="height_effective_px" select="$height_effective div 25.4 * $image_dpi"/><xsl:template match="*[local-name() = 'figure'][not(*[local-name() = 'image']) and *[local-name() = 'svg']]/*[local-name() = 'name']/*[local-name() = 'bookmark']" priority="2"/><xsl:template match="*[local-name() = 'figure'][not(*[local-name() = 'image'])]/*[local-name() = 'svg']" priority="2" name="image_svg">
|
|
4370
|
+
<xsl:param name="name"/>
|
|
4371
|
+
|
|
4372
|
+
<xsl:variable name="svg_content">
|
|
4373
|
+
<xsl:apply-templates select="." mode="svg_update"/>
|
|
4374
|
+
</xsl:variable>
|
|
4375
|
+
|
|
4376
|
+
<xsl:variable name="alt-text">
|
|
4377
|
+
<xsl:choose>
|
|
4378
|
+
<xsl:when test="normalize-space(../*[local-name() = 'name']) != ''">
|
|
4379
|
+
<xsl:value-of select="../*[local-name() = 'name']"/>
|
|
4380
|
+
</xsl:when>
|
|
4381
|
+
<xsl:when test="normalize-space($name) != ''">
|
|
4382
|
+
<xsl:value-of select="$name"/>
|
|
4383
|
+
</xsl:when>
|
|
4384
|
+
<xsl:otherwise>Figure</xsl:otherwise>
|
|
4385
|
+
</xsl:choose>
|
|
4386
|
+
</xsl:variable>
|
|
4387
|
+
|
|
4388
|
+
<xsl:choose>
|
|
4389
|
+
<xsl:when test=".//*[local-name() = 'a'][*[local-name() = 'rect'] or *[local-name() = 'polygon'] or *[local-name() = 'circle'] or *[local-name() = 'ellipse']]">
|
|
4390
|
+
<fo:block>
|
|
4391
|
+
<xsl:variable name="width" select="@width"/>
|
|
4392
|
+
<xsl:variable name="height" select="@height"/>
|
|
4393
|
+
|
|
4394
|
+
<xsl:variable name="scale_x">
|
|
4395
|
+
<xsl:choose>
|
|
4396
|
+
<xsl:when test="$width > $width_effective_px">
|
|
4397
|
+
<xsl:value-of select="$width_effective_px div $width"/>
|
|
4398
|
+
</xsl:when>
|
|
4399
|
+
<xsl:otherwise>1</xsl:otherwise>
|
|
4400
|
+
</xsl:choose>
|
|
4401
|
+
</xsl:variable>
|
|
4402
|
+
|
|
4403
|
+
<xsl:variable name="scale_y">
|
|
4404
|
+
<xsl:choose>
|
|
4405
|
+
<xsl:when test="$height * $scale_x > $height_effective_px">
|
|
4406
|
+
<xsl:value-of select="$height_effective_px div ($height * $scale_x)"/>
|
|
4407
|
+
</xsl:when>
|
|
4408
|
+
<xsl:otherwise>1</xsl:otherwise>
|
|
4409
|
+
</xsl:choose>
|
|
4410
|
+
</xsl:variable>
|
|
4411
|
+
|
|
4412
|
+
<xsl:variable name="scale">
|
|
4413
|
+
<xsl:choose>
|
|
4414
|
+
<xsl:when test="$scale_y != 1">
|
|
4415
|
+
<xsl:value-of select="$scale_x * $scale_y"/>
|
|
4416
|
+
</xsl:when>
|
|
4417
|
+
<xsl:otherwise>
|
|
4418
|
+
<xsl:value-of select="$scale_x"/>
|
|
4419
|
+
</xsl:otherwise>
|
|
4420
|
+
</xsl:choose>
|
|
4421
|
+
</xsl:variable>
|
|
4422
|
+
|
|
4423
|
+
<xsl:variable name="width_scale" select="round($width * $scale)"/>
|
|
4424
|
+
<xsl:variable name="height_scale" select="round($height * $scale)"/>
|
|
4425
|
+
|
|
4426
|
+
<fo:table table-layout="fixed" width="100%">
|
|
4427
|
+
<fo:table-column column-width="proportional-column-width(1)"/>
|
|
4428
|
+
<fo:table-column column-width="{$width_scale}px"/>
|
|
4429
|
+
<fo:table-column column-width="proportional-column-width(1)"/>
|
|
4430
|
+
<fo:table-body>
|
|
4431
|
+
<fo:table-row>
|
|
4432
|
+
<fo:table-cell column-number="2">
|
|
4433
|
+
<fo:block>
|
|
4434
|
+
<fo:block-container width="{$width_scale}px" height="{$height_scale}px">
|
|
4435
|
+
<xsl:if test="../*[local-name() = 'name']/*[local-name() = 'bookmark']">
|
|
4436
|
+
<fo:block line-height="0" font-size="0">
|
|
4437
|
+
<xsl:for-each select="../*[local-name() = 'name']/*[local-name() = 'bookmark']">
|
|
4438
|
+
<xsl:call-template name="bookmark"/>
|
|
4439
|
+
</xsl:for-each>
|
|
4440
|
+
</fo:block>
|
|
4441
|
+
</xsl:if>
|
|
4442
|
+
<fo:block text-depth="0" line-height="0" font-size="0">
|
|
4443
|
+
|
|
4444
|
+
<fo:instream-foreign-object fox:alt-text="{$alt-text}">
|
|
4445
|
+
<xsl:attribute name="width">100%</xsl:attribute>
|
|
4446
|
+
<xsl:attribute name="content-height">100%</xsl:attribute>
|
|
4447
|
+
<xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
|
|
4448
|
+
<xsl:attribute name="scaling">uniform</xsl:attribute>
|
|
4449
|
+
|
|
4450
|
+
<xsl:apply-templates select="xalan:nodeset($svg_content)" mode="svg_remove_a"/>
|
|
4451
|
+
</fo:instream-foreign-object>
|
|
4452
|
+
</fo:block>
|
|
4453
|
+
|
|
4454
|
+
<xsl:apply-templates select=".//*[local-name() = 'a'][*[local-name() = 'rect'] or *[local-name() = 'polygon'] or *[local-name() = 'circle'] or *[local-name() = 'ellipse']]" mode="svg_imagemap_links">
|
|
4455
|
+
<xsl:with-param name="scale" select="$scale"/>
|
|
4456
|
+
</xsl:apply-templates>
|
|
4457
|
+
</fo:block-container>
|
|
4458
|
+
</fo:block>
|
|
4459
|
+
</fo:table-cell>
|
|
4460
|
+
</fo:table-row>
|
|
4461
|
+
</fo:table-body>
|
|
4462
|
+
</fo:table>
|
|
4463
|
+
</fo:block>
|
|
4464
|
+
|
|
4465
|
+
</xsl:when>
|
|
4466
|
+
<xsl:otherwise>
|
|
4467
|
+
<fo:block xsl:use-attribute-sets="image-style">
|
|
4468
|
+
<fo:instream-foreign-object fox:alt-text="{$alt-text}">
|
|
4469
|
+
<xsl:attribute name="width">100%</xsl:attribute>
|
|
4470
|
+
<xsl:attribute name="content-height">100%</xsl:attribute>
|
|
4471
|
+
<xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
|
|
4472
|
+
<!-- effective height 297 - 27.4 - 13 = 256.6 -->
|
|
4473
|
+
<!-- effective width 210 - 12.5 - 25 = 172.5 -->
|
|
4474
|
+
<!-- effective height / width = 1.48, 1.4 - with title -->
|
|
4475
|
+
<xsl:if test="@height > (@width * 1.4)"> <!-- for images with big height -->
|
|
4476
|
+
<xsl:variable name="width" select="((@width * 1.4) div @height) * 100"/>
|
|
4477
|
+
<xsl:attribute name="width"><xsl:value-of select="$width"/>%</xsl:attribute>
|
|
4478
|
+
</xsl:if>
|
|
4479
|
+
<xsl:attribute name="scaling">uniform</xsl:attribute>
|
|
4480
|
+
<xsl:copy-of select="$svg_content"/>
|
|
4481
|
+
</fo:instream-foreign-object>
|
|
4482
|
+
</fo:block>
|
|
4483
|
+
</xsl:otherwise>
|
|
4484
|
+
</xsl:choose>
|
|
4485
|
+
</xsl:template><xsl:template match="@*|node()" mode="svg_update">
|
|
4486
|
+
<xsl:copy>
|
|
4487
|
+
<xsl:apply-templates select="@*|node()" mode="svg_update"/>
|
|
4488
|
+
</xsl:copy>
|
|
4489
|
+
</xsl:template><xsl:template match="*[local-name() = 'image']/@href" mode="svg_update">
|
|
4490
|
+
<xsl:attribute name="href" namespace="http://www.w3.org/1999/xlink">
|
|
4491
|
+
<xsl:value-of select="."/>
|
|
4492
|
+
</xsl:attribute>
|
|
4493
|
+
</xsl:template><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'image'][@mimetype = 'image/svg+xml' and @src[not(starts-with(., 'data:image/'))]]" priority="2">
|
|
4494
|
+
<xsl:variable name="svg_content" select="document(@src)"/>
|
|
4495
|
+
<xsl:variable name="name" select="ancestor::*[local-name() = 'figure']/*[local-name() = 'name']"/>
|
|
4496
|
+
<xsl:for-each select="xalan:nodeset($svg_content)/node()">
|
|
4497
|
+
<xsl:call-template name="image_svg">
|
|
4498
|
+
<xsl:with-param name="name" select="$name"/>
|
|
4499
|
+
</xsl:call-template>
|
|
4500
|
+
</xsl:for-each>
|
|
4501
|
+
</xsl:template><xsl:template match="@*|node()" mode="svg_remove_a">
|
|
4502
|
+
<xsl:copy>
|
|
4503
|
+
<xsl:apply-templates select="@*|node()" mode="svg_remove_a"/>
|
|
4504
|
+
</xsl:copy>
|
|
4505
|
+
</xsl:template><xsl:template match="*[local-name() = 'a']" mode="svg_remove_a">
|
|
4506
|
+
<xsl:apply-templates mode="svg_remove_a"/>
|
|
4507
|
+
</xsl:template><xsl:template match="*[local-name() = 'a']" mode="svg_imagemap_links">
|
|
4508
|
+
<xsl:param name="scale"/>
|
|
4509
|
+
<xsl:variable name="dest">
|
|
4510
|
+
<xsl:choose>
|
|
4511
|
+
<xsl:when test="starts-with(@href, '#')">
|
|
4512
|
+
<xsl:value-of select="substring-after(@href, '#')"/>
|
|
4513
|
+
</xsl:when>
|
|
4514
|
+
<xsl:otherwise>
|
|
4515
|
+
<xsl:value-of select="@href"/>
|
|
4516
|
+
</xsl:otherwise>
|
|
4517
|
+
</xsl:choose>
|
|
4518
|
+
</xsl:variable>
|
|
4519
|
+
<xsl:for-each select="./*[local-name() = 'rect']">
|
|
4520
|
+
<xsl:call-template name="insertSVGMapLink">
|
|
4521
|
+
<xsl:with-param name="left" select="floor(@x * $scale)"/>
|
|
4522
|
+
<xsl:with-param name="top" select="floor(@y * $scale)"/>
|
|
4523
|
+
<xsl:with-param name="width" select="floor(@width * $scale)"/>
|
|
4524
|
+
<xsl:with-param name="height" select="floor(@height * $scale)"/>
|
|
4525
|
+
<xsl:with-param name="dest" select="$dest"/>
|
|
4526
|
+
</xsl:call-template>
|
|
4527
|
+
</xsl:for-each>
|
|
4528
|
+
|
|
4529
|
+
<xsl:for-each select="./*[local-name() = 'polygon']">
|
|
4530
|
+
<xsl:variable name="points">
|
|
4531
|
+
<xsl:call-template name="split">
|
|
4532
|
+
<xsl:with-param name="pText" select="@points"/>
|
|
4533
|
+
</xsl:call-template>
|
|
4534
|
+
</xsl:variable>
|
|
4535
|
+
<xsl:variable name="x_coords">
|
|
4536
|
+
<xsl:for-each select="xalan:nodeset($points)//item[position() mod 2 = 1]">
|
|
4537
|
+
<xsl:sort select="." data-type="number"/>
|
|
4538
|
+
<x><xsl:value-of select="."/></x>
|
|
4539
|
+
</xsl:for-each>
|
|
4540
|
+
</xsl:variable>
|
|
4541
|
+
<xsl:variable name="y_coords">
|
|
4542
|
+
<xsl:for-each select="xalan:nodeset($points)//item[position() mod 2 = 0]">
|
|
4543
|
+
<xsl:sort select="." data-type="number"/>
|
|
4544
|
+
<y><xsl:value-of select="."/></y>
|
|
4545
|
+
</xsl:for-each>
|
|
4546
|
+
</xsl:variable>
|
|
4547
|
+
<xsl:variable name="x" select="xalan:nodeset($x_coords)//x[1]"/>
|
|
4548
|
+
<xsl:variable name="y" select="xalan:nodeset($y_coords)//y[1]"/>
|
|
4549
|
+
<xsl:variable name="width" select="xalan:nodeset($x_coords)//x[last()] - $x"/>
|
|
4550
|
+
<xsl:variable name="height" select="xalan:nodeset($y_coords)//y[last()] - $y"/>
|
|
4551
|
+
<xsl:call-template name="insertSVGMapLink">
|
|
4552
|
+
<xsl:with-param name="left" select="floor($x * $scale)"/>
|
|
4553
|
+
<xsl:with-param name="top" select="floor($y * $scale)"/>
|
|
4554
|
+
<xsl:with-param name="width" select="floor($width * $scale)"/>
|
|
4555
|
+
<xsl:with-param name="height" select="floor($height * $scale)"/>
|
|
4556
|
+
<xsl:with-param name="dest" select="$dest"/>
|
|
4557
|
+
</xsl:call-template>
|
|
4558
|
+
</xsl:for-each>
|
|
4559
|
+
|
|
4560
|
+
<xsl:for-each select="./*[local-name() = 'circle']">
|
|
4561
|
+
<xsl:call-template name="insertSVGMapLink">
|
|
4562
|
+
<xsl:with-param name="left" select="floor((@cx - @r) * $scale)"/>
|
|
4563
|
+
<xsl:with-param name="top" select="floor((@cy - @r) * $scale)"/>
|
|
4564
|
+
<xsl:with-param name="width" select="floor(@r * 2 * $scale)"/>
|
|
4565
|
+
<xsl:with-param name="height" select="floor(@r * 2 * $scale)"/>
|
|
4566
|
+
<xsl:with-param name="dest" select="$dest"/>
|
|
4567
|
+
</xsl:call-template>
|
|
4568
|
+
</xsl:for-each>
|
|
4569
|
+
<xsl:for-each select="./*[local-name() = 'ellipse']">
|
|
4570
|
+
<xsl:call-template name="insertSVGMapLink">
|
|
4571
|
+
<xsl:with-param name="left" select="floor((@cx - @rx) * $scale)"/>
|
|
4572
|
+
<xsl:with-param name="top" select="floor((@cy - @ry) * $scale)"/>
|
|
4573
|
+
<xsl:with-param name="width" select="floor(@rx * 2 * $scale)"/>
|
|
4574
|
+
<xsl:with-param name="height" select="floor(@ry * 2 * $scale)"/>
|
|
4575
|
+
<xsl:with-param name="dest" select="$dest"/>
|
|
4576
|
+
</xsl:call-template>
|
|
4577
|
+
</xsl:for-each>
|
|
4578
|
+
</xsl:template><xsl:template name="insertSVGMapLink">
|
|
4579
|
+
<xsl:param name="left"/>
|
|
4580
|
+
<xsl:param name="top"/>
|
|
4581
|
+
<xsl:param name="width"/>
|
|
4582
|
+
<xsl:param name="height"/>
|
|
4583
|
+
<xsl:param name="dest"/>
|
|
4584
|
+
<fo:block-container position="absolute" left="{$left}px" top="{$top}px" width="{$width}px" height="{$height}px">
|
|
4585
|
+
<fo:block font-size="1pt">
|
|
4586
|
+
<fo:basic-link internal-destination="{$dest}" fox:alt-text="svg link">
|
|
4587
|
+
<fo:inline-container inline-progression-dimension="100%">
|
|
4588
|
+
<fo:block-container height="{$height - 1}px" width="100%">
|
|
4589
|
+
<!-- DEBUG <xsl:if test="local-name()='polygon'">
|
|
4590
|
+
<xsl:attribute name="background-color">magenta</xsl:attribute>
|
|
4591
|
+
</xsl:if> -->
|
|
4592
|
+
<fo:block> </fo:block></fo:block-container>
|
|
4593
|
+
</fo:inline-container>
|
|
4594
|
+
</fo:basic-link>
|
|
4595
|
+
</fo:block>
|
|
4596
|
+
</fo:block-container>
|
|
4349
4597
|
</xsl:template><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] | *[local-name() = 'table']/*[local-name() = 'name'] | *[local-name() = 'permission']/*[local-name() = 'name'] | *[local-name() = 'recommendation']/*[local-name() = 'name'] | *[local-name() = 'requirement']/*[local-name() = 'name']" mode="contents">
|
|
4350
4598
|
<xsl:apply-templates mode="contents"/>
|
|
4351
4599
|
<xsl:text> </xsl:text>
|
|
@@ -4374,28 +4622,39 @@
|
|
|
4374
4622
|
<xsl:when test="count(xalan:nodeset($contents)/doc) > 1">
|
|
4375
4623
|
<xsl:for-each select="xalan:nodeset($contents)/doc">
|
|
4376
4624
|
<fo:bookmark internal-destination="{contents/item[1]/@id}" starting-state="hide">
|
|
4625
|
+
<xsl:if test="@bundle = 'true'">
|
|
4626
|
+
<xsl:attribute name="internal-destination"><xsl:value-of select="@firstpage_id"/></xsl:attribute>
|
|
4627
|
+
</xsl:if>
|
|
4377
4628
|
<fo:bookmark-title>
|
|
4378
|
-
<xsl:variable name="bookmark-title_">
|
|
4379
|
-
<xsl:call-template name="getLangVersion">
|
|
4380
|
-
<xsl:with-param name="lang" select="@lang"/>
|
|
4381
|
-
<xsl:with-param name="doctype" select="@doctype"/>
|
|
4382
|
-
<xsl:with-param name="title" select="@title-part"/>
|
|
4383
|
-
</xsl:call-template>
|
|
4384
|
-
</xsl:variable>
|
|
4385
4629
|
<xsl:choose>
|
|
4386
|
-
<xsl:when test="normalize-space(
|
|
4387
|
-
<xsl:
|
|
4388
|
-
|
|
4389
|
-
|
|
4630
|
+
<xsl:when test="not(normalize-space(@bundle) = 'true')"> <!-- 'bundle' means several different documents (not language versions) in one xml -->
|
|
4631
|
+
<xsl:variable name="bookmark-title_">
|
|
4632
|
+
<xsl:call-template name="getLangVersion">
|
|
4633
|
+
<xsl:with-param name="lang" select="@lang"/>
|
|
4634
|
+
<xsl:with-param name="doctype" select="@doctype"/>
|
|
4635
|
+
<xsl:with-param name="title" select="@title-part"/>
|
|
4636
|
+
</xsl:call-template>
|
|
4637
|
+
</xsl:variable>
|
|
4390
4638
|
<xsl:choose>
|
|
4391
|
-
<xsl:when test="
|
|
4392
|
-
|
|
4393
|
-
|
|
4394
|
-
<xsl:otherwise
|
|
4639
|
+
<xsl:when test="normalize-space($bookmark-title_) != ''">
|
|
4640
|
+
<xsl:value-of select="normalize-space($bookmark-title_)"/>
|
|
4641
|
+
</xsl:when>
|
|
4642
|
+
<xsl:otherwise>
|
|
4643
|
+
<xsl:choose>
|
|
4644
|
+
<xsl:when test="@lang = 'en'">English</xsl:when>
|
|
4645
|
+
<xsl:when test="@lang = 'fr'">Français</xsl:when>
|
|
4646
|
+
<xsl:when test="@lang = 'de'">Deutsche</xsl:when>
|
|
4647
|
+
<xsl:otherwise><xsl:value-of select="@lang"/> version</xsl:otherwise>
|
|
4648
|
+
</xsl:choose>
|
|
4649
|
+
</xsl:otherwise>
|
|
4395
4650
|
</xsl:choose>
|
|
4651
|
+
</xsl:when>
|
|
4652
|
+
<xsl:otherwise>
|
|
4653
|
+
<xsl:value-of select="@title-part"/>
|
|
4396
4654
|
</xsl:otherwise>
|
|
4397
4655
|
</xsl:choose>
|
|
4398
4656
|
</fo:bookmark-title>
|
|
4657
|
+
|
|
4399
4658
|
<xsl:apply-templates select="contents/item" mode="bookmark"/>
|
|
4400
4659
|
|
|
4401
4660
|
<xsl:call-template name="insertFigureBookmarks">
|
|
@@ -4494,16 +4753,23 @@
|
|
|
4494
4753
|
<xsl:otherwise><xsl:value-of select="$lang"/> version</xsl:otherwise>
|
|
4495
4754
|
</xsl:choose>
|
|
4496
4755
|
</xsl:template><xsl:template match="item" mode="bookmark">
|
|
4497
|
-
<
|
|
4498
|
-
|
|
4499
|
-
|
|
4500
|
-
|
|
4501
|
-
<xsl:
|
|
4502
|
-
|
|
4503
|
-
|
|
4504
|
-
|
|
4505
|
-
|
|
4506
|
-
|
|
4756
|
+
<xsl:choose>
|
|
4757
|
+
<xsl:when test="@id != ''">
|
|
4758
|
+
<fo:bookmark internal-destination="{@id}" starting-state="hide">
|
|
4759
|
+
<fo:bookmark-title>
|
|
4760
|
+
<xsl:if test="@section != ''">
|
|
4761
|
+
<xsl:value-of select="@section"/>
|
|
4762
|
+
<xsl:text> </xsl:text>
|
|
4763
|
+
</xsl:if>
|
|
4764
|
+
<xsl:value-of select="normalize-space(title)"/>
|
|
4765
|
+
</fo:bookmark-title>
|
|
4766
|
+
<xsl:apply-templates mode="bookmark"/>
|
|
4767
|
+
</fo:bookmark>
|
|
4768
|
+
</xsl:when>
|
|
4769
|
+
<xsl:otherwise>
|
|
4770
|
+
<xsl:apply-templates mode="bookmark"/>
|
|
4771
|
+
</xsl:otherwise>
|
|
4772
|
+
</xsl:choose>
|
|
4507
4773
|
</xsl:template><xsl:template match="title" mode="bookmark"/><xsl:template match="text()" mode="bookmark"/><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] | *[local-name() = 'image']/*[local-name() = 'name']" mode="presentation">
|
|
4508
4774
|
<xsl:if test="normalize-space() != ''">
|
|
4509
4775
|
<fo:block xsl:use-attribute-sets="figure-name-style">
|
|
@@ -4988,7 +5254,7 @@
|
|
|
4988
5254
|
<fo:inline>
|
|
4989
5255
|
|
|
4990
5256
|
|
|
4991
|
-
<xsl:attribute name="font-weight">
|
|
5257
|
+
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
|
4992
5258
|
<xsl:attribute name="color"><xsl:value-of select="$color_blue"/></xsl:attribute>
|
|
4993
5259
|
|
|
4994
5260
|
|
|
@@ -5071,6 +5337,7 @@
|
|
|
5071
5337
|
</xsl:if>
|
|
5072
5338
|
|
|
5073
5339
|
<fo:basic-link internal-destination="{@bibitemid}" fox:alt-text="{@citeas}">
|
|
5340
|
+
|
|
5074
5341
|
<xsl:if test="normalize-space(@citeas) = ''">
|
|
5075
5342
|
<xsl:attribute name="fox:alt-text"><xsl:value-of select="."/></xsl:attribute>
|
|
5076
5343
|
</xsl:if>
|
data/metanorma-ribose.gemspec
CHANGED
|
@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
|
|
|
28
28
|
spec.require_paths = ["lib"]
|
|
29
29
|
spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
|
|
30
30
|
|
|
31
|
-
spec.add_dependency "metanorma-generic", "~> 1.10.
|
|
31
|
+
spec.add_dependency "metanorma-generic", "~> 1.10.2"
|
|
32
32
|
|
|
33
33
|
spec.add_development_dependency "byebug", "~> 9.1"
|
|
34
34
|
spec.add_development_dependency "equivalent-xml", "~> 0.6"
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: metanorma-ribose
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.7.
|
|
4
|
+
version: 1.7.6
|
|
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-
|
|
11
|
+
date: 2021-07-05 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: metanorma-generic
|
|
@@ -16,14 +16,14 @@ dependencies:
|
|
|
16
16
|
requirements:
|
|
17
17
|
- - "~>"
|
|
18
18
|
- !ruby/object:Gem::Version
|
|
19
|
-
version: 1.10.
|
|
19
|
+
version: 1.10.2
|
|
20
20
|
type: :runtime
|
|
21
21
|
prerelease: false
|
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
|
23
23
|
requirements:
|
|
24
24
|
- - "~>"
|
|
25
25
|
- !ruby/object:Gem::Version
|
|
26
|
-
version: 1.10.
|
|
26
|
+
version: 1.10.2
|
|
27
27
|
- !ruby/object:Gem::Dependency
|
|
28
28
|
name: byebug
|
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|