metanorma-ieee 1.4.9 → 1.5.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/isodoc/ieee/ieee.amendment.xsl +740 -618
- data/lib/isodoc/ieee/ieee.standard.xsl +740 -618
- data/lib/isodoc/ieee/presentation_xml_convert.rb +0 -5
- data/lib/isodoc/ieee/word_cleanup_blocks.rb +92 -2
- data/lib/isodoc/ieee/word_convert.rb +6 -5
- data/lib/metanorma/ieee/front.rb +1 -1
- data/lib/metanorma/ieee/isodoc.rng +51 -6
- data/lib/metanorma/ieee/version.rb +1 -1
- metadata +2 -2
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
<xsl:output method="xml" encoding="UTF-8" indent="no"/>
|
|
4
4
|
|
|
5
5
|
<!-- mandatory 'key' -->
|
|
6
|
-
<xsl:key name="kfn" match="mn:fn[not(ancestor::*[self::mn:table or self::mn:figure or self::mn:localized-strings] and not(ancestor::mn:name))]" use="@reference"/>
|
|
6
|
+
<xsl:key name="kfn" match="mn:fn[not(ancestor::*[self::mn:table or self::mn:figure or self::mn:localized-strings] and not(ancestor::mn:fmt-name))]" use="@reference"/>
|
|
7
7
|
|
|
8
8
|
<!-- mandatory variable -->
|
|
9
9
|
|
|
@@ -112,6 +112,165 @@
|
|
|
112
112
|
|
|
113
113
|
<xsl:variable name="line-height">1.8</xsl:variable>
|
|
114
114
|
|
|
115
|
+
<xsl:template name="layout-master-set">
|
|
116
|
+
<fo:layout-master-set>
|
|
117
|
+
|
|
118
|
+
<!-- IEEE template for:
|
|
119
|
+
- draft documents
|
|
120
|
+
- non standard documents (whitepaper, ICAP whitepaper, industry connection report)
|
|
121
|
+
- standard documents
|
|
122
|
+
-->
|
|
123
|
+
|
|
124
|
+
<!-- ======================== -->
|
|
125
|
+
<!-- IEEE pages -->
|
|
126
|
+
<!-- ======================== -->
|
|
127
|
+
<!-- IEEE cover page -->
|
|
128
|
+
|
|
129
|
+
<!-- IEEE standard cover page -->
|
|
130
|
+
<fo:simple-page-master master-name="cover-and-back-page-standard" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
131
|
+
<fo:region-body margin-top="62mm" margin-bottom="25mm" margin-left="21.2mm" margin-right="25mm"/>
|
|
132
|
+
<fo:region-before region-name="header" extent="62mm" precedence="true"/>
|
|
133
|
+
<fo:region-after region-name="footer" extent="25mm"/>
|
|
134
|
+
<fo:region-start region-name="left-region" extent="21.2mm"/>
|
|
135
|
+
<fo:region-end region-name="right-region" extent="25mm"/>
|
|
136
|
+
</fo:simple-page-master>
|
|
137
|
+
|
|
138
|
+
<!-- IEEE industry connection report cover page -->
|
|
139
|
+
<fo:simple-page-master master-name="cover-and-back-page-industry-connection-report" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
140
|
+
<fo:region-body margin-top="116mm" margin-bottom="15mm" margin-left="62mm" margin-right="35mm"/>
|
|
141
|
+
<fo:region-before region-name="header" extent="116mm"/>
|
|
142
|
+
<fo:region-after region-name="footer" extent="15mm"/>
|
|
143
|
+
<fo:region-start region-name="left-region" extent="62mm" precedence="true"/>
|
|
144
|
+
<fo:region-end region-name="right-region" extent="35mm"/>
|
|
145
|
+
</fo:simple-page-master>
|
|
146
|
+
|
|
147
|
+
<!-- ================== -->
|
|
148
|
+
<!-- IEEE whitepaper, ICAP whitepaper, connection-report -->
|
|
149
|
+
<!-- ================== -->
|
|
150
|
+
<fo:simple-page-master master-name="cover-page-nonstandard" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
151
|
+
<fo:region-body margin-top="115mm" margin-bottom="15mm" margin-left="64mm" margin-right="35mm"/>
|
|
152
|
+
<fo:region-before region-name="header" extent="115mm"/>
|
|
153
|
+
<fo:region-after region-name="footer" extent="15mm"/>
|
|
154
|
+
<fo:region-start region-name="left-region" extent="64mm" precedence="true"/>
|
|
155
|
+
<fo:region-end region-name="right-region" extent="35mm"/>
|
|
156
|
+
</fo:simple-page-master>
|
|
157
|
+
|
|
158
|
+
<fo:simple-page-master master-name="document-nonstandard" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
159
|
+
<fo:region-body margin-top="25.4mm" margin-bottom="25.4mm" margin-left="19mm" margin-right="19mm"/>
|
|
160
|
+
<fo:region-before region-name="header" extent="25.4mm"/>
|
|
161
|
+
<fo:region-after region-name="footer" extent="25.4mm"/>
|
|
162
|
+
<fo:region-start region-name="left-region" extent="19mm"/>
|
|
163
|
+
<fo:region-end region-name="right-region" extent="19mm"/>
|
|
164
|
+
</fo:simple-page-master>
|
|
165
|
+
|
|
166
|
+
<!-- landscape -->
|
|
167
|
+
<fo:simple-page-master master-name="document-nonstandard-landscape" page-width="{$pageHeight}mm" page-height="{$pageWidth}mm">
|
|
168
|
+
<fo:region-body margin-top="19mm" margin-bottom="19mm" margin-left="25.4mm" margin-right="25.4mm"/>
|
|
169
|
+
<fo:region-before region-name="header" extent="19mm" precedence="true"/>
|
|
170
|
+
<fo:region-after region-name="footer" extent="19mm" precedence="true"/>
|
|
171
|
+
<fo:region-start region-name="left-region-landscape" extent="25.4mm"/>
|
|
172
|
+
<fo:region-end region-name="right-region-landscape" extent="25.4mm"/>
|
|
173
|
+
</fo:simple-page-master>
|
|
174
|
+
|
|
175
|
+
<fo:simple-page-master master-name="back-page-nonstandard" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
176
|
+
<fo:region-body margin-top="73mm" margin-bottom="15mm" margin-left="63.5mm" margin-right="35mm"/>
|
|
177
|
+
<fo:region-before region-name="header" extent="73mm"/>
|
|
178
|
+
<fo:region-after region-name="footer" extent="15mm"/>
|
|
179
|
+
<fo:region-start region-name="left-region" extent="63.5mm" precedence="true"/>
|
|
180
|
+
<fo:region-end region-name="right-region" extent="35mm"/>
|
|
181
|
+
</fo:simple-page-master>
|
|
182
|
+
<!-- ================== -->
|
|
183
|
+
<!-- End: IEEE whitepaper -->
|
|
184
|
+
<!-- ================== -->
|
|
185
|
+
|
|
186
|
+
<!-- ToC for non-standards (whitepaper, icap-whitepaper, industry-connection-report) -->
|
|
187
|
+
<fo:simple-page-master master-name="page-toc-first" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
188
|
+
<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="19mm" margin-right="19mm"/>
|
|
189
|
+
<fo:region-before region-name="header" extent="{$marginTop}mm" precedence="true"/>
|
|
190
|
+
<fo:region-after region-name="footer_empty" extent="{$marginBottom}mm"/> <!-- empty footer for 1st ToC page -->
|
|
191
|
+
<fo:region-start region-name="left-region" extent="19mm"/>
|
|
192
|
+
<fo:region-end region-name="right-region" extent="19mm"/>
|
|
193
|
+
</fo:simple-page-master>
|
|
194
|
+
<fo:simple-page-master master-name="page-toc-any" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
195
|
+
<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="19mm" margin-right="19mm"/>
|
|
196
|
+
<fo:region-before region-name="header" extent="{$marginTop}mm" precedence="true"/>
|
|
197
|
+
<fo:region-after region-name="footer" extent="{$marginBottom}mm"/>
|
|
198
|
+
<fo:region-start region-name="left-region" extent="19mm"/>
|
|
199
|
+
<fo:region-end region-name="right-region" extent="19mm"/>
|
|
200
|
+
</fo:simple-page-master>
|
|
201
|
+
<fo:page-sequence-master master-name="page-toc">
|
|
202
|
+
<fo:repeatable-page-master-alternatives>
|
|
203
|
+
<fo:conditional-page-master-reference page-position="first" master-reference="page-toc-first"/>
|
|
204
|
+
<fo:conditional-page-master-reference page-position="any" master-reference="page-toc-any"/>
|
|
205
|
+
</fo:repeatable-page-master-alternatives>
|
|
206
|
+
</fo:page-sequence-master>
|
|
207
|
+
|
|
208
|
+
<!-- =================== -->
|
|
209
|
+
<!-- Drafts pages -->
|
|
210
|
+
<!-- =================== -->
|
|
211
|
+
<fo:simple-page-master master-name="document-draft" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
212
|
+
<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/>
|
|
213
|
+
<fo:region-before region-name="header" extent="{$marginTop}mm"/>
|
|
214
|
+
<fo:region-after region-name="footer" extent="{$marginBottom}mm"/>
|
|
215
|
+
<fo:region-start region-name="left-region" extent="{$marginLeftRight1}mm"/>
|
|
216
|
+
<fo:region-end region-name="right-region" extent="{$marginLeftRight2}mm"/>
|
|
217
|
+
</fo:simple-page-master>
|
|
218
|
+
|
|
219
|
+
<!-- landscape -->
|
|
220
|
+
<fo:simple-page-master master-name="document-draft-landscape" page-width="{$pageHeight}mm" page-height="{$pageWidth}mm">
|
|
221
|
+
<fo:region-body margin-top="{$marginLeftRight1}mm" margin-bottom="{$marginLeftRight2}mm" margin-left="{$marginBottom}mm" margin-right="{$marginTop}mm"/>
|
|
222
|
+
<fo:region-before region-name="header" extent="{$marginLeftRight1}mm" precedence="true"/>
|
|
223
|
+
<fo:region-after region-name="footer" extent="{$marginLeftRight2}mm" precedence="true"/>
|
|
224
|
+
<fo:region-start region-name="left-region-landscape" extent="{$marginBottom}mm"/>
|
|
225
|
+
<fo:region-end region-name="right-region-landscape" extent="{$marginTop}mm"/>
|
|
226
|
+
</fo:simple-page-master>
|
|
227
|
+
<!-- =================== -->
|
|
228
|
+
<!-- =================== -->
|
|
229
|
+
|
|
230
|
+
<!-- ======================= -->
|
|
231
|
+
<!-- Standard document pages -->
|
|
232
|
+
<!-- ======================= -->
|
|
233
|
+
<fo:simple-page-master master-name="document-standard-first" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
234
|
+
<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/>
|
|
235
|
+
<fo:region-before region-name="header_empty" extent="{$marginTop}mm"/>
|
|
236
|
+
<fo:region-after region-name="footer" extent="{$marginBottom}mm"/>
|
|
237
|
+
<fo:region-start region-name="left-region" extent="{$marginLeftRight1}mm"/>
|
|
238
|
+
<fo:region-end region-name="right-region" extent="{$marginLeftRight2}mm"/>
|
|
239
|
+
</fo:simple-page-master>
|
|
240
|
+
<fo:page-sequence-master master-name="document-standard">
|
|
241
|
+
<fo:repeatable-page-master-alternatives>
|
|
242
|
+
<fo:conditional-page-master-reference page-position="first" master-reference="document-standard-first"/>
|
|
243
|
+
<fo:conditional-page-master-reference page-position="any" master-reference="document-draft"/>
|
|
244
|
+
</fo:repeatable-page-master-alternatives>
|
|
245
|
+
</fo:page-sequence-master>
|
|
246
|
+
|
|
247
|
+
<!-- landscape -->
|
|
248
|
+
<fo:simple-page-master master-name="document-standard-landscape" page-width="{$pageHeight}mm" page-height="{$pageWidth}mm">
|
|
249
|
+
<fo:region-body margin-top="{$marginLeftRight1}mm" margin-bottom="{$marginLeftRight2}mm" margin-left="{$marginBottom}mm" margin-right="{$marginTop}mm"/>
|
|
250
|
+
<fo:region-before region-name="header" extent="{$marginLeftRight1}mm" precedence="true"/>
|
|
251
|
+
<fo:region-after region-name="footer" extent="{$marginLeftRight2}mm" precedence="true"/>
|
|
252
|
+
<fo:region-start region-name="left-region-landscape" extent="{$marginBottom}mm"/>
|
|
253
|
+
<fo:region-end region-name="right-region-landscape" extent="{$marginTop}mm"/>
|
|
254
|
+
</fo:simple-page-master>
|
|
255
|
+
<!-- ======================= -->
|
|
256
|
+
<!-- ======================= -->
|
|
257
|
+
|
|
258
|
+
<!-- Index pages -->
|
|
259
|
+
<fo:simple-page-master master-name="page-index" 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" column-count="2" column-gap="10mm"/>
|
|
261
|
+
<fo:region-before region-name="header" extent="{$marginTop}mm"/>
|
|
262
|
+
<fo:region-after region-name="footer" extent="{$marginBottom}mm"/>
|
|
263
|
+
<fo:region-start region-name="left-region" extent="{$marginLeftRight1}mm"/>
|
|
264
|
+
<fo:region-end region-name="right-region" extent="{$marginLeftRight2}mm"/>
|
|
265
|
+
</fo:simple-page-master>
|
|
266
|
+
|
|
267
|
+
<!-- ======================== -->
|
|
268
|
+
<!-- END IEEE pages -->
|
|
269
|
+
<!-- ======================== -->
|
|
270
|
+
|
|
271
|
+
</fo:layout-master-set>
|
|
272
|
+
</xsl:template> <!-- END: layout-master-set -->
|
|
273
|
+
|
|
115
274
|
<xsl:template match="/">
|
|
116
275
|
<fo:root xml:lang="{$lang}">
|
|
117
276
|
<xsl:variable name="root-style">
|
|
@@ -130,162 +289,7 @@
|
|
|
130
289
|
<xsl:processing-instruction name="add_line_numbers">true</xsl:processing-instruction>
|
|
131
290
|
</xsl:if>
|
|
132
291
|
|
|
133
|
-
<
|
|
134
|
-
|
|
135
|
-
<!-- IEEE template for:
|
|
136
|
-
- draft documents
|
|
137
|
-
- non standard documents (whitepaper, ICAP whitepaper, industry connection report)
|
|
138
|
-
- standard documents
|
|
139
|
-
-->
|
|
140
|
-
|
|
141
|
-
<!-- ======================== -->
|
|
142
|
-
<!-- IEEE pages -->
|
|
143
|
-
<!-- ======================== -->
|
|
144
|
-
<!-- IEEE cover page -->
|
|
145
|
-
|
|
146
|
-
<!-- IEEE standard cover page -->
|
|
147
|
-
<fo:simple-page-master master-name="cover-and-back-page-standard" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
148
|
-
<fo:region-body margin-top="62mm" margin-bottom="25mm" margin-left="21.2mm" margin-right="25mm"/>
|
|
149
|
-
<fo:region-before region-name="header" extent="62mm" precedence="true"/>
|
|
150
|
-
<fo:region-after region-name="footer" extent="25mm"/>
|
|
151
|
-
<fo:region-start region-name="left-region" extent="21.2mm"/>
|
|
152
|
-
<fo:region-end region-name="right-region" extent="25mm"/>
|
|
153
|
-
</fo:simple-page-master>
|
|
154
|
-
|
|
155
|
-
<!-- IEEE industry connection report cover page -->
|
|
156
|
-
<fo:simple-page-master master-name="cover-and-back-page-industry-connection-report" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
157
|
-
<fo:region-body margin-top="116mm" margin-bottom="15mm" margin-left="62mm" margin-right="35mm"/>
|
|
158
|
-
<fo:region-before region-name="header" extent="116mm"/>
|
|
159
|
-
<fo:region-after region-name="footer" extent="15mm"/>
|
|
160
|
-
<fo:region-start region-name="left-region" extent="62mm" precedence="true"/>
|
|
161
|
-
<fo:region-end region-name="right-region" extent="35mm"/>
|
|
162
|
-
</fo:simple-page-master>
|
|
163
|
-
|
|
164
|
-
<!-- ================== -->
|
|
165
|
-
<!-- IEEE whitepaper, ICAP whitepaper, connection-report -->
|
|
166
|
-
<!-- ================== -->
|
|
167
|
-
<fo:simple-page-master master-name="cover-page-nonstandard" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
168
|
-
<fo:region-body margin-top="115mm" margin-bottom="15mm" margin-left="64mm" margin-right="35mm"/>
|
|
169
|
-
<fo:region-before region-name="header" extent="115mm"/>
|
|
170
|
-
<fo:region-after region-name="footer" extent="15mm"/>
|
|
171
|
-
<fo:region-start region-name="left-region" extent="64mm" precedence="true"/>
|
|
172
|
-
<fo:region-end region-name="right-region" extent="35mm"/>
|
|
173
|
-
</fo:simple-page-master>
|
|
174
|
-
|
|
175
|
-
<fo:simple-page-master master-name="document-nonstandard" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
176
|
-
<fo:region-body margin-top="25.4mm" margin-bottom="25.4mm" margin-left="19mm" margin-right="19mm"/>
|
|
177
|
-
<fo:region-before region-name="header" extent="25.4mm"/>
|
|
178
|
-
<fo:region-after region-name="footer" extent="25.4mm"/>
|
|
179
|
-
<fo:region-start region-name="left-region" extent="19mm"/>
|
|
180
|
-
<fo:region-end region-name="right-region" extent="19mm"/>
|
|
181
|
-
</fo:simple-page-master>
|
|
182
|
-
|
|
183
|
-
<!-- landscape -->
|
|
184
|
-
<fo:simple-page-master master-name="document-nonstandard-landscape" page-width="{$pageHeight}mm" page-height="{$pageWidth}mm">
|
|
185
|
-
<fo:region-body margin-top="19mm" margin-bottom="19mm" margin-left="25.4mm" margin-right="25.4mm"/>
|
|
186
|
-
<fo:region-before region-name="header" extent="19mm" precedence="true"/>
|
|
187
|
-
<fo:region-after region-name="footer" extent="19mm" precedence="true"/>
|
|
188
|
-
<fo:region-start region-name="left-region-landscape" extent="25.4mm"/>
|
|
189
|
-
<fo:region-end region-name="right-region-landscape" extent="25.4mm"/>
|
|
190
|
-
</fo:simple-page-master>
|
|
191
|
-
|
|
192
|
-
<fo:simple-page-master master-name="back-page-nonstandard" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
193
|
-
<fo:region-body margin-top="73mm" margin-bottom="15mm" margin-left="63.5mm" margin-right="35mm"/>
|
|
194
|
-
<fo:region-before region-name="header" extent="73mm"/>
|
|
195
|
-
<fo:region-after region-name="footer" extent="15mm"/>
|
|
196
|
-
<fo:region-start region-name="left-region" extent="63.5mm" precedence="true"/>
|
|
197
|
-
<fo:region-end region-name="right-region" extent="35mm"/>
|
|
198
|
-
</fo:simple-page-master>
|
|
199
|
-
<!-- ================== -->
|
|
200
|
-
<!-- End: IEEE whitepaper -->
|
|
201
|
-
<!-- ================== -->
|
|
202
|
-
|
|
203
|
-
<!-- ToC for non-standards (whitepaper, icap-whitepaper, industry-connection-report) -->
|
|
204
|
-
<fo:simple-page-master master-name="page-toc-first" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
205
|
-
<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="19mm" margin-right="19mm"/>
|
|
206
|
-
<fo:region-before region-name="header" extent="{$marginTop}mm" precedence="true"/>
|
|
207
|
-
<fo:region-after region-name="footer_empty" extent="{$marginBottom}mm"/> <!-- empty footer for 1st ToC page -->
|
|
208
|
-
<fo:region-start region-name="left-region" extent="19mm"/>
|
|
209
|
-
<fo:region-end region-name="right-region" extent="19mm"/>
|
|
210
|
-
</fo:simple-page-master>
|
|
211
|
-
<fo:simple-page-master master-name="page-toc-any" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
212
|
-
<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="19mm" margin-right="19mm"/>
|
|
213
|
-
<fo:region-before region-name="header" extent="{$marginTop}mm" precedence="true"/>
|
|
214
|
-
<fo:region-after region-name="footer" extent="{$marginBottom}mm"/>
|
|
215
|
-
<fo:region-start region-name="left-region" extent="19mm"/>
|
|
216
|
-
<fo:region-end region-name="right-region" extent="19mm"/>
|
|
217
|
-
</fo:simple-page-master>
|
|
218
|
-
<fo:page-sequence-master master-name="page-toc">
|
|
219
|
-
<fo:repeatable-page-master-alternatives>
|
|
220
|
-
<fo:conditional-page-master-reference page-position="first" master-reference="page-toc-first"/>
|
|
221
|
-
<fo:conditional-page-master-reference page-position="any" master-reference="page-toc-any"/>
|
|
222
|
-
</fo:repeatable-page-master-alternatives>
|
|
223
|
-
</fo:page-sequence-master>
|
|
224
|
-
|
|
225
|
-
<!-- =================== -->
|
|
226
|
-
<!-- Drafts pages -->
|
|
227
|
-
<!-- =================== -->
|
|
228
|
-
<fo:simple-page-master master-name="document-draft" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
229
|
-
<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/>
|
|
230
|
-
<fo:region-before region-name="header" extent="{$marginTop}mm"/>
|
|
231
|
-
<fo:region-after region-name="footer" extent="{$marginBottom}mm"/>
|
|
232
|
-
<fo:region-start region-name="left-region" extent="{$marginLeftRight1}mm"/>
|
|
233
|
-
<fo:region-end region-name="right-region" extent="{$marginLeftRight2}mm"/>
|
|
234
|
-
</fo:simple-page-master>
|
|
235
|
-
|
|
236
|
-
<!-- landscape -->
|
|
237
|
-
<fo:simple-page-master master-name="document-draft-landscape" page-width="{$pageHeight}mm" page-height="{$pageWidth}mm">
|
|
238
|
-
<fo:region-body margin-top="{$marginLeftRight1}mm" margin-bottom="{$marginLeftRight2}mm" margin-left="{$marginBottom}mm" margin-right="{$marginTop}mm"/>
|
|
239
|
-
<fo:region-before region-name="header" extent="{$marginLeftRight1}mm" precedence="true"/>
|
|
240
|
-
<fo:region-after region-name="footer" extent="{$marginLeftRight2}mm" precedence="true"/>
|
|
241
|
-
<fo:region-start region-name="left-region-landscape" extent="{$marginBottom}mm"/>
|
|
242
|
-
<fo:region-end region-name="right-region-landscape" extent="{$marginTop}mm"/>
|
|
243
|
-
</fo:simple-page-master>
|
|
244
|
-
<!-- =================== -->
|
|
245
|
-
<!-- =================== -->
|
|
246
|
-
|
|
247
|
-
<!-- ======================= -->
|
|
248
|
-
<!-- Standard document pages -->
|
|
249
|
-
<!-- ======================= -->
|
|
250
|
-
<fo:simple-page-master master-name="document-standard-first" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
251
|
-
<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/>
|
|
252
|
-
<fo:region-before region-name="header_empty" extent="{$marginTop}mm"/>
|
|
253
|
-
<fo:region-after region-name="footer" extent="{$marginBottom}mm"/>
|
|
254
|
-
<fo:region-start region-name="left-region" extent="{$marginLeftRight1}mm"/>
|
|
255
|
-
<fo:region-end region-name="right-region" extent="{$marginLeftRight2}mm"/>
|
|
256
|
-
</fo:simple-page-master>
|
|
257
|
-
<fo:page-sequence-master master-name="document-standard">
|
|
258
|
-
<fo:repeatable-page-master-alternatives>
|
|
259
|
-
<fo:conditional-page-master-reference page-position="first" master-reference="document-standard-first"/>
|
|
260
|
-
<fo:conditional-page-master-reference page-position="any" master-reference="document-draft"/>
|
|
261
|
-
</fo:repeatable-page-master-alternatives>
|
|
262
|
-
</fo:page-sequence-master>
|
|
263
|
-
|
|
264
|
-
<!-- landscape -->
|
|
265
|
-
<fo:simple-page-master master-name="document-standard-landscape" page-width="{$pageHeight}mm" page-height="{$pageWidth}mm">
|
|
266
|
-
<fo:region-body margin-top="{$marginLeftRight1}mm" margin-bottom="{$marginLeftRight2}mm" margin-left="{$marginBottom}mm" margin-right="{$marginTop}mm"/>
|
|
267
|
-
<fo:region-before region-name="header" extent="{$marginLeftRight1}mm" precedence="true"/>
|
|
268
|
-
<fo:region-after region-name="footer" extent="{$marginLeftRight2}mm" precedence="true"/>
|
|
269
|
-
<fo:region-start region-name="left-region-landscape" extent="{$marginBottom}mm"/>
|
|
270
|
-
<fo:region-end region-name="right-region-landscape" extent="{$marginTop}mm"/>
|
|
271
|
-
</fo:simple-page-master>
|
|
272
|
-
<!-- ======================= -->
|
|
273
|
-
<!-- ======================= -->
|
|
274
|
-
|
|
275
|
-
<!-- Index pages -->
|
|
276
|
-
<fo:simple-page-master master-name="page-index" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
277
|
-
<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm" column-count="2" column-gap="10mm"/>
|
|
278
|
-
<fo:region-before region-name="header" extent="{$marginTop}mm"/>
|
|
279
|
-
<fo:region-after region-name="footer" extent="{$marginBottom}mm"/>
|
|
280
|
-
<fo:region-start region-name="left-region" extent="{$marginLeftRight1}mm"/>
|
|
281
|
-
<fo:region-end region-name="right-region" extent="{$marginLeftRight2}mm"/>
|
|
282
|
-
</fo:simple-page-master>
|
|
283
|
-
|
|
284
|
-
<!-- ======================== -->
|
|
285
|
-
<!-- END IEEE pages -->
|
|
286
|
-
<!-- ======================== -->
|
|
287
|
-
|
|
288
|
-
</fo:layout-master-set>
|
|
292
|
+
<xsl:call-template name="layout-master-set"/>
|
|
289
293
|
|
|
290
294
|
<fo:declarations>
|
|
291
295
|
<xsl:call-template name="addPDFUAmeta"/>
|
|
@@ -414,20 +418,6 @@
|
|
|
414
418
|
</xsl:call-template>
|
|
415
419
|
</xsl:variable>
|
|
416
420
|
|
|
417
|
-
<xsl:variable name="cutoff_date">
|
|
418
|
-
<xsl:call-template name="convertDate">
|
|
419
|
-
<xsl:with-param name="date" select="normalize-space(/mn:metanorma/mn:bibdata/mn:date[@type = 'feedback-ended'])"/>
|
|
420
|
-
<xsl:with-param name="format" select="'ddMMyyyy'"/>
|
|
421
|
-
</xsl:call-template>
|
|
422
|
-
</xsl:variable>
|
|
423
|
-
|
|
424
|
-
<xsl:variable name="expiration_date">
|
|
425
|
-
<xsl:call-template name="convertDate">
|
|
426
|
-
<xsl:with-param name="date" select="normalize-space(/mn:metanorma/mn:bibdata/mn:date[@type = 'obsoleted'])"/>
|
|
427
|
-
<xsl:with-param name="format" select="'ddMMyyyy'"/>
|
|
428
|
-
</xsl:call-template>
|
|
429
|
-
</xsl:variable>
|
|
430
|
-
|
|
431
421
|
<!-- Example: Revision of IEEE Std 802.1X™-2010
|
|
432
422
|
Incorporating IEEE Std 802.1Xbx™-2014
|
|
433
423
|
and IEEE Std 802.1Xck™-2018 -->
|
|
@@ -470,150 +460,23 @@
|
|
|
470
460
|
</fo:flow>
|
|
471
461
|
</fo:page-sequence> -->
|
|
472
462
|
|
|
473
|
-
|
|
474
|
-
|
|
475
|
-
|
|
476
|
-
|
|
477
|
-
|
|
478
|
-
<xsl:
|
|
479
|
-
|
|
480
|
-
|
|
481
|
-
|
|
482
|
-
|
|
483
|
-
|
|
484
|
-
|
|
485
|
-
|
|
486
|
-
|
|
487
|
-
|
|
488
|
-
|
|
489
|
-
|
|
490
|
-
<xsl:with-param name="copyright_year" select="$copyright_year"/>
|
|
491
|
-
<xsl:with-param name="copyright_holder" select="$copyright_holder"/>
|
|
492
|
-
<xsl:with-param name="hideFooter">true</xsl:with-param>
|
|
493
|
-
</xsl:call-template>
|
|
494
|
-
|
|
495
|
-
<fo:flow flow-name="xsl-region-body">
|
|
496
|
-
<fo:block-container margin-top="18mm" id="firstpage_id_{$num}">
|
|
497
|
-
<fo:block font-family="Arial">
|
|
498
|
-
<fo:block font-size="23pt" font-weight="bold" margin-top="50pt" margin-bottom="36pt">
|
|
499
|
-
<xsl:if test="contains('amendment corrigendum erratum', $subdoctype) and $subdoctype != ''">
|
|
500
|
-
<xsl:attribute name="font-size">24pt</xsl:attribute>
|
|
501
|
-
</xsl:if>
|
|
502
|
-
<xsl:text>P</xsl:text>
|
|
503
|
-
<xsl:value-of select="$designation"/>
|
|
504
|
-
<xsl:text>™/D</xsl:text>
|
|
505
|
-
<xsl:value-of select="$draft_number"/>
|
|
506
|
-
<xsl:value-of select="$linebreak"/>
|
|
507
|
-
<xsl:copy-of select="$title_prefix"/>
|
|
508
|
-
<xsl:copy-of select="$title"/>
|
|
509
|
-
|
|
510
|
-
<!-- <xsl:copy-of select="$draft_title_part"/> -->
|
|
511
|
-
</fo:block>
|
|
512
|
-
<fo:block>Developed by the</fo:block>
|
|
513
|
-
<fo:block> </fo:block>
|
|
514
|
-
<fo:block font-size="11pt" font-weight="bold">
|
|
515
|
-
<!-- <Committee Name> -->
|
|
516
|
-
<xsl:value-of select="$committee"/>
|
|
517
|
-
</fo:block>
|
|
518
|
-
<fo:block>of the</fo:block>
|
|
519
|
-
<fo:block font-size="11pt" font-weight="bold">
|
|
520
|
-
<!-- IEEE <Society Name> -->
|
|
521
|
-
<xsl:text>IEEE </xsl:text><xsl:value-of select="$society"/>
|
|
522
|
-
</fo:block>
|
|
523
|
-
<fo:block> </fo:block>
|
|
524
|
-
<fo:block> </fo:block>
|
|
525
|
-
<fo:block>
|
|
526
|
-
<!-- Approved <Date Approved> -->
|
|
527
|
-
<xsl:text>Approved </xsl:text>
|
|
528
|
-
<xsl:value-of select="$approved_date"/>
|
|
529
|
-
</fo:block>
|
|
530
|
-
<fo:block> </fo:block>
|
|
531
|
-
<!-- Example: IEEE SA Standards Board -->
|
|
532
|
-
<fo:block font-size="11pt" font-weight="bold"><xsl:value-of select="$approved_by"/></fo:block>
|
|
533
|
-
|
|
534
|
-
<xsl:if test="normalize-space($cutoff_date) != ''">
|
|
535
|
-
<fo:block> </fo:block>
|
|
536
|
-
<fo:block>
|
|
537
|
-
<xsl:text>Cutoff date </xsl:text>
|
|
538
|
-
<xsl:value-of select="$cutoff_date"/>
|
|
539
|
-
</fo:block>
|
|
540
|
-
</xsl:if>
|
|
541
|
-
<xsl:if test="normalize-space($cutoff_date) != ''">
|
|
542
|
-
<fo:block> </fo:block>
|
|
543
|
-
<fo:block>
|
|
544
|
-
<xsl:text>Expiration date </xsl:text>
|
|
545
|
-
<xsl:value-of select="$expiration_date"/>
|
|
546
|
-
</fo:block>
|
|
547
|
-
</xsl:if>
|
|
548
|
-
</fo:block>
|
|
549
|
-
|
|
550
|
-
<xsl:apply-templates select="/mn:metanorma/mn:boilerplate/mn:copyright-statement"/>
|
|
551
|
-
|
|
552
|
-
<xsl:apply-templates select="/mn:metanorma/mn:boilerplate/mn:license-statement"/>
|
|
553
|
-
|
|
554
|
-
<fo:block break-after="page"/>
|
|
555
|
-
|
|
556
|
-
<!-- Second page -->
|
|
557
|
-
|
|
558
|
-
<fo:block font-family="Arial" text-align="justify">
|
|
559
|
-
<fo:block>
|
|
560
|
-
<fo:inline font-weight="bold">
|
|
561
|
-
<xsl:call-template name="getLocalizedString">
|
|
562
|
-
<xsl:with-param name="key">abstract</xsl:with-param>
|
|
563
|
-
</xsl:call-template>
|
|
564
|
-
<xsl:text>: </xsl:text>
|
|
565
|
-
</fo:inline>
|
|
566
|
-
<xsl:apply-templates select="/mn:metanorma/mn:preface/mn:abstract/node()[not(self::mn:title)] | /mn:metanorma/mn:preface/mn:clause[@id = '_abstract' or mn:title = 'Abstract']/node()[not(self::mn:title)]"/>
|
|
567
|
-
</fo:block>
|
|
568
|
-
<fo:block> </fo:block>
|
|
569
|
-
<fo:block>
|
|
570
|
-
<fo:inline font-weight="bold">Keywords: </fo:inline>
|
|
571
|
-
<xsl:for-each select="/mn:metanorma/mn:bibdata/mn:keyword">
|
|
572
|
-
<xsl:value-of select="."/>
|
|
573
|
-
<xsl:if test="position() != last()">, </xsl:if>
|
|
574
|
-
</xsl:for-each>
|
|
575
|
-
</fo:block>
|
|
576
|
-
<xsl:apply-templates select="/mn:metanorma/mn:preface/mn:acknowledgements"/>
|
|
577
|
-
</fo:block>
|
|
578
|
-
|
|
579
|
-
<!-- Example:
|
|
580
|
-
The Institute of Electrical and Electronics Engineers, Inc.
|
|
581
|
-
3 Park Avenue, New York, NY 10016-5997, USA
|
|
582
|
-
...
|
|
583
|
-
PDF: ISBN 978-0-XXXX-XXXX-X STDXXXXX
|
|
584
|
-
Print: ISBN 978-0-XXXX-XXXX-X STDPDXXXXX
|
|
585
|
-
-->
|
|
586
|
-
<xsl:apply-templates select="/mn:metanorma/mn:boilerplate/mn:feedback-statement"/>
|
|
587
|
-
|
|
588
|
-
</fo:block-container>
|
|
589
|
-
</fo:flow>
|
|
590
|
-
</fo:page-sequence> <!-- End: 'Draft' first page -->
|
|
591
|
-
</xsl:when>
|
|
592
|
-
|
|
593
|
-
<xsl:when test="$current_template = 'standard'">
|
|
594
|
-
<xsl:call-template name="insertCoverPage_Standard">
|
|
595
|
-
<xsl:with-param name="title_intro" select="$title_intro"/>
|
|
596
|
-
<xsl:with-param name="title_main" select="$title_main"/>
|
|
597
|
-
<xsl:with-param name="society" select="$society"/>
|
|
598
|
-
<xsl:with-param name="committee" select="$committee"/>
|
|
599
|
-
<xsl:with-param name="standard_number" select="$standard_number"/>
|
|
600
|
-
<xsl:with-param name="history" select="$history_text"/>
|
|
601
|
-
<xsl:with-param name="standard_title_prefix" select="$title_prefix"/>
|
|
602
|
-
<xsl:with-param name="cutoff_date" select="$cutoff_date"/>
|
|
603
|
-
<xsl:with-param name="expiration_date" select="$expiration_date"/>
|
|
604
|
-
</xsl:call-template>
|
|
605
|
-
</xsl:when>
|
|
606
|
-
|
|
607
|
-
<xsl:when test="$current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report'">
|
|
608
|
-
<xsl:call-template name="insertCoverPage_NonStandard">
|
|
609
|
-
<xsl:with-param name="title" select="$title"/>
|
|
610
|
-
</xsl:call-template>
|
|
611
|
-
</xsl:when>
|
|
612
|
-
|
|
613
|
-
</xsl:choose>
|
|
614
|
-
<!-- ======================= -->
|
|
615
|
-
<!-- END Cover page -->
|
|
616
|
-
<!-- ======================= -->
|
|
463
|
+
<xsl:call-template name="cover-page">
|
|
464
|
+
<xsl:with-param name="num" select="$num"/>
|
|
465
|
+
<xsl:with-param name="document_id" select="$document_id"/>
|
|
466
|
+
<xsl:with-param name="title" select="$title"/>
|
|
467
|
+
<xsl:with-param name="society" select="$society"/>
|
|
468
|
+
<xsl:with-param name="copyright_holder" select="$copyright_holder"/>
|
|
469
|
+
<xsl:with-param name="copyright_year" select="$copyright_year"/>
|
|
470
|
+
<xsl:with-param name="designation" select="$designation"/>
|
|
471
|
+
<xsl:with-param name="draft_number" select="$draft_number"/>
|
|
472
|
+
<xsl:with-param name="committee" select="$committee"/>
|
|
473
|
+
<xsl:with-param name="approved_date" select="$approved_date"/>
|
|
474
|
+
<xsl:with-param name="approved_by" select="$approved_by"/>
|
|
475
|
+
<xsl:with-param name="title_intro" select="$title_intro"/>
|
|
476
|
+
<xsl:with-param name="title_main" select="$title_main"/>
|
|
477
|
+
<xsl:with-param name="standard_number" select="$standard_number"/>
|
|
478
|
+
<xsl:with-param name="history_text" select="$history_text"/>
|
|
479
|
+
</xsl:call-template>
|
|
617
480
|
|
|
618
481
|
<xsl:variable name="title_standard_coverpage_">
|
|
619
482
|
<xsl:choose>
|
|
@@ -726,7 +589,7 @@
|
|
|
726
589
|
</xsl:call-template>
|
|
727
590
|
<xsl:text>: </xsl:text>
|
|
728
591
|
</fo:inline>
|
|
729
|
-
<xsl:apply-templates select="/mn:metanorma/mn:preface/mn:abstract/node()[not(self::mn:title)] |
|
|
592
|
+
<xsl:apply-templates select="/mn:metanorma/mn:preface/mn:abstract/node()[not(self::mn:fmt-title)] | /mn:metanorma/mn:preface/mn:clause[@id = '_abstract' or mn:fmt-title = 'Abstract']/node()[not(self::mn:fmt-title)]"/>
|
|
730
593
|
</fo:block>
|
|
731
594
|
<fo:block> </fo:block>
|
|
732
595
|
<fo:block>
|
|
@@ -791,7 +654,7 @@
|
|
|
791
654
|
<fo:block>
|
|
792
655
|
<!-- TRADEMARKS AND DISCLAIMERS -->
|
|
793
656
|
<!-- ACKNOWLEDGEMENTS -->
|
|
794
|
-
<xsl:apply-templates select="/mn:metanorma/mn:boilerplate/mn:legal-statement/*[@id = 'boilerplate-tm' or mn:title = 'Trademarks and Disclaimers' or @id = 'boilerplate-participants' or mn:title = 'Acknowledgements']" mode="whitepaper"/>
|
|
657
|
+
<xsl:apply-templates select="/mn:metanorma/mn:boilerplate/mn:legal-statement/*[@id = 'boilerplate-tm' or normalize-space(mn:fmt-title) = 'Trademarks and Disclaimers' or @id = 'boilerplate-participants' or normalize-space(mn:fmt-title) = 'Acknowledgements']" mode="whitepaper"/>
|
|
795
658
|
</fo:block>
|
|
796
659
|
|
|
797
660
|
<!-- Example:
|
|
@@ -805,7 +668,7 @@
|
|
|
805
668
|
|
|
806
669
|
<!-- NOTICE AND DISCLAIMER OF LIABILITY CONCERNING THE USE OF IEEE SA DOCUMENTS -->
|
|
807
670
|
<fo:block break-after="page"/>
|
|
808
|
-
<xsl:apply-templates select="/mn:metanorma/mn:boilerplate/mn:legal-statement/*[not(@id = 'boilerplate-tm') and not(mn:title = 'Trademarks and Disclaimers') and not(@id = 'boilerplate-participants') and not(mn:title = 'Acknowledgements')]"/>
|
|
671
|
+
<xsl:apply-templates select="/mn:metanorma/mn:boilerplate/mn:legal-statement/*[not(@id = 'boilerplate-tm') and not(normalize-space(mn:fmt-title) = 'Trademarks and Disclaimers') and not(@id = 'boilerplate-participants') and not(normalize-space(mn:title) = 'Acknowledgements')]"/>
|
|
809
672
|
|
|
810
673
|
</fo:block-container>
|
|
811
674
|
</fo:flow>
|
|
@@ -1118,21 +981,8 @@
|
|
|
1118
981
|
<!-- End IEEE pages -->
|
|
1119
982
|
<!-- ===================== -->
|
|
1120
983
|
|
|
1121
|
-
|
|
1122
|
-
<!-- Back page -->
|
|
1123
|
-
<!-- ======================= -->
|
|
1124
|
-
<xsl:choose>
|
|
1125
|
-
<xsl:when test="$current_template = 'standard'">
|
|
1126
|
-
<xsl:call-template name="insertBackPage_Standard"/>
|
|
1127
|
-
</xsl:when>
|
|
984
|
+
<xsl:call-template name="back-page"/>
|
|
1128
985
|
|
|
1129
|
-
<xsl:when test="$current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report'">
|
|
1130
|
-
<xsl:call-template name="insertBackPage_NonStandard"/>
|
|
1131
|
-
</xsl:when>
|
|
1132
|
-
</xsl:choose>
|
|
1133
|
-
<!-- ======================= -->
|
|
1134
|
-
<!-- END Back page -->
|
|
1135
|
-
<!-- ======================= -->
|
|
1136
986
|
<xsl:if test="not(xalan:nodeset($paged_xml)/mn:page[*])">
|
|
1137
987
|
<fo:page-sequence master-reference="document-nonstandard" force-page-count="no-force">
|
|
1138
988
|
<fo:flow flow-name="xsl-region-body">
|
|
@@ -1155,12 +1005,191 @@
|
|
|
1155
1005
|
</fo:root>
|
|
1156
1006
|
</xsl:template>
|
|
1157
1007
|
|
|
1008
|
+
<xsl:template name="cover-page">
|
|
1009
|
+
<xsl:param name="num"/>
|
|
1010
|
+
<xsl:param name="document_id"/>
|
|
1011
|
+
<xsl:param name="title"/>
|
|
1012
|
+
<xsl:param name="society"/>
|
|
1013
|
+
<xsl:param name="copyright_holder"/>
|
|
1014
|
+
<xsl:param name="copyright_year"/>
|
|
1015
|
+
<xsl:param name="designation"/>
|
|
1016
|
+
<xsl:param name="draft_number"/>
|
|
1017
|
+
<xsl:param name="committee"/>
|
|
1018
|
+
<xsl:param name="approved_date"/>
|
|
1019
|
+
<xsl:param name="approved_by"/>
|
|
1020
|
+
<xsl:param name="title_intro"/>
|
|
1021
|
+
<xsl:param name="title_main"/>
|
|
1022
|
+
<xsl:param name="standard_number"/>
|
|
1023
|
+
<xsl:param name="history_text"/>
|
|
1024
|
+
|
|
1025
|
+
<!-- ======================= -->
|
|
1026
|
+
<!-- Cover page -->
|
|
1027
|
+
<!-- ======================= -->
|
|
1028
|
+
|
|
1029
|
+
<xsl:variable name="cutoff_date">
|
|
1030
|
+
<xsl:call-template name="convertDate">
|
|
1031
|
+
<xsl:with-param name="date" select="normalize-space(/mn:metanorma/mn:bibdata/mn:date[@type = 'feedback-ended'])"/>
|
|
1032
|
+
<xsl:with-param name="format" select="'ddMMyyyy'"/>
|
|
1033
|
+
</xsl:call-template>
|
|
1034
|
+
</xsl:variable>
|
|
1035
|
+
|
|
1036
|
+
<xsl:variable name="expiration_date">
|
|
1037
|
+
<xsl:call-template name="convertDate">
|
|
1038
|
+
<xsl:with-param name="date" select="normalize-space(/mn:metanorma/mn:bibdata/mn:date[@type = 'obsoleted'])"/>
|
|
1039
|
+
<xsl:with-param name="format" select="'ddMMyyyy'"/>
|
|
1040
|
+
</xsl:call-template>
|
|
1041
|
+
</xsl:variable>
|
|
1042
|
+
|
|
1043
|
+
<xsl:choose>
|
|
1044
|
+
|
|
1045
|
+
<xsl:when test="$current_template = 'draft'">
|
|
1046
|
+
|
|
1047
|
+
<!-- 'Draft' first page -->
|
|
1048
|
+
<fo:page-sequence master-reference="document-draft" force-page-count="no-force">
|
|
1049
|
+
|
|
1050
|
+
<xsl:call-template name="insertFootnoteSeparator"/>
|
|
1051
|
+
|
|
1052
|
+
<xsl:call-template name="insertHeaderFooter">
|
|
1053
|
+
<xsl:with-param name="document_id" select="$document_id"/>
|
|
1054
|
+
<xsl:with-param name="title_prefix" select="$title_prefix"/>
|
|
1055
|
+
<xsl:with-param name="title" select="$title"/>
|
|
1056
|
+
<xsl:with-param name="doctype" select="$doctype"/>
|
|
1057
|
+
|
|
1058
|
+
<xsl:with-param name="copyright_year" select="$copyright_year"/>
|
|
1059
|
+
<xsl:with-param name="copyright_holder" select="$copyright_holder"/>
|
|
1060
|
+
<xsl:with-param name="hideFooter">true</xsl:with-param>
|
|
1061
|
+
</xsl:call-template>
|
|
1062
|
+
|
|
1063
|
+
<fo:flow flow-name="xsl-region-body">
|
|
1064
|
+
<fo:block-container margin-top="18mm" id="firstpage_id_{$num}">
|
|
1065
|
+
<fo:block font-family="Arial">
|
|
1066
|
+
<fo:block font-size="23pt" font-weight="bold" margin-top="50pt" margin-bottom="36pt">
|
|
1067
|
+
<xsl:if test="contains('amendment corrigendum erratum', $subdoctype) and $subdoctype != ''">
|
|
1068
|
+
<xsl:attribute name="font-size">24pt</xsl:attribute>
|
|
1069
|
+
</xsl:if>
|
|
1070
|
+
<xsl:text>P</xsl:text>
|
|
1071
|
+
<xsl:value-of select="$designation"/>
|
|
1072
|
+
<xsl:text>™/D</xsl:text>
|
|
1073
|
+
<xsl:value-of select="$draft_number"/>
|
|
1074
|
+
<xsl:value-of select="$linebreak"/>
|
|
1075
|
+
<xsl:copy-of select="$title_prefix"/>
|
|
1076
|
+
<xsl:copy-of select="$title"/>
|
|
1077
|
+
|
|
1078
|
+
<!-- <xsl:copy-of select="$draft_title_part"/> -->
|
|
1079
|
+
</fo:block>
|
|
1080
|
+
<fo:block>Developed by the</fo:block>
|
|
1081
|
+
<fo:block> </fo:block>
|
|
1082
|
+
<fo:block font-size="11pt" font-weight="bold">
|
|
1083
|
+
<!-- <Committee Name> -->
|
|
1084
|
+
<xsl:value-of select="$committee"/>
|
|
1085
|
+
</fo:block>
|
|
1086
|
+
<fo:block>of the</fo:block>
|
|
1087
|
+
<fo:block font-size="11pt" font-weight="bold">
|
|
1088
|
+
<!-- IEEE <Society Name> -->
|
|
1089
|
+
<xsl:text>IEEE </xsl:text><xsl:value-of select="$society"/>
|
|
1090
|
+
</fo:block>
|
|
1091
|
+
<fo:block> </fo:block>
|
|
1092
|
+
<fo:block> </fo:block>
|
|
1093
|
+
<fo:block>
|
|
1094
|
+
<!-- Approved <Date Approved> -->
|
|
1095
|
+
<xsl:text>Approved </xsl:text>
|
|
1096
|
+
<xsl:value-of select="$approved_date"/>
|
|
1097
|
+
</fo:block>
|
|
1098
|
+
<fo:block> </fo:block>
|
|
1099
|
+
<!-- Example: IEEE SA Standards Board -->
|
|
1100
|
+
<fo:block font-size="11pt" font-weight="bold"><xsl:value-of select="$approved_by"/></fo:block>
|
|
1101
|
+
|
|
1102
|
+
<xsl:if test="normalize-space($cutoff_date) != ''">
|
|
1103
|
+
<fo:block> </fo:block>
|
|
1104
|
+
<fo:block>
|
|
1105
|
+
<xsl:text>Cutoff date </xsl:text>
|
|
1106
|
+
<xsl:value-of select="$cutoff_date"/>
|
|
1107
|
+
</fo:block>
|
|
1108
|
+
</xsl:if>
|
|
1109
|
+
<xsl:if test="normalize-space($cutoff_date) != ''">
|
|
1110
|
+
<fo:block> </fo:block>
|
|
1111
|
+
<fo:block>
|
|
1112
|
+
<xsl:text>Expiration date </xsl:text>
|
|
1113
|
+
<xsl:value-of select="$expiration_date"/>
|
|
1114
|
+
</fo:block>
|
|
1115
|
+
</xsl:if>
|
|
1116
|
+
</fo:block>
|
|
1117
|
+
|
|
1118
|
+
<xsl:apply-templates select="/mn:metanorma/mn:boilerplate/mn:copyright-statement"/>
|
|
1119
|
+
|
|
1120
|
+
<xsl:apply-templates select="/mn:metanorma/mn:boilerplate/mn:license-statement"/>
|
|
1121
|
+
|
|
1122
|
+
<fo:block break-after="page"/>
|
|
1123
|
+
|
|
1124
|
+
<!-- Second page -->
|
|
1125
|
+
|
|
1126
|
+
<fo:block font-family="Arial" text-align="justify">
|
|
1127
|
+
<fo:block>
|
|
1128
|
+
<fo:inline font-weight="bold">
|
|
1129
|
+
<xsl:call-template name="getLocalizedString">
|
|
1130
|
+
<xsl:with-param name="key">abstract</xsl:with-param>
|
|
1131
|
+
</xsl:call-template>
|
|
1132
|
+
<xsl:text>: </xsl:text>
|
|
1133
|
+
</fo:inline>
|
|
1134
|
+
<xsl:apply-templates select="/mn:metanorma/mn:preface/mn:abstract/node()[not(self::mn:fmt-title)] | /mn:metanorma/mn:preface/mn:clause[@id = '_abstract' or normalize-space(mn:fmt-title) = 'Abstract']/node()[not(self::mn:fmt-title)]"/>
|
|
1135
|
+
</fo:block>
|
|
1136
|
+
<fo:block> </fo:block>
|
|
1137
|
+
<fo:block>
|
|
1138
|
+
<fo:inline font-weight="bold">Keywords: </fo:inline>
|
|
1139
|
+
<xsl:for-each select="/mn:metanorma/mn:bibdata/mn:keyword">
|
|
1140
|
+
<xsl:value-of select="."/>
|
|
1141
|
+
<xsl:if test="position() != last()">, </xsl:if>
|
|
1142
|
+
</xsl:for-each>
|
|
1143
|
+
</fo:block>
|
|
1144
|
+
<xsl:apply-templates select="/mn:metanorma/mn:preface/mn:acknowledgements"/>
|
|
1145
|
+
</fo:block>
|
|
1146
|
+
|
|
1147
|
+
<!-- Example:
|
|
1148
|
+
The Institute of Electrical and Electronics Engineers, Inc.
|
|
1149
|
+
3 Park Avenue, New York, NY 10016-5997, USA
|
|
1150
|
+
...
|
|
1151
|
+
PDF: ISBN 978-0-XXXX-XXXX-X STDXXXXX
|
|
1152
|
+
Print: ISBN 978-0-XXXX-XXXX-X STDPDXXXXX
|
|
1153
|
+
-->
|
|
1154
|
+
<xsl:apply-templates select="/mn:metanorma/mn:boilerplate/mn:feedback-statement"/>
|
|
1155
|
+
|
|
1156
|
+
</fo:block-container>
|
|
1157
|
+
</fo:flow>
|
|
1158
|
+
</fo:page-sequence> <!-- End: 'Draft' first page -->
|
|
1159
|
+
</xsl:when>
|
|
1160
|
+
|
|
1161
|
+
<xsl:when test="$current_template = 'standard'">
|
|
1162
|
+
<xsl:call-template name="insertCoverPage_Standard">
|
|
1163
|
+
<xsl:with-param name="title_intro" select="$title_intro"/>
|
|
1164
|
+
<xsl:with-param name="title_main" select="$title_main"/>
|
|
1165
|
+
<xsl:with-param name="society" select="$society"/>
|
|
1166
|
+
<xsl:with-param name="committee" select="$committee"/>
|
|
1167
|
+
<xsl:with-param name="standard_number" select="$standard_number"/>
|
|
1168
|
+
<xsl:with-param name="history" select="$history_text"/>
|
|
1169
|
+
<xsl:with-param name="standard_title_prefix" select="$title_prefix"/>
|
|
1170
|
+
<xsl:with-param name="cutoff_date" select="$cutoff_date"/>
|
|
1171
|
+
<xsl:with-param name="expiration_date" select="$expiration_date"/>
|
|
1172
|
+
</xsl:call-template>
|
|
1173
|
+
</xsl:when>
|
|
1174
|
+
|
|
1175
|
+
<xsl:when test="$current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report'">
|
|
1176
|
+
<xsl:call-template name="insertCoverPage_NonStandard">
|
|
1177
|
+
<xsl:with-param name="title" select="$title"/>
|
|
1178
|
+
</xsl:call-template>
|
|
1179
|
+
</xsl:when>
|
|
1180
|
+
|
|
1181
|
+
</xsl:choose>
|
|
1182
|
+
<!-- ======================= -->
|
|
1183
|
+
<!-- END Cover page -->
|
|
1184
|
+
<!-- ======================= -->
|
|
1185
|
+
</xsl:template> <!-- END: cover-page -->
|
|
1186
|
+
|
|
1158
1187
|
<xsl:template match="mn:preface/mn:clause[@type = 'toc']" priority="3">
|
|
1159
1188
|
<xsl:param name="num"/>
|
|
1160
1189
|
|
|
1161
1190
|
<xsl:apply-templates/>
|
|
1162
1191
|
|
|
1163
|
-
<xsl:if test="count(*) = 1 and mn:title"> <!-- if there isn't user ToC -->
|
|
1192
|
+
<xsl:if test="count(*) = 1 and mn:fmt-title"> <!-- if there isn't user ToC -->
|
|
1164
1193
|
<fo:block role="TOC">
|
|
1165
1194
|
<xsl:if test="$contents/mnx:doc[@num = $num]//mnx:item[@display = 'true']">
|
|
1166
1195
|
<xsl:choose>
|
|
@@ -1370,7 +1399,7 @@
|
|
|
1370
1399
|
</xsl:if>
|
|
1371
1400
|
</xsl:template>
|
|
1372
1401
|
|
|
1373
|
-
<xsl:template match="mn:preface/mn:clause[@type = 'toc']/mn:title" priority="3">
|
|
1402
|
+
<xsl:template match="mn:preface/mn:clause[@type = 'toc']/mn:fmt-title" priority="3">
|
|
1374
1403
|
<xsl:choose>
|
|
1375
1404
|
<xsl:when test="$current_template = 'standard' or $current_template = 'draft'">
|
|
1376
1405
|
<fo:block font-family="Arial" font-size="12pt" role="H1" font-weight="bold" margin-top="12pt" margin-bottom="24pt">
|
|
@@ -1443,21 +1472,21 @@
|
|
|
1443
1472
|
<xsl:apply-templates/>
|
|
1444
1473
|
</xsl:template>
|
|
1445
1474
|
|
|
1446
|
-
<xsl:template match="mn:boilerplate/mn:legal-statement/mn:clause[@id = 'boilerplate-participants' or mn:title = 'Participants']" priority="2">
|
|
1475
|
+
<xsl:template match="mn:boilerplate/mn:legal-statement/mn:clause[@id = 'boilerplate-participants' or normalize-space(mn:fmt-title) = 'Participants']" priority="2">
|
|
1447
1476
|
<fo:block break-after="page"/>
|
|
1448
1477
|
<fo:block id="{@id}">
|
|
1449
1478
|
<xsl:apply-templates/>
|
|
1450
1479
|
</fo:block>
|
|
1451
1480
|
</xsl:template>
|
|
1452
1481
|
|
|
1453
|
-
<xsl:template match="mn:boilerplate/mn:legal-statement/mn:clause[@id = 'boilerplate-participants' or mn:title = 'Participants']/mn:clause" priority="2">
|
|
1482
|
+
<xsl:template match="mn:boilerplate/mn:legal-statement/mn:clause[@id = 'boilerplate-participants' or normalize-space(mn:fmt-title) = 'Participants']/mn:clause" priority="2">
|
|
1454
1483
|
<fo:block id="{@id}" space-before="12pt">
|
|
1455
1484
|
<xsl:apply-templates/>
|
|
1456
1485
|
</fo:block>
|
|
1457
1486
|
</xsl:template>
|
|
1458
1487
|
|
|
1459
1488
|
<!-- Example: Important Notices and Disclaimers Concerning IEEE Standards Documents -->
|
|
1460
|
-
<xsl:template match="mn:boilerplate/mn:legal-statement//mn:title" priority="3">
|
|
1489
|
+
<xsl:template match="mn:boilerplate/mn:legal-statement//mn:fmt-title" priority="3">
|
|
1461
1490
|
<xsl:variable name="level">
|
|
1462
1491
|
<xsl:call-template name="getLevel"/>
|
|
1463
1492
|
</xsl:variable>
|
|
@@ -1587,7 +1616,7 @@
|
|
|
1587
1616
|
|
|
1588
1617
|
<xsl:variable name="attributes_">
|
|
1589
1618
|
<attributes>
|
|
1590
|
-
<xsl:if test="@align = 'center' and ancestor::mn:clause[@id = 'boilerplate-participants' or mn:title = 'Participants'] and following-sibling::*[1][self::mn:p and @align = 'center']">
|
|
1619
|
+
<xsl:if test="@align = 'center' and ancestor::mn:clause[@id = 'boilerplate-participants' or normalize-space(mn:fmt-title) = 'Participants'] and following-sibling::*[1][self::mn:p and @align = 'center']">
|
|
1591
1620
|
<xsl:attribute name="space-after">0</xsl:attribute>
|
|
1592
1621
|
</xsl:if>
|
|
1593
1622
|
<xsl:call-template name="setTextAlignment">
|
|
@@ -1626,11 +1655,11 @@
|
|
|
1626
1655
|
<xsl:apply-templates mode="whitepaper"/>
|
|
1627
1656
|
</xsl:template>
|
|
1628
1657
|
|
|
1629
|
-
<xsl:template match="mn:boilerplate/mn:legal-statement/mn:clause/mn:title" mode="whitepaper">
|
|
1658
|
+
<xsl:template match="mn:boilerplate/mn:legal-statement/mn:clause/mn:fmt-title" mode="whitepaper">
|
|
1630
1659
|
<fo:block font-family="Arial Black" font-size="13pt"><xsl:apply-templates mode="whitepaper"/></fo:block>
|
|
1631
1660
|
</xsl:template>
|
|
1632
1661
|
|
|
1633
|
-
<xsl:template match="mn:boilerplate/mn:legal-statement/mn:clause/mn:title//text()" mode="whitepaper">
|
|
1662
|
+
<xsl:template match="mn:boilerplate/mn:legal-statement/mn:clause/mn:fmt-title//text()" mode="whitepaper">
|
|
1634
1663
|
<xsl:value-of select="java:toUpperCase(java:java.lang.String.new(.))"/>
|
|
1635
1664
|
</xsl:template>
|
|
1636
1665
|
|
|
@@ -1666,7 +1695,7 @@
|
|
|
1666
1695
|
</xsl:template>
|
|
1667
1696
|
|
|
1668
1697
|
<!-- for 'draft' -->
|
|
1669
|
-
<xsl:template match="mn:preface/mn:abstract/mn:p[1] | /mn:metanorma/mn:preface/mn:clause[@id = '_abstract' or mn:title = 'Abstract']/mn:p[1]" priority="2">
|
|
1698
|
+
<xsl:template match="mn:preface/mn:abstract/mn:p[1] | /mn:metanorma/mn:preface/mn:clause[@id = '_abstract' or normalize-space(mn:fmt-title) = 'Abstract']/mn:p[1]" priority="2">
|
|
1670
1699
|
<fo:inline><xsl:apply-templates/></fo:inline>
|
|
1671
1700
|
</xsl:template>
|
|
1672
1701
|
|
|
@@ -1886,18 +1915,18 @@
|
|
|
1886
1915
|
</xsl:if>
|
|
1887
1916
|
</xsl:template>
|
|
1888
1917
|
|
|
1889
|
-
<xsl:template match="mn:figure[mn:name] | mn:table[mn:name and not(@unnumbered = 'true' and java:endsWith(java:java.lang.String.new(mn:name),'Key'))]" priority="2" mode="contents">
|
|
1918
|
+
<xsl:template match="mn:figure[mn:fmt-name] | mn:table[mn:fmt-name and not(@unnumbered = 'true' and java:endsWith(java:java.lang.String.new(mn:fmt-name),'Key'))]" priority="2" mode="contents">
|
|
1890
1919
|
<xsl:if test="$current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report'">
|
|
1891
1920
|
<xsl:variable name="level">
|
|
1892
1921
|
<xsl:for-each select="ancestor::mn:clause[1] | ancestor::mn:annex[1]">
|
|
1893
1922
|
<xsl:call-template name="getLevel">
|
|
1894
|
-
<xsl:with-param name="depth" select="mn:title/@depth"/>
|
|
1923
|
+
<xsl:with-param name="depth" select="mn:fmt-title/@depth"/>
|
|
1895
1924
|
</xsl:call-template>
|
|
1896
1925
|
</xsl:for-each>
|
|
1897
1926
|
</xsl:variable>
|
|
1898
1927
|
<mnx:item id="{@id}" level="{$level}" section="" type="{local-name()}" root="" display="true">
|
|
1899
1928
|
<xsl:variable name="name">
|
|
1900
|
-
<xsl:apply-templates select="mn:name" mode="contents_item">
|
|
1929
|
+
<xsl:apply-templates select="mn:fmt-name" mode="contents_item">
|
|
1901
1930
|
<xsl:with-param name="mode">contents</xsl:with-param>
|
|
1902
1931
|
</xsl:apply-templates>
|
|
1903
1932
|
</xsl:variable>
|
|
@@ -1911,7 +1940,7 @@
|
|
|
1911
1940
|
</xsl:if>
|
|
1912
1941
|
</xsl:template>
|
|
1913
1942
|
|
|
1914
|
-
<xsl:template match="mn:add[parent::mn:name and ancestor::mn:figure and normalize-space(following-sibling::node()) = '']" mode="contents_item" priority="2"/>
|
|
1943
|
+
<xsl:template match="mn:add[parent::mn:fmt-name and ancestor::mn:figure and normalize-space(following-sibling::node()) = '']" mode="contents_item" priority="2"/>
|
|
1915
1944
|
|
|
1916
1945
|
<xsl:template match="text()" mode="contents_item">
|
|
1917
1946
|
<xsl:choose>
|
|
@@ -1990,7 +2019,7 @@
|
|
|
1990
2019
|
|
|
1991
2020
|
</xsl:template>
|
|
1992
2021
|
|
|
1993
|
-
<xsl:template match="
|
|
2022
|
+
<xsl:template match="mnx:figures/mnx:figure/mn:fmt-name/text()[1] | mnx:tables/mnx:table/mn:fmt-name/text()[1]" mode="contents" priority="3">
|
|
1994
2023
|
<xsl:choose>
|
|
1995
2024
|
<xsl:when test="$current_template = 'standard' and contains(.,'—')"><xsl:value-of select="substring-after(.,'—')"/></xsl:when>
|
|
1996
2025
|
<xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
|
|
@@ -2075,7 +2104,7 @@
|
|
|
2075
2104
|
<xsl:apply-templates select="mn:term" mode="flatxml"/>
|
|
2076
2105
|
</xsl:template>
|
|
2077
2106
|
|
|
2078
|
-
<xsl:template match="mn:introduction//mn:title | mn:foreword//mn:title | mn:sections//mn:title | mn:annex//mn:title | mn:bibliography/mn:clause/mn:title | mn:references/mn:title" mode="flatxml" priority="2"> <!-- | mn:term -->
|
|
2107
|
+
<xsl:template match="mn:introduction//mn:fmt-title | mn:foreword//mn:fmt-title | mn:sections//mn:fmt-title | mn:annex//mn:fmt-title | mn:bibliography/mn:clause/mn:fmt-title | mn:references/mn:fmt-title" mode="flatxml" priority="2"> <!-- | mn:term -->
|
|
2079
2108
|
<xsl:copy>
|
|
2080
2109
|
<xsl:apply-templates select="@*" mode="flatxml"/>
|
|
2081
2110
|
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
|
@@ -2126,7 +2155,7 @@
|
|
|
2126
2155
|
|
|
2127
2156
|
<!-- add @to = figure, table, clause -->
|
|
2128
2157
|
<!-- add @depth = from -->
|
|
2129
|
-
<xsl:template match="mn:xref" mode="flatxml">
|
|
2158
|
+
<xsl:template match="mn:fmt-xref" mode="flatxml">
|
|
2130
2159
|
<xsl:copy>
|
|
2131
2160
|
<xsl:apply-templates select="@*" mode="flatxml"/>
|
|
2132
2161
|
<xsl:variable name="target" select="@target"/>
|
|
@@ -2134,7 +2163,7 @@
|
|
|
2134
2163
|
<xsl:value-of select="local-name(//*[@id = current()/@target][1])"/>
|
|
2135
2164
|
</xsl:attribute>
|
|
2136
2165
|
<xsl:attribute name="depth">
|
|
2137
|
-
<xsl:value-of select="//*[@id = current()/@target][1]/mn:title/@depth"/>
|
|
2166
|
+
<xsl:value-of select="//*[@id = current()/@target][1]/mn:fmt-title/@depth"/>
|
|
2138
2167
|
</xsl:attribute>
|
|
2139
2168
|
<xsl:apply-templates select="node()" mode="flatxml"/>
|
|
2140
2169
|
</xsl:copy>
|
|
@@ -2176,7 +2205,7 @@
|
|
|
2176
2205
|
</fn>
|
|
2177
2206
|
-->
|
|
2178
2207
|
|
|
2179
|
-
<xsl:template match="mn:fn[not(ancestor::*[(self::mn:table or self::mn:figure)] and not(ancestor::mn:name))]" mode="flatxml">
|
|
2208
|
+
<xsl:template match="mn:fn[not(ancestor::*[(self::mn:table or self::mn:figure)] and not(ancestor::mn:fmt-name))]" mode="flatxml">
|
|
2180
2209
|
<xsl:variable name="p_fn_">
|
|
2181
2210
|
<xsl:call-template name="get_fn_list"/>
|
|
2182
2211
|
</xsl:variable>
|
|
@@ -2240,7 +2269,7 @@
|
|
|
2240
2269
|
<xsl:when test="@hidden = 'true'"><!-- skip --></xsl:when>
|
|
2241
2270
|
<xsl:otherwise>
|
|
2242
2271
|
<xsl:choose>
|
|
2243
|
-
<xsl:when test="self::mn:title or self::mn:term">
|
|
2272
|
+
<xsl:when test="self::mn:fmt-title or self::mn:term">
|
|
2244
2273
|
<xsl:apply-templates select="."/>
|
|
2245
2274
|
</xsl:when>
|
|
2246
2275
|
<!-- <xsl:when test="not(node()) and @mainsection = 'true'"> -->
|
|
@@ -2297,13 +2326,13 @@
|
|
|
2297
2326
|
</xsl:template> -->
|
|
2298
2327
|
|
|
2299
2328
|
<!-- Bibliography -->
|
|
2300
|
-
<xsl:template match="mn:references[not(@normative='true')]/mn:title">
|
|
2329
|
+
<xsl:template match="mn:references[not(@normative='true')]/mn:fmt-title">
|
|
2301
2330
|
<fo:block font-size="16pt" font-weight="bold" margin-top="6pt" margin-bottom="36pt" keep-with-next="always" role="H1">
|
|
2302
2331
|
<xsl:apply-templates/>
|
|
2303
2332
|
</fo:block>
|
|
2304
2333
|
</xsl:template>
|
|
2305
2334
|
|
|
2306
|
-
<xsl:template match="mn:title[@inline-header = 'true'][following-sibling::*[1][self::mn:p] or following-sibling::*[1][self::mn:clause] or not(following-sibling::*)]" priority="3">
|
|
2335
|
+
<xsl:template match="mn:fmt-title[@inline-header = 'true'][following-sibling::*[1][self::mn:p] or following-sibling::*[1][self::mn:clause] or not(following-sibling::*)]" priority="3">
|
|
2307
2336
|
<fo:block>
|
|
2308
2337
|
<xsl:attribute name="space-before">
|
|
2309
2338
|
<xsl:call-template name="getTitleMarginTop"/>
|
|
@@ -2369,7 +2398,7 @@
|
|
|
2369
2398
|
</xsl:choose>
|
|
2370
2399
|
</xsl:template>
|
|
2371
2400
|
|
|
2372
|
-
<xsl:template match="mn:title" priority="2" name="title">
|
|
2401
|
+
<xsl:template match="mn:fmt-title" priority="2" name="title">
|
|
2373
2402
|
|
|
2374
2403
|
<xsl:variable name="level">
|
|
2375
2404
|
<xsl:call-template name="getLevel"/>
|
|
@@ -2544,7 +2573,7 @@
|
|
|
2544
2573
|
</xsl:template>
|
|
2545
2574
|
|
|
2546
2575
|
<!-- add blue box after first break in Annex title -->
|
|
2547
|
-
<xsl:template match="mn:br[not(preceding-sibling::mn:br)][ancestor::mn:title[preceding-sibling::*[1][self::mn:annex]]]" priority="2">
|
|
2576
|
+
<xsl:template match="mn:br[not(preceding-sibling::mn:br)][ancestor::mn:fmt-title[preceding-sibling::*[1][self::mn:annex]]]" priority="2">
|
|
2548
2577
|
<xsl:choose>
|
|
2549
2578
|
<xsl:when test="($current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report') ">
|
|
2550
2579
|
<xsl:call-template name="addBlueBox"/>
|
|
@@ -2588,35 +2617,35 @@
|
|
|
2588
2617
|
<xsl:attribute name="margin-bottom">2pt</xsl:attribute>
|
|
2589
2618
|
</xsl:if>
|
|
2590
2619
|
<!-- term/name -->
|
|
2591
|
-
<xsl:apply-templates select="mn:name"/>
|
|
2620
|
+
<xsl:apply-templates select="mn:fmt-name"/>
|
|
2592
2621
|
<xsl:text> </xsl:text>
|
|
2593
|
-
<xsl:apply-templates select="mn:preferred"/>
|
|
2594
|
-
<xsl:for-each select="mn:admitted">
|
|
2622
|
+
<xsl:apply-templates select="mn:fmt-preferred"/>
|
|
2623
|
+
<xsl:for-each select="mn:fmt-admitted">
|
|
2595
2624
|
<xsl:if test="position() = 1"><xsl:text> (</xsl:text></xsl:if>
|
|
2596
2625
|
<xsl:apply-templates/>
|
|
2597
2626
|
<xsl:if test="position() != last()"><xsl:text>, </xsl:text></xsl:if>
|
|
2598
2627
|
<xsl:if test="position() = last()"><xsl:text>)</xsl:text></xsl:if>
|
|
2599
2628
|
</xsl:for-each>
|
|
2600
2629
|
</fo:block>
|
|
2601
|
-
<xsl:apply-templates select="*[not(self::mn:preferred) and not(self::mn:admitted) and not(self::mn:name)]"/> <!-- further processing child elements -->
|
|
2630
|
+
<xsl:apply-templates select="*[not(self::mn:fmt-preferred) and not(self::mn:fmt-admitted) and not(self::mn:fmt-name)]"/> <!-- further processing child elements -->
|
|
2602
2631
|
</fo:block>
|
|
2603
2632
|
|
|
2604
2633
|
</xsl:template>
|
|
2605
2634
|
|
|
2606
|
-
<xsl:template match="mn:preferred" priority="2">
|
|
2635
|
+
<xsl:template match="mn:fmt-preferred" priority="2">
|
|
2607
2636
|
<xsl:apply-templates/>
|
|
2608
2637
|
</xsl:template>
|
|
2609
2638
|
|
|
2610
|
-
<xsl:template match="mn:term/mn:definition" priority="2">
|
|
2639
|
+
<xsl:template match="mn:term/mn:fmt-definition" priority="2">
|
|
2611
2640
|
<fo:block xsl:use-attribute-sets="definition-style">
|
|
2612
2641
|
<xsl:apply-templates/>
|
|
2613
2642
|
</fo:block>
|
|
2614
2643
|
<!-- change termsource order - show after definition before termnote -->
|
|
2615
|
-
<xsl:for-each select="ancestor::mn:term[1]/mn:termsource">
|
|
2644
|
+
<xsl:for-each select="ancestor::mn:term[1]/mn:fmt-termsource">
|
|
2616
2645
|
<xsl:call-template name="termsource"/>
|
|
2617
2646
|
</xsl:for-each>
|
|
2618
2647
|
</xsl:template>
|
|
2619
|
-
<xsl:template match="mn:term/mn:termsource" priority="2">
|
|
2648
|
+
<xsl:template match="mn:term/mn:fmt-termsource" priority="2">
|
|
2620
2649
|
<xsl:call-template name="termsource"/>
|
|
2621
2650
|
</xsl:template>
|
|
2622
2651
|
|
|
@@ -2641,7 +2670,7 @@
|
|
|
2641
2670
|
|
|
2642
2671
|
<xsl:choose>
|
|
2643
2672
|
|
|
2644
|
-
<xsl:when test="preceding-sibling::*[1][self::mn:title]/@inline-header = 'true' and $inline-header = 'false'"/> <!-- paragraph displayed in title template -->
|
|
2673
|
+
<xsl:when test="preceding-sibling::*[1][self::mn:fmt-title]/@inline-header = 'true' and $inline-header = 'false'"/> <!-- paragraph displayed in title template -->
|
|
2645
2674
|
|
|
2646
2675
|
<xsl:otherwise>
|
|
2647
2676
|
|
|
@@ -2729,7 +2758,7 @@
|
|
|
2729
2758
|
</xsl:choose>
|
|
2730
2759
|
</xsl:template>
|
|
2731
2760
|
|
|
2732
|
-
<xsl:template match="mn:fn[not(ancestor::*[(self::mn:table or self::mn:figure)] and not(ancestor::mn:name))]" priority="3">
|
|
2761
|
+
<xsl:template match="mn:fn[not(ancestor::*[(self::mn:table or self::mn:figure)] and not(ancestor::mn:fmt-name))]" priority="3">
|
|
2733
2762
|
<xsl:call-template name="fn"/>
|
|
2734
2763
|
</xsl:template>
|
|
2735
2764
|
|
|
@@ -2794,7 +2823,7 @@
|
|
|
2794
2823
|
</xsl:choose>
|
|
2795
2824
|
</xsl:template> -->
|
|
2796
2825
|
|
|
2797
|
-
<xsl:template match="*[self::mn:table or self::mn:figure or self::mn:image]/mn:name/node()[1][self::text()]" priority="2">
|
|
2826
|
+
<xsl:template match="*[self::mn:table or self::mn:figure or self::mn:image]/mn:fmt-name/node()[1][self::text()]" priority="2">
|
|
2798
2827
|
<xsl:choose>
|
|
2799
2828
|
<xsl:when test="contains(., '—')">
|
|
2800
2829
|
<xsl:variable name="substring_after" select="substring-after(., '—')"/>
|
|
@@ -2872,7 +2901,7 @@
|
|
|
2872
2901
|
</xsl:template> -->
|
|
2873
2902
|
|
|
2874
2903
|
<!-- remove space after 'NOTE' without number -->
|
|
2875
|
-
<xsl:template match="*[self::mn:note or self::mn:termnote]/mn:name/text()" priority="2">
|
|
2904
|
+
<xsl:template match="*[self::mn:note or self::mn:termnote]/mn:fmt-name/text()" priority="2">
|
|
2876
2905
|
<xsl:value-of select="normalize-space()"/>
|
|
2877
2906
|
</xsl:template>
|
|
2878
2907
|
|
|
@@ -2894,7 +2923,7 @@
|
|
|
2894
2923
|
</fo:block>
|
|
2895
2924
|
</xsl:template>
|
|
2896
2925
|
|
|
2897
|
-
<xsl:template match="mn:xref" priority="2">
|
|
2926
|
+
<xsl:template match="mn:xref | mn:fmt-xref" priority="2">
|
|
2898
2927
|
<xsl:if test="@target and @target != ''">
|
|
2899
2928
|
<fo:basic-link internal-destination="{@target}" fox:alt-text="{@target}" xsl:use-attribute-sets="xref-style">
|
|
2900
2929
|
|
|
@@ -2936,11 +2965,11 @@
|
|
|
2936
2965
|
</xsl:template>
|
|
2937
2966
|
|
|
2938
2967
|
<!-- Figure 1 to Figure <bold>1</bold> -->
|
|
2939
|
-
<xsl:template match="mn:xref[@to = 'figure' or @to = 'table']/text()" priority="2">
|
|
2968
|
+
<xsl:template match="mn:fmt-xref[@to = 'figure' or @to = 'table']/text()" priority="2">
|
|
2940
2969
|
<xsl:value-of select="."/>
|
|
2941
2970
|
</xsl:template>
|
|
2942
2971
|
|
|
2943
|
-
<xsl:template match="mn:td/mn:xref/mn:strong" priority="2">
|
|
2972
|
+
<xsl:template match="mn:td/mn:fmt-xref/mn:strong" priority="2">
|
|
2944
2973
|
<xsl:apply-templates/>
|
|
2945
2974
|
</xsl:template>
|
|
2946
2975
|
|
|
@@ -2948,7 +2977,7 @@
|
|
|
2948
2977
|
<!-- End of Index processing -->
|
|
2949
2978
|
<!-- =================== -->
|
|
2950
2979
|
|
|
2951
|
-
<xsl:template match="mn:origin" priority="3">
|
|
2980
|
+
<xsl:template match="mn:fmt-origin" priority="3">
|
|
2952
2981
|
<xsl:variable name="current_bibitemid" select="@bibitemid"/>
|
|
2953
2982
|
<xsl:variable name="bibitemid">
|
|
2954
2983
|
<xsl:choose>
|
|
@@ -3624,6 +3653,18 @@
|
|
|
3624
3653
|
<!-- =============================== -->
|
|
3625
3654
|
<!-- Back Pages -->
|
|
3626
3655
|
<!-- =============================== -->
|
|
3656
|
+
<xsl:template name="back-page">
|
|
3657
|
+
<xsl:choose>
|
|
3658
|
+
<xsl:when test="$current_template = 'standard'">
|
|
3659
|
+
<xsl:call-template name="insertBackPage_Standard"/>
|
|
3660
|
+
</xsl:when>
|
|
3661
|
+
|
|
3662
|
+
<xsl:when test="$current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report'">
|
|
3663
|
+
<xsl:call-template name="insertBackPage_NonStandard"/>
|
|
3664
|
+
</xsl:when>
|
|
3665
|
+
</xsl:choose>
|
|
3666
|
+
</xsl:template> <!-- END: back-page -->
|
|
3667
|
+
|
|
3627
3668
|
<xsl:template name="insertBackPage_Standard">
|
|
3628
3669
|
<fo:page-sequence master-reference="cover-and-back-page-standard" force-page-count="no-force">
|
|
3629
3670
|
|
|
@@ -3938,10 +3979,6 @@
|
|
|
3938
3979
|
<title-part lang="ru">
|
|
3939
3980
|
</title-part>
|
|
3940
3981
|
<title-part lang="zh">第 # 部分:</title-part>
|
|
3941
|
-
|
|
3942
|
-
<title-subpart lang="en">Sub-part #</title-subpart>
|
|
3943
|
-
<title-subpart lang="fr">Partie de sub #</title-subpart>
|
|
3944
|
-
|
|
3945
3982
|
</xsl:variable>
|
|
3946
3983
|
<xsl:variable name="titles" select="xalan:nodeset($titles_)"/>
|
|
3947
3984
|
|
|
@@ -4395,7 +4432,8 @@
|
|
|
4395
4432
|
<xsl:template match="mn:stem" mode="update_xml_step1"/>
|
|
4396
4433
|
|
|
4397
4434
|
<xsl:template match="mn:fmt-stem" mode="update_xml_step1">
|
|
4398
|
-
<xsl:element name="stem" namespace="{$namespace_full}">
|
|
4435
|
+
<!-- <xsl:element name="stem" namespace="{$namespace_full}"> -->
|
|
4436
|
+
<xsl:copy>
|
|
4399
4437
|
<xsl:copy-of select="@*"/>
|
|
4400
4438
|
<xsl:choose>
|
|
4401
4439
|
<xsl:when test="mn:semx and count(node()) = 1">
|
|
@@ -4419,7 +4457,8 @@
|
|
|
4419
4457
|
</xsl:choose>
|
|
4420
4458
|
</xsl:otherwise>
|
|
4421
4459
|
</xsl:choose>
|
|
4422
|
-
</xsl:
|
|
4460
|
+
</xsl:copy>
|
|
4461
|
+
<!-- </xsl:element> -->
|
|
4423
4462
|
</xsl:template>
|
|
4424
4463
|
|
|
4425
4464
|
<xsl:template match="mn:image[not(.//mn:passthrough)] | mn:bibdata[not(.//mn:passthrough)] | mn:localized-strings" mode="update_xml_step1">
|
|
@@ -4581,12 +4620,14 @@
|
|
|
4581
4620
|
</xsl:template>
|
|
4582
4621
|
|
|
4583
4622
|
<xsl:template match="mn:fmt-title" mode="update_xml_step1">
|
|
4584
|
-
<xsl:element name="title" namespace="{$namespace_full}">
|
|
4623
|
+
<!-- <xsl:element name="title" namespace="{$namespace_full}"> -->
|
|
4624
|
+
<xsl:copy>
|
|
4585
4625
|
<xsl:copy-of select="@*"/>
|
|
4586
4626
|
<xsl:call-template name="addNamedDestinationAttribute"/>
|
|
4587
4627
|
|
|
4588
4628
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
4589
|
-
</xsl:
|
|
4629
|
+
</xsl:copy>
|
|
4630
|
+
<!-- </xsl:element> -->
|
|
4590
4631
|
</xsl:template>
|
|
4591
4632
|
|
|
4592
4633
|
<xsl:template name="addNamedDestinationAttribute">
|
|
@@ -4598,12 +4639,14 @@
|
|
|
4598
4639
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
4599
4640
|
</xsl:when>
|
|
4600
4641
|
<xsl:otherwise>
|
|
4601
|
-
<xsl:element name="name" namespace="{$namespace_full}">
|
|
4642
|
+
<!-- <xsl:element name="name" namespace="{$namespace_full}"> -->
|
|
4643
|
+
<xsl:copy>
|
|
4602
4644
|
<xsl:copy-of select="@*"/>
|
|
4603
4645
|
<xsl:call-template name="addNamedDestinationAttribute"/>
|
|
4604
4646
|
|
|
4605
4647
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
4606
|
-
</xsl:
|
|
4648
|
+
</xsl:copy>
|
|
4649
|
+
<!-- </xsl:element> -->
|
|
4607
4650
|
</xsl:otherwise>
|
|
4608
4651
|
</xsl:choose>
|
|
4609
4652
|
</xsl:template>
|
|
@@ -4618,7 +4661,7 @@
|
|
|
4618
4661
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
4619
4662
|
</xsl:template>
|
|
4620
4663
|
<xsl:template match="mn:fmt-preferred[not(mn:p)] | mn:fmt-preferred/mn:p" mode="update_xml_step1">
|
|
4621
|
-
<xsl:element name="preferred" namespace="{$namespace_full}">
|
|
4664
|
+
<xsl:element name="fmt-preferred" namespace="{$namespace_full}">
|
|
4622
4665
|
<xsl:copy-of select="@*"/>
|
|
4623
4666
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
4624
4667
|
</xsl:element>
|
|
@@ -4628,7 +4671,7 @@
|
|
|
4628
4671
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
4629
4672
|
</xsl:template>
|
|
4630
4673
|
<xsl:template match="mn:fmt-admitted[not(mn:p)] | mn:fmt-admitted/mn:p" mode="update_xml_step1">
|
|
4631
|
-
<xsl:element name="admitted" namespace="{$namespace_full}">
|
|
4674
|
+
<xsl:element name="fmt-admitted" namespace="{$namespace_full}">
|
|
4632
4675
|
<xsl:copy-of select="@*"/>
|
|
4633
4676
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
4634
4677
|
</xsl:element>
|
|
@@ -4638,32 +4681,32 @@
|
|
|
4638
4681
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
4639
4682
|
</xsl:template>
|
|
4640
4683
|
<xsl:template match="mn:fmt-deprecates[not(mn:p)] | mn:fmt-deprecates/mn:p" mode="update_xml_step1">
|
|
4641
|
-
<xsl:element name="deprecates" namespace="{$namespace_full}">
|
|
4684
|
+
<xsl:element name="fmt-deprecates" namespace="{$namespace_full}">
|
|
4642
4685
|
<xsl:copy-of select="@*"/>
|
|
4643
4686
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
4644
4687
|
</xsl:element>
|
|
4645
4688
|
</xsl:template>
|
|
4646
4689
|
|
|
4647
|
-
<xsl:template match="mn:fmt-definition" mode="update_xml_step1">
|
|
4690
|
+
<!-- <xsl:template match="mn:fmt-definition" mode="update_xml_step1">
|
|
4648
4691
|
<xsl:element name="definition" namespace="{$namespace_full}">
|
|
4649
4692
|
<xsl:copy-of select="@*"/>
|
|
4650
4693
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
4651
4694
|
</xsl:element>
|
|
4652
4695
|
</xsl:template>
|
|
4653
|
-
|
|
4696
|
+
|
|
4654
4697
|
<xsl:template match="mn:fmt-termsource" mode="update_xml_step1">
|
|
4655
4698
|
<xsl:element name="termsource" namespace="{$namespace_full}">
|
|
4656
4699
|
<xsl:copy-of select="@*"/>
|
|
4657
4700
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
4658
4701
|
</xsl:element>
|
|
4659
4702
|
</xsl:template>
|
|
4660
|
-
|
|
4703
|
+
|
|
4661
4704
|
<xsl:template match="mn:fmt-source" mode="update_xml_step1">
|
|
4662
4705
|
<xsl:element name="source" namespace="{$namespace_full}">
|
|
4663
4706
|
<xsl:copy-of select="@*"/>
|
|
4664
4707
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
4665
4708
|
</xsl:element>
|
|
4666
|
-
</xsl:template>
|
|
4709
|
+
</xsl:template> -->
|
|
4667
4710
|
|
|
4668
4711
|
<xsl:template match="mn:span[ @class = 'fmt-caption-label' or @class = 'fmt-element-name' or @class = 'fmt-caption-delim' or @class = 'fmt-autonum-delim']" mode="update_xml_step1" priority="3">
|
|
4669
4712
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
@@ -4686,12 +4729,12 @@
|
|
|
4686
4729
|
</xsl:template>
|
|
4687
4730
|
|
|
4688
4731
|
<xsl:template match="mn:identifier" mode="update_xml_step1"/>
|
|
4689
|
-
<xsl:template match="mn:fmt-identifier" mode="update_xml_step1">
|
|
4732
|
+
<!-- <xsl:template match="mn:fmt-identifier" mode="update_xml_step1">
|
|
4690
4733
|
<xsl:element name="identifier" namespace="{$namespace_full}">
|
|
4691
4734
|
<xsl:copy-of select="@*"/>
|
|
4692
4735
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
4693
4736
|
</xsl:element>
|
|
4694
|
-
</xsl:template>
|
|
4737
|
+
</xsl:template> -->
|
|
4695
4738
|
|
|
4696
4739
|
<xsl:template match="mn:concept" mode="update_xml_step1"/>
|
|
4697
4740
|
|
|
@@ -4701,51 +4744,53 @@
|
|
|
4701
4744
|
|
|
4702
4745
|
<xsl:template match="mn:eref" mode="update_xml_step1"/>
|
|
4703
4746
|
|
|
4704
|
-
<xsl:template match="mn:fmt-eref" mode="update_xml_step1">
|
|
4747
|
+
<!-- <xsl:template match="mn:fmt-eref" mode="update_xml_step1">
|
|
4705
4748
|
<xsl:element name="eref" namespace="{$namespace_full}">
|
|
4706
4749
|
<xsl:copy-of select="@*"/>
|
|
4707
4750
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
4708
4751
|
</xsl:element>
|
|
4709
|
-
</xsl:template>
|
|
4752
|
+
</xsl:template> -->
|
|
4710
4753
|
|
|
4711
4754
|
<xsl:template match="mn:xref" mode="update_xml_step1"/>
|
|
4712
4755
|
|
|
4713
|
-
<xsl:template match="mn:fmt-xref" mode="update_xml_step1">
|
|
4756
|
+
<!-- <xsl:template match="mn:fmt-xref" mode="update_xml_step1">
|
|
4714
4757
|
<xsl:element name="xref" namespace="{$namespace_full}">
|
|
4715
4758
|
<xsl:copy-of select="@*"/>
|
|
4716
4759
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
4717
4760
|
</xsl:element>
|
|
4718
|
-
</xsl:template>
|
|
4761
|
+
</xsl:template> -->
|
|
4719
4762
|
|
|
4720
4763
|
<xsl:template match="mn:link" mode="update_xml_step1"/>
|
|
4721
4764
|
|
|
4722
|
-
<xsl:template match="mn:fmt-link" mode="update_xml_step1">
|
|
4765
|
+
<!-- <xsl:template match="mn:fmt-link" mode="update_xml_step1">
|
|
4723
4766
|
<xsl:element name="link" namespace="{$namespace_full}">
|
|
4724
4767
|
<xsl:copy-of select="@*"/>
|
|
4725
4768
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
4726
4769
|
</xsl:element>
|
|
4727
|
-
</xsl:template>
|
|
4770
|
+
</xsl:template> -->
|
|
4728
4771
|
|
|
4729
4772
|
<xsl:template match="mn:origin" mode="update_xml_step1"/>
|
|
4730
4773
|
|
|
4731
|
-
<xsl:template match="mn:fmt-origin" mode="update_xml_step1">
|
|
4774
|
+
<!-- <xsl:template match="mn:fmt-origin" mode="update_xml_step1">
|
|
4732
4775
|
<xsl:element name="origin" namespace="{$namespace_full}">
|
|
4733
4776
|
<xsl:copy-of select="@*"/>
|
|
4734
4777
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
4735
4778
|
</xsl:element>
|
|
4736
|
-
</xsl:template>
|
|
4779
|
+
</xsl:template> -->
|
|
4737
4780
|
|
|
4738
4781
|
<xsl:template match="mn:erefstack" mode="update_xml_step1"/>
|
|
4739
4782
|
|
|
4740
4783
|
<xsl:template match="mn:svgmap" mode="update_xml_step1"/>
|
|
4741
4784
|
|
|
4742
|
-
<xsl:template match="mn:
|
|
4785
|
+
<xsl:template match="mn:annotation-container" mode="update_xml_step1"/>
|
|
4743
4786
|
|
|
4744
|
-
|
|
4745
|
-
|
|
4746
|
-
|
|
4747
|
-
|
|
4748
|
-
|
|
4787
|
+
<xsl:template match="mn:fmt-identifier[not(ancestor::*[local-name() = 'bibdata'])]//text()" mode="update_xml_step1">
|
|
4788
|
+
<xsl:element name="{$element_name_keep-together_within-line}" namespace="{$namespace_full}">
|
|
4789
|
+
<xsl:value-of select="."/>
|
|
4790
|
+
</xsl:element>
|
|
4791
|
+
</xsl:template>
|
|
4792
|
+
|
|
4793
|
+
<xsl:template match="@semx-id | @anchor" mode="update_xml_step1"/>
|
|
4749
4794
|
|
|
4750
4795
|
<!-- END: update new Presentation XML -->
|
|
4751
4796
|
|
|
@@ -4938,7 +4983,7 @@
|
|
|
4938
4983
|
</xsl:variable>
|
|
4939
4984
|
|
|
4940
4985
|
<!-- add 'fn' after eref and origin, to reference bibitem with note = 'Withdrawn.' or 'Cancelled and replaced...' -->
|
|
4941
|
-
<xsl:template match="mn:eref | mn:origin" mode="update_xml_step2">
|
|
4986
|
+
<xsl:template match="mn:fmt-eref | mn:fmt-origin" mode="update_xml_step2">
|
|
4942
4987
|
<xsl:copy-of select="."/>
|
|
4943
4988
|
|
|
4944
4989
|
<xsl:variable name="bibitemid" select="@bibitemid"/>
|
|
@@ -5007,7 +5052,7 @@
|
|
|
5007
5052
|
</xsl:call-template>
|
|
5008
5053
|
</xsl:template>
|
|
5009
5054
|
|
|
5010
|
-
<xsl:template match="mn:stem | mn:image" mode="update_xml_step2">
|
|
5055
|
+
<xsl:template match="mn:fmt-stem | mn:image" mode="update_xml_step2">
|
|
5011
5056
|
<xsl:copy-of select="."/>
|
|
5012
5057
|
</xsl:template>
|
|
5013
5058
|
|
|
@@ -5044,7 +5089,7 @@
|
|
|
5044
5089
|
<xsl:variable name="non_white_space">[^\s\u3000-\u9FFF]</xsl:variable>
|
|
5045
5090
|
<xsl:variable name="regex_dots_units">((\b((<xsl:value-of select="$non_white_space"/>{1,3}\.<xsl:value-of select="$non_white_space"/>+)|(<xsl:value-of select="$non_white_space"/>+\.<xsl:value-of select="$non_white_space"/>{1,3}))\b)|(\.<xsl:value-of select="$non_white_space"/>{1,3})\b)</xsl:variable>
|
|
5046
5091
|
|
|
5047
|
-
<xsl:template match="text()[not(ancestor::mn:bibdata or ancestor::mn:link[not(contains(
|
|
5092
|
+
<xsl:template match="text()[not(ancestor::mn:bibdata or ancestor::mn:fmt-link[not(contains(normalize-space(),' '))] or ancestor::mn:sourcecode or ancestor::*[local-name() = 'math'] or ancestor::*[local-name() = 'svg'] or ancestor::mn:name or ancestor::mn:fmt-name or starts-with(., 'http://') or starts-with(., 'https://') or starts-with(., 'www.') or normalize-space() = '' )]" name="keep_together_standard_number" mode="update_xml_enclose_keep-together_within-line">
|
|
5048
5093
|
|
|
5049
5094
|
<xsl:variable name="parent" select="local-name(..)"/>
|
|
5050
5095
|
|
|
@@ -5163,7 +5208,7 @@
|
|
|
5163
5208
|
</xsl:if>
|
|
5164
5209
|
</xsl:template>
|
|
5165
5210
|
|
|
5166
|
-
<xsl:template match="mn:stem | mn:image" mode="update_xml_enclose_keep-together_within-line">
|
|
5211
|
+
<xsl:template match="mn:fmt-stem | mn:image" mode="update_xml_enclose_keep-together_within-line">
|
|
5167
5212
|
<xsl:copy-of select="."/>
|
|
5168
5213
|
</xsl:template>
|
|
5169
5214
|
|
|
@@ -5490,7 +5535,7 @@
|
|
|
5490
5535
|
</fo:block>
|
|
5491
5536
|
</xsl:template> <!-- copyright-statement -->
|
|
5492
5537
|
|
|
5493
|
-
<xsl:template match="mn:copyright-statement//mn:title">
|
|
5538
|
+
<xsl:template match="mn:copyright-statement//mn:fmt-title">
|
|
5494
5539
|
<!-- process in the template 'title' -->
|
|
5495
5540
|
<xsl:call-template name="title"/>
|
|
5496
5541
|
</xsl:template> <!-- copyright-statement//title -->
|
|
@@ -5506,7 +5551,7 @@
|
|
|
5506
5551
|
</fo:block>
|
|
5507
5552
|
</xsl:template> <!-- license-statement -->
|
|
5508
5553
|
|
|
5509
|
-
<xsl:template match="mn:license-statement//mn:title">
|
|
5554
|
+
<xsl:template match="mn:license-statement//mn:fmt-title">
|
|
5510
5555
|
<!-- process in the template 'title' -->
|
|
5511
5556
|
<xsl:call-template name="title"/>
|
|
5512
5557
|
</xsl:template> <!-- license-statement/title -->
|
|
@@ -5523,7 +5568,7 @@
|
|
|
5523
5568
|
</fo:block>
|
|
5524
5569
|
</xsl:template> <!-- legal-statement -->
|
|
5525
5570
|
|
|
5526
|
-
<xsl:template match="mn:legal-statement//mn:title">
|
|
5571
|
+
<xsl:template match="mn:legal-statement//mn:fmt-title">
|
|
5527
5572
|
<!-- process in the template 'title' -->
|
|
5528
5573
|
<xsl:call-template name="title"/>
|
|
5529
5574
|
|
|
@@ -5543,7 +5588,7 @@
|
|
|
5543
5588
|
</fo:block>
|
|
5544
5589
|
</xsl:template> <!-- feedback-statement -->
|
|
5545
5590
|
|
|
5546
|
-
<xsl:template match="mn:feedback-statement//mn:title">
|
|
5591
|
+
<xsl:template match="mn:feedback-statement//mn:fmt-title">
|
|
5547
5592
|
<!-- process in the template 'title' -->
|
|
5548
5593
|
<xsl:call-template name="title"/>
|
|
5549
5594
|
</xsl:template>
|
|
@@ -5579,7 +5624,7 @@
|
|
|
5579
5624
|
</xsl:if>
|
|
5580
5625
|
</xsl:template> <!-- refine_link-style -->
|
|
5581
5626
|
|
|
5582
|
-
<xsl:template match="mn:link" name="link">
|
|
5627
|
+
<xsl:template match="mn:fmt-link" name="link">
|
|
5583
5628
|
<xsl:variable name="target_normalized" select="translate(@target, '\', '/')"/>
|
|
5584
5629
|
<xsl:variable name="target_attachment_name" select="substring-after($target_normalized, '_attachments/')"/>
|
|
5585
5630
|
<xsl:variable name="isLinkToEmbeddedFile" select="normalize-space(@attachment = 'true' and $pdfAttachmentsList//attachment[@filename = current()/@target])"/>
|
|
@@ -5800,7 +5845,7 @@
|
|
|
5800
5845
|
<xsl:value-of select="."/>
|
|
5801
5846
|
</xsl:attribute>
|
|
5802
5847
|
</xsl:for-each>
|
|
5803
|
-
<xsl:apply-templates select="node()[not(self::mn:name)]"/>
|
|
5848
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/>
|
|
5804
5849
|
</xsl:when>
|
|
5805
5850
|
|
|
5806
5851
|
<xsl:otherwise>
|
|
@@ -5842,11 +5887,11 @@
|
|
|
5842
5887
|
<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
|
|
5843
5888
|
</xsl:if>
|
|
5844
5889
|
|
|
5845
|
-
<xsl:apply-templates select="node()[not(self::mn:name or self::mn:dl)]"/>
|
|
5890
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name or self::mn:dl)]"/>
|
|
5846
5891
|
</fo:block>
|
|
5847
5892
|
|
|
5848
5893
|
<xsl:apply-templates select="mn:dl"/> <!-- Key table -->
|
|
5849
|
-
<xsl:apply-templates select="mn:name"/> <!-- show sourcecode's name AFTER content -->
|
|
5894
|
+
<xsl:apply-templates select="mn:fmt-name"/> <!-- show sourcecode's name AFTER content -->
|
|
5850
5895
|
|
|
5851
5896
|
</fo:block-container>
|
|
5852
5897
|
</fo:block-container>
|
|
@@ -6147,7 +6192,7 @@
|
|
|
6147
6192
|
|
|
6148
6193
|
<!-- end mode="syntax_highlight" -->
|
|
6149
6194
|
|
|
6150
|
-
<xsl:template match="mn:sourcecode/mn:name">
|
|
6195
|
+
<xsl:template match="mn:sourcecode/mn:fmt-name">
|
|
6151
6196
|
<xsl:if test="normalize-space() != ''">
|
|
6152
6197
|
<fo:block xsl:use-attribute-sets="sourcecode-name-style">
|
|
6153
6198
|
<xsl:apply-templates/>
|
|
@@ -6165,7 +6210,7 @@
|
|
|
6165
6210
|
</xsl:choose>
|
|
6166
6211
|
</xsl:template>
|
|
6167
6212
|
|
|
6168
|
-
<xsl:template match="mn:annotation">
|
|
6213
|
+
<xsl:template match="mn:callout-annotation">
|
|
6169
6214
|
<xsl:variable name="annotation-id" select="@id"/>
|
|
6170
6215
|
<xsl:variable name="callout" select="//*[@target = $annotation-id]/text()"/>
|
|
6171
6216
|
<fo:block id="{$annotation-id}" white-space="nowrap">
|
|
@@ -6177,7 +6222,7 @@
|
|
|
6177
6222
|
</fo:block>
|
|
6178
6223
|
</xsl:template>
|
|
6179
6224
|
|
|
6180
|
-
<xsl:template match="mn:annotation/mn:p">
|
|
6225
|
+
<xsl:template match="mn:callout-annotation/mn:p">
|
|
6181
6226
|
<xsl:param name="callout"/>
|
|
6182
6227
|
<fo:inline id="{@id}">
|
|
6183
6228
|
<xsl:call-template name="setNamedDestination"/>
|
|
@@ -6330,7 +6375,7 @@
|
|
|
6330
6375
|
<xsl:when test="starts-with(., $ace_tag) or self::mn:change-open-tag or self::mn:change-close-tag"> <!-- examples: ace-tag_A1_start, ace-tag_A2_end, C1_start, AC_start, or
|
|
6331
6376
|
<change-open-tag>A<sub>1</sub></change-open-tag>, <change-close-tag>A<sub>1</sub></change-close-tag> -->
|
|
6332
6377
|
<xsl:choose>
|
|
6333
|
-
<xsl:when test="$skip = 'true' and ((local-name(../..) = 'note' and not(preceding-sibling::node())) or (
|
|
6378
|
+
<xsl:when test="$skip = 'true' and ((local-name(../..) = 'note' and not(preceding-sibling::node())) or (parent::mn:fmt-title and preceding-sibling::node()[1][self::mn:tab]) or local-name(..) = 'formattedref' and not(preceding-sibling::node())) and ../node()[last()][self::mn:add][starts-with(text(), $ace_tag)]"><!-- start tag displayed in template name="note" and title --></xsl:when>
|
|
6334
6379
|
<xsl:otherwise>
|
|
6335
6380
|
<xsl:variable name="tag">
|
|
6336
6381
|
<xsl:call-template name="insertTag">
|
|
@@ -6731,12 +6776,12 @@
|
|
|
6731
6776
|
<xsl:template match="mn:permission">
|
|
6732
6777
|
<xsl:call-template name="setNamedDestination"/>
|
|
6733
6778
|
<fo:block id="{@id}" xsl:use-attribute-sets="permission-style">
|
|
6734
|
-
<xsl:apply-templates select="mn:name"/>
|
|
6735
|
-
<xsl:apply-templates select="node()[not(self::mn:name)]"/>
|
|
6779
|
+
<xsl:apply-templates select="mn:fmt-name"/>
|
|
6780
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/>
|
|
6736
6781
|
</fo:block>
|
|
6737
6782
|
</xsl:template>
|
|
6738
6783
|
|
|
6739
|
-
<xsl:template match="mn:permission/mn:name">
|
|
6784
|
+
<xsl:template match="mn:permission/mn:fmt-name">
|
|
6740
6785
|
<xsl:if test="normalize-space() != ''">
|
|
6741
6786
|
<fo:block xsl:use-attribute-sets="permission-name-style">
|
|
6742
6787
|
<xsl:apply-templates/>
|
|
@@ -6758,15 +6803,15 @@
|
|
|
6758
6803
|
<xsl:template match="mn:requirement">
|
|
6759
6804
|
<xsl:call-template name="setNamedDestination"/>
|
|
6760
6805
|
<fo:block id="{@id}" xsl:use-attribute-sets="requirement-style">
|
|
6761
|
-
<xsl:apply-templates select="mn:name"/>
|
|
6806
|
+
<xsl:apply-templates select="mn:fmt-name"/>
|
|
6762
6807
|
<xsl:apply-templates select="mn:label"/>
|
|
6763
6808
|
<xsl:apply-templates select="@obligation"/>
|
|
6764
6809
|
<xsl:apply-templates select="mn:subject"/>
|
|
6765
|
-
<xsl:apply-templates select="node()[not(self::mn:name) and not(self::mn:label) and not(self::mn:subject)]"/>
|
|
6810
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name) and not(self::mn:label) and not(self::mn:subject)]"/>
|
|
6766
6811
|
</fo:block>
|
|
6767
6812
|
</xsl:template>
|
|
6768
6813
|
|
|
6769
|
-
<xsl:template match="mn:requirement/mn:name">
|
|
6814
|
+
<xsl:template match="mn:requirement/mn:fmt-name">
|
|
6770
6815
|
<xsl:if test="normalize-space() != ''">
|
|
6771
6816
|
|
|
6772
6817
|
<fo:block xsl:use-attribute-sets="requirement-name-style">
|
|
@@ -6802,12 +6847,12 @@
|
|
|
6802
6847
|
<xsl:template match="mn:recommendation">
|
|
6803
6848
|
<xsl:call-template name="setNamedDestination"/>
|
|
6804
6849
|
<fo:block id="{@id}" xsl:use-attribute-sets="recommendation-style">
|
|
6805
|
-
<xsl:apply-templates select="mn:name"/>
|
|
6806
|
-
<xsl:apply-templates select="node()[not(self::mn:name)]"/>
|
|
6850
|
+
<xsl:apply-templates select="mn:fmt-name"/>
|
|
6851
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/>
|
|
6807
6852
|
</fo:block>
|
|
6808
6853
|
</xsl:template>
|
|
6809
6854
|
|
|
6810
|
-
<xsl:template match="mn:recommendation/mn:name">
|
|
6855
|
+
<xsl:template match="mn:recommendation/mn:fmt-name">
|
|
6811
6856
|
<xsl:if test="normalize-space() != ''">
|
|
6812
6857
|
|
|
6813
6858
|
<fo:block xsl:use-attribute-sets="recommendation-name-style">
|
|
@@ -7056,11 +7101,11 @@
|
|
|
7056
7101
|
|
|
7057
7102
|
<xsl:if test="parent::mn:term and not(preceding-sibling::mn:term)">
|
|
7058
7103
|
</xsl:if>
|
|
7059
|
-
<xsl:apply-templates select="node()[not(self::mn:name)]"/>
|
|
7104
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/>
|
|
7060
7105
|
</fo:block>
|
|
7061
7106
|
</xsl:template>
|
|
7062
7107
|
|
|
7063
|
-
<xsl:template match="mn:term/mn:name">
|
|
7108
|
+
<xsl:template match="mn:term/mn:fmt-name">
|
|
7064
7109
|
<xsl:if test="normalize-space() != ''">
|
|
7065
7110
|
<!-- <xsl:variable name="level">
|
|
7066
7111
|
<xsl:call-template name="getLevelTermName"/>
|
|
@@ -7079,7 +7124,7 @@
|
|
|
7079
7124
|
<!-- origin -->
|
|
7080
7125
|
<!-- modification -->
|
|
7081
7126
|
<!-- ====== -->
|
|
7082
|
-
<xsl:template match="mn:termsource" name="termsource">
|
|
7127
|
+
<xsl:template match="mn:fmt-termsource" name="termsource">
|
|
7083
7128
|
<fo:block xsl:use-attribute-sets="termsource-style">
|
|
7084
7129
|
|
|
7085
7130
|
<xsl:call-template name="refine_termsource-style"/>
|
|
@@ -7118,24 +7163,24 @@
|
|
|
7118
7163
|
</fo:block>
|
|
7119
7164
|
</xsl:template>
|
|
7120
7165
|
|
|
7121
|
-
<xsl:template match="mn:termsource/text()[starts-with(., '[SOURCE: Adapted from: ') or starts-with(., '[SOURCE: Quoted from: ') or starts-with(., '[SOURCE: Modified from: ')]" priority="2">
|
|
7166
|
+
<xsl:template match="mn:fmt-termsource/text()[starts-with(., '[SOURCE: Adapted from: ') or starts-with(., '[SOURCE: Quoted from: ') or starts-with(., '[SOURCE: Modified from: ')]" priority="2">
|
|
7122
7167
|
<xsl:text>[</xsl:text><xsl:value-of select="substring-after(., '[SOURCE: ')"/>
|
|
7123
7168
|
</xsl:template>
|
|
7124
7169
|
|
|
7125
|
-
<xsl:template match="mn:termsource/text()">
|
|
7170
|
+
<xsl:template match="mn:fmt-termsource/text()">
|
|
7126
7171
|
<xsl:if test="normalize-space() != ''">
|
|
7127
7172
|
<xsl:value-of select="."/>
|
|
7128
7173
|
</xsl:if>
|
|
7129
7174
|
</xsl:template>
|
|
7130
7175
|
|
|
7131
7176
|
<!-- text SOURCE: -->
|
|
7132
|
-
<xsl:template match="mn:termsource/mn:strong[1][following-sibling::*[1][self::mn:origin]]/text()">
|
|
7177
|
+
<xsl:template match="mn:fmt-termsource/mn:strong[1][following-sibling::*[1][self::mn:fmt-origin]]/text()">
|
|
7133
7178
|
<fo:inline xsl:use-attribute-sets="termsource-text-style">
|
|
7134
7179
|
<xsl:value-of select="."/>
|
|
7135
7180
|
</fo:inline>
|
|
7136
7181
|
</xsl:template>
|
|
7137
7182
|
|
|
7138
|
-
<xsl:template match="mn:origin">
|
|
7183
|
+
<xsl:template match="mn:fmt-origin">
|
|
7139
7184
|
<xsl:call-template name="insert_basic_link">
|
|
7140
7185
|
<xsl:with-param name="element">
|
|
7141
7186
|
<fo:basic-link internal-destination="{@bibitemid}" fox:alt-text="{@citeas}">
|
|
@@ -7181,7 +7226,7 @@
|
|
|
7181
7226
|
<!-- ====== -->
|
|
7182
7227
|
|
|
7183
7228
|
<!-- Preferred, admitted, deprecated -->
|
|
7184
|
-
<xsl:template match="mn:preferred">
|
|
7229
|
+
<xsl:template match="mn:fmt-preferred">
|
|
7185
7230
|
<xsl:variable name="level">
|
|
7186
7231
|
<xsl:call-template name="getLevel"/>
|
|
7187
7232
|
</xsl:variable>
|
|
@@ -7192,15 +7237,15 @@
|
|
|
7192
7237
|
</xsl:variable>
|
|
7193
7238
|
<fo:block font-size="{normalize-space($font-size)}" role="H{$levelTerm}" xsl:use-attribute-sets="preferred-block-style">
|
|
7194
7239
|
|
|
7195
|
-
<xsl:if test="parent::mn:term and not(preceding-sibling::mn:preferred)"> <!-- if first preffered in term, then display term's name -->
|
|
7240
|
+
<xsl:if test="parent::mn:term and not(preceding-sibling::mn:fmt-preferred)"> <!-- if first preffered in term, then display term's name -->
|
|
7196
7241
|
|
|
7197
7242
|
<fo:block xsl:use-attribute-sets="term-name-style" role="SKIP">
|
|
7198
7243
|
|
|
7199
|
-
<xsl:for-each select="ancestor::mn:term[1]/mn:name"><!-- change context -->
|
|
7244
|
+
<xsl:for-each select="ancestor::mn:term[1]/mn:fmt-name"><!-- change context -->
|
|
7200
7245
|
<xsl:call-template name="setIDforNamedDestination"/>
|
|
7201
7246
|
</xsl:for-each>
|
|
7202
7247
|
|
|
7203
|
-
<xsl:apply-templates select="ancestor::mn:term[1]/mn:name"/>
|
|
7248
|
+
<xsl:apply-templates select="ancestor::mn:term[1]/mn:fmt-name"/>
|
|
7204
7249
|
</fo:block>
|
|
7205
7250
|
</xsl:if>
|
|
7206
7251
|
|
|
@@ -7224,13 +7269,13 @@
|
|
|
7224
7269
|
<!-- https://github.com/metanorma/isodoc/issues/632#issuecomment-2567163931 -->
|
|
7225
7270
|
<xsl:template match="mn:domain"/>
|
|
7226
7271
|
|
|
7227
|
-
<xsl:template match="mn:admitted">
|
|
7272
|
+
<xsl:template match="mn:fmt-admitted">
|
|
7228
7273
|
<fo:block xsl:use-attribute-sets="admitted-style">
|
|
7229
7274
|
<xsl:apply-templates/>
|
|
7230
7275
|
</fo:block>
|
|
7231
7276
|
</xsl:template>
|
|
7232
7277
|
|
|
7233
|
-
<xsl:template match="mn:deprecates">
|
|
7278
|
+
<xsl:template match="mn:fmt-deprecates">
|
|
7234
7279
|
<fo:block xsl:use-attribute-sets="deprecates-style">
|
|
7235
7280
|
<xsl:apply-templates/>
|
|
7236
7281
|
</fo:block>
|
|
@@ -7244,7 +7289,7 @@
|
|
|
7244
7289
|
|
|
7245
7290
|
<!-- regarding ISO 10241-1:2011, If there is more than one preferred term, each preferred term follows the previous one on a new line. -->
|
|
7246
7291
|
<!-- in metanorma xml preferred terms delimited by semicolons -->
|
|
7247
|
-
<xsl:template match="mn:preferred/text()[contains(., ';')] | mn:preferred/mn:strong/text()[contains(., ';')]">
|
|
7292
|
+
<xsl:template match="mn:fmt-preferred/text()[contains(., ';')] | mn:fmt-preferred/mn:strong/text()[contains(., ';')]">
|
|
7248
7293
|
<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.), ';', $linebreak)"/>
|
|
7249
7294
|
</xsl:template>
|
|
7250
7295
|
<!-- End Preferred, admitted, deprecated -->
|
|
@@ -7263,16 +7308,16 @@
|
|
|
7263
7308
|
<!-- ========== -->
|
|
7264
7309
|
<!-- definition -->
|
|
7265
7310
|
<!-- ========== -->
|
|
7266
|
-
<xsl:template match="mn:definition">
|
|
7311
|
+
<xsl:template match="mn:fmt-definition">
|
|
7267
7312
|
<fo:block xsl:use-attribute-sets="definition-style" role="SKIP">
|
|
7268
7313
|
<xsl:apply-templates/>
|
|
7269
7314
|
</fo:block>
|
|
7270
7315
|
</xsl:template>
|
|
7271
7316
|
|
|
7272
|
-
<xsl:template match="mn:definition[preceding-sibling::mn:domain]">
|
|
7317
|
+
<xsl:template match="mn:fmt-definition[preceding-sibling::mn:domain]">
|
|
7273
7318
|
<xsl:apply-templates/>
|
|
7274
7319
|
</xsl:template>
|
|
7275
|
-
<xsl:template match="mn:definition[preceding-sibling::mn:domain]/mn:p[1]">
|
|
7320
|
+
<xsl:template match="mn:fmt-definition[preceding-sibling::mn:domain]/mn:p[1]">
|
|
7276
7321
|
<fo:inline> <xsl:apply-templates/></fo:inline>
|
|
7277
7322
|
<fo:block/>
|
|
7278
7323
|
</xsl:template>
|
|
@@ -7345,12 +7390,12 @@
|
|
|
7345
7390
|
<xsl:call-template name="refine_termexample-style"/>
|
|
7346
7391
|
<xsl:call-template name="setBlockSpanAll"/>
|
|
7347
7392
|
|
|
7348
|
-
<xsl:apply-templates select="mn:name"/>
|
|
7349
|
-
<xsl:apply-templates select="node()[not(self::mn:name)]"/>
|
|
7393
|
+
<xsl:apply-templates select="mn:fmt-name"/>
|
|
7394
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/>
|
|
7350
7395
|
</fo:block>
|
|
7351
7396
|
</xsl:template>
|
|
7352
7397
|
|
|
7353
|
-
<xsl:template match="mn:termexample/mn:name">
|
|
7398
|
+
<xsl:template match="mn:termexample/mn:fmt-name">
|
|
7354
7399
|
<xsl:if test="normalize-space() != ''">
|
|
7355
7400
|
<fo:inline xsl:use-attribute-sets="termexample-name-style">
|
|
7356
7401
|
<xsl:call-template name="refine_termexample-name-style"/>
|
|
@@ -7404,7 +7449,7 @@
|
|
|
7404
7449
|
<xsl:call-template name="refine_example-style"/>
|
|
7405
7450
|
|
|
7406
7451
|
<xsl:variable name="fo_element">
|
|
7407
|
-
<xsl:if test=".//mn:table or .//mn:dl or *[not(self::mn:name)][1][self::mn:sourcecode]">block</xsl:if>block
|
|
7452
|
+
<xsl:if test=".//mn:table or .//mn:dl or *[not(self::mn:fmt-name)][1][self::mn:sourcecode]">block</xsl:if>block
|
|
7408
7453
|
</xsl:variable>
|
|
7409
7454
|
|
|
7410
7455
|
<fo:block-container margin-left="0mm" role="SKIP">
|
|
@@ -7415,7 +7460,7 @@
|
|
|
7415
7460
|
|
|
7416
7461
|
<!-- display name 'EXAMPLE' in a separate block -->
|
|
7417
7462
|
<fo:block>
|
|
7418
|
-
<xsl:apply-templates select="mn:name">
|
|
7463
|
+
<xsl:apply-templates select="mn:fmt-name">
|
|
7419
7464
|
<xsl:with-param name="fo_element" select="$fo_element"/>
|
|
7420
7465
|
</xsl:apply-templates>
|
|
7421
7466
|
</fo:block>
|
|
@@ -7423,7 +7468,7 @@
|
|
|
7423
7468
|
<fo:block-container xsl:use-attribute-sets="example-body-style" role="SKIP">
|
|
7424
7469
|
<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
|
|
7425
7470
|
<xsl:variable name="example_body">
|
|
7426
|
-
<xsl:apply-templates select="node()[not(self::mn:name)]">
|
|
7471
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name)]">
|
|
7427
7472
|
<xsl:with-param name="fo_element" select="$fo_element"/>
|
|
7428
7473
|
</xsl:apply-templates>
|
|
7429
7474
|
</xsl:variable>
|
|
@@ -7450,14 +7495,14 @@
|
|
|
7450
7495
|
<fo:list-item>
|
|
7451
7496
|
<fo:list-item-label start-indent="{$indent}mm" end-indent="label-end()">
|
|
7452
7497
|
<fo:block>
|
|
7453
|
-
<xsl:apply-templates select="mn:name">
|
|
7498
|
+
<xsl:apply-templates select="mn:fmt-name">
|
|
7454
7499
|
<xsl:with-param name="fo_element">block</xsl:with-param>
|
|
7455
7500
|
</xsl:apply-templates>
|
|
7456
7501
|
</fo:block>
|
|
7457
7502
|
</fo:list-item-label>
|
|
7458
7503
|
<fo:list-item-body start-indent="body-start()">
|
|
7459
7504
|
<fo:block>
|
|
7460
|
-
<xsl:apply-templates select="node()[not(self::mn:name)]">
|
|
7505
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name)]">
|
|
7461
7506
|
<xsl:with-param name="fo_element" select="$fo_element"/>
|
|
7462
7507
|
</xsl:apply-templates>
|
|
7463
7508
|
</fo:block>
|
|
@@ -7470,21 +7515,21 @@
|
|
|
7470
7515
|
|
|
7471
7516
|
<!-- display 'EXAMPLE' and first element in the same line -->
|
|
7472
7517
|
<fo:block>
|
|
7473
|
-
<xsl:apply-templates select="mn:name">
|
|
7518
|
+
<xsl:apply-templates select="mn:fmt-name">
|
|
7474
7519
|
<xsl:with-param name="fo_element" select="$fo_element"/>
|
|
7475
7520
|
</xsl:apply-templates>
|
|
7476
7521
|
<fo:inline>
|
|
7477
|
-
<xsl:apply-templates select="*[not(self::mn:name)][1]">
|
|
7522
|
+
<xsl:apply-templates select="*[not(self::mn:fmt-name)][1]">
|
|
7478
7523
|
<xsl:with-param name="fo_element" select="$fo_element"/>
|
|
7479
7524
|
</xsl:apply-templates>
|
|
7480
7525
|
</fo:inline>
|
|
7481
7526
|
</fo:block>
|
|
7482
7527
|
|
|
7483
|
-
<xsl:if test="*[not(self::mn:name)][position() > 1]">
|
|
7528
|
+
<xsl:if test="*[not(self::mn:fmt-name)][position() > 1]">
|
|
7484
7529
|
<!-- display further elements in blocks -->
|
|
7485
7530
|
<fo:block-container xsl:use-attribute-sets="example-body-style" role="SKIP">
|
|
7486
7531
|
<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
|
|
7487
|
-
<xsl:apply-templates select="*[not(self::mn:name)][position() > 1]">
|
|
7532
|
+
<xsl:apply-templates select="*[not(self::mn:fmt-name)][position() > 1]">
|
|
7488
7533
|
<xsl:with-param name="fo_element" select="'block'"/>
|
|
7489
7534
|
</xsl:apply-templates>
|
|
7490
7535
|
</fo:block-container>
|
|
@@ -7498,7 +7543,7 @@
|
|
|
7498
7543
|
</xsl:template>
|
|
7499
7544
|
|
|
7500
7545
|
<!-- example/name -->
|
|
7501
|
-
<xsl:template match="mn:example/mn:name">
|
|
7546
|
+
<xsl:template match="mn:example/mn:fmt-name">
|
|
7502
7547
|
<xsl:param name="fo_element">block</xsl:param>
|
|
7503
7548
|
|
|
7504
7549
|
<xsl:choose>
|
|
@@ -7523,7 +7568,7 @@
|
|
|
7523
7568
|
</xsl:template>
|
|
7524
7569
|
|
|
7525
7570
|
<!-- table/example/name, table/tfoot//example/name -->
|
|
7526
|
-
<xsl:template match="mn:table/mn:example/mn:name | mn:table/mn:tfoot//mn:example/mn:name">
|
|
7571
|
+
<xsl:template match="mn:table/mn:example/mn:fmt-name | mn:table/mn:tfoot//mn:example/mn:fmt-name">
|
|
7527
7572
|
<fo:inline xsl:use-attribute-sets="example-name-style">
|
|
7528
7573
|
<xsl:apply-templates/>
|
|
7529
7574
|
</fo:inline>
|
|
@@ -7872,7 +7917,7 @@
|
|
|
7872
7917
|
|
|
7873
7918
|
<fo:block-container xsl:use-attribute-sets="table-container-style" role="SKIP">
|
|
7874
7919
|
|
|
7875
|
-
<xsl:for-each select="mn:name">
|
|
7920
|
+
<xsl:for-each select="mn:fmt-name">
|
|
7876
7921
|
<xsl:call-template name="setIDforNamedDestination"/>
|
|
7877
7922
|
</xsl:for-each>
|
|
7878
7923
|
|
|
@@ -7909,6 +7954,10 @@
|
|
|
7909
7954
|
<xsl:with-param name="margin-side" select="$margin-side"/>
|
|
7910
7955
|
</xsl:call-template>
|
|
7911
7956
|
|
|
7957
|
+
<xsl:call-template name="setTableStyles">
|
|
7958
|
+
<xsl:with-param name="scope">table</xsl:with-param>
|
|
7959
|
+
</xsl:call-template>
|
|
7960
|
+
|
|
7912
7961
|
</xsl:element>
|
|
7913
7962
|
</xsl:variable>
|
|
7914
7963
|
|
|
@@ -7929,7 +7978,7 @@
|
|
|
7929
7978
|
</xsl:attribute>
|
|
7930
7979
|
</xsl:for-each>
|
|
7931
7980
|
|
|
7932
|
-
<xsl:variable name="isNoteOrFnExist" select="./mn:note[not(@type = 'units')] or ./mn:example or .//mn:fn[
|
|
7981
|
+
<xsl:variable name="isNoteOrFnExist" select="./mn:note[not(@type = 'units')] or ./mn:example or .//mn:fn[not(parent::mn:fmt-name)] or ./mn:fmt-source"/>
|
|
7933
7982
|
<xsl:if test="$isNoteOrFnExist = 'true'">
|
|
7934
7983
|
<!-- <xsl:choose>
|
|
7935
7984
|
<xsl:when test="$namespace = 'plateau'"></xsl:when>
|
|
@@ -7985,7 +8034,7 @@
|
|
|
7985
8034
|
<xsl:apply-templates select="*[local-name()='thead']" mode="process_tbody"/>
|
|
7986
8035
|
</xsl:when>
|
|
7987
8036
|
<xsl:otherwise>
|
|
7988
|
-
<xsl:apply-templates select="node()[not(self::mn:name) and not(self::mn:note) and not(self::mn:example) and not(self::mn:dl) and not(self::mn:source) and not(self::mn:p) and not(self::mn:thead) and not(self::mn:tfoot) and not(self::mn:fmt-footnote-container)]"/> <!-- process all table' elements, except name, header, footer, note, source and dl which render separaterely -->
|
|
8037
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name) and not(self::mn:note) and not(self::mn:example) and not(self::mn:dl) and not(self::mn:fmt-source) and not(self::mn:p) and not(self::mn:thead) and not(self::mn:tfoot) and not(self::mn:fmt-footnote-container)]"/> <!-- process all table' elements, except name, header, footer, note, source and dl which render separaterely -->
|
|
7989
8038
|
</xsl:otherwise>
|
|
7990
8039
|
</xsl:choose>
|
|
7991
8040
|
|
|
@@ -8063,7 +8112,7 @@
|
|
|
8063
8112
|
</xsl:template>
|
|
8064
8113
|
|
|
8065
8114
|
<!-- table/name-->
|
|
8066
|
-
<xsl:template match="*[local-name()='table']/mn:name">
|
|
8115
|
+
<xsl:template match="*[local-name()='table']/mn:fmt-name">
|
|
8067
8116
|
<xsl:param name="continued"/>
|
|
8068
8117
|
<xsl:param name="cols-count"/>
|
|
8069
8118
|
<xsl:if test="normalize-space() != ''">
|
|
@@ -8092,7 +8141,7 @@
|
|
|
8092
8141
|
</xsl:template>
|
|
8093
8142
|
|
|
8094
8143
|
<!-- SOURCE: ... -->
|
|
8095
|
-
<xsl:template match="*[local-name()='table']/mn:source" priority="2">
|
|
8144
|
+
<xsl:template match="*[local-name()='table']/mn:fmt-source" priority="2">
|
|
8096
8145
|
<xsl:call-template name="termsource"/>
|
|
8097
8146
|
</xsl:template>
|
|
8098
8147
|
|
|
@@ -8257,11 +8306,11 @@
|
|
|
8257
8306
|
<xsl:value-of select="translate(., $zero_width_space, ' ')"/><xsl:text> </xsl:text>
|
|
8258
8307
|
</xsl:template>
|
|
8259
8308
|
|
|
8260
|
-
<xsl:template match="mn:termsource" mode="td_text">
|
|
8261
|
-
<xsl:value-of select="
|
|
8309
|
+
<xsl:template match="mn:fmt-termsource" mode="td_text">
|
|
8310
|
+
<xsl:value-of select="mn:fmt-origin/@citeas"/>
|
|
8262
8311
|
</xsl:template>
|
|
8263
8312
|
|
|
8264
|
-
<xsl:template match="mn:link" mode="td_text">
|
|
8313
|
+
<xsl:template match="mn:fmt-link" mode="td_text">
|
|
8265
8314
|
<xsl:value-of select="@target"/>
|
|
8266
8315
|
</xsl:template>
|
|
8267
8316
|
|
|
@@ -8472,7 +8521,7 @@
|
|
|
8472
8521
|
|
|
8473
8522
|
<fo:block xsl:use-attribute-sets="table-name-style" role="SKIP">
|
|
8474
8523
|
|
|
8475
|
-
<xsl:apply-templates select="ancestor::mn:table/mn:name">
|
|
8524
|
+
<xsl:apply-templates select="ancestor::mn:table/mn:fmt-name">
|
|
8476
8525
|
<xsl:with-param name="continued">true</xsl:with-param>
|
|
8477
8526
|
</xsl:apply-templates>
|
|
8478
8527
|
|
|
@@ -8513,7 +8562,7 @@
|
|
|
8513
8562
|
<xsl:param name="colwidths"/>
|
|
8514
8563
|
<xsl:param name="colgroup"/>
|
|
8515
8564
|
|
|
8516
|
-
<xsl:variable name="isNoteOrFnExist" select="../mn:note[not(@type = 'units')] or ../mn:example or ../mn:dl or ..//mn:fn[
|
|
8565
|
+
<xsl:variable name="isNoteOrFnExist" select="../mn:note[not(@type = 'units')] or ../mn:example or ../mn:dl or ..//mn:fn[not(parent::mn:fmt-name)] or ../mn:fmt-source or ../mn:p"/>
|
|
8517
8566
|
|
|
8518
8567
|
<xsl:variable name="isNoteOrFnExistShowAfterTable">
|
|
8519
8568
|
</xsl:variable>
|
|
@@ -8554,6 +8603,12 @@
|
|
|
8554
8603
|
</xsl:choose>
|
|
8555
8604
|
</xsl:for-each>
|
|
8556
8605
|
|
|
8606
|
+
<xsl:for-each select="ancestor::mn:table[1]">
|
|
8607
|
+
<xsl:call-template name="setTableStyles">
|
|
8608
|
+
<xsl:with-param name="scope">table</xsl:with-param>
|
|
8609
|
+
</xsl:call-template>
|
|
8610
|
+
</xsl:for-each>
|
|
8611
|
+
|
|
8557
8612
|
<xsl:choose>
|
|
8558
8613
|
<xsl:when test="xalan:nodeset($colgroup)//mn:col">
|
|
8559
8614
|
<xsl:for-each select="xalan:nodeset($colgroup)//mn:col">
|
|
@@ -8570,10 +8625,22 @@
|
|
|
8570
8625
|
|
|
8571
8626
|
<fo:table-body role="SKIP">
|
|
8572
8627
|
<fo:table-row role="SKIP">
|
|
8628
|
+
<xsl:for-each select="ancestor::mn:table[1]">
|
|
8629
|
+
<xsl:call-template name="setTableStyles">
|
|
8630
|
+
<xsl:with-param name="scope">ancestor_table</xsl:with-param>
|
|
8631
|
+
</xsl:call-template>
|
|
8632
|
+
</xsl:for-each>
|
|
8633
|
+
|
|
8573
8634
|
<fo:table-cell xsl:use-attribute-sets="table-footer-cell-style" number-columns-spanned="{$cols-count}" role="SKIP">
|
|
8574
8635
|
|
|
8575
8636
|
<xsl:call-template name="refine_table-footer-cell-style"/>
|
|
8576
8637
|
|
|
8638
|
+
<xsl:for-each select="ancestor::mn:table[1]">
|
|
8639
|
+
<xsl:call-template name="setTableStyles">
|
|
8640
|
+
<xsl:with-param name="scope">ancestor_table_borders_only</xsl:with-param>
|
|
8641
|
+
</xsl:call-template>
|
|
8642
|
+
</xsl:for-each>
|
|
8643
|
+
|
|
8577
8644
|
<xsl:call-template name="setBordersTableArray"/>
|
|
8578
8645
|
|
|
8579
8646
|
<!-- fn will be processed inside 'note' processing -->
|
|
@@ -8581,7 +8648,7 @@
|
|
|
8581
8648
|
<xsl:apply-templates select="../mn:dl"/>
|
|
8582
8649
|
<xsl:apply-templates select="../mn:note[not(@type = 'units')]"/>
|
|
8583
8650
|
<xsl:apply-templates select="../mn:example"/>
|
|
8584
|
-
<xsl:apply-templates select="../mn:source"/>
|
|
8651
|
+
<xsl:apply-templates select="../mn:fmt-source"/>
|
|
8585
8652
|
|
|
8586
8653
|
<xsl:variable name="isDisplayRowSeparator">
|
|
8587
8654
|
</xsl:variable>
|
|
@@ -8631,7 +8698,7 @@
|
|
|
8631
8698
|
</xsl:choose>
|
|
8632
8699
|
</xsl:variable>
|
|
8633
8700
|
<!-- if there isn't 'thead' and there is a table's title -->
|
|
8634
|
-
<xsl:if test="not(ancestor::mn:table/mn:thead) and ancestor::mn:table/mn:name">
|
|
8701
|
+
<xsl:if test="not(ancestor::mn:table/mn:thead) and ancestor::mn:table/mn:fmt-name">
|
|
8635
8702
|
<fo:table-header>
|
|
8636
8703
|
<xsl:call-template name="table-header-title">
|
|
8637
8704
|
<xsl:with-param name="cols-count" select="$cols-count"/>
|
|
@@ -8658,7 +8725,7 @@
|
|
|
8658
8725
|
<xsl:variable name="title_continued"><xsl:value-of select="$title_continued_in_parenthesis"/>
|
|
8659
8726
|
</xsl:variable>
|
|
8660
8727
|
|
|
8661
|
-
<xsl:variable name="title_start" select="ancestor::mn:table[1]/mn:name/node()[1][self::text()]"/>
|
|
8728
|
+
<xsl:variable name="title_start" select="ancestor::mn:table[1]/mn:fmt-name/node()[1][self::text()]"/>
|
|
8662
8729
|
<xsl:variable name="table_number" select="substring-before($title_start, '—')"/>
|
|
8663
8730
|
|
|
8664
8731
|
<fo:table-row height="0" keep-with-next.within-page="always" role="SKIP">
|
|
@@ -8806,7 +8873,12 @@
|
|
|
8806
8873
|
|
|
8807
8874
|
<xsl:template name="setTableRowAttributes">
|
|
8808
8875
|
|
|
8809
|
-
<xsl:
|
|
8876
|
+
<xsl:for-each select="ancestor::mn:table[1]">
|
|
8877
|
+
<xsl:call-template name="setTableStyles">
|
|
8878
|
+
<xsl:with-param name="scope">ancestor_table</xsl:with-param>
|
|
8879
|
+
</xsl:call-template>
|
|
8880
|
+
</xsl:for-each>
|
|
8881
|
+
<xsl:call-template name="setTableStyles"/>
|
|
8810
8882
|
|
|
8811
8883
|
</xsl:template> <!-- setTableRowAttributes -->
|
|
8812
8884
|
<!-- ===================== -->
|
|
@@ -8859,7 +8931,13 @@
|
|
|
8859
8931
|
</xsl:attribute>
|
|
8860
8932
|
</xsl:if>
|
|
8861
8933
|
<xsl:call-template name="display-align"/>
|
|
8862
|
-
|
|
8934
|
+
|
|
8935
|
+
<xsl:for-each select="ancestor::mn:table[1]">
|
|
8936
|
+
<xsl:call-template name="setTableStyles">
|
|
8937
|
+
<xsl:with-param name="scope">ancestor_table_borders_only</xsl:with-param>
|
|
8938
|
+
</xsl:call-template>
|
|
8939
|
+
</xsl:for-each>
|
|
8940
|
+
<xsl:call-template name="setTableStyles"/>
|
|
8863
8941
|
</xsl:template>
|
|
8864
8942
|
|
|
8865
8943
|
<xsl:template name="display-align">
|
|
@@ -8875,7 +8953,8 @@
|
|
|
8875
8953
|
</xsl:if>
|
|
8876
8954
|
</xsl:template>
|
|
8877
8955
|
|
|
8878
|
-
<xsl:template name="
|
|
8956
|
+
<xsl:template name="setTableStyles">
|
|
8957
|
+
<xsl:param name="scope">cell</xsl:param>
|
|
8879
8958
|
<xsl:variable name="styles__">
|
|
8880
8959
|
<xsl:call-template name="split">
|
|
8881
8960
|
<xsl:with-param name="pText" select="concat(@style,';')"/>
|
|
@@ -8887,16 +8966,22 @@
|
|
|
8887
8966
|
<xsl:for-each select="xalan:nodeset($styles__)/mnx:item">
|
|
8888
8967
|
<xsl:variable name="key" select="normalize-space(substring-before(., ':'))"/>
|
|
8889
8968
|
<xsl:variable name="value" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
|
|
8890
|
-
<xsl:if test="$key = 'color' or $key = 'background-color' or $key = 'border' or $key = 'border-top' or $key = 'border-right' or $key = 'border-left' or $key = 'border-bottom' or $key = 'border-style' or $key = 'border-width' or $key = 'border-color' or $key = 'border-top-style' or $key = 'border-top-width' or $key = 'border-top-color' or $key = 'border-right-style' or $key = 'border-right-width' or $key = 'border-right-color' or $key = 'border-left-style' or $key = 'border-left-width' or $key = 'border-left-color' or $key = 'border-bottom-style' or $key = 'border-bottom-width' or $key = 'border-bottom-color'">
|
|
8969
|
+
<xsl:if test="($key = 'color' and ($scope = 'cell' or $scope = 'table')) or ($key = 'background-color' and ($scope = 'cell' or $scope = 'ancestor_table')) or $key = 'border' or $key = 'border-top' or $key = 'border-right' or $key = 'border-left' or $key = 'border-bottom' or $key = 'border-style' or $key = 'border-width' or $key = 'border-color' or $key = 'border-top-style' or $key = 'border-top-width' or $key = 'border-top-color' or $key = 'border-right-style' or $key = 'border-right-width' or $key = 'border-right-color' or $key = 'border-left-style' or $key = 'border-left-width' or $key = 'border-left-color' or $key = 'border-bottom-style' or $key = 'border-bottom-width' or $key = 'border-bottom-color'">
|
|
8891
8970
|
<style name="{$key}"><xsl:value-of select="java:replaceAll(java:java.lang.String.new($value), 'currentColor', 'inherit')"/></style>
|
|
8892
8971
|
</xsl:if>
|
|
8972
|
+
<xsl:if test="$key = 'border' and ($scope = 'table' or $scope = 'ancestor_table' or $scope = 'ancestor_table_borders_only')">
|
|
8973
|
+
<style name="{$key}-top"><xsl:value-of select="$value"/></style>
|
|
8974
|
+
<style name="{$key}-right"><xsl:value-of select="$value"/></style>
|
|
8975
|
+
<style name="{$key}-left"><xsl:value-of select="$value"/></style>
|
|
8976
|
+
<style name="{$key}-bottom"><xsl:value-of select="$value"/></style>
|
|
8977
|
+
</xsl:if>
|
|
8893
8978
|
</xsl:for-each>
|
|
8894
8979
|
</xsl:variable>
|
|
8895
8980
|
<xsl:variable name="styles" select="xalan:nodeset($styles_)"/>
|
|
8896
8981
|
<xsl:for-each select="$styles/style">
|
|
8897
8982
|
<xsl:attribute name="{@name}"><xsl:value-of select="."/></xsl:attribute>
|
|
8898
8983
|
</xsl:for-each>
|
|
8899
|
-
</xsl:template> <!--
|
|
8984
|
+
</xsl:template> <!-- setTableStyles -->
|
|
8900
8985
|
|
|
8901
8986
|
<!-- cell in table body, footer -->
|
|
8902
8987
|
<xsl:template match="*[local-name()='td']" name="td">
|
|
@@ -8960,11 +9045,11 @@
|
|
|
8960
9045
|
|
|
8961
9046
|
<xsl:call-template name="refine_table-note-name-style"/>
|
|
8962
9047
|
|
|
8963
|
-
<xsl:apply-templates select="mn:name"/>
|
|
9048
|
+
<xsl:apply-templates select="mn:fmt-name"/>
|
|
8964
9049
|
|
|
8965
9050
|
</fo:inline>
|
|
8966
9051
|
|
|
8967
|
-
<xsl:apply-templates select="node()[not(self::mn:name)]"/>
|
|
9052
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/>
|
|
8968
9053
|
</fo:block>
|
|
8969
9054
|
</xsl:template> <!-- table/note -->
|
|
8970
9055
|
|
|
@@ -9103,7 +9188,7 @@
|
|
|
9103
9188
|
|
|
9104
9189
|
<!-- footnotes for table's name rendering -->
|
|
9105
9190
|
<xsl:template name="table_name_fn_display">
|
|
9106
|
-
<xsl:for-each select="mn:name//mn:fn">
|
|
9191
|
+
<xsl:for-each select="mn:fmt-name//mn:fn">
|
|
9107
9192
|
<xsl:variable name="reference" select="@reference"/>
|
|
9108
9193
|
<fo:block id="{@reference}_{ancestor::*[@id][1]/@id}"><xsl:value-of select="@reference"/></fo:block>
|
|
9109
9194
|
<fo:block margin-bottom="12pt">
|
|
@@ -9760,7 +9845,7 @@
|
|
|
9760
9845
|
</xsl:if> -->
|
|
9761
9846
|
|
|
9762
9847
|
<xsl:variable name="words">
|
|
9763
|
-
<xsl:for-each select=".//*[local-name() = 'image' or local-name() = 'stem']">
|
|
9848
|
+
<xsl:for-each select=".//*[local-name() = 'image' or local-name() = 'fmt-stem']">
|
|
9764
9849
|
<word>
|
|
9765
9850
|
<xsl:copy-of select="."/>
|
|
9766
9851
|
</word>
|
|
@@ -9819,7 +9904,7 @@
|
|
|
9819
9904
|
</xsl:copy>
|
|
9820
9905
|
</xsl:template>
|
|
9821
9906
|
|
|
9822
|
-
<xsl:template match="*[local-name() = 'stem' or local-name() = 'image']" mode="td_text_with_formatting"/>
|
|
9907
|
+
<xsl:template match="*[local-name() = 'fmt-stem' or local-name() = 'image']" mode="td_text_with_formatting"/>
|
|
9823
9908
|
|
|
9824
9909
|
<xsl:template match="*[local-name() = 'keep-together_within-line']/text()" mode="td_text_with_formatting">
|
|
9825
9910
|
<xsl:variable name="formatting_tags">
|
|
@@ -9854,7 +9939,7 @@
|
|
|
9854
9939
|
</xsl:call-template>
|
|
9855
9940
|
</xsl:template>
|
|
9856
9941
|
|
|
9857
|
-
<xsl:template match="mn:link[normalize-space() = '']" mode="td_text_with_formatting">
|
|
9942
|
+
<xsl:template match="mn:fmt-link[normalize-space() = '']" mode="td_text_with_formatting">
|
|
9858
9943
|
<xsl:variable name="link">
|
|
9859
9944
|
<link_updated>
|
|
9860
9945
|
<xsl:variable name="target_text">
|
|
@@ -10071,7 +10156,7 @@
|
|
|
10071
10156
|
|
|
10072
10157
|
<xsl:call-template name="refine_multicomponent_block_style"/>
|
|
10073
10158
|
|
|
10074
|
-
<xsl:apply-templates select="mn:name">
|
|
10159
|
+
<xsl:apply-templates select="mn:fmt-name">
|
|
10075
10160
|
<xsl:with-param name="process">true</xsl:with-param>
|
|
10076
10161
|
</xsl:apply-templates>
|
|
10077
10162
|
|
|
@@ -10254,7 +10339,7 @@
|
|
|
10254
10339
|
</xsl:template> <!-- refine_multicomponent_block_style -->
|
|
10255
10340
|
|
|
10256
10341
|
<!-- dl/name -->
|
|
10257
|
-
<xsl:template match="mn:dl/mn:name">
|
|
10342
|
+
<xsl:template match="mn:dl/mn:fmt-name">
|
|
10258
10343
|
<xsl:param name="process">false</xsl:param>
|
|
10259
10344
|
<xsl:if test="$process = 'true'">
|
|
10260
10345
|
<fo:block xsl:use-attribute-sets="dl-name-style">
|
|
@@ -10665,12 +10750,12 @@
|
|
|
10665
10750
|
<xsl:template match="mn:appendix">
|
|
10666
10751
|
<xsl:call-template name="setNamedDestination"/>
|
|
10667
10752
|
<fo:block id="{@id}" xsl:use-attribute-sets="appendix-style">
|
|
10668
|
-
<xsl:apply-templates select="mn:title"/>
|
|
10753
|
+
<xsl:apply-templates select="mn:fmt-title"/>
|
|
10669
10754
|
</fo:block>
|
|
10670
|
-
<xsl:apply-templates select="node()[not(
|
|
10755
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-title)]"/>
|
|
10671
10756
|
</xsl:template>
|
|
10672
10757
|
|
|
10673
|
-
<xsl:template match="mn:appendix/mn:title" priority="2">
|
|
10758
|
+
<xsl:template match="mn:appendix/mn:fmt-title" priority="2">
|
|
10674
10759
|
<xsl:variable name="level">
|
|
10675
10760
|
<xsl:call-template name="getLevel"/>
|
|
10676
10761
|
</xsl:variable>
|
|
@@ -10683,9 +10768,9 @@
|
|
|
10683
10768
|
<xsl:template match="mn:appendix//mn:example" priority="2">
|
|
10684
10769
|
<xsl:call-template name="setNamedDestination"/>
|
|
10685
10770
|
<fo:block id="{@id}" xsl:use-attribute-sets="appendix-example-style">
|
|
10686
|
-
<xsl:apply-templates select="mn:name"/>
|
|
10771
|
+
<xsl:apply-templates select="mn:fmt-name"/>
|
|
10687
10772
|
</fo:block>
|
|
10688
|
-
<xsl:apply-templates select="node()[not(
|
|
10773
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/>
|
|
10689
10774
|
</xsl:template>
|
|
10690
10775
|
|
|
10691
10776
|
<xsl:attribute-set name="xref-style">
|
|
@@ -10693,7 +10778,7 @@
|
|
|
10693
10778
|
<xsl:attribute name="text-decoration">underline</xsl:attribute>
|
|
10694
10779
|
</xsl:attribute-set>
|
|
10695
10780
|
|
|
10696
|
-
<xsl:template match="mn:xref">
|
|
10781
|
+
<xsl:template match="mn:fmt-xref">
|
|
10697
10782
|
<xsl:call-template name="insert_basic_link">
|
|
10698
10783
|
<xsl:with-param name="element">
|
|
10699
10784
|
<xsl:variable name="alt_text">
|
|
@@ -10713,7 +10798,7 @@
|
|
|
10713
10798
|
</xsl:template> <!-- xref -->
|
|
10714
10799
|
|
|
10715
10800
|
<!-- command between two xref points to non-standard bibitem -->
|
|
10716
|
-
<xsl:template match="text()[. = ','][preceding-sibling::node()[1][self::mn:sup][mn:xref[@type = 'footnote']] and following-sibling::node()[1][self::mn:sup][mn:xref[@type = 'footnote']]]"><xsl:value-of select="."/>
|
|
10801
|
+
<xsl:template match="text()[. = ','][preceding-sibling::node()[1][self::mn:sup][mn:fmt-xref[@type = 'footnote']] and following-sibling::node()[1][self::mn:sup][mn:fmt-xref[@type = 'footnote']]]"><xsl:value-of select="."/>
|
|
10717
10802
|
</xsl:template>
|
|
10718
10803
|
|
|
10719
10804
|
<xsl:attribute-set name="eref-style">
|
|
@@ -10750,7 +10835,7 @@
|
|
|
10750
10835
|
<!-- ====== -->
|
|
10751
10836
|
<!-- eref -->
|
|
10752
10837
|
<!-- ====== -->
|
|
10753
|
-
<xsl:template match="mn:eref" name="eref">
|
|
10838
|
+
<xsl:template match="mn:fmt-eref" name="eref">
|
|
10754
10839
|
<xsl:variable name="current_bibitemid" select="@bibitemid"/>
|
|
10755
10840
|
<!-- <xsl:variable name="external-destination" select="normalize-space(key('bibitems', $current_bibitemid)/mn:uri[@type = 'citation'])"/> -->
|
|
10756
10841
|
<xsl:variable name="external-destination" select="normalize-space($bibitems/mn:bibitem[@id = $current_bibitemid]/mn:uri[@type = 'citation'])"/>
|
|
@@ -10888,28 +10973,28 @@
|
|
|
10888
10973
|
|
|
10889
10974
|
<fo:inline xsl:use-attribute-sets="note-name-style" role="SKIP">
|
|
10890
10975
|
|
|
10891
|
-
<xsl:apply-templates select="mn:name/mn:tab" mode="tab"/>
|
|
10976
|
+
<xsl:apply-templates select="mn:fmt-name/mn:tab" mode="tab"/>
|
|
10892
10977
|
|
|
10893
10978
|
<xsl:call-template name="refine_note-name-style"/>
|
|
10894
10979
|
|
|
10895
10980
|
<!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
|
|
10896
10981
|
<!-- <xsl:if test="*[not(local-name()='name')][1][node()[normalize-space() != ''][1][local-name() = 'add'] and node()[normalize-space() != ''][last()][local-name() = 'add']]"> -->
|
|
10897
|
-
<xsl:if test="*[not(
|
|
10982
|
+
<xsl:if test="*[not(self::mn:fmt-name)][1][count(node()[normalize-space() != '']) = 1 and mn:add]">
|
|
10898
10983
|
<xsl:call-template name="append_add-style"/>
|
|
10899
10984
|
</xsl:if>
|
|
10900
10985
|
|
|
10901
10986
|
<!-- if note contains only one element and first and last childs are `add` ace-tag, then move start ace-tag before NOTE's name-->
|
|
10902
|
-
<xsl:if test="count(*[not(self::mn:name)]) = 1 and *[not(self::mn:name)]/node()[last()][self::mn:add][starts-with(text(), $ace_tag)]">
|
|
10903
|
-
<xsl:apply-templates select="*[not(self::mn:name)]/node()[1][self::mn:add][starts-with(text(), $ace_tag)]">
|
|
10987
|
+
<xsl:if test="count(*[not(self::mn:fmt-name)]) = 1 and *[not(self::mn:fmt-name)]/node()[last()][self::mn:add][starts-with(text(), $ace_tag)]">
|
|
10988
|
+
<xsl:apply-templates select="*[not(self::mn:fmt-name)]/node()[1][self::mn:add][starts-with(text(), $ace_tag)]">
|
|
10904
10989
|
<xsl:with-param name="skip">false</xsl:with-param>
|
|
10905
10990
|
</xsl:apply-templates>
|
|
10906
10991
|
</xsl:if>
|
|
10907
10992
|
|
|
10908
|
-
<xsl:apply-templates select="mn:name"/>
|
|
10993
|
+
<xsl:apply-templates select="mn:fmt-name"/>
|
|
10909
10994
|
|
|
10910
10995
|
</fo:inline>
|
|
10911
10996
|
|
|
10912
|
-
<xsl:apply-templates select="node()[not(self::mn:name)]"/>
|
|
10997
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/>
|
|
10913
10998
|
</fo:block>
|
|
10914
10999
|
</fo:block-container>
|
|
10915
11000
|
</fo:block-container>
|
|
@@ -10948,19 +11033,19 @@
|
|
|
10948
11033
|
|
|
10949
11034
|
<!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
|
|
10950
11035
|
<!-- <xsl:if test="*[not(local-name()='name')][1][node()[normalize-space() != ''][1][local-name() = 'add'] and node()[normalize-space() != ''][last()][local-name() = 'add']]"> -->
|
|
10951
|
-
<xsl:if test="*[not(
|
|
11036
|
+
<xsl:if test="*[not(self::mn:fmt-name)][1][count(node()[normalize-space() != '']) = 1 and mn:add]">
|
|
10952
11037
|
<xsl:call-template name="append_add-style"/>
|
|
10953
11038
|
</xsl:if>
|
|
10954
11039
|
|
|
10955
|
-
<xsl:apply-templates select="mn:name"/>
|
|
11040
|
+
<xsl:apply-templates select="mn:fmt-name"/>
|
|
10956
11041
|
|
|
10957
11042
|
</fo:inline>
|
|
10958
11043
|
|
|
10959
|
-
<xsl:apply-templates select="node()[not(self::mn:name)]"/>
|
|
11044
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/>
|
|
10960
11045
|
</fo:block>
|
|
10961
11046
|
</xsl:template>
|
|
10962
11047
|
|
|
10963
|
-
<xsl:template match="mn:note/mn:name">
|
|
11048
|
+
<xsl:template match="mn:note/mn:fmt-name">
|
|
10964
11049
|
<xsl:param name="sfx"/>
|
|
10965
11050
|
<xsl:variable name="suffix">
|
|
10966
11051
|
<xsl:choose>
|
|
@@ -10987,7 +11072,7 @@
|
|
|
10987
11072
|
</xsl:if>
|
|
10988
11073
|
</xsl:template>
|
|
10989
11074
|
|
|
10990
|
-
<xsl:template match="mn:termnote/mn:name">
|
|
11075
|
+
<xsl:template match="mn:termnote/mn:fmt-name">
|
|
10991
11076
|
<xsl:param name="sfx"/>
|
|
10992
11077
|
<xsl:variable name="suffix">
|
|
10993
11078
|
<xsl:choose>
|
|
@@ -11067,15 +11152,15 @@
|
|
|
11067
11152
|
|
|
11068
11153
|
<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
|
|
11069
11154
|
<fo:block role="BlockQuote">
|
|
11070
|
-
<xsl:apply-templates select="./node()[not(self::mn:author) and not(self::mn:source) and not(self::mn:attribution)]"/> <!-- process all nested nodes, except author and source -->
|
|
11155
|
+
<xsl:apply-templates select="./node()[not(self::mn:author) and not(self::mn:fmt-source) and not(self::mn:attribution)]"/> <!-- process all nested nodes, except author and source -->
|
|
11071
11156
|
</fo:block>
|
|
11072
11157
|
</fo:block-container>
|
|
11073
11158
|
</fo:block-container>
|
|
11074
|
-
<xsl:if test="mn:author or mn:source or mn:attribution">
|
|
11159
|
+
<xsl:if test="mn:author or mn:fmt-source or mn:attribution">
|
|
11075
11160
|
<fo:block xsl:use-attribute-sets="quote-source-style">
|
|
11076
11161
|
<!-- — ISO, ISO 7301:2011, Clause 1 -->
|
|
11077
11162
|
<xsl:apply-templates select="mn:author"/>
|
|
11078
|
-
<xsl:apply-templates select="mn:source"/>
|
|
11163
|
+
<xsl:apply-templates select="mn:fmt-source"/>
|
|
11079
11164
|
<!-- added for https://github.com/metanorma/isodoc/issues/607 -->
|
|
11080
11165
|
<xsl:apply-templates select="mn:attribution/mn:p/node()"/>
|
|
11081
11166
|
</fo:block>
|
|
@@ -11085,17 +11170,32 @@
|
|
|
11085
11170
|
</fo:block-container>
|
|
11086
11171
|
</xsl:template>
|
|
11087
11172
|
|
|
11088
|
-
<xsl:template match="mn:source">
|
|
11173
|
+
<xsl:template match="mn:fmt-source">
|
|
11089
11174
|
<xsl:if test="../mn:author">
|
|
11090
11175
|
<xsl:text>, </xsl:text>
|
|
11091
11176
|
</xsl:if>
|
|
11092
|
-
<xsl:
|
|
11093
|
-
<xsl:
|
|
11094
|
-
<fo:
|
|
11095
|
-
<xsl:
|
|
11096
|
-
|
|
11097
|
-
|
|
11098
|
-
|
|
11177
|
+
<xsl:choose>
|
|
11178
|
+
<xsl:when test="not(parent::quote)">
|
|
11179
|
+
<fo:block>
|
|
11180
|
+
<xsl:call-template name="insert_basic_link">
|
|
11181
|
+
<xsl:with-param name="element">
|
|
11182
|
+
<fo:basic-link internal-destination="{@bibitemid}" fox:alt-text="{@citeas}">
|
|
11183
|
+
<xsl:apply-templates/>
|
|
11184
|
+
</fo:basic-link>
|
|
11185
|
+
</xsl:with-param>
|
|
11186
|
+
</xsl:call-template>
|
|
11187
|
+
</fo:block>
|
|
11188
|
+
</xsl:when>
|
|
11189
|
+
<xsl:otherwise>
|
|
11190
|
+
<xsl:call-template name="insert_basic_link">
|
|
11191
|
+
<xsl:with-param name="element">
|
|
11192
|
+
<fo:basic-link internal-destination="{@bibitemid}" fox:alt-text="{@citeas}">
|
|
11193
|
+
<xsl:apply-templates/>
|
|
11194
|
+
</fo:basic-link>
|
|
11195
|
+
</xsl:with-param>
|
|
11196
|
+
</xsl:call-template>
|
|
11197
|
+
</xsl:otherwise>
|
|
11198
|
+
</xsl:choose>
|
|
11099
11199
|
</xsl:template>
|
|
11100
11200
|
|
|
11101
11201
|
<xsl:template match="mn:author">
|
|
@@ -11176,7 +11276,7 @@
|
|
|
11176
11276
|
<ancestor><xsl:copy-of select="ancestor::mn:figure[.//mn:name[.//mn:fn]]"/></ancestor> -->
|
|
11177
11277
|
<xsl:choose>
|
|
11178
11278
|
<!-- skip figure/name/fn -->
|
|
11179
|
-
<xsl:when test="ancestor::mn:figure[.//mn:name[.//mn:fn[@target = $curr_id]]]"><!-- skip --></xsl:when>
|
|
11279
|
+
<xsl:when test="ancestor::mn:figure[.//mn:fmt-name[.//mn:fn[@target = $curr_id]]]"><!-- skip --></xsl:when>
|
|
11180
11280
|
<xsl:otherwise>
|
|
11181
11281
|
<xsl:element name="figure" namespace="{$namespace_full}">
|
|
11182
11282
|
<xsl:element name="fmt-footnote-container" namespace="{$namespace_full}">
|
|
@@ -11372,17 +11472,17 @@
|
|
|
11372
11472
|
|
|
11373
11473
|
<fo:block xsl:use-attribute-sets="figure-style" role="SKIP">
|
|
11374
11474
|
|
|
11375
|
-
<xsl:for-each select="mn:name"> <!-- set context -->
|
|
11475
|
+
<xsl:for-each select="mn:fmt-name"> <!-- set context -->
|
|
11376
11476
|
<xsl:call-template name="setIDforNamedDestination"/>
|
|
11377
11477
|
</xsl:for-each>
|
|
11378
11478
|
|
|
11379
|
-
<xsl:apply-templates select="node()[not(self::mn:name) and not(self::mn:note and @type = 'units')]"/>
|
|
11479
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name) and not(self::mn:note and @type = 'units')]"/>
|
|
11380
11480
|
</fo:block>
|
|
11381
11481
|
|
|
11382
11482
|
<xsl:if test="normalize-space($show_figure_key_in_block_container) = 'true'">
|
|
11383
11483
|
<xsl:call-template name="showFigureKey"/>
|
|
11384
11484
|
</xsl:if>
|
|
11385
|
-
<xsl:apply-templates select="mn:name"/> <!-- show figure's name AFTER image -->
|
|
11485
|
+
<xsl:apply-templates select="mn:fmt-name"/> <!-- show figure's name AFTER image -->
|
|
11386
11486
|
|
|
11387
11487
|
</fo:block-container>
|
|
11388
11488
|
</xsl:template>
|
|
@@ -11408,9 +11508,9 @@
|
|
|
11408
11508
|
<xsl:template match="mn:figure[@class = 'pseudocode']">
|
|
11409
11509
|
<xsl:call-template name="setNamedDestination"/>
|
|
11410
11510
|
<fo:block id="{@id}">
|
|
11411
|
-
<xsl:apply-templates select="node()[not(self::mn:name)]"/>
|
|
11511
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/>
|
|
11412
11512
|
</fo:block>
|
|
11413
|
-
<xsl:apply-templates select="mn:name"/>
|
|
11513
|
+
<xsl:apply-templates select="mn:fmt-name"/>
|
|
11414
11514
|
</xsl:template>
|
|
11415
11515
|
|
|
11416
11516
|
<xsl:template match="mn:figure[@class = 'pseudocode']//mn:p">
|
|
@@ -11421,7 +11521,7 @@
|
|
|
11421
11521
|
|
|
11422
11522
|
<!-- SOURCE: ... -->
|
|
11423
11523
|
<!-- figure/source -->
|
|
11424
|
-
<xsl:template match="mn:figure/mn:source" priority="2">
|
|
11524
|
+
<xsl:template match="mn:figure/mn:fmt-source" priority="2">
|
|
11425
11525
|
<xsl:call-template name="termsource"/>
|
|
11426
11526
|
</xsl:template>
|
|
11427
11527
|
|
|
@@ -11431,7 +11531,7 @@
|
|
|
11431
11531
|
<xsl:variable name="isAdded" select="../@added"/>
|
|
11432
11532
|
<xsl:variable name="isDeleted" select="../@deleted"/>
|
|
11433
11533
|
<xsl:choose>
|
|
11434
|
-
<xsl:when test="ancestor::mn:title or not(parent::mn:figure) or parent::mn:p"> <!-- inline image ( 'image:path' in adoc, with one colon after image) -->
|
|
11534
|
+
<xsl:when test="ancestor::mn:fmt-title or not(parent::mn:figure) or parent::mn:p"> <!-- inline image ( 'image:path' in adoc, with one colon after image) -->
|
|
11435
11535
|
<fo:inline padding-left="1mm" padding-right="1mm">
|
|
11436
11536
|
<xsl:if test="not(parent::mn:figure) or parent::mn:p">
|
|
11437
11537
|
<xsl:attribute name="padding-left">0mm</xsl:attribute>
|
|
@@ -11452,13 +11552,26 @@
|
|
|
11452
11552
|
<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" vertical-align="middle">
|
|
11453
11553
|
|
|
11454
11554
|
<xsl:if test="parent::mn:logo"> <!-- publisher's logo -->
|
|
11455
|
-
<xsl:attribute name="
|
|
11555
|
+
<xsl:attribute name="scaling">uniform</xsl:attribute>
|
|
11556
|
+
<xsl:choose>
|
|
11557
|
+
<xsl:when test="@width and not(@height)">
|
|
11558
|
+
<xsl:attribute name="width">100%</xsl:attribute>
|
|
11559
|
+
<xsl:attribute name="content-height">100%</xsl:attribute>
|
|
11560
|
+
</xsl:when>
|
|
11561
|
+
<xsl:when test="@height and not(@width)">
|
|
11562
|
+
<xsl:attribute name="height">100%</xsl:attribute>
|
|
11563
|
+
<xsl:attribute name="content-height"><xsl:value-of select="@height"/></xsl:attribute>
|
|
11564
|
+
</xsl:when>
|
|
11565
|
+
<xsl:when test="not(@width) and not(@height)">
|
|
11566
|
+
<xsl:attribute name="content-height">100%</xsl:attribute>
|
|
11567
|
+
</xsl:when>
|
|
11568
|
+
</xsl:choose>
|
|
11569
|
+
|
|
11456
11570
|
<xsl:if test="normalize-space($logo_width) != ''">
|
|
11457
11571
|
<xsl:attribute name="width"><xsl:value-of select="$logo_width"/></xsl:attribute>
|
|
11458
11572
|
</xsl:if>
|
|
11459
|
-
<xsl:attribute name="content-height">100%</xsl:attribute>
|
|
11460
11573
|
<xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
|
|
11461
|
-
<xsl:attribute name="
|
|
11574
|
+
<xsl:attribute name="vertical-align">top</xsl:attribute>
|
|
11462
11575
|
</xsl:if>
|
|
11463
11576
|
|
|
11464
11577
|
<xsl:variable name="width">
|
|
@@ -11747,7 +11860,7 @@
|
|
|
11747
11860
|
<xsl:variable name="width_effective_px" select="$width_effective div 25.4 * $image_dpi"/>
|
|
11748
11861
|
<xsl:variable name="height_effective_px" select="$height_effective div 25.4 * $image_dpi"/>
|
|
11749
11862
|
|
|
11750
|
-
<xsl:template match="mn:figure[not(mn:image) and *[local-name() = 'svg']]/mn:name/mn:bookmark" priority="2"/>
|
|
11863
|
+
<xsl:template match="mn:figure[not(mn:image) and *[local-name() = 'svg']]/mn:fmt-name/mn:bookmark" priority="2"/>
|
|
11751
11864
|
<xsl:template match="mn:figure[not(mn:image)]/*[local-name() = 'svg']" priority="2" name="image_svg">
|
|
11752
11865
|
<xsl:param name="name"/>
|
|
11753
11866
|
|
|
@@ -11757,8 +11870,8 @@
|
|
|
11757
11870
|
|
|
11758
11871
|
<xsl:variable name="alt-text">
|
|
11759
11872
|
<xsl:choose>
|
|
11760
|
-
<xsl:when test="normalize-space(../mn:name) != ''">
|
|
11761
|
-
<xsl:value-of select="../mn:name"/>
|
|
11873
|
+
<xsl:when test="normalize-space(../mn:fmt-name) != ''">
|
|
11874
|
+
<xsl:value-of select="../mn:fmt-name"/>
|
|
11762
11875
|
</xsl:when>
|
|
11763
11876
|
<xsl:when test="normalize-space($name) != ''">
|
|
11764
11877
|
<xsl:value-of select="$name"/>
|
|
@@ -11767,7 +11880,7 @@
|
|
|
11767
11880
|
</xsl:choose>
|
|
11768
11881
|
</xsl:variable>
|
|
11769
11882
|
|
|
11770
|
-
<xsl:variable name="isPrecedingTitle" select="normalize-space(ancestor::mn:figure/preceding-sibling::*[1][self::mn:title] and 1 = 1)"/>
|
|
11883
|
+
<xsl:variable name="isPrecedingTitle" select="normalize-space(ancestor::mn:figure/preceding-sibling::*[1][self::mn:fmt-title] and 1 = 1)"/>
|
|
11771
11884
|
|
|
11772
11885
|
<xsl:choose>
|
|
11773
11886
|
<xsl:when test=".//*[local-name() = 'a'][*[local-name() = 'rect'] or *[local-name() = 'polygon'] or *[local-name() = 'circle'] or *[local-name() = 'ellipse']]">
|
|
@@ -11816,9 +11929,9 @@
|
|
|
11816
11929
|
<fo:table-cell column-number="2">
|
|
11817
11930
|
<fo:block>
|
|
11818
11931
|
<fo:block-container width="{$width_scale}px" height="{$height_scale}px">
|
|
11819
|
-
<xsl:if test="../mn:name/mn:bookmark">
|
|
11932
|
+
<xsl:if test="../mn:fmt-name/mn:bookmark">
|
|
11820
11933
|
<fo:block line-height="0" font-size="0">
|
|
11821
|
-
<xsl:for-each select="../mn:name/mn:bookmark">
|
|
11934
|
+
<xsl:for-each select="../mn:fmt-name/mn:bookmark">
|
|
11822
11935
|
<xsl:call-template name="bookmark"/>
|
|
11823
11936
|
</xsl:for-each>
|
|
11824
11937
|
</fo:block>
|
|
@@ -12058,7 +12171,7 @@
|
|
|
12058
12171
|
|
|
12059
12172
|
<!-- image with svg and emf -->
|
|
12060
12173
|
<xsl:template match="mn:figure/mn:image[*[local-name() = 'svg']]" priority="3">
|
|
12061
|
-
<xsl:variable name="name" select="ancestor::mn:figure/mn:name"/>
|
|
12174
|
+
<xsl:variable name="name" select="ancestor::mn:figure/mn:fmt-name"/>
|
|
12062
12175
|
<xsl:for-each select="*[local-name() = 'svg']">
|
|
12063
12176
|
<xsl:call-template name="image_svg">
|
|
12064
12177
|
<xsl:with-param name="name" select="$name"/>
|
|
@@ -12075,7 +12188,7 @@
|
|
|
12075
12188
|
|
|
12076
12189
|
<xsl:template match="mn:figure/mn:image[@mimetype = 'image/svg+xml' and @src[not(starts-with(., 'data:image/'))]]" priority="2">
|
|
12077
12190
|
<xsl:variable name="svg_content" select="document(@src)"/>
|
|
12078
|
-
<xsl:variable name="name" select="ancestor::mn:figure/mn:name"/>
|
|
12191
|
+
<xsl:variable name="name" select="ancestor::mn:figure/mn:fmt-name"/>
|
|
12079
12192
|
<xsl:for-each select="xalan:nodeset($svg_content)/node()">
|
|
12080
12193
|
<xsl:call-template name="image_svg">
|
|
12081
12194
|
<xsl:with-param name="name" select="$name"/>
|
|
@@ -12198,7 +12311,7 @@
|
|
|
12198
12311
|
<xsl:template match="mn:emf"/>
|
|
12199
12312
|
|
|
12200
12313
|
<!-- figure/name -->
|
|
12201
|
-
<xsl:template match="mn:figure/mn:name | mn:image/mn:name">
|
|
12314
|
+
<xsl:template match="mn:figure/mn:fmt-name | mn:image/mn:fmt-name">
|
|
12202
12315
|
<xsl:if test="normalize-space() != ''">
|
|
12203
12316
|
<fo:block xsl:use-attribute-sets="figure-name-style">
|
|
12204
12317
|
|
|
@@ -12270,25 +12383,25 @@
|
|
|
12270
12383
|
<fo:block-container margin-left="0mm" role="SKIP">
|
|
12271
12384
|
<xsl:call-template name="setNamedDestination"/>
|
|
12272
12385
|
<fo:block id="{@id}">
|
|
12273
|
-
<xsl:apply-templates select="node()[not(self::mn:name)]"/> <!-- formula's number will be process in 'stem' template -->
|
|
12386
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/> <!-- formula's number will be process in 'stem' template -->
|
|
12274
12387
|
</fo:block>
|
|
12275
12388
|
</fo:block-container>
|
|
12276
12389
|
</fo:block-container>
|
|
12277
12390
|
</xsl:template>
|
|
12278
12391
|
|
|
12279
|
-
<xsl:template match="mn:formula/mn:dt/mn:stem">
|
|
12392
|
+
<xsl:template match="mn:formula/mn:dt/mn:fmt-stem">
|
|
12280
12393
|
<fo:inline>
|
|
12281
12394
|
<xsl:apply-templates/>
|
|
12282
12395
|
</fo:inline>
|
|
12283
12396
|
</xsl:template>
|
|
12284
12397
|
|
|
12285
|
-
<xsl:template match="mn:admitted/mn:stem">
|
|
12398
|
+
<xsl:template match="mn:fmt-admitted/mn:fmt-stem">
|
|
12286
12399
|
<fo:inline>
|
|
12287
12400
|
<xsl:apply-templates/>
|
|
12288
12401
|
</fo:inline>
|
|
12289
12402
|
</xsl:template>
|
|
12290
12403
|
|
|
12291
|
-
<xsl:template match="mn:formula/mn:name"> <!-- show in 'stem' template -->
|
|
12404
|
+
<xsl:template match="mn:formula/mn:fmt-name"> <!-- show in 'stem' template -->
|
|
12292
12405
|
<!-- https://github.com/metanorma/isodoc/issues/607
|
|
12293
12406
|
<xsl:if test="normalize-space() != ''">
|
|
12294
12407
|
<xsl:text>(</xsl:text><xsl:apply-templates /><xsl:text>)</xsl:text>
|
|
@@ -12297,7 +12410,7 @@
|
|
|
12297
12410
|
</xsl:template>
|
|
12298
12411
|
|
|
12299
12412
|
<!-- stem inside formula with name (with formula's number) -->
|
|
12300
|
-
<xsl:template match="mn:formula[mn:name]/mn:stem">
|
|
12413
|
+
<xsl:template match="mn:formula[mn:fmt-name]/mn:fmt-stem">
|
|
12301
12414
|
<fo:block xsl:use-attribute-sets="formula-style">
|
|
12302
12415
|
|
|
12303
12416
|
<fo:table table-layout="fixed" width="100%">
|
|
@@ -12317,13 +12430,13 @@
|
|
|
12317
12430
|
|
|
12318
12431
|
<fo:block xsl:use-attribute-sets="formula-stem-number-style" role="SKIP">
|
|
12319
12432
|
|
|
12320
|
-
<xsl:for-each select="../mn:name">
|
|
12433
|
+
<xsl:for-each select="../mn:fmt-name">
|
|
12321
12434
|
<xsl:call-template name="setIDforNamedDestination"/>
|
|
12322
12435
|
</xsl:for-each>
|
|
12323
12436
|
|
|
12324
12437
|
<xsl:call-template name="refine_formula-stem-number-style"/>
|
|
12325
12438
|
|
|
12326
|
-
<xsl:apply-templates select="../mn:name"/>
|
|
12439
|
+
<xsl:apply-templates select="../mn:fmt-name"/>
|
|
12327
12440
|
</fo:block>
|
|
12328
12441
|
</fo:table-cell>
|
|
12329
12442
|
</fo:table-row>
|
|
@@ -12333,7 +12446,7 @@
|
|
|
12333
12446
|
</xsl:template>
|
|
12334
12447
|
|
|
12335
12448
|
<!-- stem inside formula without name (without formula's number) -->
|
|
12336
|
-
<xsl:template match="mn:formula[not(mn:name)]/mn:stem">
|
|
12449
|
+
<xsl:template match="mn:formula[not(mn:fmt-name)]/mn:fmt-stem">
|
|
12337
12450
|
<fo:block xsl:use-attribute-sets="formula-style">
|
|
12338
12451
|
<fo:block xsl:use-attribute-sets="formula-stem-block-style">
|
|
12339
12452
|
<xsl:apply-templates/>
|
|
@@ -12688,7 +12801,7 @@
|
|
|
12688
12801
|
<stem type="AsciiMath"><asciimath>x = 1</asciimath></stem>
|
|
12689
12802
|
<stem type="AsciiMath"><asciimath>x = 1</asciimath><latexmath>x = 1</latexmath></stem>
|
|
12690
12803
|
-->
|
|
12691
|
-
<xsl:template match="mn:stem[@type = 'AsciiMath'][count(*) = 0]/text() | mn:stem[@type = 'AsciiMath'][mn:asciimath]" priority="3">
|
|
12804
|
+
<xsl:template match="mn:fmt-stem[@type = 'AsciiMath'][count(*) = 0]/text() | mn:fmt-stem[@type = 'AsciiMath'][mn:asciimath]" priority="3">
|
|
12692
12805
|
<fo:inline xsl:use-attribute-sets="mathml-style">
|
|
12693
12806
|
|
|
12694
12807
|
<xsl:call-template name="refine_mathml-style"/>
|
|
@@ -12971,7 +13084,7 @@
|
|
|
12971
13084
|
|
|
12972
13085
|
<xsl:template match="mn:ul | mn:ol" mode="list" name="list">
|
|
12973
13086
|
|
|
12974
|
-
<xsl:apply-templates select="mn:name">
|
|
13087
|
+
<xsl:apply-templates select="mn:fmt-name">
|
|
12975
13088
|
<xsl:with-param name="process">true</xsl:with-param>
|
|
12976
13089
|
</xsl:apply-templates>
|
|
12977
13090
|
|
|
@@ -13017,7 +13130,7 @@
|
|
|
13017
13130
|
|
|
13018
13131
|
<xsl:call-template name="refine_list-style"/>
|
|
13019
13132
|
|
|
13020
|
-
<xsl:if test="mn:name">
|
|
13133
|
+
<xsl:if test="mn:fmt-name">
|
|
13021
13134
|
<xsl:attribute name="margin-top">0pt</xsl:attribute>
|
|
13022
13135
|
</xsl:if>
|
|
13023
13136
|
|
|
@@ -13032,7 +13145,7 @@
|
|
|
13032
13145
|
<xsl:template name="refine_list-style_provisional-distance-between-starts">
|
|
13033
13146
|
</xsl:template> <!-- refine_list-style_provisional-distance-between-starts -->
|
|
13034
13147
|
|
|
13035
|
-
<xsl:template match="*[self::mn:ol or self::mn:ul]/mn:name">
|
|
13148
|
+
<xsl:template match="*[self::mn:ol or self::mn:ul]/mn:fmt-name">
|
|
13036
13149
|
<xsl:param name="process">false</xsl:param>
|
|
13037
13150
|
<xsl:if test="$process = 'true'">
|
|
13038
13151
|
<fo:block xsl:use-attribute-sets="list-name-style">
|
|
@@ -13169,7 +13282,7 @@
|
|
|
13169
13282
|
-->
|
|
13170
13283
|
<!-- footnotes in text (title, bibliography, main body), not for tables, figures and names --> <!-- table's, figure's names -->
|
|
13171
13284
|
<!-- fn in text -->
|
|
13172
|
-
<xsl:template match="mn:fn[not(ancestor::*[(self::mn:table or self::mn:figure)] and not(ancestor::mn:name))]" priority="2" name="fn">
|
|
13285
|
+
<xsl:template match="mn:fn[not(ancestor::*[(self::mn:table or self::mn:figure)] and not(ancestor::mn:fmt-name))]" priority="2" name="fn">
|
|
13173
13286
|
<xsl:param name="footnote_body_from_table">false</xsl:param>
|
|
13174
13287
|
|
|
13175
13288
|
<!-- list of unique footnotes -->
|
|
@@ -13293,7 +13406,7 @@
|
|
|
13293
13406
|
<!-- commented:
|
|
13294
13407
|
.//mn:bibitem[ancestor::mn:references]/mn:note |
|
|
13295
13408
|
because 'fn' there is in biblio-tag -->
|
|
13296
|
-
<xsl:for-each select=".//mn:fn[not(ancestor::*[(self::mn:table or self::mn:figure)] and not(ancestor::mn:name))][generate-id(.)=generate-id(key('kfn',@reference)[1])]">
|
|
13409
|
+
<xsl:for-each select=".//mn:fn[not(ancestor::*[(self::mn:table or self::mn:figure)] and not(ancestor::mn:fmt-name))][generate-id(.)=generate-id(key('kfn',@reference)[1])]">
|
|
13297
13410
|
<!-- copy unique fn -->
|
|
13298
13411
|
<fn gen_id="{generate-id(.)}">
|
|
13299
13412
|
<xsl:copy-of select="@*"/>
|
|
@@ -13391,7 +13504,7 @@
|
|
|
13391
13504
|
<xsl:with-param name="sep">: </xsl:with-param>
|
|
13392
13505
|
</xsl:call-template>
|
|
13393
13506
|
</fo:inline>
|
|
13394
|
-
<xsl:apply-templates select="node()[not(self::mn:name)]"/>
|
|
13507
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/>
|
|
13395
13508
|
</fo:block>
|
|
13396
13509
|
</fo:block-container>
|
|
13397
13510
|
|
|
@@ -13418,7 +13531,7 @@
|
|
|
13418
13531
|
</xsl:otherwise>
|
|
13419
13532
|
</xsl:choose> -->
|
|
13420
13533
|
<xsl:variable name="name">
|
|
13421
|
-
<xsl:apply-templates select="mn:name"/>
|
|
13534
|
+
<xsl:apply-templates select="mn:fmt-name"/>
|
|
13422
13535
|
</xsl:variable>
|
|
13423
13536
|
<xsl:copy-of select="$name"/>
|
|
13424
13537
|
<xsl:if test="normalize-space($name) != ''">
|
|
@@ -13426,7 +13539,7 @@
|
|
|
13426
13539
|
</xsl:if>
|
|
13427
13540
|
</xsl:template>
|
|
13428
13541
|
|
|
13429
|
-
<xsl:template match="mn:admonition/mn:name">
|
|
13542
|
+
<xsl:template match="mn:admonition/mn:fmt-name">
|
|
13430
13543
|
<xsl:apply-templates/>
|
|
13431
13544
|
</xsl:template>
|
|
13432
13545
|
|
|
@@ -13562,10 +13675,10 @@
|
|
|
13562
13675
|
<xsl:call-template name="setNamedDestination"/>
|
|
13563
13676
|
<fo:block id="{@id}"/>
|
|
13564
13677
|
|
|
13565
|
-
<xsl:apply-templates select="mn:title[@columns = 1]"/>
|
|
13678
|
+
<xsl:apply-templates select="mn:fmt-title[@columns = 1]"/>
|
|
13566
13679
|
|
|
13567
13680
|
<fo:block xsl:use-attribute-sets="references-non-normative-style">
|
|
13568
|
-
<xsl:apply-templates select="node()[not(self::mn:title and @columns = 1)]"/>
|
|
13681
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-title and @columns = 1)]"/>
|
|
13569
13682
|
</fo:block>
|
|
13570
13683
|
</xsl:template> <!-- references -->
|
|
13571
13684
|
|
|
@@ -13892,7 +14005,8 @@
|
|
|
13892
14005
|
</xsl:copy>
|
|
13893
14006
|
</xsl:template>
|
|
13894
14007
|
|
|
13895
|
-
<xsl:template match="mn:xref" mode="index_add_id"
|
|
14008
|
+
<xsl:template match="mn:xref" mode="index_add_id"/>
|
|
14009
|
+
<xsl:template match="mn:fmt-xref" mode="index_add_id">
|
|
13896
14010
|
<xsl:param name="docid"/>
|
|
13897
14011
|
<xsl:variable name="id">
|
|
13898
14012
|
<xsl:call-template name="generateIndexXrefId">
|
|
@@ -13934,7 +14048,7 @@
|
|
|
13934
14048
|
<xsl:template match="mn:indexsect//mn:li" mode="index_update">
|
|
13935
14049
|
<xsl:copy>
|
|
13936
14050
|
<xsl:apply-templates select="@*" mode="index_update"/>
|
|
13937
|
-
<xsl:apply-templates select="node()[1]" mode="process_li_element"/>
|
|
14051
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name)][1]" mode="process_li_element"/>
|
|
13938
14052
|
</xsl:copy>
|
|
13939
14053
|
</xsl:template>
|
|
13940
14054
|
|
|
@@ -13955,11 +14069,11 @@
|
|
|
13955
14069
|
<xsl:value-of select="."/>
|
|
13956
14070
|
<xsl:apply-templates select="following-sibling::node()[1]" mode="process_li_element"/>
|
|
13957
14071
|
</xsl:when>
|
|
13958
|
-
<xsl:when test="self::* and local-name(.) = 'xref'">
|
|
14072
|
+
<xsl:when test="self::* and local-name(.) = 'fmt-xref'">
|
|
13959
14073
|
<xsl:variable name="id" select="@id"/>
|
|
13960
14074
|
|
|
13961
|
-
<xsl:variable name="id_next" select="following-sibling::mn:xref[1]/@id"/>
|
|
13962
|
-
<xsl:variable name="id_prev" select="preceding-sibling::mn:xref[1]/@id"/>
|
|
14075
|
+
<xsl:variable name="id_next" select="following-sibling::mn:fmt-xref[1]/@id"/>
|
|
14076
|
+
<xsl:variable name="id_prev" select="preceding-sibling::mn:fmt-xref[1]/@id"/>
|
|
13963
14077
|
|
|
13964
14078
|
<xsl:variable name="pages_">
|
|
13965
14079
|
<xsl:for-each select="$index/index/item[@id = $id or @id = $id_next or @id = $id_prev]">
|
|
@@ -14055,18 +14169,18 @@
|
|
|
14055
14169
|
<xsl:variable name="item_number">
|
|
14056
14170
|
<xsl:number count="mn:li[ancestor::mn:indexsect]" level="any"/>
|
|
14057
14171
|
</xsl:variable>
|
|
14058
|
-
<xsl:variable name="xref_number"><xsl:number count="mn:xref"/></xsl:variable>
|
|
14172
|
+
<xsl:variable name="xref_number"><xsl:number count="mn:fmt-xref"/></xsl:variable>
|
|
14059
14173
|
<xsl:value-of select="concat($docid_curr, '_', $item_number, '_', $xref_number)"/> <!-- $level, '_', -->
|
|
14060
14174
|
</xsl:template>
|
|
14061
14175
|
|
|
14062
|
-
<xsl:template match="mn:indexsect/mn:title" priority="4">
|
|
14176
|
+
<xsl:template match="mn:indexsect/mn:fmt-title | mn:indexsect/mn:title" priority="4">
|
|
14063
14177
|
<fo:block xsl:use-attribute-sets="indexsect-title-style">
|
|
14064
14178
|
<!-- Index -->
|
|
14065
14179
|
<xsl:apply-templates/>
|
|
14066
14180
|
</fo:block>
|
|
14067
14181
|
</xsl:template>
|
|
14068
14182
|
|
|
14069
|
-
<xsl:template match="mn:indexsect/mn:clause/mn:title" priority="4">
|
|
14183
|
+
<xsl:template match="mn:indexsect/mn:clause/mn:fmt-title | mn:indexsect/mn:clause/mn:title" priority="4">
|
|
14070
14184
|
<!-- Letter A, B, C, ... -->
|
|
14071
14185
|
<fo:block xsl:use-attribute-sets="indexsect-clause-title-style">
|
|
14072
14186
|
<xsl:apply-templates/>
|
|
@@ -14107,12 +14221,12 @@
|
|
|
14107
14221
|
<fmt-review-start id="_7ef81cf7-3f6c-4ed4-9c1f-1ba092052bbd" source="_dda23915-8574-ef1e-29a1-822d465a5b97" target="_ecfb2210-3b1b-46a2-b63a-8b8505be6686" end="_dda23915-8574-ef1e-29a1-822d465a5b97" author="" date="2025-03-24T00:00:00Z"/>
|
|
14108
14222
|
<bookmark id="_dda23915-8574-ef1e-29a1-822d465a5b97"/>
|
|
14109
14223
|
<fmt-review-end id="_f336a8d0-08a8-4b7f-a1aa-b04688ed40c1" source="_dda23915-8574-ef1e-29a1-822d465a5b97" target="_ecfb2210-3b1b-46a2-b63a-8b8505be6686" start="_dda23915-8574-ef1e-29a1-822d465a5b97" author="" date="2025-03-24T00:00:00Z"/> -->
|
|
14110
|
-
<xsl:when test="1 = 2 and preceding-sibling::node()[self::mn:fmt-
|
|
14224
|
+
<xsl:when test="1 = 2 and preceding-sibling::node()[self::mn:fmt-annotation-start][@source = $bookmark_id] and following-sibling::node()[self::mn:fmt-annotation-end][@source = $bookmark_id]">
|
|
14111
14225
|
<!-- skip here, see the template 'fmt-review-start' -->
|
|
14112
14226
|
</xsl:when>
|
|
14113
14227
|
<xsl:otherwise>
|
|
14114
14228
|
<!-- <fo:inline id="{@id}" font-size="1pt"/> -->
|
|
14115
|
-
<fo:inline id="{@id}" font-size="1pt"><xsl:if test="preceding-sibling::node()[self::mn:fmt-
|
|
14229
|
+
<fo:inline id="{@id}" font-size="1pt"><xsl:if test="preceding-sibling::node()[self::mn:fmt-annotation-start][@source = $bookmark_id] and following-sibling::node()[self::mn:fmt-annotation-end][@source = $bookmark_id]"><xsl:attribute name="line-height">0.1</xsl:attribute></xsl:if><xsl:value-of select="$hair_space"/></fo:inline>
|
|
14116
14230
|
<!-- we need to add zero-width space, otherwise this fo:inline is missing in IF xml -->
|
|
14117
14231
|
<xsl:if test="not(following-sibling::node()[normalize-space() != ''])"><fo:inline font-size="1pt"> </fo:inline></xsl:if>
|
|
14118
14232
|
</xsl:otherwise>
|
|
@@ -14276,7 +14390,7 @@
|
|
|
14276
14390
|
|
|
14277
14391
|
<xsl:template name="processTables_Contents">
|
|
14278
14392
|
<mnx:tables>
|
|
14279
|
-
<xsl:for-each select="//mn:table[not(ancestor::mn:metanorma-extension)][@id and mn:name and normalize-space(@id) != '']">
|
|
14393
|
+
<xsl:for-each select="//mn:table[not(ancestor::mn:metanorma-extension)][@id and mn:fmt-name and normalize-space(@id) != '']">
|
|
14280
14394
|
<xsl:choose>
|
|
14281
14395
|
<xsl:when test="mn:fmt-name">
|
|
14282
14396
|
<xsl:variable name="fmt_name">
|
|
@@ -14298,7 +14412,7 @@
|
|
|
14298
14412
|
|
|
14299
14413
|
<xsl:template name="processFigures_Contents">
|
|
14300
14414
|
<mnx:figures>
|
|
14301
|
-
<xsl:for-each select="//mn:figure[@id and mn:name and not(@unnumbered = 'true') and normalize-space(@id) != ''] | //*[@id and starts-with(mn:name, 'Figure ') and normalize-space(@id) != '']">
|
|
14415
|
+
<xsl:for-each select="//mn:figure[@id and mn:fmt-name and not(@unnumbered = 'true') and normalize-space(@id) != ''] | //*[@id and starts-with(mn:name, 'Figure ') and normalize-space(@id) != '']">
|
|
14302
14416
|
<xsl:choose>
|
|
14303
14417
|
<xsl:when test="mn:fmt-name">
|
|
14304
14418
|
<xsl:variable name="fmt_name">
|
|
@@ -14327,7 +14441,7 @@
|
|
|
14327
14441
|
|
|
14328
14442
|
<xsl:template match="mn:title[following-sibling::*[1][self::mn:fmt-title]]" mode="contents"/>
|
|
14329
14443
|
|
|
14330
|
-
<xsl:template match="mn:figure/mn:fmt-name |
|
|
14444
|
+
<xsl:template match="mn:figure/mn:fmt-name | mnx:figure/mn:fmt-name | mn:table/mn:fmt-name | mnx:table/mn:fmt-name | mn:permission/mn:fmt-name | mnx:permission/mn:fmt-name | mn:recommendation/mn:fmt-name | mnx:recommendation/mn:fmt-name | mn:requirement/mn:fmt-name | mnx:requirement/mn:fmt-name" mode="contents">
|
|
14331
14445
|
<xsl:apply-templates mode="contents"/>
|
|
14332
14446
|
<xsl:text> </xsl:text>
|
|
14333
14447
|
</xsl:template>
|
|
@@ -14339,7 +14453,7 @@
|
|
|
14339
14453
|
</xsl:if>
|
|
14340
14454
|
</xsl:template>
|
|
14341
14455
|
|
|
14342
|
-
<xsl:template match="mn:figure/mn:fmt-name | mn:table/mn:fmt-name |
|
|
14456
|
+
<xsl:template match="mn:figure/mn:fmt-name | mnx:figure/mn:fmt-name | mn:table/mn:fmt-name | mnx:table/mn:fmt-name | mn:permission/mn:fmt-name | mnx:permission/mn:fmt-name | mn:recommendation/mn:fmt-name | mnx:recommendation/mn:fmt-name | mn:requirement/mn:fmt-name | mnx:requirement/mn:fmt-name | mn:sourcecode/mn:fmt-name | mnx:sourcecode/mn:fmt-name" mode="bookmarks">
|
|
14343
14457
|
<xsl:apply-templates mode="bookmarks"/>
|
|
14344
14458
|
<xsl:text> </xsl:text>
|
|
14345
14459
|
</xsl:template>
|
|
@@ -14350,7 +14464,7 @@
|
|
|
14350
14464
|
</xsl:if>
|
|
14351
14465
|
</xsl:template>
|
|
14352
14466
|
|
|
14353
|
-
<xsl:template match="*[self::mn:figure or self::mn:table or self::mn:permission or self::mn:recommendation or self::mn:requirement]/mn:fmt-name/text()" mode="contents" priority="2">
|
|
14467
|
+
<xsl:template match="*[self::mn:figure or self::mn:table or self::mn:permission or self::mn:recommendation or self::mn:requirement]/mn:fmt-name/text() | *[self::mnx:figure or self::mnx:table or self::mnx:permission or self::mnx:recommendation or self::mnx:requirement]/mn:fmt-name/text()" mode="contents" priority="2">
|
|
14354
14468
|
<xsl:value-of select="."/>
|
|
14355
14469
|
</xsl:template>
|
|
14356
14470
|
|
|
@@ -14360,7 +14474,7 @@
|
|
|
14360
14474
|
</xsl:if>
|
|
14361
14475
|
</xsl:template>
|
|
14362
14476
|
|
|
14363
|
-
<xsl:template match="*[self::mn:figure or self::mn:table or self::mn:permission or self::mn:recommendation or self::mn:requirement or self::mn:sourcecode]/mn:fmt-name//text()" mode="bookmarks" priority="2">
|
|
14477
|
+
<xsl:template match="*[self::mn:figure or self::mn:table or self::mn:permission or self::mn:recommendation or self::mn:requirement or self::mn:sourcecode]/mn:fmt-name//text() | *[self::mnx:figure or self::mnx:table or self::mnx:permission or self::mnx:recommendation or self::mnx:requirement or self::mnx:sourcecode]/mn:fmt-name//text()" mode="bookmarks" priority="2">
|
|
14364
14478
|
<xsl:value-of select="."/>
|
|
14365
14479
|
</xsl:template>
|
|
14366
14480
|
|
|
@@ -14821,7 +14935,7 @@
|
|
|
14821
14935
|
<xsl:value-of select="."/>
|
|
14822
14936
|
</xsl:template>
|
|
14823
14937
|
|
|
14824
|
-
<xsl:template match="mn:
|
|
14938
|
+
<xsl:template match="mn:annotation" mode="contents_item"/>
|
|
14825
14939
|
|
|
14826
14940
|
<xsl:template match="mn:tab" mode="contents_item">
|
|
14827
14941
|
<xsl:text> </xsl:text>
|
|
@@ -14981,7 +15095,7 @@
|
|
|
14981
15095
|
<xsl:apply-templates/>
|
|
14982
15096
|
</xsl:template>
|
|
14983
15097
|
|
|
14984
|
-
<xsl:template match="mn:toc//mn:xref" priority="3">
|
|
15098
|
+
<xsl:template match="mn:toc//mn:xref | mn:toc//mn:fmt-xref" priority="3">
|
|
14985
15099
|
<!-- <xref target="cgpm9th1948r6">1.6.3<tab/>“9th CGPM, 1948:<tab/>decision to establish the SI”</xref> -->
|
|
14986
15100
|
<!-- New format: one tab <xref target="cgpm9th1948r6">“9th CGPM, 1948:<tab/>decision to establish the SI”</xref> -->
|
|
14987
15101
|
<!-- <test><xsl:copy-of select="."/></test> -->
|
|
@@ -15049,8 +15163,8 @@
|
|
|
15049
15163
|
<xsl:apply-templates mode="toc_table_width"/>
|
|
15050
15164
|
</xsl:template>
|
|
15051
15165
|
|
|
15052
|
-
<xsl:template match="mn:clause[@type = 'toc']/mn:title" mode="toc_table_width"/>
|
|
15053
|
-
<xsl:template match="mn:clause[not(@type = 'toc')]/mn:title" mode="toc_table_width"/>
|
|
15166
|
+
<xsl:template match="mn:clause[@type = 'toc']/mn:fmt-title" mode="toc_table_width"/>
|
|
15167
|
+
<xsl:template match="mn:clause[not(@type = 'toc')]/mn:fmt-title" mode="toc_table_width"/>
|
|
15054
15168
|
|
|
15055
15169
|
<xsl:template match="mn:li" mode="toc_table_width">
|
|
15056
15170
|
<mn:tr>
|
|
@@ -15058,7 +15172,7 @@
|
|
|
15058
15172
|
</mn:tr>
|
|
15059
15173
|
</xsl:template>
|
|
15060
15174
|
|
|
15061
|
-
<xsl:template match="mn:xref" mode="toc_table_width">
|
|
15175
|
+
<xsl:template match="mn:fmt-xref" mode="toc_table_width">
|
|
15062
15176
|
<!-- <xref target="cgpm9th1948r6">1.6.3<tab/>“9th CGPM, 1948:<tab/>decision to establish the SI”</xref> -->
|
|
15063
15177
|
<!-- New format - one tab <xref target="cgpm9th1948r6">“9th CGPM, 1948:<tab/>decision to establish the SI”</xref> -->
|
|
15064
15178
|
<xsl:for-each select="mn:tab">
|
|
@@ -15132,10 +15246,10 @@
|
|
|
15132
15246
|
|
|
15133
15247
|
</xsl:template> <!-- tab -->
|
|
15134
15248
|
|
|
15135
|
-
<xsl:template match="mn:note/mn:name/mn:tab" priority="2"/>
|
|
15136
|
-
<xsl:template match="mn:termnote/mn:name/mn:tab" priority="2"/>
|
|
15249
|
+
<xsl:template match="mn:note/mn:fmt-name/mn:tab" priority="2"/>
|
|
15250
|
+
<xsl:template match="mn:termnote/mn:fmt-name/mn:tab" priority="2"/>
|
|
15137
15251
|
|
|
15138
|
-
<xsl:template match="mn:note/mn:name/mn:tab" mode="tab">
|
|
15252
|
+
<xsl:template match="mn:note/mn:fmt-name/mn:tab" mode="tab">
|
|
15139
15253
|
</xsl:template>
|
|
15140
15254
|
|
|
15141
15255
|
<xsl:template name="insertNonBreakSpaces">
|
|
@@ -15149,13 +15263,13 @@
|
|
|
15149
15263
|
</xsl:template>
|
|
15150
15264
|
|
|
15151
15265
|
<xsl:variable name="reviews_">
|
|
15152
|
-
<xsl:for-each select="//mn:
|
|
15266
|
+
<xsl:for-each select="//mn:annotation[not(parent::mn:annotation-container)][@from]">
|
|
15153
15267
|
<xsl:copy>
|
|
15154
15268
|
<xsl:copy-of select="@from"/>
|
|
15155
15269
|
<xsl:copy-of select="@id"/>
|
|
15156
15270
|
</xsl:copy>
|
|
15157
15271
|
</xsl:for-each>
|
|
15158
|
-
<xsl:for-each select="//mn:fmt-
|
|
15272
|
+
<xsl:for-each select="//mn:fmt-annotation-start[@source]">
|
|
15159
15273
|
<xsl:copy>
|
|
15160
15274
|
<xsl:copy-of select="@source"/>
|
|
15161
15275
|
<xsl:copy-of select="@id"/>
|
|
@@ -15169,7 +15283,7 @@
|
|
|
15169
15283
|
<!-- if there is review with from="...", then add small helper block for Annot tag adding, see 'review' template -->
|
|
15170
15284
|
<xsl:variable name="curr_id" select="@id"/>
|
|
15171
15285
|
<!-- <xsl:variable name="review_id" select="normalize-space(/@id)"/> -->
|
|
15172
|
-
<xsl:for-each select="$reviews//mn:
|
|
15286
|
+
<xsl:for-each select="$reviews//mn:annotation[@from = $curr_id]"> <!-- $reviews//mn:fmt-review-start[@source = $curr_id] -->
|
|
15173
15287
|
<xsl:variable name="review_id" select="normalize-space(@id)"/>
|
|
15174
15288
|
<xsl:if test="$review_id != ''"> <!-- i.e. if review found -->
|
|
15175
15289
|
<fo:block keep-with-next="always" line-height="0.1" id="{$review_id}" font-size="1pt" role="SKIP"><xsl:value-of select="$hair_space"/><fo:basic-link internal-destination="{$review_id}" fox:alt-text="Annot___{$review_id}" role="Annot"><xsl:value-of select="$hair_space"/></fo:basic-link></fo:block>
|
|
@@ -15184,7 +15298,7 @@
|
|
|
15184
15298
|
|
|
15185
15299
|
<!-- document text (not figures, or tables) footnotes -->
|
|
15186
15300
|
<xsl:variable name="reviews_container_">
|
|
15187
|
-
<xsl:for-each select="//mn:
|
|
15301
|
+
<xsl:for-each select="//mn:annotation-container/mn:fmt-annotation-body">
|
|
15188
15302
|
<xsl:variable name="update_xml_step1">
|
|
15189
15303
|
<xsl:apply-templates select="." mode="update_xml_step1"/>
|
|
15190
15304
|
</xsl:variable>
|
|
@@ -15193,10 +15307,10 @@
|
|
|
15193
15307
|
</xsl:variable>
|
|
15194
15308
|
<xsl:variable name="reviews_container" select="xalan:nodeset($reviews_container_)"/>
|
|
15195
15309
|
|
|
15196
|
-
<xsl:template match="mn:
|
|
15310
|
+
<xsl:template match="mn:annotation-container"/>
|
|
15197
15311
|
|
|
15198
15312
|
<!-- for old Presentation XML (before https://github.com/metanorma/isodoc/issues/670) -->
|
|
15199
|
-
<xsl:template match="mn:
|
|
15313
|
+
<xsl:template match="mn:annotation[not(parent::mn:annotation-container)]"> <!-- 'review' will be processed in mn2pdf/review.xsl -->
|
|
15200
15314
|
<xsl:variable name="id_from" select="normalize-space(current()/@from)"/>
|
|
15201
15315
|
<xsl:if test="$isGenerateTableIF = 'false'">
|
|
15202
15316
|
<xsl:choose>
|
|
@@ -15216,7 +15330,7 @@
|
|
|
15216
15330
|
</xsl:template>
|
|
15217
15331
|
|
|
15218
15332
|
<!-- for new Presentation XML (https://github.com/metanorma/isodoc/issues/670) -->
|
|
15219
|
-
<xsl:template match="mn:fmt-
|
|
15333
|
+
<xsl:template match="mn:fmt-annotation-start" name="fmt-annotation-start"> <!-- 'review' will be processed in mn2pdf/review.xsl -->
|
|
15220
15334
|
<!-- comment 2019-11-29 -->
|
|
15221
15335
|
<!-- <fo:block font-weight="bold">Review:</fo:block>
|
|
15222
15336
|
<xsl:apply-templates /> -->
|
|
@@ -15272,7 +15386,7 @@
|
|
|
15272
15386
|
</xsl:template>
|
|
15273
15387
|
|
|
15274
15388
|
<!-- https://github.com/metanorma/mn-samples-bsi/issues/312 -->
|
|
15275
|
-
<xsl:template match="mn:
|
|
15389
|
+
<xsl:template match="mn:annotation[@type = 'other']"/>
|
|
15276
15390
|
|
|
15277
15391
|
<!-- ============ -->
|
|
15278
15392
|
<!-- errata -->
|
|
@@ -15665,9 +15779,12 @@
|
|
|
15665
15779
|
<xsl:choose>
|
|
15666
15780
|
<xsl:when test="mn:fmt-title">
|
|
15667
15781
|
<xsl:variable name="fmt_title_section">
|
|
15668
|
-
<xsl:copy-of select="mn:fmt-title//mn:span[@class = 'fmt-caption-delim'][mn:tab][1]/preceding-sibling::node()[not(self::mn:
|
|
15782
|
+
<xsl:copy-of select="mn:fmt-title//mn:span[@class = 'fmt-caption-delim'][mn:tab][1]/preceding-sibling::node()[not(self::mn:annotation)]"/>
|
|
15669
15783
|
</xsl:variable>
|
|
15670
15784
|
<xsl:value-of select="normalize-space($fmt_title_section)"/>
|
|
15785
|
+
<xsl:if test="normalize-space($fmt_title_section) = ''">
|
|
15786
|
+
<xsl:value-of select="mn:fmt-title/mn:tab[1]/preceding-sibling::node()"/>
|
|
15787
|
+
</xsl:if>
|
|
15671
15788
|
</xsl:when>
|
|
15672
15789
|
<xsl:otherwise>
|
|
15673
15790
|
<xsl:value-of select="mn:title/mn:tab[1]/preceding-sibling::node()"/>
|
|
@@ -15680,6 +15797,9 @@
|
|
|
15680
15797
|
<xsl:when test="mn:fmt-title//mn:span[@class = 'fmt-caption-delim'][mn:tab]">
|
|
15681
15798
|
<xsl:copy-of select="mn:fmt-title//mn:span[@class = 'fmt-caption-delim'][mn:tab][1]/following-sibling::node()"/>
|
|
15682
15799
|
</xsl:when>
|
|
15800
|
+
<xsl:when test="mn:fmt-title/mn:tab">
|
|
15801
|
+
<xsl:copy-of select="mn:fmt-title/mn:tab[1]/following-sibling::node()"/>
|
|
15802
|
+
</xsl:when>
|
|
15683
15803
|
<xsl:when test="mn:fmt-title">
|
|
15684
15804
|
<xsl:copy-of select="mn:fmt-title/node()"/>
|
|
15685
15805
|
</xsl:when>
|
|
@@ -15817,10 +15937,10 @@
|
|
|
15817
15937
|
|
|
15818
15938
|
</fo:block>
|
|
15819
15939
|
|
|
15820
|
-
<xsl:apply-templates select="mn:title[@columns = 1]"/>
|
|
15940
|
+
<xsl:apply-templates select="mn:fmt-title[@columns = 1]"/>
|
|
15821
15941
|
|
|
15822
15942
|
<fo:block>
|
|
15823
|
-
<xsl:apply-templates select="node()[not(self::mn:title and @columns = 1)]"/>
|
|
15943
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-title and @columns = 1)]"/>
|
|
15824
15944
|
</fo:block>
|
|
15825
15945
|
</xsl:otherwise>
|
|
15826
15946
|
</xsl:choose>
|
|
@@ -15829,7 +15949,7 @@
|
|
|
15829
15949
|
<xsl:template name="refine_annex_style">
|
|
15830
15950
|
</xsl:template>
|
|
15831
15951
|
|
|
15832
|
-
<xsl:template match="mn:name/text()">
|
|
15952
|
+
<xsl:template match="mn:name/text() | mn:fmt-name/text()">
|
|
15833
15953
|
<!-- 0xA0 to space replacement -->
|
|
15834
15954
|
<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),' ',' ')"/>
|
|
15835
15955
|
</xsl:template>
|
|
@@ -15885,28 +16005,28 @@
|
|
|
15885
16005
|
<xsl:template match="mn:amend"/>
|
|
15886
16006
|
|
|
15887
16007
|
<!-- fmt-title renamed to title in update_xml_step1 -->
|
|
15888
|
-
<xsl:template match="mn:fmt-title"/>
|
|
16008
|
+
<!-- <xsl:template match="mn:fmt-title" /> -->
|
|
15889
16009
|
|
|
15890
16010
|
<!-- fmt-name renamed to name in update_xml_step1 -->
|
|
15891
|
-
<xsl:template match="mn:fmt-name"/>
|
|
16011
|
+
<!-- <xsl:template match="mn:fmt-name" /> -->
|
|
15892
16012
|
|
|
15893
16013
|
<!-- fmt-preferred renamed to preferred in update_xml_step1 -->
|
|
15894
|
-
<xsl:template match="mn:fmt-preferred"/>
|
|
16014
|
+
<!-- <xsl:template match="mn:fmt-preferred" /> -->
|
|
15895
16015
|
|
|
15896
16016
|
<!-- fmt-admitted renamed to admitted in update_xml_step1 -->
|
|
15897
|
-
<xsl:template match="mn:fmt-admitted"/>
|
|
16017
|
+
<!-- <xsl:template match="mn:fmt-admitted" /> -->
|
|
15898
16018
|
|
|
15899
16019
|
<!-- fmt-deprecates renamed to deprecates in update_xml_step1 -->
|
|
15900
|
-
<xsl:template match="mn:fmt-deprecates"/>
|
|
16020
|
+
<!-- <xsl:template match="mn:fmt-deprecates" /> -->
|
|
15901
16021
|
|
|
15902
16022
|
<!-- fmt-definition renamed to definition in update_xml_step1 -->
|
|
15903
|
-
<xsl:template match="mn:fmt-definition"/>
|
|
16023
|
+
<!-- <xsl:template match="mn:fmt-definition" /> -->
|
|
15904
16024
|
|
|
15905
16025
|
<!-- fmt-termsource renamed to termsource in update_xml_step1 -->
|
|
15906
|
-
<xsl:template match="mn:fmt-termsource"/>
|
|
16026
|
+
<!-- <xsl:template match="mn:fmt-termsource" /> -->
|
|
15907
16027
|
|
|
15908
16028
|
<!-- fmt-source renamed to source in update_xml_step1 -->
|
|
15909
|
-
<xsl:template match="mn:fmt-source"/>
|
|
16029
|
+
<!-- <xsl:template match="mn:fmt-source" /> -->
|
|
15910
16030
|
|
|
15911
16031
|
<xsl:template match="mn:semx">
|
|
15912
16032
|
<xsl:apply-templates/>
|
|
@@ -16350,12 +16470,12 @@
|
|
|
16350
16470
|
<xsl:when test="ancestor::mn:preface">
|
|
16351
16471
|
<xsl:value-of select="$level_total - 2"/>
|
|
16352
16472
|
</xsl:when>
|
|
16353
|
-
<xsl:when test="ancestor::mn:sections and self::mn:title">
|
|
16473
|
+
<xsl:when test="ancestor::mn:sections and self::mn:fmt-title">
|
|
16354
16474
|
<!-- determine 'depth' depends on upper clause with title/@depth -->
|
|
16355
16475
|
<!-- <xsl:message>title=<xsl:value-of select="."/></xsl:message> -->
|
|
16356
|
-
<xsl:variable name="clause_with_depth_depth" select="ancestor::mn:clause[mn:title/@depth][1]/mn:title/@depth"/>
|
|
16476
|
+
<xsl:variable name="clause_with_depth_depth" select="ancestor::mn:clause[mn:fmt-title/@depth][1]/mn:fmt-title/@depth"/>
|
|
16357
16477
|
<!-- <xsl:message>clause_with_depth_depth=<xsl:value-of select="$clause_with_depth_depth"/></xsl:message> -->
|
|
16358
|
-
<xsl:variable name="clause_with_depth_level" select="count(ancestor::mn:clause[mn:title/@depth][1]/ancestor::*)"/>
|
|
16478
|
+
<xsl:variable name="clause_with_depth_level" select="count(ancestor::mn:clause[mn:fmt-title/@depth][1]/ancestor::*)"/>
|
|
16359
16479
|
<!-- <xsl:message>clause_with_depth_level=<xsl:value-of select="$clause_with_depth_level"/></xsl:message> -->
|
|
16360
16480
|
<xsl:variable name="curr_level" select="count(ancestor::*) - 1"/>
|
|
16361
16481
|
<!-- <xsl:message>curr_level=<xsl:value-of select="$curr_level"/></xsl:message> -->
|
|
@@ -16371,8 +16491,8 @@
|
|
|
16371
16491
|
</xsl:otherwise>
|
|
16372
16492
|
</xsl:choose>
|
|
16373
16493
|
</xsl:when>
|
|
16374
|
-
<xsl:when test="ancestor::mn:sections and self::mn:name and parent::mn:term">
|
|
16375
|
-
<xsl:variable name="upper_terms_depth" select="normalize-space(ancestor::mn:terms[1]/mn:title/@depth)"/>
|
|
16494
|
+
<xsl:when test="ancestor::mn:sections and self::mn:fmt-name and parent::mn:term">
|
|
16495
|
+
<xsl:variable name="upper_terms_depth" select="normalize-space(ancestor::mn:terms[1]/mn:fmt-title/@depth)"/>
|
|
16376
16496
|
<xsl:choose>
|
|
16377
16497
|
<xsl:when test="string(number($upper_terms_depth)) != 'NaN'">
|
|
16378
16498
|
<xsl:value-of select="number($upper_terms_depth + 1)"/>
|
|
@@ -16383,7 +16503,7 @@
|
|
|
16383
16503
|
</xsl:choose>
|
|
16384
16504
|
</xsl:when>
|
|
16385
16505
|
<xsl:when test="ancestor::mn:sections">
|
|
16386
|
-
<xsl:variable name="upper_clause_depth" select="normalize-space(ancestor::*[self::mn:clause or self::mn:terms][1]/mn:title/@depth)"/>
|
|
16506
|
+
<xsl:variable name="upper_clause_depth" select="normalize-space(ancestor::*[self::mn:clause or self::mn:terms][1]/mn:fmt-title/@depth)"/>
|
|
16387
16507
|
<xsl:choose>
|
|
16388
16508
|
<xsl:when test="string(number($upper_clause_depth)) != 'NaN'">
|
|
16389
16509
|
<xsl:value-of select="number($upper_clause_depth + 1)"/>
|
|
@@ -16399,8 +16519,8 @@
|
|
|
16399
16519
|
<xsl:when test="parent::mn:annex">
|
|
16400
16520
|
<xsl:value-of select="$level_total - 1"/>
|
|
16401
16521
|
</xsl:when>
|
|
16402
|
-
<xsl:when test="ancestor::mn:annex and self::mn:title">
|
|
16403
|
-
<xsl:variable name="upper_clause_depth" select="normalize-space(ancestor::mn:clause[2]/mn:title/@depth)"/>
|
|
16522
|
+
<xsl:when test="ancestor::mn:annex and self::mn:fmt-title">
|
|
16523
|
+
<xsl:variable name="upper_clause_depth" select="normalize-space(ancestor::mn:clause[2]/mn:fmt-title/@depth)"/>
|
|
16404
16524
|
<xsl:choose>
|
|
16405
16525
|
<xsl:when test="string(number($upper_clause_depth)) != 'NaN'">
|
|
16406
16526
|
<xsl:value-of select="number($upper_clause_depth + 1)"/>
|
|
@@ -16433,7 +16553,7 @@
|
|
|
16433
16553
|
</xsl:when>
|
|
16434
16554
|
<xsl:otherwise>
|
|
16435
16555
|
<xsl:variable name="title_level_">
|
|
16436
|
-
<xsl:for-each select="../preceding-sibling::mn:title[1]">
|
|
16556
|
+
<xsl:for-each select="../preceding-sibling::mn:fmt-title[1]">
|
|
16437
16557
|
<xsl:call-template name="getLevel"/>
|
|
16438
16558
|
</xsl:for-each>
|
|
16439
16559
|
</xsl:variable>
|
|
@@ -16510,15 +16630,17 @@
|
|
|
16510
16630
|
</xsl:template>
|
|
16511
16631
|
|
|
16512
16632
|
<xsl:template name="setNamedDestination">
|
|
16513
|
-
|
|
16514
|
-
|
|
16515
|
-
<
|
|
16516
|
-
|
|
16517
|
-
<xsl:for-each select=". | mn:title | mn:name">
|
|
16518
|
-
<xsl:if test="@named_dest">
|
|
16519
|
-
<fox:destination internal-destination="{@named_dest}"/>
|
|
16633
|
+
<xsl:if test="$isGenerateTableIF = 'false'">
|
|
16634
|
+
<!-- skip GUID, e.g. _33eac3cb-9663-4291-ae26-1d4b6f4635fc -->
|
|
16635
|
+
<xsl:if test="@id and normalize-space(java:matches(java:java.lang.String.new(@id), '_[0-9a-z]{8}-[0-9a-z]{4}-[0-9a-z]{4}-[0-9a-z]{4}-[0-9a-z]{12}')) = 'false'">
|
|
16636
|
+
<fox:destination internal-destination="{@id}"/>
|
|
16520
16637
|
</xsl:if>
|
|
16521
|
-
|
|
16638
|
+
<xsl:for-each select=". | mn:fmt-title | mn:fmt-name">
|
|
16639
|
+
<xsl:if test="@named_dest">
|
|
16640
|
+
<fox:destination internal-destination="{@named_dest}"/>
|
|
16641
|
+
</xsl:if>
|
|
16642
|
+
</xsl:for-each>
|
|
16643
|
+
</xsl:if>
|
|
16522
16644
|
</xsl:template>
|
|
16523
16645
|
|
|
16524
16646
|
<xsl:template name="add-letter-spacing">
|
|
@@ -16866,7 +16988,7 @@
|
|
|
16866
16988
|
</xsl:when>
|
|
16867
16989
|
<xsl:otherwise>
|
|
16868
16990
|
<!-- namespace-uri(ancestor::mn:title) != '' to skip title from $contents -->
|
|
16869
|
-
<xsl:if test="namespace-uri(ancestor::mn:title) != '' and ($char_prev = '' and ../preceding-sibling::node())">
|
|
16991
|
+
<xsl:if test="namespace-uri(ancestor::mn:fmt-title) != '' and ($char_prev = '' and ../preceding-sibling::node())">
|
|
16870
16992
|
<fo:inline padding-left="1mm"><xsl:value-of select="$zero_width_space"/></fo:inline>
|
|
16871
16993
|
</xsl:if>
|
|
16872
16994
|
<fo:inline-container text-align="center" alignment-baseline="central" width="1em" margin="0" padding="0" text-indent="0mm" last-line-end-indent="0mm" start-indent="0mm" end-indent="0mm" role="SKIP" text-align-last="center">
|
|
@@ -16900,7 +17022,7 @@
|
|
|
16900
17022
|
</fo:block>
|
|
16901
17023
|
</fo:block-container>
|
|
16902
17024
|
</fo:inline-container>
|
|
16903
|
-
<xsl:if test="namespace-uri(ancestor::mn:title) != '' and ($char_next != '' or ../following-sibling::node())">
|
|
17025
|
+
<xsl:if test="namespace-uri(ancestor::mn:fmt-title) != '' and ($char_next != '' or ../following-sibling::node())">
|
|
16904
17026
|
<fo:inline padding-left="1mm"><xsl:value-of select="$zero_width_space"/></fo:inline>
|
|
16905
17027
|
</xsl:if>
|
|
16906
17028
|
</xsl:otherwise>
|