metanorma-csa 2.0.2 → 2.0.5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (11) hide show
  1. checksums.yaml +4 -4
  2. data/lib/isodoc/csa/csa.standard.xsl +1205 -318
  3. data/lib/isodoc/csa/html/csa.css +1 -2
  4. data/lib/isodoc/csa/html/csa.scss +0 -1
  5. data/lib/isodoc/csa/html/wordstyle.css +20 -0
  6. data/lib/isodoc/csa/html/wordstyle.scss +19 -0
  7. data/lib/metanorma/csa/basicdoc.rng +5 -3
  8. data/lib/metanorma/csa/biblio.rng +5 -3
  9. data/lib/metanorma/csa/isodoc.rng +73 -3
  10. data/lib/metanorma/csa/version.rb +1 -1
  11. metadata +2 -2
data/lib/isodoc/csa/csa.standard.xsl CHANGED
@@ -2,19 +2,8 @@
2
2
 
3
3
  <xsl:output version="1.0" method="xml" encoding="UTF-8" indent="yes"/>
4
4
 
5
- <xsl:param name="svg_images"/>
6
- <xsl:param name="external_index"/><!-- path to index xml, generated on 1st pass, based on FOP Intermediate Format -->
7
- <xsl:variable name="images" select="document($svg_images)"/>
8
- <xsl:param name="basepath"/>
9
-
10
5
  <xsl:key name="kfn" match="*[local-name() = 'fn'][not(ancestor::*[(local-name() = 'table' or local-name() = 'figure') and not(ancestor::*[local-name() = 'name'])])]" use="@reference"/>
11
6
 
12
- <xsl:variable name="marginLeftRight1" select="25"/>
13
- <xsl:variable name="marginLeftRight2" select="25"/>
14
- <xsl:variable name="marginTop" select="25"/>
15
- <xsl:variable name="marginBottom" select="21"/>
16
-
17
-
18
7
 
19
8
 
20
9
  <xsl:variable name="debug">false</xsl:variable>
@@ -27,16 +16,14 @@
27
16
 
28
17
  <xsl:variable name="color-header-document">rgb(79, 201, 204)</xsl:variable>
29
18
 
30
- <xsl:variable name="contents">
19
+ <xsl:variable name="contents_">
31
20
  <contents>
32
21
  <xsl:call-template name="processPrefaceSectionsDefault_Contents"/>
33
22
  <xsl:call-template name="processMainSectionsDefault_Contents"/>
23
+ <xsl:call-template name="processTablesFigures_Contents"/>
34
24
  </contents>
35
25
  </xsl:variable>
36
-
37
- <xsl:variable name="lang">
38
- <xsl:call-template name="getLang"/>
39
- </xsl:variable>
26
+ <xsl:variable name="contents" select="xalan:nodeset($contents_)"/>
40
27
 
41
28
  <xsl:template match="/">
42
29
  <xsl:call-template name="namespaceCheck"/>
@@ -119,7 +106,7 @@
119
106
  <xsl:if test="$debug = 'true'">
120
107
  <xsl:text disable-output-escaping="yes">&lt;!--</xsl:text>
121
108
  DEBUG
122
- contents=<xsl:copy-of select="xalan:nodeset($contents)"/>
109
+ contents=<xsl:copy-of select="$contents"/>
123
110
  <xsl:text disable-output-escaping="yes">--&gt;</xsl:text>
124
111
  </xsl:if>
125
112
 
@@ -208,7 +195,7 @@
208
195
  <fo:block font-size="26pt" color="black" margin-top="2pt" margin-bottom="30pt" role="H1"><xsl:value-of select="$title-toc"/></fo:block>
209
196
 
210
197
  <fo:block margin-left="-3mm" role="TOC">
211
- <xsl:for-each select="xalan:nodeset($contents)//item[@display = 'true']">
198
+ <xsl:for-each select="$contents//item[@display = 'true']">
212
199
  <fo:block role="TOCI">
213
200
  <fo:list-block>
214
201
  <xsl:attribute name="provisional-distance-between-starts">
@@ -237,6 +224,27 @@
237
224
  </fo:list-block>
238
225
  </fo:block>
239
226
  </xsl:for-each>
227
+
228
+ <!-- List of Tables -->
229
+ <xsl:if test="$contents//tables/table">
230
+ <xsl:call-template name="insertListOf_Title">
231
+ <xsl:with-param name="title" select="$title-list-tables"/>
232
+ </xsl:call-template>
233
+ <xsl:for-each select="$contents//tables/table">
234
+ <xsl:call-template name="insertListOf_Item"/>
235
+ </xsl:for-each>
236
+ </xsl:if>
237
+
238
+ <!-- List of Figures -->
239
+ <xsl:if test="$contents//figures/figure">
240
+ <xsl:call-template name="insertListOf_Title">
241
+ <xsl:with-param name="title" select="$title-list-figures"/>
242
+ </xsl:call-template>
243
+ <xsl:for-each select="$contents//figures/figure">
244
+ <xsl:call-template name="insertListOf_Item"/>
245
+ </xsl:for-each>
246
+ </xsl:if>
247
+
240
248
  </fo:block>
241
249
  </fo:block-container>
242
250
 
@@ -255,6 +263,51 @@
255
263
  </fo:root>
256
264
  </xsl:template>
257
265
 
266
+ <xsl:template name="insertListOf_Title">
267
+ <xsl:param name="title"/>
268
+ <fo:block role="TOCI" keep-with-next="always">
269
+ <fo:list-block provisional-distance-between-starts="3mm">
270
+ <fo:list-item>
271
+ <fo:list-item-label end-indent="label-end()">
272
+ <fo:block font-size="1pt"> </fo:block>
273
+ </fo:list-item-label>
274
+ <fo:list-item-body start-indent="body-start()">
275
+ <fo:block>
276
+ <xsl:value-of select="$title"/>
277
+ </fo:block>
278
+ </fo:list-item-body>
279
+ </fo:list-item>
280
+ </fo:list-block>
281
+ </fo:block>
282
+ </xsl:template>
283
+
284
+ <xsl:template name="insertListOf_Item">
285
+ <fo:block role="TOCI">
286
+ <fo:list-block provisional-distance-between-starts="10mm">
287
+ <fo:list-item>
288
+ <fo:list-item-label end-indent="label-end()">
289
+ <fo:block font-size="1pt"> </fo:block>
290
+ </fo:list-item-label>
291
+ <fo:list-item-body start-indent="body-start()">
292
+ <fo:block text-align-last="justify" margin-left="12mm" text-indent="-12mm">
293
+ <fo:basic-link internal-destination="{@id}">
294
+ <xsl:call-template name="setAltText">
295
+ <xsl:with-param name="value" select="@alt-text"/>
296
+ </xsl:call-template>
297
+ <xsl:apply-templates select="." mode="contents"/>
298
+ <fo:inline keep-together.within-line="always">
299
+ <fo:leader leader-pattern="dots"/>
300
+ <fo:inline><fo:page-number-citation ref-id="{@id}"/></fo:inline>
301
+ </fo:inline>
302
+ </fo:basic-link>
303
+ </fo:block>
304
+ </fo:list-item-body>
305
+ </fo:list-item>
306
+ </fo:list-block>
307
+ </fo:block>
308
+ </xsl:template>
309
+
310
+
258
311
  <xsl:template match="node()">
259
312
  <xsl:apply-templates/>
260
313
  </xsl:template>
@@ -445,7 +498,7 @@
445
498
  </xsl:template>
446
499
 
447
500
 
448
- <xsl:template match="csa:ul | csa:ol" mode="ul_ol">
501
+ <xsl:template match="csa:ul | csa:ol" mode="list" priority="2">
449
502
  <xsl:choose>
450
503
  <xsl:when test="not(ancestor::csa:ul) and not(ancestor::csa:ol)">
451
504
  <fo:block-container border-left="0.75mm solid {$color-header-document}" margin-left="1mm" margin-bottom="12pt">
@@ -469,57 +522,11 @@
469
522
  </xsl:template>
470
523
 
471
524
  <xsl:template name="listProcessing">
472
- <fo:list-block provisional-distance-between-starts="6.5mm" line-height="145%">
473
- <xsl:if test="ancestor::csa:ul | ancestor::csa:ol">
474
- <!-- <xsl:attribute name="margin-bottom">0pt</xsl:attribute> -->
475
- </xsl:if>
476
- <xsl:if test="following-sibling::*[1][local-name() = 'ul' or local-name() = 'ol']">
477
- <!-- <xsl:attribute name="margin-bottom">0pt</xsl:attribute> -->
478
- </xsl:if>
525
+ <fo:list-block xsl:use-attribute-sets="list-style">
479
526
  <xsl:apply-templates/>
480
527
  </fo:list-block>
481
528
  </xsl:template>
482
529
 
483
- <xsl:template match="csa:li">
484
- <fo:list-item>
485
- <fo:list-item-label end-indent="label-end()">
486
- <fo:block>
487
- <xsl:choose>
488
- <xsl:when test="local-name(..) = 'ul'">
489
- <xsl:call-template name="setULLabel"/>
490
- </xsl:when>
491
- <!-- <xsl:when test="local-name(..) = 'ul' and (../ancestor::csa:ul or ../ancestor::csa:ol)">-</xsl:when> --> <!-- &#x2014; dash -->
492
- <!-- <xsl:when test="local-name(..) = 'ul'">•</xsl:when> --> <!-- &#x2014; dash -->
493
- <xsl:otherwise> <!-- for ordered lists -->
494
- <xsl:choose>
495
- <xsl:when test="../@type = 'arabic'">
496
- <xsl:number format="a)" lang="en"/>
497
- </xsl:when>
498
- <xsl:when test="../@type = 'alphabet'">
499
- <xsl:number format="1)"/>
500
- </xsl:when>
501
- <xsl:when test="../@type = 'alphabet_upper'">
502
- <xsl:number format="A)" lang="en"/>
503
- </xsl:when>
504
-
505
- <xsl:when test="../@type = 'roman'">
506
- <xsl:number format="i)"/>
507
- </xsl:when>
508
- <xsl:otherwise>
509
- <xsl:number format="1)"/>
510
- </xsl:otherwise>
511
- </xsl:choose>
512
- </xsl:otherwise>
513
- </xsl:choose>
514
- </fo:block>
515
- </fo:list-item-label>
516
- <fo:list-item-body start-indent="body-start()" line-height-shift-adjustment="disregard-shifts">
517
- <fo:block>
518
- <xsl:apply-templates/>
519
- </fo:block>
520
- </fo:list-item-body>
521
- </fo:list-item>
522
- </xsl:template>
523
530
 
524
531
  <xsl:template match="csa:ul/csa:note | csa:ol/csa:note" priority="2">
525
532
  <fo:list-item font-size="10pt">
@@ -533,55 +540,6 @@
533
540
  </fo:list-item>
534
541
  </xsl:template>
535
542
 
536
- <xsl:template match="csa:preferred">
537
- <xsl:variable name="level">
538
- <xsl:call-template name="getLevel"/>
539
- </xsl:variable>
540
- <xsl:variable name="font-size">
541
- <xsl:choose>
542
- <xsl:when test="$level &gt;= 2">11pt</xsl:when>
543
- <xsl:otherwise>12pt</xsl:otherwise>
544
- </xsl:choose>
545
- </xsl:variable>
546
- <xsl:variable name="levelTerm">
547
- <xsl:call-template name="getLevelTermName"/>
548
- </xsl:variable>
549
- <fo:block font-size="{$font-size}" role="H{$levelTerm}">
550
- <fo:block font-weight="bold" keep-with-next="always">
551
- <xsl:apply-templates select="ancestor::csa:term[1]/csa:name"/>
552
- </fo:block>
553
- <fo:block font-weight="bold" keep-with-next="always" line-height="1">
554
- <xsl:call-template name="setStyle_preferred"/>
555
- <xsl:apply-templates/>
556
- </fo:block>
557
- </fo:block>
558
- </xsl:template>
559
-
560
-
561
-
562
- <xsl:template match="csa:formula/csa:stem">
563
- <fo:block margin-top="6pt" margin-bottom="12pt">
564
- <fo:table table-layout="fixed" width="100%">
565
- <fo:table-column column-width="95%"/>
566
- <fo:table-column column-width="5%"/>
567
- <fo:table-body>
568
- <fo:table-row>
569
- <fo:table-cell display-align="center">
570
- <fo:block text-align="left" margin-left="5mm">
571
- <xsl:apply-templates/>
572
- </fo:block>
573
- </fo:table-cell>
574
- <fo:table-cell display-align="center">
575
- <fo:block text-align="right">
576
- <xsl:apply-templates select="../csa:name" mode="formula_number"/>
577
- </fo:block>
578
- </fo:table-cell>
579
- </fo:table-row>
580
- </fo:table-body>
581
- </fo:table>
582
- </fo:block>
583
- </xsl:template>
584
-
585
543
 
586
544
  <xsl:template name="insertHeaderFooter">
587
545
  <fo:static-content flow-name="header" role="artifact">
@@ -607,11 +565,21 @@
607
565
  <xsl:text>iVBORw0KGgoAAAANSUhEUgAAASEAAAEhCAYAAAAwHRYbAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA3BpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMDE0IDc5LjE1Njc5NywgMjAxNC8wOC8yMC0wOTo1MzowMiAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDplYWRhN2RlNC04YzAyLTQ1N2UtYjUwNy0zNGYzY2RjNWE2ZGQiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6MDUyNzBENDc3NjVCMTFFQTlDMDhGMEI2ODhENjUxQkIiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6MDUyNzBENDY3NjVCMTFFQTlDMDhGMEI2ODhENjUxQkIiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgSW5EZXNpZ24gMTQuMCAoTWFjaW50b3NoKSI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ1dWlkOmZiZjFiODZmLTIzMjMtM2U0OS1hMDMzLTVlOGQxYThlNmI1YiIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmlkOjFlMzVjZTE3LWU5NzAtNDQ1OS05ZjI0LTM1NzcwZWYzMjNjMiIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PpxYC6QAADYxSURBVHja7F0J3FbT9l59SWUqMmTOlMoUGRJuma/pmq9ZoZCZ6JplzjXPXFO4hrjGuCLckChkCA1ErjFFEWWq/uf57/Xe3r6+r2/t8+59zt7nXc/vt39vPvtM++zz7LXX2Khxn9dIoVAo8kKNDoFCoVASUigUSkIKhUKhJKRQKJSEFAqFQklIoVAoCSkUCoWSkEKhUBJSKBQKJSGFQqEkpFAoFD6wkA6BQoDFkrZEWVskac24AY2TtnjSppUd83PSfk/a9KT9yO2HpP2iw6lQElKUv/9VkrZ60lbjtlzSVuDf5ZO2DJOMK/yWtElJ+7rsF+3TpH3C7aukzdHXoySkKA4gsbRL2jpJWy9pHfjfqzomGAkWTtrK3BZEVB8lbUzS3k/a6KR9yH+bpa9TSUgRNhozyWyatE24rR/Zu16YSRJtn7K/z0ja20kbkbQ3uE3QV64kpMifdDZMWjduW5HR2xQR0EVtwa0EbOmGlrWxOiXiQiNNahYlsJXZOWk7JW0bMkphxVxSei5pT/PvVB0SJSGFg/fE26s9krYLGb2OomHMThom+FNJe1i3bkpCCnvi2Sxp+3JbWYekYkDJ/RATkm7blIQU9WCtpB2StEPJWK8UfgAF9z1Juy9pk3U4lISqHXAGPCBp3WlepavCP/5I2jNJuytpg/i/FRlCrWP5Aqb0Y1jqCUW5/BMZZ8FvytoUmuvxPI3/PZv71vXRNk1a86Q1SVoLmutpvSQZ58eSQ+SySVuR++f5DezGDc/9j6Tdxv9WqCRUSCBeDwrmE5LWNad7QEgFHAE/SNo4MgrbksfydzncDwhpdZrrud2eCbp9TgsliPXxpF2TtFd1yioJFQXNebvVJ2lrZnjd72muY9+bZLyPQTgxhEVAkmpLxhoIp0tYCDci4y+UFfCBXJ60J1j6UygJRYeWSTue2zIZXA9SzVBur1HxzNJwzlyXjFNmV/5dLoPrjk/alWR0R7/rtFYSigGLsdRzMhm9iE9JB055UK6+mLQvqnCsERe3HRkfqm40N7rfF8lflLR/kiqxlYQCxaIs9ZyatFaergE9ziNMPHiBGtQ577a3GxPSXmQyAfgko3t0m6YkFAqgQO2RtAuT1trD+UuOdo+SUSgrGgaMAHB5QBDsnuTH4RPvpS8vCAolodyAVfcyMlHfLgHzOJzp7iajUFZUMNfJ6JCwUOzN22WXeCFpp5FxglQoCWUGeDdfn7QdHZ4TWytYYu5I2rO61fK2ZcZWrWfS/uTwvLA4ws/oTDK6OoVQXFXYAybii1kUd0VAyC54PplMh1ip/60E5A3wk7qXJSOY/28i43jpQto6iowlrZd+XyoJ+QI8a29gsnAB+O5cQUbRrNaW/LA4b9VOSVobR+ccyaT0jg6vSkIuAB8f6GeedERAkHS2JuOEN1AJKHdM5601ttiI4xvl4Jyb8iIDqbmpDrGSUCXApESO4wMdnAv6Hnj9Qpk9VIc2OGAxeDBpncgkjRtR4fngXAkd0btJ66LDqyRki1a8Tbo/aUs7Ih/EjakFJQ4MTlpnR2S0dtKGkbGiLqxDqyQkwfZJe4+MFaUS/CdpGyv5FIKM/kLGUTQtoLjuy4TWXodVSag+YO9+NZlQiBUqOA8cCqHERg7ot3RYCwHkG0LcWm8yuazToiMZndNxTExKQor/AakkhiftpArOMZUnKSbaUzqkhQN0RreQyYSArVXaYFbEt13P2/0W1TygSkJzsQdLLBulPB6OareTST1xC6m1q+iAX9HpZGq6PV/BefZkqaijklD1AtYL+Ok8RibtRhrA8rE5GQe1KTqkVQUkzIf+8K+UPhsjJPDXk3aEklD1AelGERrRJ+XxKFd8NhnF8wj9HqsaqOCB2ME7Ux7flCVpeG83URKqDiAHDTxat015PFzNNyDjiKZbLwUwjaUZSEYTU56jNy+Mrapl0KqVhHZmySVNmlUQzhlkMvpp7SpFXYCOaL0KpKKteYHsoCRUTBxJxtSapl47fERQkLA/aXCpYsH4iaUiBCOniahfnaXtrkUfqGoiIfhjIOHYrSmfGykaYDkbpd+XwgKPslT0YopjsVAOSdp+SkLxowmLxmenOBZpHw4mEw09Q78pRQrAarYDL4JzUsxdxLL1KergVAMJweoAh7AeKY5F0Coioe/T70hRIbB9P5dMHFqa2m5XsBpASSgyIPkYcv/uluLYfzEBfajfj8IhYPnaMOW2/m9Ju5EKFupRZBJqwfvprVMcex4Z57Of9ZtReMDnZKyrA1Mci7Lh8CdqrCQUPgEhANU2fwt0PrBmXEBxVChVxAvMNeSpSqOnPJxMqaFCEFERSahEQJtaHvcNr06P6vehyAhY6C5mqftXy2ORYG9AEbZmRSMh6ICeSEFA8P/ZnNT8rsgHCPmAl/U0y+Ngtb0pdiIqEgmh8iZSZ9g6dyF1BwrkTdRvQZEjXuF5+LnlcUeTKbygJJQzsDeGGd1WCT2YV6Dv9BtQBABYYqHH/MjyOCir+ykJ5YubyeRlsQG2bbuTOiAqwsIXLBG9b3kcLLpHKgnlA6wAvSyPQeJ6WMF+0zmvCBCTWa0wMoPFOHfEXvwQZXxvS0FAh5IGoNoAXufNF/CL6hGLWPwiPzN8uFC/XV0h6kcaS+8vZNLTDFcS8o9u/IJsEkApAc0PeO8i4TqCLBEw2aysNeVfX0Alkv145VfUT0RDyS7967dMXJ8pCfkDqmQiHeZSFscMYlFVCWguTkzaVTlvy19N2p+SNltfR71A9V9E4a9rccxoMrql6aE/XIw6oZZMKDYEhHidfZSA5sGWSbsmgDmAD2VnfR0LBCRFlI762OKY9VjyD96rOjYSquGBXdvimDfIFDBUJfS8ODmge1ESkhHRjmRX72zXpJ2vJOQW55BJhSAF/C1Q813N8HVLIKGgs74OET7h+f+jxTFnUbosEkpCdQCrwLkW/SfxMar0rHtLu1xA94PaXYvoaxEBpcSh27Qpuohg1zWUhCrDKrwNk94vzJRwRPxU52ydWDuw+4HeYmN9LWJASd3bctFBfqzmSkLpsBCZ9JY2imikOtA6YPWjXYD3pFsyO9yRtCst+ne07K8kVAbogTa36H9R0h7QORqVJKQklA7ItPiURf/evEMITsoIGTAj2yR9epLs9EYqCdWPmWQqjMDPZFbZL5Sis8t+fyDj9Vz6LaWjKP8dI7imkpA98D6QV+jNpLW1kKBgMf4qlIdYyNE5ViP7yF/JPvY+C2ltQtK6k4YBSCCZsCCOkxxdb4SAhJYno/v7r74eK2Bx2IvHeFFBf1R2vZuM0SYIB9FKtmMgnx5kqpAiBmhhx/d2DU9KCWbyi5imc7JBNLYgIVd4XbdkXvEB2QVxb0d2iu3gSKicfO4iY/pbmYwy2BV2YalGCuRTeU/noghtSBZvN15JKCpAD2qT3Owy3sFERUJ1kU85znQkDbVgXYQU2LIN0DkoRnthv7EOr4k4JonDaJYkhDisf5IJ8vyajD5xm8jf7akWizG2bigImntqWAkJNWqAfEpwJQ2hyNsKwr6fshSkkEOqwBzn8JpQoL4h6LeRh219XfMZ1UyRT/wg3vK3JuNVDLVCv4jfLZLlo4LHL8L+3UL4fiQkNIdJSOJxWak0hEHpaTGxMYl+VF6xQjvhOx/v+LoSvy2kDuno8dkRjf40L3T1bUmRofAaijd5PFLE2sQFXkrGKBD8dky6OlQiDWFS3GTRH/5AMeYhwbb2WDKJzSeSSWWBSdMso+tLfIRgoZrp+LrSd+VrS4ZEX++SLPbwRN6qxFrX65ak/VvYd/GkXR0DCQ1N2kvCvmmloT4W+gpMposjnBzQdyGRFxSI8IFalUxi86t4L981g3uQSELjPFxX6sHumoQW4rkyxHLFh/Q/MIPtoS8g3/QPwr5ILLd96CTkWxrCx3iOsO8fPEF+j2xSlGqibVnP/1+LyR5K+Zae7gHnXVbQb6yHa0P5K8n055KEVuHF88yU2yvkIR9EcQbXfkl2fl438HY4aBLyKQ1dYfGiL0naO5FNCIzFQ0JJpxfv6/fKaSvmSxKSSkOrCYmyIezFEnOXCs+zA5k0wi0iJKIBFtuytpRTjilbPyEf0hAkg30sPo5LIpsI0CsglcIuFsdg2/AImZLULpWG0sDVsZ7GIgt/IejWbubxcyVRbsGL8DIREhGKI0rzaZ3paAHwSkKupSGIyDaRvTAn/hrRBGjEH8R+KY9H3pgxLB25sNbkLQn5JqEOZFwBjvZw77DawZiwUmQk9LmF8AAldeaZGNN4TLuUhuDTIC1ngnxCL0Y2AS4n+5potVFy3oRCe60MJKHprE/wAfjmSHR5aUioJxPQuh7fJ0gc1sw1I5uH1/AWX4JeTOZBk5AraWhhi60VfIFOTXGvC/GquEoOLx7R/30cng/6JHgen0HpA48ljorjPY4JpNi3Bf02Ibl5HCSNfFOoP5eFAhlzaRiZRPKxAMQvjRXDuP89dBKylYaOXgDjrio8zwVkrCs25NODdRs3MxlmieOTdqGH8zZl4kbqBttMhHkErtYFiXJ6saStI+i3GZNa2u0uMj9AJ/mC5XFIjfsyXz8W4H4HCvvuQhmG0KQlIRtpCCt37bSSzUmeJwihGdenIJ/yEJPDM5SGUFzxOs/X2IA/5istVv82lH3gal2QOi3CUrN6Pf8P+rG+LJGkDcK8l0yYCLZXqPbxhOXxLZm8Yoo3O53kOtULQichG2kIcTlH1frbUfx3CTDZGirX01BwbZOMpKE9+fpZvbtTkvY+yRzNNhSeNwRJiPh9IkfUcJaaS7lyYL0ZTCYKPM229GdeKNB+4r9hfu3NxGQD3NMzSftLJCQ0MWnXCvtiTnXL4qYqrcA6lGS+L9/wqjaTRe0JJDMFDmdxec4CyOdglqoaim3DvhgKRV9Js5Cj5d9kV5Z6JBMJPKY3rfD6SFQFHdR3tSQGhCugzPNuwkUHUpbvtCgoU2xr7p7O24ndKH2lkNLW7aMFSFiQuo+1PC/iGJF65r4IiAg6NBRRXFrQ96UsiKjSHNNS6aJcGupFcl+Ev9VDQA1JPnXBpzSEHNhPWhIQJJhdeTuA40/iVToturMUsz+/1/35o0O4wu4kD1Yen8GH8HqKY2A+7lkBAV3H4/xRA88Pwrb1RYO+DWlBekdAQgjlkIY8QcDYKnRJiFg03lEoDa3NH9/Kgv4o3fznCiSfrKQh1MyC/8gSFsdM4BXmi1p/h6L+ljqe2xZThCtdXeJ6FomuzqTsYv8gGR5GJvzCBn15y5fm2S4NnIia8xyUOMI+zYtlsJKQrW7oZiEB1T5vGsknC2kIfjsvWBLQl0zaX9Tx/xBbtRMT7ZQK7mvplMeNzegjeCWj68Ai1DEFAQEwU8Oya5uHGVJUfwo7FQjUIlLFMyxlPn2vnJDQ6yy1SPBXYb9BfF5X5FOOw0muFF8Q4Dn7H8sPfgoT0IQG+kG30J5F/CzxdkbXeZUlYl+YzYvYNvWQvRS3Ju0Qsg+WhhrhJgo7FQhSlXxuIRUGTUI20pDUmnGJB/IBoGjbgbeGlQBK1aFJW9HiGDhcwhT8gQVhHcJbs88ymJRQrt6b0QcAkti/QmlvQZLm1mTCD2Y5OB889fch+/xKR/PWOlT8ZrFtPIA8hqu4IiEbaaghfMgSgEvyGcETsxuTRyVowVswm3vDBIYZ940U13uWxeFryG+JFqx2YzL8CD7grRJCUqY6OieMAxvwNswlnmS9yHTL43pS5fo9nxhAxlIpER6O9nUTLiuw9nN0ng6OyQc6ls4OyAdYhEnBxmUfovy+JHfurAvwZ4HzHqw7ox3PAaRFgfXsqhw+AkgtR7FkiQXi2pRSKlb1E5K2B83rouASiFvcPsX5Dw2YhGaS3G8IVm0vCd5ckpBLacgl+Qx2dM6FeUW0cdWfzVuqpx3dA/yKOpFJAFdJNoHvyaT03JDbkzm/r1lM0iex2I8t87/IJLBrCOP5ncC/Z04G8woStU0I0VoUNqC7kriGLMuLadAk5FIaCol8AFg64Ci3bQq9wEDHzwjJ6iLedthamaAMPpw/9FMozORwIKQhPOFX5metT/q4m0k5y+cYTfNHACwIkwMnIRQMvU3Y97gYSCgvacgX+ZRwLIv6NjjV4uWmAXL+dGWia6jiyBu85YJP013kPom9L3zDUh/8p45I2mMsMd3OW6MeNDf0Iis0JnkqYnIoBfvEjQIpEg6Ft/q4uAtnxdroTNlVwRjB0tdgz9eBsry9Rf+LLCdqpYCVDh7BtVPCjuH7eDSDrUq1ALo5qf4M4RHQH/4SwXMhBq62Eh3e1bCY/oPc6yK9khCR3Is6dPIprXx/WPSHbuKEnCYS0l8gp/LCrCuBFW+28oYztCFj1ZNmLoD+aGgkzwbrX8mpcxgTD1LkzvB9YV8k5EsaypJ8yvErySwD+ODXpWxN3YrsAFXDDsK+2IofGdGzQTWDwo8DSZ6F0dmFfcC1bsi3zqchvGwxnsjy10y/18LhUAsCgvWsb2TPN5tJ6MOsL1zj8dz9HJyj5MOSF/mUcK7FtgbK3yv1my0U4MdkU6UUVqRpOmz5k1Al0hDIBwnCkPnuyQDGCVtLm6jvY/j+FcUAHPqWEvaFBe9RHbIwSCiNNFROPo9TWBYdxCINs+h/B+WTYF/hFoj3O0DYF9akY3XIwiIhSEMSP4mQyaeEWTwZpXFOS5IJflxIp1m0QCI1myDU08jOm1qRAQkB50ROPuVAWojDLPpvQfl7kSvSA9kcpPmvSk6UigBJCDlqnoicfMqBZ7nRoj+qjWytUy06bG6xtYILRy9Sh9BgSQg4vwDkUw6EZLxrMcZIUra0Trdo0JSlGml2REi7H+mwhU1CkIa6FIB8SoAbPpJySRPTI5fv3RR2yk/FvNKrtBQyFqMrdMjCJyHgtYKJq8j6eLxFf1hZTtYpFzzWYRKSAMYKJC77Q4ctDhIqIhCRfr9FfyRA76TDFvT3gHALafIuZLt8U4etMqj5uHIglQaSaklrnyE2B4nEpkf0jM1ZQkAOI0SFo5AldFyt+LcxS7lIlgYXBlgRkcz/A/5IP4xEWoAienNh30/IeNIrKoSvANZqQyfebkqLH0J6OijwZ2rLW0jE7CFvUdMKzgUnPqRHRYVaWBdDTPS1CpPmYsL+yGf0vE593Y6FgreSdrpF/wPJzt8oKyBFBSq5ImMjkqYhXmqHCgkIQHGAPXmr8xUZ48Tugc2/GywIaIASkEpCQY5l0p5i6UECWNY2puwKDi4I+PgQdHkqb7GyAp4dVU7hwvB7js+PoGOpy8UkMpaz73XKqyQUGuawFCF121+U8k/7AZ0gErBNJFODqlXG129HRrn/Pm/78sLGFn1PVAJSEgoZKOYHXY807QcUvf1z/PBGkYkQb5XzuEH/BH0RMvstn8P1pdYw5LN+Uqe5klDoQGnoSyz6QxJZLeN3fjaZ4OL1Ahs7pBhFLuO9Mr6uNH/yYiztKpSEgkc/MvXWJYAuafuM7qslSxwXUrh10iGVIbfx5Rne43CSlw06kzwVAVQSUrgEPGlhAftB2L9FBvfUhqWfHSMZw1N5e7ZIBteCPk+ajhVR9fvpFHcHdVb0h2kW4/uV53tB8n2kx13R0fmg+4IJ/1v+969MpGjQ6cB6tKiD60BZjYohf7Yg9LRAwUWY3bcT9IVy+l6d4kpCoeNQ4YeIwoU+lZ1rOiAgkOTTfB74dDRkAcQWE3quLkwgu1Yg7SG/+HO8Zf3R8zs7R0hCcE7dg7e2v+lUrwzqJ+QPo1kCaQjwkznd0z0sz/qONimPh9/TzWRyhc+q4D4Q9gFlMwJ+N6tAUtk1g49+KBkPcQlgBZ1IpsQT6ryNZQkRv5P0E1ASyhNIWfKWoN9vTBA+UoLC/wilijZJST6Ii3rbw31tSyb1RccUx8Kn6HDP7w6S2zMOzvNDGSGNLSOoj1V60u1YFjhQ2O9h8peT+IYUBIRtF4I4H/c4Ni/wdqY3S4E2uqPDWLLzmUb1WZZq2lZ4Hmw/N+VWjlm1pKdyKepblYQUlWIp3m7cQTKnu63IroKHFEi49oDlMdBvHEzyRP4usFbSHrKUipBQDo6WH3i8L/huXZvD/JnGpPQyLyJfKAkpGpIi12fS6czNZvWEaN7Ow3215g90KYtj4Fx5DuVTtx4m+HuStrfFMSPJpNzwdb+tWCrM0x8IqV6g/H6xyB/RrCs31+2YBVZgotmMP4BOVJkPy/2e7vMySwJCFsH+OY7rDDJ+N7eRPLMAtjgIuL3O0z19R8ZHae8cxwXlhh7jharQZYRUEqobUOpuVCbhoK3s+BownU9wfE7cM5KISXNZ501A88xFMtH0NoUGV/O4fQTR4ePI26EX9eEvKKoUVNpSKExWxJKEg98NPY/NBx4ICLjSgoDuDIiAAHgt92Cy31LQH4rfv5E/94aRLG3dkDMRbVoNeo1qBCYwAhG3Z9JZJuPrP+HhnCi02E3YF6b33gG+l994a/aO8J2cyMTrK1MjfKTeIFNTrCsvVll/M4sV8QMsSUHVSkJYWWCCXj7He3jQwzlPEvZDiMVBFK6vChTCPYVE3YwJ4hKP9/MmzU1mj/S9yK8NPc3a/AtjRHuy08NVPQlVsyS0FE/u1jnew60kTx0hBfIj7ynsezEZM3DIQBjLoyRL6XFM0v5O2STSR/bHcdxqAxa1DmWk1JZJCqTVWL/RuqWgaiShnjkSEJzUYM3p6+HcBwon+pe8fYkB0PfsRg0XD0BMHOK9Bud8v7CovcKtHLj/NVlyas+/JSmqpUpC1UdCW2RMOpB4kD4DVhbEPvkyte4r7IcUrjMieVcIb0CYxpHC5x8c6HP8zpLnGJrfE/2f1HDVlcJ/o9VGQj7z9nzNhDOCSQexYz9n8EzYim0k6Adv3AGRva9rhSS0J/ebFdnzSZL7L1r0j7LaSMhVThood0cx6ZTaf3N6pj8L+92bESm6BIomvkQNR7UvSSZf96gCzscmRf8oq42E5qQ8Dj49I1nCgaTzNuVboqYcUj+ShyN9Zw+SLLXGnyIkIcl8LLwkVG3pXSUrD0R6RHpDfwLF6HJkFItQ/l7PZPR7QM8kKVsMP5pXI31nTzkchxjnY+EEhdpRGioJzQ+kK90ukudBZdT2gn5IfzE70ndWqmu/RgP92hd0PpakoZ+L+lGqJDQ/mkX0PFBKS8I0RkT+3iT3D7+cxgWcj0Ch9ULVRkKSlScmEpIG1Y6J/L1JSmVDKly2wJKQklAVSUJNI3qeFYT9Po/8vUmDfZcq4HxUSagKJaGYpCEpYU6O/L1Ja78vVdD5qJJQgSAtGRMLCS3u+LlDxS/CfqoTUhIKHlILUTNSKFQSUhJSSciZhLBk5O+tiePxUElISUglIUeYIuy3TOTvTWoF/KmgktAiRf4oVRKKm4SkdapWify9Se8/thI5Uklo4SJ/lCoJxU1C0tQgG0T+3joI+qBEzjSVhJSEVBLKFp8kbaag30aRvzdJHqiJET5X1UpC5fFjKgnFTUIItpVUIu1GcTlhlgMxYxKnzFERPptKQioJRU9CwDvCSfynSN/ZHsJ+wyN5ntb8TCi3dG+1SkLl0lC1RdEX0U8IaUd6CvodSibFbGzYL2ISaspb4fKadqumOE+hJaFqI6EiSkJDmFwbkmr3SdrxFJfyFh/tJoJ+Xwm3pb7Rpoxs8NvRkRRTWOsYpCGVhOInIVR5GEENJ/XCM6E2Wb+Inq2PsB/KA83J+N5QBWPjWqTjK4pfJaECYXoBSQi4j2SZBUFC10QiDXVk6U2ChzK4HxTL3JHHuXPS1qXsdKo/FfmjbFQ71WLBgTpPU4US00QyeXjGk8lnM45/JwX6XNiSNBf0vYG3ZaFjKMlyS39EpoaXr8yRCIpFhddTcly0UczgWZWEqksSwgq3Orddav2/H8oIqfQ7nltepZWnsTTQXdD32KQ9QGFbk3oJCQi4lvymrr08aSfnOBYoHTWkyB9ltUlC5FF3MKuW9FQuRX2bwXPBq/h9kqV7/YT1GVMDfD8oKgC3A0nkOO4fcWW+8i+vwZJWo5zG4kPeAn5R5A+y2iSh0v7aR2ndxjxp16hHUoH15mkyFTt+8jRhIQ1JTNqQ8O5P2q4UVsFAbCsHkTx1xVXkNwH8PjkQEBYsGBpQZeRuMjXuCo1qlIS+IVPGJy9gZd3G0+rWlslImtzrtqQdRdlblupCMybpbYT9kbIWNd1nerynl5O2lcfzo3QUatiVF9H8tNo+yGqUhN6k+fU8WWItlkJ8eDCPZ0nrJGH/XiwJQU+UZ0mgRXjl39rimNM9ExBSxXZxfM7PaG6ZcPyOqgZJRyWh+bFt0p4P4D4255XPNZZI2ntk55n7WNIOTtqMHMYBYQyPWH7wQ1hX4lOC68mSYlpgLN8ok3BAOl+TQiUhMmEOfZN2GeWncAQO9URC8Arvwc8p9WPZk0yF1gNIVl7HFbZM2kCSVw0BpjFB+N5CHmDZfywTTYl0RlNY+jaVhAIEvFyPIVPLfc0cCBmezsuTv5LS/ZJ2nuUxM3mbc1PS/vD47FA8X5y0E1IsBHuT8ZD2CUiRnwru7We+H5QGn6p0kg41VfzsWLXgV4PywXDyg5Jz96SdlrQ7kzaMicIXWiVtL4/nvyBpT1oeg3GA3827ZPRmriVFxED1TtrHSTsxxfkvyYCASlsxyb1hfJ9VAlJJyDegoIQPDixP7Zis8Lu6A+kJ1peuHu8drggvkiwItC7A7+g6Mqb/Hyq4D/jyHMEf94opzzGQt0i+t2EgyokspTaEv5BxKVAoCeWCJkxE7cpaiaBsqlt0ZMnDF5ZhIlq3gnPAE/w5XvWx9Xi7gW1kK34u6Hx2ZhKsRKrCh74PZeORfkjS7hFup1eg/LzklYQUC8TSSfuXUMrBCr+/5/sBEcGi5CrXNMz5iFWDrxNMzDNYgliWm0s/LGx59s3oY2/EC8J6gr5wlOyjU11JKGQge95jgn6zWHr62PP9tCBjCt82ojGEibw3ZWdlQi7rYcK+eGfjdJpXjhodAm8YRDKvaHg3X5DB/UCnsxMZZ8bQAcscgkaPpGzN3NKCAAitmKhTXEkodODjuUHYF9uxDTO4J+hxYBaHFXBKoOOG4Fp4k1+T0zuTAFvO/jrFlYRiwM0ksypBF3F6hvcFPQv0Ho8HNFazWUqD3iovHcGbFn0RGrOrTnElodAB7+UbhX23z/jeEMgLT2noiEbnPE7P8lYIUlqeWQRh+XvJov8AsvP2VigJ5QKpX0uLnO7vRd4KHkTZ1+56kbdeyBz4biDvCw6s0vS3cEVAat3GOs2VhEIFtjx/E/b9OMf7hC4Ekf2dWDJC5kVfeXrgXwPzdju+1iuBvTNEuve06N8taWfqVFcSChFYHe8guVf1PYHcN6STA8n4FiFB2l1Jm1ChJAjPa6RJRaoORM3DvyZk8zZcGW616N+PjGOmIgXUT8gfoLi8WtgXeYCgkP0l4OdpzZLSmtxWIhMWgmBU5AOC5Q0Wt8lkTNgTeIuFtCIxVotAHB10RFJP8y/4HX6vU19JKAS04dVfmqYUntUv67AFh3XI5ARqLuwPa+OeOmy6HQsBt1oQ0D+UgIIF8oKfaNEfXvLH6rApCeUNBEDuIOyL+Ku+OmRBA6EjD1v0v5LcxegpCSmsAWXu1Rb9j6PKUmQosgFycU8U9m1KJih50QI9P4wr6/o6uZKQWyDUoJWwL5JzPaZDFgWwUCCXkTTbJFK6XFcQ8ulBJnXtUPJTKktJyCEQHHqgxaRW3UFcQN7osy36H072eapDJB+4aKzBi+txSkLhAiuEjV/JqWTCJhRx4e9kV5L5Vqq7GGZM5FN73jr37FcScgPkPl5Z2Bdi7R06ZFECjpcwPEjLei+etAfJJHyLmXxKgDR0spJQeOhsIaYiC+GRFEbFU0U6TGIikmJjXqRiJp9ywAm3pZJQOMAKdzvJ8yf3I1MGWhE3nuOtmRQIU/lz5ORTQguSV/hVEsoAZ5DxqpXgnaRdoUNWGEBJPcKi/z0kt5yGSD7epCElofRAvTJp9DSi1OFr8ocOW2GAWDlYv34U9ocP2ck53Su+8/0dkI8XaSgEEkJQ5JGRTcAa3oZJFY7wH3pTv9vCAVVaj7fov3VO5IM4xgfIraXOmTSUFwktQaYE8yj+OJGLefmIJh8qQHSxmKjn6vdaSGAROtCif/OM7qs2+bT3cA1n0lDWJIS67zBPf00m7WkpuXuTiKQhpLC41KI/nmuGfq9OgVrxyN+NBGRIvvYeb42bZXgPyBeFrIo7WhwztgDk41wayoKEkGsG3sFQzEKRdzj/rTaOYjIKHeeQ8f+QYEDSns/pPlG+enMyIQRF0f1hwiM5GhKiHZ20VXguIYPlxWRyZXfL4D5gDUVg6z6Wx93q6X6yJh+n0lAWk7MxSw4NRRZjOxZDLpa/CPvNzmkbthxPRCQXG86rL7aEfXkbHCNQ0fYiMkGk8NptWk8/JFv7Dxl9XUuP94P0tIdZHoP7f8nxfeRFPk6loSxIaDpLBBKcFsEH0dpibAdStgnsd+Ctyf613i0khsuS9l/+XT0S8umQtJuYfM6yGMsjmHz39nBP/VKs/rc4XpBCIB9n0lBWmRUxSB8K+26XtBcC/jCQinUti/7v8TNN9nhPTXilleYmgsf2c7w4oAZZSDqrxXmb04NMJY5KgWyH8Gj/0tGqf7XlMSggcCi5qSQL8vkrE1r7gN4ZArLbkLxKSeaSEDDGglhCT/J1r2X/9ZP2KhmFtg9AqhlmOW7QaezIq+i3/Lu/5y2MhHxgJUVYxJ2OCAjYgxfAo0ju2V4XDk9BQIOYTCsloEb8HG87lnyQQ3tq3tJQljmmdyd5xc+NeMBDRDPe229qeRwSocNPxGVpH1TDQHpYV7oeOFMOJlMN9oMMxxQJwIYzYfsEygvBadS20se+ZAJRbRZt6KZ2SdrMCskH3815SevocBzeYWmqNc+fXKWhLK0mgyxe/nkBS0K/sO7lVcvjVuIPbT0H9wCL0G38YbhUNsOtH6WNkdy9S4ZjelYGBARsRaYCyFkkt8Qi5us+y29lJJPHzArvF1V5H3NIQCCfPXmRf4bkNfG8SkNZkhCsRdLYKbzADQMmoh+YiJ6zPG4ZXo03q+Da6zFJ9PT4fHCqu4fkNdMqxcEZvjtY1qA/eytpmwhI61Gycx2BshgJ7qY7uNchTBwuyQe7kTk8f6Qe1M8K+6WylGXtP4KJ/bWw74UUNqDM3Y0nqe2KAVF9mxTX7M0E1CGD51uDP0LfWJLkuZhcAmSObIlXU935oPHBPkV2Xs4TeHFyVXsMZHG+Y/IB4OktjXsEAZ1CsvQzqaShrEnoN5Ir97Cf7hw4EeF5YK0YkELSGMwSn/RDRVXQm6h+Hxkf2CKDa7RLedws3ib1p/SBwTX80UB6Kfd8bs8fn81WF9a37SwWWSmeSCEN1Uc+JfSyIH6kLIFi/yFf0lAenrRwt/9O2Lc/hQ98DLCc2CY2b8JSVENbkS48qfbK4dmyWATWtuz/O5N+Ox67M3jrPqKCe2jDiwIk9U68DVra4vgprL+Z6GF8bKShhsgHQCric4Tnw5i+yP++wEIa6hs6CaEksFQ31NVCWsgTeDknpthCYvxh8j+2nv8HBSoKI66S8r5g6kapFnisT46chL7kjwcKfngrf1xLD9OFV+GfK7gXZExEQPWKFsf8yFLUGI9j1JA0JCGfEmD5XE543dPL/m0jDZ1gQ+J5lYFejCeRZDCQiXAdXgFjQB9Kl7wMhFNKA7oCk9M2Ke8BSlH4xTxQ9jfoAfZg6WFHkqchWYvcuhXUxmN8Xw196K2E2y4Et8JDOYtMhjNZBzQsg2vtQfOXiHqHpaQnhFLKSvw9SQJ94YbSrdbfOjDhS/ytLqtFYkFJQiVpqL/FR9Cb4sGVvOeebXncxbz/3pknV1oCeoO3Jw/U+vtvvJIh9g1xetcGIg1JJKFxFnofRNbvxFLNFI/3/TtvkYdlNK/KpaExFpJPOS4leaaBusJMIA0NFB5/nFQayksSAprzCruCoO9U1gF8GxEZ7cfSTJaZASCBnSmUGrGqSRwSbyJ/NdLgAjBDMEYYx0NTnB8fwdXk3gVgNr/ff2U8p7Yl4+bxUIpFDhkVhgv7DmYirwsIEkZcXmNX0lCeKR5mktxMuCTZJRYPAQN5tZqZwbUm86Q5zWLbOpZkviybebzvNkKSHp/y/FNYItqJJSRX6JUDAQEIfXowBQEtxFtUKcEuyIkRgsM/XUpDeeeZwQonDc/onrQtIyOip/kD+NHzxNyAVy/b1fx1Qb+O5C8joDQGqlKlL8ZmXd6Czq7wXMgTfWdk8xBkIPVIRw7q9xroA2dPSTwc/K9ODZ2EMCH6WPS/hbLz4nUFKPi286CfwCSAMhuK0bS+KSMFfSB2d/I0Nm2F/cY7uBb0kLCewYr2fspz9COTLzwmQN1xgbAvLIsS871TaSiEjHvwHh4k7LsOuY13yQpQFiN49UtH50NeIESZX1Lhyi7VEWyeoyQ02xEJlQDfFyh0oXj9zeI4kM/5Ec496PSkmUAvs1jQnElDoaT9hIj7q7DvuSxaxwasvt3IuPZXgkd4izTcwT2NFPbzpReSWMY+s5gbUkBvdiFvYyXWLWy/Tolwzh1Ecj+7T8ikzpXCmTQUCglNIHmpXPi3DIhwW1Z6cd1SbgcQvQ9XBST8murofrBFlFSEzVMS8pkcfixLlKj8Up+SHnrLGEt3I02HjRf/8TzHbOBEGgopAfplJHeK6xTptgxAXqFteIsmBfwzkL/oFg/3I5GGoFdwnZQNifglFUnHeX4fIBeEEsEF5Fq+HrYkQ1mS6E5usiLmsQ1bStgX4UP/TrmoViwNhURCELlt/FHOI38KU9+ASR2xRpLE50jajpQToz3dS156IWng6tiM3slXZBTX7Zh0ocO7P0IJCEAso7RoxAyqLEd0xdJQaKVgnuMXLwH8S+AVvFikRIScRPCOfqqe/w+zPlKu9iK/OaDz0gtJY8bGkcIGbS23YbCwfl6hikEiDcHb+5UYSAhA8NskYV+EdFwT8YQBuUBxeDSTAVJjwvKF+lRQvg/M4B4wOSQOlXlJQkpCcjThRXxRYf9hZJ/9wVYaKg+ufToWEvqOP0opjmCJIVbMZtKBpAHP8FX5+T/P6PqIyRol6LcRuQ1BkUhCkAa/JoUU/S1UFDN52zbbwXXrkobEkf2hVuZ83GJbVtKbdNA5mBoSvRACH10mW5cGripkQDCtjRsBnBI/cnj9kjRkk1YkaBIqbcu+EvaF+An/mcV1LqZC1nohuFesKeg3Vl+NCNADDbDo/7IHNcbHPD9sI/uD9rXBtgyR08hyJ8lfAh3DHWTSrSrcS0IA9EKoDdaYCT/tbwvh3Buvr0a0AD9qsQBD73gw+XE7eCvtihQyEJyJ9BTS8tCoD4XI/Et0bloBEidCShrKKHggt6wwRl/NAoHF+W4y4UxSINnd5yE9RE0EA32WJcNeTHIfCYW9NJQlVBJqeK7vbdEfO4WHQnuIGEgIcT6wfv1gcQw09RvqHLXCyMDux3XgatEAb+4zLPojgd2JIT5ITSQDDqVXd4v+qFCKyPyVdK5GKwn5CFwtCrZkqUaKn1hi+jnEh6mJaOCRY9emBBD0G0hm1VLnrAjwFfojoPtRy1jdWIcXWJv6cz0oYHeHmshewNlk8g/ZvLCnWDJSLBiIoH47oPt5TV/JfEDBwmctF1YUXngk5IeKjYRgVoQJ/lOLY1BFFJU6G+scbhDPBXIfSKtxu76OebAME5BNTTS4twSfbaImwpeBHDgoEW2Ttxk1m+5RImoQ8AGamvM9IJ4OSlcN15gL+FUh1UZ7i2Ownd2XIkhDUhPpS4H/CCxmNnEv8G9BEu9GOqfrxTdM8JMyuBaUpLB4wj/pM94K3kgmIfsgfRXzEBAk1I0tjvk+abuSnUU5NywU8ct5hkweFJso4EN48iOT3hyd33UCuph2PFYbM2nPZsmzrt/pvNpKf2Gp+UOHWQToMhF5vqnFMXBpgSVsQiwPuVDkL+l6MnXaT7U45mjelvWmODPmZYFpPLaK/LdgXSyOmcOLx9CYHrSmAC+rLxl9jw16keqIFOECSughlgQEoGDEwNgetggkNIdJ5VnL46AjeoxM4nyFIhQsm7QXyaT0tQFytF8b4wPXFOTFoX4U8qmMsDxuNzK6pRY69xUBAJlCoZOzLWmFAghnxPrQNQV6gTDt7kj2MVCofIH8KhriocgTyMWD0JnVLY9D8r/jKGJDS03BXiRMkiiL/K7lcevzCrSOfguKHABzOiIBlk5BQMi5FbWBpaaALxREhHI6tgUGV+KVaGf9JhQZAilZERfZ3PK4J4tAQEUlIWAyb7Nst2ZLkHGUO02/DYVnIAB1AJnYLtvvEBLQXlQQF5OaAr/kybw1ezXFmPydjAm/mX4rCg9ozduv7imOva0oElA1kFBpa7YD2UXelwCnL+iJ1tBvRuEQXcmEqKSp44bogKOoYE62NVXw0mE12ylpD6c4FiVukFpW08UqKgXCX04n4wPUOsXx55LJjFi4cKOaKpkAyNC3H6UrcwIfIlQzuIrsEkkpFCXAAxp5rS5N8c0hzg5FCi8s6uDUVNFEwAoCt/ZTUh6PY6HoVjO+wgaQwkdTOqsrgn1hvr+ryANUU4WT4uqk7cPbNFusz9uzE0hTgigWDJjckZ8JQajLpTgeZXn+RPbhSEpCkQDpLpFx8b8pjsWW7Fre26+m35qiDiARPZTPx6Y8HgaRTSisdLtKQh6AmtnI0/JqyuO7kSmjgpxGGo2vABYjkwIFYUBrpzzHAJ5bk6pl0GqqfNLgRcOp8ZYKRO6rmcg20G+wqoGMlPDSPy7lVv13XtAOIxOQXTWo0bnz/y8cCc6Q1zhtXSYEH0JXBD8OjcivLmBLjhAKWL9WTXkO6H+2okhTcSgJucP9vA//MOXx2JIdT6ZqaHdSxXXRASn4XJ4vu1VwHtTGgz/aiGodSCWheYEE+tAT3VbBOZblff0bSdtah7SQ38whvNicT+lDeyCBoxwPTPffV/uAKuYFtmRHkikTNKWC83QiY0GDmK6+RcXAdrztRlxhJfmnsNh1JhOjWPUFF5SE6gfSK6zP4nIlgMISzmoPJm1NHdYo0Y1M8vghvHWqBPAd2oiqxPyuJFQ5vmZxGTmsK6nhBP0QwkbG8lZNySgu8kEAdNcKz4WqwbDEQm/4iw6tkpANIC7fzluqJyo8F5TX3VmfgIDaTXV4g/wmoGge5oh8UJsNVq91KV02ByUhxf+ASqHQEx1AplJpJYBkhNARWERe4i2bvot8AQVzTzIOqDC5b+HgnO/xeeD/M0OHWEnIFaDbgTcsnBRd5HVBfBCU1x+Tyei4tA5xpkC+qCt4kYFVtJ2Dc05n4oFx4nUd4gZW5MZ9XtNRSA+I2DcykbgC0o48lLQ7WUrSctXugfg/RKdD17cDufXpgr8ZKgJ/rcOsJJTZGPLWqj/Zl2tpCBOTdi8Zk/DHOtQVAzq4HmSMBEs5PvdwlmSH6zArCeUFVHJF+Me5HiY4AP0RlNmoGvuJDrcY2BLtS0aft7aH839EpvDgIzrUSkKhoCUZT1iYYhf1dI1RPOmRq+Zd3bLNgyZklMFwrdjbg3RaAuK9LknaHWSCTxVKQsFhadYNHOeRjIh1D3CohHIbKSSmVOFYtyHjgwPigVezzyBiWEZR9x2ZF9TfR0koKjI6mrKJsIeJeSi3YVS5O0GIgLMnEod147ZqBtdEAjzkGf9H0mbqtFYSihGLk4lJg+k2y7r3MD1Dn4SA2jfJ5LyJhZgaMcEgfGYTblAuL5nhPWC7e3nSBpJJOq9QEiqEzmJ/MnmqN87pHqawxIQ2joyi+1P+zWOVhx4NeXlW59Y+aR3IuEAsmsP9QMf2DJnqLEN0yioJFRlY2Y8hYzJuHsg9QUqCnmlS2S+q2SJ27kdu+HdJHwJP4PJMgHiOUmkkpDtdoqxhO4ryNyuQSXmyYtKWz1iyaYic4Z91C5OyQkmoagCTPnLU9KDKo7QV9lIPUq4MIOMC8asOiZJQtQP6DwS5It3scjoc3oBt6D3cvtDhUBJSzA9E3Hcj42i3F29jFJUBXuePsMTzlg6HkpDCjpAQn7YnmZgnrXcmB5KHPcXEM1qHQ0lI4QYIP9iJCQn+Mk11SP4HKM2fJ+NNDguXBpIqCSk8A3lwOtNcx73OVUZKU8kEjQ7lBslnlk6LeLCQDkH0+KXsAyQmoA1prmMffttSMUoQwVkQicLgeDmSG0ruzNZpoCSkCAcwMb9O8ybTgn8OHP/gALge/xsOga0DfQaQCgJE4Uw5monmff5vNaErCSkiBPQkr3IrB7yRyz2V2zAxwYFwOf5dwsP9wCnwWzIhJXCEhIl8IhmPbbTPqMpKISsJKaoVP7OE8f4C+jSlud7OJc/nlvz/mlDdYRU/sjQzi+Z6WE+juR7XGoOlUBJSWG3vJnNTKJxDE90rFAolIYVCoSSkUCgUSkIKhUJJSKFQKJSEFAqFkpBCoVAoCSkUCiUhhUKhUBJSKBRKQgqFQuEF/yfAACbVBNmSyrCxAAAAAElFTkSuQmCC</xsl:text>
608
566
  </xsl:variable>
609
567
 
610
- <xsl:variable name="pageWidth_">
568
+ <xsl:param name="svg_images"/><xsl:variable name="images" select="document($svg_images)"/><xsl:param name="basepath"/><xsl:param name="external_index"/><xsl:param name="syntax-highlight">false</xsl:param><xsl:key name="bibitems" match="*[local-name() = 'bibitem']" use="@id"/><xsl:key name="bibitems_hidden" match="*[local-name() = 'bibitem'][@hidden='true'] | *[local-name() = 'references'][@hidden='true']//*[local-name() = 'bibitem']" use="@id"/><xsl:variable name="lang">
569
+ <xsl:call-template name="getLang"/>
570
+ </xsl:variable><xsl:variable name="pageWidth_">
611
571
  215.9
612
572
  </xsl:variable><xsl:variable name="pageWidth" select="normalize-space($pageWidth_)"/><xsl:variable name="pageHeight_">
613
573
  279.4
614
- </xsl:variable><xsl:variable name="pageHeight" select="normalize-space($pageHeight_)"/><xsl:variable name="titles_">
574
+ </xsl:variable><xsl:variable name="pageHeight" select="normalize-space($pageHeight_)"/><xsl:variable name="marginLeftRight1_">
575
+ 25
576
+ </xsl:variable><xsl:variable name="marginLeftRight1" select="normalize-space($marginLeftRight1_)"/><xsl:variable name="marginLeftRight2_">
577
+ 25
578
+ </xsl:variable><xsl:variable name="marginLeftRight2" select="normalize-space($marginLeftRight2_)"/><xsl:variable name="marginTop_">
579
+ 25
580
+ </xsl:variable><xsl:variable name="marginTop" select="normalize-space($marginTop_)"/><xsl:variable name="marginBottom_">
581
+ 21
582
+ </xsl:variable><xsl:variable name="marginBottom" select="normalize-space($marginBottom_)"/><xsl:variable name="titles_">
615
583
 
616
584
  <title-edition lang="en">
617
585
 
@@ -623,6 +591,10 @@
623
591
  <xsl:text>Édition </xsl:text>
624
592
  </title-edition>
625
593
 
594
+ <title-edition lang="ru">
595
+ <xsl:text>Издание </xsl:text>
596
+ </title-edition>
597
+
626
598
  <!-- These titles of Table of contents renders different than determined in localized-strings -->
627
599
  <title-toc lang="en">
628
600
 
@@ -639,7 +611,7 @@
639
611
  <xsl:text>Contents</xsl:text>
640
612
 
641
613
  </title-toc>
642
-
614
+
643
615
  <title-descriptors lang="en">Descriptors</title-descriptors>
644
616
 
645
617
  <title-part lang="en">
@@ -651,7 +623,11 @@
651
623
 
652
624
 
653
625
 
654
- </title-part>
626
+ </title-part>
627
+ <title-part lang="ru">
628
+
629
+
630
+ </title-part>
655
631
  <title-part lang="zh">第 # 部分:</title-part>
656
632
 
657
633
  <title-subpart lang="en">Sub-part #</title-subpart>
@@ -667,13 +643,38 @@
667
643
 
668
644
  <title-summary lang="en">Summary</title-summary>
669
645
 
646
+ <title-continued lang="ru">(продолжение)</title-continued>
670
647
  <title-continued lang="en">(continued)</title-continued>
671
648
  <title-continued lang="fr">(continué)</title-continued>
672
649
 
673
- </xsl:variable><xsl:variable name="titles" select="xalan:nodeset($titles_)"/><xsl:variable name="bibdata">
650
+ </xsl:variable><xsl:variable name="titles" select="xalan:nodeset($titles_)"/><xsl:variable name="title-list-tables">
651
+ <xsl:variable name="toc_table_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'misc-container']/*[local-name() = 'toc'][@type='table']/*[local-name() = 'title']"/>
652
+ <xsl:value-of select="$toc_table_title"/>
653
+ <xsl:if test="normalize-space($toc_table_title) = ''">
654
+ <xsl:call-template name="getTitle">
655
+ <xsl:with-param name="name" select="'title-list-tables'"/>
656
+ </xsl:call-template>
657
+ </xsl:if>
658
+ </xsl:variable><xsl:variable name="title-list-figures">
659
+ <xsl:variable name="toc_figure_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'misc-container']/*[local-name() = 'toc'][@type='figure']/*[local-name() = 'title']"/>
660
+ <xsl:value-of select="$toc_figure_title"/>
661
+ <xsl:if test="normalize-space($toc_figure_title) = ''">
662
+ <xsl:call-template name="getTitle">
663
+ <xsl:with-param name="name" select="'title-list-figures'"/>
664
+ </xsl:call-template>
665
+ </xsl:if>
666
+ </xsl:variable><xsl:variable name="title-list-recommendations">
667
+ <xsl:variable name="toc_requirement_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'misc-container']/*[local-name() = 'toc'][@type='requirement']/*[local-name() = 'title']"/>
668
+ <xsl:value-of select="$toc_requirement_title"/>
669
+ <xsl:if test="normalize-space($toc_requirement_title) = ''">
670
+ <xsl:call-template name="getTitle">
671
+ <xsl:with-param name="name" select="'title-list-recommendations'"/>
672
+ </xsl:call-template>
673
+ </xsl:if>
674
+ </xsl:variable><xsl:variable name="bibdata">
674
675
  <xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'bibdata']"/>
675
676
  <xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'localized-strings']"/>
676
- </xsl:variable><xsl:variable name="tab_zh">　</xsl:variable><xsl:template name="getTitle">
677
+ </xsl:variable><xsl:variable name="linebreak">&#8232;</xsl:variable><xsl:variable name="tab_zh">　</xsl:variable><xsl:variable name="non_breaking_hyphen">‑</xsl:variable><xsl:variable name="thin_space"> </xsl:variable><xsl:variable name="zero_width_space">​</xsl:variable><xsl:variable name="en_dash">–</xsl:variable><xsl:template name="getTitle">
677
678
  <xsl:param name="name"/>
678
679
  <xsl:param name="lang"/>
679
680
  <xsl:variable name="lang_">
@@ -696,7 +697,7 @@
696
697
  <xsl:value-of select="$titles/*[local-name() = $name][@lang = 'en']"/>
697
698
  </xsl:otherwise>
698
699
  </xsl:choose>
699
- </xsl:template><xsl:variable name="lower">abcdefghijklmnopqrstuvwxyz</xsl:variable><xsl:variable name="upper">ABCDEFGHIJKLMNOPQRSTUVWXYZ</xsl:variable><xsl:variable name="en_chars" select="concat($lower,$upper,',.`1234567890-=~!@#$%^*()_+[]{}\|?/')"/><xsl:variable name="linebreak" select="'&#8232;'"/><xsl:attribute-set name="root-style">
700
+ </xsl:template><xsl:variable name="lower">abcdefghijklmnopqrstuvwxyz</xsl:variable><xsl:variable name="upper">ABCDEFGHIJKLMNOPQRSTUVWXYZ</xsl:variable><xsl:variable name="en_chars" select="concat($lower,$upper,',.`1234567890-=~!@#$%^*()_+[]{}\|?/')"/><xsl:attribute-set name="root-style">
700
701
 
701
702
 
702
703
 
@@ -863,8 +864,8 @@
863
864
 
864
865
 
865
866
  </xsl:attribute-set><xsl:attribute-set name="example-name-style">
866
- <xsl:attribute name="keep-with-next">always</xsl:attribute>
867
867
 
868
+ <xsl:attribute name="keep-with-next">always</xsl:attribute>
868
869
  <xsl:attribute name="margin-top">12pt</xsl:attribute>
869
870
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
870
871
  <xsl:attribute name="font-weight">bold</xsl:attribute>
@@ -879,6 +880,7 @@
879
880
 
880
881
 
881
882
 
883
+
882
884
 
883
885
 
884
886
 
@@ -1225,11 +1227,11 @@
1225
1227
 
1226
1228
 
1227
1229
  </xsl:attribute-set><xsl:attribute-set name="quote-style">
1228
- <xsl:attribute name="role">BlockQuote</xsl:attribute>
1230
+ <xsl:attribute name="margin-left">12mm</xsl:attribute>
1231
+ <xsl:attribute name="margin-right">12mm</xsl:attribute>
1229
1232
 
1230
1233
  <xsl:attribute name="margin-top">12pt</xsl:attribute>
1231
1234
  <xsl:attribute name="margin-left">13mm</xsl:attribute>
1232
- <xsl:attribute name="margin-right">12mm</xsl:attribute>
1233
1235
 
1234
1236
 
1235
1237
 
@@ -1238,12 +1240,11 @@
1238
1240
 
1239
1241
 
1240
1242
  </xsl:attribute-set><xsl:attribute-set name="quote-source-style">
1243
+ <xsl:attribute name="text-align">right</xsl:attribute>
1241
1244
 
1242
- <xsl:attribute name="text-align">right</xsl:attribute>
1243
1245
  <xsl:attribute name="margin-right">25mm</xsl:attribute>
1244
1246
 
1245
1247
 
1246
-
1247
1248
  </xsl:attribute-set><xsl:attribute-set name="termsource-style">
1248
1249
 
1249
1250
 
@@ -1268,6 +1269,9 @@
1268
1269
 
1269
1270
  </xsl:attribute-set><xsl:attribute-set name="term-style">
1270
1271
 
1272
+ </xsl:attribute-set><xsl:attribute-set name="term-name-style">
1273
+ <xsl:attribute name="keep-with-next">always</xsl:attribute>
1274
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
1271
1275
  </xsl:attribute-set><xsl:attribute-set name="figure-style">
1272
1276
 
1273
1277
  </xsl:attribute-set><xsl:attribute-set name="figure-name-style">
@@ -1299,6 +1303,36 @@
1299
1303
 
1300
1304
 
1301
1305
  </xsl:attribute-set><xsl:attribute-set name="formula-style">
1306
+ <xsl:attribute name="margin-top">6pt</xsl:attribute>
1307
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1308
+
1309
+
1310
+
1311
+
1312
+
1313
+
1314
+ </xsl:attribute-set><xsl:attribute-set name="formula-stem-block-style">
1315
+ <xsl:attribute name="text-align">center</xsl:attribute>
1316
+
1317
+
1318
+ <xsl:attribute name="text-align">left</xsl:attribute>
1319
+ <xsl:attribute name="margin-left">5mm</xsl:attribute>
1320
+
1321
+
1322
+
1323
+
1324
+
1325
+
1326
+
1327
+
1328
+
1329
+
1330
+ </xsl:attribute-set><xsl:attribute-set name="formula-stem-number-style">
1331
+ <xsl:attribute name="text-align">right</xsl:attribute>
1332
+
1333
+
1334
+
1335
+
1302
1336
 
1303
1337
  </xsl:attribute-set><xsl:attribute-set name="image-style">
1304
1338
  <xsl:attribute name="text-align">center</xsl:attribute>
@@ -1334,6 +1368,20 @@
1334
1368
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1335
1369
  <xsl:attribute name="keep-with-previous">always</xsl:attribute>
1336
1370
 
1371
+ </xsl:attribute-set><xsl:attribute-set name="preferred-block-style">
1372
+
1373
+
1374
+
1375
+
1376
+
1377
+
1378
+ </xsl:attribute-set><xsl:attribute-set name="preferred-term-style">
1379
+ <xsl:attribute name="keep-with-next">always</xsl:attribute>
1380
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
1381
+
1382
+ <xsl:attribute name="line-height">1</xsl:attribute>
1383
+
1384
+
1337
1385
  </xsl:attribute-set><xsl:attribute-set name="domain-style">
1338
1386
 
1339
1387
  </xsl:attribute-set><xsl:attribute-set name="admitted-style">
@@ -1352,13 +1400,19 @@
1352
1400
  </xsl:attribute-set><xsl:variable name="color-added-text">
1353
1401
  <xsl:text>rgb(0, 255, 0)</xsl:text>
1354
1402
  </xsl:variable><xsl:attribute-set name="add-style">
1355
- <xsl:attribute name="color">red</xsl:attribute>
1356
- <xsl:attribute name="text-decoration">underline</xsl:attribute>
1357
- <!-- <xsl:attribute name="color">black</xsl:attribute>
1358
- <xsl:attribute name="background-color"><xsl:value-of select="$color-added-text"/></xsl:attribute>
1359
- <xsl:attribute name="padding-top">1mm</xsl:attribute>
1360
- <xsl:attribute name="padding-bottom">0.5mm</xsl:attribute> -->
1361
- </xsl:attribute-set><xsl:variable name="color-deleted-text">
1403
+
1404
+ <xsl:attribute name="color">red</xsl:attribute>
1405
+ <xsl:attribute name="text-decoration">underline</xsl:attribute>
1406
+ <!-- <xsl:attribute name="color">black</xsl:attribute>
1407
+ <xsl:attribute name="background-color"><xsl:value-of select="$color-added-text"/></xsl:attribute>
1408
+ <xsl:attribute name="padding-top">1mm</xsl:attribute>
1409
+ <xsl:attribute name="padding-bottom">0.5mm</xsl:attribute> -->
1410
+
1411
+ </xsl:attribute-set><xsl:variable name="add-style">
1412
+ <add-style xsl:use-attribute-sets="add-style"/>
1413
+ </xsl:variable><xsl:template name="append_add-style">
1414
+ <xsl:copy-of select="xalan:nodeset($add-style)/add-style/@*"/>
1415
+ </xsl:template><xsl:variable name="color-deleted-text">
1362
1416
  <xsl:text>red</xsl:text>
1363
1417
  </xsl:variable><xsl:attribute-set name="del-style">
1364
1418
  <xsl:attribute name="color"><xsl:value-of select="$color-deleted-text"/></xsl:attribute>
@@ -1369,6 +1423,38 @@
1369
1423
 
1370
1424
  </xsl:attribute-set><xsl:attribute-set name="list-style">
1371
1425
 
1426
+
1427
+ <xsl:attribute name="provisional-distance-between-starts">6.5mm</xsl:attribute>
1428
+ <xsl:attribute name="line-height">145%</xsl:attribute>
1429
+
1430
+
1431
+
1432
+
1433
+
1434
+
1435
+
1436
+
1437
+
1438
+
1439
+
1440
+
1441
+
1442
+
1443
+
1444
+
1445
+ </xsl:attribute-set><xsl:attribute-set name="list-item-style">
1446
+
1447
+
1448
+ </xsl:attribute-set><xsl:attribute-set name="list-item-label-style">
1449
+
1450
+
1451
+
1452
+ </xsl:attribute-set><xsl:attribute-set name="list-item-body-style">
1453
+
1454
+ <xsl:attribute name="line-height-shift-adjustment">disregard-shifts</xsl:attribute>
1455
+
1456
+
1457
+
1372
1458
  </xsl:attribute-set><xsl:attribute-set name="toc-style">
1373
1459
  <xsl:attribute name="line-height">135%</xsl:attribute>
1374
1460
  </xsl:attribute-set><xsl:attribute-set name="fn-reference-style">
@@ -1661,15 +1747,148 @@
1661
1747
  <xsl:attribute name="line-height">145%</xsl:attribute>
1662
1748
 
1663
1749
 
1750
+ </xsl:attribute-set><xsl:attribute-set name="hljs-doctag">
1751
+ <xsl:attribute name="color">#d73a49</xsl:attribute>
1752
+ </xsl:attribute-set><xsl:attribute-set name="hljs-keyword">
1753
+ <xsl:attribute name="color">#d73a49</xsl:attribute>
1754
+ </xsl:attribute-set><xsl:attribute-set name="hljs-meta_hljs-keyword">
1755
+ <xsl:attribute name="color">#d73a49</xsl:attribute>
1756
+ </xsl:attribute-set><xsl:attribute-set name="hljs-template-tag">
1757
+ <xsl:attribute name="color">#d73a49</xsl:attribute>
1758
+ </xsl:attribute-set><xsl:attribute-set name="hljs-template-variable">
1759
+ <xsl:attribute name="color">#d73a49</xsl:attribute>
1760
+ </xsl:attribute-set><xsl:attribute-set name="hljs-type">
1761
+ <xsl:attribute name="color">#d73a49</xsl:attribute>
1762
+ </xsl:attribute-set><xsl:attribute-set name="hljs-variable_and_language_">
1763
+ <xsl:attribute name="color">#d73a49</xsl:attribute>
1764
+ </xsl:attribute-set><xsl:attribute-set name="hljs-title">
1765
+ <xsl:attribute name="color">#6f42c1</xsl:attribute>
1766
+ </xsl:attribute-set><xsl:attribute-set name="hljs-title_and_class_">
1767
+ <xsl:attribute name="color">#6f42c1</xsl:attribute>
1768
+ </xsl:attribute-set><xsl:attribute-set name="hljs-title_and_class__and_inherited__">
1769
+ <xsl:attribute name="color">#6f42c1</xsl:attribute>
1770
+ </xsl:attribute-set><xsl:attribute-set name="hljs-title_and_function_">
1771
+ <xsl:attribute name="color">#6f42c1</xsl:attribute>
1772
+ </xsl:attribute-set><xsl:attribute-set name="hljs-attr">
1773
+ <xsl:attribute name="color">#005cc5</xsl:attribute>
1774
+ </xsl:attribute-set><xsl:attribute-set name="hljs-attribute">
1775
+ <xsl:attribute name="color">#005cc5</xsl:attribute>
1776
+ </xsl:attribute-set><xsl:attribute-set name="hljs-literal">
1777
+ <xsl:attribute name="color">#005cc5</xsl:attribute>
1778
+ </xsl:attribute-set><xsl:attribute-set name="hljs-meta">
1779
+ <xsl:attribute name="color">#005cc5</xsl:attribute>
1780
+ </xsl:attribute-set><xsl:attribute-set name="hljs-number">
1781
+ <xsl:attribute name="color">#005cc5</xsl:attribute>
1782
+ </xsl:attribute-set><xsl:attribute-set name="hljs-operator">
1783
+ <xsl:attribute name="color">#005cc5</xsl:attribute>
1784
+ </xsl:attribute-set><xsl:attribute-set name="hljs-variable">
1785
+ <xsl:attribute name="color">#005cc5</xsl:attribute>
1786
+ </xsl:attribute-set><xsl:attribute-set name="hljs-selector-attr">
1787
+ <xsl:attribute name="color">#005cc5</xsl:attribute>
1788
+ </xsl:attribute-set><xsl:attribute-set name="hljs-selector-class">
1789
+ <xsl:attribute name="color">#005cc5</xsl:attribute>
1790
+ </xsl:attribute-set><xsl:attribute-set name="hljs-selector-id">
1791
+ <xsl:attribute name="color">#005cc5</xsl:attribute>
1792
+ </xsl:attribute-set><xsl:attribute-set name="hljs-regexp">
1793
+ <xsl:attribute name="color">#032f62</xsl:attribute>
1794
+ </xsl:attribute-set><xsl:attribute-set name="hljs-string">
1795
+ <xsl:attribute name="color">#032f62</xsl:attribute>
1796
+ </xsl:attribute-set><xsl:attribute-set name="hljs-meta_hljs-string">
1797
+ <xsl:attribute name="color">#032f62</xsl:attribute>
1798
+ </xsl:attribute-set><xsl:attribute-set name="hljs-built_in">
1799
+ <xsl:attribute name="color">#e36209</xsl:attribute>
1800
+ </xsl:attribute-set><xsl:attribute-set name="hljs-symbol">
1801
+ <xsl:attribute name="color">#e36209</xsl:attribute>
1802
+ </xsl:attribute-set><xsl:attribute-set name="hljs-comment">
1803
+ <xsl:attribute name="color">#6a737d</xsl:attribute>
1804
+ </xsl:attribute-set><xsl:attribute-set name="hljs-code">
1805
+ <xsl:attribute name="color">#6a737d</xsl:attribute>
1806
+ </xsl:attribute-set><xsl:attribute-set name="hljs-formula">
1807
+ <xsl:attribute name="color">#6a737d</xsl:attribute>
1808
+ </xsl:attribute-set><xsl:attribute-set name="hljs-name">
1809
+ <xsl:attribute name="color">#22863a</xsl:attribute>
1810
+ </xsl:attribute-set><xsl:attribute-set name="hljs-quote">
1811
+ <xsl:attribute name="color">#22863a</xsl:attribute>
1812
+ </xsl:attribute-set><xsl:attribute-set name="hljs-selector-tag">
1813
+ <xsl:attribute name="color">#22863a</xsl:attribute>
1814
+ </xsl:attribute-set><xsl:attribute-set name="hljs-selector-pseudo">
1815
+ <xsl:attribute name="color">#22863a</xsl:attribute>
1816
+ </xsl:attribute-set><xsl:attribute-set name="hljs-subst">
1817
+ <xsl:attribute name="color">#24292e</xsl:attribute>
1818
+ </xsl:attribute-set><xsl:attribute-set name="hljs-section">
1819
+ <xsl:attribute name="color">#005cc5</xsl:attribute>
1820
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
1821
+ </xsl:attribute-set><xsl:attribute-set name="hljs-bullet">
1822
+ <xsl:attribute name="color">#735c0f</xsl:attribute>
1823
+ </xsl:attribute-set><xsl:attribute-set name="hljs-emphasis">
1824
+ <xsl:attribute name="color">#24292e</xsl:attribute>
1825
+ <xsl:attribute name="font-style">italic</xsl:attribute>
1826
+ </xsl:attribute-set><xsl:attribute-set name="hljs-strong">
1827
+ <xsl:attribute name="color">#24292e</xsl:attribute>
1828
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
1829
+ </xsl:attribute-set><xsl:attribute-set name="hljs-addition">
1830
+ <xsl:attribute name="color">#22863a</xsl:attribute>
1831
+ <xsl:attribute name="background-color">#f0fff4</xsl:attribute>
1832
+ </xsl:attribute-set><xsl:attribute-set name="hljs-deletion">
1833
+ <xsl:attribute name="color">#b31d28</xsl:attribute>
1834
+ <xsl:attribute name="background-color">#ffeef0</xsl:attribute>
1835
+ </xsl:attribute-set><xsl:attribute-set name="hljs-char_and_escape_">
1836
+ </xsl:attribute-set><xsl:attribute-set name="hljs-link">
1837
+ </xsl:attribute-set><xsl:attribute-set name="hljs-params">
1838
+ </xsl:attribute-set><xsl:attribute-set name="hljs-property">
1839
+ </xsl:attribute-set><xsl:attribute-set name="hljs-punctuation">
1840
+ </xsl:attribute-set><xsl:attribute-set name="hljs-tag">
1841
+ </xsl:attribute-set><xsl:attribute-set name="indexsect-title-style">
1842
+ <xsl:attribute name="role">H1</xsl:attribute>
1843
+
1844
+
1845
+
1846
+
1847
+
1848
+ </xsl:attribute-set><xsl:attribute-set name="indexsect-clause-title-style">
1849
+ <xsl:attribute name="keep-with-next">always</xsl:attribute>
1850
+
1851
+
1852
+
1853
+
1854
+
1664
1855
  </xsl:attribute-set><xsl:variable name="border-block-added">2.5pt solid rgb(0, 176, 80)</xsl:variable><xsl:variable name="border-block-deleted">2.5pt solid rgb(255, 0, 0)</xsl:variable><xsl:variable name="ace_tag">ace-tag_</xsl:variable><xsl:template name="processPrefaceSectionsDefault_Contents">
1856
+ <xsl:variable name="nodes_preface_">
1857
+ <xsl:for-each select="/*/*[local-name()='preface']/*">
1858
+ <node id="{@id}"/>
1859
+ </xsl:for-each>
1860
+ </xsl:variable>
1861
+ <xsl:variable name="nodes_preface" select="xalan:nodeset($nodes_preface_)"/>
1862
+
1665
1863
  <xsl:for-each select="/*/*[local-name()='preface']/*">
1666
1864
  <xsl:sort select="@displayorder" data-type="number"/>
1865
+
1866
+ <!-- process Section's title -->
1867
+ <xsl:variable name="preceding-sibling_id" select="$nodes_preface/node[@id = current()/@id]/preceding-sibling::node[1]/@id"/>
1868
+ <xsl:if test="$preceding-sibling_id != ''">
1869
+ <xsl:apply-templates select="parent::*/*[@type = 'section-title' and @id = $preceding-sibling_id and not(@displayorder)]" mode="contents_no_displayorder"/>
1870
+ </xsl:if>
1871
+
1667
1872
  <xsl:apply-templates select="." mode="contents"/>
1668
1873
  </xsl:for-each>
1669
1874
  </xsl:template><xsl:template name="processMainSectionsDefault_Contents">
1670
1875
 
1876
+ <xsl:variable name="nodes_sections_">
1877
+ <xsl:for-each select="/*/*[local-name()='sections']/*">
1878
+ <node id="{@id}"/>
1879
+ </xsl:for-each>
1880
+ </xsl:variable>
1881
+ <xsl:variable name="nodes_sections" select="xalan:nodeset($nodes_sections_)"/>
1882
+
1671
1883
  <xsl:for-each select="/*/*[local-name()='sections']/* | /*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true'] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][@normative='true']]">
1672
1884
  <xsl:sort select="@displayorder" data-type="number"/>
1885
+
1886
+ <!-- process Section's title -->
1887
+ <xsl:variable name="preceding-sibling_id" select="$nodes_sections/node[@id = current()/@id]/preceding-sibling::node[1]/@id"/>
1888
+ <xsl:if test="$preceding-sibling_id != ''">
1889
+ <xsl:apply-templates select="parent::*/*[@type = 'section-title' and @id = $preceding-sibling_id and not(@displayorder)]" mode="contents_no_displayorder"/>
1890
+ </xsl:if>
1891
+
1673
1892
  <xsl:apply-templates select="." mode="contents"/>
1674
1893
  </xsl:for-each>
1675
1894
 
@@ -1682,6 +1901,30 @@
1682
1901
  <xsl:sort select="@displayorder" data-type="number"/>
1683
1902
  <xsl:apply-templates select="." mode="contents"/>
1684
1903
  </xsl:for-each>
1904
+ </xsl:template><xsl:template name="processTablesFigures_Contents">
1905
+ <xsl:param name="always"/>
1906
+ <xsl:if test="(//*[contains(local-name(), '-standard')]/*[local-name() = 'misc-container']/*[local-name() = 'toc'][@type='table']/*[local-name() = 'title']) or normalize-space($always) = 'true'">
1907
+ <xsl:call-template name="processTables_Contents"/>
1908
+ </xsl:if>
1909
+ <xsl:if test="(//*[contains(local-name(), '-standard')]/*[local-name() = 'misc-container']/*[local-name() = 'toc'][@type='figure']/*[local-name() = 'title']) or normalize-space($always) = 'true'">
1910
+ <xsl:call-template name="processFigures_Contents"/>
1911
+ </xsl:if>
1912
+ </xsl:template><xsl:template name="processTables_Contents">
1913
+ <tables>
1914
+ <xsl:for-each select="//*[local-name() = 'table'][@id and *[local-name() = 'name'] and normalize-space(@id) != '']">
1915
+ <table id="{@id}" alt-text="{*[local-name() = 'name']}">
1916
+ <xsl:copy-of select="*[local-name() = 'name']"/>
1917
+ </table>
1918
+ </xsl:for-each>
1919
+ </tables>
1920
+ </xsl:template><xsl:template name="processFigures_Contents">
1921
+ <figures>
1922
+ <xsl:for-each select="//*[local-name() = 'figure'][@id and *[local-name() = 'name'] and not(@unnumbered = 'true') and normalize-space(@id) != ''] | //*[@id and starts-with(*[local-name() = 'name'], 'Figure ') and normalize-space(@id) != '']">
1923
+ <figure id="{@id}" alt-text="{*[local-name() = 'name']}">
1924
+ <xsl:copy-of select="*[local-name() = 'name']"/>
1925
+ </figure>
1926
+ </xsl:for-each>
1927
+ </figures>
1685
1928
  </xsl:template><xsl:template name="processPrefaceSectionsDefault">
1686
1929
  <xsl:for-each select="/*/*[local-name()='preface']/*">
1687
1930
  <xsl:sort select="@displayorder" data-type="number"/>
@@ -1747,9 +1990,12 @@
1747
1990
 
1748
1991
 
1749
1992
  </xsl:template><xsl:template match="*[local-name()='legal-statement']//*[local-name()='p']">
1993
+ <xsl:param name="margin"/>
1750
1994
 
1751
1995
  <!-- process in the template 'paragraph' -->
1752
- <xsl:call-template name="paragraph"/>
1996
+ <xsl:call-template name="paragraph">
1997
+ <xsl:with-param name="margin" select="$margin"/>
1998
+ </xsl:call-template>
1753
1999
 
1754
2000
  </xsl:template><xsl:template match="*[local-name()='feedback-statement']">
1755
2001
  <fo:block xsl:use-attribute-sets="feedback-statement-style">
@@ -1761,9 +2007,12 @@
1761
2007
  <xsl:call-template name="title"/>
1762
2008
 
1763
2009
  </xsl:template><xsl:template match="*[local-name()='feedback-statement']//*[local-name()='p']">
2010
+ <xsl:param name="margin"/>
1764
2011
 
1765
2012
  <!-- process in the template 'paragraph' -->
1766
- <xsl:call-template name="paragraph"/>
2013
+ <xsl:call-template name="paragraph">
2014
+ <xsl:with-param name="margin" select="$margin"/>
2015
+ </xsl:call-template>
1767
2016
 
1768
2017
  </xsl:template><xsl:template match="*[local-name()='td']//text() | *[local-name()='th']//text() | *[local-name()='dt']//text() | *[local-name()='dd']//text()" priority="1">
1769
2018
  <!-- <xsl:call-template name="add-zero-spaces"/> -->
@@ -1800,7 +2049,7 @@
1800
2049
  </xsl:call-template>
1801
2050
  </xsl:if>
1802
2051
  </xsl:variable>
1803
- <!-- colwidths=<xsl:copy-of select="$colwidths"/> -->
2052
+ <!-- DEBUG colwidths=<xsl:copy-of select="$colwidths"/> -->
1804
2053
 
1805
2054
 
1806
2055
  <xsl:variable name="margin-side">
@@ -2066,7 +2315,7 @@
2066
2315
  <!-- <xsl:with-param name="text" select="translate(td[$curr-col],'- —:', ' ')"/> -->
2067
2316
  <!-- 2009 thinspace -->
2068
2317
  <!-- <xsl:with-param name="text" select="translate(normalize-space($td_text),'- —:', ' ')"/> -->
2069
- <xsl:with-param name="text" select="normalize-space(translate($string_with_added_zerospaces, '​', ' '))"/>
2318
+ <xsl:with-param name="text" select="normalize-space(translate($string_with_added_zerospaces, '​­', ' '))"/> <!-- replace zero-width-space and soft-hyphen to space -->
2070
2319
  </xsl:call-template>
2071
2320
  </xsl:variable>
2072
2321
  <xsl:variable name="max_length">
@@ -2107,8 +2356,7 @@
2107
2356
  </xsl:call-template>
2108
2357
  </xsl:if>
2109
2358
  </xsl:template><xsl:template match="text()" mode="td_text">
2110
- <xsl:variable name="zero-space">​</xsl:variable>
2111
- <xsl:value-of select="translate(., $zero-space, ' ')"/><xsl:text> </xsl:text>
2359
+ <xsl:value-of select="translate(., $zero_width_space, ' ')"/><xsl:text> </xsl:text>
2112
2360
  </xsl:template><xsl:template match="*[local-name()='termsource']" mode="td_text">
2113
2361
  <xsl:value-of select="*[local-name()='origin']/@citeas"/>
2114
2362
  </xsl:template><xsl:template match="*[local-name()='link']" mode="td_text">
@@ -2453,37 +2701,7 @@
2453
2701
 
2454
2702
  <!-- list of footnotes to calculate actual footnotes number -->
2455
2703
  <xsl:variable name="p_fn_">
2456
- <xsl:choose>
2457
- <xsl:when test="@current_fn_number"> <!-- for BSI, footnote reference number calculated already -->
2458
- <fn gen_id="{generate-id(.)}">
2459
- <xsl:copy-of select="@*"/>
2460
- <xsl:copy-of select="node()"/>
2461
- </fn>
2462
- </xsl:when>
2463
- <xsl:otherwise>
2464
- <!-- itetation for:
2465
- footnotes in bibdata/title
2466
- footnotes in bibliography
2467
- footnotes in document's body (except table's head/body/foot and figure text)
2468
- -->
2469
- <xsl:for-each select="ancestor::*[contains(local-name(), '-standard')]/*[local-name() = 'bibdata']/*[local-name() = 'note'][@type='title-footnote']">
2470
- <fn gen_id="{generate-id(.)}">
2471
- <xsl:copy-of select="@*"/>
2472
- <xsl:copy-of select="node()"/>
2473
- </fn>
2474
- </xsl:for-each>
2475
- <xsl:for-each select="ancestor::*[contains(local-name(), '-standard')]/*[local-name()='preface']/* | ancestor::*[contains(local-name(), '-standard')]/*[local-name()='sections']/* | ancestor::*[contains(local-name(), '-standard')]/*[local-name()='annex'] | ancestor::*[contains(local-name(), '-standard')]/*[local-name()='bibliography']/*">
2476
- <xsl:sort select="@displayorder" data-type="number"/>
2477
- <xsl:for-each select=".//*[local-name() = 'bibitem'][ancestor::*[local-name() = 'references']]/*[local-name() = 'note'] | .//*[local-name() = 'fn'][not(ancestor::*[(local-name() = 'table' or local-name() = 'figure') and not(ancestor::*[local-name() = 'name'])])][generate-id(.)=generate-id(key('kfn',@reference)[1])]">
2478
- <!-- copy unique fn -->
2479
- <fn gen_id="{generate-id(.)}">
2480
- <xsl:copy-of select="@*"/>
2481
- <xsl:copy-of select="node()"/>
2482
- </fn>
2483
- </xsl:for-each>
2484
- </xsl:for-each>
2485
- </xsl:otherwise>
2486
- </xsl:choose>
2704
+ <xsl:call-template name="get_fn_list"/>
2487
2705
  </xsl:variable>
2488
2706
  <xsl:variable name="p_fn" select="xalan:nodeset($p_fn_)"/>
2489
2707
 
@@ -2544,6 +2762,38 @@
2544
2762
  <xsl:copy-of select="$footnote_inline"/>
2545
2763
  </xsl:otherwise>
2546
2764
  </xsl:choose>
2765
+ </xsl:template><xsl:template name="get_fn_list">
2766
+ <xsl:choose>
2767
+ <xsl:when test="@current_fn_number"> <!-- for BSI, footnote reference number calculated already -->
2768
+ <fn gen_id="{generate-id(.)}">
2769
+ <xsl:copy-of select="@*"/>
2770
+ <xsl:copy-of select="node()"/>
2771
+ </fn>
2772
+ </xsl:when>
2773
+ <xsl:otherwise>
2774
+ <!-- itetation for:
2775
+ footnotes in bibdata/title
2776
+ footnotes in bibliography
2777
+ footnotes in document's body (except table's head/body/foot and figure text)
2778
+ -->
2779
+ <xsl:for-each select="ancestor::*[contains(local-name(), '-standard')]/*[local-name() = 'bibdata']/*[local-name() = 'note'][@type='title-footnote']">
2780
+ <fn gen_id="{generate-id(.)}">
2781
+ <xsl:copy-of select="@*"/>
2782
+ <xsl:copy-of select="node()"/>
2783
+ </fn>
2784
+ </xsl:for-each>
2785
+ <xsl:for-each select="ancestor::*[contains(local-name(), '-standard')]/*[local-name()='preface']/* | ancestor::*[contains(local-name(), '-standard')]/*[local-name()='sections']/* | ancestor::*[contains(local-name(), '-standard')]/*[local-name()='annex'] | ancestor::*[contains(local-name(), '-standard')]/*[local-name()='bibliography']/*">
2786
+ <xsl:sort select="@displayorder" data-type="number"/>
2787
+ <xsl:for-each select=".//*[local-name() = 'bibitem'][ancestor::*[local-name() = 'references']]/*[local-name() = 'note'] | .//*[local-name() = 'fn'][not(ancestor::*[(local-name() = 'table' or local-name() = 'figure') and not(ancestor::*[local-name() = 'name'])])][generate-id(.)=generate-id(key('kfn',@reference)[1])]">
2788
+ <!-- copy unique fn -->
2789
+ <fn gen_id="{generate-id(.)}">
2790
+ <xsl:copy-of select="@*"/>
2791
+ <xsl:copy-of select="node()"/>
2792
+ </fn>
2793
+ </xsl:for-each>
2794
+ </xsl:for-each>
2795
+ </xsl:otherwise>
2796
+ </xsl:choose>
2547
2797
  </xsl:template><xsl:template name="table_fn_display">
2548
2798
  <xsl:variable name="references">
2549
2799
 
@@ -2715,7 +2965,7 @@
2715
2965
  </fo:inline>
2716
2966
  </xsl:template><xsl:template match="*[local-name()='fn']/text()[normalize-space() != '']">
2717
2967
  <fo:inline><xsl:value-of select="."/></fo:inline>
2718
- </xsl:template><xsl:template match="*[local-name()='fn']/*[local-name()='p']">
2968
+ </xsl:template><xsl:template match="*[local-name()='fn']//*[local-name()='p']">
2719
2969
  <fo:inline>
2720
2970
  <xsl:apply-templates/>
2721
2971
  </fo:inline>
@@ -3078,20 +3328,44 @@
3078
3328
  <fo:inline text-decoration="underline">
3079
3329
  <xsl:apply-templates/>
3080
3330
  </fo:inline>
3081
- </xsl:template><xsl:template match="*[local-name()='add']">
3331
+ </xsl:template><xsl:template match="*[local-name()='add']" name="tag_add">
3082
3332
  <xsl:param name="skip">true</xsl:param>
3333
+ <xsl:param name="block">false</xsl:param>
3334
+ <xsl:param name="type"/>
3335
+ <xsl:param name="text-align"/>
3083
3336
  <xsl:choose>
3084
3337
  <xsl:when test="starts-with(., $ace_tag)"> <!-- examples: ace-tag_A1_start, ace-tag_A2_end, C1_start, AC_start -->
3085
3338
  <xsl:choose>
3086
- <xsl:when test="$skip = 'true' and ((local-name(../..) = 'note' and not(preceding-sibling::node())) or (local-name(..) = 'title' and preceding-sibling::node()[1][local-name() = 'tab'])) and ../node()[last()][local-name() = 'add'][starts-with(text(), $ace_tag)]"><!-- start tag displayed in template name="note" and title --></xsl:when>
3339
+ <xsl:when test="$skip = 'true' and ((local-name(../..) = 'note' and not(preceding-sibling::node())) or (local-name(..) = 'title' and preceding-sibling::node()[1][local-name() = 'tab']) or local-name(..) = 'formattedref' and not(preceding-sibling::node())) and ../node()[last()][local-name() = 'add'][starts-with(text(), $ace_tag)]"><!-- start tag displayed in template name="note" and title --></xsl:when>
3087
3340
  <xsl:otherwise>
3088
- <fo:inline>
3341
+ <xsl:variable name="tag">
3089
3342
  <xsl:call-template name="insertTag">
3090
- <xsl:with-param name="type" select="substring-after(substring-after(., $ace_tag), '_')"/> <!-- start or end -->
3343
+ <xsl:with-param name="type">
3344
+ <xsl:choose>
3345
+ <xsl:when test="$type = ''"><xsl:value-of select="substring-after(substring-after(., $ace_tag), '_')"/> <!-- start or end --></xsl:when>
3346
+ <xsl:otherwise><xsl:value-of select="$type"/></xsl:otherwise>
3347
+ </xsl:choose>
3348
+ </xsl:with-param>
3091
3349
  <xsl:with-param name="kind" select="substring(substring-before(substring-after(., $ace_tag), '_'), 1, 1)"/> <!-- A or C -->
3092
3350
  <xsl:with-param name="value" select="substring(substring-before(substring-after(., $ace_tag), '_'), 2)"/> <!-- 1, 2, C -->
3093
3351
  </xsl:call-template>
3094
- </fo:inline>
3352
+ </xsl:variable>
3353
+ <xsl:choose>
3354
+ <xsl:when test="$block = 'false'">
3355
+ <fo:inline>
3356
+ <xsl:copy-of select="$tag"/>
3357
+ </fo:inline>
3358
+ </xsl:when>
3359
+ <xsl:otherwise>
3360
+ <fo:block> <!-- for around figures -->
3361
+ <xsl:if test="$text-align != ''">
3362
+ <xsl:attribute name="text-align"><xsl:value-of select="$text-align"/></xsl:attribute>
3363
+ </xsl:if>
3364
+ <xsl:copy-of select="$tag"/>
3365
+ </fo:block>
3366
+ </xsl:otherwise>
3367
+ </xsl:choose>
3368
+
3095
3369
  </xsl:otherwise>
3096
3370
  </xsl:choose>
3097
3371
  </xsl:when>
@@ -3450,17 +3724,21 @@
3450
3724
  </xsl:apply-templates>
3451
3725
  </xsl:template><xsl:template name="getLang">
3452
3726
  <xsl:variable name="language_current" select="normalize-space(//*[local-name()='bibdata']//*[local-name()='language'][@current = 'true'])"/>
3453
- <xsl:variable name="language_current_2" select="normalize-space(xalan:nodeset($bibdata)//*[local-name()='bibdata']//*[local-name()='language'][@current = 'true'])"/>
3454
3727
  <xsl:variable name="language">
3455
3728
  <xsl:choose>
3456
3729
  <xsl:when test="$language_current != ''">
3457
3730
  <xsl:value-of select="$language_current"/>
3458
3731
  </xsl:when>
3459
- <xsl:when test="$language_current_2 != ''">
3460
- <xsl:value-of select="$language_current_2"/>
3461
- </xsl:when>
3462
3732
  <xsl:otherwise>
3463
- <xsl:value-of select="//*[local-name()='bibdata']//*[local-name()='language']"/>
3733
+ <xsl:variable name="language_current_2" select="normalize-space(xalan:nodeset($bibdata)//*[local-name()='bibdata']//*[local-name()='language'][@current = 'true'])"/>
3734
+ <xsl:choose>
3735
+ <xsl:when test="$language_current_2 != ''">
3736
+ <xsl:value-of select="$language_current_2"/>
3737
+ </xsl:when>
3738
+ <xsl:otherwise>
3739
+ <xsl:value-of select="//*[local-name()='bibdata']//*[local-name()='language']"/>
3740
+ </xsl:otherwise>
3741
+ </xsl:choose>
3464
3742
  </xsl:otherwise>
3465
3743
  </xsl:choose>
3466
3744
  </xsl:variable>
@@ -3663,6 +3941,9 @@
3663
3941
  </fo:inline>
3664
3942
  </xsl:template><xsl:template match="*[local-name() = 'xref']">
3665
3943
  <fo:basic-link internal-destination="{@target}" fox:alt-text="{@target}" xsl:use-attribute-sets="xref-style">
3944
+ <xsl:if test="parent::*[local-name() = 'add']">
3945
+ <xsl:call-template name="append_add-style"/>
3946
+ </xsl:if>
3666
3947
  <xsl:apply-templates/>
3667
3948
  </fo:basic-link>
3668
3949
  </xsl:template><xsl:template match="*[local-name() = 'formula']" name="formula">
@@ -3677,8 +3958,8 @@
3677
3958
 
3678
3959
  </xsl:if>
3679
3960
  <fo:block-container margin-left="0mm">
3680
- <fo:block id="{@id}" xsl:use-attribute-sets="formula-style">
3681
- <xsl:apply-templates/>
3961
+ <fo:block id="{@id}">
3962
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/> <!-- formula's number will be process in 'stem' template -->
3682
3963
  </fo:block>
3683
3964
  </fo:block-container>
3684
3965
  </fo:block-container>
@@ -3690,10 +3971,43 @@
3690
3971
  <fo:inline>
3691
3972
  <xsl:apply-templates/>
3692
3973
  </fo:inline>
3693
- </xsl:template><xsl:template match="*[local-name() = 'formula']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'formula']/*[local-name() = 'name']" mode="formula_number"> <!-- show by demand -->
3974
+ </xsl:template><xsl:template match="*[local-name() = 'formula']/*[local-name() = 'name']"> <!-- show in 'stem' template -->
3694
3975
  <xsl:if test="normalize-space() != ''">
3695
3976
  <xsl:text>(</xsl:text><xsl:apply-templates/><xsl:text>)</xsl:text>
3696
3977
  </xsl:if>
3978
+ </xsl:template><xsl:template match="*[local-name() = 'formula'][*[local-name() = 'name']]/*[local-name() = 'stem']">
3979
+ <fo:block xsl:use-attribute-sets="formula-style">
3980
+
3981
+
3982
+
3983
+ <fo:table table-layout="fixed" width="100%">
3984
+ <fo:table-column column-width="95%"/>
3985
+ <fo:table-column column-width="5%"/>
3986
+ <fo:table-body>
3987
+ <fo:table-row>
3988
+ <fo:table-cell display-align="center">
3989
+ <fo:block xsl:use-attribute-sets="formula-stem-block-style">
3990
+
3991
+
3992
+
3993
+ <xsl:apply-templates/>
3994
+ </fo:block>
3995
+ </fo:table-cell>
3996
+ <fo:table-cell display-align="center">
3997
+ <fo:block xsl:use-attribute-sets="formula-stem-number-style">
3998
+ <xsl:apply-templates select="../*[local-name() = 'name']"/>
3999
+ </fo:block>
4000
+ </fo:table-cell>
4001
+ </fo:table-row>
4002
+ </fo:table-body>
4003
+ </fo:table>
4004
+ </fo:block>
4005
+ </xsl:template><xsl:template match="*[local-name() = 'formula'][not(*[local-name() = 'name'])]/*[local-name() = 'stem']">
4006
+ <fo:block xsl:use-attribute-sets="formula-style">
4007
+ <fo:block xsl:use-attribute-sets="formula-stem-block-style">
4008
+ <xsl:apply-templates/>
4009
+ </fo:block>
4010
+ </fo:block>
3697
4011
  </xsl:template><xsl:template match="*[local-name() = 'note']" name="note">
3698
4012
 
3699
4013
  <fo:block-container id="{@id}" xsl:use-attribute-sets="note-style">
@@ -3731,6 +4045,13 @@
3731
4045
 
3732
4046
 
3733
4047
 
4048
+ <!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
4049
+ <!-- <xsl:if test="*[not(local-name()='name')][1][node()[normalize-space() != ''][1][local-name() = 'add'] and node()[normalize-space() != ''][last()][local-name() = 'add']]"> -->
4050
+ <xsl:if test="*[not(local-name()='name')][1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
4051
+ <xsl:call-template name="append_add-style"/>
4052
+ </xsl:if>
4053
+
4054
+
3734
4055
  <!-- if note contains only one element and first and last childs are `add` ace-tag, then move start ace-tag before NOTE's name-->
3735
4056
  <xsl:if test="count(*[not(local-name() = 'name')]) = 1 and *[not(local-name() = 'name')]/node()[last()][local-name() = 'add'][starts-with(text(), $ace_tag)]">
3736
4057
  <xsl:apply-templates select="*[not(local-name() = 'name')]/node()[1][local-name() = 'add'][starts-with(text(), $ace_tag)]">
@@ -3769,6 +4090,12 @@
3769
4090
 
3770
4091
 
3771
4092
 
4093
+ <!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
4094
+ <!-- <xsl:if test="*[not(local-name()='name')][1][node()[normalize-space() != ''][1][local-name() = 'add'] and node()[normalize-space() != ''][last()][local-name() = 'add']]"> -->
4095
+ <xsl:if test="*[not(local-name()='name')][1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
4096
+ <xsl:call-template name="append_add-style"/>
4097
+ </xsl:if>
4098
+
3772
4099
  <xsl:apply-templates select="*[local-name() = 'name']"/>
3773
4100
 
3774
4101
  </fo:inline>
@@ -3818,6 +4145,7 @@
3818
4145
  </fo:block>
3819
4146
  </xsl:template><xsl:template match="*[local-name() = 'term']">
3820
4147
  <fo:block id="{@id}" xsl:use-attribute-sets="term-style">
4148
+
3821
4149
 
3822
4150
 
3823
4151
 
@@ -4254,7 +4582,11 @@
4254
4582
  <xsl:value-of select="."/>
4255
4583
  </xsl:template><xsl:template match="node()" mode="contents">
4256
4584
  <xsl:apply-templates mode="contents"/>
4257
- </xsl:template><xsl:template match="*[local-name() = 'p'][@type = 'floating-title' or @type = 'section-title']" priority="2" mode="contents">
4585
+ </xsl:template><xsl:template match="*[local-name() = 'preface' or local-name() = 'sections']/*[local-name() = 'p'][@type = 'section-title' and not(@displayorder)]" priority="3" mode="contents"/><xsl:template match="*[local-name() = 'p'][@type = 'section-title' and not(@displayorder)]" mode="contents_no_displayorder">
4586
+ <xsl:call-template name="contents_section-title"/>
4587
+ </xsl:template><xsl:template match="*[local-name() = 'p'][@type = 'section-title']" mode="contents_in_clause">
4588
+ <xsl:call-template name="contents_section-title"/>
4589
+ </xsl:template><xsl:template match="*[local-name() = 'clause']/*[local-name() = 'p'][@type = 'section-title' and (@depth != ../*[local-name() = 'title']/@depth or ../*[local-name() = 'title']/@depth = 1)]" priority="3" mode="contents"/><xsl:template match="*[local-name() = 'p'][@type = 'floating-title' or @type = 'section-title']" priority="2" name="contents_section-title" mode="contents">
4258
4590
  <xsl:variable name="level">
4259
4591
  <xsl:call-template name="getLevel">
4260
4592
  <xsl:with-param name="depth" select="@depth"/>
@@ -4323,13 +4655,14 @@
4323
4655
  <xsl:apply-templates mode="bookmarks"/>
4324
4656
  </xsl:template><xsl:template name="addBookmarks">
4325
4657
  <xsl:param name="contents"/>
4326
- <xsl:if test="xalan:nodeset($contents)//item">
4658
+ <xsl:variable name="contents_nodes" select="xalan:nodeset($contents)"/>
4659
+ <xsl:if test="$contents_nodes//item">
4327
4660
  <fo:bookmark-tree>
4328
4661
  <xsl:choose>
4329
- <xsl:when test="xalan:nodeset($contents)/doc">
4662
+ <xsl:when test="$contents_nodes/doc">
4330
4663
  <xsl:choose>
4331
- <xsl:when test="count(xalan:nodeset($contents)/doc) &gt; 1">
4332
- <xsl:for-each select="xalan:nodeset($contents)/doc">
4664
+ <xsl:when test="count($contents_nodes/doc) &gt; 1">
4665
+ <xsl:for-each select="$contents_nodes/doc">
4333
4666
  <fo:bookmark internal-destination="{contents/item[1]/@id}" starting-state="hide">
4334
4667
  <xsl:if test="@bundle = 'true'">
4335
4668
  <xsl:attribute name="internal-destination"><xsl:value-of select="@firstpage_id"/></xsl:attribute>
@@ -4380,7 +4713,7 @@
4380
4713
  </xsl:for-each>
4381
4714
  </xsl:when>
4382
4715
  <xsl:otherwise>
4383
- <xsl:for-each select="xalan:nodeset($contents)/doc">
4716
+ <xsl:for-each select="$contents_nodes/doc">
4384
4717
 
4385
4718
  <xsl:apply-templates select="contents/item" mode="bookmark"/>
4386
4719
 
@@ -4398,25 +4731,36 @@
4398
4731
  </xsl:choose>
4399
4732
  </xsl:when>
4400
4733
  <xsl:otherwise>
4401
- <xsl:apply-templates select="xalan:nodeset($contents)/contents/item" mode="bookmark"/>
4734
+ <xsl:apply-templates select="$contents_nodes/contents/item" mode="bookmark"/>
4735
+
4736
+ <xsl:call-template name="insertFigureBookmarks">
4737
+ <xsl:with-param name="contents" select="$contents_nodes/contents"/>
4738
+ </xsl:call-template>
4739
+
4740
+ <xsl:call-template name="insertTableBookmarks">
4741
+ <xsl:with-param name="contents" select="$contents_nodes/contents"/>
4742
+ <xsl:with-param name="lang" select="@lang"/>
4743
+ </xsl:call-template>
4744
+
4402
4745
  </xsl:otherwise>
4403
4746
  </xsl:choose>
4404
4747
 
4748
+
4405
4749
 
4406
4750
 
4407
4751
 
4408
4752
 
4409
-
4410
-
4753
+
4411
4754
 
4412
4755
  </fo:bookmark-tree>
4413
4756
  </xsl:if>
4414
4757
  </xsl:template><xsl:template name="insertFigureBookmarks">
4415
4758
  <xsl:param name="contents"/>
4416
- <xsl:if test="xalan:nodeset($contents)/figure">
4417
- <fo:bookmark internal-destination="{xalan:nodeset($contents)/figure[1]/@id}" starting-state="hide">
4759
+ <xsl:variable name="contents_nodes" select="xalan:nodeset($contents)"/>
4760
+ <xsl:if test="$contents_nodes/figure">
4761
+ <fo:bookmark internal-destination="{$contents_nodes/figure[1]/@id}" starting-state="hide">
4418
4762
  <fo:bookmark-title>Figures</fo:bookmark-title>
4419
- <xsl:for-each select="xalan:nodeset($contents)/figure">
4763
+ <xsl:for-each select="$contents_nodes/figure">
4420
4764
  <fo:bookmark internal-destination="{@id}">
4421
4765
  <fo:bookmark-title>
4422
4766
  <xsl:value-of select="normalize-space(title)"/>
@@ -4425,18 +4769,40 @@
4425
4769
  </xsl:for-each>
4426
4770
  </fo:bookmark>
4427
4771
  </xsl:if>
4772
+
4773
+
4774
+ <xsl:if test="$contents_nodes//figures/figure">
4775
+ <fo:bookmark internal-destination="empty_bookmark" starting-state="hide">
4776
+
4777
+
4778
+
4779
+ <xsl:variable name="bookmark-title">
4780
+
4781
+ <xsl:value-of select="$title-list-figures"/>
4782
+
4783
+ </xsl:variable>
4784
+ <fo:bookmark-title><xsl:value-of select="normalize-space($bookmark-title)"/></fo:bookmark-title>
4785
+ <xsl:for-each select="$contents_nodes//figures/figure">
4786
+ <fo:bookmark internal-destination="{@id}">
4787
+ <fo:bookmark-title><xsl:value-of select="normalize-space(.)"/></fo:bookmark-title>
4788
+ </fo:bookmark>
4789
+ </xsl:for-each>
4790
+ </fo:bookmark>
4791
+ </xsl:if>
4792
+
4428
4793
  </xsl:template><xsl:template name="insertTableBookmarks">
4429
4794
  <xsl:param name="contents"/>
4430
4795
  <xsl:param name="lang"/>
4431
- <xsl:if test="xalan:nodeset($contents)/table">
4432
- <fo:bookmark internal-destination="{xalan:nodeset($contents)/table[1]/@id}" starting-state="hide">
4796
+ <xsl:variable name="contents_nodes" select="xalan:nodeset($contents)"/>
4797
+ <xsl:if test="$contents_nodes/table">
4798
+ <fo:bookmark internal-destination="{$contents_nodes/table[1]/@id}" starting-state="hide">
4433
4799
  <fo:bookmark-title>
4434
4800
  <xsl:choose>
4435
4801
  <xsl:when test="$lang = 'fr'">Tableaux</xsl:when>
4436
4802
  <xsl:otherwise>Tables</xsl:otherwise>
4437
4803
  </xsl:choose>
4438
4804
  </fo:bookmark-title>
4439
- <xsl:for-each select="xalan:nodeset($contents)/table">
4805
+ <xsl:for-each select="$contents_nodes/table">
4440
4806
  <fo:bookmark internal-destination="{@id}">
4441
4807
  <fo:bookmark-title>
4442
4808
  <xsl:value-of select="normalize-space(title)"/>
@@ -4445,6 +4811,29 @@
4445
4811
  </xsl:for-each>
4446
4812
  </fo:bookmark>
4447
4813
  </xsl:if>
4814
+
4815
+
4816
+ <xsl:if test="$contents_nodes//tables/table">
4817
+ <fo:bookmark internal-destination="empty_bookmark" starting-state="hide">
4818
+
4819
+
4820
+
4821
+ <xsl:variable name="bookmark-title">
4822
+
4823
+ <xsl:value-of select="$title-list-tables"/>
4824
+
4825
+ </xsl:variable>
4826
+
4827
+ <fo:bookmark-title><xsl:value-of select="$bookmark-title"/></fo:bookmark-title>
4828
+
4829
+ <xsl:for-each select="$contents_nodes//tables/table">
4830
+ <fo:bookmark internal-destination="{@id}">
4831
+ <fo:bookmark-title><xsl:value-of select="normalize-space(.)"/></fo:bookmark-title>
4832
+ </fo:bookmark>
4833
+ </xsl:for-each>
4834
+ </fo:bookmark>
4835
+ </xsl:if>
4836
+
4448
4837
  </xsl:template><xsl:template name="getLangVersion">
4449
4838
  <xsl:param name="lang"/>
4450
4839
  <xsl:param name="doctype" select="''"/>
@@ -4643,12 +5032,140 @@
4643
5032
  </fo:block-container>
4644
5033
  </fo:block-container>
4645
5034
  </xsl:template><xsl:template match="*[local-name()='sourcecode']/text()" priority="2">
4646
- <xsl:variable name="text">
5035
+ <xsl:choose>
5036
+ <xsl:when test="normalize-space($syntax-highlight) = 'true' and normalize-space(../@lang) != ''"> <!-- condition for turn on of highlighting -->
5037
+ <xsl:variable name="syntax" select="java:org.metanorma.fop.Util.syntaxHighlight(., ../@lang)"/>
5038
+ <xsl:choose>
5039
+ <xsl:when test="normalize-space($syntax) != ''"><!-- if there is highlighted result -->
5040
+ <xsl:apply-templates select="xalan:nodeset($syntax)" mode="syntax_highlight"/> <!-- process span tags -->
5041
+ </xsl:when>
5042
+ <xsl:otherwise> <!-- if case of non-succesfull syntax highlight (for instance, unknown lang), process without highlighting -->
5043
+ <xsl:call-template name="add_spaces_to_sourcecode"/>
5044
+ </xsl:otherwise>
5045
+ </xsl:choose>
5046
+ </xsl:when>
5047
+ <xsl:otherwise>
5048
+ <xsl:call-template name="add_spaces_to_sourcecode"/>
5049
+ </xsl:otherwise>
5050
+ </xsl:choose>
5051
+
5052
+ </xsl:template><xsl:template name="add_spaces_to_sourcecode">
5053
+ <xsl:variable name="text_step1">
4647
5054
  <xsl:call-template name="add-zero-spaces-equal"/>
4648
5055
  </xsl:variable>
4649
- <xsl:call-template name="add-zero-spaces-java">
4650
- <xsl:with-param name="text" select="$text"/>
4651
- </xsl:call-template>
5056
+ <xsl:variable name="text_step2">
5057
+ <xsl:call-template name="add-zero-spaces-java">
5058
+ <xsl:with-param name="text" select="$text_step1"/>
5059
+ </xsl:call-template>
5060
+ </xsl:variable>
5061
+ <xsl:value-of select="$text_step2"/>
5062
+ </xsl:template><xsl:template match="*" mode="syntax_highlight">
5063
+ <xsl:apply-templates mode="syntax_highlight"/>
5064
+ </xsl:template><xsl:variable name="syntax_highlight_styles_">
5065
+ <style class="hljs-addition" xsl:use-attribute-sets="hljs-addition"/>
5066
+ <style class="hljs-attr" xsl:use-attribute-sets="hljs-attr"/>
5067
+ <style class="hljs-attribute" xsl:use-attribute-sets="hljs-attribute"/>
5068
+ <style class="hljs-built_in" xsl:use-attribute-sets="hljs-built_in"/>
5069
+ <style class="hljs-bullet" xsl:use-attribute-sets="hljs-bullet"/>
5070
+ <style class="hljs-char_and_escape_" xsl:use-attribute-sets="hljs-char_and_escape_"/>
5071
+ <style class="hljs-code" xsl:use-attribute-sets="hljs-code"/>
5072
+ <style class="hljs-comment" xsl:use-attribute-sets="hljs-comment"/>
5073
+ <style class="hljs-deletion" xsl:use-attribute-sets="hljs-deletion"/>
5074
+ <style class="hljs-doctag" xsl:use-attribute-sets="hljs-doctag"/>
5075
+ <style class="hljs-emphasis" xsl:use-attribute-sets="hljs-emphasis"/>
5076
+ <style class="hljs-formula" xsl:use-attribute-sets="hljs-formula"/>
5077
+ <style class="hljs-keyword" xsl:use-attribute-sets="hljs-keyword"/>
5078
+ <style class="hljs-link" xsl:use-attribute-sets="hljs-link"/>
5079
+ <style class="hljs-literal" xsl:use-attribute-sets="hljs-literal"/>
5080
+ <style class="hljs-meta" xsl:use-attribute-sets="hljs-meta"/>
5081
+ <style class="hljs-meta_hljs-string" xsl:use-attribute-sets="hljs-meta_hljs-string"/>
5082
+ <style class="hljs-meta_hljs-keyword" xsl:use-attribute-sets="hljs-meta_hljs-keyword"/>
5083
+ <style class="hljs-name" xsl:use-attribute-sets="hljs-name"/>
5084
+ <style class="hljs-number" xsl:use-attribute-sets="hljs-number"/>
5085
+ <style class="hljs-operator" xsl:use-attribute-sets="hljs-operator"/>
5086
+ <style class="hljs-params" xsl:use-attribute-sets="hljs-params"/>
5087
+ <style class="hljs-property" xsl:use-attribute-sets="hljs-property"/>
5088
+ <style class="hljs-punctuation" xsl:use-attribute-sets="hljs-punctuation"/>
5089
+ <style class="hljs-quote" xsl:use-attribute-sets="hljs-quote"/>
5090
+ <style class="hljs-regexp" xsl:use-attribute-sets="hljs-regexp"/>
5091
+ <style class="hljs-section" xsl:use-attribute-sets="hljs-section"/>
5092
+ <style class="hljs-selector-attr" xsl:use-attribute-sets="hljs-selector-attr"/>
5093
+ <style class="hljs-selector-class" xsl:use-attribute-sets="hljs-selector-class"/>
5094
+ <style class="hljs-selector-id" xsl:use-attribute-sets="hljs-selector-id"/>
5095
+ <style class="hljs-selector-pseudo" xsl:use-attribute-sets="hljs-selector-pseudo"/>
5096
+ <style class="hljs-selector-tag" xsl:use-attribute-sets="hljs-selector-tag"/>
5097
+ <style class="hljs-string" xsl:use-attribute-sets="hljs-string"/>
5098
+ <style class="hljs-strong" xsl:use-attribute-sets="hljs-strong"/>
5099
+ <style class="hljs-subst" xsl:use-attribute-sets="hljs-subst"/>
5100
+ <style class="hljs-symbol" xsl:use-attribute-sets="hljs-symbol"/>
5101
+ <style class="hljs-tag" xsl:use-attribute-sets="hljs-tag"/>
5102
+ <!-- <style class="hljs-tag_hljs-attr" xsl:use-attribute-sets="hljs-tag_hljs-attr"></style> -->
5103
+ <!-- <style class="hljs-tag_hljs-name" xsl:use-attribute-sets="hljs-tag_hljs-name"></style> -->
5104
+ <style class="hljs-template-tag" xsl:use-attribute-sets="hljs-template-tag"/>
5105
+ <style class="hljs-template-variable" xsl:use-attribute-sets="hljs-template-variable"/>
5106
+ <style class="hljs-title" xsl:use-attribute-sets="hljs-title"/>
5107
+ <style class="hljs-title_and_class_" xsl:use-attribute-sets="hljs-title_and_class_"/>
5108
+ <style class="hljs-title_and_class__and_inherited__" xsl:use-attribute-sets="hljs-title_and_class__and_inherited__"/>
5109
+ <style class="hljs-title_and_function_" xsl:use-attribute-sets="hljs-title_and_function_"/>
5110
+ <style class="hljs-type" xsl:use-attribute-sets="hljs-type"/>
5111
+ <style class="hljs-variable" xsl:use-attribute-sets="hljs-variable"/>
5112
+ <style class="hljs-variable_and_language_" xsl:use-attribute-sets="hljs-variable_and_language_"/>
5113
+ </xsl:variable><xsl:variable name="syntax_highlight_styles" select="xalan:nodeset($syntax_highlight_styles_)"/><xsl:template match="span" mode="syntax_highlight" priority="2">
5114
+ <!-- <fo:inline color="green" font-style="italic"><xsl:apply-templates mode="syntax_highlight"/></fo:inline> -->
5115
+ <fo:inline>
5116
+ <xsl:variable name="classes_">
5117
+ <xsl:call-template name="split">
5118
+ <xsl:with-param name="pText" select="@class"/>
5119
+ <xsl:with-param name="sep" select="' '"/>
5120
+ </xsl:call-template>
5121
+ <!-- a few classes together (_and_ suffix) -->
5122
+ <xsl:if test="contains(@class, 'hljs-char') and contains(@class, 'escape_')">
5123
+ <item>hljs-char_and_escape_</item>
5124
+ </xsl:if>
5125
+ <xsl:if test="contains(@class, 'hljs-title') and contains(@class, 'class_')">
5126
+ <item>hljs-title_and_class_</item>
5127
+ </xsl:if>
5128
+ <xsl:if test="contains(@class, 'hljs-title') and contains(@class, 'class_') and contains(@class, 'inherited__')">
5129
+ <item>hljs-title_and_class__and_inherited__</item>
5130
+ </xsl:if>
5131
+ <xsl:if test="contains(@class, 'hljs-title') and contains(@class, 'function_')">
5132
+ <item>hljs-title_and_function_</item>
5133
+ </xsl:if>
5134
+ <xsl:if test="contains(@class, 'hljs-variable') and contains(@class, 'language_')">
5135
+ <item>hljs-variable_and_language_</item>
5136
+ </xsl:if>
5137
+ <!-- with parent classes (_ suffix) -->
5138
+ <xsl:if test="contains(@class, 'hljs-keyword') and contains(ancestor::*/@class, 'hljs-meta')">
5139
+ <item>hljs-meta_hljs-keyword</item>
5140
+ </xsl:if>
5141
+ <xsl:if test="contains(@class, 'hljs-string') and contains(ancestor::*/@class, 'hljs-meta')">
5142
+ <item>hljs-meta_hljs-string</item>
5143
+ </xsl:if>
5144
+ </xsl:variable>
5145
+ <xsl:variable name="classes" select="xalan:nodeset($classes_)"/>
5146
+
5147
+ <xsl:for-each select="$classes/item">
5148
+ <xsl:variable name="class_name" select="."/>
5149
+ <xsl:for-each select="$syntax_highlight_styles/style[@class = $class_name]/@*[not(local-name() = 'class')]">
5150
+ <xsl:attribute name="{local-name()}"><xsl:value-of select="."/></xsl:attribute>
5151
+ </xsl:for-each>
5152
+ </xsl:for-each>
5153
+
5154
+ <!-- <xsl:variable name="class_name">
5155
+ <xsl:choose>
5156
+ <xsl:when test="@class = 'hljs-attr' and ancestor::*/@class = 'hljs-tag'">hljs-tag_hljs-attr</xsl:when>
5157
+ <xsl:when test="@class = 'hljs-name' and ancestor::*/@class = 'hljs-tag'">hljs-tag_hljs-name</xsl:when>
5158
+ <xsl:when test="@class = 'hljs-string' and ancestor::*/@class = 'hljs-meta'">hljs-meta_hljs-string</xsl:when>
5159
+ <xsl:otherwise><xsl:value-of select="@class"/></xsl:otherwise>
5160
+ </xsl:choose>
5161
+ </xsl:variable>
5162
+ <xsl:for-each select="$syntax_highlight_styles/style[@class = $class_name]/@*[not(local-name() = 'class')]">
5163
+ <xsl:attribute name="{local-name()}"><xsl:value-of select="."/></xsl:attribute>
5164
+ </xsl:for-each> -->
5165
+
5166
+ <xsl:apply-templates mode="syntax_highlight"/></fo:inline>
5167
+ </xsl:template><xsl:template match="text()" mode="syntax_highlight" priority="2">
5168
+ <xsl:call-template name="add_spaces_to_sourcecode"/>
4652
5169
  </xsl:template><xsl:template match="*[local-name() = 'sourcecode']/*[local-name() = 'name']">
4653
5170
  <xsl:if test="normalize-space() != ''">
4654
5171
  <fo:block xsl:use-attribute-sets="sourcecode-name-style">
@@ -4973,6 +5490,8 @@
4973
5490
  </xsl:otherwise>
4974
5491
  </xsl:choose> -->
4975
5492
  </fo:block>
5493
+ </xsl:template><xsl:template match="*[local-name() = 'termsource']/text()[starts-with(., '[SOURCE: Adapted from: ')]" priority="2">
5494
+ <xsl:text>[</xsl:text><xsl:value-of select="substring-after(., '[SOURCE: ')"/>
4976
5495
  </xsl:template><xsl:template match="*[local-name() = 'termsource']/text()">
4977
5496
  <xsl:if test="normalize-space() != ''">
4978
5497
  <xsl:value-of select="."/>
@@ -5019,11 +5538,14 @@
5019
5538
 
5020
5539
 
5021
5540
  <fo:block-container margin-left="0mm">
5022
-
5023
- <fo:block xsl:use-attribute-sets="quote-style">
5541
+ <fo:block-container xsl:use-attribute-sets="quote-style">
5024
5542
 
5025
- <xsl:apply-templates select="./node()[not(local-name() = 'author') and not(local-name() = 'source')]"/> <!-- process all nested nodes, except author and source -->
5026
- </fo:block>
5543
+ <fo:block-container margin-left="0mm" margin-right="0mm">
5544
+ <fo:block role="BlockQuote">
5545
+ <xsl:apply-templates select="./node()[not(local-name() = 'author') and not(local-name() = 'source')]"/> <!-- process all nested nodes, except author and source -->
5546
+ </fo:block>
5547
+ </fo:block-container>
5548
+ </fo:block-container>
5027
5549
  <xsl:if test="*[local-name() = 'author'] or *[local-name() = 'source']">
5028
5550
  <fo:block xsl:use-attribute-sets="quote-source-style">
5029
5551
  <!-- — ISO, ISO 7301:2011, Clause 1 -->
@@ -5044,26 +5566,11 @@
5044
5566
  </xsl:template><xsl:template match="*[local-name() = 'author']">
5045
5567
  <xsl:text>— </xsl:text>
5046
5568
  <xsl:apply-templates/>
5047
- </xsl:template><xsl:variable name="bibitem_hidden_">
5048
- <xsl:for-each select="//*[local-name() = 'bibitem'][@hidden='true']">
5049
- <xsl:copy-of select="."/>
5050
- </xsl:for-each>
5051
- <xsl:for-each select="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem']">
5052
- <xsl:copy-of select="."/>
5053
- </xsl:for-each>
5054
- </xsl:variable><xsl:variable name="bibitem_hidden" select="xalan:nodeset($bibitem_hidden_)"/><xsl:template match="*[local-name() = 'eref']">
5055
-
5056
- <xsl:variable name="bibitemid">
5057
- <xsl:choose>
5058
- <!-- <xsl:when test="//*[local-name() = 'bibitem'][@hidden='true' and @id = current()/@bibitemid]"></xsl:when>
5059
- <xsl:when test="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"></xsl:when> -->
5060
- <xsl:when test="$bibitem_hidden/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"/>
5061
- <xsl:otherwise><xsl:value-of select="@bibitemid"/></xsl:otherwise>
5062
- </xsl:choose>
5063
- </xsl:variable>
5064
-
5569
+ </xsl:template><xsl:template match="*[local-name() = 'eref']">
5570
+ <xsl:variable name="current_bibitemid" select="@bibitemid"/>
5571
+ <xsl:variable name="external-destination" select="normalize-space(key('bibitems', $current_bibitemid)/*[local-name() = 'uri'][@type = 'citation'])"/>
5065
5572
  <xsl:choose>
5066
- <xsl:when test="normalize-space($bibitemid) != ''"> <!-- if in the bibliography there is the item with @bibitemid (and not hidden), then create link -->
5573
+ <xsl:when test="$external-destination != '' or not(key('bibitems_hidden', $current_bibitemid))"> <!-- if in the bibliography there is the item with @bibitemid (and not hidden), then create link (internal to the bibitem or external) -->
5067
5574
  <fo:inline xsl:use-attribute-sets="eref-style">
5068
5575
  <xsl:if test="@type = 'footnote'">
5069
5576
  <xsl:attribute name="keep-together.within-line">always</xsl:attribute>
@@ -5077,8 +5584,8 @@
5077
5584
  <xsl:variable name="text" select="normalize-space()"/>
5078
5585
 
5079
5586
 
5080
-
5081
- <fo:basic-link internal-destination="{@bibitemid}" fox:alt-text="{@citeas}">
5587
+
5588
+ <fo:basic-link fox:alt-text="{@citeas}">
5082
5589
  <xsl:if test="normalize-space(@citeas) = ''">
5083
5590
  <xsl:attribute name="fox:alt-text"><xsl:value-of select="."/></xsl:attribute>
5084
5591
  </xsl:if>
@@ -5088,14 +5595,21 @@
5088
5595
 
5089
5596
  </xsl:if>
5090
5597
 
5091
-
5598
+ <xsl:choose>
5599
+ <xsl:when test="$external-destination != ''"> <!-- external hyperlink -->
5600
+ <xsl:attribute name="external-destination"><xsl:value-of select="$external-destination"/></xsl:attribute>
5601
+ </xsl:when>
5602
+ <xsl:otherwise>
5603
+ <xsl:attribute name="internal-destination"><xsl:value-of select="@bibitemid"/></xsl:attribute>
5604
+ </xsl:otherwise>
5605
+ </xsl:choose>
5092
5606
 
5093
5607
  <xsl:apply-templates/>
5094
5608
  </fo:basic-link>
5095
-
5609
+
5096
5610
  </fo:inline>
5097
5611
  </xsl:when>
5098
- <xsl:otherwise>
5612
+ <xsl:otherwise> <!-- if there is key('bibitems_hidden', $current_bibitemid) -->
5099
5613
  <fo:inline><xsl:apply-templates/></fo:inline>
5100
5614
  </xsl:otherwise>
5101
5615
  </xsl:choose>
@@ -5163,6 +5677,36 @@
5163
5677
  <xsl:with-param name="count" select="$count - 1"/>
5164
5678
  </xsl:call-template>
5165
5679
  </xsl:if>
5680
+ </xsl:template><xsl:template match="*[local-name() = 'preferred']">
5681
+ <xsl:variable name="level">
5682
+ <xsl:call-template name="getLevel"/>
5683
+ </xsl:variable>
5684
+ <xsl:variable name="font-size">
5685
+
5686
+ <xsl:choose>
5687
+ <xsl:when test="$level &gt;= 2">11pt</xsl:when>
5688
+ <xsl:otherwise>12pt</xsl:otherwise>
5689
+ </xsl:choose>
5690
+
5691
+ </xsl:variable>
5692
+ <xsl:variable name="levelTerm">
5693
+ <xsl:call-template name="getLevelTermName"/>
5694
+ </xsl:variable>
5695
+ <fo:block font-size="{normalize-space($font-size)}" role="H{$levelTerm}" xsl:use-attribute-sets="preferred-block-style">
5696
+
5697
+
5698
+
5699
+ <xsl:if test="parent::*[local-name() = 'term'] and not(preceding-sibling::*[local-name() = 'preferred'])"> <!-- if first preffered in term, then display term's name -->
5700
+ <fo:block xsl:use-attribute-sets="term-name-style">
5701
+ <xsl:apply-templates select="ancestor::*[local-name() = 'term'][1]/*[local-name() = 'name']"/>
5702
+ </fo:block>
5703
+ </xsl:if>
5704
+
5705
+ <fo:block xsl:use-attribute-sets="preferred-term-style">
5706
+ <xsl:call-template name="setStyle_preferred"/>
5707
+ <xsl:apply-templates/>
5708
+ </fo:block>
5709
+ </fo:block>
5166
5710
  </xsl:template><xsl:template match="*[local-name() = 'domain']">
5167
5711
  <fo:inline xsl:use-attribute-sets="domain-style">&lt;<xsl:apply-templates/>&gt;</fo:inline>
5168
5712
  <xsl:text> </xsl:text>
@@ -5251,26 +5795,10 @@
5251
5795
  <xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),' ',' ')"/>
5252
5796
  </xsl:template><xsl:variable name="ul_labels_">
5253
5797
 
5254
-
5255
-
5256
- <label level="1">•</label>
5257
- <label level="2">-</label><!-- minus -->
5258
- <label level="3" font-size="75%">o</label> <!-- white circle -->
5259
-
5260
-
5261
-
5262
-
5263
-
5264
-
5265
-
5266
-
5267
-
5268
-
5269
-
5270
-
5271
-
5272
-
5273
-
5798
+ <label level="1">•</label>
5799
+ <label level="2">-</label><!-- minus -->
5800
+ <label level="3" font-size="75%">o</label> <!-- white circle -->
5801
+
5274
5802
  </xsl:variable><xsl:variable name="ul_labels" select="xalan:nodeset($ul_labels_)"/><xsl:template name="setULLabel">
5275
5803
  <xsl:variable name="list_level_" select="count(ancestor::*[local-name() = 'ul']) + count(ancestor::*[local-name() = 'ol'])"/>
5276
5804
  <xsl:variable name="list_level">
@@ -5296,6 +5824,91 @@
5296
5824
  </xsl:template><xsl:template match="label" mode="ul_labels">
5297
5825
  <xsl:copy-of select="@*[not(local-name() = 'level')]"/>
5298
5826
  <xsl:value-of select="."/>
5827
+ </xsl:template><xsl:template name="getListItemFormat">
5828
+ <!-- Example: for BSI <?list-type loweralpha?> -->
5829
+ <xsl:variable name="processing_instruction_type" select="normalize-space(../preceding-sibling::*[1]/processing-instruction('list-type'))"/>
5830
+ <xsl:choose>
5831
+ <xsl:when test="local-name(..) = 'ul'">
5832
+ <xsl:choose>
5833
+ <xsl:when test="normalize-space($processing_instruction_type) = 'simple'"/>
5834
+ <xsl:otherwise><xsl:call-template name="setULLabel"/></xsl:otherwise>
5835
+ </xsl:choose>
5836
+ </xsl:when>
5837
+ <xsl:otherwise> <!-- for ordered lists 'ol' -->
5838
+
5839
+ <!-- Example: for BSI <?list-start 2?> -->
5840
+ <xsl:variable name="processing_instruction_start" select="normalize-space(../preceding-sibling::*[1]/processing-instruction('list-start'))"/>
5841
+
5842
+ <xsl:variable name="start_value">
5843
+ <xsl:choose>
5844
+ <xsl:when test="normalize-space($processing_instruction_start) != ''">
5845
+ <xsl:value-of select="number($processing_instruction_start) - 1"/><!-- if start="3" then start_value=2 + xsl:number(1) = 3 -->
5846
+ </xsl:when>
5847
+ <xsl:when test="normalize-space(../@start) != ''">
5848
+ <xsl:value-of select="number(../@start) - 1"/><!-- if start="3" then start_value=2 + xsl:number(1) = 3 -->
5849
+ </xsl:when>
5850
+ <xsl:otherwise>0</xsl:otherwise>
5851
+ </xsl:choose>
5852
+ </xsl:variable>
5853
+
5854
+ <xsl:variable name="curr_value"><xsl:number/></xsl:variable>
5855
+
5856
+ <xsl:variable name="type">
5857
+ <xsl:choose>
5858
+ <xsl:when test="normalize-space($processing_instruction_type) != ''"><xsl:value-of select="$processing_instruction_type"/></xsl:when>
5859
+ <xsl:when test="normalize-space(../@type) != ''"><xsl:value-of select="../@type"/></xsl:when>
5860
+
5861
+ <xsl:otherwise> <!-- if no @type or @class = 'steps' -->
5862
+
5863
+ <xsl:variable name="list_level_" select="count(ancestor::*[local-name() = 'ul']) + count(ancestor::*[local-name() = 'ol'])"/>
5864
+ <xsl:variable name="list_level">
5865
+ <xsl:choose>
5866
+ <xsl:when test="$list_level_ &lt;= 5"><xsl:value-of select="$list_level_"/></xsl:when>
5867
+ <xsl:otherwise><xsl:value-of select="$list_level_ mod 5"/></xsl:otherwise>
5868
+ </xsl:choose>
5869
+ </xsl:variable>
5870
+
5871
+ <xsl:choose>
5872
+ <xsl:when test="$list_level mod 5 = 0">roman_upper</xsl:when> <!-- level 5 -->
5873
+ <xsl:when test="$list_level mod 4 = 0">alphabet_upper</xsl:when> <!-- level 4 -->
5874
+ <xsl:when test="$list_level mod 3 = 0">roman</xsl:when> <!-- level 3 -->
5875
+ <xsl:when test="$list_level mod 2 = 0 and ancestor::*/@class = 'steps'">alphabet</xsl:when> <!-- level 2 and @class = 'steps'-->
5876
+ <xsl:when test="$list_level mod 2 = 0">arabic</xsl:when> <!-- level 2 -->
5877
+ <xsl:otherwise> <!-- level 1 -->
5878
+ <xsl:choose>
5879
+ <xsl:when test="ancestor::*/@class = 'steps'">arabic</xsl:when>
5880
+ <xsl:otherwise>alphabet</xsl:otherwise>
5881
+ </xsl:choose>
5882
+ </xsl:otherwise>
5883
+ </xsl:choose>
5884
+
5885
+ </xsl:otherwise>
5886
+ </xsl:choose>
5887
+ </xsl:variable>
5888
+
5889
+ <xsl:variable name="format">
5890
+ <xsl:choose>
5891
+ <xsl:when test="$type = 'arabic'">
5892
+ 1)
5893
+ </xsl:when>
5894
+ <xsl:when test="$type = 'alphabet'">
5895
+ a)
5896
+ </xsl:when>
5897
+ <xsl:when test="$type = 'alphabet_upper'">
5898
+ A)
5899
+ </xsl:when>
5900
+ <xsl:when test="$type = 'roman'">
5901
+ i)
5902
+ </xsl:when>
5903
+ <xsl:when test="$type = 'roman_upper'">I.</xsl:when>
5904
+ <xsl:otherwise>1.</xsl:otherwise> <!-- for any case, if $type has non-determined value, not using -->
5905
+ </xsl:choose>
5906
+ </xsl:variable>
5907
+
5908
+ <xsl:number value="$start_value + $curr_value" format="{normalize-space($format)}" lang="en"/>
5909
+
5910
+ </xsl:otherwise>
5911
+ </xsl:choose>
5299
5912
  </xsl:template><xsl:template match="*[local-name() = 'ul'] | *[local-name() = 'ol']">
5300
5913
  <xsl:choose>
5301
5914
  <xsl:when test="parent::*[local-name() = 'note'] or parent::*[local-name() = 'termnote']">
@@ -5311,18 +5924,71 @@
5311
5924
 
5312
5925
  <fo:block-container margin-left="0mm">
5313
5926
  <fo:block>
5314
- <xsl:apply-templates select="." mode="ul_ol"/>
5927
+ <xsl:apply-templates select="." mode="list"/>
5315
5928
  </fo:block>
5316
5929
  </fo:block-container>
5317
5930
  </fo:block-container>
5318
5931
  </xsl:when>
5319
5932
  <xsl:otherwise>
5320
5933
  <fo:block>
5321
- <xsl:apply-templates select="." mode="ul_ol"/>
5934
+ <xsl:apply-templates select="." mode="list"/>
5322
5935
  </fo:block>
5323
5936
  </xsl:otherwise>
5324
5937
  </xsl:choose>
5325
- </xsl:template><xsl:variable name="index" select="document($external_index)"/><xsl:variable name="dash" select="'–'"/><xsl:variable name="bookmark_in_fn">
5938
+ </xsl:template><xsl:template match="*[local-name()='ul'] | *[local-name()='ol']" mode="list" name="list">
5939
+ <fo:list-block xsl:use-attribute-sets="list-style">
5940
+
5941
+
5942
+
5943
+
5944
+
5945
+
5946
+
5947
+
5948
+
5949
+ <xsl:apply-templates select="node()[not(local-name() = 'note')]"/>
5950
+ </fo:list-block>
5951
+ <!-- <xsl:for-each select="./iho:note">
5952
+ <xsl:call-template name="note"/>
5953
+ </xsl:for-each> -->
5954
+ <xsl:apply-templates select="./*[local-name() = 'note']"/>
5955
+ </xsl:template><xsl:template match="*[local-name()='li']">
5956
+ <fo:list-item xsl:use-attribute-sets="list-item-style">
5957
+ <xsl:copy-of select="@id"/>
5958
+
5959
+
5960
+
5961
+ <fo:list-item-label end-indent="label-end()">
5962
+ <fo:block xsl:use-attribute-sets="list-item-label-style">
5963
+
5964
+
5965
+
5966
+ <!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
5967
+ <xsl:if test="*[1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
5968
+ <xsl:call-template name="append_add-style"/>
5969
+ </xsl:if>
5970
+
5971
+ <xsl:call-template name="getListItemFormat"/>
5972
+ </fo:block>
5973
+ </fo:list-item-label>
5974
+ <fo:list-item-body start-indent="body-start()" xsl:use-attribute-sets="list-item-body-style">
5975
+ <fo:block>
5976
+
5977
+
5978
+
5979
+
5980
+
5981
+ <xsl:apply-templates/>
5982
+
5983
+ <!-- <xsl:apply-templates select="node()[not(local-name() = 'note')]" />
5984
+
5985
+ <xsl:for-each select="./bsi:note">
5986
+ <xsl:call-template name="note"/>
5987
+ </xsl:for-each> -->
5988
+ </fo:block>
5989
+ </fo:list-item-body>
5990
+ </fo:list-item>
5991
+ </xsl:template><xsl:variable name="index" select="document($external_index)"/><xsl:variable name="bookmark_in_fn">
5326
5992
  <xsl:for-each select="//*[local-name() = 'bookmark'][ancestor::*[local-name() = 'fn']]">
5327
5993
  <bookmark><xsl:value-of select="@id"/></bookmark>
5328
5994
  </xsl:for-each>
@@ -5344,7 +6010,7 @@
5344
6010
  <!-- split <xref target="bm1" to="End" pagenumber="true"> to two xref:
5345
6011
  <xref target="bm1" pagenumber="true"> and <xref target="End" pagenumber="true"> -->
5346
6012
  <xsl:if test="@to">
5347
- <xsl:value-of select="$dash"/>
6013
+ <xsl:value-of select="$en_dash"/>
5348
6014
  <xsl:copy>
5349
6015
  <xsl:copy-of select="@*"/>
5350
6016
  <xsl:attribute name="target"><xsl:value-of select="@to"/></xsl:attribute>
@@ -5369,7 +6035,7 @@
5369
6035
  <xsl:param name="target"/>
5370
6036
  <!-- <node></node> -->
5371
6037
  <xsl:choose>
5372
- <xsl:when test="self::text() and (normalize-space(.) = ',' or normalize-space(.) = $dash) and $remove = 'true'">
6038
+ <xsl:when test="self::text() and (normalize-space(.) = ',' or normalize-space(.) = $en_dash) and $remove = 'true'">
5373
6039
  <!-- skip text (i.e. remove it) and process next element -->
5374
6040
  <!-- [removed_<xsl:value-of select="."/>] -->
5375
6041
  <xsl:apply-templates select="following-sibling::node()[1]" mode="process_li_element">
@@ -5453,12 +6119,22 @@
5453
6119
  </xsl:variable>
5454
6120
  <xsl:variable name="xref_number"><xsl:number count="*[local-name() = 'xref']"/></xsl:variable>
5455
6121
  <xsl:value-of select="concat($docid, '_', $item_number, '_', $xref_number)"/> <!-- $level, '_', -->
6122
+ </xsl:template><xsl:template match="*[local-name() = 'indexsect']/*[local-name() = 'title']" priority="4">
6123
+ <fo:block xsl:use-attribute-sets="indexsect-title-style">
6124
+ <!-- Index -->
6125
+ <xsl:apply-templates/>
6126
+ </fo:block>
6127
+ </xsl:template><xsl:template match="*[local-name() = 'indexsect']/*[local-name() = 'clause']/*[local-name() = 'title']" priority="4">
6128
+ <!-- Letter A, B, C, ... -->
6129
+ <fo:block xsl:use-attribute-sets="indexsect-clause-title-style">
6130
+ <xsl:apply-templates/>
6131
+ </fo:block>
5456
6132
  </xsl:template><xsl:template match="*[local-name() = 'indexsect']/*[local-name() = 'clause']" priority="4">
5457
6133
  <xsl:apply-templates/>
5458
6134
  <fo:block>
5459
- <xsl:if test="following-sibling::*[local-name() = 'clause']">
5460
- <fo:block> </fo:block>
5461
- </xsl:if>
6135
+ <xsl:if test="following-sibling::*[local-name() = 'clause']">
6136
+ <fo:block> </fo:block>
6137
+ </xsl:if>
5462
6138
  </fo:block>
5463
6139
  </xsl:template><xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'ul']" priority="4">
5464
6140
  <xsl:apply-templates/>
@@ -5468,6 +6144,9 @@
5468
6144
 
5469
6145
  <xsl:apply-templates/>
5470
6146
  </fo:block>
6147
+ </xsl:template><xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'li']/text()">
6148
+ <!-- to split by '_' and other chars -->
6149
+ <xsl:call-template name="add-zero-spaces-java"/>
5471
6150
  </xsl:template><xsl:template match="*[local-name() = 'bookmark']" name="bookmark">
5472
6151
  <fo:inline id="{@id}" font-size="1pt"/>
5473
6152
  </xsl:template><xsl:template match="*[local-name() = 'errata']">
@@ -5706,6 +6385,24 @@
5706
6385
  <xsl:apply-templates/>
5707
6386
  </fo:inline>
5708
6387
  </xsl:template><xsl:template match="*[local-name() = 'bibitem']/*[local-name() = 'note']" priority="2">
6388
+
6389
+ <!-- list of footnotes to calculate actual footnotes number -->
6390
+ <xsl:variable name="p_fn_">
6391
+ <xsl:call-template name="get_fn_list"/>
6392
+ </xsl:variable>
6393
+ <xsl:variable name="p_fn" select="xalan:nodeset($p_fn_)"/>
6394
+ <xsl:variable name="gen_id" select="generate-id(.)"/>
6395
+ <xsl:variable name="lang" select="ancestor::*[contains(local-name(), '-standard')]/*[local-name()='bibdata']//*[local-name()='language'][@current = 'true']"/>
6396
+ <!-- fn sequence number in document -->
6397
+ <xsl:variable name="current_fn_number">
6398
+ <xsl:choose>
6399
+ <xsl:when test="@current_fn_number"><xsl:value-of select="@current_fn_number"/></xsl:when> <!-- for BSI -->
6400
+ <xsl:otherwise>
6401
+ <!-- <xsl:value-of select="count($p_fn//fn[@reference = $reference]/preceding-sibling::fn) + 1" /> -->
6402
+ <xsl:value-of select="count($p_fn//fn[@gen_id = $gen_id]/preceding-sibling::fn) + 1"/>
6403
+ </xsl:otherwise>
6404
+ </xsl:choose>
6405
+ </xsl:variable>
5709
6406
  <fo:footnote>
5710
6407
  <xsl:variable name="number">
5711
6408
 
@@ -5714,22 +6411,26 @@
5714
6411
  <xsl:number level="any" count="*[local-name() = 'references'][preceding-sibling::*[local-name() = 'references']]//*[local-name() = 'bibitem']/*[local-name() = 'note']"/>
5715
6412
  </xsl:when>
5716
6413
  <xsl:otherwise>
5717
- <xsl:number level="any" count="*[local-name() = 'bibitem']/*[local-name() = 'note']"/>
6414
+ <xsl:value-of select="$current_fn_number"/>
5718
6415
  </xsl:otherwise>
5719
6416
  </xsl:choose>
5720
6417
 
5721
6418
  </xsl:variable>
6419
+
6420
+ <xsl:variable name="current_fn_number_text">
6421
+ <xsl:value-of select="$number"/>
6422
+
6423
+ </xsl:variable>
6424
+
5722
6425
  <fo:inline xsl:use-attribute-sets="bibitem-note-fn-style">
5723
- <fo:basic-link internal-destination="{generate-id()}" fox:alt-text="footnote {$number}">
5724
- <xsl:value-of select="$number"/>
5725
-
6426
+ <fo:basic-link internal-destination="{$gen_id}" fox:alt-text="footnote {$number}">
6427
+ <xsl:value-of select="$current_fn_number_text"/>
5726
6428
  </fo:basic-link>
5727
6429
  </fo:inline>
5728
6430
  <fo:footnote-body>
5729
6431
  <fo:block xsl:use-attribute-sets="bibitem-note-fn-body-style">
5730
- <fo:inline id="{generate-id()}" xsl:use-attribute-sets="bibitem-note-fn-number-style">
5731
- <xsl:value-of select="$number"/>
5732
-
6432
+ <fo:inline id="{$gen_id}" xsl:use-attribute-sets="bibitem-note-fn-number-style">
6433
+ <xsl:value-of select="$current_fn_number_text"/>
5733
6434
  </fo:inline>
5734
6435
  <xsl:apply-templates/>
5735
6436
  </fo:block>
@@ -5855,7 +6556,7 @@
5855
6556
  </fo:table-body>
5856
6557
  </fo:table>
5857
6558
  </fo:block>
5858
- </xsl:template><xsl:template match="*[local-name() = 'toc']//*[local-name() = 'li']">
6559
+ </xsl:template><xsl:template match="*[local-name() = 'toc']//*[local-name() = 'li']" priority="2">
5859
6560
  <fo:table-row min-height="5mm">
5860
6561
  <xsl:apply-templates/>
5861
6562
  </fo:table-row>
@@ -5969,6 +6670,78 @@
5969
6670
  <!-- processing for admonition/p found in the template for 'p' -->
5970
6671
  <xsl:call-template name="paragraph"/>
5971
6672
 
6673
+ </xsl:template><xsl:template match="@*|node()" mode="update_xml_step1">
6674
+ <xsl:copy>
6675
+ <xsl:apply-templates select="@*|node()" mode="update_xml_step1"/>
6676
+ </xsl:copy>
6677
+ </xsl:template><xsl:template match="*[local-name() = 'preface']" mode="update_xml_step1">
6678
+ <xsl:copy>
6679
+ <xsl:copy-of select="@*"/>
6680
+
6681
+ <xsl:variable name="nodes_preface_">
6682
+ <xsl:for-each select="*">
6683
+ <node id="{@id}"/>
6684
+ </xsl:for-each>
6685
+ </xsl:variable>
6686
+ <xsl:variable name="nodes_preface" select="xalan:nodeset($nodes_preface_)"/>
6687
+
6688
+ <xsl:for-each select="*">
6689
+ <xsl:sort select="@displayorder" data-type="number"/>
6690
+
6691
+ <!-- process Section's title -->
6692
+ <xsl:variable name="preceding-sibling_id" select="$nodes_preface/node[@id = current()/@id]/preceding-sibling::node[1]/@id"/>
6693
+ <xsl:if test="$preceding-sibling_id != ''">
6694
+ <xsl:apply-templates select="parent::*/*[@type = 'section-title' and @id = $preceding-sibling_id and not(@displayorder)]" mode="update_xml_step1"/>
6695
+ </xsl:if>
6696
+
6697
+ <xsl:choose>
6698
+ <xsl:when test="@type = 'section-title' and not(@displayorder)"><!-- skip, don't copy, because copied in above 'apply-templates' --></xsl:when>
6699
+ <xsl:otherwise>
6700
+ <xsl:apply-templates select="." mode="update_xml_step1"/>
6701
+ </xsl:otherwise>
6702
+ </xsl:choose>
6703
+
6704
+ </xsl:for-each>
6705
+ </xsl:copy>
6706
+ </xsl:template><xsl:template match="*[local-name() = 'sections']" mode="update_xml_step1">
6707
+ <xsl:copy>
6708
+ <xsl:copy-of select="@*"/>
6709
+
6710
+ <xsl:variable name="nodes_sections_">
6711
+ <xsl:for-each select="*">
6712
+ <node id="{@id}"/>
6713
+ </xsl:for-each>
6714
+ </xsl:variable>
6715
+ <xsl:variable name="nodes_sections" select="xalan:nodeset($nodes_sections_)"/>
6716
+
6717
+ <!-- move section 'Normative references' inside 'sections' -->
6718
+ <xsl:for-each select="* | ancestor::*[contains(local-name(), '-standard')]/*[local-name()='bibliography']/*[local-name()='references'][@normative='true'] | ancestor::*[contains(local-name(), '-standard')]/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][@normative='true']]">
6719
+ <xsl:sort select="@displayorder" data-type="number"/>
6720
+
6721
+ <!-- process Section's title -->
6722
+ <xsl:variable name="preceding-sibling_id" select="$nodes_sections/node[@id = current()/@id]/preceding-sibling::node[1]/@id"/>
6723
+ <xsl:if test="$preceding-sibling_id != ''">
6724
+ <xsl:apply-templates select="parent::*/*[@type = 'section-title' and @id = $preceding-sibling_id and not(@displayorder)]" mode="update_xml_step1"/>
6725
+ </xsl:if>
6726
+
6727
+ <xsl:choose>
6728
+ <xsl:when test="@type = 'section-title' and not(@displayorder)"><!-- skip, don't copy, because copied in above 'apply-templates' --></xsl:when>
6729
+ <xsl:otherwise>
6730
+ <xsl:apply-templates select="." mode="update_xml_step1"/>
6731
+ </xsl:otherwise>
6732
+ </xsl:choose>
6733
+
6734
+ </xsl:for-each>
6735
+ </xsl:copy>
6736
+ </xsl:template><xsl:template match="*[local-name() = 'bibliography']" mode="update_xml_step1">
6737
+ <xsl:copy>
6738
+ <xsl:copy-of select="@*"/>
6739
+ <!-- copy all elements from bibliography except 'Normative references' (moved to 'sections') -->
6740
+ <xsl:for-each select="*[not(@normative='true') and not(*[*[@normative='true']])]">
6741
+ <xsl:sort select="@displayorder" data-type="number"/>
6742
+ <xsl:apply-templates select="." mode="update_xml_step1"/>
6743
+ </xsl:for-each>
6744
+ </xsl:copy>
5972
6745
  </xsl:template><xsl:template name="convertDate">
5973
6746
  <xsl:param name="date"/>
5974
6747
  <xsl:param name="format" select="'short'"/>
@@ -6082,9 +6855,6 @@
6082
6855
  <xsl:otherwise><xsl:value-of select="$charAtEnd"/></xsl:otherwise>
6083
6856
  </xsl:choose>
6084
6857
  </xsl:template><xsl:template name="addPDFUAmeta">
6085
- <xsl:variable name="lang">
6086
- <xsl:call-template name="getLang"/>
6087
- </xsl:variable>
6088
6858
  <pdf:catalog xmlns:pdf="http://xmlgraphics.apache.org/fop/extensions/pdf">
6089
6859
  <pdf:dictionary type="normal" key="ViewerPreferences">
6090
6860
  <pdf:boolean key="DisplayDocTitle">true</pdf:boolean>
@@ -6312,10 +7082,12 @@
6312
7082
  <xsl:param name="key"/>
6313
7083
  <xsl:param name="formatted">false</xsl:param>
6314
7084
  <xsl:param name="lang"/>
7085
+ <xsl:param name="returnEmptyIfNotFound">false</xsl:param>
6315
7086
 
6316
7087
  <xsl:variable name="curr_lang">
6317
7088
  <xsl:choose>
6318
7089
  <xsl:when test="$lang != ''"><xsl:value-of select="$lang"/></xsl:when>
7090
+ <xsl:when test="$returnEmptyIfNotFound = 'true'"/>
6319
7091
  <xsl:otherwise>
6320
7092
  <xsl:call-template name="getLang"/>
6321
7093
  </xsl:otherwise>
@@ -6350,6 +7122,7 @@
6350
7122
  </xsl:otherwise>
6351
7123
  </xsl:choose>
6352
7124
  </xsl:when>
7125
+ <xsl:when test="$returnEmptyIfNotFound = 'true'"/>
6353
7126
  <xsl:otherwise>
6354
7127
  <xsl:variable name="key_">
6355
7128
  <xsl:call-template name="capitalize">
@@ -6419,53 +7192,153 @@
6419
7192
  <xsl:param name="first"/>
6420
7193
  <xsl:if test="$number != ''">
6421
7194
  <xsl:variable name="words">
6422
- <words>
6423
- <word cardinal="1">One-</word>
6424
- <word ordinal="1">First </word>
6425
- <word cardinal="2">Two-</word>
6426
- <word ordinal="2">Second </word>
6427
- <word cardinal="3">Three-</word>
6428
- <word ordinal="3">Third </word>
6429
- <word cardinal="4">Four-</word>
6430
- <word ordinal="4">Fourth </word>
6431
- <word cardinal="5">Five-</word>
6432
- <word ordinal="5">Fifth </word>
6433
- <word cardinal="6">Six-</word>
6434
- <word ordinal="6">Sixth </word>
6435
- <word cardinal="7">Seven-</word>
6436
- <word ordinal="7">Seventh </word>
6437
- <word cardinal="8">Eight-</word>
6438
- <word ordinal="8">Eighth </word>
6439
- <word cardinal="9">Nine-</word>
6440
- <word ordinal="9">Ninth </word>
6441
- <word ordinal="10">Tenth </word>
6442
- <word ordinal="11">Eleventh </word>
6443
- <word ordinal="12">Twelfth </word>
6444
- <word ordinal="13">Thirteenth </word>
6445
- <word ordinal="14">Fourteenth </word>
6446
- <word ordinal="15">Fifteenth </word>
6447
- <word ordinal="16">Sixteenth </word>
6448
- <word ordinal="17">Seventeenth </word>
6449
- <word ordinal="18">Eighteenth </word>
6450
- <word ordinal="19">Nineteenth </word>
6451
- <word cardinal="20">Twenty-</word>
6452
- <word ordinal="20">Twentieth </word>
6453
- <word cardinal="30">Thirty-</word>
6454
- <word ordinal="30">Thirtieth </word>
6455
- <word cardinal="40">Forty-</word>
6456
- <word ordinal="40">Fortieth </word>
6457
- <word cardinal="50">Fifty-</word>
6458
- <word ordinal="50">Fiftieth </word>
6459
- <word cardinal="60">Sixty-</word>
6460
- <word ordinal="60">Sixtieth </word>
6461
- <word cardinal="70">Seventy-</word>
6462
- <word ordinal="70">Seventieth </word>
6463
- <word cardinal="80">Eighty-</word>
6464
- <word ordinal="80">Eightieth </word>
6465
- <word cardinal="90">Ninety-</word>
6466
- <word ordinal="90">Ninetieth </word>
6467
- <word cardinal="100">Hundred-</word>
6468
- <word ordinal="100">Hundredth </word>
7195
+ <words>
7196
+ <xsl:choose>
7197
+ <xsl:when test="$lang = 'fr'"> <!-- https://en.wiktionary.org/wiki/Appendix:French_numbers -->
7198
+ <word cardinal="1">Une-</word>
7199
+ <word ordinal="1">Première </word>
7200
+ <word cardinal="2">Deux-</word>
7201
+ <word ordinal="2">Seconde </word>
7202
+ <word cardinal="3">Trois-</word>
7203
+ <word ordinal="3">Tierce </word>
7204
+ <word cardinal="4">Quatre-</word>
7205
+ <word ordinal="4">Quatrième </word>
7206
+ <word cardinal="5">Cinq-</word>
7207
+ <word ordinal="5">Cinquième </word>
7208
+ <word cardinal="6">Six-</word>
7209
+ <word ordinal="6">Sixième </word>
7210
+ <word cardinal="7">Sept-</word>
7211
+ <word ordinal="7">Septième </word>
7212
+ <word cardinal="8">Huit-</word>
7213
+ <word ordinal="8">Huitième </word>
7214
+ <word cardinal="9">Neuf-</word>
7215
+ <word ordinal="9">Neuvième </word>
7216
+ <word ordinal="10">Dixième </word>
7217
+ <word ordinal="11">Onzième </word>
7218
+ <word ordinal="12">Douzième </word>
7219
+ <word ordinal="13">Treizième </word>
7220
+ <word ordinal="14">Quatorzième </word>
7221
+ <word ordinal="15">Quinzième </word>
7222
+ <word ordinal="16">Seizième </word>
7223
+ <word ordinal="17">Dix-septième </word>
7224
+ <word ordinal="18">Dix-huitième </word>
7225
+ <word ordinal="19">Dix-neuvième </word>
7226
+ <word cardinal="20">Vingt-</word>
7227
+ <word ordinal="20">Vingtième </word>
7228
+ <word cardinal="30">Trente-</word>
7229
+ <word ordinal="30">Trentième </word>
7230
+ <word cardinal="40">Quarante-</word>
7231
+ <word ordinal="40">Quarantième </word>
7232
+ <word cardinal="50">Cinquante-</word>
7233
+ <word ordinal="50">Cinquantième </word>
7234
+ <word cardinal="60">Soixante-</word>
7235
+ <word ordinal="60">Soixantième </word>
7236
+ <word cardinal="70">Septante-</word>
7237
+ <word ordinal="70">Septantième </word>
7238
+ <word cardinal="80">Huitante-</word>
7239
+ <word ordinal="80">Huitantième </word>
7240
+ <word cardinal="90">Nonante-</word>
7241
+ <word ordinal="90">Nonantième </word>
7242
+ <word cardinal="100">Cent-</word>
7243
+ <word ordinal="100">Centième </word>
7244
+ </xsl:when>
7245
+ <xsl:when test="$lang = 'ru'">
7246
+ <word cardinal="1">Одна-</word>
7247
+ <word ordinal="1">Первое </word>
7248
+ <word cardinal="2">Две-</word>
7249
+ <word ordinal="2">Второе </word>
7250
+ <word cardinal="3">Три-</word>
7251
+ <word ordinal="3">Третье </word>
7252
+ <word cardinal="4">Четыре-</word>
7253
+ <word ordinal="4">Четвертое </word>
7254
+ <word cardinal="5">Пять-</word>
7255
+ <word ordinal="5">Пятое </word>
7256
+ <word cardinal="6">Шесть-</word>
7257
+ <word ordinal="6">Шестое </word>
7258
+ <word cardinal="7">Семь-</word>
7259
+ <word ordinal="7">Седьмое </word>
7260
+ <word cardinal="8">Восемь-</word>
7261
+ <word ordinal="8">Восьмое </word>
7262
+ <word cardinal="9">Девять-</word>
7263
+ <word ordinal="9">Девятое </word>
7264
+ <word ordinal="10">Десятое </word>
7265
+ <word ordinal="11">Одиннадцатое </word>
7266
+ <word ordinal="12">Двенадцатое </word>
7267
+ <word ordinal="13">Тринадцатое </word>
7268
+ <word ordinal="14">Четырнадцатое </word>
7269
+ <word ordinal="15">Пятнадцатое </word>
7270
+ <word ordinal="16">Шестнадцатое </word>
7271
+ <word ordinal="17">Семнадцатое </word>
7272
+ <word ordinal="18">Восемнадцатое </word>
7273
+ <word ordinal="19">Девятнадцатое </word>
7274
+ <word cardinal="20">Двадцать-</word>
7275
+ <word ordinal="20">Двадцатое </word>
7276
+ <word cardinal="30">Тридцать-</word>
7277
+ <word ordinal="30">Тридцатое </word>
7278
+ <word cardinal="40">Сорок-</word>
7279
+ <word ordinal="40">Сороковое </word>
7280
+ <word cardinal="50">Пятьдесят-</word>
7281
+ <word ordinal="50">Пятидесятое </word>
7282
+ <word cardinal="60">Шестьдесят-</word>
7283
+ <word ordinal="60">Шестидесятое </word>
7284
+ <word cardinal="70">Семьдесят-</word>
7285
+ <word ordinal="70">Семидесятое </word>
7286
+ <word cardinal="80">Восемьдесят-</word>
7287
+ <word ordinal="80">Восьмидесятое </word>
7288
+ <word cardinal="90">Девяносто-</word>
7289
+ <word ordinal="90">Девяностое </word>
7290
+ <word cardinal="100">Сто-</word>
7291
+ <word ordinal="100">Сотое </word>
7292
+ </xsl:when>
7293
+ <xsl:otherwise> <!-- default english -->
7294
+ <word cardinal="1">One-</word>
7295
+ <word ordinal="1">First </word>
7296
+ <word cardinal="2">Two-</word>
7297
+ <word ordinal="2">Second </word>
7298
+ <word cardinal="3">Three-</word>
7299
+ <word ordinal="3">Third </word>
7300
+ <word cardinal="4">Four-</word>
7301
+ <word ordinal="4">Fourth </word>
7302
+ <word cardinal="5">Five-</word>
7303
+ <word ordinal="5">Fifth </word>
7304
+ <word cardinal="6">Six-</word>
7305
+ <word ordinal="6">Sixth </word>
7306
+ <word cardinal="7">Seven-</word>
7307
+ <word ordinal="7">Seventh </word>
7308
+ <word cardinal="8">Eight-</word>
7309
+ <word ordinal="8">Eighth </word>
7310
+ <word cardinal="9">Nine-</word>
7311
+ <word ordinal="9">Ninth </word>
7312
+ <word ordinal="10">Tenth </word>
7313
+ <word ordinal="11">Eleventh </word>
7314
+ <word ordinal="12">Twelfth </word>
7315
+ <word ordinal="13">Thirteenth </word>
7316
+ <word ordinal="14">Fourteenth </word>
7317
+ <word ordinal="15">Fifteenth </word>
7318
+ <word ordinal="16">Sixteenth </word>
7319
+ <word ordinal="17">Seventeenth </word>
7320
+ <word ordinal="18">Eighteenth </word>
7321
+ <word ordinal="19">Nineteenth </word>
7322
+ <word cardinal="20">Twenty-</word>
7323
+ <word ordinal="20">Twentieth </word>
7324
+ <word cardinal="30">Thirty-</word>
7325
+ <word ordinal="30">Thirtieth </word>
7326
+ <word cardinal="40">Forty-</word>
7327
+ <word ordinal="40">Fortieth </word>
7328
+ <word cardinal="50">Fifty-</word>
7329
+ <word ordinal="50">Fiftieth </word>
7330
+ <word cardinal="60">Sixty-</word>
7331
+ <word ordinal="60">Sixtieth </word>
7332
+ <word cardinal="70">Seventy-</word>
7333
+ <word ordinal="70">Seventieth </word>
7334
+ <word cardinal="80">Eighty-</word>
7335
+ <word ordinal="80">Eightieth </word>
7336
+ <word cardinal="90">Ninety-</word>
7337
+ <word ordinal="90">Ninetieth </word>
7338
+ <word cardinal="100">Hundred-</word>
7339
+ <word ordinal="100">Hundredth </word>
7340
+ </xsl:otherwise>
7341
+ </xsl:choose>
6469
7342
  </words>
6470
7343
  </xsl:variable>
6471
7344
 
@@ -6539,4 +7412,18 @@
6539
7412
  <xsl:otherwise>_</xsl:otherwise>
6540
7413
  </xsl:choose>
6541
7414
  </xsl:attribute>
7415
+ </xsl:template><xsl:template name="substring-after-last">
7416
+ <xsl:param name="value"/>
7417
+ <xsl:param name="delimiter"/>
7418
+ <xsl:choose>
7419
+ <xsl:when test="contains($value, $delimiter)">
7420
+ <xsl:call-template name="substring-after-last">
7421
+ <xsl:with-param name="value" select="substring-after($value, $delimiter)"/>
7422
+ <xsl:with-param name="delimiter" select="$delimiter"/>
7423
+ </xsl:call-template>
7424
+ </xsl:when>
7425
+ <xsl:otherwise>
7426
+ <xsl:value-of select="$value"/>
7427
+ </xsl:otherwise>
7428
+ </xsl:choose>
6542
7429
  </xsl:template></xsl:stylesheet>