metanorma-itu 2.2.4 → 2.2.6

Sign up to get free protection for your applications and to get access to all the features.
Files changed (34) hide show
  1. checksums.yaml +4 -4
  2. data/lib/isodoc/itu/base_convert.rb +11 -11
  3. data/lib/isodoc/itu/html/header.html +4 -4
  4. data/lib/isodoc/itu/html/html_itu_titlepage.html +2 -0
  5. data/lib/isodoc/itu/html/htmlstyle.css +4 -0
  6. data/lib/isodoc/itu/html/htmlstyle.scss +6 -0
  7. data/lib/isodoc/itu/html/word_itu_titlepage.html +2 -0
  8. data/lib/isodoc/itu/html/word_itu_titlepage_sp.html +2 -0
  9. data/lib/isodoc/itu/i18n-ar.yaml +1 -0
  10. data/lib/isodoc/itu/i18n-de.yaml +1 -0
  11. data/lib/isodoc/itu/i18n-en.yaml +1 -0
  12. data/lib/isodoc/itu/i18n-es.yaml +1 -0
  13. data/lib/isodoc/itu/i18n-fr.yaml +1 -0
  14. data/lib/isodoc/itu/i18n-ru.yaml +1 -0
  15. data/lib/isodoc/itu/i18n-zh-Hans.yaml +1 -0
  16. data/lib/isodoc/itu/itu.implementers-guide.xsl +227 -100
  17. data/lib/isodoc/itu/itu.in-force.xsl +227 -100
  18. data/lib/isodoc/itu/itu.recommendation-annex.xsl +227 -100
  19. data/lib/isodoc/itu/itu.recommendation-supplement.xsl +227 -100
  20. data/lib/isodoc/itu/itu.recommendation.xsl +227 -100
  21. data/lib/isodoc/itu/itu.resolution.xsl +227 -100
  22. data/lib/isodoc/itu/itu.service-publication.xsl +227 -100
  23. data/lib/isodoc/itu/itu.technical-paper.xsl +227 -100
  24. data/lib/isodoc/itu/itu.technical-report.xsl +227 -100
  25. data/lib/isodoc/itu/metadata.rb +18 -17
  26. data/lib/isodoc/itu/presentation_xml_convert.rb +2 -2
  27. data/lib/isodoc/itu/xref.rb +7 -5
  28. data/lib/metanorma/itu/basicdoc.rng +0 -1
  29. data/lib/metanorma/itu/biblio.rng +11 -1
  30. data/lib/metanorma/itu/front_id.rb +15 -8
  31. data/lib/metanorma/itu/isodoc.rng +11 -0
  32. data/lib/metanorma/itu/validate.rb +2 -2
  33. data/lib/metanorma/itu/version.rb +1 -1
  34. metadata +2 -2
data/lib/isodoc/itu/itu.recommendation.xsl CHANGED
@@ -69,13 +69,24 @@
69
69
  </xsl:variable>
70
70
 
71
71
  <xsl:variable name="footer-text">
72
+ <xsl:variable name="additionalIdentifiers_">
73
+ <xsl:if test="$TDnumber != ''">/<xsl:value-of select="$TDnumber"/></xsl:if>
74
+ <xsl:if test="$provisionalIdentifier != ''">/<xsl:value-of select="$provisionalIdentifier"/></xsl:if>
75
+ </xsl:variable>
76
+ <xsl:variable name="additionalIdentifiers" select="normalize-space($additionalIdentifiers_)"/>
72
77
  <xsl:choose>
73
78
  <xsl:when test="$doctype = 'technical-report' or $doctype = 'technical-paper'">
74
- <xsl:variable name="date" select="concat('(',substring(/itu:itu-standard/itu:bibdata/itu:version/itu:revision-date,1,7), ')')"/>
75
- <xsl:value-of select="concat($xSTR-ACRONYM, ' ', $date)"/>
79
+ <xsl:variable name="date_">
80
+ <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:version/itu:revision-date"/>
81
+ <xsl:if test="not(/itu:itu-standard/itu:bibdata/itu:version/itu:revision-date)"/>
82
+ <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:date[@type = 'published']/itu:on"/>
83
+ </xsl:variable>
84
+ <xsl:variable name="date" select="concat('(',substring($date_,1,7), ')')"/>
85
+ <xsl:value-of select="concat($xSTR-ACRONYM, $additionalIdentifiers, ' ', $date)"/>
76
86
  </xsl:when>
77
87
  <xsl:when test="$doctype = 'implementers-guide'">
78
88
  <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:ext/itu:doctype[@language = $lang]"/>
89
+ <xsl:value-of select="$additionalIdentifiers"/>
79
90
  <xsl:text> for </xsl:text>
80
91
  <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:docidentifier[@type='ITU-Recommendation']"/>
81
92
  <xsl:text> </xsl:text>
@@ -87,19 +98,22 @@
87
98
  <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:ext/itu:meeting/@acronym"/>
88
99
  <xsl:text> – </xsl:text>
89
100
  <xsl:value-of select="$doctypeTitle"/>
101
+ <xsl:value-of select="$additionalIdentifiers"/>
90
102
  <xsl:text> </xsl:text>
91
103
  <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:ext/itu:structuredidentifier/itu:docnumber"/>
92
104
  </xsl:when>
93
105
  <xsl:when test="$doctype = 'recommendation-supplement'">
94
106
  <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:docidentifier[@type = 'ITU-Supplement-Short']"/>
107
+ <xsl:value-of select="$additionalIdentifiers"/>
95
108
  <xsl:text> </xsl:text>
96
109
  <xsl:value-of select="$docdate"/>
97
110
  </xsl:when>
98
111
  <xsl:when test="$doctype = 'service-publication'">
99
112
  <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:docidentifier[@type = 'ITU-lang']"/>
113
+ <xsl:value-of select="$additionalIdentifiers"/>
100
114
  </xsl:when>
101
115
  <xsl:otherwise>
102
- <xsl:value-of select="concat($footerprefix, $docname, ' ', $docdate)"/>
116
+ <xsl:value-of select="concat($footerprefix, $docname, $additionalIdentifiers, ' ', $docdate)"/>
103
117
  </xsl:otherwise>
104
118
  </xsl:choose>
105
119
  </xsl:variable>
@@ -107,6 +121,9 @@
107
121
  <xsl:variable name="isAmendment" select="normalize-space(/itu:itu-standard/itu:bibdata/itu:ext/itu:structuredidentifier/itu:amendment[@language = $lang])"/>
108
122
  <xsl:variable name="isCorrigendum" select="normalize-space(/itu:itu-standard/itu:bibdata/itu:ext/itu:structuredidentifier/itu:corrigendum[@language = $lang])"/>
109
123
 
124
+ <xsl:variable name="TDnumber" select="normalize-space(/itu:itu-standard/itu:bibdata/itu:docidentifier[@type = 'ITU-TemporaryDocument'])"/>
125
+ <xsl:variable name="provisionalIdentifier" select="normalize-space(/itu:itu-standard/itu:bibdata/itu:docidentifier[@type = 'ITU-provisional'])"/>
126
+
110
127
  <xsl:template match="/">
111
128
  <xsl:call-template name="namespaceCheck"/>
112
129
  <fo:root xml:lang="{$lang}">
@@ -265,13 +282,15 @@
265
282
  <fo:block font-weight="bold">Study Group:</fo:block>
266
283
  </fo:table-cell>
267
284
  <fo:table-cell padding-top="2mm">
268
- <fo:block><xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:ext/itu:editorialgroup/itu:subgroup/itu:name"/></fo:block>
285
+ <xsl:variable name="subgroup" select="/itu:itu-standard/itu:bibdata/itu:ext/itu:editorialgroup/itu:subgroup/itu:name"/>
286
+ <fo:block><xsl:value-of select="java:replaceAll(java:java.lang.String.new($subgroup),'(.)','$1​')"/></fo:block>
269
287
  </fo:table-cell>
270
288
  <fo:table-cell padding-top="2mm">
271
289
  <fo:block font-weight="bold">Working Party:</fo:block>
272
290
  </fo:table-cell>
273
291
  <fo:table-cell padding-top="2mm">
274
- <fo:block><xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:ext/itu:editorialgroup/itu:workgroup/itu:name"/></fo:block>
292
+ <xsl:variable name="workgroup" select="/itu:itu-standard/itu:bibdata/itu:ext/itu:editorialgroup/itu:workgroup/itu:name"/>
293
+ <fo:block><xsl:value-of select="java:replaceAll(java:java.lang.String.new($workgroup),'(.)','$1​')"/></fo:block>
275
294
  </fo:table-cell>
276
295
  <fo:table-cell padding-top="2mm">
277
296
  <fo:block font-weight="bold">Intended type of document <fo:inline font-weight="normal">(R-C-TD)</fo:inline>:</fo:block>
@@ -517,14 +536,17 @@
517
536
  </xsl:if>
518
537
  <fo:flow flow-name="xsl-region-body">
519
538
 
520
- <fo:block-container absolute-position="fixed" top="265mm">
539
+ <fo:block-container absolute-position="fixed" top="255mm">
521
540
  <fo:block text-align="right" margin-right="19mm">
522
541
  <xsl:choose>
523
542
  <xsl:when test="$doctype = 'resolution'">
524
543
  <fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-Logo_resolution))}" content-height="21mm" content-width="scale-to-fit" scaling="uniform" fox:alt-text="Image Logo"/>
525
544
  </xsl:when>
526
545
  <xsl:otherwise>
527
- <fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-Logo))}" content-height="17.7mm" content-width="scale-to-fit" scaling="uniform" fox:alt-text="Image Logo"/>
546
+ <!-- <fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-Logo))}" content-height="17.7mm" content-width="scale-to-fit" scaling="uniform" fox:alt-text="Image Logo"/> -->
547
+ <fo:instream-foreign-object content-width="24.1mm" fox:alt-text="Image Logo">
548
+ <xsl:copy-of select="$Image-ITU-Logo"/>
549
+ </fo:instream-foreign-object>
528
550
  </xsl:otherwise>
529
551
  </xsl:choose>
530
552
 
@@ -617,6 +639,48 @@
617
639
  </fo:block-container>
618
640
  </fo:table-cell>
619
641
  </fo:table-row>
642
+ <xsl:variable name="additionalNumbers">
643
+ <xsl:if test="$TDnumber != ''">
644
+ <fo:block-container space-after="2pt">
645
+ <xsl:call-template name="setWritingMode"/>
646
+ <fo:block font-size="14pt">TD number: <xsl:value-of select="$TDnumber"/></fo:block>
647
+ </fo:block-container>
648
+ </xsl:if>
649
+ <xsl:if test="$provisionalIdentifier != ''">
650
+ <fo:block-container space-after="2pt">
651
+ <xsl:call-template name="setWritingMode"/>
652
+ <fo:block font-size="14pt">Provisional identifier: <xsl:value-of select="$provisionalIdentifier"/></fo:block>
653
+ </fo:block-container>
654
+ </xsl:if>
655
+ <xsl:if test="$annexid != ''">
656
+ <fo:block-container>
657
+ <xsl:call-template name="setWritingMode"/>
658
+ <fo:block font-size="18pt" font-weight="bold">
659
+ <xsl:call-template name="getLocalizedString">
660
+ <xsl:with-param name="key">annex</xsl:with-param>
661
+ </xsl:call-template>
662
+ <xsl:text> </xsl:text>
663
+ <xsl:value-of select="$annexid"/>
664
+ </fo:block>
665
+ </fo:block-container>
666
+ </xsl:if>
667
+ <xsl:if test="$isAmendment != ''">
668
+ <fo:block-container>
669
+ <xsl:call-template name="setWritingMode"/>
670
+ <fo:block font-size="18pt" font-weight="bold">
671
+ <xsl:value-of select="$isAmendment"/>
672
+ </fo:block>
673
+ </fo:block-container>
674
+ </xsl:if>
675
+ <xsl:if test="$isCorrigendum != ''">
676
+ <fo:block-container>
677
+ <xsl:call-template name="setWritingMode"/>
678
+ <fo:block font-size="18pt" font-weight="bold">
679
+ <xsl:value-of select="$isCorrigendum"/>
680
+ </fo:block>
681
+ </fo:block-container>
682
+ </xsl:if>
683
+ </xsl:variable>
620
684
  <fo:table-row height="17.2mm">
621
685
  <fo:table-cell>
622
686
  <fo:block> </fo:block>
@@ -636,34 +700,7 @@
636
700
  </fo:block-container>
637
701
  </fo:table-cell>
638
702
  <fo:table-cell text-align="right">
639
- <xsl:if test="$annexid != ''">
640
- <fo:block-container>
641
- <xsl:call-template name="setWritingMode"/>
642
- <fo:block font-size="18pt" font-weight="bold">
643
- <xsl:call-template name="getLocalizedString">
644
- <xsl:with-param name="key">annex</xsl:with-param>
645
- </xsl:call-template>
646
- <xsl:text> </xsl:text>
647
- <xsl:value-of select="$annexid"/>
648
- </fo:block>
649
- </fo:block-container>
650
- </xsl:if>
651
- <xsl:if test="$isAmendment != ''">
652
- <fo:block-container>
653
- <xsl:call-template name="setWritingMode"/>
654
- <fo:block font-size="18pt" font-weight="bold">
655
- <xsl:value-of select="$isAmendment"/>
656
- </fo:block>
657
- </fo:block-container>
658
- </xsl:if>
659
- <xsl:if test="$isCorrigendum != ''">
660
- <fo:block-container>
661
- <xsl:call-template name="setWritingMode"/>
662
- <fo:block font-size="18pt" font-weight="bold">
663
- <xsl:value-of select="$isCorrigendum"/>
664
- </fo:block>
665
- </fo:block-container>
666
- </xsl:if>
703
+ <xsl:copy-of select="$additionalNumbers"/>
667
704
  <fo:block font-size="14pt">
668
705
  <xsl:choose>
669
706
  <xsl:when test="($doctype = 'technical-report' or $doctype = 'technical-paper') and /itu:itu-standard/itu:bibdata/itu:version/itu:revision-date">
@@ -682,7 +719,11 @@
682
719
  </fo:block>
683
720
  </fo:table-cell>
684
721
  </fo:table-row>
722
+ <xsl:variable name="countAdditionalNumbers" select="count(xalan:nodeset($additionalNumbers)/*)"/>
685
723
  <fo:table-row height="64mm"> <!-- 59mm -->
724
+ <xsl:if test="$countAdditionalNumbers != 0">
725
+ <xsl:attribute name="height"><xsl:value-of select="64 - $countAdditionalNumbers * 5"/>mm</xsl:attribute>
726
+ </xsl:if>
686
727
  <fo:table-cell>
687
728
  <fo:block> </fo:block>
688
729
  </fo:table-cell>
@@ -739,7 +780,7 @@
739
780
  <xsl:variable name="series_title">
740
781
  <xsl:value-of select="$series_title_full"/>
741
782
  <xsl:if test="$series_title_full = ''">
742
- <xsl:value-of select="normalize-space(/itu:itu-standard/itu:bibdata/itu:series[@type = 'main']/itu:title[@type != 'full' and @type != 'abbrev'])"/>
783
+ <xsl:value-of select="normalize-space(/itu:itu-standard/itu:bibdata/itu:series[@type = 'main']/itu:title[(@type != 'full' and @type != 'abbrev') or not(@type)])"/>
743
784
  </xsl:if>
744
785
  </xsl:variable>
745
786
  <xsl:if test="$series_title != ''">
@@ -1317,26 +1358,6 @@
1317
1358
  </fo:block>
1318
1359
  </xsl:template>
1319
1360
 
1320
- <!-- Summary -->
1321
- <xsl:template match="itu:itu-standard/itu:preface/itu:abstract[@id = '_summary']" priority="3">
1322
- <fo:block font-size="12pt">
1323
- <xsl:value-of select="$linebreak"/>
1324
- <xsl:value-of select="$linebreak"/>
1325
- </fo:block>
1326
- <fo:block id="{@id}">
1327
- <fo:block font-weight="bold" keep-with-next="always" margin-top="18pt" margin-bottom="18pt" role="H2">
1328
- <xsl:variable name="title-summary">
1329
- <xsl:call-template name="getTitle">
1330
- <xsl:with-param name="name" select="'title-summary'"/>
1331
- </xsl:call-template>
1332
- </xsl:variable>
1333
- <xsl:value-of select="$title-summary"/>
1334
- </fo:block>
1335
- <xsl:apply-templates/>
1336
- </fo:block>
1337
- </xsl:template>
1338
- <xsl:template match="itu:itu-standard/itu:preface/itu:abstract[@id = '_summary']/itu:title" priority="4"/>
1339
-
1340
1361
  <xsl:template match="itu:preface/itu:clause" priority="3">
1341
1362
  <xsl:if test="$doctype != 'service-publication'">
1342
1363
  <fo:block font-size="12pt">
@@ -2022,6 +2043,19 @@
2022
2043
  </svg>
2023
2044
  </xsl:variable>
2024
2045
 
2046
+ <xsl:variable name="Image-ITU-Logo">
2047
+ <svg xmlns="http://www.w3.org/2000/svg" id="ITU-logo" data-name="Layer 1" width="272" height="300" viewBox="0 0 272 300">
2048
+ <defs>
2049
+ <style>.cls-1{fill:#16a0db;}</style>
2050
+ </defs>
2051
+ <title>ITU</title>
2052
+ <path class="cls-1" d="M53.95176,124.04334a1.39913,1.39913,0,0,1,1.40068,1.40094v84.80738a1.404,1.404,0,0,1-1.40068,1.40666H28.56261a1.40764,1.40764,0,0,1-1.40068-1.40666V125.44428a1.40272,1.40272,0,0,1,1.40068-1.40094H53.95176"/>
2053
+ <path class="cls-1" d="M145.67105,124.04334a1.39914,1.39914,0,0,1,1.40068,1.40094V146.326a1.404,1.404,0,0,1-1.40068,1.40668H123.50867a1.404,1.404,0,0,0-1.40663,1.40092v61.118a1.4041,1.4041,0,0,1-1.401,1.40666H95.31221a1.404,1.404,0,0,1-1.40068-1.40666v-61.118a1.40277,1.40277,0,0,0-1.401-1.40092H70.85941a1.4089,1.4089,0,0,1-1.40664-1.40668V125.44428a1.404,1.404,0,0,1,1.40664-1.40094h74.81164"/>
2054
+ <path class="cls-1" d="M244.46942,124.04334a1.40422,1.40422,0,0,1,1.40663,1.40094v43.22185c0,28.627-15.0027,43.76154-43.38279,43.76154-27.4157,0-41.31559-14.93933-41.31559-44.4046V125.44428a1.39921,1.39921,0,0,1,1.401-1.40094h25.38284a1.40043,1.40043,0,0,1,1.40664,1.40094v42.441c0,9.33564,2.45758,20.46263,14.1585,20.46263,9.5251,0,14.1529-6.69457,14.1529-20.46263v-42.441a1.404,1.404,0,0,1,1.40664-1.40094h25.3832"/>
2055
+ <path class="cls-1" d="M271.12012,299c-16.84562-8.30792-35.804-17.7871-53.2867-28.20789q4.4696-3.46207,8.635-7.28018A133.03915,133.03915,0,0,0,247.28128,89.2695a134.47457,134.47457,0,0,0-183.33695-38.91C53.0126,35.11588,42.035,18.58043,30.43146,1,34.083,8.41225,44.91131,31.26336,57.60572,54.60822A135.0389,135.0389,0,0,0,.87988,164.51161,132.39673,132.39673,0,0,0,14.19454,222.5522,134.51424,134.51424,0,0,0,209.97884,276.436c20.48556,8.47442,41.07449,15.55367,61.14128,22.564M122.93256,287.31035a124.4229,124.4229,0,0,1-79.12931-39.63342,33.60229,33.60229,0,0,1-5.5575-15.96706,175.63893,175.63893,0,0,0,46.236,31.6298,187.00148,187.00148,0,0,0,59.79738,17.44261c-6.9757,4.87453-14.19285,7.13093-21.34657,6.52807M35.2888,220.36472c-.12055,1.24016-.19519,2.4516-.24705,3.65157-1.11368-1.21145-2.21053-2.42291-3.25517-3.65157H27.79026c2.23365,2.74441,4.65654,5.44865,7.22871,8.107a45.77546,45.77546,0,0,0,1.52718,10.55285A122.68891,122.68891,0,0,1,31.91274,96.4923a67.04283,67.04283,0,0,0-1.91757,18.82631H32.998a60.01641,60.01641,0,0,1,4.93163-27.09979A124.9733,124.9733,0,0,1,54.3905,71.115q4.70245-2.64395,9.6516-4.9262c7.3377,12.87816,14.97957,25.13044,22.00714,34.18475a148.36379,148.36379,0,0,1-23.71234-.49375l1.28609.36171c-.40756-.03445-.8095-.07464-1.223-.11483,2.50313,5.2075,5.24211,10.26575,8.14719,15.192h51.174q-4.01332-3.28127-7.90049-6.80366A214.83757,214.83757,0,0,1,150.4569,84.37778a53.34945,53.34945,0,0,0,15.33,11.7241,55.86873,55.86873,0,0,0,23.69482,6.4649c.90166,4.13961,1.67681,8.39979,2.31986,12.75183h3.05436q-.94722-6.53667-2.29077-12.77481c7.64748-.32152,14.16411-2.77312,18.07423-7.25146a134.07139,134.07139,0,0,1,17.02329,20.02627h3.6459A136.97749,136.97749,0,0,0,212.41925,92.812a16.79184,16.79184,0,0,0,1.36633-12.93552,28.74433,28.74433,0,0,0-4.31767-8.95674,30.75992,30.75992,0,0,1,14.968,7.02761,122.772,122.772,0,0,1,27.39258,131.0722c-10.52418,21.89225-35.98762,33.78285-67.28436,34.65556,13.21689-3.34152,23.74668-7.92323,36.22872-15.82926-4.66776-2.14155-9.35268-4.48408-14.038-6.98737-1.44658.07464-2.91069.12057-4.4207.12057-26.07215,0-42.30907-11.483-47.59113-34.18476-8.18749-6.27545-16.18541-12.815-23.91909-19.48085V186.312c10.95486,9.9787,21.89219,19.14211,32.10623,27.5878-7.85984,5.23625-33.30611,12.96428-38.29,13.837q6.425,5.14149,13.00454,9.78347a193.15732,193.15732,0,0,1-31.4229-11.83893q-1.50755-.72342-2.99724-1.46982c-.14333-.06891-.2814-.13779-.41912-.20669q-2.79014-1.40381-5.506-2.87648a142.74922,142.74922,0,0,1-33.249-24.631v4.21425q4.43541,4.2975,9.41015,8.2907a161.36744,161.36744,0,0,0,33.77149,20.4741,193.87776,193.87776,0,0,0,37.5954,13.00445q10.4809,6.97591,21.226,12.9413c-.08025.14355-.16646.29281-.25267.4421-5.52876,9.37583-11.54042,16.78233-17.79283,22.05875-19.77944-1.72244-41.33837-7.50411-62.26618-17.5115-18.82626-9.00265-35.19529-20.5832-47.72885-33.30632a59.25825,59.25825,0,0,1,.32135-6.74049ZM143.4006,71.93026a29.50071,29.50071,0,0,0,5.09283,10.05906,219.33257,219.33257,0,0,0-36.93484,24.46443c-13.62445-12.64847-26.25017-27.427-38.72625-43.98547.06869-.023.13211-.05738.2008-.08038.01156-.00574.02873-.01147.0403-.01721v.00574A109.521,109.521,0,0,1,90.648,57.42727a126.6736,126.6736,0,0,1,54.11372,1.57318,16.75412,16.75412,0,0,0-1.36108,12.92981m2.917-.77512a13.70221,13.70221,0,0,1,1.3835-11.18439c.0403-.06316.09182-.12059.13212-.18371a143.44783,143.44783,0,0,1,28.32857,10.93177q-2.86792.82678-5.82768,1.83727a157.61385,157.61385,0,0,0-19.06175,8.03234,26.81162,26.81162,0,0,1-4.95476-9.43328m31.05564-3.198A147.18752,147.18752,0,0,0,150.02657,57.255c3.72019-3.37024,9.47919-5.08123,16.14476-5.0927a69.51757,69.51757,0,0,1,11.20191,15.7948m-6.7693-15.5594a54.77565,54.77565,0,0,1,19.40027,5.9941,52.42951,52.42951,0,0,1,12.06888,8.58352,78.61407,78.61407,0,0,0-20.57772,2.34825,79.14234,79.14234,0,0,0-10.89143-16.92587m.70612,23.01761c2.90508-.9933,5.73587-1.83728,8.50884-2.555q1.83451,3.953,3.47944,8.34234a152.17933,152.17933,0,0,1,5.50038,18.37848,53.66044,53.66044,0,0,1-21.61675-6.1606,50.91755,50.91755,0,0,1-13.90024-10.461,154.40473,154.40473,0,0,1,18.02833-7.54427m14.81872,4.731q-.973-2.60091-2.01533-5.05249a142.63376,142.63376,0,0,1,24.3326,18.12584c-3.45071,4.07645-9.43328,6.2295-16.52988,6.40748a157.66347,157.66347,0,0,0-5.78739-19.48083M184.412,71.781a69.52887,69.52887,0,0,1,20.74978-1.487A27.61015,27.61015,0,0,1,210.863,80.65155a14.07557,14.07557,0,0,1-.71769,10.01889A146.12178,146.12178,0,0,0,184.412,71.781m6.98165-16.07038a55.6803,55.6803,0,0,0-23.71794-6.45916,43.3225,43.3225,0,0,0-7.05069-5.71279,124.27675,124.27675,0,0,1,53.95848,25.47493,42.49122,42.49122,0,0,0-7.96322-1.69373,53.22364,53.22364,0,0,0-15.22663-11.60925m-28.1905-6.35583c-6.95293.54545-12.86086,2.89944-16.53549,7.01035a129.93743,129.93743,0,0,0-56.59934-1.90043,113.03233,113.03233,0,0,0-18.574,5.27067v.01148c-.178.0689-.36164.14354-.54527.21245-.13772-.1895-.287-.38469-.42508-.57414a124.53515,124.53515,0,0,1,65.22347-18.31533q5.55453,0,10.9892.47654c5.74709.67747,11.30494,3.353,16.46646,7.80841M148.72892,281.20141c3.85265.30431,7.66465.47655,11.41988.47655,2.78453,0,5.54629-.08612,8.26179-.25837,3.69741-.22965,7.25744-.63156,10.67906-1.17125a124.84385,124.84385,0,0,1-41.6082,7.68209,45.52058,45.52058,0,0,0,11.24747-6.729m3.44475-2.97408a92.61049,92.61049,0,0,0,16.20818-20.83009c.10338-.17224.20115-.34447.29857-.51671,9.70907,5.31086,19.54395,10.08778,29.42508,14.47425-.683.39616-1.3779.76936-2.06685,1.1483-12.26968,4.7482-27.3698,6.68882-43.865,5.72425m31.343-31.515c4.19678-.08612,8.33643-.36171,12.37831-.83826,20.75575-2.46308,37.45173-9.88683,48.60739-21.364a124.33918,124.33918,0,0,1-36.27463,40.34537,214.60728,214.60728,0,0,1-24.71107-18.14309"/>
2056
+ </svg>
2057
+ </xsl:variable>
2058
+
2025
2059
  <!-- convert YYYY-MM-DD to (MM/YYYY) -->
2026
2060
  <xsl:template name="formatDate">
2027
2061
  <xsl:param name="date"/>
@@ -3865,7 +3899,7 @@
3865
3899
  <xsl:variable name="isDeleted" select="@deleted"/>
3866
3900
 
3867
3901
  <xsl:choose>
3868
- <xsl:when test="@width">
3902
+ <xsl:when test="@width and @width != 'full-page-width' and @width != 'text-width'">
3869
3903
 
3870
3904
  <!-- centered table when table name is centered (see table-name-style) -->
3871
3905
 
@@ -4190,6 +4224,7 @@
4190
4224
  This makes columns with large differences between minimum and maximum widths wider than columns with smaller differences. -->
4191
4225
  <xsl:when test="(@width_max &gt; $page_width and @width_min &lt; $page_width) or (@width_min &gt;= $page_width)">
4192
4226
  <!-- difference between the available space and the minimum table width -->
4227
+ <_width_min><xsl:value-of select="@width_min"/></_width_min>
4193
4228
  <xsl:variable name="W" select="$page_width - @width_min"/>
4194
4229
  <W><xsl:value-of select="$W"/></W>
4195
4230
  <!-- difference between maximum and minimum width of the table -->
@@ -4857,19 +4892,22 @@
4857
4892
  <xsl:for-each select="xalan:nodeset($references)//fn">
4858
4893
  <xsl:variable name="reference" select="@reference"/>
4859
4894
  <xsl:if test="not(preceding-sibling::*[@reference = $reference])"> <!-- only unique reference puts in note-->
4860
- <fo:block xsl:use-attribute-sets="table-fn-style">
4861
4895
 
4862
- <fo:inline id="{@id}" xsl:use-attribute-sets="table-fn-number-style">
4896
+ <fo:block xsl:use-attribute-sets="table-fn-style">
4863
4897
 
4864
- <xsl:value-of select="@reference"/>
4898
+ <fo:inline id="{@id}" xsl:use-attribute-sets="table-fn-number-style">
4865
4899
 
4866
- <xsl:text>)</xsl:text>
4900
+ <xsl:value-of select="@reference"/>
4901
+
4902
+ <xsl:text>)</xsl:text>
4903
+
4904
+ </fo:inline>
4905
+ <fo:inline xsl:use-attribute-sets="table-fn-body-style">
4906
+ <xsl:copy-of select="./node()"/>
4907
+ </fo:inline>
4908
+
4909
+ </fo:block>
4867
4910
 
4868
- </fo:inline>
4869
- <fo:inline xsl:use-attribute-sets="table-fn-body-style">
4870
- <xsl:copy-of select="./node()"/>
4871
- </fo:inline>
4872
- </fo:block>
4873
4911
  </xsl:if>
4874
4912
  </xsl:for-each>
4875
4913
  </xsl:template>
@@ -5825,12 +5863,12 @@
5825
5863
  <xsl:param name="value"/>
5826
5864
  <xsl:variable name="add_width" select="string-length($value) * 20"/>
5827
5865
  <xsl:variable name="maxwidth" select="60 + $add_width"/>
5828
- <fo:instream-foreign-object fox:alt-text="OpeningTag" baseline-shift="-20%"><!-- alignment-baseline="middle" -->
5829
- <xsl:attribute name="height">5mm</xsl:attribute>
5866
+ <fo:instream-foreign-object fox:alt-text="OpeningTag" baseline-shift="-10%"><!-- alignment-baseline="middle" -->
5867
+ <xsl:attribute name="height">3.5mm</xsl:attribute> <!-- 5mm -->
5830
5868
  <xsl:attribute name="content-width">100%</xsl:attribute>
5831
5869
  <xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
5832
5870
  <xsl:attribute name="scaling">uniform</xsl:attribute>
5833
- <svg xmlns="http://www.w3.org/2000/svg" width="{$maxwidth + 32}" height="80">
5871
+ <!-- <svg xmlns="http://www.w3.org/2000/svg" width="{$maxwidth + 32}" height="80">
5834
5872
  <g>
5835
5873
  <xsl:if test="$type = 'closing' or $type = 'end'">
5836
5874
  <xsl:attribute name="transform">scale(-1 1) translate(-<xsl:value-of select="$maxwidth + 32"/>,0)</xsl:attribute>
@@ -5844,6 +5882,27 @@
5844
5882
  </xsl:if>
5845
5883
  <xsl:value-of select="$kind"/><tspan dy="10" font-size="30pt"><xsl:value-of select="$value"/></tspan>
5846
5884
  </text>
5885
+ </svg> -->
5886
+ <svg xmlns="http://www.w3.org/2000/svg" width="{$maxwidth + 32}" height="80">
5887
+ <g>
5888
+ <xsl:if test="$type = 'closing' or $type = 'end'">
5889
+ <xsl:attribute name="transform">scale(-1 1) translate(-<xsl:value-of select="$maxwidth + 32"/>,0)</xsl:attribute>
5890
+ </xsl:if>
5891
+ <polyline points="0,2.5 {$maxwidth},2.5 {$maxwidth + 20},40 {$maxwidth},77.5 0,77.5" stroke="black" stroke-width="5" fill="white"/>
5892
+ <line x1="9.5" y1="0" x2="9.5" y2="80" stroke="black" stroke-width="19"/>
5893
+ </g>
5894
+ <xsl:variable name="text_x">
5895
+ <xsl:choose>
5896
+ <xsl:when test="$type = 'closing' or $type = 'end'">28</xsl:when>
5897
+ <xsl:otherwise>22</xsl:otherwise>
5898
+ </xsl:choose>
5899
+ </xsl:variable>
5900
+ <text font-family="Arial" x="{$text_x}" y="50" font-size="40pt">
5901
+ <xsl:value-of select="$kind"/>
5902
+ </text>
5903
+ <text font-family="Arial" x="{$text_x + 33}" y="65" font-size="38pt">
5904
+ <xsl:value-of select="$value"/>
5905
+ </text>
5847
5906
  </svg>
5848
5907
  </fo:instream-foreign-object>
5849
5908
  </xsl:template>
@@ -6098,18 +6157,23 @@
6098
6157
 
6099
6158
  <xsl:template name="add-zero-spaces-java">
6100
6159
  <xsl:param name="text" select="."/>
6101
- <!-- add zero-width space (#x200B) after characters: dash, dot, colon, equal, underscore, em dash, thin space, arrow right -->
6102
- <xsl:variable name="text1" select="java:replaceAll(java:java.lang.String.new($text),'(-|\.|:|=|_|—| |→)','$1​')"/>
6160
+
6161
+ <!-- add zero-width space (#x200B) after dot with next non-digit -->
6162
+ <xsl:variable name="text1" select="java:replaceAll(java:java.lang.String.new($text),'(\.)([^\d\s])','$1​$2')"/>
6163
+ <!-- add zero-width space (#x200B) after characters: dash, equal, underscore, em dash, thin space, arrow right -->
6164
+ <xsl:variable name="text2" select="java:replaceAll(java:java.lang.String.new($text1),'(-|=|_|—| |→)','$1​')"/>
6165
+ <!-- add zero-width space (#x200B) after characters: colon, if there aren't digits after -->
6166
+ <xsl:variable name="text3" select="java:replaceAll(java:java.lang.String.new($text2),'(:)(\D)','$1​$2')"/>
6103
6167
  <!-- add zero-width space (#x200B) after characters: 'great than' -->
6104
- <xsl:variable name="text2" select="java:replaceAll(java:java.lang.String.new($text1), '(\u003e)(?!\u003e)', '$1​')"/><!-- negative lookahead: 'great than' not followed by 'great than' -->
6168
+ <xsl:variable name="text4" select="java:replaceAll(java:java.lang.String.new($text3), '(\u003e)(?!\u003e)', '$1​')"/><!-- negative lookahead: 'great than' not followed by 'great than' -->
6105
6169
  <!-- add zero-width space (#x200B) before characters: 'less than' -->
6106
- <xsl:variable name="text3" select="java:replaceAll(java:java.lang.String.new($text2), '(?&lt;!\u003c)(\u003c)', '​$1')"/> <!-- (?<!\u003c)(\u003c) --> <!-- negative lookbehind: 'less than' not preceeded by 'less than' -->
6170
+ <xsl:variable name="text5" select="java:replaceAll(java:java.lang.String.new($text4), '(?&lt;!\u003c)(\u003c)', '​$1')"/> <!-- (?<!\u003c)(\u003c) --> <!-- negative lookbehind: 'less than' not preceeded by 'less than' -->
6107
6171
  <!-- add zero-width space (#x200B) before character: { -->
6108
- <xsl:variable name="text4" select="java:replaceAll(java:java.lang.String.new($text3), '(?&lt;!\W)(\{)', '​$1')"/> <!-- negative lookbehind: '{' not preceeded by 'punctuation char' -->
6172
+ <xsl:variable name="text6" select="java:replaceAll(java:java.lang.String.new($text5), '(?&lt;!\W)(\{)', '​$1')"/> <!-- negative lookbehind: '{' not preceeded by 'punctuation char' -->
6109
6173
  <!-- add zero-width space (#x200B) after character: , -->
6110
- <xsl:variable name="text5" select="java:replaceAll(java:java.lang.String.new($text4), '(\,)(?!\d)', '$1​')"/> <!-- negative lookahead: ',' not followed by digit -->
6174
+ <xsl:variable name="text7" select="java:replaceAll(java:java.lang.String.new($text6), '(\,)(?!\d)', '$1​')"/> <!-- negative lookahead: ',' not followed by digit -->
6111
6175
 
6112
- <xsl:value-of select="$text5"/>
6176
+ <xsl:value-of select="$text7"/>
6113
6177
  </xsl:template>
6114
6178
 
6115
6179
  <xsl:template name="add-zero-spaces-link-java">
@@ -6118,7 +6182,9 @@
6118
6182
  <xsl:value-of select="java:replaceAll(java:java.lang.String.new($text), $regex_url_start, '$1')"/> <!-- http://. https:// or www. -->
6119
6183
  <xsl:variable name="url_continue" select="java:replaceAll(java:java.lang.String.new($text), $regex_url_start, '$2')"/>
6120
6184
  <!-- add zero-width space (#x200B) after characters: dash, dot, colon, equal, underscore, em dash, thin space -->
6121
- <xsl:value-of select="java:replaceAll(java:java.lang.String.new($url_continue),'(-|\.|:|=|_|—| |,|/)','$1​')"/>
6185
+ <xsl:variable name="url" select="java:replaceAll(java:java.lang.String.new($url_continue),'(-|\.|:|=|_|—| |,|/)','$1​')"/>
6186
+ <!-- remove zero-width space at the end -->
6187
+ <xsl:value-of select="java:replaceAll(java:java.lang.String.new($url), '​$', '')"/>
6122
6188
  </xsl:template>
6123
6189
 
6124
6190
  <!-- add zero space after dash character (for table's entries) -->
@@ -6255,7 +6321,7 @@
6255
6321
  </xsl:copy>
6256
6322
  </xsl:template>
6257
6323
 
6258
- <xsl:template match="*[local-name()='th' or local-name() = 'td'][not(*[local-name()='br']) and not(*[local-name()='p']) and not(*[local-name()='sourcecode'])]" mode="table-without-br">
6324
+ <xsl:template match="*[local-name()='th' or local-name() = 'td'][not(*[local-name()='br']) and not(*[local-name()='p']) and not(*[local-name()='sourcecode']) and not(*[local-name()='ul']) and not(*[local-name()='ol'])]" mode="table-without-br">
6259
6325
  <xsl:copy>
6260
6326
  <xsl:copy-of select="@*"/>
6261
6327
  <p>
@@ -6331,6 +6397,14 @@
6331
6397
  <xsl:value-of select="java:replaceAll(java:java.lang.String.new($text),' {2,}',' ')"/>
6332
6398
  </xsl:template>
6333
6399
 
6400
+ <xsl:template match="*[local-name()='th' or local-name()='td']//*[local-name() = 'ol' or local-name() = 'ul']" mode="table-without-br">
6401
+ <xsl:apply-templates mode="table-without-br"/>
6402
+ </xsl:template>
6403
+
6404
+ <xsl:template match="*[local-name()='th' or local-name()='td']//*[local-name() = 'li']" mode="table-without-br">
6405
+ <xsl:apply-templates mode="table-without-br"/>
6406
+ </xsl:template>
6407
+
6334
6408
  <!-- mode="table-without-br" -->
6335
6409
  <!-- ================================== -->
6336
6410
  <!-- END: Step 0. replace <br/> to <p>...</p> -->
@@ -7144,7 +7218,7 @@
7144
7218
 
7145
7219
  <fo:block-container id="{@id}" xsl:use-attribute-sets="note-style">
7146
7220
 
7147
- <fo:block-container margin-left="0mm">
7221
+ <fo:block-container margin-left="0mm" margin-right="0mm">
7148
7222
 
7149
7223
  <fo:block>
7150
7224
 
@@ -7326,11 +7400,14 @@
7326
7400
  <xsl:with-param name="isDeleted" select="$isDeleted"/>
7327
7401
  </xsl:call-template>
7328
7402
 
7403
+ <!-- Example: Dimensions in millimeters -->
7404
+ <xsl:apply-templates select="*[local-name() = 'note'][@type = 'units']"/>
7405
+
7329
7406
  <fo:block xsl:use-attribute-sets="figure-style">
7330
- <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
7407
+ <xsl:apply-templates select="node()[not(local-name() = 'name') and not(local-name() = 'note' and @type = 'units')]"/>
7331
7408
  </fo:block>
7332
7409
  <xsl:call-template name="fn_display_figure"/>
7333
- <xsl:for-each select="*[local-name() = 'note']">
7410
+ <xsl:for-each select="*[local-name() = 'note'][not(@type = 'units')]">
7334
7411
  <xsl:call-template name="note"/>
7335
7412
  </xsl:for-each>
7336
7413
 
@@ -7587,24 +7664,47 @@
7587
7664
 
7588
7665
  </xsl:when>
7589
7666
  <xsl:otherwise>
7590
- <fo:block xsl:use-attribute-sets="image-style">
7591
- <fo:instream-foreign-object fox:alt-text="{$alt-text}">
7592
- <xsl:attribute name="width">100%</xsl:attribute>
7593
- <xsl:attribute name="content-height">100%</xsl:attribute>
7594
- <xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
7595
- <xsl:variable name="svg_width" select="xalan:nodeset($svg_content)/*/@width"/>
7596
- <xsl:variable name="svg_height" select="xalan:nodeset($svg_content)/*/@height"/>
7597
- <!-- effective height 297 - 27.4 - 13 = 256.6 -->
7598
- <!-- effective width 210 - 12.5 - 25 = 172.5 -->
7599
- <!-- effective height / width = 1.48, 1.4 - with title -->
7600
- <xsl:if test="$svg_height &gt; ($svg_width * 1.4)"> <!-- for images with big height -->
7601
- <xsl:variable name="width" select="(($svg_width * 1.4) div $svg_height) * 100"/>
7602
- <xsl:attribute name="width"><xsl:value-of select="$width"/>%</xsl:attribute>
7603
- </xsl:if>
7604
- <xsl:attribute name="scaling">uniform</xsl:attribute>
7605
- <xsl:copy-of select="$svg_content"/>
7606
- </fo:instream-foreign-object>
7607
- </fo:block>
7667
+
7668
+ <xsl:variable name="element">
7669
+ <xsl:choose>
7670
+ <xsl:when test="ancestor::*[local-name() = 'tr'] and $isGenerateTableIF = 'true'">
7671
+ <fo:inline xsl:use-attribute-sets="image-style" text-align="left"/>
7672
+ </xsl:when>
7673
+ <xsl:otherwise>
7674
+ <fo:block xsl:use-attribute-sets="image-style">
7675
+ <xsl:if test="ancestor::*[local-name() = 'dt']">
7676
+ <xsl:attribute name="text-align">left</xsl:attribute>
7677
+ </xsl:if>
7678
+ </fo:block>
7679
+ </xsl:otherwise>
7680
+ </xsl:choose>
7681
+ </xsl:variable>
7682
+
7683
+ <xsl:for-each select="xalan:nodeset($element)/*">
7684
+ <xsl:copy>
7685
+ <xsl:copy-of select="@*"/>
7686
+ <!-- <fo:block xsl:use-attribute-sets="image-style"> -->
7687
+ <fo:instream-foreign-object fox:alt-text="{$alt-text}">
7688
+ <xsl:if test="$isGenerateTableIF = 'false'">
7689
+ <xsl:attribute name="width">100%</xsl:attribute>
7690
+ </xsl:if>
7691
+ <xsl:attribute name="content-height">100%</xsl:attribute>
7692
+ <xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
7693
+ <xsl:variable name="svg_width" select="xalan:nodeset($svg_content)/*/@width"/>
7694
+ <xsl:variable name="svg_height" select="xalan:nodeset($svg_content)/*/@height"/>
7695
+ <!-- effective height 297 - 27.4 - 13 = 256.6 -->
7696
+ <!-- effective width 210 - 12.5 - 25 = 172.5 -->
7697
+ <!-- effective height / width = 1.48, 1.4 - with title -->
7698
+ <xsl:if test="$svg_height &gt; ($svg_width * 1.4)"> <!-- for images with big height -->
7699
+ <xsl:variable name="width" select="(($svg_width * 1.4) div $svg_height) * 100"/>
7700
+ <xsl:attribute name="width"><xsl:value-of select="$width"/>%</xsl:attribute>
7701
+ </xsl:if>
7702
+ <xsl:attribute name="scaling">uniform</xsl:attribute>
7703
+ <xsl:copy-of select="$svg_content"/>
7704
+ </fo:instream-foreign-object>
7705
+ <!-- </fo:block> -->
7706
+ </xsl:copy>
7707
+ </xsl:for-each>
7608
7708
  </xsl:otherwise>
7609
7709
  </xsl:choose>
7610
7710
  </xsl:template>
@@ -7696,6 +7796,13 @@
7696
7796
  </xsl:for-each>
7697
7797
  </xsl:template>
7698
7798
 
7799
+ <!-- For the structures like: <dt><image src="" mimetype="image/svg+xml" height="" width=""><svg xmlns="http://www.w3.org/2000/svg" ... -->
7800
+ <xsl:template match="*[local-name() != 'figure']/*[local-name() = 'image'][*[local-name() = 'svg']]" priority="3">
7801
+ <xsl:for-each select="*[local-name() = 'svg']">
7802
+ <xsl:call-template name="image_svg"/>
7803
+ </xsl:for-each>
7804
+ </xsl:template>
7805
+
7699
7806
  <xsl:template match="*[local-name() = 'figure']/*[local-name() = 'image'][@mimetype = 'image/svg+xml' and @src[not(starts-with(., 'data:image/'))]]" priority="2">
7700
7807
  <xsl:variable name="svg_content" select="document(@src)"/>
7701
7808
  <xsl:variable name="name" select="ancestor::*[local-name() = 'figure']/*[local-name() = 'name']"/>
@@ -7834,6 +7941,8 @@
7834
7941
  <xsl:value-of select="."/>
7835
7942
  </xsl:template>
7836
7943
 
7944
+ <xsl:template match="*[local-name() = 'add'][starts-with(., $ace_tag)]/text()" mode="bookmarks" priority="3"/>
7945
+
7837
7946
  <xsl:template match="node()" mode="contents">
7838
7947
  <xsl:apply-templates mode="contents"/>
7839
7948
  </xsl:template>
@@ -8141,7 +8250,15 @@
8141
8250
  <xsl:value-of select="@section"/>
8142
8251
  <xsl:text> </xsl:text>
8143
8252
  </xsl:if>
8144
- <xsl:value-of select="normalize-space(title)"/>
8253
+ <xsl:variable name="title">
8254
+ <xsl:for-each select="title/node()">
8255
+ <xsl:choose>
8256
+ <xsl:when test="local-name() = 'add' and starts-with(., $ace_tag)"><!-- skip --></xsl:when>
8257
+ <xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
8258
+ </xsl:choose>
8259
+ </xsl:for-each>
8260
+ </xsl:variable>
8261
+ <xsl:value-of select="normalize-space($title)"/>
8145
8262
  </fo:bookmark-title>
8146
8263
  <xsl:apply-templates mode="bookmark"/>
8147
8264
  </fo:bookmark>
@@ -8167,6 +8284,12 @@
8167
8284
  <xsl:template match="*[local-name() = 'figure']/*[local-name() = 'fn']" priority="2"/>
8168
8285
  <xsl:template match="*[local-name() = 'figure']/*[local-name() = 'note']"/>
8169
8286
 
8287
+ <xsl:template match="*[local-name() = 'figure']/*[local-name() = 'note'][@type = 'units'] | *[local-name() = 'image']/*[local-name() = 'note'][@type = 'units']" priority="2">
8288
+ <fo:block text-align="right" keep-with-next="always">
8289
+ <xsl:apply-templates/>
8290
+ </fo:block>
8291
+ </xsl:template>
8292
+
8170
8293
  <!-- ====== -->
8171
8294
  <!-- ====== -->
8172
8295
  <xsl:template match="*[local-name() = 'title']" mode="contents_item">
@@ -8316,6 +8439,10 @@
8316
8439
  </xsl:for-each>
8317
8440
  </xsl:template>
8318
8441
 
8442
+ <xsl:template match="*[local-name() = 'add'][starts-with(., $ace_tag)]/text()" mode="contents_item" priority="2">
8443
+ <xsl:value-of select="."/>
8444
+ </xsl:template>
8445
+
8319
8446
  <!-- Note: to enable the addition of character span markup with semantic styling for DIS Word output -->
8320
8447
  <xsl:template match="*[local-name() = 'span']" mode="contents_item">
8321
8448
  <xsl:apply-templates mode="contents_item"/>