metanorma-jis 0.0.7 → 0.0.9
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/isodoc/jis/jis.international-standard.xsl +406 -121
- data/lib/metanorma/jis/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 96fb5369c9530447626770ee760870db7070e6fd45aa3b1967c7dafaab62d4f1
|
|
4
|
+
data.tar.gz: 325357b99ed0186f8297579404bed3a0935b9d5bbd4d43456330b18af8387bf0
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 057bb29e1dce2f8a646f7ad95151111dbee6cc38effe9609d51a081b79e04e88eedea5c59eb6a541cce1f731d7036236a7a9be227d6ae5777c0448c2273dc495
|
|
7
|
+
data.tar.gz: 2916496bebb78fbf748f177c67503143175abffcaa25adca5c96b3440c2e6d5a064a2d3461ef97816433da1745482ff869edf320f376d6cffc764908b2e72eec
|
|
@@ -126,6 +126,31 @@
|
|
|
126
126
|
</fo:repeatable-page-master-alternatives>
|
|
127
127
|
</fo:page-sequence-master>
|
|
128
128
|
|
|
129
|
+
<fo:simple-page-master master-name="commentary_first_page_even" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
130
|
+
<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/>
|
|
131
|
+
<fo:region-before region-name="header-commentary-even-first" extent="{$marginTop}mm"/>
|
|
132
|
+
<fo:region-after region-name="footer" extent="{$marginBottom}mm"/>
|
|
133
|
+
<fo:region-start region-name="left-region" extent="{$marginLeftRight1}mm"/>
|
|
134
|
+
<fo:region-end region-name="right-region" extent="{$marginLeftRight2}mm"/>
|
|
135
|
+
</fo:simple-page-master>
|
|
136
|
+
|
|
137
|
+
<fo:simple-page-master master-name="commentary_first_page_odd" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
138
|
+
<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/>
|
|
139
|
+
<fo:region-before region-name="header-commentary-odd-first" extent="{$marginTop}mm"/>
|
|
140
|
+
<fo:region-after region-name="footer" extent="{$marginBottom}mm"/>
|
|
141
|
+
<fo:region-start region-name="left-region" extent="{$marginLeftRight1}mm"/>
|
|
142
|
+
<fo:region-end region-name="right-region" extent="{$marginLeftRight2}mm"/>
|
|
143
|
+
</fo:simple-page-master>
|
|
144
|
+
|
|
145
|
+
<fo:page-sequence-master master-name="document_commentary_section">
|
|
146
|
+
<fo:repeatable-page-master-alternatives>
|
|
147
|
+
<fo:conditional-page-master-reference page-position="first" odd-or-even="even" master-reference="commentary_first_page_even"/>
|
|
148
|
+
<fo:conditional-page-master-reference page-position="first" odd-or-even="odd" master-reference="commentary_first_page_odd"/>
|
|
149
|
+
<fo:conditional-page-master-reference odd-or-even="even" master-reference="even"/>
|
|
150
|
+
<fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd"/>
|
|
151
|
+
</fo:repeatable-page-master-alternatives>
|
|
152
|
+
</fo:page-sequence-master>
|
|
153
|
+
|
|
129
154
|
<!-- landscape -->
|
|
130
155
|
<fo:simple-page-master master-name="odd-landscape" page-width="{$pageHeight}mm" page-height="{$pageWidth}mm">
|
|
131
156
|
<fo:region-body margin-top="{$marginLeftRight1}mm" margin-bottom="{$marginLeftRight2}mm" margin-left="{$marginBottom}mm" margin-right="{$marginTop}mm"/>
|
|
@@ -348,14 +373,15 @@
|
|
|
348
373
|
</item>
|
|
349
374
|
|
|
350
375
|
<!-- Annexes -->
|
|
351
|
-
<xsl:for-each select="/*/*[local-name()='annex']">
|
|
376
|
+
<!-- <xsl:for-each select="/*/*[local-name()='annex']">
|
|
352
377
|
<item>
|
|
353
378
|
<xsl:apply-templates select="." mode="linear_xml"/>
|
|
354
379
|
</item>
|
|
355
|
-
</xsl:for-each>
|
|
380
|
+
</xsl:for-each> -->
|
|
356
381
|
|
|
357
|
-
<!-- Bibliography -->
|
|
358
|
-
<xsl:for-each select="/*/*[local-name()='bibliography']/*[count(.//*[local-name() = 'bibitem'][not(@hidden) = 'true']) > 0 and not(@hidden = 'true')]">
|
|
382
|
+
<!-- Annexes and Bibliography -->
|
|
383
|
+
<xsl:for-each select="/*/*[local-name()='annex'] | /*/*[local-name()='bibliography']/*[count(.//*[local-name() = 'bibitem'][not(@hidden) = 'true']) > 0 and not(@hidden = 'true')]">
|
|
384
|
+
<xsl:sort select="@displayorder" data-type="number"/>
|
|
359
385
|
<item><xsl:apply-templates select="." mode="linear_xml"/></item>
|
|
360
386
|
</xsl:for-each>
|
|
361
387
|
|
|
@@ -382,6 +408,9 @@
|
|
|
382
408
|
<!-- paged_xml=<xsl:copy-of select="$paged_xml"/> -->
|
|
383
409
|
|
|
384
410
|
<xsl:for-each select="xalan:nodeset($paged_xml)/*[local-name()='page'][*]">
|
|
411
|
+
|
|
412
|
+
<xsl:variable name="isCommentary" select="normalize-space(.//jis:annex[@commentary = 'true'] and 1 = 1)"/> <!-- true or false -->
|
|
413
|
+
<!-- DEBUG: <xsl:copy-of select="."/> -->
|
|
385
414
|
<fo:page-sequence master-reference="document" force-page-count="no-force">
|
|
386
415
|
<xsl:if test="position() = 1">
|
|
387
416
|
<xsl:attribute name="master-reference">document_first_section</xsl:attribute>
|
|
@@ -389,6 +418,9 @@
|
|
|
389
418
|
<xsl:if test="@orientation = 'landscape'">
|
|
390
419
|
<xsl:attribute name="master-reference">document-<xsl:value-of select="@orientation"/></xsl:attribute>
|
|
391
420
|
</xsl:if>
|
|
421
|
+
<xsl:if test="$isCommentary = 'true'">
|
|
422
|
+
<xsl:attribute name="master-reference">document_commentary_section</xsl:attribute>
|
|
423
|
+
</xsl:if>
|
|
392
424
|
<xsl:if test="position() = 1">
|
|
393
425
|
<xsl:attribute name="initial-page-number">1</xsl:attribute>
|
|
394
426
|
</xsl:if>
|
|
@@ -398,10 +430,31 @@
|
|
|
398
430
|
</fo:block>
|
|
399
431
|
</fo:static-content>
|
|
400
432
|
|
|
433
|
+
<xsl:variable name="section_title">
|
|
434
|
+
<xsl:if test="$isCommentary = 'true'">
|
|
435
|
+
<fo:inline font-family="IPAexGothic" padding-left="2mm">
|
|
436
|
+
<xsl:text> </xsl:text>
|
|
437
|
+
<xsl:call-template name="getLocalizedString">
|
|
438
|
+
<xsl:with-param name="key">commentary</xsl:with-param>
|
|
439
|
+
</xsl:call-template>
|
|
440
|
+
</fo:inline>
|
|
441
|
+
</xsl:if>
|
|
442
|
+
</xsl:variable>
|
|
443
|
+
|
|
444
|
+
<xsl:variable name="section">
|
|
445
|
+
<xsl:choose>
|
|
446
|
+
<xsl:when test="$isCommentary = 'true'">commentary</xsl:when>
|
|
447
|
+
<xsl:otherwise>main</xsl:otherwise>
|
|
448
|
+
</xsl:choose>
|
|
449
|
+
</xsl:variable>
|
|
450
|
+
|
|
401
451
|
<xsl:call-template name="insertHeaderFooter">
|
|
402
452
|
<xsl:with-param name="docidentifier" select="$docidentifier"/>
|
|
403
453
|
<xsl:with-param name="copyrightText" select="$copyrightText"/>
|
|
404
|
-
<xsl:with-param name="section"
|
|
454
|
+
<xsl:with-param name="section" select="$section"/>
|
|
455
|
+
<xsl:with-param name="section_title">
|
|
456
|
+
<xsl:copy-of select="$section_title"/>
|
|
457
|
+
</xsl:with-param>
|
|
405
458
|
</xsl:call-template>
|
|
406
459
|
|
|
407
460
|
<fo:flow flow-name="xsl-region-body">
|
|
@@ -446,6 +499,20 @@
|
|
|
446
499
|
|
|
447
500
|
</xsl:if>
|
|
448
501
|
|
|
502
|
+
<!-- Annex Commentary first page -->
|
|
503
|
+
<xsl:if test="$isCommentary = 'true'">
|
|
504
|
+
|
|
505
|
+
<!-- Example: JIS Z 8301：2019 -->
|
|
506
|
+
<fo:block font-family="IPAexGothic" font-size="15pt" text-align="center">
|
|
507
|
+
<fo:inline font-family="Arial">JIS <xsl:value-of select="$docidentifier_number"/></fo:inline>
|
|
508
|
+
<fo:inline baseline-shift="10%"><fo:inline font-size="10pt">：</fo:inline>
|
|
509
|
+
<fo:inline font-family="Times New Roman" font-size="10pt"><xsl:value-of select="$docidentifier_year"/></fo:inline></fo:inline>
|
|
510
|
+
</fo:block>
|
|
511
|
+
|
|
512
|
+
<!-- title -->
|
|
513
|
+
<fo:block role="H1" font-family="IPAexGothic" font-size="16pt" text-align="center" margin-top="6mm"><xsl:value-of select="$title_ja"/></fo:block>
|
|
514
|
+
</xsl:if>
|
|
515
|
+
|
|
449
516
|
<xsl:apply-templates select="*" mode="page"/>
|
|
450
517
|
|
|
451
518
|
</fo:flow>
|
|
@@ -488,9 +555,7 @@
|
|
|
488
555
|
<xsl:for-each select="$contents/doc[@num = $num]//item[@display = 'true'][@level <= $toc_level or @type='figure' or @type = 'table']">
|
|
489
556
|
<fo:block role="TOCI">
|
|
490
557
|
<xsl:choose>
|
|
491
|
-
<xsl:when test="@type = 'bibliography'">
|
|
492
|
-
</xsl:when>
|
|
493
|
-
<xsl:when test="@type = 'annex'">
|
|
558
|
+
<xsl:when test="@type = 'annex' or @type = 'bibliography'">
|
|
494
559
|
<fo:block space-after="5pt">
|
|
495
560
|
<xsl:call-template name="insertTocItem"/>
|
|
496
561
|
</fo:block>
|
|
@@ -559,6 +624,10 @@
|
|
|
559
624
|
</fo:block>
|
|
560
625
|
</xsl:template>
|
|
561
626
|
|
|
627
|
+
<!-- docidentifier, 3 part: number, colon and year-->
|
|
628
|
+
<xsl:variable name="docidentifier_jis" select="/*/jis:bibdata/jis:docidentifier[@type = 'JIS']"/>
|
|
629
|
+
<xsl:variable name="docidentifier_number" select="java:replaceAll(java:java.lang.String.new($docidentifier_jis), '^(.*)(:)(.*)$', '$1')"/>
|
|
630
|
+
<xsl:variable name="docidentifier_year" select="java:replaceAll(java:java.lang.String.new($docidentifier_jis), '^(.*)(:)(.*)$', '$3')"/>
|
|
562
631
|
<xsl:template name="insertCoverPage">
|
|
563
632
|
<xsl:param name="num"/>
|
|
564
633
|
<xsl:param name="copyrightText"/>
|
|
@@ -578,10 +647,6 @@
|
|
|
578
647
|
<fo:block-container text-align="center">
|
|
579
648
|
<!-- title -->
|
|
580
649
|
<fo:block role="H1" font-family="IPAexGothic" font-size="22pt" margin-top="27mm"><xsl:apply-templates select="/*/jis:bibdata/jis:title[@language = 'ja' and @type = 'main']/node()"/></fo:block>
|
|
581
|
-
<!-- docidentifier, 3 part: number, colon and year-->
|
|
582
|
-
<xsl:variable name="docidentifier" select="/*/jis:bibdata/jis:docidentifier[@type = 'JIS']"/>
|
|
583
|
-
<xsl:variable name="docidentifier_number" select="java:replaceAll(java:java.lang.String.new($docidentifier), '^(.*)(:)(.*)$', '$1')"/>
|
|
584
|
-
<xsl:variable name="docidentifier_year" select="java:replaceAll(java:java.lang.String.new($docidentifier), '^(.*)(:)(.*)$', '$3')"/>
|
|
585
650
|
|
|
586
651
|
<fo:block font-family="IPAexGothic" font-size="20pt" margin-top="15mm">
|
|
587
652
|
<fo:inline font-family="Arial">JIS <xsl:value-of select="$docidentifier_number"/></fo:inline>
|
|
@@ -777,6 +842,7 @@
|
|
|
777
842
|
<xsl:choose>
|
|
778
843
|
<xsl:when test="@type = 'section-title'">18pt</xsl:when>
|
|
779
844
|
<xsl:when test="@ancestor = 'foreword' and $level = '1'">14pt</xsl:when>
|
|
845
|
+
<xsl:when test="@ancestor = 'annex' and $level = '1' and preceding-sibling::*[1][local-name() = 'annex' and @commentary = 'true']">16pt</xsl:when>
|
|
780
846
|
<xsl:when test="@ancestor = 'annex' and $level = '1'">14pt</xsl:when>
|
|
781
847
|
<!-- <xsl:when test="@ancestor = 'foreword' and $level >= '2'">12pt</xsl:when>
|
|
782
848
|
<xsl:when test=". = 'Executive summary'">18pt</xsl:when>
|
|
@@ -813,6 +879,7 @@
|
|
|
813
879
|
<xsl:variable name="margin-top">
|
|
814
880
|
<xsl:choose>
|
|
815
881
|
<xsl:when test="@ancestor = 'foreword' and $level = 1">9mm</xsl:when>
|
|
882
|
+
<xsl:when test="@ancestor = 'annex' and $level = '1' and preceding-sibling::*[1][local-name() = 'annex' and @commentary = 'true']">1mm</xsl:when>
|
|
816
883
|
<xsl:when test="$level = 1">6.5mm</xsl:when>
|
|
817
884
|
<xsl:when test="@ancestor = 'foreword' and $level = 2">0mm</xsl:when>
|
|
818
885
|
<xsl:when test="@ancestor = 'annex' and $level = 2">4.5mm</xsl:when>
|
|
@@ -833,6 +900,7 @@
|
|
|
833
900
|
<xsl:variable name="margin-bottom">
|
|
834
901
|
<xsl:choose>
|
|
835
902
|
<xsl:when test="@ancestor = 'foreword' and $level = 1">9mm</xsl:when>
|
|
903
|
+
<xsl:when test="@ancestor = 'annex' and $level = '1' and preceding-sibling::*[1][local-name() = 'annex' and @commentary = 'true']">7mm</xsl:when>
|
|
836
904
|
<xsl:when test="$level = 1 and following-sibling::jis:clause">8pt</xsl:when>
|
|
837
905
|
<xsl:when test="$level = 1">12pt</xsl:when>
|
|
838
906
|
<xsl:when test="$level = 2 and following-sibling::jis:clause">8pt</xsl:when>
|
|
@@ -1011,17 +1079,8 @@
|
|
|
1011
1079
|
<xsl:call-template name="append_add-style"/>
|
|
1012
1080
|
</xsl:if>
|
|
1013
1081
|
|
|
1014
|
-
<xsl:variable name="list_item_label_">
|
|
1015
|
-
<xsl:call-template name="getListItemFormat"/>
|
|
1016
|
-
</xsl:variable>
|
|
1017
|
-
|
|
1018
1082
|
<xsl:variable name="list_item_label">
|
|
1019
|
-
<xsl:
|
|
1020
|
-
<xsl:when test="(../@type = 'arabic' or ../@type = 'alphabet' or ../@type = 'alphabetic' or ../@type = 'roman') and not(java:endsWith(java:java.lang.String.new($list_item_label_),')'))">
|
|
1021
|
-
<xsl:value-of select="concat($list_item_label_, ')')"/>
|
|
1022
|
-
</xsl:when>
|
|
1023
|
-
<xsl:otherwise><xsl:value-of select="$list_item_label_"/></xsl:otherwise>
|
|
1024
|
-
</xsl:choose>
|
|
1083
|
+
<xsl:call-template name="getListItemFormat"/>
|
|
1025
1084
|
</xsl:variable>
|
|
1026
1085
|
|
|
1027
1086
|
<xsl:choose>
|
|
@@ -1300,7 +1359,7 @@
|
|
|
1300
1359
|
</fo:static-content>
|
|
1301
1360
|
<fo:static-content flow-name="header-odd" role="artifact">
|
|
1302
1361
|
<fo:block-container font-family="Arial" font-size="9pt" height="26mm" display-align="after" text-align="right">
|
|
1303
|
-
<xsl:if test="$section = 'main'"><fo:block><fo:page-number/></fo:block></xsl:if>
|
|
1362
|
+
<xsl:if test="$section = 'main' or $section = 'commentary'"><fo:block><fo:page-number/></fo:block></xsl:if>
|
|
1304
1363
|
<fo:block>
|
|
1305
1364
|
<xsl:copy-of select="$docidentifier"/>
|
|
1306
1365
|
<xsl:copy-of select="$section_title"/>
|
|
@@ -1309,13 +1368,28 @@
|
|
|
1309
1368
|
</fo:static-content>
|
|
1310
1369
|
<fo:static-content flow-name="header-even" role="artifact">
|
|
1311
1370
|
<fo:block-container font-family="Arial" font-size="9pt" height="26mm" display-align="after">
|
|
1312
|
-
<xsl:if test="$section = 'main'"><fo:block><fo:page-number/></fo:block></xsl:if>
|
|
1371
|
+
<xsl:if test="$section = 'main' or $section = 'commentary'"><fo:block><fo:page-number/></fo:block></xsl:if>
|
|
1313
1372
|
<fo:block>
|
|
1314
1373
|
<xsl:copy-of select="$docidentifier"/>
|
|
1315
1374
|
<xsl:copy-of select="$section_title"/>
|
|
1316
1375
|
</fo:block>
|
|
1317
1376
|
</fo:block-container>
|
|
1318
1377
|
</fo:static-content>
|
|
1378
|
+
|
|
1379
|
+
<fo:static-content flow-name="header-commentary-even-first" role="artifact">
|
|
1380
|
+
<fo:block-container font-family="Arial" font-size="9pt" height="26mm" display-align="after" text-align="left">
|
|
1381
|
+
<fo:block><fo:page-number/></fo:block>
|
|
1382
|
+
<fo:block> </fo:block>
|
|
1383
|
+
</fo:block-container>
|
|
1384
|
+
</fo:static-content>
|
|
1385
|
+
|
|
1386
|
+
<fo:static-content flow-name="header-commentary-odd-first" role="artifact">
|
|
1387
|
+
<fo:block-container font-family="Arial" font-size="9pt" height="26mm" display-align="after" text-align="right">
|
|
1388
|
+
<fo:block><fo:page-number/></fo:block>
|
|
1389
|
+
<fo:block> </fo:block>
|
|
1390
|
+
</fo:block-container>
|
|
1391
|
+
</fo:static-content>
|
|
1392
|
+
|
|
1319
1393
|
<xsl:call-template name="insertFooter">
|
|
1320
1394
|
<xsl:with-param name="section" select="$section"/>
|
|
1321
1395
|
<xsl:with-param name="copyrightText" select="$copyrightText"/>
|
|
@@ -1330,6 +1404,16 @@
|
|
|
1330
1404
|
<xsl:if test="$section = 'preface'">
|
|
1331
1405
|
<fo:block font-size="9pt" text-align="center" space-after="10pt">(<fo:inline font-family="Times New Roman"><fo:page-number/></fo:inline>)</fo:block>
|
|
1332
1406
|
</xsl:if>
|
|
1407
|
+
<xsl:if test="$section = 'commentary'">
|
|
1408
|
+
<fo:block font-size="9pt" text-align="center" space-after="12pt">
|
|
1409
|
+
<fo:inline font-family="IPAexGothic" padding-right="3mm">
|
|
1410
|
+
<xsl:call-template name="getLocalizedString">
|
|
1411
|
+
<xsl:with-param name="key">commentary_page</xsl:with-param>
|
|
1412
|
+
</xsl:call-template>
|
|
1413
|
+
</fo:inline>
|
|
1414
|
+
<fo:inline font-weight="bold" font-family="Times New Roman" id="_independent_page_number_commentary"><fo:page-number/></fo:inline>
|
|
1415
|
+
</fo:block>
|
|
1416
|
+
</xsl:if>
|
|
1333
1417
|
<!-- copyright restriction -->
|
|
1334
1418
|
<fo:block font-size="7pt" text-align="center" font-family="IPAexMincho" margin-bottom="13mm"><xsl:value-of select="$copyrightText"/></fo:block>
|
|
1335
1419
|
</fo:block-container>
|
|
@@ -2303,6 +2387,7 @@
|
|
|
2303
2387
|
</xsl:attribute-set>
|
|
2304
2388
|
|
|
2305
2389
|
<xsl:attribute-set name="figure-block-style">
|
|
2390
|
+
<xsl:attribute name="role">SKIP</xsl:attribute>
|
|
2306
2391
|
|
|
2307
2392
|
</xsl:attribute-set>
|
|
2308
2393
|
|
|
@@ -2311,6 +2396,7 @@
|
|
|
2311
2396
|
</xsl:attribute-set>
|
|
2312
2397
|
|
|
2313
2398
|
<xsl:attribute-set name="figure-name-style">
|
|
2399
|
+
<xsl:attribute name="role">Caption</xsl:attribute>
|
|
2314
2400
|
|
|
2315
2401
|
<xsl:attribute name="font-family">IPAexGothic</xsl:attribute>
|
|
2316
2402
|
<xsl:attribute name="text-align">center</xsl:attribute>
|
|
@@ -2355,7 +2441,12 @@
|
|
|
2355
2441
|
</xsl:attribute-set> <!-- formula-stem-number-style -->
|
|
2356
2442
|
<!-- End Formula's styles -->
|
|
2357
2443
|
|
|
2444
|
+
<xsl:template name="refine_formula-stem-number-style">
|
|
2445
|
+
|
|
2446
|
+
</xsl:template>
|
|
2447
|
+
|
|
2358
2448
|
<xsl:attribute-set name="image-style">
|
|
2449
|
+
<xsl:attribute name="role">SKIP</xsl:attribute>
|
|
2359
2450
|
<xsl:attribute name="text-align">center</xsl:attribute>
|
|
2360
2451
|
|
|
2361
2452
|
</xsl:attribute-set>
|
|
@@ -2619,6 +2710,11 @@
|
|
|
2619
2710
|
|
|
2620
2711
|
</xsl:attribute-set> <!-- bibitem-non-normative-list-style -->
|
|
2621
2712
|
|
|
2713
|
+
<xsl:attribute-set name="bibitem-non-normative-list-item-style">
|
|
2714
|
+
<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
|
|
2715
|
+
|
|
2716
|
+
</xsl:attribute-set>
|
|
2717
|
+
|
|
2622
2718
|
<!-- bibitem in bibliography section (references/@normative="false"), list body -->
|
|
2623
2719
|
<xsl:attribute-set name="bibitem-normative-list-body-style">
|
|
2624
2720
|
|
|
@@ -2835,13 +2931,13 @@
|
|
|
2835
2931
|
|
|
2836
2932
|
<xsl:template name="processPrefaceSectionsDefault_Contents">
|
|
2837
2933
|
<xsl:variable name="nodes_preface_">
|
|
2838
|
-
<xsl:for-each select="/*/*[local-name()='preface']/*[not(local-name() = 'note' or local-name() = 'admonition')]">
|
|
2934
|
+
<xsl:for-each select="/*/*[local-name()='preface']/*[not(local-name() = 'note' or local-name() = 'admonition' or @type = 'toc')]">
|
|
2839
2935
|
<node id="{@id}"/>
|
|
2840
2936
|
</xsl:for-each>
|
|
2841
2937
|
</xsl:variable>
|
|
2842
2938
|
<xsl:variable name="nodes_preface" select="xalan:nodeset($nodes_preface_)"/>
|
|
2843
2939
|
|
|
2844
|
-
<xsl:for-each select="/*/*[local-name()='preface']/*[not(local-name() = 'note' or local-name() = 'admonition')]">
|
|
2940
|
+
<xsl:for-each select="/*/*[local-name()='preface']/*[not(local-name() = 'note' or local-name() = 'admonition' or @type = 'toc')]">
|
|
2845
2941
|
<xsl:sort select="@displayorder" data-type="number"/>
|
|
2846
2942
|
|
|
2847
2943
|
<!-- process Section's title -->
|
|
@@ -2875,12 +2971,12 @@
|
|
|
2875
2971
|
<xsl:apply-templates select="." mode="contents"/>
|
|
2876
2972
|
</xsl:for-each>
|
|
2877
2973
|
|
|
2878
|
-
<xsl:for-each select="/*/*[local-name()='annex']">
|
|
2974
|
+
<!-- <xsl:for-each select="/*/*[local-name()='annex']">
|
|
2879
2975
|
<xsl:sort select="@displayorder" data-type="number"/>
|
|
2880
2976
|
<xsl:apply-templates select="." mode="contents"/>
|
|
2881
|
-
</xsl:for-each>
|
|
2977
|
+
</xsl:for-each> -->
|
|
2882
2978
|
|
|
2883
|
-
<xsl:for-each select="/*/*[local-name()='bibliography']/*[not(@normative='true') and not(*[local-name()='references'][@normative='true'])][count(.//*[local-name() = 'bibitem'][not(@hidden) = 'true']) > 0] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]][count(.//*[local-name() = 'bibitem'][not(@hidden) = 'true']) > 0]">
|
|
2979
|
+
<xsl:for-each select="/*/*[local-name()='annex'] | /*/*[local-name()='bibliography']/*[not(@normative='true') and not(*[local-name()='references'][@normative='true'])][count(.//*[local-name() = 'bibitem'][not(@hidden) = 'true']) > 0] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]][count(.//*[local-name() = 'bibitem'][not(@hidden) = 'true']) > 0]">
|
|
2884
2980
|
<xsl:sort select="@displayorder" data-type="number"/>
|
|
2885
2981
|
<xsl:apply-templates select="." mode="contents"/>
|
|
2886
2982
|
</xsl:for-each>
|
|
@@ -3010,14 +3106,14 @@
|
|
|
3010
3106
|
<xsl:value-of select="$sep"/><xsl:value-of select="$zero_width_space"/>
|
|
3011
3107
|
</xsl:when>
|
|
3012
3108
|
<xsl:otherwise>
|
|
3013
|
-
<fo:inline keep-together.within-line="always"><xsl:apply-templates/></fo:inline>
|
|
3109
|
+
<fo:inline keep-together.within-line="always" role="SKIP"><xsl:apply-templates/></fo:inline>
|
|
3014
3110
|
</xsl:otherwise>
|
|
3015
3111
|
</xsl:choose>
|
|
3016
3112
|
</xsl:for-each>
|
|
3017
3113
|
</xsl:when>
|
|
3018
3114
|
|
|
3019
3115
|
<xsl:otherwise>
|
|
3020
|
-
<fo:inline keep-together.within-line="always"><xsl:apply-templates/></fo:inline>
|
|
3116
|
+
<fo:inline keep-together.within-line="always" role="SKIP"><xsl:apply-templates/></fo:inline>
|
|
3021
3117
|
</xsl:otherwise>
|
|
3022
3118
|
|
|
3023
3119
|
</xsl:choose>
|
|
@@ -3027,7 +3123,7 @@
|
|
|
3027
3123
|
<!-- Preface boilerplate sections processing -->
|
|
3028
3124
|
<!-- ================================= -->
|
|
3029
3125
|
<xsl:template match="*[local-name()='copyright-statement']">
|
|
3030
|
-
<fo:block xsl:use-attribute-sets="copyright-statement-style">
|
|
3126
|
+
<fo:block xsl:use-attribute-sets="copyright-statement-style" role="SKIP">
|
|
3031
3127
|
<xsl:apply-templates/>
|
|
3032
3128
|
</fo:block>
|
|
3033
3129
|
</xsl:template> <!-- copyright-statement -->
|
|
@@ -3197,7 +3293,7 @@
|
|
|
3197
3293
|
</xsl:choose>
|
|
3198
3294
|
</xsl:variable>
|
|
3199
3295
|
|
|
3200
|
-
<fo:block-container xsl:use-attribute-sets="table-container-style">
|
|
3296
|
+
<fo:block-container xsl:use-attribute-sets="table-container-style" role="SKIP">
|
|
3201
3297
|
|
|
3202
3298
|
<xsl:call-template name="refine_table-container-style">
|
|
3203
3299
|
<xsl:with-param name="margin-side" select="$margin-side"/>
|
|
@@ -3358,7 +3454,7 @@
|
|
|
3358
3454
|
<xsl:param name="continued"/>
|
|
3359
3455
|
<xsl:if test="normalize-space() != ''">
|
|
3360
3456
|
|
|
3361
|
-
<fo:block xsl:use-attribute-sets="table-name-style">
|
|
3457
|
+
<fo:block xsl:use-attribute-sets="table-name-style" role="SKIP">
|
|
3362
3458
|
|
|
3363
3459
|
<xsl:call-template name="refine_table-name-style">
|
|
3364
3460
|
<xsl:with-param name="continued" select="$continued"/>
|
|
@@ -3743,8 +3839,8 @@
|
|
|
3743
3839
|
<xsl:template name="table-header-title">
|
|
3744
3840
|
<xsl:param name="cols-count"/>
|
|
3745
3841
|
<!-- row for title -->
|
|
3746
|
-
<fo:table-row>
|
|
3747
|
-
<fo:table-cell number-columns-spanned="{$cols-count}" border-left="1.5pt solid white" border-right="1.5pt solid white" border-top="1.5pt solid white" border-bottom="1.5pt solid black">
|
|
3842
|
+
<fo:table-row role="SKIP">
|
|
3843
|
+
<fo:table-cell number-columns-spanned="{$cols-count}" border-left="1.5pt solid white" border-right="1.5pt solid white" border-top="1.5pt solid white" border-bottom="1.5pt solid black" role="SKIP">
|
|
3748
3844
|
|
|
3749
3845
|
<xsl:call-template name="refine_table-header-title-style"/>
|
|
3750
3846
|
|
|
@@ -3753,7 +3849,7 @@
|
|
|
3753
3849
|
</xsl:apply-templates>
|
|
3754
3850
|
|
|
3755
3851
|
<xsl:if test="not(ancestor::*[local-name()='table']/*[local-name()='name'])"> <!-- to prevent empty fo:table-cell in case of missing table's name -->
|
|
3756
|
-
<fo:block/>
|
|
3852
|
+
<fo:block role="SKIP"/>
|
|
3757
3853
|
</xsl:if>
|
|
3758
3854
|
|
|
3759
3855
|
</fo:table-cell>
|
|
@@ -4064,7 +4160,7 @@
|
|
|
4064
4160
|
|
|
4065
4161
|
<xsl:call-template name="refine_table-header-cell-style"/>
|
|
4066
4162
|
|
|
4067
|
-
<fo:block>
|
|
4163
|
+
<fo:block role="SKIP">
|
|
4068
4164
|
<xsl:apply-templates/>
|
|
4069
4165
|
</fo:block>
|
|
4070
4166
|
</fo:table-cell>
|
|
@@ -4117,7 +4213,7 @@
|
|
|
4117
4213
|
<xsl:attribute name="text-align">left</xsl:attribute>
|
|
4118
4214
|
</xsl:if>
|
|
4119
4215
|
|
|
4120
|
-
<fo:block>
|
|
4216
|
+
<fo:block role="SKIP">
|
|
4121
4217
|
|
|
4122
4218
|
<xsl:if test="$isGenerateTableIF = 'true'">
|
|
4123
4219
|
<xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
|
|
@@ -4212,7 +4308,7 @@
|
|
|
4212
4308
|
</xsl:choose>
|
|
4213
4309
|
</xsl:variable>
|
|
4214
4310
|
<xsl:variable name="footnote_inline">
|
|
4215
|
-
<fo:inline>
|
|
4311
|
+
<fo:inline role="Reference">
|
|
4216
4312
|
|
|
4217
4313
|
<xsl:variable name="fn_styles">
|
|
4218
4314
|
<xsl:choose>
|
|
@@ -4235,7 +4331,7 @@
|
|
|
4235
4331
|
|
|
4236
4332
|
<xsl:call-template name="insert_basic_link">
|
|
4237
4333
|
<xsl:with-param name="element">
|
|
4238
|
-
<fo:basic-link internal-destination="{$ref_id}" fox:alt-text="footnote {$current_fn_number}">
|
|
4334
|
+
<fo:basic-link internal-destination="{$ref_id}" fox:alt-text="footnote {$current_fn_number}" role="Lbl">
|
|
4239
4335
|
<xsl:copy-of select="$current_fn_number_text"/>
|
|
4240
4336
|
</fo:basic-link>
|
|
4241
4337
|
</xsl:with-param>
|
|
@@ -4248,17 +4344,17 @@
|
|
|
4248
4344
|
<xsl:copy-of select="$footnote_inline"/>
|
|
4249
4345
|
</xsl:when>
|
|
4250
4346
|
<xsl:when test="$p_fn//fn[@gen_id = $gen_id] or normalize-space(@skip_footnote_body) = 'false'">
|
|
4251
|
-
<fo:footnote xsl:use-attribute-sets="fn-style">
|
|
4347
|
+
<fo:footnote xsl:use-attribute-sets="fn-style" role="SKIP">
|
|
4252
4348
|
<xsl:copy-of select="$footnote_inline"/>
|
|
4253
|
-
<fo:footnote-body>
|
|
4349
|
+
<fo:footnote-body role="Note">
|
|
4254
4350
|
|
|
4255
|
-
<fo:block-container xsl:use-attribute-sets="fn-container-body-style">
|
|
4351
|
+
<fo:block-container xsl:use-attribute-sets="fn-container-body-style" role="SKIP">
|
|
4256
4352
|
|
|
4257
|
-
<fo:block xsl:use-attribute-sets="fn-body-style">
|
|
4353
|
+
<fo:block xsl:use-attribute-sets="fn-body-style" role="SKIP">
|
|
4258
4354
|
|
|
4259
4355
|
<xsl:call-template name="refine_fn-body-style"/>
|
|
4260
4356
|
|
|
4261
|
-
<fo:inline id="{$ref_id}" xsl:use-attribute-sets="fn-body-num-style">
|
|
4357
|
+
<fo:inline id="{$ref_id}" xsl:use-attribute-sets="fn-body-num-style" role="Lbl">
|
|
4262
4358
|
|
|
4263
4359
|
<xsl:call-template name="refine_fn-body-num-style"/>
|
|
4264
4360
|
|
|
@@ -4534,11 +4630,11 @@
|
|
|
4534
4630
|
</xsl:template>
|
|
4535
4631
|
|
|
4536
4632
|
<xsl:template match="*[local-name()='fn']/text()[normalize-space() != '']">
|
|
4537
|
-
<fo:inline><xsl:value-of select="."/></fo:inline>
|
|
4633
|
+
<fo:inline role="SKIP"><xsl:value-of select="."/></fo:inline>
|
|
4538
4634
|
</xsl:template>
|
|
4539
4635
|
|
|
4540
4636
|
<xsl:template match="*[local-name()='fn']//*[local-name()='p']">
|
|
4541
|
-
<fo:inline>
|
|
4637
|
+
<fo:inline role="P">
|
|
4542
4638
|
<xsl:apply-templates/>
|
|
4543
4639
|
</fo:inline>
|
|
4544
4640
|
</xsl:template>
|
|
@@ -4553,7 +4649,7 @@
|
|
|
4553
4649
|
<xsl:variable name="isAdded" select="@added"/>
|
|
4554
4650
|
<xsl:variable name="isDeleted" select="@deleted"/>
|
|
4555
4651
|
<!-- <dl><xsl:copy-of select="."/></dl> -->
|
|
4556
|
-
<fo:block-container xsl:use-attribute-sets="dl-block-style">
|
|
4652
|
+
<fo:block-container xsl:use-attribute-sets="dl-block-style" role="SKIP">
|
|
4557
4653
|
|
|
4558
4654
|
<xsl:call-template name="setBlockSpanAll"/>
|
|
4559
4655
|
|
|
@@ -4588,7 +4684,7 @@
|
|
|
4588
4684
|
<xsl:with-param name="isDeleted" select="$isDeleted"/>
|
|
4589
4685
|
</xsl:call-template>
|
|
4590
4686
|
|
|
4591
|
-
<fo:block-container margin-left="0mm">
|
|
4687
|
+
<fo:block-container margin-left="0mm" role="SKIP">
|
|
4592
4688
|
|
|
4593
4689
|
<xsl:attribute name="margin-right">0mm</xsl:attribute>
|
|
4594
4690
|
|
|
@@ -4653,7 +4749,7 @@
|
|
|
4653
4749
|
|
|
4654
4750
|
<!-- a few components -->
|
|
4655
4751
|
<xsl:if test="$onlyOneComponent = 'false'">
|
|
4656
|
-
<fo:block>
|
|
4752
|
+
<fo:block role="SKIP">
|
|
4657
4753
|
|
|
4658
4754
|
<xsl:call-template name="refine_multicomponent_style"/>
|
|
4659
4755
|
|
|
@@ -4661,7 +4757,7 @@
|
|
|
4661
4757
|
<xsl:attribute name="margin-top">0</xsl:attribute>
|
|
4662
4758
|
</xsl:if>
|
|
4663
4759
|
|
|
4664
|
-
<fo:block>
|
|
4760
|
+
<fo:block role="SKIP">
|
|
4665
4761
|
|
|
4666
4762
|
<xsl:call-template name="refine_multicomponent_block_style"/>
|
|
4667
4763
|
|
|
@@ -4996,7 +5092,7 @@
|
|
|
4996
5092
|
-->
|
|
4997
5093
|
<fo:table-row>
|
|
4998
5094
|
<fo:table-cell number-columns-spanned="2">
|
|
4999
|
-
<fo:block>
|
|
5095
|
+
<fo:block role="SKIP">
|
|
5000
5096
|
<xsl:call-template name="note"/>
|
|
5001
5097
|
</fo:block>
|
|
5002
5098
|
</fo:table-cell>
|
|
@@ -5061,7 +5157,7 @@
|
|
|
5061
5157
|
|
|
5062
5158
|
<xsl:call-template name="refine_dt-cell-style"/>
|
|
5063
5159
|
|
|
5064
|
-
<fo:block xsl:use-attribute-sets="dt-block-style">
|
|
5160
|
+
<fo:block xsl:use-attribute-sets="dt-block-style" role="SKIP">
|
|
5065
5161
|
<xsl:copy-of select="@id"/>
|
|
5066
5162
|
|
|
5067
5163
|
<xsl:if test="normalize-space($key_iso) = 'true'">
|
|
@@ -5091,7 +5187,7 @@
|
|
|
5091
5187
|
|
|
5092
5188
|
<xsl:call-template name="refine_dd-cell-style"/>
|
|
5093
5189
|
|
|
5094
|
-
<fo:block>
|
|
5190
|
+
<fo:block role="SKIP">
|
|
5095
5191
|
|
|
5096
5192
|
<xsl:if test="$isGenerateTableIF = 'true'">
|
|
5097
5193
|
<xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
|
|
@@ -5258,6 +5354,9 @@
|
|
|
5258
5354
|
|
|
5259
5355
|
<xsl:attribute name="font-family">Times New Roman</xsl:attribute>
|
|
5260
5356
|
|
|
5357
|
+
<xsl:if test="ancestor::*['preferred']">
|
|
5358
|
+
<xsl:attribute name="role">SKIP</xsl:attribute>
|
|
5359
|
+
</xsl:if>
|
|
5261
5360
|
</xsl:template>
|
|
5262
5361
|
|
|
5263
5362
|
<xsl:template match="*[local-name()='padding']">
|
|
@@ -5466,11 +5565,41 @@
|
|
|
5466
5565
|
|
|
5467
5566
|
<xsl:template match="text()[ancestor::*[local-name()='smallcap']]">
|
|
5468
5567
|
<xsl:variable name="text" select="normalize-space(.)"/>
|
|
5469
|
-
<fo:inline font-size="75%">
|
|
5568
|
+
<fo:inline font-size="75%" role="SKIP">
|
|
5470
5569
|
<xsl:if test="string-length($text) > 0">
|
|
5471
|
-
<xsl:
|
|
5472
|
-
<xsl:
|
|
5473
|
-
|
|
5570
|
+
<xsl:variable name="smallCapsText">
|
|
5571
|
+
<xsl:call-template name="recursiveSmallCaps">
|
|
5572
|
+
<xsl:with-param name="text" select="$text"/>
|
|
5573
|
+
</xsl:call-template>
|
|
5574
|
+
</xsl:variable>
|
|
5575
|
+
<!-- merge neighboring fo:inline -->
|
|
5576
|
+
<xsl:for-each select="xalan:nodeset($smallCapsText)/node()">
|
|
5577
|
+
<xsl:choose>
|
|
5578
|
+
<xsl:when test="self::fo:inline and preceding-sibling::node()[1][self::fo:inline]"><!-- <xsl:copy-of select="."/> --></xsl:when>
|
|
5579
|
+
<xsl:when test="self::fo:inline and @font-size">
|
|
5580
|
+
<xsl:variable name="curr_pos" select="count(preceding-sibling::node()) + 1"/>
|
|
5581
|
+
<!-- <curr_pos><xsl:value-of select="$curr_pos"/></curr_pos> -->
|
|
5582
|
+
<xsl:variable name="next_text_" select="count(following-sibling::node()[not(local-name() = 'inline')][1]/preceding-sibling::node())"/>
|
|
5583
|
+
<xsl:variable name="next_text">
|
|
5584
|
+
<xsl:choose>
|
|
5585
|
+
<xsl:when test="$next_text_ = 0">99999999</xsl:when>
|
|
5586
|
+
<xsl:otherwise><xsl:value-of select="$next_text_ + 1"/></xsl:otherwise>
|
|
5587
|
+
</xsl:choose>
|
|
5588
|
+
</xsl:variable>
|
|
5589
|
+
<!-- <next_text><xsl:value-of select="$next_text"/></next_text> -->
|
|
5590
|
+
<fo:inline>
|
|
5591
|
+
<xsl:copy-of select="@*"/>
|
|
5592
|
+
<xsl:copy-of select="./node()"/>
|
|
5593
|
+
<xsl:for-each select="following-sibling::node()[position() < $next_text - $curr_pos]"> <!-- [self::fo:inline] -->
|
|
5594
|
+
<xsl:copy-of select="./node()"/>
|
|
5595
|
+
</xsl:for-each>
|
|
5596
|
+
</fo:inline>
|
|
5597
|
+
</xsl:when>
|
|
5598
|
+
<xsl:otherwise>
|
|
5599
|
+
<xsl:copy-of select="."/>
|
|
5600
|
+
</xsl:otherwise>
|
|
5601
|
+
</xsl:choose>
|
|
5602
|
+
</xsl:for-each>
|
|
5474
5603
|
</xsl:if>
|
|
5475
5604
|
</fo:inline>
|
|
5476
5605
|
</xsl:template>
|
|
@@ -5482,7 +5611,7 @@
|
|
|
5482
5611
|
<xsl:variable name="upperCase" select="java:toUpperCase(java:java.lang.String.new($char))"/>
|
|
5483
5612
|
<xsl:choose>
|
|
5484
5613
|
<xsl:when test="$char=$upperCase">
|
|
5485
|
-
<fo:inline font-size="{100 div 0.75}%">
|
|
5614
|
+
<fo:inline font-size="{100 div 0.75}%" role="SKIP">
|
|
5486
5615
|
<xsl:value-of select="$upperCase"/>
|
|
5487
5616
|
</fo:inline>
|
|
5488
5617
|
</xsl:when>
|
|
@@ -5648,6 +5777,10 @@
|
|
|
5648
5777
|
|
|
5649
5778
|
<xsl:when test="not(contains($text, $separator))">
|
|
5650
5779
|
<word>
|
|
5780
|
+
<xsl:if test="ancestor::*[local-name() = 'p'][@from_dl = 'true']">
|
|
5781
|
+
<xsl:text>
|
|
5782
|
+
</xsl:text> <!-- to add distance between dt and dd -->
|
|
5783
|
+
</xsl:if>
|
|
5651
5784
|
<xsl:call-template name="enclose_text_in_tags">
|
|
5652
5785
|
<xsl:with-param name="text" select="normalize-space($text)"/>
|
|
5653
5786
|
<xsl:with-param name="tags" select="$tags"/>
|
|
@@ -5656,6 +5789,10 @@
|
|
|
5656
5789
|
</xsl:when>
|
|
5657
5790
|
<xsl:otherwise>
|
|
5658
5791
|
<word>
|
|
5792
|
+
<xsl:if test="ancestor::*[local-name() = 'p'][@from_dl = 'true']">
|
|
5793
|
+
<xsl:text>
|
|
5794
|
+
</xsl:text> <!-- to add distance between dt and dd -->
|
|
5795
|
+
</xsl:if>
|
|
5659
5796
|
<xsl:call-template name="enclose_text_in_tags">
|
|
5660
5797
|
<xsl:with-param name="text" select="normalize-space(substring-before($text, $separator))"/>
|
|
5661
5798
|
<xsl:with-param name="tags" select="$tags"/>
|
|
@@ -5839,6 +5976,10 @@
|
|
|
5839
5976
|
<xsl:template name="getSimpleTable">
|
|
5840
5977
|
<xsl:param name="id"/>
|
|
5841
5978
|
|
|
5979
|
+
<!-- <test0>
|
|
5980
|
+
<xsl:copy-of select="."/>
|
|
5981
|
+
</test0> -->
|
|
5982
|
+
|
|
5842
5983
|
<xsl:variable name="simple-table">
|
|
5843
5984
|
|
|
5844
5985
|
<!-- Step 0. replace <br/> to <p>...</p> -->
|
|
@@ -6151,6 +6292,18 @@
|
|
|
6151
6292
|
</xsl:copy>
|
|
6152
6293
|
</xsl:template>
|
|
6153
6294
|
|
|
6295
|
+
<xsl:variable name="font_main_root_style">
|
|
6296
|
+
<root-style xsl:use-attribute-sets="root-style">
|
|
6297
|
+
</root-style>
|
|
6298
|
+
</xsl:variable>
|
|
6299
|
+
<xsl:variable name="font_main_root_style_font_family" select="xalan:nodeset($font_main_root_style)/root-style/@font-family"/>
|
|
6300
|
+
<xsl:variable name="font_main">
|
|
6301
|
+
<xsl:choose>
|
|
6302
|
+
<xsl:when test="contains($font_main_root_style_font_family, ',')"><xsl:value-of select="substring-before($font_main_root_style_font_family, ',')"/></xsl:when>
|
|
6303
|
+
<xsl:otherwise><xsl:value-of select="$font_main_root_style_font_family"/></xsl:otherwise>
|
|
6304
|
+
</xsl:choose>
|
|
6305
|
+
</xsl:variable>
|
|
6306
|
+
|
|
6154
6307
|
<xsl:template match="*[local-name()='th' or local-name()='td']" mode="simple-table-id">
|
|
6155
6308
|
<xsl:param name="id"/>
|
|
6156
6309
|
<xsl:copy>
|
|
@@ -6189,6 +6342,33 @@
|
|
|
6189
6342
|
|
|
6190
6343
|
<!-- td_text='<xsl:copy-of select="$td_text"/>' -->
|
|
6191
6344
|
|
|
6345
|
+
<xsl:variable name="words_with_width">
|
|
6346
|
+
<!-- calculate width for 'word' which contain text only (without formatting tags inside) -->
|
|
6347
|
+
<xsl:for-each select="xalan:nodeset($td_text)//*[local-name() = 'word'][normalize-space() != ''][not(*)]">
|
|
6348
|
+
<xsl:copy>
|
|
6349
|
+
<xsl:copy-of select="@*"/>
|
|
6350
|
+
<xsl:attribute name="width">
|
|
6351
|
+
<xsl:value-of select="java:org.metanorma.fop.Util.getStringWidth(., $font_main)"/> <!-- Example: 'Times New Roman' -->
|
|
6352
|
+
</xsl:attribute>
|
|
6353
|
+
<xsl:copy-of select="node()"/>
|
|
6354
|
+
</xsl:copy>
|
|
6355
|
+
</xsl:for-each>
|
|
6356
|
+
</xsl:variable>
|
|
6357
|
+
|
|
6358
|
+
<xsl:variable name="words_with_width_sorted">
|
|
6359
|
+
<xsl:for-each select="xalan:nodeset($words_with_width)//*[local-name() = 'word']">
|
|
6360
|
+
<xsl:sort select="@width" data-type="number" order="descending"/>
|
|
6361
|
+
<!-- select word maximal width only -->
|
|
6362
|
+
<xsl:if test="position() = 1">
|
|
6363
|
+
<xsl:copy-of select="."/>
|
|
6364
|
+
</xsl:if>
|
|
6365
|
+
</xsl:for-each>
|
|
6366
|
+
<!-- add 'word' with formatting tags inside -->
|
|
6367
|
+
<xsl:for-each select="xalan:nodeset($td_text)//*[local-name() = 'word'][normalize-space() != ''][*]">
|
|
6368
|
+
<xsl:copy-of select="."/>
|
|
6369
|
+
</xsl:for-each>
|
|
6370
|
+
</xsl:variable>
|
|
6371
|
+
|
|
6192
6372
|
<xsl:variable name="words">
|
|
6193
6373
|
<xsl:for-each select=".//*[local-name() = 'image' or local-name() = 'stem']">
|
|
6194
6374
|
<word>
|
|
@@ -6196,9 +6376,12 @@
|
|
|
6196
6376
|
</word>
|
|
6197
6377
|
</xsl:for-each>
|
|
6198
6378
|
|
|
6199
|
-
<xsl:for-each select="xalan:nodeset($
|
|
6379
|
+
<xsl:for-each select="xalan:nodeset($words_with_width_sorted)//*[local-name() = 'word'][normalize-space() != '']">
|
|
6200
6380
|
<xsl:copy-of select="."/>
|
|
6201
6381
|
</xsl:for-each>
|
|
6382
|
+
<!-- <xsl:for-each select="xalan:nodeset($td_text)//*[local-name() = 'word'][normalize-space() != '']">
|
|
6383
|
+
<xsl:copy-of select="."/>
|
|
6384
|
+
</xsl:for-each> -->
|
|
6202
6385
|
|
|
6203
6386
|
</xsl:variable>
|
|
6204
6387
|
|
|
@@ -6659,10 +6842,10 @@
|
|
|
6659
6842
|
<xsl:copy>
|
|
6660
6843
|
<xsl:apply-templates select="@*" mode="mathml"/>
|
|
6661
6844
|
<xsl:if test="not(@lspace)">
|
|
6662
|
-
<xsl:attribute name="lspace">0.
|
|
6845
|
+
<xsl:attribute name="lspace">0.2em</xsl:attribute>
|
|
6663
6846
|
</xsl:if>
|
|
6664
|
-
<xsl:if test="not(@rspace)">
|
|
6665
|
-
<xsl:attribute name="rspace">0.
|
|
6847
|
+
<xsl:if test="not(@rspace) and not(following-sibling::*[1][self::mathml:mo and normalize-space(text()) = '|'])">
|
|
6848
|
+
<xsl:attribute name="rspace">0.2em</xsl:attribute>
|
|
6666
6849
|
</xsl:if>
|
|
6667
6850
|
<xsl:apply-templates mode="mathml"/>
|
|
6668
6851
|
</xsl:copy>
|
|
@@ -6679,6 +6862,27 @@
|
|
|
6679
6862
|
</xsl:copy>
|
|
6680
6863
|
</xsl:template>
|
|
6681
6864
|
|
|
6865
|
+
<!-- increase space before '(' -->
|
|
6866
|
+
<xsl:template match="mathml:mo[normalize-space(text()) = '(']" mode="mathml">
|
|
6867
|
+
<xsl:copy>
|
|
6868
|
+
<xsl:apply-templates select="@*" mode="mathml"/>
|
|
6869
|
+
<xsl:if test="(preceding-sibling::* and not(preceding-sibling::*[1][self::mathml:mo])) or (../preceding-sibling::* and not(../preceding-sibling::*[1][self::mathml:mo]))">
|
|
6870
|
+
<xsl:if test="not(@lspace)">
|
|
6871
|
+
<xsl:attribute name="lspace">0.4em</xsl:attribute>
|
|
6872
|
+
<xsl:choose>
|
|
6873
|
+
<xsl:when test="preceding-sibling::*[1][self::mathml:mi or self::mathml:mstyle]">
|
|
6874
|
+
<xsl:attribute name="lspace">0.2em</xsl:attribute>
|
|
6875
|
+
</xsl:when>
|
|
6876
|
+
<xsl:when test="../preceding-sibling::*[1][self::mathml:mi or self::mathml:mstyle]">
|
|
6877
|
+
<xsl:attribute name="lspace">0.2em</xsl:attribute>
|
|
6878
|
+
</xsl:when>
|
|
6879
|
+
</xsl:choose>
|
|
6880
|
+
</xsl:if>
|
|
6881
|
+
</xsl:if>
|
|
6882
|
+
<xsl:apply-templates mode="mathml"/>
|
|
6883
|
+
</xsl:copy>
|
|
6884
|
+
</xsl:template>
|
|
6885
|
+
|
|
6682
6886
|
<!-- Examples:
|
|
6683
6887
|
<stem type="AsciiMath">x = 1</stem>
|
|
6684
6888
|
<stem type="AsciiMath"><asciimath>x = 1</asciimath></stem>
|
|
@@ -6838,7 +7042,7 @@
|
|
|
6838
7042
|
<!-- formula -->
|
|
6839
7043
|
<!-- ====== -->
|
|
6840
7044
|
<xsl:template match="*[local-name() = 'formula']" name="formula">
|
|
6841
|
-
<fo:block-container margin-left="0mm">
|
|
7045
|
+
<fo:block-container margin-left="0mm" role="SKIP">
|
|
6842
7046
|
<xsl:if test="parent::*[local-name() = 'note']">
|
|
6843
7047
|
<xsl:attribute name="margin-left">
|
|
6844
7048
|
<xsl:choose>
|
|
@@ -6848,7 +7052,7 @@
|
|
|
6848
7052
|
</xsl:attribute>
|
|
6849
7053
|
|
|
6850
7054
|
</xsl:if>
|
|
6851
|
-
<fo:block-container margin-left="0mm">
|
|
7055
|
+
<fo:block-container margin-left="0mm" role="SKIP">
|
|
6852
7056
|
<fo:block id="{@id}">
|
|
6853
7057
|
<xsl:apply-templates select="node()[not(local-name() = 'name')]"/> <!-- formula's number will be process in 'stem' template -->
|
|
6854
7058
|
</fo:block>
|
|
@@ -6884,7 +7088,7 @@
|
|
|
6884
7088
|
<fo:table-body>
|
|
6885
7089
|
<fo:table-row>
|
|
6886
7090
|
<fo:table-cell display-align="center">
|
|
6887
|
-
<fo:block xsl:use-attribute-sets="formula-stem-block-style">
|
|
7091
|
+
<fo:block xsl:use-attribute-sets="formula-stem-block-style" role="SKIP">
|
|
6888
7092
|
|
|
6889
7093
|
<xsl:call-template name="refine_formula-stem-block-style"/>
|
|
6890
7094
|
|
|
@@ -6892,7 +7096,10 @@
|
|
|
6892
7096
|
</fo:block>
|
|
6893
7097
|
</fo:table-cell>
|
|
6894
7098
|
<fo:table-cell display-align="center">
|
|
6895
|
-
<fo:block xsl:use-attribute-sets="formula-stem-number-style">
|
|
7099
|
+
<fo:block xsl:use-attribute-sets="formula-stem-number-style" role="SKIP">
|
|
7100
|
+
|
|
7101
|
+
<xsl:call-template name="refine_formula-stem-number-style"/>
|
|
7102
|
+
|
|
6896
7103
|
<xsl:apply-templates select="../*[local-name() = 'name']"/>
|
|
6897
7104
|
</fo:block>
|
|
6898
7105
|
</fo:table-cell>
|
|
@@ -6925,13 +7132,13 @@
|
|
|
6925
7132
|
|
|
6926
7133
|
<xsl:template match="*[local-name() = 'note']" name="note">
|
|
6927
7134
|
|
|
6928
|
-
<fo:block-container id="{@id}" xsl:use-attribute-sets="note-style">
|
|
7135
|
+
<fo:block-container id="{@id}" xsl:use-attribute-sets="note-style" role="SKIP">
|
|
6929
7136
|
|
|
6930
7137
|
<xsl:call-template name="setBlockSpanAll"/>
|
|
6931
7138
|
|
|
6932
7139
|
<xsl:call-template name="refine_note-style"/>
|
|
6933
7140
|
|
|
6934
|
-
<fo:block-container margin-left="0mm" margin-right="0mm">
|
|
7141
|
+
<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
|
|
6935
7142
|
|
|
6936
7143
|
<fo:list-block>
|
|
6937
7144
|
<xsl:attribute name="provisional-distance-between-starts">
|
|
@@ -7088,12 +7295,13 @@
|
|
|
7088
7295
|
|
|
7089
7296
|
<xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']">
|
|
7090
7297
|
<xsl:if test="normalize-space() != ''">
|
|
7091
|
-
<xsl:variable name="level">
|
|
7298
|
+
<!-- <xsl:variable name="level">
|
|
7092
7299
|
<xsl:call-template name="getLevelTermName"/>
|
|
7093
7300
|
</xsl:variable>
|
|
7094
7301
|
<fo:inline role="H{$level}">
|
|
7095
|
-
<xsl:apply-templates/>
|
|
7096
|
-
</fo:inline>
|
|
7302
|
+
<xsl:apply-templates />
|
|
7303
|
+
</fo:inline> -->
|
|
7304
|
+
<xsl:apply-templates/>
|
|
7097
7305
|
</xsl:if>
|
|
7098
7306
|
</xsl:template>
|
|
7099
7307
|
<!-- ====== -->
|
|
@@ -7117,7 +7325,7 @@
|
|
|
7117
7325
|
<!-- Example: Dimensions in millimeters -->
|
|
7118
7326
|
<xsl:apply-templates select="*[local-name() = 'note'][@type = 'units']"/>
|
|
7119
7327
|
|
|
7120
|
-
<fo:block xsl:use-attribute-sets="figure-style">
|
|
7328
|
+
<fo:block xsl:use-attribute-sets="figure-style" role="SKIP">
|
|
7121
7329
|
<xsl:apply-templates select="node()[not(local-name() = 'name') and not(local-name() = 'note' and @type = 'units')]"/>
|
|
7122
7330
|
</fo:block>
|
|
7123
7331
|
<xsl:for-each select="*[local-name() = 'note'][not(@type = 'units')]">
|
|
@@ -8250,7 +8458,7 @@
|
|
|
8250
8458
|
</xsl:when>
|
|
8251
8459
|
|
|
8252
8460
|
<xsl:otherwise>
|
|
8253
|
-
<fo:block-container xsl:use-attribute-sets="sourcecode-container-style">
|
|
8461
|
+
<fo:block-container xsl:use-attribute-sets="sourcecode-container-style" role="SKIP">
|
|
8254
8462
|
|
|
8255
8463
|
<xsl:if test="not(ancestor::*[local-name() = 'li']) or ancestor::*[local-name() = 'example']">
|
|
8256
8464
|
<xsl:attribute name="margin-left">0mm</xsl:attribute>
|
|
@@ -8271,7 +8479,7 @@
|
|
|
8271
8479
|
</xsl:attribute>
|
|
8272
8480
|
|
|
8273
8481
|
</xsl:if>
|
|
8274
|
-
<fo:block-container margin-left="0mm">
|
|
8482
|
+
<fo:block-container margin-left="0mm" role="SKIP">
|
|
8275
8483
|
|
|
8276
8484
|
<fo:block xsl:use-attribute-sets="sourcecode-style">
|
|
8277
8485
|
|
|
@@ -8395,7 +8603,7 @@
|
|
|
8395
8603
|
<!-- second td with sourcecode -->
|
|
8396
8604
|
<xsl:template match="*[local-name() = 'sourcecode'][@linenums = 'true']/*[local-name()='table']//*[local-name()='tr']/*[local-name()='td'][preceding-sibling::*]" priority="2"> <!-- *[local-name()='table'][@type = 'sourcecode'] -->
|
|
8397
8605
|
<fo:table-cell>
|
|
8398
|
-
<fo:block>
|
|
8606
|
+
<fo:block role="SKIP">
|
|
8399
8607
|
<xsl:apply-templates/>
|
|
8400
8608
|
</fo:block>
|
|
8401
8609
|
</fo:table-cell>
|
|
@@ -8817,11 +9025,11 @@
|
|
|
8817
9025
|
<!-- requirement, recommendation, permission table -->
|
|
8818
9026
|
<!-- ========== -->
|
|
8819
9027
|
<xsl:template match="*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']">
|
|
8820
|
-
<fo:block-container margin-left="0mm" margin-right="0mm" margin-bottom="12pt">
|
|
9028
|
+
<fo:block-container margin-left="0mm" margin-right="0mm" margin-bottom="12pt" role="SKIP">
|
|
8821
9029
|
<xsl:if test="ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']">
|
|
8822
9030
|
<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
|
|
8823
9031
|
</xsl:if>
|
|
8824
|
-
<fo:block-container margin-left="0mm" margin-right="0mm">
|
|
9032
|
+
<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
|
|
8825
9033
|
<fo:table id="{@id}" table-layout="fixed" width="100%"> <!-- border="1pt solid black" -->
|
|
8826
9034
|
<xsl:if test="ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']">
|
|
8827
9035
|
<!-- <xsl:attribute name="border">0.5pt solid black</xsl:attribute> -->
|
|
@@ -8882,7 +9090,7 @@
|
|
|
8882
9090
|
|
|
8883
9091
|
<xsl:call-template name="setTableCellAttributes"/>
|
|
8884
9092
|
|
|
8885
|
-
<fo:block>
|
|
9093
|
+
<fo:block role="SKIP">
|
|
8886
9094
|
<xsl:apply-templates/>
|
|
8887
9095
|
</fo:block>
|
|
8888
9096
|
</fo:table-cell>
|
|
@@ -8904,7 +9112,7 @@
|
|
|
8904
9112
|
|
|
8905
9113
|
<xsl:call-template name="setTableCellAttributes"/>
|
|
8906
9114
|
|
|
8907
|
-
<fo:block>
|
|
9115
|
+
<fo:block role="SKIP">
|
|
8908
9116
|
<xsl:apply-templates/>
|
|
8909
9117
|
</fo:block>
|
|
8910
9118
|
</fo:table-cell>
|
|
@@ -8983,7 +9191,7 @@
|
|
|
8983
9191
|
-->
|
|
8984
9192
|
<xsl:template match="*[local-name() = 'example']">
|
|
8985
9193
|
|
|
8986
|
-
<fo:block-container id="{@id}" xsl:use-attribute-sets="example-style">
|
|
9194
|
+
<fo:block-container id="{@id}" xsl:use-attribute-sets="example-style" role="SKIP">
|
|
8987
9195
|
|
|
8988
9196
|
<xsl:call-template name="setBlockSpanAll"/>
|
|
8989
9197
|
|
|
@@ -8994,7 +9202,7 @@
|
|
|
8994
9202
|
list
|
|
8995
9203
|
</xsl:variable>
|
|
8996
9204
|
|
|
8997
|
-
<fo:block-container margin-left="0mm">
|
|
9205
|
+
<fo:block-container margin-left="0mm" role="SKIP">
|
|
8998
9206
|
|
|
8999
9207
|
<xsl:choose>
|
|
9000
9208
|
|
|
@@ -9007,8 +9215,8 @@
|
|
|
9007
9215
|
</xsl:apply-templates>
|
|
9008
9216
|
</fo:block>
|
|
9009
9217
|
|
|
9010
|
-
<fo:block-container xsl:use-attribute-sets="example-body-style">
|
|
9011
|
-
<fo:block-container margin-left="0mm" margin-right="0mm">
|
|
9218
|
+
<fo:block-container xsl:use-attribute-sets="example-body-style" role="SKIP">
|
|
9219
|
+
<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
|
|
9012
9220
|
<xsl:apply-templates select="node()[not(local-name() = 'name')]">
|
|
9013
9221
|
<xsl:with-param name="fo_element" select="$fo_element"/>
|
|
9014
9222
|
</xsl:apply-templates>
|
|
@@ -9061,8 +9269,8 @@
|
|
|
9061
9269
|
|
|
9062
9270
|
<xsl:if test="*[not(local-name() = 'name')][position() > 1]">
|
|
9063
9271
|
<!-- display further elements in blocks -->
|
|
9064
|
-
<fo:block-container xsl:use-attribute-sets="example-body-style">
|
|
9065
|
-
<fo:block-container margin-left="0mm" margin-right="0mm">
|
|
9272
|
+
<fo:block-container xsl:use-attribute-sets="example-body-style" role="SKIP">
|
|
9273
|
+
<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
|
|
9066
9274
|
<xsl:apply-templates select="*[not(local-name() = 'name')][position() > 1]">
|
|
9067
9275
|
<xsl:with-param name="fo_element" select="'block'"/>
|
|
9068
9276
|
</xsl:apply-templates>
|
|
@@ -9115,7 +9323,7 @@
|
|
|
9115
9323
|
</xsl:variable>
|
|
9116
9324
|
<xsl:choose>
|
|
9117
9325
|
<xsl:when test="starts-with(normalize-space($element), 'block')">
|
|
9118
|
-
<fo:block-container>
|
|
9326
|
+
<fo:block-container role="SKIP">
|
|
9119
9327
|
<xsl:if test="ancestor::*[local-name() = 'li'] and contains(normalize-space($fo_element), 'block')">
|
|
9120
9328
|
<xsl:attribute name="margin-left">0mm</xsl:attribute>
|
|
9121
9329
|
<xsl:attribute name="margin-right">0mm</xsl:attribute>
|
|
@@ -9256,7 +9464,7 @@
|
|
|
9256
9464
|
<!-- author -->
|
|
9257
9465
|
<!-- ====== -->
|
|
9258
9466
|
<xsl:template match="*[local-name() = 'quote']">
|
|
9259
|
-
<fo:block-container margin-left="0mm">
|
|
9467
|
+
<fo:block-container margin-left="0mm" role="SKIP">
|
|
9260
9468
|
|
|
9261
9469
|
<xsl:call-template name="setBlockSpanAll"/>
|
|
9262
9470
|
|
|
@@ -9266,12 +9474,12 @@
|
|
|
9266
9474
|
</xsl:if>
|
|
9267
9475
|
</xsl:if>
|
|
9268
9476
|
|
|
9269
|
-
<fo:block-container margin-left="0mm">
|
|
9270
|
-
<fo:block-container xsl:use-attribute-sets="quote-style">
|
|
9477
|
+
<fo:block-container margin-left="0mm" role="SKIP">
|
|
9478
|
+
<fo:block-container xsl:use-attribute-sets="quote-style" role="SKIP">
|
|
9271
9479
|
|
|
9272
9480
|
<xsl:call-template name="refine_quote-style"/>
|
|
9273
9481
|
|
|
9274
|
-
<fo:block-container margin-left="0mm" margin-right="0mm">
|
|
9482
|
+
<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
|
|
9275
9483
|
<fo:block role="BlockQuote">
|
|
9276
9484
|
<xsl:apply-templates select="./node()[not(local-name() = 'author') and not(local-name() = 'source')]"/> <!-- process all nested nodes, except author and source -->
|
|
9277
9485
|
</fo:block>
|
|
@@ -9427,10 +9635,10 @@
|
|
|
9427
9635
|
|
|
9428
9636
|
<xsl:choose>
|
|
9429
9637
|
<xsl:when test="$lang = 'zh'">
|
|
9430
|
-
<fo:inline><xsl:value-of select="$tab_zh"/></fo:inline>
|
|
9638
|
+
<fo:inline role="SKIP"><xsl:value-of select="$tab_zh"/></fo:inline>
|
|
9431
9639
|
</xsl:when>
|
|
9432
9640
|
<xsl:when test="../../@inline-header = 'true'">
|
|
9433
|
-
<fo:inline font-size="90%">
|
|
9641
|
+
<fo:inline font-size="90%" role="SKIP">
|
|
9434
9642
|
<xsl:call-template name="insertNonBreakSpaces">
|
|
9435
9643
|
<xsl:with-param name="count" select="$padding-right"/>
|
|
9436
9644
|
</xsl:call-template>
|
|
@@ -9438,7 +9646,7 @@
|
|
|
9438
9646
|
</xsl:when>
|
|
9439
9647
|
<xsl:otherwise>
|
|
9440
9648
|
<xsl:variable name="direction"><xsl:if test="$lang = 'ar'"><xsl:value-of select="$RLM"/></xsl:if></xsl:variable>
|
|
9441
|
-
<fo:inline padding-right="{$padding-right}mm"><xsl:value-of select="$direction"/></fo:inline>
|
|
9649
|
+
<fo:inline padding-right="{$padding-right}mm" role="SKIP"><xsl:value-of select="$direction"/></fo:inline>
|
|
9442
9650
|
</xsl:otherwise>
|
|
9443
9651
|
</xsl:choose>
|
|
9444
9652
|
|
|
@@ -9468,12 +9676,12 @@
|
|
|
9468
9676
|
<fo:block font-size="{normalize-space($font-size)}" role="H{$levelTerm}" xsl:use-attribute-sets="preferred-block-style">
|
|
9469
9677
|
|
|
9470
9678
|
<xsl:if test="parent::*[local-name() = 'term'] and not(preceding-sibling::*[local-name() = 'preferred'])"> <!-- if first preffered in term, then display term's name -->
|
|
9471
|
-
<fo:block xsl:use-attribute-sets="term-name-style">
|
|
9679
|
+
<fo:block xsl:use-attribute-sets="term-name-style" role="SKIP">
|
|
9472
9680
|
<xsl:apply-templates select="ancestor::*[local-name() = 'term'][1]/*[local-name() = 'name']"/>
|
|
9473
9681
|
</fo:block>
|
|
9474
9682
|
</xsl:if>
|
|
9475
9683
|
|
|
9476
|
-
<fo:block xsl:use-attribute-sets="preferred-term-style">
|
|
9684
|
+
<fo:block xsl:use-attribute-sets="preferred-term-style" role="SKIP">
|
|
9477
9685
|
<xsl:call-template name="setStyle_preferred"/>
|
|
9478
9686
|
<xsl:apply-templates/>
|
|
9479
9687
|
</fo:block>
|
|
@@ -9514,7 +9722,7 @@
|
|
|
9514
9722
|
<!-- definition -->
|
|
9515
9723
|
<!-- ========== -->
|
|
9516
9724
|
<xsl:template match="*[local-name() = 'definition']">
|
|
9517
|
-
<fo:block xsl:use-attribute-sets="definition-style">
|
|
9725
|
+
<fo:block xsl:use-attribute-sets="definition-style" role="SKIP">
|
|
9518
9726
|
<xsl:apply-templates/>
|
|
9519
9727
|
</fo:block>
|
|
9520
9728
|
</xsl:template>
|
|
@@ -9557,6 +9765,10 @@
|
|
|
9557
9765
|
|
|
9558
9766
|
<xsl:template match="*[local-name() = 'clause']">
|
|
9559
9767
|
<fo:block>
|
|
9768
|
+
<xsl:if test="parent::*[local-name() = 'copyright-statement']">
|
|
9769
|
+
<xsl:attribute name="role">SKIP</xsl:attribute>
|
|
9770
|
+
</xsl:if>
|
|
9771
|
+
|
|
9560
9772
|
<xsl:call-template name="setId"/>
|
|
9561
9773
|
|
|
9562
9774
|
<xsl:call-template name="setBlockSpanAll"/>
|
|
@@ -9671,7 +9883,48 @@
|
|
|
9671
9883
|
</xsl:choose>
|
|
9672
9884
|
</xsl:when>
|
|
9673
9885
|
<xsl:when test="local-name(..) = 'ol' and @label"> <!-- for ordered lists 'ol', and if there is @label, for instance label="1.1.2" -->
|
|
9674
|
-
|
|
9886
|
+
|
|
9887
|
+
<xsl:variable name="label">
|
|
9888
|
+
|
|
9889
|
+
<xsl:variable name="type" select="../@type"/>
|
|
9890
|
+
|
|
9891
|
+
<xsl:variable name="style_prefix_">
|
|
9892
|
+
<xsl:if test="$type = 'roman'">
|
|
9893
|
+
<!-- Example: (i) -->
|
|
9894
|
+
</xsl:if>
|
|
9895
|
+
</xsl:variable>
|
|
9896
|
+
<xsl:variable name="style_prefix" select="normalize-space($style_prefix_)"/>
|
|
9897
|
+
|
|
9898
|
+
<xsl:variable name="style_suffix_">
|
|
9899
|
+
<xsl:choose>
|
|
9900
|
+
<xsl:when test="$type = 'arabic'">
|
|
9901
|
+
)
|
|
9902
|
+
</xsl:when>
|
|
9903
|
+
<xsl:when test="$type = 'alphabet' or $type = 'alphabetic'">
|
|
9904
|
+
)
|
|
9905
|
+
</xsl:when>
|
|
9906
|
+
<xsl:when test="$type = 'alphabet_upper' or $type = 'alphabetic_upper'">
|
|
9907
|
+
.
|
|
9908
|
+
</xsl:when>
|
|
9909
|
+
<xsl:when test="$type = 'roman'">
|
|
9910
|
+
)
|
|
9911
|
+
</xsl:when>
|
|
9912
|
+
<xsl:when test="$type = 'roman_upper'">.</xsl:when> <!-- Example: I. -->
|
|
9913
|
+
</xsl:choose>
|
|
9914
|
+
</xsl:variable>
|
|
9915
|
+
<xsl:variable name="style_suffix" select="normalize-space($style_suffix_)"/>
|
|
9916
|
+
|
|
9917
|
+
<xsl:if test="$style_prefix != '' and not(starts-with(@label, $style_prefix))">
|
|
9918
|
+
<xsl:value-of select="$style_prefix"/>
|
|
9919
|
+
</xsl:if>
|
|
9920
|
+
<xsl:value-of select="@label"/>
|
|
9921
|
+
<xsl:if test="not(java:endsWith(java:java.lang.String.new(@label),$style_suffix))">
|
|
9922
|
+
<xsl:value-of select="$style_suffix"/>
|
|
9923
|
+
</xsl:if>
|
|
9924
|
+
</xsl:variable>
|
|
9925
|
+
|
|
9926
|
+
<xsl:value-of select="normalize-space($label)"/>
|
|
9927
|
+
|
|
9675
9928
|
</xsl:when>
|
|
9676
9929
|
<xsl:otherwise> <!-- for ordered lists 'ol' -->
|
|
9677
9930
|
|
|
@@ -9753,7 +10006,7 @@
|
|
|
9753
10006
|
<xsl:template match="*[local-name() = 'ul'] | *[local-name() = 'ol']">
|
|
9754
10007
|
<xsl:choose>
|
|
9755
10008
|
<xsl:when test="parent::*[local-name() = 'note'] or parent::*[local-name() = 'termnote']">
|
|
9756
|
-
<fo:block-container>
|
|
10009
|
+
<fo:block-container role="SKIP">
|
|
9757
10010
|
<xsl:attribute name="margin-left">
|
|
9758
10011
|
<xsl:choose>
|
|
9759
10012
|
<xsl:when test="not(ancestor::*[local-name() = 'table'])"><xsl:value-of select="$note-body-indent"/></xsl:when>
|
|
@@ -9763,7 +10016,7 @@
|
|
|
9763
10016
|
|
|
9764
10017
|
<xsl:call-template name="refine_list_container_style"/>
|
|
9765
10018
|
|
|
9766
|
-
<fo:block-container margin-left="0mm">
|
|
10019
|
+
<fo:block-container margin-left="0mm" role="SKIP">
|
|
9767
10020
|
<fo:block>
|
|
9768
10021
|
<xsl:apply-templates select="." mode="list"/>
|
|
9769
10022
|
</fo:block>
|
|
@@ -9772,11 +10025,11 @@
|
|
|
9772
10025
|
</xsl:when>
|
|
9773
10026
|
<xsl:otherwise>
|
|
9774
10027
|
|
|
9775
|
-
<fo:block-container>
|
|
10028
|
+
<fo:block-container role="SKIP">
|
|
9776
10029
|
<xsl:if test="ancestor::jis:ol or ancestor::jis:ul">
|
|
9777
10030
|
<xsl:attribute name="margin-left">3.5mm</xsl:attribute>
|
|
9778
10031
|
</xsl:if>
|
|
9779
|
-
<fo:block-container margin-left="0mm">
|
|
10032
|
+
<fo:block-container margin-left="0mm" role="SKIP">
|
|
9780
10033
|
<fo:block>
|
|
9781
10034
|
<xsl:apply-templates select="." mode="list"/>
|
|
9782
10035
|
</fo:block>
|
|
@@ -9871,7 +10124,7 @@
|
|
|
9871
10124
|
<xsl:call-template name="refine_list-item-style"/>
|
|
9872
10125
|
|
|
9873
10126
|
<fo:list-item-label end-indent="label-end()">
|
|
9874
|
-
<fo:block xsl:use-attribute-sets="list-item-label-style">
|
|
10127
|
+
<fo:block xsl:use-attribute-sets="list-item-label-style" role="SKIP">
|
|
9875
10128
|
|
|
9876
10129
|
<xsl:call-template name="refine_list-item-label-style"/>
|
|
9877
10130
|
|
|
@@ -9885,7 +10138,7 @@
|
|
|
9885
10138
|
</fo:block>
|
|
9886
10139
|
</fo:list-item-label>
|
|
9887
10140
|
<fo:list-item-body start-indent="body-start()" xsl:use-attribute-sets="list-item-body-style">
|
|
9888
|
-
<fo:block>
|
|
10141
|
+
<fo:block role="SKIP">
|
|
9889
10142
|
|
|
9890
10143
|
<xsl:call-template name="refine_list-item-body-style"/>
|
|
9891
10144
|
|
|
@@ -10164,10 +10417,10 @@
|
|
|
10164
10417
|
<fo:table-body>
|
|
10165
10418
|
<fo:table-row text-align="center" font-weight="bold" background-color="black" color="white">
|
|
10166
10419
|
|
|
10167
|
-
<fo:table-cell border="1pt solid black"><fo:block>Date</fo:block></fo:table-cell>
|
|
10168
|
-
<fo:table-cell border="1pt solid black"><fo:block>Type</fo:block></fo:table-cell>
|
|
10169
|
-
<fo:table-cell border="1pt solid black"><fo:block>Change</fo:block></fo:table-cell>
|
|
10170
|
-
<fo:table-cell border="1pt solid black"><fo:block>Pages</fo:block></fo:table-cell>
|
|
10420
|
+
<fo:table-cell border="1pt solid black"><fo:block role="SKIP">Date</fo:block></fo:table-cell>
|
|
10421
|
+
<fo:table-cell border="1pt solid black"><fo:block role="SKIP">Type</fo:block></fo:table-cell>
|
|
10422
|
+
<fo:table-cell border="1pt solid black"><fo:block role="SKIP">Change</fo:block></fo:table-cell>
|
|
10423
|
+
<fo:table-cell border="1pt solid black"><fo:block role="SKIP">Pages</fo:block></fo:table-cell>
|
|
10171
10424
|
</fo:table-row>
|
|
10172
10425
|
<xsl:apply-templates/>
|
|
10173
10426
|
</fo:table-body>
|
|
@@ -10182,7 +10435,7 @@
|
|
|
10182
10435
|
|
|
10183
10436
|
<xsl:template match="*[local-name() = 'errata']/*[local-name() = 'row']/*">
|
|
10184
10437
|
<fo:table-cell border="1pt solid black" padding-left="1mm" padding-top="0.5mm">
|
|
10185
|
-
<fo:block><xsl:apply-templates/></fo:block>
|
|
10438
|
+
<fo:block role="SKIP"><xsl:apply-templates/></fo:block>
|
|
10186
10439
|
</fo:table-cell>
|
|
10187
10440
|
</xsl:template>
|
|
10188
10441
|
<!-- ============ -->
|
|
@@ -10197,7 +10450,10 @@
|
|
|
10197
10450
|
<!-- Reference sections (Normative References and Bibliography) -->
|
|
10198
10451
|
<!-- ========================================================== -->
|
|
10199
10452
|
<xsl:template match="*[local-name() = 'references'][@hidden='true']" priority="3"/>
|
|
10200
|
-
<xsl:template match="*[local-name() = 'bibitem'][@hidden='true']" priority="3"
|
|
10453
|
+
<xsl:template match="*[local-name() = 'bibitem'][@hidden='true']" priority="3">
|
|
10454
|
+
<xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][local-name() = 'bibitem'] and 1 = 1)"/>
|
|
10455
|
+
|
|
10456
|
+
</xsl:template>
|
|
10201
10457
|
<!-- don't display bibitem with @id starts with '_hidden', that was introduced for references integrity -->
|
|
10202
10458
|
<xsl:template match="*[local-name() = 'bibitem'][starts-with(@id, 'hidden_bibitem_')]" priority="3"/>
|
|
10203
10459
|
|
|
@@ -10248,8 +10504,8 @@
|
|
|
10248
10504
|
<!-- Normative references -->
|
|
10249
10505
|
<xsl:template match="*[local-name() = 'references'][@normative='true']/*[local-name() = 'bibitem']" name="bibitem" priority="2">
|
|
10250
10506
|
|
|
10251
|
-
<fo:block-container margin-left="6mm">
|
|
10252
|
-
<fo:block-container margin-left="0mm">
|
|
10507
|
+
<fo:block-container margin-left="6mm" role="SKIP">
|
|
10508
|
+
<fo:block-container margin-left="0mm" role="SKIP">
|
|
10253
10509
|
<fo:block id="{@id}" xsl:use-attribute-sets="bibitem-normative-style">
|
|
10254
10510
|
<xsl:call-template name="processBibitem"/>
|
|
10255
10511
|
</fo:block>
|
|
@@ -10260,15 +10516,15 @@
|
|
|
10260
10516
|
|
|
10261
10517
|
<!-- Bibliography (non-normative references) -->
|
|
10262
10518
|
<xsl:template match="*[local-name() = 'references'][not(@normative='true')]/*[local-name() = 'bibitem']" name="bibitem_non_normative" priority="2">
|
|
10263
|
-
|
|
10519
|
+
<xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][local-name() = 'bibitem'] and 1 = 1)"/> <!-- current bibiitem is non-first -->
|
|
10264
10520
|
<!-- $namespace = 'csd' or $namespace = 'gb' or $namespace = 'iec' or $namespace = 'ieee' or $namespace = 'iso' or $namespace = 'jcgm' or $namespace = 'm3d' or
|
|
10265
10521
|
$namespace = 'mpfd' or $namespace = 'ogc' or $namespace = 'ogc-white-paper' -->
|
|
10266
10522
|
<!-- Example: [1] ISO 9:1995, Information and documentation – Transliteration of Cyrillic characters into Latin characters – Slavic and non-Slavic languages -->
|
|
10267
10523
|
<fo:list-block id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-list-style">
|
|
10268
10524
|
<fo:list-item>
|
|
10269
10525
|
<fo:list-item-label end-indent="label-end()">
|
|
10270
|
-
<fo:block>
|
|
10271
|
-
<fo:inline>
|
|
10526
|
+
<fo:block role="SKIP">
|
|
10527
|
+
<fo:inline role="SKIP">
|
|
10272
10528
|
|
|
10273
10529
|
<xsl:apply-templates select="*[local-name() = 'biblio-tag']">
|
|
10274
10530
|
<xsl:with-param name="biblio_tag_part">first</xsl:with-param>
|
|
@@ -10277,7 +10533,7 @@
|
|
|
10277
10533
|
</fo:block>
|
|
10278
10534
|
</fo:list-item-label>
|
|
10279
10535
|
<fo:list-item-body start-indent="body-start()">
|
|
10280
|
-
<fo:block xsl:use-attribute-sets="bibitem-non-normative-list-body-style">
|
|
10536
|
+
<fo:block xsl:use-attribute-sets="bibitem-non-normative-list-body-style" role="SKIP">
|
|
10281
10537
|
<xsl:call-template name="processBibitem">
|
|
10282
10538
|
<xsl:with-param name="biblio_tag_part">last</xsl:with-param>
|
|
10283
10539
|
</xsl:call-template>
|
|
@@ -10288,6 +10544,35 @@
|
|
|
10288
10544
|
|
|
10289
10545
|
</xsl:template> <!-- references[not(@normative='true')]/bibitem -->
|
|
10290
10546
|
|
|
10547
|
+
<xsl:template name="insertListItem_Bibitem">
|
|
10548
|
+
<xsl:choose>
|
|
10549
|
+
<xsl:when test="@hidden = 'true'"><!-- skip --></xsl:when>
|
|
10550
|
+
<xsl:otherwise>
|
|
10551
|
+
<fo:list-item id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-list-item-style">
|
|
10552
|
+
<fo:list-item-label end-indent="label-end()">
|
|
10553
|
+
<fo:block role="SKIP">
|
|
10554
|
+
<fo:inline role="SKIP">
|
|
10555
|
+
<xsl:apply-templates select="*[local-name() = 'biblio-tag']">
|
|
10556
|
+
<xsl:with-param name="biblio_tag_part">first</xsl:with-param>
|
|
10557
|
+
</xsl:apply-templates>
|
|
10558
|
+
</fo:inline>
|
|
10559
|
+
</fo:block>
|
|
10560
|
+
</fo:list-item-label>
|
|
10561
|
+
<fo:list-item-body start-indent="body-start()">
|
|
10562
|
+
<fo:block xsl:use-attribute-sets="bibitem-non-normative-list-body-style" role="SKIP">
|
|
10563
|
+
<xsl:call-template name="processBibitem">
|
|
10564
|
+
<xsl:with-param name="biblio_tag_part">last</xsl:with-param>
|
|
10565
|
+
</xsl:call-template>
|
|
10566
|
+
</fo:block>
|
|
10567
|
+
</fo:list-item-body>
|
|
10568
|
+
</fo:list-item>
|
|
10569
|
+
</xsl:otherwise>
|
|
10570
|
+
</xsl:choose>
|
|
10571
|
+
<xsl:apply-templates select="following-sibling::*[1][local-name() = 'bibitem']">
|
|
10572
|
+
<xsl:with-param name="skip">false</xsl:with-param>
|
|
10573
|
+
</xsl:apply-templates>
|
|
10574
|
+
</xsl:template>
|
|
10575
|
+
|
|
10291
10576
|
<xsl:template name="processBibitem">
|
|
10292
10577
|
<xsl:param name="biblio_tag_part">both</xsl:param>
|
|
10293
10578
|
|
|
@@ -10498,7 +10783,7 @@
|
|
|
10498
10783
|
<xsl:for-each select="*[local-name() = 'tab']">
|
|
10499
10784
|
<xsl:variable name="current_id" select="generate-id()"/>
|
|
10500
10785
|
<fo:table-cell>
|
|
10501
|
-
<fo:block line-height-shift-adjustment="disregard-shifts">
|
|
10786
|
+
<fo:block line-height-shift-adjustment="disregard-shifts" role="SKIP">
|
|
10502
10787
|
<xsl:call-template name="insert_basic_link">
|
|
10503
10788
|
<xsl:with-param name="element">
|
|
10504
10789
|
<fo:basic-link internal-destination="{$target}" fox:alt-text="{.}">
|
|
@@ -10516,7 +10801,7 @@
|
|
|
10516
10801
|
</xsl:for-each>
|
|
10517
10802
|
<!-- last column - for page numbers -->
|
|
10518
10803
|
<fo:table-cell text-align="right" font-size="10pt" font-weight="bold" font-family="Arial">
|
|
10519
|
-
<fo:block>
|
|
10804
|
+
<fo:block role="SKIP">
|
|
10520
10805
|
<xsl:call-template name="insert_basic_link">
|
|
10521
10806
|
<xsl:with-param name="element">
|
|
10522
10807
|
<fo:basic-link internal-destination="{$target}" fox:alt-text="{.}">
|
|
@@ -10620,9 +10905,9 @@
|
|
|
10620
10905
|
|
|
10621
10906
|
<xsl:call-template name="setBlockSpanAll"/>
|
|
10622
10907
|
|
|
10623
|
-
<fo:block-container xsl:use-attribute-sets="admonition-container-style">
|
|
10908
|
+
<fo:block-container xsl:use-attribute-sets="admonition-container-style" role="SKIP">
|
|
10624
10909
|
|
|
10625
|
-
<fo:block-container margin-left="0mm" margin-right="0mm">
|
|
10910
|
+
<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
|
|
10626
10911
|
<fo:block>
|
|
10627
10912
|
<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
|
|
10628
10913
|
</fo:block>
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: metanorma-jis
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.0.
|
|
4
|
+
version: 0.0.9
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Ribose Inc.
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2023-
|
|
11
|
+
date: 2023-07-07 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: metanorma-iso
|