metanorma-iso 2.4.6 → 2.4.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/isodoc/iso/html/style-human.css +15 -11
- data/lib/isodoc/iso/html/style-human.scss +8 -8
- data/lib/isodoc/iso/html/style-iso.css +26 -22
- data/lib/isodoc/iso/html/style-iso.scss +19 -19
- data/lib/isodoc/iso/i18n-en.yaml +6 -0
- data/lib/isodoc/iso/i18n-fr.yaml +6 -0
- data/lib/isodoc/iso/i18n-ja.yaml +1 -0
- data/lib/isodoc/iso/i18n-ru.yaml +6 -0
- data/lib/isodoc/iso/i18n-zh-Hans.yaml +3 -0
- data/lib/isodoc/iso/iso.amendment.xsl +370 -227
- data/lib/isodoc/iso/iso.international-standard.xsl +370 -227
- data/lib/metanorma/iso/front.rb +18 -3
- data/lib/metanorma/iso/front_id.rb +6 -45
- data/lib/metanorma/iso/validate.rb +0 -16
- data/lib/metanorma/iso/version.rb +1 -1
- metadata +2 -2
|
@@ -517,13 +517,13 @@
|
|
|
517
517
|
<xsl:when test="$stage-abbreviation != ''">
|
|
518
518
|
<fo:page-sequence master-reference="cover-page-publishedISO" force-page-count="no-force">
|
|
519
519
|
<fo:static-content flow-name="cover-page-footer" font-size="10pt">
|
|
520
|
-
<fo:table table-layout="fixed" width="100%">
|
|
520
|
+
<fo:table table-layout="fixed" width="100%" role="SKIP">
|
|
521
521
|
<fo:table-column column-width="52mm"/>
|
|
522
522
|
<fo:table-column column-width="7.5mm"/>
|
|
523
523
|
<fo:table-column column-width="112.5mm"/>
|
|
524
|
-
<fo:table-body>
|
|
525
|
-
<fo:table-row>
|
|
526
|
-
<fo:table-cell font-size="6.5pt" text-align="justify" display-align="after" padding-bottom="8mm">
|
|
524
|
+
<fo:table-body role="SKIP">
|
|
525
|
+
<fo:table-row role="SKIP">
|
|
526
|
+
<fo:table-cell font-size="6.5pt" text-align="justify" display-align="after" padding-bottom="8mm" role="SKIP">
|
|
527
527
|
<xsl:if test="$stage-abbreviation = 'DAmd' or $stage-abbreviation = 'DAM'">
|
|
528
528
|
<xsl:attribute name="font-size">7pt</xsl:attribute>
|
|
529
529
|
</xsl:if>
|
|
@@ -555,11 +555,11 @@
|
|
|
555
555
|
</xsl:if>
|
|
556
556
|
</fo:block>
|
|
557
557
|
</fo:table-cell>
|
|
558
|
-
<fo:table-cell>
|
|
559
|
-
<fo:block> </fo:block>
|
|
558
|
+
<fo:table-cell role="SKIP">
|
|
559
|
+
<fo:block role="SKIP"><fo:wrapper role="artifact"> </fo:wrapper></fo:block>
|
|
560
560
|
</fo:table-cell>
|
|
561
|
-
<fo:table-cell display-align="after" padding-bottom="3mm">
|
|
562
|
-
<fo:block-container height="22.5mm" display-align="center">
|
|
561
|
+
<fo:table-cell display-align="after" padding-bottom="3mm" role="SKIP">
|
|
562
|
+
<fo:block-container height="22.5mm" display-align="center" role="SKIP">
|
|
563
563
|
|
|
564
564
|
<xsl:variable name="iso-fast-track">false</xsl:variable>
|
|
565
565
|
|
|
@@ -577,7 +577,7 @@
|
|
|
577
577
|
</xsl:for-each>
|
|
578
578
|
</xsl:variable>
|
|
579
579
|
<xsl:if test="normalize-space($text) != ''">
|
|
580
|
-
<fo:block-container margin-left="1mm"> <!-- margin-bottom="7mm" margin-top="-15mm" -->
|
|
580
|
+
<fo:block-container margin-left="1mm" role="SKIP"> <!-- margin-bottom="7mm" margin-top="-15mm" -->
|
|
581
581
|
<fo:block font-size="9pt" border="0.5pt solid black" fox:border-radius="5pt" padding-left="2mm" padding-top="2mm" padding-bottom="2mm">
|
|
582
582
|
<!-- <xsl:text>This document is circulated as received from the committee secretariat.</xsl:text> -->
|
|
583
583
|
<xsl:copy-of select="xalan:nodeset($text)/node()"/>
|
|
@@ -586,9 +586,9 @@
|
|
|
586
586
|
</xsl:if>
|
|
587
587
|
|
|
588
588
|
<xsl:if test="normalize-space($iso-fast-track) = 'true'">
|
|
589
|
-
<fo:block-container space-before="2mm">
|
|
590
|
-
<fo:block background-color="rgb(77,77,77)" color="white" fox:border-radius="5pt" text-align="center" display-align="center" font-size="19pt" font-weight="bold">
|
|
591
|
-
<fo:block-container height="13.2mm">
|
|
589
|
+
<fo:block-container space-before="2mm" role="SKIP">
|
|
590
|
+
<fo:block background-color="rgb(77,77,77)" color="white" fox:border-radius="5pt" text-align="center" display-align="center" font-size="19pt" font-weight="bold" role="SKIP">
|
|
591
|
+
<fo:block-container height="13.2mm" role="SKIP">
|
|
592
592
|
<fo:block>
|
|
593
593
|
<xsl:text>FAST TRACK PROCEDURE</xsl:text>
|
|
594
594
|
</fo:block>
|
|
@@ -599,14 +599,14 @@
|
|
|
599
599
|
</xsl:if>
|
|
600
600
|
</fo:block>
|
|
601
601
|
</fo:block-container>
|
|
602
|
-
<fo:block>
|
|
602
|
+
<fo:block role="SKIP">
|
|
603
603
|
<xsl:call-template name="insertTripleLine"/>
|
|
604
|
-
<fo:table table-layout="fixed" width="100%"> <!-- margin-bottom="3mm" -->
|
|
604
|
+
<fo:table table-layout="fixed" width="100%" role="SKIP"> <!-- margin-bottom="3mm" -->
|
|
605
605
|
<fo:table-column column-width="50%"/>
|
|
606
606
|
<fo:table-column column-width="50%"/>
|
|
607
|
-
<fo:table-body>
|
|
608
|
-
<fo:table-row height="34mm">
|
|
609
|
-
<fo:table-cell display-align="center">
|
|
607
|
+
<fo:table-body role="SKIP">
|
|
608
|
+
<fo:table-row height="34mm" role="SKIP">
|
|
609
|
+
<fo:table-cell display-align="center" role="SKIP">
|
|
610
610
|
|
|
611
611
|
<xsl:if test="$copyrightAbbrIEEE != ''">
|
|
612
612
|
<xsl:attribute name="display-align">before</xsl:attribute>
|
|
@@ -638,7 +638,7 @@
|
|
|
638
638
|
<xsl:otherwise/>
|
|
639
639
|
</xsl:choose>
|
|
640
640
|
<xsl:if test="position() != last()">
|
|
641
|
-
<fo:inline padding-right="1mm"> </fo:inline>
|
|
641
|
+
<fo:inline padding-right="1mm" role="SKIP"> </fo:inline>
|
|
642
642
|
</xsl:if>
|
|
643
643
|
</xsl:for-each>
|
|
644
644
|
<xsl:if test="$copyrightAbbrIEEE != ''">
|
|
@@ -648,8 +648,8 @@
|
|
|
648
648
|
</xsl:if>
|
|
649
649
|
</fo:block>
|
|
650
650
|
</fo:table-cell>
|
|
651
|
-
<fo:table-cell display-align="center">
|
|
652
|
-
<fo:block text-align="right">
|
|
651
|
+
<fo:table-cell display-align="center" role="SKIP">
|
|
652
|
+
<fo:block text-align="right" role="SKIP">
|
|
653
653
|
<!-- Reference number -->
|
|
654
654
|
<fo:block>
|
|
655
655
|
<xsl:call-template name="getLocalizedString">
|
|
@@ -686,7 +686,7 @@
|
|
|
686
686
|
<!-- COVER PAGE for DIS document only -->
|
|
687
687
|
<xsl:when test="$stage-abbreviation = 'DIS' or $stage-abbreviation = 'DAmd' or $stage-abbreviation = 'DAM'">
|
|
688
688
|
<fo:flow flow-name="xsl-region-body">
|
|
689
|
-
<fo:block-container>
|
|
689
|
+
<fo:block-container role="SKIP">
|
|
690
690
|
<fo:block margin-top="-1mm" font-size="20pt" text-align="right">
|
|
691
691
|
<xsl:value-of select="$stage-fullname-uppercased"/>
|
|
692
692
|
</fo:block>
|
|
@@ -719,10 +719,20 @@
|
|
|
719
719
|
<fo:block> </fo:block>
|
|
720
720
|
</fo:table-cell>
|
|
721
721
|
<fo:table-cell>
|
|
722
|
-
<fo:block>
|
|
722
|
+
<fo:block>
|
|
723
|
+
<!-- Voting begins on: -->
|
|
724
|
+
<xsl:call-template name="getLocalizedString">
|
|
725
|
+
<xsl:with-param name="key">voting_begins_on</xsl:with-param>
|
|
726
|
+
</xsl:call-template><xsl:text>:</xsl:text>
|
|
727
|
+
</fo:block>
|
|
723
728
|
</fo:table-cell>
|
|
724
729
|
<fo:table-cell>
|
|
725
|
-
<fo:block>
|
|
730
|
+
<fo:block>
|
|
731
|
+
<!-- Voting terminates on: -->
|
|
732
|
+
<xsl:call-template name="getLocalizedString">
|
|
733
|
+
<xsl:with-param name="key">voting_terminates_on</xsl:with-param>
|
|
734
|
+
</xsl:call-template><xsl:text>:</xsl:text>
|
|
735
|
+
</fo:block>
|
|
726
736
|
</fo:table-cell>
|
|
727
737
|
</fo:table-row>
|
|
728
738
|
<fo:table-row>
|
|
@@ -753,9 +763,9 @@
|
|
|
753
763
|
</fo:table-body>
|
|
754
764
|
</fo:table>
|
|
755
765
|
|
|
756
|
-
<fo:block-container line-height="1.1" margin-top="3mm">
|
|
766
|
+
<fo:block-container line-height="1.1" margin-top="3mm" role="SKIP">
|
|
757
767
|
<xsl:call-template name="insertTripleLine"/>
|
|
758
|
-
<fo:block margin-right="5mm">
|
|
768
|
+
<fo:block margin-right="5mm" role="SKIP">
|
|
759
769
|
<fo:block font-size="18pt" font-weight="bold" margin-top="6pt" role="H1">
|
|
760
770
|
|
|
761
771
|
<xsl:apply-templates select="/iso:iso-standard/iso:bibdata/iso:title[@language = $lang and @type = 'title-intro']"/>
|
|
@@ -775,7 +785,7 @@
|
|
|
775
785
|
<xsl:for-each select="xalan:nodeset($lang_other)/lang">
|
|
776
786
|
<xsl:variable name="lang_other" select="."/>
|
|
777
787
|
|
|
778
|
-
<fo:block font-size="12pt"><xsl:value-of select="$linebreak"/></fo:block>
|
|
788
|
+
<fo:block font-size="12pt" role="SKIP"><xsl:value-of select="$linebreak"/></fo:block>
|
|
779
789
|
<fo:block font-size="11pt" font-style="italic" line-height="1.1" role="H1">
|
|
780
790
|
|
|
781
791
|
<!-- Example: title-intro fr -->
|
|
@@ -809,14 +819,14 @@
|
|
|
809
819
|
|
|
810
820
|
<!-- COVER PAGE for all documents except DIS, DAmd and DAM -->
|
|
811
821
|
<fo:flow flow-name="xsl-region-body">
|
|
812
|
-
<fo:block-container>
|
|
813
|
-
<fo:table table-layout="fixed" width="100%" font-size="24pt" line-height="1"> <!-- margin-bottom="35mm" -->
|
|
822
|
+
<fo:block-container role="SKIP">
|
|
823
|
+
<fo:table table-layout="fixed" width="100%" font-size="24pt" line-height="1" role="SKIP"> <!-- margin-bottom="35mm" -->
|
|
814
824
|
<fo:table-column column-width="59.5mm"/>
|
|
815
825
|
<fo:table-column column-width="67.5mm"/>
|
|
816
826
|
<fo:table-column column-width="45.5mm"/>
|
|
817
|
-
<fo:table-body>
|
|
818
|
-
<fo:table-row>
|
|
819
|
-
<fo:table-cell>
|
|
827
|
+
<fo:table-body role="SKIP">
|
|
828
|
+
<fo:table-row role="SKIP">
|
|
829
|
+
<fo:table-cell role="SKIP">
|
|
820
830
|
<fo:block font-size="18pt">
|
|
821
831
|
|
|
822
832
|
<xsl:value-of select="translate($stagename-header-coverpage, ' ', $linebreak)"/>
|
|
@@ -840,7 +850,7 @@
|
|
|
840
850
|
</xsl:variable>
|
|
841
851
|
<xsl:variable name="font-size"><xsl:if test="string-length($lastWord) >= 12">90%</xsl:if></xsl:variable> <!-- to prevent overlapping 'NORME INTERNATIONALE' to number -->
|
|
842
852
|
|
|
843
|
-
<fo:table-cell>
|
|
853
|
+
<fo:table-cell role="SKIP">
|
|
844
854
|
<fo:block text-align="left">
|
|
845
855
|
<xsl:choose>
|
|
846
856
|
<xsl:when test="$stage-abbreviation = 'FDAmd' or $stage-abbreviation = 'FDAM'"><xsl:value-of select="$doctype_uppercased"/></xsl:when>
|
|
@@ -856,7 +866,7 @@
|
|
|
856
866
|
</xsl:choose>
|
|
857
867
|
</fo:block>
|
|
858
868
|
</fo:table-cell>
|
|
859
|
-
<fo:table-cell>
|
|
869
|
+
<fo:table-cell role="SKIP">
|
|
860
870
|
<fo:block text-align="right" font-weight="bold" margin-bottom="13mm">
|
|
861
871
|
<xsl:if test="$font-size != ''">
|
|
862
872
|
<xsl:attribute name="font-size"><xsl:value-of select="$font-size"/></xsl:attribute>
|
|
@@ -865,8 +875,8 @@
|
|
|
865
875
|
</fo:block>
|
|
866
876
|
</fo:table-cell>
|
|
867
877
|
</fo:table-row>
|
|
868
|
-
<fo:table-row height="25mm">
|
|
869
|
-
<fo:table-cell number-columns-spanned="3" font-size="10pt" line-height="1.2">
|
|
878
|
+
<fo:table-row height="25mm" role="SKIP">
|
|
879
|
+
<fo:table-cell number-columns-spanned="3" font-size="10pt" line-height="1.2" role="SKIP">
|
|
870
880
|
<fo:block text-align="right">
|
|
871
881
|
<xsl:if test="$stage-abbreviation = 'PRF' or $stage-abbreviation = 'IS' or $stage-abbreviation = 'D' or $stage-abbreviation = 'published'">
|
|
872
882
|
<xsl:call-template name="printEdition"/>
|
|
@@ -893,7 +903,7 @@
|
|
|
893
903
|
<!-- <xsl:value-of select="$linebreak"/>
|
|
894
904
|
<xsl:value-of select="/iso:iso-standard/iso:bibdata/iso:version/iso:revision-date"/> -->
|
|
895
905
|
<xsl:if test="$doctype = 'amendment' and not($stage-abbreviation = 'FDAmd' or $stage-abbreviation = 'FDAM')">
|
|
896
|
-
<fo:block text-align="right" margin-right="0.5mm">
|
|
906
|
+
<fo:block text-align="right" margin-right="0.5mm" role="SKIP">
|
|
897
907
|
<fo:block font-weight="bold" margin-top="4pt" role="H1">
|
|
898
908
|
<xsl:value-of select="$doctype_uppercased"/>
|
|
899
909
|
<xsl:text> </xsl:text>
|
|
@@ -911,22 +921,22 @@
|
|
|
911
921
|
</xsl:if>
|
|
912
922
|
</fo:table-cell>
|
|
913
923
|
</fo:table-row>
|
|
914
|
-
<fo:table-row height="17mm">
|
|
915
|
-
<fo:table-cell><fo:block/></fo:table-cell>
|
|
916
|
-
<fo:table-cell number-columns-spanned="2" font-size="10pt" line-height="1.2" display-align="center">
|
|
917
|
-
<fo:block>
|
|
924
|
+
<fo:table-row height="17mm" role="SKIP">
|
|
925
|
+
<fo:table-cell role="SKIP"><fo:block role="SKIP"/></fo:table-cell>
|
|
926
|
+
<fo:table-cell number-columns-spanned="2" font-size="10pt" line-height="1.2" display-align="center" role="SKIP">
|
|
927
|
+
<fo:block role="SKIP">
|
|
918
928
|
<xsl:if test="$stage-abbreviation = 'NWIP' or $stage-abbreviation = 'NP' or $stage-abbreviation = 'PWI' or $stage-abbreviation = 'AWI' or $stage-abbreviation = 'WD' or $stage-abbreviation = 'CD' or $stage-abbreviation = 'FDIS'">
|
|
919
|
-
<fo:table table-layout="fixed" width="100%">
|
|
929
|
+
<fo:table table-layout="fixed" width="100%" role="SKIP">
|
|
920
930
|
<fo:table-column column-width="50%"/>
|
|
921
931
|
<fo:table-column column-width="50%"/>
|
|
922
|
-
<fo:table-body>
|
|
923
|
-
<fo:table-row>
|
|
924
|
-
<fo:table-cell>
|
|
932
|
+
<fo:table-body role="SKIP">
|
|
933
|
+
<fo:table-row role="SKIP">
|
|
934
|
+
<fo:table-cell role="SKIP">
|
|
925
935
|
<fo:block>
|
|
926
936
|
<xsl:copy-of select="$editorialgroup"/>
|
|
927
937
|
</fo:block>
|
|
928
938
|
</fo:table-cell>
|
|
929
|
-
<fo:table-cell>
|
|
939
|
+
<fo:table-cell role="SKIP">
|
|
930
940
|
<fo:block>
|
|
931
941
|
<xsl:copy-of select="$secretariat"/>
|
|
932
942
|
</fo:block>
|
|
@@ -942,20 +952,25 @@
|
|
|
942
952
|
</fo:table-body>
|
|
943
953
|
</fo:table>
|
|
944
954
|
|
|
945
|
-
<fo:table table-layout="fixed" width="100%">
|
|
955
|
+
<fo:table table-layout="fixed" width="100%" role="SKIP">
|
|
946
956
|
<fo:table-column column-width="52mm"/>
|
|
947
957
|
<fo:table-column column-width="7.5mm"/>
|
|
948
958
|
<fo:table-column column-width="112.5mm"/>
|
|
949
|
-
<fo:table-body>
|
|
950
|
-
<fo:table-row> <!-- border="1pt solid black" height="150mm" -->
|
|
951
|
-
<fo:table-cell font-size="11pt">
|
|
952
|
-
<fo:block>
|
|
959
|
+
<fo:table-body role="SKIP">
|
|
960
|
+
<fo:table-row role="SKIP"> <!-- border="1pt solid black" height="150mm" -->
|
|
961
|
+
<fo:table-cell font-size="11pt" role="SKIP">
|
|
962
|
+
<fo:block role="SKIP">
|
|
953
963
|
<xsl:if test="$stage-abbreviation = 'FDIS' or $stage-abbreviation = 'FDAmd' or $stage-abbreviation = 'FDAM'">
|
|
954
|
-
<fo:block-container border="0.5mm solid black" width="51mm">
|
|
955
|
-
<fo:block margin="2mm">
|
|
964
|
+
<fo:block-container border="0.5mm solid black" width="51mm" role="SKIP">
|
|
965
|
+
<fo:block margin="2mm" role="SKIP">
|
|
956
966
|
<fo:block margin-bottom="8pt"><xsl:copy-of select="$editorialgroup"/></fo:block>
|
|
957
967
|
<fo:block margin-bottom="6pt"><xsl:copy-of select="$secretariat"/></fo:block>
|
|
958
|
-
<fo:block margin-bottom="6pt">
|
|
968
|
+
<fo:block margin-bottom="6pt">
|
|
969
|
+
<!-- Voting begins on: -->
|
|
970
|
+
<xsl:call-template name="getLocalizedString">
|
|
971
|
+
<xsl:with-param name="key">voting_begins_on</xsl:with-param>
|
|
972
|
+
</xsl:call-template><xsl:text>:</xsl:text>
|
|
973
|
+
<xsl:value-of select="$linebreak"/>
|
|
959
974
|
<fo:inline font-weight="bold">
|
|
960
975
|
<xsl:choose>
|
|
961
976
|
<xsl:when test="/iso:iso-standard/iso:bibdata/iso:date[@type = 'vote-started']/iso:on">
|
|
@@ -965,7 +980,12 @@
|
|
|
965
980
|
</xsl:choose>
|
|
966
981
|
</fo:inline>
|
|
967
982
|
</fo:block>
|
|
968
|
-
<fo:block>
|
|
983
|
+
<fo:block>
|
|
984
|
+
<!-- Voting terminates on: -->
|
|
985
|
+
<xsl:call-template name="getLocalizedString">
|
|
986
|
+
<xsl:with-param name="key">voting_terminates_on</xsl:with-param>
|
|
987
|
+
</xsl:call-template><xsl:text>:</xsl:text>
|
|
988
|
+
<xsl:value-of select="$linebreak"/>
|
|
969
989
|
<fo:inline font-weight="bold">
|
|
970
990
|
<xsl:choose>
|
|
971
991
|
<xsl:when test="/iso:iso-standard/iso:bibdata/iso:date[@type = 'vote-ended']/iso:on">
|
|
@@ -980,13 +1000,13 @@
|
|
|
980
1000
|
</xsl:if>
|
|
981
1001
|
</fo:block>
|
|
982
1002
|
</fo:table-cell>
|
|
983
|
-
<fo:table-cell>
|
|
984
|
-
<fo:block> </fo:block>
|
|
1003
|
+
<fo:table-cell role="SKIP">
|
|
1004
|
+
<fo:block role="SKIP"><fo:wrapper role="artifact"> </fo:wrapper></fo:block>
|
|
985
1005
|
</fo:table-cell>
|
|
986
|
-
<fo:table-cell>
|
|
1006
|
+
<fo:table-cell role="SKIP">
|
|
987
1007
|
<xsl:call-template name="insertTripleLine"/>
|
|
988
|
-
<fo:block-container line-height="1.1">
|
|
989
|
-
<fo:block margin-right="3.5mm">
|
|
1008
|
+
<fo:block-container line-height="1.1" role="SKIP">
|
|
1009
|
+
<fo:block margin-right="3.5mm" role="SKIP">
|
|
990
1010
|
<fo:block font-size="18pt" font-weight="bold" margin-top="12pt" role="H1">
|
|
991
1011
|
|
|
992
1012
|
<xsl:apply-templates select="/iso:iso-standard/iso:bibdata/iso:title[@language = $lang and @type = 'title-intro']"/>
|
|
@@ -1007,7 +1027,7 @@
|
|
|
1007
1027
|
<xsl:for-each select="xalan:nodeset($lang_other)/lang">
|
|
1008
1028
|
<xsl:variable name="lang_other" select="."/>
|
|
1009
1029
|
|
|
1010
|
-
<fo:block font-size="12pt"><xsl:value-of select="$linebreak"/></fo:block>
|
|
1030
|
+
<fo:block font-size="12pt" role="SKIP"><xsl:value-of select="$linebreak"/></fo:block>
|
|
1011
1031
|
<fo:block font-size="11pt" font-style="italic" line-height="1.1" role="H1">
|
|
1012
1032
|
|
|
1013
1033
|
<!-- Example: title-intro fr -->
|
|
@@ -1040,8 +1060,8 @@
|
|
|
1040
1060
|
</fo:table-body>
|
|
1041
1061
|
</fo:table>
|
|
1042
1062
|
</fo:block-container>
|
|
1043
|
-
<fo:block-container position="absolute" left="60mm" top="222mm" height="25mm" display-align="after">
|
|
1044
|
-
<fo:block margin-bottom="2mm">
|
|
1063
|
+
<fo:block-container position="absolute" left="60mm" top="222mm" height="25mm" display-align="after" role="SKIP">
|
|
1064
|
+
<fo:block margin-bottom="2mm" role="SKIP">
|
|
1045
1065
|
<xsl:if test="$stage-abbreviation = 'PRF'">
|
|
1046
1066
|
<fo:block font-size="36pt" font-weight="bold" margin-left="1mm">
|
|
1047
1067
|
<xsl:call-template name="add-letter-spacing">
|
|
@@ -1063,26 +1083,26 @@
|
|
|
1063
1083
|
<fo:page-sequence master-reference="cover-page-published" force-page-count="no-force">
|
|
1064
1084
|
<fo:static-content flow-name="cover-page-footer" font-size="10pt">
|
|
1065
1085
|
<xsl:call-template name="insertTripleLine"/>
|
|
1066
|
-
<fo:table table-layout="fixed" width="100%" margin-bottom="3mm">
|
|
1086
|
+
<fo:table table-layout="fixed" width="100%" margin-bottom="3mm" role="SKIP">
|
|
1067
1087
|
<fo:table-column column-width="50%"/>
|
|
1068
1088
|
<fo:table-column column-width="50%"/>
|
|
1069
|
-
<fo:table-body>
|
|
1070
|
-
<fo:table-row height="32mm">
|
|
1071
|
-
<fo:table-cell display-align="center">
|
|
1089
|
+
<fo:table-body role="SKIP">
|
|
1090
|
+
<fo:table-row height="32mm" role="SKIP">
|
|
1091
|
+
<fo:table-cell display-align="center" role="SKIP">
|
|
1072
1092
|
<fo:block text-align="left">
|
|
1073
1093
|
<fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-ISO-Logo))}" width="21mm" content-height="21mm" content-width="scale-to-fit" scaling="uniform" fox:alt-text="Image {@alt}"/>
|
|
1074
1094
|
</fo:block>
|
|
1075
1095
|
</fo:table-cell>
|
|
1076
|
-
<fo:table-cell display-align="center">
|
|
1077
|
-
<fo:block text-align="right">
|
|
1096
|
+
<fo:table-cell display-align="center" role="SKIP">
|
|
1097
|
+
<fo:block text-align="right" role="SKIP">
|
|
1078
1098
|
<fo:block>
|
|
1079
1099
|
<xsl:call-template name="getLocalizedString">
|
|
1080
1100
|
<xsl:with-param name="key">reference_number</xsl:with-param>
|
|
1081
1101
|
</xsl:call-template>
|
|
1082
1102
|
</fo:block>
|
|
1083
1103
|
<fo:block><xsl:value-of select="$ISOname"/></fo:block>
|
|
1084
|
-
<fo:block> </fo:block>
|
|
1085
|
-
<fo:block> </fo:block>
|
|
1104
|
+
<fo:block role="SKIP"> </fo:block>
|
|
1105
|
+
<fo:block role="SKIP"> </fo:block>
|
|
1086
1106
|
<fo:block><fo:inline font-size="9pt">©</fo:inline><xsl:value-of select="concat(' ', $copyrightAbbr, ' ', $copyrightYear)"/>
|
|
1087
1107
|
<xsl:if test="$copyrightAbbrIEEE != ''">
|
|
1088
1108
|
<xsl:value-of select="$linebreak"/>
|
|
@@ -1097,25 +1117,25 @@
|
|
|
1097
1117
|
</fo:table>
|
|
1098
1118
|
</fo:static-content>
|
|
1099
1119
|
<fo:flow flow-name="xsl-region-body">
|
|
1100
|
-
<fo:block-container>
|
|
1101
|
-
<fo:table table-layout="fixed" width="100%" font-size="24pt" line-height="1" margin-bottom="35mm">
|
|
1120
|
+
<fo:block-container role="SKIP">
|
|
1121
|
+
<fo:table table-layout="fixed" width="100%" font-size="24pt" line-height="1" margin-bottom="35mm" role="SKIP">
|
|
1102
1122
|
<fo:table-column column-width="60%"/>
|
|
1103
1123
|
<fo:table-column column-width="40%"/>
|
|
1104
|
-
<fo:table-body>
|
|
1105
|
-
<fo:table-row>
|
|
1106
|
-
<fo:table-cell>
|
|
1124
|
+
<fo:table-body role="SKIP">
|
|
1125
|
+
<fo:table-row role="SKIP">
|
|
1126
|
+
<fo:table-cell role="SKIP">
|
|
1107
1127
|
<fo:block text-align="left">
|
|
1108
1128
|
<xsl:value-of select="$doctype_uppercased"/>
|
|
1109
1129
|
</fo:block>
|
|
1110
1130
|
</fo:table-cell>
|
|
1111
|
-
<fo:table-cell>
|
|
1131
|
+
<fo:table-cell role="SKIP">
|
|
1112
1132
|
<fo:block text-align="right" font-weight="bold" margin-bottom="13mm">
|
|
1113
1133
|
<xsl:value-of select="$docidentifierISO_with_break"/>
|
|
1114
1134
|
</fo:block>
|
|
1115
1135
|
</fo:table-cell>
|
|
1116
1136
|
</fo:table-row>
|
|
1117
|
-
<fo:table-row>
|
|
1118
|
-
<fo:table-cell number-columns-spanned="2" font-size="10pt" line-height="1.2">
|
|
1137
|
+
<fo:table-row role="SKIP">
|
|
1138
|
+
<fo:table-cell number-columns-spanned="2" font-size="10pt" line-height="1.2" role="SKIP">
|
|
1119
1139
|
<fo:block text-align="right">
|
|
1120
1140
|
<xsl:call-template name="printEdition"/>
|
|
1121
1141
|
<xsl:value-of select="$linebreak"/>
|
|
@@ -1126,8 +1146,8 @@
|
|
|
1126
1146
|
</fo:table>
|
|
1127
1147
|
|
|
1128
1148
|
<xsl:call-template name="insertTripleLine"/>
|
|
1129
|
-
<fo:block-container line-height="1.1">
|
|
1130
|
-
<fo:block margin-right="40mm">
|
|
1149
|
+
<fo:block-container line-height="1.1" role="SKIP">
|
|
1150
|
+
<fo:block margin-right="40mm" role="SKIP">
|
|
1131
1151
|
<fo:block font-size="18pt" font-weight="bold" margin-top="12pt" role="H1">
|
|
1132
1152
|
|
|
1133
1153
|
<xsl:apply-templates select="/iso:iso-standard/iso:bibdata/iso:title[@language = $lang and @type = 'title-intro']"/>
|
|
@@ -1143,7 +1163,7 @@
|
|
|
1143
1163
|
<xsl:for-each select="xalan:nodeset($lang_other)/lang">
|
|
1144
1164
|
<xsl:variable name="lang_other" select="."/>
|
|
1145
1165
|
|
|
1146
|
-
<fo:block font-size="12pt"><xsl:value-of select="$linebreak"/></fo:block>
|
|
1166
|
+
<fo:block font-size="12pt" role="SKIP"><xsl:value-of select="$linebreak"/></fo:block>
|
|
1147
1167
|
<fo:block font-size="11pt" font-style="italic" line-height="1.1" role="H1">
|
|
1148
1168
|
|
|
1149
1169
|
<!-- Example: title-intro fr -->
|
|
@@ -1173,7 +1193,7 @@
|
|
|
1173
1193
|
</fo:block-container>
|
|
1174
1194
|
</fo:static-content>
|
|
1175
1195
|
<fo:flow flow-name="xsl-region-body">
|
|
1176
|
-
<fo:block-container text-align="right">
|
|
1196
|
+
<fo:block-container text-align="right" role="SKIP">
|
|
1177
1197
|
<xsl:choose>
|
|
1178
1198
|
<xsl:when test="/iso:iso-standard/iso:bibdata/iso:docidentifier[@type = 'iso-tc']">
|
|
1179
1199
|
<!-- 17301 -->
|
|
@@ -1213,7 +1233,7 @@
|
|
|
1213
1233
|
</fo:block>
|
|
1214
1234
|
|
|
1215
1235
|
</fo:block-container>
|
|
1216
|
-
<fo:block-container font-size="16pt">
|
|
1236
|
+
<fo:block-container font-size="16pt" role="SKIP">
|
|
1217
1237
|
<!-- Information and documentation — Codes for transcription systems -->
|
|
1218
1238
|
<fo:block font-weight="bold" role="H1">
|
|
1219
1239
|
|
|
@@ -1230,7 +1250,7 @@
|
|
|
1230
1250
|
<xsl:for-each select="xalan:nodeset($lang_other)/lang">
|
|
1231
1251
|
<xsl:variable name="lang_other" select="."/>
|
|
1232
1252
|
|
|
1233
|
-
<fo:block font-size="12pt"><xsl:value-of select="$linebreak"/></fo:block>
|
|
1253
|
+
<fo:block font-size="12pt" role="SKIP"><xsl:value-of select="$linebreak"/></fo:block>
|
|
1234
1254
|
<fo:block role="H1">
|
|
1235
1255
|
|
|
1236
1256
|
<!-- Example: title-intro fr -->
|
|
@@ -1247,8 +1267,8 @@
|
|
|
1247
1267
|
</xsl:for-each>
|
|
1248
1268
|
|
|
1249
1269
|
</fo:block-container>
|
|
1250
|
-
<fo:block font-size="11pt" margin-bottom="8pt"><xsl:value-of select="$linebreak"/></fo:block>
|
|
1251
|
-
<fo:block-container font-size="40pt" text-align="center" margin-bottom="12pt" border="0.5pt solid black">
|
|
1270
|
+
<fo:block font-size="11pt" margin-bottom="8pt" role="SKIP"><xsl:value-of select="$linebreak"/></fo:block>
|
|
1271
|
+
<fo:block-container font-size="40pt" text-align="center" margin-bottom="12pt" border="0.5pt solid black" role="SKIP">
|
|
1252
1272
|
<xsl:variable name="stage-title" select="substring-after(substring-before($docidentifierISO, ' '), '/')"/>
|
|
1253
1273
|
<xsl:choose>
|
|
1254
1274
|
<xsl:when test="normalize-space($stage-title) != ''">
|
|
@@ -1256,14 +1276,14 @@
|
|
|
1256
1276
|
</xsl:when>
|
|
1257
1277
|
<xsl:otherwise>
|
|
1258
1278
|
<xsl:attribute name="border">0pt solid white</xsl:attribute>
|
|
1259
|
-
<fo:block> </fo:block>
|
|
1279
|
+
<fo:block role="SKIP"> </fo:block>
|
|
1260
1280
|
</xsl:otherwise>
|
|
1261
1281
|
</xsl:choose>
|
|
1262
1282
|
</fo:block-container>
|
|
1263
|
-
<fo:block><xsl:value-of select="$linebreak"/></fo:block>
|
|
1283
|
+
<fo:block role="SKIP"><xsl:value-of select="$linebreak"/></fo:block>
|
|
1264
1284
|
|
|
1265
1285
|
<xsl:if test="/iso:iso-standard/iso:boilerplate/iso:license-statement">
|
|
1266
|
-
<fo:block-container font-size="10pt" margin-top="12pt" margin-bottom="6pt" border="0.5pt solid black">
|
|
1286
|
+
<fo:block-container font-size="10pt" margin-top="12pt" margin-bottom="6pt" border="0.5pt solid black" role="SKIP">
|
|
1267
1287
|
<fo:block padding-top="1mm">
|
|
1268
1288
|
<xsl:apply-templates select="/iso:iso-standard/iso:boilerplate/iso:license-statement"/>
|
|
1269
1289
|
</fo:block>
|
|
@@ -1300,13 +1320,13 @@
|
|
|
1300
1320
|
<fo:flow flow-name="xsl-region-body" line-height="115%">
|
|
1301
1321
|
<xsl:if test="/iso:iso-standard/iso:boilerplate/iso:copyright-statement">
|
|
1302
1322
|
|
|
1303
|
-
<fo:block-container height="252mm" display-align="after">
|
|
1323
|
+
<fo:block-container height="252mm" display-align="after" role="SKIP">
|
|
1304
1324
|
<!-- <fo:block margin-bottom="3mm">
|
|
1305
1325
|
<fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-Attention))}" width="14mm" content-height="13mm" content-width="scale-to-fit" scaling="uniform" fox:alt-text="Image {@alt}"/>
|
|
1306
1326
|
<fo:inline padding-left="6mm" font-size="12pt" font-weight="bold"></fo:inline>
|
|
1307
1327
|
</fo:block> -->
|
|
1308
|
-
<fo:block line-height="90%">
|
|
1309
|
-
<fo:block font-size="9pt" text-align="justify">
|
|
1328
|
+
<fo:block line-height="90%" role="SKIP">
|
|
1329
|
+
<fo:block font-size="9pt" text-align="justify" role="SKIP">
|
|
1310
1330
|
<xsl:apply-templates select="/iso:iso-standard/iso:boilerplate/iso:copyright-statement"/>
|
|
1311
1331
|
</fo:block>
|
|
1312
1332
|
</fo:block>
|
|
@@ -1339,9 +1359,9 @@
|
|
|
1339
1359
|
<xsl:value-of select="$title-en"/>
|
|
1340
1360
|
</fo:block>
|
|
1341
1361
|
-->
|
|
1342
|
-
<fo:block font-size="18pt" font-weight="bold" margin-top="40pt" margin-bottom="20pt" line-height="1.1">
|
|
1362
|
+
<fo:block font-size="18pt" font-weight="bold" margin-top="40pt" margin-bottom="20pt" line-height="1.1" role="H1">
|
|
1343
1363
|
|
|
1344
|
-
<fo:block role="
|
|
1364
|
+
<fo:block role="SKIP">
|
|
1345
1365
|
|
|
1346
1366
|
<xsl:apply-templates select="/iso:iso-standard/iso:bibdata/iso:title[@language = $lang and @type = 'title-intro']"/>
|
|
1347
1367
|
|
|
@@ -1353,7 +1373,7 @@
|
|
|
1353
1373
|
</xsl:apply-templates>
|
|
1354
1374
|
|
|
1355
1375
|
</fo:block>
|
|
1356
|
-
<fo:block role="
|
|
1376
|
+
<fo:block role="SKIP">
|
|
1357
1377
|
<xsl:apply-templates select="/iso:iso-standard/iso:bibdata/iso:title[@language = $lang and @type = 'title-part']/node()"/>
|
|
1358
1378
|
</fo:block>
|
|
1359
1379
|
|
|
@@ -1377,7 +1397,7 @@
|
|
|
1377
1397
|
</xsl:otherwise>
|
|
1378
1398
|
</xsl:choose>
|
|
1379
1399
|
|
|
1380
|
-
<fo:block id="lastBlock" font-size="1pt"> </fo:block>
|
|
1400
|
+
<fo:block id="lastBlock" font-size="1pt" role="SKIP"> </fo:block>
|
|
1381
1401
|
</fo:block>
|
|
1382
1402
|
|
|
1383
1403
|
</fo:flow>
|
|
@@ -1446,8 +1466,8 @@
|
|
|
1446
1466
|
<xsl:if test="/iso:iso-standard/iso:bibdata/iso:keyword">
|
|
1447
1467
|
<fo:block font-size="9pt" margin-bottom="6pt">
|
|
1448
1468
|
<xsl:variable name="title-descriptors">
|
|
1449
|
-
<xsl:call-template name="
|
|
1450
|
-
<xsl:with-param name="
|
|
1469
|
+
<xsl:call-template name="getLocalizedString">
|
|
1470
|
+
<xsl:with-param name="key">Descriptor.pl</xsl:with-param>
|
|
1451
1471
|
</xsl:call-template>
|
|
1452
1472
|
</xsl:variable>
|
|
1453
1473
|
<fo:inline font-weight="bold"><xsl:value-of select="$title-descriptors"/>: </fo:inline>
|
|
@@ -1682,18 +1702,18 @@
|
|
|
1682
1702
|
</xsl:variable>
|
|
1683
1703
|
<xsl:choose>
|
|
1684
1704
|
<xsl:when test="$isMainBody = 'true'">
|
|
1685
|
-
<fo:block font-weight="normal" margin-top="12pt" line-height="1.1">
|
|
1705
|
+
<fo:block font-weight="normal" margin-top="12pt" line-height="1.1" role="SKIP">
|
|
1686
1706
|
<xsl:value-of select="$part-text"/>
|
|
1687
1707
|
</fo:block>
|
|
1688
1708
|
</xsl:when>
|
|
1689
1709
|
<xsl:when test="$isMainLang = 'true'">
|
|
1690
|
-
<fo:block font-weight="normal" margin-top="6pt">
|
|
1710
|
+
<fo:block font-weight="normal" margin-top="6pt" role="SKIP">
|
|
1691
1711
|
<xsl:value-of select="$part-text"/>
|
|
1692
1712
|
</fo:block>
|
|
1693
1713
|
</xsl:when>
|
|
1694
1714
|
<xsl:otherwise>
|
|
1695
1715
|
<!-- <xsl:value-of select="$linebreak"/> -->
|
|
1696
|
-
<fo:block font-size="1pt" margin-top="5pt"> </fo:block>
|
|
1716
|
+
<fo:block font-size="1pt" margin-top="5pt" role="SKIP"> </fo:block>
|
|
1697
1717
|
<xsl:value-of select="$part-text"/>
|
|
1698
1718
|
<xsl:text> </xsl:text>
|
|
1699
1719
|
</xsl:otherwise>
|
|
@@ -1717,7 +1737,7 @@
|
|
|
1717
1737
|
<xsl:attribute name="margin-right">0mm</xsl:attribute>
|
|
1718
1738
|
</xsl:if>
|
|
1719
1739
|
|
|
1720
|
-
<fo:block font-weight="normal" line-height="1.1">
|
|
1740
|
+
<fo:block font-weight="normal" line-height="1.1" role="SKIP">
|
|
1721
1741
|
<xsl:choose>
|
|
1722
1742
|
<xsl:when test="$isMainLang = 'false' and $curr_lang = 'fr'">AMENDEMENT</xsl:when>
|
|
1723
1743
|
<xsl:otherwise><xsl:value-of select="$doctype_uppercased"/></xsl:otherwise>
|
|
@@ -1832,7 +1852,7 @@
|
|
|
1832
1852
|
<fo:block margin-left="0.5mm" margin-bottom="3mm" role="H1">
|
|
1833
1853
|
<fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-Attention))}" width="14mm" content-height="13mm" content-width="scale-to-fit" scaling="uniform" fox:alt-text="Image {@alt}"/>
|
|
1834
1854
|
<!-- <fo:inline padding-left="6mm" font-size="12pt" font-weight="bold">COPYRIGHT PROTECTED DOCUMENT</fo:inline> -->
|
|
1835
|
-
<fo:inline padding-left="6mm" font-size="12pt" font-weight="bold"><xsl:apply-templates/></fo:inline>
|
|
1855
|
+
<fo:inline padding-left="6mm" font-size="12pt" font-weight="bold" role="SKIP"><xsl:apply-templates/></fo:inline>
|
|
1836
1856
|
</fo:block>
|
|
1837
1857
|
</xsl:template>
|
|
1838
1858
|
|
|
@@ -1964,7 +1984,7 @@
|
|
|
1964
1984
|
</xsl:element>
|
|
1965
1985
|
|
|
1966
1986
|
<xsl:if test="$element-name = 'fo:inline' and not(following-sibling::iso:p)">
|
|
1967
|
-
<fo:block> <!-- margin-bottom="12pt" -->
|
|
1987
|
+
<fo:block role="SKIP"> <!-- margin-bottom="12pt" -->
|
|
1968
1988
|
<xsl:value-of select="$linebreak"/>
|
|
1969
1989
|
</fo:block>
|
|
1970
1990
|
</xsl:if>
|
|
@@ -2041,15 +2061,25 @@
|
|
|
2041
2061
|
<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
|
|
2042
2062
|
<xsl:attribute name="line-height">0</xsl:attribute>
|
|
2043
2063
|
</xsl:if>
|
|
2064
|
+
<xsl:if test="$element-name = 'fo:inline'">
|
|
2065
|
+
<xsl:attribute name="role">P</xsl:attribute>
|
|
2066
|
+
</xsl:if>
|
|
2044
2067
|
<xsl:if test="ancestor::*[local-name() = 'li' or local-name() = 'td' or local-name() = 'th' or local-name() = 'dd']">
|
|
2045
2068
|
<xsl:attribute name="role">SKIP</xsl:attribute>
|
|
2046
2069
|
</xsl:if>
|
|
2047
|
-
<xsl:apply-templates>
|
|
2070
|
+
<!-- <xsl:apply-templates>
|
|
2071
|
+
<xsl:with-param name="split_keep-within-line" select="$split_keep-within-line"/>
|
|
2072
|
+
</xsl:apply-templates> -->
|
|
2073
|
+
<!-- <xsl:apply-templates select="node()[not(self::iso:note[not(following-sibling::*) or count(following-sibling::*) = count(../iso:note) - 1])]"> -->
|
|
2074
|
+
<xsl:apply-templates select="node()[not(self::iso:note)]"> <!-- note renders below paragraph for correct PDF tags order (see https://github.com/metanorma/metanorma-iso/issues/1003) -->
|
|
2048
2075
|
<xsl:with-param name="split_keep-within-line" select="$split_keep-within-line"/>
|
|
2049
2076
|
</xsl:apply-templates>
|
|
2050
2077
|
</xsl:element>
|
|
2078
|
+
|
|
2079
|
+
<xsl:apply-templates select="iso:note"/> <!-- [not(following-sibling::*) or count(following-sibling::*) = count(../iso:note) - 1] -->
|
|
2080
|
+
|
|
2051
2081
|
<xsl:if test="$element-name = 'fo:inline' and not($inline = 'true') and not(local-name(..) = 'admonition')">
|
|
2052
|
-
<fo:block margin-bottom="12pt">
|
|
2082
|
+
<fo:block margin-bottom="12pt" role="SKIP">
|
|
2053
2083
|
<xsl:if test="ancestor::iso:annex or following-sibling::iso:table">
|
|
2054
2084
|
<xsl:attribute name="margin-bottom">0</xsl:attribute>
|
|
2055
2085
|
</xsl:if>
|
|
@@ -2057,7 +2087,7 @@
|
|
|
2057
2087
|
</fo:block>
|
|
2058
2088
|
</xsl:if>
|
|
2059
2089
|
<xsl:if test="$inline = 'true'">
|
|
2060
|
-
<fo:block> </fo:block>
|
|
2090
|
+
<fo:block role="SKIP"> </fo:block>
|
|
2061
2091
|
</xsl:if>
|
|
2062
2092
|
</xsl:template>
|
|
2063
2093
|
|
|
@@ -2278,10 +2308,10 @@
|
|
|
2278
2308
|
</xsl:template>
|
|
2279
2309
|
|
|
2280
2310
|
<xsl:template name="insertTripleLine">
|
|
2281
|
-
<fo:block font-size="1.25pt">
|
|
2282
|
-
<fo:block><fo:leader leader-pattern="rule" rule-thickness="0.75pt" leader-length="100%"/></fo:block>
|
|
2283
|
-
<fo:block><fo:leader leader-pattern="rule" rule-thickness="0.75pt" leader-length="100%"/></fo:block>
|
|
2284
|
-
<fo:block><fo:leader leader-pattern="rule" rule-thickness="0.75pt" leader-length="100%"/></fo:block>
|
|
2311
|
+
<fo:block font-size="1.25pt" role="SKIP">
|
|
2312
|
+
<fo:block role="SKIP"><fo:leader leader-pattern="rule" rule-thickness="0.75pt" leader-length="100%"/></fo:block>
|
|
2313
|
+
<fo:block role="SKIP"><fo:leader leader-pattern="rule" rule-thickness="0.75pt" leader-length="100%"/></fo:block>
|
|
2314
|
+
<fo:block role="SKIP"><fo:leader leader-pattern="rule" rule-thickness="0.75pt" leader-length="100%"/></fo:block>
|
|
2285
2315
|
</fo:block>
|
|
2286
2316
|
</xsl:template>
|
|
2287
2317
|
|
|
@@ -2441,19 +2471,32 @@
|
|
|
2441
2471
|
<xsl:variable name="titles_">
|
|
2442
2472
|
|
|
2443
2473
|
<!-- These titles of Table of contents renders different than determined in localized-strings -->
|
|
2444
|
-
<title-toc lang="en">
|
|
2445
|
-
|
|
2446
|
-
|
|
2447
|
-
|
|
2474
|
+
<!-- <title-toc lang="en">
|
|
2475
|
+
<xsl:if test="$namespace = 'csd' or $namespace = 'ieee' or $namespace = 'iho' or $namespace = 'mpfd' or $namespace = 'ogc' or $namespace = 'unece-rec'">
|
|
2476
|
+
<xsl:text>Contents</xsl:text>
|
|
2477
|
+
</xsl:if>
|
|
2478
|
+
<xsl:if test="$namespace = 'csa' or $namespace = 'm3d' or $namespace = 'nist-sp' or $namespace = 'ogc-white-paper'">
|
|
2479
|
+
<xsl:text>Table of Contents</xsl:text>
|
|
2480
|
+
</xsl:if>
|
|
2481
|
+
<xsl:if test="$namespace = 'gb'">
|
|
2482
|
+
<xsl:text>Table of contents</xsl:text>
|
|
2483
|
+
</xsl:if>
|
|
2484
|
+
</title-toc> -->
|
|
2485
|
+
<title-toc lang="en">Table of contents</title-toc>
|
|
2486
|
+
<!-- <title-toc lang="fr">
|
|
2448
2487
|
<xsl:text>Sommaire</xsl:text>
|
|
2449
|
-
</title-toc>
|
|
2450
|
-
<title-toc lang="zh">
|
|
2451
|
-
|
|
2488
|
+
</title-toc> -->
|
|
2489
|
+
<!-- <title-toc lang="zh">
|
|
2490
|
+
<xsl:choose>
|
|
2491
|
+
<xsl:when test="$namespace = 'gb'">
|
|
2492
|
+
<xsl:text>目次</xsl:text>
|
|
2493
|
+
</xsl:when>
|
|
2494
|
+
<xsl:otherwise>
|
|
2452
2495
|
<xsl:text>Contents</xsl:text>
|
|
2453
|
-
|
|
2454
|
-
|
|
2455
|
-
|
|
2456
|
-
<title-
|
|
2496
|
+
</xsl:otherwise>
|
|
2497
|
+
</xsl:choose>
|
|
2498
|
+
</title-toc> -->
|
|
2499
|
+
<title-toc lang="zh">目次</title-toc>
|
|
2457
2500
|
|
|
2458
2501
|
<title-part lang="en">
|
|
2459
2502
|
|
|
@@ -2475,20 +2518,6 @@
|
|
|
2475
2518
|
<title-subpart lang="en">Sub-part #</title-subpart>
|
|
2476
2519
|
<title-subpart lang="fr">Partie de sub #</title-subpart>
|
|
2477
2520
|
|
|
2478
|
-
<title-list-tables lang="en">List of Tables</title-list-tables>
|
|
2479
|
-
|
|
2480
|
-
<title-list-figures lang="en">List of Figures</title-list-figures>
|
|
2481
|
-
|
|
2482
|
-
<title-table-figures lang="en">Table of Figures</title-table-figures>
|
|
2483
|
-
|
|
2484
|
-
<title-list-recommendations lang="en">List of Recommendations</title-list-recommendations>
|
|
2485
|
-
|
|
2486
|
-
<title-summary lang="en">Summary</title-summary>
|
|
2487
|
-
|
|
2488
|
-
<title-continued lang="ru">(продолжение)</title-continued>
|
|
2489
|
-
<title-continued lang="en">(continued)</title-continued>
|
|
2490
|
-
<title-continued lang="fr">(continué)</title-continued>
|
|
2491
|
-
|
|
2492
2521
|
</xsl:variable>
|
|
2493
2522
|
<xsl:variable name="titles" select="xalan:nodeset($titles_)"/>
|
|
2494
2523
|
|
|
@@ -2496,8 +2525,8 @@
|
|
|
2496
2525
|
<xsl:variable name="toc_table_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'toc'][@type='table']/*[local-name() = 'title']"/>
|
|
2497
2526
|
<xsl:value-of select="$toc_table_title"/>
|
|
2498
2527
|
<xsl:if test="normalize-space($toc_table_title) = ''">
|
|
2499
|
-
<xsl:call-template name="
|
|
2500
|
-
<xsl:with-param name="
|
|
2528
|
+
<xsl:call-template name="getLocalizedString">
|
|
2529
|
+
<xsl:with-param name="key">toc_tables</xsl:with-param>
|
|
2501
2530
|
</xsl:call-template>
|
|
2502
2531
|
</xsl:if>
|
|
2503
2532
|
</xsl:variable>
|
|
@@ -2506,8 +2535,8 @@
|
|
|
2506
2535
|
<xsl:variable name="toc_figure_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'toc'][@type='figure']/*[local-name() = 'title']"/>
|
|
2507
2536
|
<xsl:value-of select="$toc_figure_title"/>
|
|
2508
2537
|
<xsl:if test="normalize-space($toc_figure_title) = ''">
|
|
2509
|
-
<xsl:call-template name="
|
|
2510
|
-
<xsl:with-param name="
|
|
2538
|
+
<xsl:call-template name="getLocalizedString">
|
|
2539
|
+
<xsl:with-param name="key">toc_figures</xsl:with-param>
|
|
2511
2540
|
</xsl:call-template>
|
|
2512
2541
|
</xsl:if>
|
|
2513
2542
|
</xsl:variable>
|
|
@@ -2516,8 +2545,8 @@
|
|
|
2516
2545
|
<xsl:variable name="toc_requirement_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'toc'][@type='requirement']/*[local-name() = 'title']"/>
|
|
2517
2546
|
<xsl:value-of select="$toc_requirement_title"/>
|
|
2518
2547
|
<xsl:if test="normalize-space($toc_requirement_title) = ''">
|
|
2519
|
-
<xsl:call-template name="
|
|
2520
|
-
<xsl:with-param name="
|
|
2548
|
+
<xsl:call-template name="getLocalizedString">
|
|
2549
|
+
<xsl:with-param name="key">toc_recommendations</xsl:with-param>
|
|
2521
2550
|
</xsl:call-template>
|
|
2522
2551
|
</xsl:if>
|
|
2523
2552
|
</xsl:variable>
|
|
@@ -3351,6 +3380,7 @@
|
|
|
3351
3380
|
</xsl:attribute-set>
|
|
3352
3381
|
|
|
3353
3382
|
<xsl:attribute-set name="figure-block-style">
|
|
3383
|
+
<xsl:attribute name="role">SKIP</xsl:attribute>
|
|
3354
3384
|
|
|
3355
3385
|
<xsl:attribute name="space-after">12pt</xsl:attribute>
|
|
3356
3386
|
|
|
@@ -3361,6 +3391,7 @@
|
|
|
3361
3391
|
</xsl:attribute-set>
|
|
3362
3392
|
|
|
3363
3393
|
<xsl:attribute-set name="figure-name-style">
|
|
3394
|
+
<xsl:attribute name="role">Caption</xsl:attribute>
|
|
3364
3395
|
|
|
3365
3396
|
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
|
3366
3397
|
<xsl:attribute name="text-align">center</xsl:attribute>
|
|
@@ -3408,6 +3439,7 @@
|
|
|
3408
3439
|
</xsl:template>
|
|
3409
3440
|
|
|
3410
3441
|
<xsl:attribute-set name="image-style">
|
|
3442
|
+
<xsl:attribute name="role">SKIP</xsl:attribute>
|
|
3411
3443
|
<xsl:attribute name="text-align">center</xsl:attribute>
|
|
3412
3444
|
|
|
3413
3445
|
</xsl:attribute-set>
|
|
@@ -3676,6 +3708,13 @@
|
|
|
3676
3708
|
|
|
3677
3709
|
</xsl:attribute-set> <!-- bibitem-non-normative-list-style -->
|
|
3678
3710
|
|
|
3711
|
+
<xsl:attribute-set name="bibitem-non-normative-list-item-style">
|
|
3712
|
+
<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
|
|
3713
|
+
|
|
3714
|
+
<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
|
|
3715
|
+
|
|
3716
|
+
</xsl:attribute-set>
|
|
3717
|
+
|
|
3679
3718
|
<!-- bibitem in bibliography section (references/@normative="false"), list body -->
|
|
3680
3719
|
<xsl:attribute-set name="bibitem-normative-list-body-style">
|
|
3681
3720
|
|
|
@@ -4066,14 +4105,14 @@
|
|
|
4066
4105
|
<xsl:value-of select="$sep"/><xsl:value-of select="$zero_width_space"/>
|
|
4067
4106
|
</xsl:when>
|
|
4068
4107
|
<xsl:otherwise>
|
|
4069
|
-
<fo:inline keep-together.within-line="always"><xsl:apply-templates/></fo:inline>
|
|
4108
|
+
<fo:inline keep-together.within-line="always" role="SKIP"><xsl:apply-templates/></fo:inline>
|
|
4070
4109
|
</xsl:otherwise>
|
|
4071
4110
|
</xsl:choose>
|
|
4072
4111
|
</xsl:for-each>
|
|
4073
4112
|
</xsl:when>
|
|
4074
4113
|
|
|
4075
4114
|
<xsl:otherwise>
|
|
4076
|
-
<fo:inline keep-together.within-line="always"><xsl:apply-templates/></fo:inline>
|
|
4115
|
+
<fo:inline keep-together.within-line="always" role="SKIP"><xsl:apply-templates/></fo:inline>
|
|
4077
4116
|
</xsl:otherwise>
|
|
4078
4117
|
|
|
4079
4118
|
</xsl:choose>
|
|
@@ -4083,7 +4122,7 @@
|
|
|
4083
4122
|
<!-- Preface boilerplate sections processing -->
|
|
4084
4123
|
<!-- ================================= -->
|
|
4085
4124
|
<xsl:template match="*[local-name()='copyright-statement']">
|
|
4086
|
-
<fo:block xsl:use-attribute-sets="copyright-statement-style">
|
|
4125
|
+
<fo:block xsl:use-attribute-sets="copyright-statement-style" role="SKIP">
|
|
4087
4126
|
<xsl:apply-templates/>
|
|
4088
4127
|
</fo:block>
|
|
4089
4128
|
</xsl:template> <!-- copyright-statement -->
|
|
@@ -4262,7 +4301,7 @@
|
|
|
4262
4301
|
</xsl:choose>
|
|
4263
4302
|
</xsl:variable>
|
|
4264
4303
|
|
|
4265
|
-
<fo:block-container xsl:use-attribute-sets="table-container-style">
|
|
4304
|
+
<fo:block-container xsl:use-attribute-sets="table-container-style" role="SKIP">
|
|
4266
4305
|
|
|
4267
4306
|
<xsl:call-template name="refine_table-container-style">
|
|
4268
4307
|
<xsl:with-param name="margin-side" select="$margin-side"/>
|
|
@@ -5051,13 +5090,13 @@
|
|
|
5051
5090
|
<fo:table-body>
|
|
5052
5091
|
|
|
5053
5092
|
<xsl:variable name="title_continued_">
|
|
5054
|
-
<xsl:call-template name="
|
|
5055
|
-
<xsl:with-param name="
|
|
5093
|
+
<xsl:call-template name="getLocalizedString">
|
|
5094
|
+
<xsl:with-param name="key">continued</xsl:with-param>
|
|
5056
5095
|
</xsl:call-template>
|
|
5057
5096
|
</xsl:variable>
|
|
5058
|
-
|
|
5097
|
+
<xsl:variable name="title_continued_in_parenthesis" select="concat('(',$title_continued_,')')"/>
|
|
5059
5098
|
<xsl:variable name="title_continued">
|
|
5060
|
-
<xsl:value-of select="$
|
|
5099
|
+
<xsl:value-of select="$title_continued_in_parenthesis"/>
|
|
5061
5100
|
|
|
5062
5101
|
</xsl:variable>
|
|
5063
5102
|
|
|
@@ -5370,7 +5409,7 @@
|
|
|
5370
5409
|
</xsl:choose>
|
|
5371
5410
|
</xsl:variable>
|
|
5372
5411
|
<xsl:variable name="footnote_inline">
|
|
5373
|
-
<fo:inline>
|
|
5412
|
+
<fo:inline role="Reference">
|
|
5374
5413
|
|
|
5375
5414
|
<xsl:variable name="fn_styles">
|
|
5376
5415
|
<xsl:choose>
|
|
@@ -5393,7 +5432,7 @@
|
|
|
5393
5432
|
|
|
5394
5433
|
<xsl:call-template name="insert_basic_link">
|
|
5395
5434
|
<xsl:with-param name="element">
|
|
5396
|
-
<fo:basic-link internal-destination="{$ref_id}" fox:alt-text="footnote {$current_fn_number}">
|
|
5435
|
+
<fo:basic-link internal-destination="{$ref_id}" fox:alt-text="footnote {$current_fn_number}" role="Lbl">
|
|
5397
5436
|
<xsl:copy-of select="$current_fn_number_text"/>
|
|
5398
5437
|
</fo:basic-link>
|
|
5399
5438
|
</xsl:with-param>
|
|
@@ -5406,17 +5445,17 @@
|
|
|
5406
5445
|
<xsl:copy-of select="$footnote_inline"/>
|
|
5407
5446
|
</xsl:when>
|
|
5408
5447
|
<xsl:when test="$p_fn//fn[@gen_id = $gen_id] or normalize-space(@skip_footnote_body) = 'false'">
|
|
5409
|
-
<fo:footnote xsl:use-attribute-sets="fn-style">
|
|
5448
|
+
<fo:footnote xsl:use-attribute-sets="fn-style" role="SKIP">
|
|
5410
5449
|
<xsl:copy-of select="$footnote_inline"/>
|
|
5411
|
-
<fo:footnote-body>
|
|
5450
|
+
<fo:footnote-body role="Note">
|
|
5412
5451
|
|
|
5413
|
-
<fo:block-container xsl:use-attribute-sets="fn-container-body-style">
|
|
5452
|
+
<fo:block-container xsl:use-attribute-sets="fn-container-body-style" role="SKIP">
|
|
5414
5453
|
|
|
5415
|
-
<fo:block xsl:use-attribute-sets="fn-body-style">
|
|
5454
|
+
<fo:block xsl:use-attribute-sets="fn-body-style" role="SKIP">
|
|
5416
5455
|
|
|
5417
5456
|
<xsl:call-template name="refine_fn-body-style"/>
|
|
5418
5457
|
|
|
5419
|
-
<fo:inline id="{$ref_id}" xsl:use-attribute-sets="fn-body-num-style">
|
|
5458
|
+
<fo:inline id="{$ref_id}" xsl:use-attribute-sets="fn-body-num-style" role="Lbl">
|
|
5420
5459
|
|
|
5421
5460
|
<xsl:call-template name="refine_fn-body-num-style"/>
|
|
5422
5461
|
|
|
@@ -5678,11 +5717,11 @@
|
|
|
5678
5717
|
</xsl:template>
|
|
5679
5718
|
|
|
5680
5719
|
<xsl:template match="*[local-name()='fn']/text()[normalize-space() != '']">
|
|
5681
|
-
<fo:inline><xsl:value-of select="."/></fo:inline>
|
|
5720
|
+
<fo:inline role="SKIP"><xsl:value-of select="."/></fo:inline>
|
|
5682
5721
|
</xsl:template>
|
|
5683
5722
|
|
|
5684
5723
|
<xsl:template match="*[local-name()='fn']//*[local-name()='p']">
|
|
5685
|
-
<fo:inline>
|
|
5724
|
+
<fo:inline role="P">
|
|
5686
5725
|
<xsl:apply-templates/>
|
|
5687
5726
|
</fo:inline>
|
|
5688
5727
|
</xsl:template>
|
|
@@ -5697,7 +5736,7 @@
|
|
|
5697
5736
|
<xsl:variable name="isAdded" select="@added"/>
|
|
5698
5737
|
<xsl:variable name="isDeleted" select="@deleted"/>
|
|
5699
5738
|
<!-- <dl><xsl:copy-of select="."/></dl> -->
|
|
5700
|
-
<fo:block-container xsl:use-attribute-sets="dl-block-style">
|
|
5739
|
+
<fo:block-container xsl:use-attribute-sets="dl-block-style" role="SKIP">
|
|
5701
5740
|
|
|
5702
5741
|
<xsl:call-template name="setBlockSpanAll"/>
|
|
5703
5742
|
|
|
@@ -5732,7 +5771,7 @@
|
|
|
5732
5771
|
<xsl:with-param name="isDeleted" select="$isDeleted"/>
|
|
5733
5772
|
</xsl:call-template>
|
|
5734
5773
|
|
|
5735
|
-
<fo:block-container margin-left="0mm">
|
|
5774
|
+
<fo:block-container margin-left="0mm" role="SKIP">
|
|
5736
5775
|
|
|
5737
5776
|
<xsl:attribute name="margin-right">0mm</xsl:attribute>
|
|
5738
5777
|
|
|
@@ -5801,7 +5840,7 @@
|
|
|
5801
5840
|
|
|
5802
5841
|
<!-- a few components -->
|
|
5803
5842
|
<xsl:if test="$onlyOneComponent = 'false'">
|
|
5804
|
-
<fo:block>
|
|
5843
|
+
<fo:block role="SKIP">
|
|
5805
5844
|
|
|
5806
5845
|
<xsl:call-template name="refine_multicomponent_style"/>
|
|
5807
5846
|
|
|
@@ -5809,7 +5848,7 @@
|
|
|
5809
5848
|
<xsl:attribute name="margin-top">0</xsl:attribute>
|
|
5810
5849
|
</xsl:if>
|
|
5811
5850
|
|
|
5812
|
-
<fo:block>
|
|
5851
|
+
<fo:block role="SKIP">
|
|
5813
5852
|
|
|
5814
5853
|
<xsl:call-template name="refine_multicomponent_block_style"/>
|
|
5815
5854
|
|
|
@@ -6426,6 +6465,9 @@
|
|
|
6426
6465
|
<xsl:attribute name="role">SKIP</xsl:attribute>
|
|
6427
6466
|
</xsl:if>
|
|
6428
6467
|
|
|
6468
|
+
<xsl:if test="ancestor::*['preferred']">
|
|
6469
|
+
<xsl:attribute name="role">SKIP</xsl:attribute>
|
|
6470
|
+
</xsl:if>
|
|
6429
6471
|
</xsl:template>
|
|
6430
6472
|
|
|
6431
6473
|
<xsl:template match="*[local-name()='padding']">
|
|
@@ -7428,6 +7470,18 @@
|
|
|
7428
7470
|
</xsl:copy>
|
|
7429
7471
|
</xsl:template>
|
|
7430
7472
|
|
|
7473
|
+
<xsl:variable name="font_main_root_style">
|
|
7474
|
+
<root-style xsl:use-attribute-sets="root-style">
|
|
7475
|
+
</root-style>
|
|
7476
|
+
</xsl:variable>
|
|
7477
|
+
<xsl:variable name="font_main_root_style_font_family" select="xalan:nodeset($font_main_root_style)/root-style/@font-family"/>
|
|
7478
|
+
<xsl:variable name="font_main">
|
|
7479
|
+
<xsl:choose>
|
|
7480
|
+
<xsl:when test="contains($font_main_root_style_font_family, ',')"><xsl:value-of select="substring-before($font_main_root_style_font_family, ',')"/></xsl:when>
|
|
7481
|
+
<xsl:otherwise><xsl:value-of select="$font_main_root_style_font_family"/></xsl:otherwise>
|
|
7482
|
+
</xsl:choose>
|
|
7483
|
+
</xsl:variable>
|
|
7484
|
+
|
|
7431
7485
|
<xsl:template match="*[local-name()='th' or local-name()='td']" mode="simple-table-id">
|
|
7432
7486
|
<xsl:param name="id"/>
|
|
7433
7487
|
<xsl:copy>
|
|
@@ -7466,6 +7520,33 @@
|
|
|
7466
7520
|
|
|
7467
7521
|
<!-- td_text='<xsl:copy-of select="$td_text"/>' -->
|
|
7468
7522
|
|
|
7523
|
+
<xsl:variable name="words_with_width">
|
|
7524
|
+
<!-- calculate width for 'word' which contain text only (without formatting tags inside) -->
|
|
7525
|
+
<xsl:for-each select="xalan:nodeset($td_text)//*[local-name() = 'word'][normalize-space() != ''][not(*)]">
|
|
7526
|
+
<xsl:copy>
|
|
7527
|
+
<xsl:copy-of select="@*"/>
|
|
7528
|
+
<xsl:attribute name="width">
|
|
7529
|
+
<xsl:value-of select="java:org.metanorma.fop.Util.getStringWidth(., $font_main)"/> <!-- Example: 'Times New Roman' -->
|
|
7530
|
+
</xsl:attribute>
|
|
7531
|
+
<xsl:copy-of select="node()"/>
|
|
7532
|
+
</xsl:copy>
|
|
7533
|
+
</xsl:for-each>
|
|
7534
|
+
</xsl:variable>
|
|
7535
|
+
|
|
7536
|
+
<xsl:variable name="words_with_width_sorted">
|
|
7537
|
+
<xsl:for-each select="xalan:nodeset($words_with_width)//*[local-name() = 'word']">
|
|
7538
|
+
<xsl:sort select="@width" data-type="number" order="descending"/>
|
|
7539
|
+
<!-- select word maximal width only -->
|
|
7540
|
+
<xsl:if test="position() = 1">
|
|
7541
|
+
<xsl:copy-of select="."/>
|
|
7542
|
+
</xsl:if>
|
|
7543
|
+
</xsl:for-each>
|
|
7544
|
+
<!-- add 'word' with formatting tags inside -->
|
|
7545
|
+
<xsl:for-each select="xalan:nodeset($td_text)//*[local-name() = 'word'][normalize-space() != ''][*]">
|
|
7546
|
+
<xsl:copy-of select="."/>
|
|
7547
|
+
</xsl:for-each>
|
|
7548
|
+
</xsl:variable>
|
|
7549
|
+
|
|
7469
7550
|
<xsl:variable name="words">
|
|
7470
7551
|
<xsl:for-each select=".//*[local-name() = 'image' or local-name() = 'stem']">
|
|
7471
7552
|
<word>
|
|
@@ -7473,9 +7554,12 @@
|
|
|
7473
7554
|
</word>
|
|
7474
7555
|
</xsl:for-each>
|
|
7475
7556
|
|
|
7476
|
-
<xsl:for-each select="xalan:nodeset($
|
|
7557
|
+
<xsl:for-each select="xalan:nodeset($words_with_width_sorted)//*[local-name() = 'word'][normalize-space() != '']">
|
|
7477
7558
|
<xsl:copy-of select="."/>
|
|
7478
7559
|
</xsl:for-each>
|
|
7560
|
+
<!-- <xsl:for-each select="xalan:nodeset($td_text)//*[local-name() = 'word'][normalize-space() != '']">
|
|
7561
|
+
<xsl:copy-of select="."/>
|
|
7562
|
+
</xsl:for-each> -->
|
|
7479
7563
|
|
|
7480
7564
|
</xsl:variable>
|
|
7481
7565
|
|
|
@@ -7943,10 +8027,10 @@
|
|
|
7943
8027
|
<xsl:copy>
|
|
7944
8028
|
<xsl:apply-templates select="@*" mode="mathml"/>
|
|
7945
8029
|
<xsl:if test="not(@lspace)">
|
|
7946
|
-
<xsl:attribute name="lspace">0.
|
|
8030
|
+
<xsl:attribute name="lspace">0.2em</xsl:attribute>
|
|
7947
8031
|
</xsl:if>
|
|
7948
|
-
<xsl:if test="not(@rspace)">
|
|
7949
|
-
<xsl:attribute name="rspace">0.
|
|
8032
|
+
<xsl:if test="not(@rspace) and not(following-sibling::*[1][self::mathml:mo and normalize-space(text()) = '|'])">
|
|
8033
|
+
<xsl:attribute name="rspace">0.2em</xsl:attribute>
|
|
7950
8034
|
</xsl:if>
|
|
7951
8035
|
<xsl:apply-templates mode="mathml"/>
|
|
7952
8036
|
</xsl:copy>
|
|
@@ -7963,6 +8047,27 @@
|
|
|
7963
8047
|
</xsl:copy>
|
|
7964
8048
|
</xsl:template>
|
|
7965
8049
|
|
|
8050
|
+
<!-- increase space before '(' -->
|
|
8051
|
+
<xsl:template match="mathml:mo[normalize-space(text()) = '(']" mode="mathml">
|
|
8052
|
+
<xsl:copy>
|
|
8053
|
+
<xsl:apply-templates select="@*" mode="mathml"/>
|
|
8054
|
+
<xsl:if test="(preceding-sibling::* and not(preceding-sibling::*[1][self::mathml:mo])) or (../preceding-sibling::* and not(../preceding-sibling::*[1][self::mathml:mo]))">
|
|
8055
|
+
<xsl:if test="not(@lspace)">
|
|
8056
|
+
<xsl:attribute name="lspace">0.4em</xsl:attribute>
|
|
8057
|
+
<xsl:choose>
|
|
8058
|
+
<xsl:when test="preceding-sibling::*[1][self::mathml:mi or self::mathml:mstyle]">
|
|
8059
|
+
<xsl:attribute name="lspace">0.2em</xsl:attribute>
|
|
8060
|
+
</xsl:when>
|
|
8061
|
+
<xsl:when test="../preceding-sibling::*[1][self::mathml:mi or self::mathml:mstyle]">
|
|
8062
|
+
<xsl:attribute name="lspace">0.2em</xsl:attribute>
|
|
8063
|
+
</xsl:when>
|
|
8064
|
+
</xsl:choose>
|
|
8065
|
+
</xsl:if>
|
|
8066
|
+
</xsl:if>
|
|
8067
|
+
<xsl:apply-templates mode="mathml"/>
|
|
8068
|
+
</xsl:copy>
|
|
8069
|
+
</xsl:template>
|
|
8070
|
+
|
|
7966
8071
|
<!-- Examples:
|
|
7967
8072
|
<stem type="AsciiMath">x = 1</stem>
|
|
7968
8073
|
<stem type="AsciiMath"><asciimath>x = 1</asciimath></stem>
|
|
@@ -8122,7 +8227,7 @@
|
|
|
8122
8227
|
<!-- formula -->
|
|
8123
8228
|
<!-- ====== -->
|
|
8124
8229
|
<xsl:template match="*[local-name() = 'formula']" name="formula">
|
|
8125
|
-
<fo:block-container margin-left="0mm">
|
|
8230
|
+
<fo:block-container margin-left="0mm" role="SKIP">
|
|
8126
8231
|
<xsl:if test="parent::*[local-name() = 'note']">
|
|
8127
8232
|
<xsl:attribute name="margin-left">
|
|
8128
8233
|
<xsl:choose>
|
|
@@ -8132,7 +8237,7 @@
|
|
|
8132
8237
|
</xsl:attribute>
|
|
8133
8238
|
|
|
8134
8239
|
</xsl:if>
|
|
8135
|
-
<fo:block-container margin-left="0mm">
|
|
8240
|
+
<fo:block-container margin-left="0mm" role="SKIP">
|
|
8136
8241
|
<fo:block id="{@id}">
|
|
8137
8242
|
<xsl:apply-templates select="node()[not(local-name() = 'name')]"/> <!-- formula's number will be process in 'stem' template -->
|
|
8138
8243
|
</fo:block>
|
|
@@ -8212,19 +8317,19 @@
|
|
|
8212
8317
|
|
|
8213
8318
|
<xsl:template match="*[local-name() = 'note']" name="note">
|
|
8214
8319
|
|
|
8215
|
-
<fo:block-container id="{@id}" xsl:use-attribute-sets="note-style">
|
|
8320
|
+
<fo:block-container id="{@id}" xsl:use-attribute-sets="note-style" role="SKIP">
|
|
8216
8321
|
|
|
8217
8322
|
<xsl:call-template name="setBlockSpanAll"/>
|
|
8218
8323
|
|
|
8219
8324
|
<xsl:call-template name="refine_note-style"/>
|
|
8220
8325
|
|
|
8221
|
-
<fo:block-container margin-left="0mm" margin-right="0mm">
|
|
8326
|
+
<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
|
|
8222
8327
|
|
|
8223
8328
|
<fo:block>
|
|
8224
8329
|
|
|
8225
8330
|
<xsl:call-template name="refine_note_block_style"/>
|
|
8226
8331
|
|
|
8227
|
-
<fo:inline xsl:use-attribute-sets="note-name-style">
|
|
8332
|
+
<fo:inline xsl:use-attribute-sets="note-name-style" role="SKIP">
|
|
8228
8333
|
|
|
8229
8334
|
<xsl:call-template name="refine_note-name-style"/>
|
|
8230
8335
|
|
|
@@ -8261,12 +8366,12 @@
|
|
|
8261
8366
|
<xsl:variable name="num"><xsl:number/></xsl:variable>
|
|
8262
8367
|
<xsl:choose>
|
|
8263
8368
|
<xsl:when test="$num = 1"> <!-- display first NOTE's paragraph in the same line with label NOTE -->
|
|
8264
|
-
<fo:inline xsl:use-attribute-sets="note-p-style">
|
|
8369
|
+
<fo:inline xsl:use-attribute-sets="note-p-style" role="SKIP">
|
|
8265
8370
|
<xsl:apply-templates/>
|
|
8266
8371
|
</fo:inline>
|
|
8267
8372
|
</xsl:when>
|
|
8268
8373
|
<xsl:otherwise>
|
|
8269
|
-
<fo:block xsl:use-attribute-sets="note-p-style">
|
|
8374
|
+
<fo:block xsl:use-attribute-sets="note-p-style" role="SKIP">
|
|
8270
8375
|
<xsl:apply-templates/>
|
|
8271
8376
|
</fo:block>
|
|
8272
8377
|
</xsl:otherwise>
|
|
@@ -8384,12 +8489,13 @@
|
|
|
8384
8489
|
|
|
8385
8490
|
<xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']">
|
|
8386
8491
|
<xsl:if test="normalize-space() != ''">
|
|
8387
|
-
<xsl:variable name="level">
|
|
8492
|
+
<!-- <xsl:variable name="level">
|
|
8388
8493
|
<xsl:call-template name="getLevelTermName"/>
|
|
8389
8494
|
</xsl:variable>
|
|
8390
8495
|
<fo:inline role="H{$level}">
|
|
8391
|
-
<xsl:apply-templates/>
|
|
8392
|
-
</fo:inline>
|
|
8496
|
+
<xsl:apply-templates />
|
|
8497
|
+
</fo:inline> -->
|
|
8498
|
+
<xsl:apply-templates/>
|
|
8393
8499
|
</xsl:if>
|
|
8394
8500
|
</xsl:template>
|
|
8395
8501
|
<!-- ====== -->
|
|
@@ -8413,7 +8519,7 @@
|
|
|
8413
8519
|
<!-- Example: Dimensions in millimeters -->
|
|
8414
8520
|
<xsl:apply-templates select="*[local-name() = 'note'][@type = 'units']"/>
|
|
8415
8521
|
|
|
8416
|
-
<fo:block xsl:use-attribute-sets="figure-style">
|
|
8522
|
+
<fo:block xsl:use-attribute-sets="figure-style" role="SKIP">
|
|
8417
8523
|
<xsl:apply-templates select="node()[not(local-name() = 'name') and not(local-name() = 'note' and @type = 'units')]"/>
|
|
8418
8524
|
</fo:block>
|
|
8419
8525
|
<xsl:for-each select="*[local-name() = 'note'][not(@type = 'units')]">
|
|
@@ -9546,7 +9652,7 @@
|
|
|
9546
9652
|
</xsl:when>
|
|
9547
9653
|
|
|
9548
9654
|
<xsl:otherwise>
|
|
9549
|
-
<fo:block-container xsl:use-attribute-sets="sourcecode-container-style">
|
|
9655
|
+
<fo:block-container xsl:use-attribute-sets="sourcecode-container-style" role="SKIP">
|
|
9550
9656
|
|
|
9551
9657
|
<xsl:if test="not(ancestor::*[local-name() = 'li']) or ancestor::*[local-name() = 'example']">
|
|
9552
9658
|
<xsl:attribute name="margin-left">0mm</xsl:attribute>
|
|
@@ -9567,7 +9673,7 @@
|
|
|
9567
9673
|
</xsl:attribute>
|
|
9568
9674
|
|
|
9569
9675
|
</xsl:if>
|
|
9570
|
-
<fo:block-container margin-left="0mm">
|
|
9676
|
+
<fo:block-container margin-left="0mm" role="SKIP">
|
|
9571
9677
|
|
|
9572
9678
|
<fo:block xsl:use-attribute-sets="sourcecode-style">
|
|
9573
9679
|
|
|
@@ -10115,11 +10221,11 @@
|
|
|
10115
10221
|
<!-- requirement, recommendation, permission table -->
|
|
10116
10222
|
<!-- ========== -->
|
|
10117
10223
|
<xsl:template match="*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']">
|
|
10118
|
-
<fo:block-container margin-left="0mm" margin-right="0mm" margin-bottom="12pt">
|
|
10224
|
+
<fo:block-container margin-left="0mm" margin-right="0mm" margin-bottom="12pt" role="SKIP">
|
|
10119
10225
|
<xsl:if test="ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']">
|
|
10120
10226
|
<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
|
|
10121
10227
|
</xsl:if>
|
|
10122
|
-
<fo:block-container margin-left="0mm" margin-right="0mm">
|
|
10228
|
+
<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
|
|
10123
10229
|
<fo:table id="{@id}" table-layout="fixed" width="100%"> <!-- border="1pt solid black" -->
|
|
10124
10230
|
<xsl:if test="ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']">
|
|
10125
10231
|
<!-- <xsl:attribute name="border">0.5pt solid black</xsl:attribute> -->
|
|
@@ -10281,7 +10387,7 @@
|
|
|
10281
10387
|
-->
|
|
10282
10388
|
<xsl:template match="*[local-name() = 'example']">
|
|
10283
10389
|
|
|
10284
|
-
<fo:block-container id="{@id}" xsl:use-attribute-sets="example-style">
|
|
10390
|
+
<fo:block-container id="{@id}" xsl:use-attribute-sets="example-style" role="SKIP">
|
|
10285
10391
|
|
|
10286
10392
|
<xsl:call-template name="setBlockSpanAll"/>
|
|
10287
10393
|
|
|
@@ -10292,7 +10398,7 @@
|
|
|
10292
10398
|
inline
|
|
10293
10399
|
</xsl:variable>
|
|
10294
10400
|
|
|
10295
|
-
<fo:block-container margin-left="0mm">
|
|
10401
|
+
<fo:block-container margin-left="0mm" role="SKIP">
|
|
10296
10402
|
|
|
10297
10403
|
<xsl:choose>
|
|
10298
10404
|
|
|
@@ -10305,8 +10411,8 @@
|
|
|
10305
10411
|
</xsl:apply-templates>
|
|
10306
10412
|
</fo:block>
|
|
10307
10413
|
|
|
10308
|
-
<fo:block-container xsl:use-attribute-sets="example-body-style">
|
|
10309
|
-
<fo:block-container margin-left="0mm" margin-right="0mm">
|
|
10414
|
+
<fo:block-container xsl:use-attribute-sets="example-body-style" role="SKIP">
|
|
10415
|
+
<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
|
|
10310
10416
|
<xsl:apply-templates select="node()[not(local-name() = 'name')]">
|
|
10311
10417
|
<xsl:with-param name="fo_element" select="$fo_element"/>
|
|
10312
10418
|
</xsl:apply-templates>
|
|
@@ -10359,8 +10465,8 @@
|
|
|
10359
10465
|
|
|
10360
10466
|
<xsl:if test="*[not(local-name() = 'name')][position() > 1]">
|
|
10361
10467
|
<!-- display further elements in blocks -->
|
|
10362
|
-
<fo:block-container xsl:use-attribute-sets="example-body-style">
|
|
10363
|
-
<fo:block-container margin-left="0mm" margin-right="0mm">
|
|
10468
|
+
<fo:block-container xsl:use-attribute-sets="example-body-style" role="SKIP">
|
|
10469
|
+
<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
|
|
10364
10470
|
<xsl:apply-templates select="*[not(local-name() = 'name')][position() > 1]">
|
|
10365
10471
|
<xsl:with-param name="fo_element" select="'block'"/>
|
|
10366
10472
|
</xsl:apply-templates>
|
|
@@ -10418,7 +10524,7 @@
|
|
|
10418
10524
|
</xsl:variable>
|
|
10419
10525
|
<xsl:choose>
|
|
10420
10526
|
<xsl:when test="starts-with(normalize-space($element), 'block')">
|
|
10421
|
-
<fo:block-container>
|
|
10527
|
+
<fo:block-container role="SKIP">
|
|
10422
10528
|
<xsl:if test="ancestor::*[local-name() = 'li'] and contains(normalize-space($fo_element), 'block')">
|
|
10423
10529
|
<xsl:attribute name="margin-left">0mm</xsl:attribute>
|
|
10424
10530
|
<xsl:attribute name="margin-right">0mm</xsl:attribute>
|
|
@@ -10559,7 +10665,7 @@
|
|
|
10559
10665
|
<!-- author -->
|
|
10560
10666
|
<!-- ====== -->
|
|
10561
10667
|
<xsl:template match="*[local-name() = 'quote']">
|
|
10562
|
-
<fo:block-container margin-left="0mm">
|
|
10668
|
+
<fo:block-container margin-left="0mm" role="SKIP">
|
|
10563
10669
|
|
|
10564
10670
|
<xsl:call-template name="setBlockSpanAll"/>
|
|
10565
10671
|
|
|
@@ -10569,12 +10675,12 @@
|
|
|
10569
10675
|
</xsl:if>
|
|
10570
10676
|
</xsl:if>
|
|
10571
10677
|
|
|
10572
|
-
<fo:block-container margin-left="0mm">
|
|
10573
|
-
<fo:block-container xsl:use-attribute-sets="quote-style">
|
|
10678
|
+
<fo:block-container margin-left="0mm" role="SKIP">
|
|
10679
|
+
<fo:block-container xsl:use-attribute-sets="quote-style" role="SKIP">
|
|
10574
10680
|
|
|
10575
10681
|
<xsl:call-template name="refine_quote-style"/>
|
|
10576
10682
|
|
|
10577
|
-
<fo:block-container margin-left="0mm" margin-right="0mm">
|
|
10683
|
+
<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
|
|
10578
10684
|
<fo:block role="BlockQuote">
|
|
10579
10685
|
<xsl:apply-templates select="./node()[not(local-name() = 'author') and not(local-name() = 'source')]"/> <!-- process all nested nodes, except author and source -->
|
|
10580
10686
|
</fo:block>
|
|
@@ -10730,10 +10836,10 @@
|
|
|
10730
10836
|
|
|
10731
10837
|
<xsl:choose>
|
|
10732
10838
|
<xsl:when test="$lang = 'zh'">
|
|
10733
|
-
<fo:inline><xsl:value-of select="$tab_zh"/></fo:inline>
|
|
10839
|
+
<fo:inline role="SKIP"><xsl:value-of select="$tab_zh"/></fo:inline>
|
|
10734
10840
|
</xsl:when>
|
|
10735
10841
|
<xsl:when test="../../@inline-header = 'true'">
|
|
10736
|
-
<fo:inline font-size="90%">
|
|
10842
|
+
<fo:inline font-size="90%" role="SKIP">
|
|
10737
10843
|
<xsl:call-template name="insertNonBreakSpaces">
|
|
10738
10844
|
<xsl:with-param name="count" select="$padding-right"/>
|
|
10739
10845
|
</xsl:call-template>
|
|
@@ -10741,7 +10847,7 @@
|
|
|
10741
10847
|
</xsl:when>
|
|
10742
10848
|
<xsl:otherwise>
|
|
10743
10849
|
<xsl:variable name="direction"><xsl:if test="$lang = 'ar'"><xsl:value-of select="$RLM"/></xsl:if></xsl:variable>
|
|
10744
|
-
<fo:inline padding-right="{$padding-right}mm"><xsl:value-of select="$direction"/></fo:inline>
|
|
10850
|
+
<fo:inline padding-right="{$padding-right}mm" role="SKIP"><xsl:value-of select="$direction"/></fo:inline>
|
|
10745
10851
|
</xsl:otherwise>
|
|
10746
10852
|
</xsl:choose>
|
|
10747
10853
|
|
|
@@ -10771,12 +10877,12 @@
|
|
|
10771
10877
|
<fo:block font-size="{normalize-space($font-size)}" role="H{$levelTerm}" xsl:use-attribute-sets="preferred-block-style">
|
|
10772
10878
|
|
|
10773
10879
|
<xsl:if test="parent::*[local-name() = 'term'] and not(preceding-sibling::*[local-name() = 'preferred'])"> <!-- if first preffered in term, then display term's name -->
|
|
10774
|
-
<fo:block xsl:use-attribute-sets="term-name-style">
|
|
10880
|
+
<fo:block xsl:use-attribute-sets="term-name-style" role="SKIP">
|
|
10775
10881
|
<xsl:apply-templates select="ancestor::*[local-name() = 'term'][1]/*[local-name() = 'name']"/>
|
|
10776
10882
|
</fo:block>
|
|
10777
10883
|
</xsl:if>
|
|
10778
10884
|
|
|
10779
|
-
<fo:block xsl:use-attribute-sets="preferred-term-style">
|
|
10885
|
+
<fo:block xsl:use-attribute-sets="preferred-term-style" role="SKIP">
|
|
10780
10886
|
<xsl:call-template name="setStyle_preferred"/>
|
|
10781
10887
|
<xsl:apply-templates/>
|
|
10782
10888
|
</fo:block>
|
|
@@ -10817,7 +10923,7 @@
|
|
|
10817
10923
|
<!-- definition -->
|
|
10818
10924
|
<!-- ========== -->
|
|
10819
10925
|
<xsl:template match="*[local-name() = 'definition']">
|
|
10820
|
-
<fo:block xsl:use-attribute-sets="definition-style">
|
|
10926
|
+
<fo:block xsl:use-attribute-sets="definition-style" role="SKIP">
|
|
10821
10927
|
<xsl:apply-templates/>
|
|
10822
10928
|
</fo:block>
|
|
10823
10929
|
</xsl:template>
|
|
@@ -10865,6 +10971,10 @@
|
|
|
10865
10971
|
|
|
10866
10972
|
<xsl:template match="*[local-name() = 'clause']">
|
|
10867
10973
|
<fo:block>
|
|
10974
|
+
<xsl:if test="parent::*[local-name() = 'copyright-statement']">
|
|
10975
|
+
<xsl:attribute name="role">SKIP</xsl:attribute>
|
|
10976
|
+
</xsl:if>
|
|
10977
|
+
|
|
10868
10978
|
<xsl:call-template name="setId"/>
|
|
10869
10979
|
|
|
10870
10980
|
<xsl:call-template name="setBlockSpanAll"/>
|
|
@@ -11101,7 +11211,7 @@
|
|
|
11101
11211
|
<xsl:template match="*[local-name() = 'ul'] | *[local-name() = 'ol']">
|
|
11102
11212
|
<xsl:choose>
|
|
11103
11213
|
<xsl:when test="parent::*[local-name() = 'note'] or parent::*[local-name() = 'termnote']">
|
|
11104
|
-
<fo:block-container>
|
|
11214
|
+
<fo:block-container role="SKIP">
|
|
11105
11215
|
<xsl:attribute name="margin-left">
|
|
11106
11216
|
<xsl:choose>
|
|
11107
11217
|
<xsl:when test="not(ancestor::*[local-name() = 'table'])"><xsl:value-of select="$note-body-indent"/></xsl:when>
|
|
@@ -11111,7 +11221,7 @@
|
|
|
11111
11221
|
|
|
11112
11222
|
<xsl:call-template name="refine_list_container_style"/>
|
|
11113
11223
|
|
|
11114
|
-
<fo:block-container margin-left="0mm">
|
|
11224
|
+
<fo:block-container margin-left="0mm" role="SKIP">
|
|
11115
11225
|
<fo:block>
|
|
11116
11226
|
<xsl:apply-templates select="." mode="list"/>
|
|
11117
11227
|
</fo:block>
|
|
@@ -11120,7 +11230,7 @@
|
|
|
11120
11230
|
</xsl:when>
|
|
11121
11231
|
<xsl:otherwise>
|
|
11122
11232
|
|
|
11123
|
-
<fo:block>
|
|
11233
|
+
<fo:block role="SKIP">
|
|
11124
11234
|
<xsl:apply-templates select="." mode="list"/>
|
|
11125
11235
|
</fo:block>
|
|
11126
11236
|
|
|
@@ -11538,7 +11648,16 @@
|
|
|
11538
11648
|
<!-- Reference sections (Normative References and Bibliography) -->
|
|
11539
11649
|
<!-- ========================================================== -->
|
|
11540
11650
|
<xsl:template match="*[local-name() = 'references'][@hidden='true']" priority="3"/>
|
|
11541
|
-
<xsl:template match="*[local-name() = 'bibitem'][@hidden='true']" priority="3"
|
|
11651
|
+
<xsl:template match="*[local-name() = 'bibitem'][@hidden='true']" priority="3">
|
|
11652
|
+
<xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][local-name() = 'bibitem'] and 1 = 1)"/>
|
|
11653
|
+
|
|
11654
|
+
<xsl:if test="ancestor::*[local-name() = 'references'][not(@normative='true')] or preceding-sibling::*[local-name() = 'references'][1][not(@normative='true')]">
|
|
11655
|
+
<xsl:apply-templates select="following-sibling::*[1][local-name() = 'bibitem']">
|
|
11656
|
+
<xsl:with-param name="skip" select="$skip"/>
|
|
11657
|
+
</xsl:apply-templates>
|
|
11658
|
+
</xsl:if>
|
|
11659
|
+
|
|
11660
|
+
</xsl:template>
|
|
11542
11661
|
<!-- don't display bibitem with @id starts with '_hidden', that was introduced for references integrity -->
|
|
11543
11662
|
<xsl:template match="*[local-name() = 'bibitem'][starts-with(@id, 'hidden_bibitem_')]" priority="3"/>
|
|
11544
11663
|
|
|
@@ -11585,36 +11704,60 @@
|
|
|
11585
11704
|
|
|
11586
11705
|
</xsl:template> <!-- bibitem -->
|
|
11587
11706
|
|
|
11707
|
+
<!-- start list for bibitem sequence -->
|
|
11708
|
+
<xsl:template match="*[local-name() = 'references'][not(@normative='true')]/*[local-name() = 'bibitem'][1]" priority="4">
|
|
11709
|
+
<xsl:variable name="list_items">
|
|
11710
|
+
<xsl:call-template name="insertListItem_Bibitem"/>
|
|
11711
|
+
</xsl:variable>
|
|
11712
|
+
<xsl:if test="normalize-space($list_items) != ''">
|
|
11713
|
+
<fo:list-block xsl:use-attribute-sets="bibitem-non-normative-list-style">
|
|
11714
|
+
<xsl:copy-of select="$list_items"/>
|
|
11715
|
+
</fo:list-block>
|
|
11716
|
+
</xsl:if>
|
|
11717
|
+
</xsl:template>
|
|
11718
|
+
|
|
11588
11719
|
<!-- Bibliography (non-normative references) -->
|
|
11589
11720
|
<xsl:template match="*[local-name() = 'references'][not(@normative='true')]/*[local-name() = 'bibitem']" name="bibitem_non_normative" priority="2">
|
|
11721
|
+
<xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][local-name() = 'bibitem'] and 1 = 1)"/> <!-- current bibiitem is non-first -->
|
|
11590
11722
|
|
|
11591
|
-
|
|
11592
|
-
|
|
11593
|
-
|
|
11594
|
-
|
|
11595
|
-
|
|
11596
|
-
|
|
11597
|
-
<fo:block role="SKIP">
|
|
11598
|
-
<fo:inline role="SKIP">
|
|
11599
|
-
|
|
11600
|
-
<xsl:apply-templates select="*[local-name() = 'biblio-tag']">
|
|
11601
|
-
<xsl:with-param name="biblio_tag_part">first</xsl:with-param>
|
|
11602
|
-
</xsl:apply-templates>
|
|
11603
|
-
</fo:inline>
|
|
11604
|
-
</fo:block>
|
|
11605
|
-
</fo:list-item-label>
|
|
11606
|
-
<fo:list-item-body start-indent="body-start()">
|
|
11607
|
-
<fo:block xsl:use-attribute-sets="bibitem-non-normative-list-body-style" role="SKIP">
|
|
11608
|
-
<xsl:call-template name="processBibitem">
|
|
11609
|
-
<xsl:with-param name="biblio_tag_part">last</xsl:with-param>
|
|
11610
|
-
</xsl:call-template>
|
|
11611
|
-
</fo:block>
|
|
11612
|
-
</fo:list-item-body>
|
|
11613
|
-
</fo:list-item>
|
|
11614
|
-
</fo:list-block>
|
|
11723
|
+
<xsl:choose>
|
|
11724
|
+
<xsl:when test="$skip = 'true'"><!-- skip bibitem --></xsl:when>
|
|
11725
|
+
<xsl:otherwise>
|
|
11726
|
+
<xsl:call-template name="insertListItem_Bibitem"/>
|
|
11727
|
+
</xsl:otherwise>
|
|
11728
|
+
</xsl:choose>
|
|
11615
11729
|
|
|
11616
11730
|
</xsl:template> <!-- references[not(@normative='true')]/bibitem -->
|
|
11617
11731
|
|
|
11732
|
+
<xsl:template name="insertListItem_Bibitem">
|
|
11733
|
+
<xsl:choose>
|
|
11734
|
+
<xsl:when test="@hidden = 'true'"><!-- skip --></xsl:when>
|
|
11735
|
+
<xsl:otherwise>
|
|
11736
|
+
<fo:list-item id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-list-item-style">
|
|
11737
|
+
<fo:list-item-label end-indent="label-end()">
|
|
11738
|
+
<fo:block role="SKIP">
|
|
11739
|
+
<fo:inline role="SKIP">
|
|
11740
|
+
<xsl:apply-templates select="*[local-name() = 'biblio-tag']">
|
|
11741
|
+
<xsl:with-param name="biblio_tag_part">first</xsl:with-param>
|
|
11742
|
+
</xsl:apply-templates>
|
|
11743
|
+
</fo:inline>
|
|
11744
|
+
</fo:block>
|
|
11745
|
+
</fo:list-item-label>
|
|
11746
|
+
<fo:list-item-body start-indent="body-start()">
|
|
11747
|
+
<fo:block xsl:use-attribute-sets="bibitem-non-normative-list-body-style" role="SKIP">
|
|
11748
|
+
<xsl:call-template name="processBibitem">
|
|
11749
|
+
<xsl:with-param name="biblio_tag_part">last</xsl:with-param>
|
|
11750
|
+
</xsl:call-template>
|
|
11751
|
+
</fo:block>
|
|
11752
|
+
</fo:list-item-body>
|
|
11753
|
+
</fo:list-item>
|
|
11754
|
+
</xsl:otherwise>
|
|
11755
|
+
</xsl:choose>
|
|
11756
|
+
<xsl:apply-templates select="following-sibling::*[1][local-name() = 'bibitem']">
|
|
11757
|
+
<xsl:with-param name="skip">false</xsl:with-param>
|
|
11758
|
+
</xsl:apply-templates>
|
|
11759
|
+
</xsl:template>
|
|
11760
|
+
|
|
11618
11761
|
<xsl:template name="processBibitem">
|
|
11619
11762
|
<xsl:param name="biblio_tag_part">both</xsl:param>
|
|
11620
11763
|
|