metanorma-itu 2.4.4 → 2.4.6
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/isodoc/itu/html/header.html +68 -0
- data/lib/isodoc/itu/html/itu.css +4 -1
- data/lib/isodoc/itu/html/itu.scss +4 -1
- data/lib/isodoc/itu/html/logo-small.png +0 -0
- data/lib/isodoc/itu/html/word_itu_intro.html +2 -0
- data/lib/isodoc/itu/html/wordstyle.css +2 -0
- data/lib/isodoc/itu/html/wordstyle.scss +2 -0
- data/lib/isodoc/itu/html_convert.rb +10 -0
- data/lib/isodoc/itu/i18n-ar.yaml +10 -0
- data/lib/isodoc/itu/i18n-de.yaml +10 -0
- data/lib/isodoc/itu/i18n-en.yaml +10 -0
- data/lib/isodoc/itu/i18n-es.yaml +10 -0
- data/lib/isodoc/itu/i18n-fr.yaml +10 -0
- data/lib/isodoc/itu/i18n-ru.yaml +10 -0
- data/lib/isodoc/itu/i18n-zh-Hans.yaml +10 -0
- data/lib/isodoc/itu/itu.implementers-guide.xsl +198 -131
- data/lib/isodoc/itu/itu.in-force.xsl +198 -131
- data/lib/isodoc/itu/itu.recommendation-annex.xsl +198 -131
- data/lib/isodoc/itu/itu.recommendation-supplement.xsl +198 -131
- data/lib/isodoc/itu/itu.recommendation.xsl +198 -131
- data/lib/isodoc/itu/itu.resolution.xsl +198 -131
- data/lib/isodoc/itu/itu.service-publication.xsl +198 -131
- data/lib/isodoc/itu/itu.technical-paper.xsl +198 -131
- data/lib/isodoc/itu/itu.technical-report.xsl +198 -131
- data/lib/isodoc/itu/metadata.rb +50 -18
- data/lib/isodoc/itu/presentation_preface.rb +110 -9
- data/lib/isodoc/itu/presentation_xml_convert.rb +13 -15
- data/lib/isodoc/itu/word_cleanup.rb +25 -16
- data/lib/isodoc/itu/word_convert.rb +21 -2
- data/lib/metanorma/itu/biblio.rng +24 -8
- data/lib/metanorma/itu/cleanup_section.rb +1 -1
- data/lib/metanorma/itu/front.rb +39 -13
- data/lib/metanorma/itu/front_id.rb +17 -6
- data/lib/metanorma/itu/isodoc.rng +67 -55
- data/lib/metanorma/itu/relaton-itu.rng +43 -7
- data/lib/metanorma/itu/validate.rb +4 -4
- data/lib/metanorma/itu/version.rb +1 -1
- data/metanorma-itu.gemspec +1 -1
- metadata +4 -3
@@ -143,7 +143,7 @@
|
|
143
143
|
<xsl:variable name="document_scheme" select="normalize-space(/itu:itu-standard/itu:metanorma-extension/itu:presentation-metadata[itu:name = 'document-scheme']/itu:value)"/>
|
144
144
|
<xsl:variable name="layoutVersion_">
|
145
145
|
<xsl:choose>
|
146
|
-
<xsl:when test="$document_scheme = ''">2023</xsl:when>
|
146
|
+
<xsl:when test="$document_scheme = '' or $document_scheme = 'current'">2023</xsl:when>
|
147
147
|
<xsl:otherwise>default</xsl:otherwise>
|
148
148
|
</xsl:choose>
|
149
149
|
</xsl:variable>
|
@@ -170,6 +170,20 @@
|
|
170
170
|
</xsl:variable>
|
171
171
|
<xsl:variable name="color_cover_itu_logo" select="normalize-space($color_cover_itu_logo_)"/>
|
172
172
|
|
173
|
+
<xsl:variable name="i18n_international_telecommunication_union"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">international_telecommunication_union</xsl:with-param></xsl:call-template></xsl:variable>
|
174
|
+
<xsl:variable name="i18n_edition"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">edition</xsl:with-param></xsl:call-template></xsl:variable>
|
175
|
+
<xsl:variable name="i18n_edition_Capitalized"><xsl:call-template name="capitalize"><xsl:with-param name="str" select="$i18n_edition"/></xsl:call-template></xsl:variable>
|
176
|
+
<xsl:variable name="i18n_annex"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">annex</xsl:with-param></xsl:call-template></xsl:variable>
|
177
|
+
<xsl:variable name="i18n_annex_to_itu_ob"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">annex_to_itu_ob</xsl:with-param></xsl:call-template></xsl:variable>
|
178
|
+
<xsl:variable name="i18n_number_abbrev"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">number_abbrev</xsl:with-param></xsl:call-template></xsl:variable>
|
179
|
+
<xsl:variable name="i18n_tsb"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">tsb</xsl:with-param></xsl:call-template></xsl:variable>
|
180
|
+
<xsl:variable name="i18n_tsb_full"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">tsb_full</xsl:with-param><xsl:with-param name="formatted">true</xsl:with-param></xsl:call-template></xsl:variable>
|
181
|
+
<xsl:variable name="i18n_placedate"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">placedate</xsl:with-param></xsl:call-template></xsl:variable>
|
182
|
+
<xsl:variable name="i18n_series"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">series</xsl:with-param></xsl:call-template></xsl:variable>
|
183
|
+
<xsl:variable name="i18n_series_Capitalized"><xsl:call-template name="capitalize"><xsl:with-param name="str" select="$i18n_series"/></xsl:call-template></xsl:variable>
|
184
|
+
<xsl:variable name="i18n_keywords"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">keywords</xsl:with-param></xsl:call-template></xsl:variable>
|
185
|
+
<xsl:variable name="i18n_page"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">Page.sg</xsl:with-param></xsl:call-template></xsl:variable>
|
186
|
+
|
173
187
|
<xsl:template match="/">
|
174
188
|
<xsl:call-template name="namespaceCheck"/>
|
175
189
|
<fo:root xml:lang="{$lang}">
|
@@ -340,9 +354,7 @@
|
|
340
354
|
</fo:table-cell>
|
341
355
|
<fo:table-cell text-align="end" display-align="center">
|
342
356
|
<fo:block>
|
343
|
-
<xsl:
|
344
|
-
<xsl:with-param name="key">international_telecommunication_union</xsl:with-param>
|
345
|
-
</xsl:call-template>
|
357
|
+
<xsl:value-of select="$i18n_international_telecommunication_union"/>
|
346
358
|
</fo:block>
|
347
359
|
</fo:table-cell>
|
348
360
|
</fo:table-row>
|
@@ -350,16 +362,13 @@
|
|
350
362
|
<!-- collection/series (optional) -->
|
351
363
|
<fo:table-cell text-align="start">
|
352
364
|
<fo:block>
|
353
|
-
<xsl:
|
354
|
-
<xsl:if test="$collection != ''">
|
355
|
-
<xsl:value-of select="$collection"/>
|
356
|
-
</xsl:if>
|
365
|
+
<xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:title[@type = 'collection']"/>
|
357
366
|
</fo:block>
|
358
367
|
</fo:table-cell>
|
359
368
|
<!-- Sector or Bureau name -->
|
360
369
|
<fo:table-cell text-align="end">
|
361
370
|
<fo:block>
|
362
|
-
<xsl:variable name="sector" select="normalize-space(/itu:itu-standard/itu:
|
371
|
+
<xsl:variable name="sector" select="normalize-space(/itu:itu-standard/itu:bibdata/itu:ext/itu:editorialgroup/itu:sector)"/>
|
363
372
|
<xsl:value-of select="$sector"/>
|
364
373
|
<xsl:if test="$sector = ''">
|
365
374
|
<xsl:variable name="bureau_key">
|
@@ -408,13 +417,25 @@
|
|
408
417
|
|
409
418
|
<xsl:choose>
|
410
419
|
|
411
|
-
<xsl:when test="$doctype = 'service-publication'">
|
412
|
-
<fo:block margin-top="11.5mm" font-size="
|
420
|
+
<xsl:when test="$doctype = 'service-publication'"> <!-- Flagship -->
|
421
|
+
<fo:block margin-top="11.5mm" font-size="34pt">
|
413
422
|
<xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:title[@type = 'main' and @language = $lang]"/>
|
414
423
|
</fo:block>
|
415
|
-
<fo:block margin-top="2mm">
|
424
|
+
<fo:block margin-top="2mm" font-size="26pt">
|
416
425
|
<xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:title[@type = 'subtitle' and @language = $lang]"/>
|
417
426
|
</fo:block>
|
427
|
+
<!-- https://github.com/metanorma/metanorma-itu/issues/474#issuecomment-1966298384 -->
|
428
|
+
<xsl:variable name="title_slogan" select="normalize-space(/itu:itu-standard/itu:bibdata/itu:title[@type = 'slogan'])"/>
|
429
|
+
<xsl:if test="$title_slogan != ''">
|
430
|
+
<fo:block margin-top="2mm" font-family="Adelle Devanagari" font-size="26pt">
|
431
|
+
<xsl:choose>
|
432
|
+
<xsl:when test="$lang = 'ar'"><xsl:attribute name="font-family">Traditional Arabic</xsl:attribute></xsl:when>
|
433
|
+
<xsl:when test="$lang = 'zh'"><xsl:attribute name="font-family">STKaiti</xsl:attribute></xsl:when>
|
434
|
+
<!-- <xsl:otherwise><xsl:attribute name="font-style">italic</xsl:attribute></xsl:otherwise> -->
|
435
|
+
</xsl:choose>
|
436
|
+
<xsl:value-of select="$title_slogan"/>
|
437
|
+
</fo:block>
|
438
|
+
</xsl:if>
|
418
439
|
<xsl:variable name="year_published" select="substring($date_published,1,4)"/>
|
419
440
|
<xsl:if test="$year_published != ''">
|
420
441
|
<!-- Examples:
|
@@ -424,27 +445,13 @@
|
|
424
445
|
طبعة 2020
|
425
446
|
2020 年版
|
426
447
|
Издание 2020 года -->
|
427
|
-
<fo:block margin-top="3mm" font-size="
|
428
|
-
<xsl:variable name="editionTitle">
|
429
|
-
<xsl:call-template name="getLocalizedString">
|
430
|
-
<xsl:with-param name="key">edition</xsl:with-param>
|
431
|
-
</xsl:call-template>
|
432
|
-
</xsl:variable>
|
433
|
-
<xsl:variable name="editionTitleCapitalized">
|
434
|
-
<xsl:call-template name="capitalize">
|
435
|
-
<xsl:with-param name="str" select="$editionTitle"/>
|
436
|
-
</xsl:call-template>
|
437
|
-
</xsl:variable>
|
448
|
+
<fo:block margin-top="3mm" font-size="22pt">
|
438
449
|
<xsl:choose>
|
439
450
|
<xsl:when test="$lang = 'en' or $lang = 'ar' or $lang = 'zh'">
|
440
|
-
<xsl:value-of select="$year_published"/>
|
441
|
-
<xsl:text> </xsl:text>
|
442
|
-
<xsl:value-of select="$editionTitle"/>
|
451
|
+
<xsl:value-of select="concat($year_published, ' ', $i18n_edition)"/>
|
443
452
|
</xsl:when>
|
444
453
|
<xsl:otherwise>
|
445
|
-
<xsl:value-of select="$
|
446
|
-
<xsl:text> </xsl:text>
|
447
|
-
<xsl:value-of select="$year_published"/>
|
454
|
+
<xsl:value-of select="concat($i18n_edition_Capitalized, ' ', $year_published)"/>
|
448
455
|
<xsl:if test="$lang = 'ru'"> года</xsl:if>
|
449
456
|
</xsl:otherwise>
|
450
457
|
</xsl:choose>
|
@@ -508,9 +515,7 @@
|
|
508
515
|
<fo:block-container>
|
509
516
|
<xsl:call-template name="setWritingMode"/>
|
510
517
|
<fo:block>
|
511
|
-
<xsl:
|
512
|
-
<xsl:with-param name="key">annex</xsl:with-param>
|
513
|
-
</xsl:call-template>
|
518
|
+
<xsl:value-of select="$i18n_annex"/>
|
514
519
|
<xsl:text> </xsl:text>
|
515
520
|
<xsl:value-of select="$annexid"/>
|
516
521
|
</fo:block>
|
@@ -611,9 +616,7 @@
|
|
611
616
|
<!-- Example: Annex F1 - ... -->
|
612
617
|
<xsl:for-each select="/itu:itu-standard/itu:bibdata/itu:title[@type = 'annex' and @language = $lang]">
|
613
618
|
<fo:block font-size="18pt" margin-top="3mm" role="H1">
|
614
|
-
<xsl:
|
615
|
-
<xsl:with-param name="key">annex</xsl:with-param>
|
616
|
-
</xsl:call-template>
|
619
|
+
<xsl:value-of select="$i18n_annex"/>
|
617
620
|
<xsl:text> </xsl:text>
|
618
621
|
<xsl:value-of select="$annexid"/>
|
619
622
|
<xsl:value-of select="$en_dash_separator"/>
|
@@ -824,14 +827,10 @@
|
|
824
827
|
<xsl:attribute name="font-style">normal</xsl:attribute>
|
825
828
|
</xsl:if>
|
826
829
|
<fo:block>
|
827
|
-
<xsl:
|
828
|
-
<xsl:with-param name="key">annex_to_itu_ob</xsl:with-param>
|
829
|
-
</xsl:call-template>
|
830
|
+
<xsl:value-of select="$i18n_annex_to_itu_ob"/>
|
830
831
|
</fo:block>
|
831
832
|
<fo:block>
|
832
|
-
<xsl:
|
833
|
-
<xsl:with-param name="key">number_abbrev</xsl:with-param>
|
834
|
-
</xsl:call-template>
|
833
|
+
<xsl:value-of select="$i18n_number_abbrev"/>
|
835
834
|
<xsl:value-of select="/*/itu:bibdata/itu:docnumber"/>
|
836
835
|
<xsl:text> – </xsl:text>
|
837
836
|
<xsl:value-of select="translate(normalize-space(/*/itu:bibdata/itu:date[@type='published' and @format]),' ','')"/>
|
@@ -849,30 +848,17 @@
|
|
849
848
|
<xsl:copy-of select="$Image-ITU-Globe-Logo"/>
|
850
849
|
</fo:instream-foreign-object>
|
851
850
|
</fo:inline>
|
852
|
-
<xsl:
|
853
|
-
<xsl:call-template name="getLocalizedString">
|
854
|
-
<xsl:with-param name="key">international_telecommunication_union</xsl:with-param>
|
855
|
-
</xsl:call-template>
|
856
|
-
</xsl:variable>
|
857
|
-
<xsl:value-of select="java:toUpperCase(java:java.lang.String.new($itu_name))"/>
|
851
|
+
<xsl:value-of select="java:toUpperCase(java:java.lang.String.new($i18n_international_telecommunication_union))"/>
|
858
852
|
</fo:block>
|
859
853
|
</fo:block>
|
860
854
|
<fo:block-container margin-left="10mm">
|
861
855
|
<fo:block-container margin-left="0mm">
|
862
856
|
|
863
857
|
<fo:block font-size="20pt" font-weight="bold" space-before="30mm">
|
864
|
-
<xsl:
|
865
|
-
<xsl:with-param name="key">tsb</xsl:with-param>
|
866
|
-
</xsl:call-template>
|
858
|
+
<xsl:value-of select="$i18n_tsb"/>
|
867
859
|
</fo:block>
|
868
860
|
<fo:block font-size="14pt" font-weight="bold">
|
869
|
-
<xsl:
|
870
|
-
<xsl:call-template name="getLocalizedString">
|
871
|
-
<xsl:with-param name="key">tsb_full</xsl:with-param>
|
872
|
-
<xsl:with-param name="formatted">true</xsl:with-param>
|
873
|
-
</xsl:call-template>
|
874
|
-
</xsl:variable>
|
875
|
-
<xsl:value-of select="java:toUpperCase(java:java.lang.String.new($tsb_full))"/>
|
861
|
+
<xsl:value-of select="java:toUpperCase(java:java.lang.String.new($i18n_tsb_full))"/>
|
876
862
|
</fo:block>
|
877
863
|
<fo:block-container height="20mm" display-align="center" width="90%">
|
878
864
|
<fo:block font-weight="bold">
|
@@ -968,14 +954,9 @@
|
|
968
954
|
</fo:block-container>
|
969
955
|
|
970
956
|
<fo:block space-before="25mm" font-weight="bold">
|
971
|
-
<xsl:variable name="placedate">
|
972
|
-
<xsl:call-template name="getLocalizedString">
|
973
|
-
<xsl:with-param name="key">placedate</xsl:with-param>
|
974
|
-
</xsl:call-template>
|
975
|
-
</xsl:variable>
|
976
957
|
<xsl:variable name="year" select="substring(/*/itu:bibdata/itu:date[@type = 'published']/itu:on,1,4)"/>
|
977
958
|
<xsl:if test="normalize-space($year) != ''">
|
978
|
-
<xsl:value-of select="java:replaceAll(java:java.lang.String.new($
|
959
|
+
<xsl:value-of select="java:replaceAll(java:java.lang.String.new($i18n_placedate),'%',$year)"/>
|
979
960
|
</xsl:if>
|
980
961
|
</fo:block>
|
981
962
|
</fo:flow>
|
@@ -1038,7 +1019,7 @@
|
|
1038
1019
|
</fo:block-container>
|
1039
1020
|
</fo:table-cell>
|
1040
1021
|
</fo:table-row>
|
1041
|
-
<fo:table-row
|
1022
|
+
<fo:table-row>
|
1042
1023
|
<fo:table-cell>
|
1043
1024
|
<fo:block> </fo:block>
|
1044
1025
|
</fo:table-cell>
|
@@ -1068,14 +1049,7 @@
|
|
1068
1049
|
<xsl:when test="$doctype = 'resolution'"/>
|
1069
1050
|
<xsl:when test="$doctype = 'recommendation-supplement'">
|
1070
1051
|
<!-- Series L -->
|
1071
|
-
<xsl:
|
1072
|
-
<xsl:call-template name="getLocalizedString">
|
1073
|
-
<xsl:with-param name="key">series</xsl:with-param>
|
1074
|
-
</xsl:call-template>
|
1075
|
-
</xsl:variable>
|
1076
|
-
<xsl:call-template name="capitalize">
|
1077
|
-
<xsl:with-param name="str" select="$title-series"/>
|
1078
|
-
</xsl:call-template>
|
1052
|
+
<xsl:value-of select="$i18n_series_Capitalized"/>
|
1079
1053
|
<xsl:text> </xsl:text>
|
1080
1054
|
<xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:series[@type='main']/itu:title[@type='abbrev']"/>
|
1081
1055
|
<!-- Ex. Supplement 37 -->
|
@@ -1112,11 +1086,7 @@
|
|
1112
1086
|
<fo:block-container>
|
1113
1087
|
<xsl:call-template name="setWritingMode"/>
|
1114
1088
|
<fo:block font-size="18pt" font-weight="bold">
|
1115
|
-
<xsl:
|
1116
|
-
<xsl:with-param name="key">annex</xsl:with-param>
|
1117
|
-
</xsl:call-template>
|
1118
|
-
<xsl:text> </xsl:text>
|
1119
|
-
<xsl:value-of select="$annexid"/>
|
1089
|
+
<xsl:value-of select="concat($i18n_annex, ' ', $annexid)"/>
|
1120
1090
|
</fo:block>
|
1121
1091
|
</fo:block-container>
|
1122
1092
|
</xsl:if>
|
@@ -1137,7 +1107,7 @@
|
|
1137
1107
|
</fo:block-container>
|
1138
1108
|
</xsl:if>
|
1139
1109
|
</xsl:variable>
|
1140
|
-
<fo:table-row height="17.2mm"
|
1110
|
+
<fo:table-row height="17.2mm">
|
1141
1111
|
<fo:table-cell>
|
1142
1112
|
<fo:block> </fo:block>
|
1143
1113
|
</fo:table-cell>
|
@@ -1175,7 +1145,7 @@
|
|
1175
1145
|
</fo:table-cell>
|
1176
1146
|
</fo:table-row>
|
1177
1147
|
<xsl:variable name="countAdditionalNumbers" select="count(xalan:nodeset($additionalNumbers)/*)"/>
|
1178
|
-
<fo:table-row height="64mm"
|
1148
|
+
<fo:table-row height="64mm"> <!-- 59mm -->
|
1179
1149
|
<xsl:if test="$countAdditionalNumbers != 0">
|
1180
1150
|
<xsl:attribute name="height"><xsl:value-of select="64 - $countAdditionalNumbers * 5"/>mm</xsl:attribute>
|
1181
1151
|
</xsl:if>
|
@@ -1210,7 +1180,7 @@
|
|
1210
1180
|
</fo:block-container>
|
1211
1181
|
</fo:table-cell>
|
1212
1182
|
</fo:table-row>
|
1213
|
-
<fo:table-row height="40mm"
|
1183
|
+
<fo:table-row height="40mm">
|
1214
1184
|
<fo:table-cell>
|
1215
1185
|
<fo:block> </fo:block>
|
1216
1186
|
</fo:table-cell>
|
@@ -1263,7 +1233,7 @@
|
|
1263
1233
|
</fo:block-container>
|
1264
1234
|
</fo:table-cell>
|
1265
1235
|
</fo:table-row>
|
1266
|
-
<fo:table-row height="40mm"
|
1236
|
+
<fo:table-row height="40mm">
|
1267
1237
|
<fo:table-cell>
|
1268
1238
|
<fo:block> </fo:block>
|
1269
1239
|
</fo:table-cell>
|
@@ -1284,7 +1254,7 @@
|
|
1284
1254
|
</fo:block-container>
|
1285
1255
|
</fo:table-cell>
|
1286
1256
|
</fo:table-row>
|
1287
|
-
<fo:table-row height="25mm"
|
1257
|
+
<fo:table-row height="25mm">
|
1288
1258
|
<fo:table-cell>
|
1289
1259
|
<fo:block> </fo:block>
|
1290
1260
|
</fo:table-cell>
|
@@ -1343,12 +1313,7 @@
|
|
1343
1313
|
</xsl:choose>
|
1344
1314
|
|
1345
1315
|
<xsl:if test="$annexid != ''">
|
1346
|
-
<xsl:
|
1347
|
-
<xsl:call-template name="getLocalizedString">
|
1348
|
-
<xsl:with-param name="key">annex</xsl:with-param>
|
1349
|
-
</xsl:call-template>
|
1350
|
-
<xsl:text> </xsl:text>
|
1351
|
-
<xsl:value-of select="$annexid"/>
|
1316
|
+
<xsl:value-of select="concat(' — ', $i18n_annex, ' ', $annexid)"/>
|
1352
1317
|
</xsl:if>
|
1353
1318
|
</fo:block>
|
1354
1319
|
</fo:block-container>
|
@@ -1418,9 +1383,7 @@
|
|
1418
1383
|
<xsl:value-of select="$linebreak"/>
|
1419
1384
|
</fo:block>
|
1420
1385
|
<fo:block font-weight="bold" margin-top="18pt" margin-bottom="18pt">
|
1421
|
-
<xsl:
|
1422
|
-
<xsl:with-param name="key">keywords</xsl:with-param>
|
1423
|
-
</xsl:call-template>
|
1386
|
+
<xsl:value-of select="$i18n_keywords"/>
|
1424
1387
|
</fo:block>
|
1425
1388
|
<fo:block>
|
1426
1389
|
<xsl:call-template name="insertKeywords"/>
|
@@ -1603,9 +1566,7 @@
|
|
1603
1566
|
<xsl:if test="$series_title != ''">
|
1604
1567
|
<!-- Series -->
|
1605
1568
|
<fo:inline text-transform="uppercase">
|
1606
|
-
<xsl:
|
1607
|
-
<xsl:with-param name="key">series</xsl:with-param>
|
1608
|
-
</xsl:call-template>
|
1569
|
+
<xsl:value-of select="$i18n_series"/>
|
1609
1570
|
</fo:inline>
|
1610
1571
|
<xsl:text> </xsl:text>
|
1611
1572
|
<xsl:value-of select="$series_title"/>
|
@@ -1714,9 +1675,7 @@
|
|
1714
1675
|
<xsl:with-param name="title" select="$title-list-tables"/>
|
1715
1676
|
</xsl:call-template>
|
1716
1677
|
<fo:block margin-top="6pt" text-align="end" font-weight="bold" keep-with-next="always">
|
1717
|
-
<xsl:
|
1718
|
-
<xsl:with-param name="key">Page.sg</xsl:with-param>
|
1719
|
-
</xsl:call-template>
|
1678
|
+
<xsl:value-of select="$i18n_page"/>
|
1720
1679
|
</fo:block>
|
1721
1680
|
<fo:block-container>
|
1722
1681
|
<xsl:for-each select="$contents//tables/table">
|
@@ -1731,9 +1690,7 @@
|
|
1731
1690
|
<xsl:with-param name="title" select="$title-list-figures"/>
|
1732
1691
|
</xsl:call-template>
|
1733
1692
|
<fo:block margin-top="6pt" text-align="end" font-weight="bold" keep-with-next="always">
|
1734
|
-
<xsl:
|
1735
|
-
<xsl:with-param name="key">Page.sg</xsl:with-param>
|
1736
|
-
</xsl:call-template>
|
1693
|
+
<xsl:value-of select="$i18n_page"/>
|
1737
1694
|
</fo:block>
|
1738
1695
|
<fo:block-container>
|
1739
1696
|
<xsl:for-each select="$contents//figures/figure">
|
@@ -1757,9 +1714,7 @@
|
|
1757
1714
|
<xsl:apply-templates/>
|
1758
1715
|
</fo:block>
|
1759
1716
|
<fo:block margin-top="6pt" text-align="end" font-weight="bold">
|
1760
|
-
<xsl:
|
1761
|
-
<xsl:with-param name="key">Page.sg</xsl:with-param>
|
1762
|
-
</xsl:call-template>
|
1717
|
+
<xsl:value-of select="$i18n_page"/>
|
1763
1718
|
</fo:block>
|
1764
1719
|
</xsl:template>
|
1765
1720
|
|
@@ -2792,17 +2747,30 @@
|
|
2792
2747
|
<xsl:param name="add_math_as_text">true</xsl:param> <!-- add math in text behind svg formula, to copy-paste formula from PDF as text -->
|
2793
2748
|
|
2794
2749
|
<xsl:param name="table_if">false</xsl:param> <!-- generate extended table in IF for autolayout-algorithm -->
|
2795
|
-
<xsl:param name="table_widths"/> <!-- path to xml with table's widths, generated on 1st pass, based on FOP Intermediate Format -->
|
2750
|
+
<xsl:param name="table_widths"/> <!-- (debug: path to) xml with table's widths, generated on 1st pass, based on FOP Intermediate Format -->
|
2796
2751
|
<!-- Example: <tables>
|
2797
|
-
|
2798
|
-
|
2799
|
-
|
2800
|
-
|
2801
|
-
|
2802
|
-
|
2803
|
-
|
2804
|
-
|
2805
|
-
|
2752
|
+
<table page-width="509103" id="table1" width_max="223561" width_min="223560">
|
2753
|
+
<column width_max="39354" width_min="39354"/>
|
2754
|
+
<column width_max="75394" width_min="75394"/>
|
2755
|
+
<column width_max="108813" width_min="108813"/>
|
2756
|
+
<tbody>
|
2757
|
+
<tr>
|
2758
|
+
<td width_max="39354" width_min="39354">
|
2759
|
+
<p_len>39354</p_len>
|
2760
|
+
<word_len>39354</word_len>
|
2761
|
+
</td>
|
2762
|
+
|
2763
|
+
OLD:
|
2764
|
+
<tables>
|
2765
|
+
<table id="table_if_tab-symdu" page-width="75"> - table id prefixed by 'table_if_' to simple search in IF
|
2766
|
+
<tbody>
|
2767
|
+
<tr>
|
2768
|
+
<td id="tab-symdu_1_1">
|
2769
|
+
<p_len>6</p_len>
|
2770
|
+
<p_len>100</p_len> for 2nd paragraph
|
2771
|
+
<word_len>6</word_len>
|
2772
|
+
<word_len>20</word_len>
|
2773
|
+
...
|
2806
2774
|
-->
|
2807
2775
|
|
2808
2776
|
<!-- for command line debug: <xsl:variable name="table_widths_from_if" select="document($table_widths)"/> -->
|
@@ -3021,6 +2989,10 @@
|
|
3021
2989
|
<xsl:variable name="zero_width_space"></xsl:variable>
|
3022
2990
|
<xsl:variable name="hair_space"> </xsl:variable>
|
3023
2991
|
<xsl:variable name="en_dash">–</xsl:variable>
|
2992
|
+
<xsl:variable name="em_dash">—</xsl:variable>
|
2993
|
+
<xsl:variable name="cr"> </xsl:variable>
|
2994
|
+
<xsl:variable name="lf">
|
2995
|
+
</xsl:variable>
|
3024
2996
|
|
3025
2997
|
<xsl:template name="getTitle">
|
3026
2998
|
<xsl:param name="name"/>
|
@@ -3335,6 +3307,10 @@
|
|
3335
3307
|
|
3336
3308
|
</xsl:attribute-set> <!-- example-name-style -->
|
3337
3309
|
|
3310
|
+
<xsl:template name="refine_example-name-style">
|
3311
|
+
|
3312
|
+
</xsl:template>
|
3313
|
+
|
3338
3314
|
<xsl:attribute-set name="example-p-style">
|
3339
3315
|
|
3340
3316
|
<xsl:attribute name="font-size">10pt</xsl:attribute>
|
@@ -3351,6 +3327,10 @@
|
|
3351
3327
|
|
3352
3328
|
</xsl:attribute-set> <!-- termexample-name-style -->
|
3353
3329
|
|
3330
|
+
<xsl:template name="refine_termexample-name-style">
|
3331
|
+
|
3332
|
+
</xsl:template>
|
3333
|
+
|
3354
3334
|
<!-- ========================== -->
|
3355
3335
|
<!-- Table styles -->
|
3356
3336
|
<!-- ========================== -->
|
@@ -3554,6 +3534,10 @@
|
|
3554
3534
|
|
3555
3535
|
</xsl:attribute-set> <!-- table-fn-style -->
|
3556
3536
|
|
3537
|
+
<xsl:template name="refine_table-fn-style">
|
3538
|
+
|
3539
|
+
</xsl:template>
|
3540
|
+
|
3557
3541
|
<xsl:attribute-set name="table-fn-number-style">
|
3558
3542
|
<xsl:attribute name="font-size">80%</xsl:attribute>
|
3559
3543
|
<xsl:attribute name="padding-right">5mm</xsl:attribute>
|
@@ -3564,6 +3548,10 @@
|
|
3564
3548
|
|
3565
3549
|
</xsl:attribute-set> <!-- table-fn-number-style -->
|
3566
3550
|
|
3551
|
+
<xsl:template name="refine_table-fn-number-style">
|
3552
|
+
|
3553
|
+
</xsl:template>
|
3554
|
+
|
3567
3555
|
<xsl:attribute-set name="fn-container-body-style">
|
3568
3556
|
<xsl:attribute name="text-indent">0</xsl:attribute>
|
3569
3557
|
<xsl:attribute name="start-indent">0</xsl:attribute>
|
@@ -4698,6 +4686,20 @@
|
|
4698
4686
|
</xsl:for-each>
|
4699
4687
|
</xsl:template>
|
4700
4688
|
|
4689
|
+
<xsl:param name="table_only_with_id"/><!-- Example: table1, for table auto-layout algorithm -->
|
4690
|
+
|
4691
|
+
<xsl:template match="*[local-name()='table']" priority="2">
|
4692
|
+
<xsl:choose>
|
4693
|
+
<xsl:when test="$table_only_with_id != '' and @id = $table_only_with_id">
|
4694
|
+
<xsl:call-template name="table"/>
|
4695
|
+
</xsl:when>
|
4696
|
+
<xsl:when test="$table_only_with_id != ''"><fo:block/><!-- to prevent empty fo:block-container --></xsl:when>
|
4697
|
+
<xsl:otherwise>
|
4698
|
+
<xsl:call-template name="table"/>
|
4699
|
+
</xsl:otherwise>
|
4700
|
+
</xsl:choose>
|
4701
|
+
</xsl:template>
|
4702
|
+
|
4701
4703
|
<xsl:template match="*[local-name()='table']" name="table">
|
4702
4704
|
|
4703
4705
|
<xsl:variable name="table-preamble">
|
@@ -4711,9 +4713,11 @@
|
|
4711
4713
|
<xsl:variable name="table">
|
4712
4714
|
|
4713
4715
|
<xsl:variable name="simple-table">
|
4714
|
-
<xsl:
|
4715
|
-
<xsl:
|
4716
|
-
|
4716
|
+
<xsl:if test="$isGenerateTableIF = 'true' and $isApplyAutolayoutAlgorithm = 'true'">
|
4717
|
+
<xsl:call-template name="getSimpleTable">
|
4718
|
+
<xsl:with-param name="id" select="@id"/>
|
4719
|
+
</xsl:call-template>
|
4720
|
+
</xsl:if>
|
4717
4721
|
</xsl:variable>
|
4718
4722
|
<!-- <xsl:variable name="simple-table" select="xalan:nodeset($simple-table_)"/> -->
|
4719
4723
|
|
@@ -4809,9 +4813,9 @@
|
|
4809
4813
|
</xsl:attribute>
|
4810
4814
|
</xsl:for-each>
|
4811
4815
|
|
4812
|
-
<xsl:variable name="isNoteOrFnExist" select="./*[local-name()='note'] or ./*[local-name()='example'] or .//*[local-name()='fn'][local-name(..) != 'name'] or ./*[local-name()='source']"/>
|
4816
|
+
<xsl:variable name="isNoteOrFnExist" select="./*[local-name()='note'][not(@type = 'units')] or ./*[local-name()='example'] or .//*[local-name()='fn'][local-name(..) != 'name'] or ./*[local-name()='source']"/>
|
4813
4817
|
<xsl:if test="$isNoteOrFnExist = 'true'">
|
4814
|
-
<xsl:attribute name="border-bottom">0pt solid black</xsl:attribute
|
4818
|
+
<xsl:attribute name="border-bottom">0pt solid black</xsl:attribute><!-- set 0pt border, because there is a separete table below for footer -->
|
4815
4819
|
</xsl:if>
|
4816
4820
|
|
4817
4821
|
<xsl:choose>
|
@@ -4896,6 +4900,7 @@
|
|
4896
4900
|
<!-- centered table when table name is centered (see table-name-style) -->
|
4897
4901
|
|
4898
4902
|
<fo:table table-layout="fixed" width="100%" xsl:use-attribute-sets="table-container-style">
|
4903
|
+
|
4899
4904
|
<fo:table-column column-width="proportional-column-width(1)"/>
|
4900
4905
|
<fo:table-column column-width="{@width}"/>
|
4901
4906
|
<fo:table-column column-width="proportional-column-width(1)"/>
|
@@ -4963,9 +4968,28 @@
|
|
4963
4968
|
|
4964
4969
|
</fo:block>
|
4965
4970
|
|
4971
|
+
<!-- <xsl:if test="$namespace = 'bsi' or $namespace = 'iec' or $namespace = 'iso'"> -->
|
4972
|
+
<xsl:if test="$continued = 'true'">
|
4973
|
+
<fo:block text-align="right">
|
4974
|
+
<xsl:apply-templates select="../*[local-name() = 'note'][@type = 'units']/node()"/>
|
4975
|
+
</fo:block>
|
4976
|
+
</xsl:if>
|
4977
|
+
<!-- </xsl:if> -->
|
4978
|
+
|
4966
4979
|
</xsl:if>
|
4967
4980
|
</xsl:template> <!-- table/name -->
|
4968
4981
|
|
4982
|
+
<!-- workaround solution for https://github.com/metanorma/metanorma-iso/issues/1151#issuecomment-2033087938 -->
|
4983
|
+
<xsl:template match="*[local-name()='table']/*[local-name() = 'note'][@type = 'units']/*[local-name() = 'p']/text()" priority="4">
|
4984
|
+
<xsl:choose>
|
4985
|
+
<xsl:when test="preceding-sibling::*[local-name() = 'br']">
|
4986
|
+
<!-- remove CR or LF at start -->
|
4987
|
+
<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),'^( | | )', '')"/>
|
4988
|
+
</xsl:when>
|
4989
|
+
<xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
|
4990
|
+
</xsl:choose>
|
4991
|
+
</xsl:template>
|
4992
|
+
|
4969
4993
|
<!-- SOURCE: ... -->
|
4970
4994
|
<xsl:template match="*[local-name()='table']/*[local-name() = 'source']" priority="2">
|
4971
4995
|
<xsl:call-template name="termsource"/>
|
@@ -5376,7 +5400,7 @@
|
|
5376
5400
|
<xsl:param name="colwidths"/>
|
5377
5401
|
<xsl:param name="colgroup"/>
|
5378
5402
|
|
5379
|
-
<xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ../*[local-name()='example'] or ../*[local-name()='dl'] or ..//*[local-name()='fn'][local-name(..) != 'name'] or ../*[local-name()='source'] or ../*[local-name()='p']"/>
|
5403
|
+
<xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'][not(@type = 'units')] or ../*[local-name()='example'] or ../*[local-name()='dl'] or ..//*[local-name()='fn'][local-name(..) != 'name'] or ../*[local-name()='source'] or ../*[local-name()='p']"/>
|
5380
5404
|
|
5381
5405
|
<xsl:variable name="isNoteOrFnExistShowAfterTable">
|
5382
5406
|
|
@@ -5458,7 +5482,7 @@
|
|
5458
5482
|
|
5459
5483
|
<xsl:apply-templates select="../*[local-name()='p']"/>
|
5460
5484
|
<xsl:apply-templates select="../*[local-name()='dl']"/>
|
5461
|
-
<xsl:apply-templates select="../*[local-name()='note']"/>
|
5485
|
+
<xsl:apply-templates select="../*[local-name()='note'][not(@type = 'units')]"/>
|
5462
5486
|
<xsl:apply-templates select="../*[local-name()='example']"/>
|
5463
5487
|
<xsl:apply-templates select="../*[local-name()='source']"/>
|
5464
5488
|
|
@@ -5468,7 +5492,7 @@
|
|
5468
5492
|
|
5469
5493
|
<!-- horizontal row separator -->
|
5470
5494
|
<xsl:if test="normalize-space($isDisplayRowSeparator) = 'true'">
|
5471
|
-
<xsl:if test="(../*[local-name()='note'] or ../*[local-name()='example']) and normalize-space($table_fn_block) != ''">
|
5495
|
+
<xsl:if test="(../*[local-name()='note'][not(@type = 'units')] or ../*[local-name()='example']) and normalize-space($table_fn_block) != ''">
|
5472
5496
|
<fo:block-container border-top="0.5pt solid black" padding-left="1mm" padding-right="1mm">
|
5473
5497
|
|
5474
5498
|
<xsl:call-template name="setBordersTableArray"/>
|
@@ -5951,8 +5975,9 @@
|
|
5951
5975
|
<xsl:if test="not(preceding-sibling::*[@reference = $reference])"> <!-- only unique reference puts in note-->
|
5952
5976
|
|
5953
5977
|
<fo:block xsl:use-attribute-sets="table-fn-style">
|
5954
|
-
|
5978
|
+
<xsl:call-template name="refine_table-fn-style"/>
|
5955
5979
|
<fo:inline id="{@id}" xsl:use-attribute-sets="table-fn-number-style">
|
5980
|
+
<xsl:call-template name="refine_table-fn-number-style"/>
|
5956
5981
|
|
5957
5982
|
<xsl:value-of select="@reference"/>
|
5958
5983
|
|
@@ -6176,7 +6201,20 @@
|
|
6176
6201
|
</xsl:element>
|
6177
6202
|
</xsl:template>
|
6178
6203
|
|
6179
|
-
|
6204
|
+
<!-- for table auto-layout algorithm -->
|
6205
|
+
<xsl:template match="*[local-name()='dl']" priority="2">
|
6206
|
+
<xsl:choose>
|
6207
|
+
<xsl:when test="$table_only_with_id != '' and @id = $table_only_with_id">
|
6208
|
+
<xsl:call-template name="dl"/>
|
6209
|
+
</xsl:when>
|
6210
|
+
<xsl:when test="$table_only_with_id != ''"><fo:block/><!-- to prevent empty fo:block-container --></xsl:when>
|
6211
|
+
<xsl:otherwise>
|
6212
|
+
<xsl:call-template name="dl"/>
|
6213
|
+
</xsl:otherwise>
|
6214
|
+
</xsl:choose>
|
6215
|
+
</xsl:template>
|
6216
|
+
|
6217
|
+
<xsl:template match="*[local-name()='dl']" name="dl">
|
6180
6218
|
<xsl:variable name="isAdded" select="@added"/>
|
6181
6219
|
<xsl:variable name="isDeleted" select="@deleted"/>
|
6182
6220
|
<!-- <dl><xsl:copy-of select="."/></dl> -->
|
@@ -7142,11 +7180,16 @@
|
|
7142
7180
|
<xsl:template match="text()[ancestor::*[local-name()='smallcap']]">
|
7143
7181
|
<!-- <xsl:variable name="text" select="normalize-space(.)"/> --> <!-- https://github.com/metanorma/metanorma-iso/issues/1115 -->
|
7144
7182
|
<xsl:variable name="text" select="."/>
|
7145
|
-
<
|
7183
|
+
<xsl:variable name="ratio_">
|
7184
|
+
0.75
|
7185
|
+
</xsl:variable>
|
7186
|
+
<xsl:variable name="ratio" select="number(normalize-space($ratio_))"/>
|
7187
|
+
<fo:inline font-size="{$ratio * 100}%" role="SKIP">
|
7146
7188
|
<xsl:if test="string-length($text) > 0">
|
7147
7189
|
<xsl:variable name="smallCapsText">
|
7148
7190
|
<xsl:call-template name="recursiveSmallCaps">
|
7149
7191
|
<xsl:with-param name="text" select="$text"/>
|
7192
|
+
<xsl:with-param name="ratio" select="$ratio"/>
|
7150
7193
|
</xsl:call-template>
|
7151
7194
|
</xsl:variable>
|
7152
7195
|
<!-- merge neighboring fo:inline -->
|
@@ -7183,12 +7226,13 @@
|
|
7183
7226
|
|
7184
7227
|
<xsl:template name="recursiveSmallCaps">
|
7185
7228
|
<xsl:param name="text"/>
|
7229
|
+
<xsl:param name="ratio"/>
|
7186
7230
|
<xsl:variable name="char" select="substring($text,1,1)"/>
|
7187
7231
|
<!-- <xsl:variable name="upperCase" select="translate($char, $lower, $upper)"/> -->
|
7188
7232
|
<xsl:variable name="upperCase" select="java:toUpperCase(java:java.lang.String.new($char))"/>
|
7189
7233
|
<xsl:choose>
|
7190
7234
|
<xsl:when test="$char=$upperCase">
|
7191
|
-
<fo:inline font-size="{100 div
|
7235
|
+
<fo:inline font-size="{100 div $ratio}%" role="SKIP">
|
7192
7236
|
<xsl:value-of select="$upperCase"/>
|
7193
7237
|
</fo:inline>
|
7194
7238
|
</xsl:when>
|
@@ -7199,6 +7243,7 @@
|
|
7199
7243
|
<xsl:if test="string-length($text) > 1">
|
7200
7244
|
<xsl:call-template name="recursiveSmallCaps">
|
7201
7245
|
<xsl:with-param name="text" select="substring($text,2)"/>
|
7246
|
+
<xsl:with-param name="ratio" select="$ratio"/>
|
7202
7247
|
</xsl:call-template>
|
7203
7248
|
</xsl:if>
|
7204
7249
|
</xsl:template>
|
@@ -7235,6 +7280,9 @@
|
|
7235
7280
|
<xsl:if test="$key = 'font-family' or $key = 'font-size' or $key = 'color'">
|
7236
7281
|
<style name="{$key}"><xsl:value-of select="$value"/></style>
|
7237
7282
|
</xsl:if>
|
7283
|
+
<xsl:if test="$key = 'text-indent'">
|
7284
|
+
<style name="padding-left"><xsl:value-of select="$value"/></style>
|
7285
|
+
</xsl:if>
|
7238
7286
|
</xsl:for-each>
|
7239
7287
|
</xsl:variable>
|
7240
7288
|
<xsl:variable name="styles" select="xalan:nodeset($styles_)"/>
|
@@ -8107,7 +8155,13 @@
|
|
8107
8155
|
<xsl:value-of select="$language_current_2"/>
|
8108
8156
|
</xsl:when>
|
8109
8157
|
<xsl:otherwise>
|
8110
|
-
<xsl:
|
8158
|
+
<xsl:variable name="language_current_3" select="normalize-space(//*[local-name()='bibdata']//*[local-name()='language'])"/>
|
8159
|
+
<xsl:choose>
|
8160
|
+
<xsl:when test="$language_current_3 != ''">
|
8161
|
+
<xsl:value-of select="$language_current_3"/>
|
8162
|
+
</xsl:when>
|
8163
|
+
<xsl:otherwise>en</xsl:otherwise>
|
8164
|
+
</xsl:choose>
|
8111
8165
|
</xsl:otherwise>
|
8112
8166
|
</xsl:choose>
|
8113
8167
|
</xsl:otherwise>
|
@@ -8637,6 +8691,11 @@
|
|
8637
8691
|
</xsl:call-template>
|
8638
8692
|
</xsl:template>
|
8639
8693
|
|
8694
|
+
<!-- command between two xref points to non-standard bibitem -->
|
8695
|
+
<xsl:template match="text()[. = ','][preceding-sibling::node()[1][local-name() = 'sup'][*[local-name() = 'xref'][@type = 'footnote']] and following-sibling::node()[1][local-name() = 'sup'][*[local-name() = 'xref'][@type = 'footnote']]]">
|
8696
|
+
<xsl:value-of select="."/>
|
8697
|
+
</xsl:template>
|
8698
|
+
|
8640
8699
|
<!-- ====== -->
|
8641
8700
|
<!-- formula -->
|
8642
8701
|
<!-- ====== -->
|
@@ -9011,7 +9070,7 @@
|
|
9011
9070
|
</xsl:when>
|
9012
9071
|
<xsl:otherwise>
|
9013
9072
|
<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style">
|
9014
|
-
<xsl:if test="not(@mimetype = 'image/svg+xml') and ../*[local-name() = 'name'] and not(ancestor::*[local-name() = 'table'])">
|
9073
|
+
<xsl:if test="not(@mimetype = 'image/svg+xml') and (../*[local-name() = 'name'] or parent::*[local-name() = 'figure'][@unnumbered = 'true']) and not(ancestor::*[local-name() = 'table'])">
|
9015
9074
|
|
9016
9075
|
<xsl:if test="@width != '' and @width != 'auto' and @width != 'text-width' and @width != 'full-page-width' and @width != 'narrow'">
|
9017
9076
|
<xsl:attribute name="width">
|
@@ -9346,6 +9405,8 @@
|
|
9346
9405
|
</xsl:attribute>
|
9347
9406
|
</xsl:template>
|
9348
9407
|
|
9408
|
+
<xsl:variable name="regex_starts_with_digit">^[0-9].*</xsl:variable>
|
9409
|
+
|
9349
9410
|
<xsl:template match="*[local-name() = 'svg'][not(@width and @height)]" mode="svg_update">
|
9350
9411
|
<xsl:copy>
|
9351
9412
|
<xsl:apply-templates select="@*" mode="svg_update"/>
|
@@ -9364,7 +9425,8 @@
|
|
9364
9425
|
|
9365
9426
|
<xsl:attribute name="width">
|
9366
9427
|
<xsl:choose>
|
9367
|
-
|
9428
|
+
<!-- width is non 'auto', 'text-width', 'full-page-width' or 'narrow' -->
|
9429
|
+
<xsl:when test="$parent_image_width != '' and normalize-space(java:matches(java:java.lang.String.new($parent_image_width), $regex_starts_with_digit)) = 'true'"><xsl:value-of select="$parent_image_width"/></xsl:when>
|
9368
9430
|
<xsl:when test="$width != ''">
|
9369
9431
|
<xsl:value-of select="round($width)"/>
|
9370
9432
|
</xsl:when>
|
@@ -9373,7 +9435,8 @@
|
|
9373
9435
|
</xsl:attribute>
|
9374
9436
|
<xsl:attribute name="height">
|
9375
9437
|
<xsl:choose>
|
9376
|
-
|
9438
|
+
<!-- height non 'auto', 'text-width', 'full-page-width' or 'narrow' -->
|
9439
|
+
<xsl:when test="$parent_image_height != '' and normalize-space(java:matches(java:java.lang.String.new($parent_image_height), $regex_starts_with_digit)) = 'true'"><xsl:value-of select="$parent_image_height"/></xsl:when>
|
9377
9440
|
<xsl:when test="$height != ''">
|
9378
9441
|
<xsl:value-of select="round($height)"/>
|
9379
9442
|
</xsl:when>
|
@@ -9390,7 +9453,7 @@
|
|
9390
9453
|
<xsl:variable name="parent_image_width" select="normalize-space(ancestor::*[2][local-name() = 'image']/@width)"/>
|
9391
9454
|
<xsl:attribute name="width">
|
9392
9455
|
<xsl:choose>
|
9393
|
-
<xsl:when test="$parent_image_width != '' and $parent_image_width
|
9456
|
+
<xsl:when test="$parent_image_width != '' and normalize-space(java:matches(java:java.lang.String.new($parent_image_width), $regex_starts_with_digit)) = 'true'"><xsl:value-of select="$parent_image_width"/></xsl:when>
|
9394
9457
|
<xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
|
9395
9458
|
</xsl:choose>
|
9396
9459
|
</xsl:attribute>
|
@@ -9401,7 +9464,7 @@
|
|
9401
9464
|
<xsl:variable name="parent_image_height" select="normalize-space(ancestor::*[2][local-name() = 'image']/@height)"/>
|
9402
9465
|
<xsl:attribute name="height">
|
9403
9466
|
<xsl:choose>
|
9404
|
-
<xsl:when test="$parent_image_height != '' and $parent_image_height
|
9467
|
+
<xsl:when test="$parent_image_height != '' and normalize-space(java:matches(java:java.lang.String.new($parent_image_height), $regex_starts_with_digit)) = 'true'"><xsl:value-of select="$parent_image_height"/></xsl:when>
|
9405
9468
|
<xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
|
9406
9469
|
</xsl:choose>
|
9407
9470
|
</xsl:attribute>
|
@@ -10864,6 +10927,7 @@
|
|
10864
10927
|
<xsl:template match="*[local-name() = 'termexample']/*[local-name() = 'name']">
|
10865
10928
|
<xsl:if test="normalize-space() != ''">
|
10866
10929
|
<fo:inline xsl:use-attribute-sets="termexample-name-style">
|
10930
|
+
<xsl:call-template name="refine_termexample-name-style"/>
|
10867
10931
|
<xsl:apply-templates/>
|
10868
10932
|
</fo:inline>
|
10869
10933
|
</xsl:if>
|
@@ -11014,6 +11078,7 @@
|
|
11014
11078
|
</xsl:when>
|
11015
11079
|
<xsl:otherwise>
|
11016
11080
|
<fo:inline xsl:use-attribute-sets="example-name-style">
|
11081
|
+
<xsl:call-template name="refine_example-name-style"/>
|
11017
11082
|
<xsl:apply-templates/>
|
11018
11083
|
</fo:inline>
|
11019
11084
|
</xsl:otherwise>
|
@@ -12227,6 +12292,7 @@
|
|
12227
12292
|
<xsl:template match="*[local-name() = 'references'][@normative='true']/*[local-name() = 'bibitem']" name="bibitem" priority="2">
|
12228
12293
|
|
12229
12294
|
<fo:block id="{@id}" xsl:use-attribute-sets="bibitem-normative-style">
|
12295
|
+
|
12230
12296
|
<xsl:call-template name="processBibitem"/>
|
12231
12297
|
</fo:block>
|
12232
12298
|
|
@@ -12247,6 +12313,7 @@
|
|
12247
12313
|
<xsl:when test="@hidden = 'true'"><!-- skip --></xsl:when>
|
12248
12314
|
<xsl:otherwise>
|
12249
12315
|
<fo:list-item id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-list-item-style">
|
12316
|
+
|
12250
12317
|
<fo:list-item-label end-indent="label-end()">
|
12251
12318
|
<fo:block role="SKIP">
|
12252
12319
|
<fo:inline role="SKIP">
|