metanorma-itu 2.2.3 → 2.2.5

Sign up to get free protection for your applications and to get access to all the features.
@@ -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 != ''">
@@ -1298,23 +1339,24 @@
1298
1339
  <!-- PREFACE (Summary, History, ...) -->
1299
1340
  <!-- ============================= -->
1300
1341
 
1301
- <!-- Summary -->
1302
- <xsl:template match="itu:itu-standard/itu:preface/itu:abstract[@id = '_summary']" priority="3">
1303
- <fo:block font-size="12pt">
1304
- <xsl:value-of select="$linebreak"/>
1305
- <xsl:value-of select="$linebreak"/>
1306
- </fo:block>
1307
- <fo:block font-weight="bold" margin-top="18pt" margin-bottom="18pt">
1308
- <xsl:variable name="title-summary">
1309
- <xsl:call-template name="getTitle">
1310
- <xsl:with-param name="name" select="'title-summary'"/>
1311
- </xsl:call-template>
1312
- </xsl:variable>
1313
- <xsl:value-of select="$title-summary"/>
1342
+ <xsl:template match="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*" priority="3">
1343
+ <xsl:choose>
1344
+ <xsl:when test="preceding-sibling::*">
1345
+ <!-- page-break before 2nd and next elements only -->
1346
+ <fo:block break-after="page"/>
1347
+ </xsl:when>
1348
+ <xsl:otherwise>
1349
+ <fo:block font-size="12pt">
1350
+ <xsl:value-of select="$linebreak"/>
1351
+ <xsl:value-of select="$linebreak"/>
1352
+ </fo:block>
1353
+ </xsl:otherwise>
1354
+ </xsl:choose>
1355
+ <fo:block>
1356
+ <xsl:call-template name="setId"/>
1357
+ <xsl:apply-templates/>
1314
1358
  </fo:block>
1315
- <xsl:apply-templates/>
1316
1359
  </xsl:template>
1317
- <xsl:template match="itu:itu-standard/itu:preface/itu:abstract[@id = '_summary']/itu:title" priority="4"/>
1318
1360
 
1319
1361
  <xsl:template match="itu:preface/itu:clause" priority="3">
1320
1362
  <xsl:if test="$doctype != 'service-publication'">
@@ -2001,6 +2043,19 @@
2001
2043
  </svg>
2002
2044
  </xsl:variable>
2003
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
+
2004
2059
  <!-- convert YYYY-MM-DD to (MM/YYYY) -->
2005
2060
  <xsl:template name="formatDate">
2006
2061
  <xsl:param name="date"/>
@@ -2113,14 +2168,14 @@
2113
2168
  BUT DON'T put any another conditions together with $namespace = '...' (such conditions will be ignored). For another conditions, please use nested xsl:if or xsl:choose -->
2114
2169
 
2115
2170
  <!--
2116
- <misc-container>
2171
+ <metanorma-extension>
2117
2172
  <presentation-metadata>
2118
2173
  <papersize>letter</papersize>
2119
2174
  </presentation-metadata>
2120
- </misc-container>
2175
+ </metanorma-extension>
2121
2176
  -->
2122
2177
 
2123
- <xsl:variable name="papersize" select="java:toLowerCase(java:java.lang.String.new(normalize-space(//*[contains(local-name(), '-standard')]/*[local-name() = 'misc-container']/*[local-name() = 'presentation-metadata']/*[local-name() = 'papersize'])))"/>
2178
+ <xsl:variable name="papersize" select="java:toLowerCase(java:java.lang.String.new(normalize-space(//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata']/*[local-name() = 'papersize'])))"/>
2124
2179
  <xsl:variable name="papersize_width_">
2125
2180
  <xsl:choose>
2126
2181
  <xsl:when test="$papersize = 'letter'">215.9</xsl:when>
@@ -2235,7 +2290,7 @@
2235
2290
  <xsl:variable name="titles" select="xalan:nodeset($titles_)"/>
2236
2291
 
2237
2292
  <xsl:variable name="title-list-tables">
2238
- <xsl:variable name="toc_table_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'misc-container']/*[local-name() = 'toc'][@type='table']/*[local-name() = 'title']"/>
2293
+ <xsl:variable name="toc_table_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'toc'][@type='table']/*[local-name() = 'title']"/>
2239
2294
  <xsl:value-of select="$toc_table_title"/>
2240
2295
  <xsl:if test="normalize-space($toc_table_title) = ''">
2241
2296
  <xsl:call-template name="getTitle">
@@ -2245,7 +2300,7 @@
2245
2300
  </xsl:variable>
2246
2301
 
2247
2302
  <xsl:variable name="title-list-figures">
2248
- <xsl:variable name="toc_figure_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'misc-container']/*[local-name() = 'toc'][@type='figure']/*[local-name() = 'title']"/>
2303
+ <xsl:variable name="toc_figure_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'toc'][@type='figure']/*[local-name() = 'title']"/>
2249
2304
  <xsl:value-of select="$toc_figure_title"/>
2250
2305
  <xsl:if test="normalize-space($toc_figure_title) = ''">
2251
2306
  <xsl:call-template name="getTitle">
@@ -2255,7 +2310,7 @@
2255
2310
  </xsl:variable>
2256
2311
 
2257
2312
  <xsl:variable name="title-list-recommendations">
2258
- <xsl:variable name="toc_requirement_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'misc-container']/*[local-name() = 'toc'][@type='requirement']/*[local-name() = 'title']"/>
2313
+ <xsl:variable name="toc_requirement_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'toc'][@type='requirement']/*[local-name() = 'title']"/>
2259
2314
  <xsl:value-of select="$toc_requirement_title"/>
2260
2315
  <xsl:if test="normalize-space($toc_requirement_title) = ''">
2261
2316
  <xsl:call-template name="getTitle">
@@ -2327,7 +2382,7 @@
2327
2382
  <xsl:variable name="root-style_" select="xalan:nodeset($root-style)"/>
2328
2383
 
2329
2384
  <xsl:variable name="additional_fonts_">
2330
- <xsl:for-each select="//*[contains(local-name(), '-standard')][1]/*[local-name() = 'misc-container']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name'] = 'fonts']/*[local-name() = 'value'] | //*[contains(local-name(), '-standard')][1]/*[local-name() = 'presentation-metadata'][*[local-name() = 'name'] = 'fonts']/*[local-name() = 'value']">
2385
+ <xsl:for-each select="//*[contains(local-name(), '-standard')][1]/*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name'] = 'fonts']/*[local-name() = 'value'] | //*[contains(local-name(), '-standard')][1]/*[local-name() = 'presentation-metadata'][*[local-name() = 'name'] = 'fonts']/*[local-name() = 'value']">
2331
2386
  <xsl:value-of select="."/><xsl:if test="position() != last()">, </xsl:if>
2332
2387
  </xsl:for-each>
2333
2388
  </xsl:variable>
@@ -3049,17 +3104,28 @@
3049
3104
  <!-- admonition -->
3050
3105
  <xsl:attribute-set name="admonition-style">
3051
3106
 
3107
+ <xsl:attribute name="border">0.5pt solid black</xsl:attribute>
3108
+ <xsl:attribute name="space-before">12pt</xsl:attribute>
3109
+ <xsl:attribute name="space-after">12pt</xsl:attribute>
3110
+
3052
3111
  </xsl:attribute-set> <!-- admonition-style -->
3053
3112
 
3054
3113
  <xsl:attribute-set name="admonition-container-style">
3055
3114
  <xsl:attribute name="margin-left">0mm</xsl:attribute>
3056
3115
  <xsl:attribute name="margin-right">0mm</xsl:attribute>
3057
3116
 
3117
+ <xsl:attribute name="padding">2mm</xsl:attribute>
3118
+ <xsl:attribute name="padding-top">3mm</xsl:attribute>
3119
+
3058
3120
  </xsl:attribute-set> <!-- admonition-container-style -->
3059
3121
 
3060
3122
  <xsl:attribute-set name="admonition-name-style">
3061
3123
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
3062
3124
 
3125
+ <xsl:attribute name="text-align">center</xsl:attribute>
3126
+ <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
3127
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
3128
+
3063
3129
  </xsl:attribute-set> <!-- admonition-name-style -->
3064
3130
 
3065
3131
  <xsl:attribute-set name="admonition-p-style">
@@ -3381,10 +3447,10 @@
3381
3447
 
3382
3448
  <xsl:template name="processTablesFigures_Contents">
3383
3449
  <xsl:param name="always"/>
3384
- <xsl:if test="(//*[contains(local-name(), '-standard')]/*[local-name() = 'misc-container']/*[local-name() = 'toc'][@type='table']/*[local-name() = 'title']) or normalize-space($always) = 'true'">
3450
+ <xsl:if test="(//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'toc'][@type='table']/*[local-name() = 'title']) or normalize-space($always) = 'true'">
3385
3451
  <xsl:call-template name="processTables_Contents"/>
3386
3452
  </xsl:if>
3387
- <xsl:if test="(//*[contains(local-name(), '-standard')]/*[local-name() = 'misc-container']/*[local-name() = 'toc'][@type='figure']/*[local-name() = 'title']) or normalize-space($always) = 'true'">
3453
+ <xsl:if test="(//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'toc'][@type='figure']/*[local-name() = 'title']) or normalize-space($always) = 'true'">
3388
3454
  <xsl:call-template name="processFigures_Contents"/>
3389
3455
  </xsl:if>
3390
3456
  </xsl:template>
@@ -3730,6 +3796,8 @@
3730
3796
 
3731
3797
  <xsl:attribute name="width"><xsl:value-of select="normalize-space($table_width)"/></xsl:attribute>
3732
3798
 
3799
+ <xsl:call-template name="setBordersTableArray"/>
3800
+
3733
3801
  <xsl:if test="$doctype = 'service-publication'">
3734
3802
  <xsl:attribute name="border">1pt solid rgb(211,211,211)</xsl:attribute>
3735
3803
  </xsl:if>
@@ -3878,6 +3946,10 @@
3878
3946
 
3879
3947
  </xsl:template>
3880
3948
 
3949
+ <xsl:template name="setBordersTableArray">
3950
+
3951
+ </xsl:template>
3952
+
3881
3953
  <xsl:template match="*[local-name()='table']/*[local-name() = 'name']">
3882
3954
  <xsl:param name="continued"/>
3883
3955
  <xsl:if test="normalize-space() != ''">
@@ -4367,6 +4439,8 @@
4367
4439
  <xsl:attribute name="border">none</xsl:attribute>
4368
4440
  </xsl:if>
4369
4441
 
4442
+ <xsl:call-template name="setBordersTableArray"/>
4443
+
4370
4444
  <!-- fn will be processed inside 'note' processing -->
4371
4445
 
4372
4446
  <xsl:if test="$doctype = 'service-publication'">
@@ -4492,6 +4566,8 @@
4492
4566
  <xsl:template match="*[local-name()='thead']/*[local-name()='tr']" priority="2">
4493
4567
  <fo:table-row xsl:use-attribute-sets="table-header-row-style">
4494
4568
 
4569
+ <xsl:call-template name="setBordersTableArray"/>
4570
+
4495
4571
  <xsl:if test="$doctype = 'service-publication'">
4496
4572
  <xsl:attribute name="border-bottom">1.1pt solid black</xsl:attribute>
4497
4573
  </xsl:if>
@@ -4519,6 +4595,8 @@
4519
4595
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
4520
4596
  </xsl:if>
4521
4597
 
4598
+ <xsl:call-template name="setBordersTableArray"/>
4599
+
4522
4600
  <xsl:call-template name="setTableRowAttributes"/>
4523
4601
  <xsl:apply-templates/>
4524
4602
  </fo:table-row>
@@ -4542,6 +4620,8 @@
4542
4620
  <xsl:with-param name="default">center</xsl:with-param>
4543
4621
  </xsl:call-template>
4544
4622
 
4623
+ <xsl:call-template name="setBordersTableArray"/>
4624
+
4545
4625
  <xsl:if test="ancestor::*[local-name()='preface']">
4546
4626
  <xsl:if test="$doctype != 'service-publication'">
4547
4627
  <xsl:attribute name="border">solid black 0pt</xsl:attribute>
@@ -4605,6 +4685,8 @@
4605
4685
 
4606
4686
  <!-- bsi -->
4607
4687
 
4688
+ <xsl:call-template name="setBordersTableArray"/>
4689
+
4608
4690
  <xsl:if test="ancestor::*[local-name()='preface']">
4609
4691
  <xsl:attribute name="border">solid black 0pt</xsl:attribute>
4610
4692
  </xsl:if>
@@ -8277,7 +8359,7 @@
8277
8359
  <!-- sourcecode -->
8278
8360
  <!-- =============== -->
8279
8361
 
8280
- <xsl:variable name="source-highlighter-css_" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'misc-container']/*[local-name() = 'source-highlighter-css']"/>
8362
+ <xsl:variable name="source-highlighter-css_" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'source-highlighter-css']"/>
8281
8363
  <xsl:variable name="sourcecode_css_" select="java:org.metanorma.fop.Util.parseCSS($source-highlighter-css_)"/>
8282
8364
  <xsl:variable name="sourcecode_css" select="xalan:nodeset($sourcecode_css_)"/>
8283
8365
 
@@ -10368,8 +10450,8 @@
10368
10450
 
10369
10451
  <xsl:variable name="toc_level">
10370
10452
  <!-- https://www.metanorma.org/author/ref/document-attributes/ -->
10371
- <xsl:variable name="htmltoclevels" select="normalize-space(//*[local-name() = 'misc-container']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name']/text() = 'HTML TOC Heading Levels']/*[local-name() = 'value'])"/> <!-- :htmltoclevels Number of table of contents levels to render in HTML/PDF output; used to override :toclevels:-->
10372
- <xsl:variable name="toclevels" select="normalize-space(//*[local-name() = 'misc-container']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name']/text() = 'TOC Heading Levels']/*[local-name() = 'value'])"/> <!-- Number of table of contents levels to render -->
10453
+ <xsl:variable name="htmltoclevels" select="normalize-space(//*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name']/text() = 'HTML TOC Heading Levels']/*[local-name() = 'value'])"/> <!-- :htmltoclevels Number of table of contents levels to render in HTML/PDF output; used to override :toclevels:-->
10454
+ <xsl:variable name="toclevels" select="normalize-space(//*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name']/text() = 'TOC Heading Levels']/*[local-name() = 'value'])"/> <!-- Number of table of contents levels to render -->
10373
10455
  <xsl:choose>
10374
10456
  <xsl:when test="$htmltoclevels != ''"><xsl:value-of select="number($htmltoclevels)"/></xsl:when> <!-- if there is value in xml -->
10375
10457
  <xsl:when test="$toclevels != ''"><xsl:value-of select="number($toclevels)"/></xsl:when> <!-- if there is value in xml -->
@@ -11361,6 +11443,7 @@
11361
11443
  <xsl:choose>
11362
11444
  <xsl:when test="$lang = 'ar' and $align = 'left'">start</xsl:when>
11363
11445
  <xsl:when test="$lang = 'ar' and $align = 'right'">end</xsl:when>
11446
+ <xsl:when test="$align = 'justified'">justify</xsl:when>
11364
11447
  <xsl:when test="$align != '' and not($align = 'indent')"><xsl:value-of select="$align"/></xsl:when>
11365
11448
  <xsl:when test="ancestor::*[local-name() = 'td']/@align"><xsl:value-of select="ancestor::*[local-name() = 'td']/@align"/></xsl:when>
11366
11449
  <xsl:when test="ancestor::*[local-name() = 'th']/@align"><xsl:value-of select="ancestor::*[local-name() = 'th']/@align"/></xsl:when>