metanorma-csa 2.0.0 → 2.0.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/lib/isodoc/csa/csa.standard.xsl +1195 -1124
  3. data/lib/isodoc/csa/html/htmlstyle.css +21 -17
  4. data/lib/isodoc/csa/html/htmlstyle.scss +8 -2
  5. data/lib/metanorma/csa/version.rb +1 -1
  6. metadata +2 -2
data/lib/isodoc/csa/csa.standard.xsl CHANGED
@@ -42,7 +42,7 @@
42
42
 
43
43
  <xsl:template match="/">
44
44
  <xsl:call-template name="namespaceCheck"/>
45
- <fo:root font-family="Azo Sans, STIX Two Math" font-size="10pt" xml:lang="{$lang}">
45
+ <fo:root xsl:use-attribute-sets="root-style" xml:lang="{$lang}">
46
46
  <fo:layout-master-set>
47
47
  <!-- Cover page -->
48
48
  <fo:simple-page-master master-name="cover-page" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
@@ -264,10 +264,7 @@
264
264
  <!-- ============================= -->
265
265
  <!-- CONTENTS -->
266
266
  <!-- ============================= -->
267
- <xsl:template match="node()" mode="contents">
268
- <xsl:apply-templates mode="contents"/>
269
- </xsl:template>
270
-
267
+
271
268
  <!-- element with title -->
272
269
  <xsl:template match="*[csa:title]" mode="contents">
273
270
  <xsl:variable name="level">
@@ -482,7 +479,7 @@
482
479
  <!-- ====== -->
483
480
  <!-- ====== -->
484
481
 
485
- <xsl:template match="csa:p">
482
+ <xsl:template match="csa:p" name="paragraph">
486
483
  <xsl:param name="inline" select="'false'"/>
487
484
  <xsl:variable name="previous-element" select="local-name(preceding-sibling::*[1])"/>
488
485
  <xsl:variable name="element-name">
@@ -534,43 +531,6 @@
534
531
  </xsl:template>
535
532
 
536
533
 
537
- <xsl:template match="csa:bibitem">
538
- <fo:block id="{@id}" margin-bottom="12pt" start-indent="12mm" text-indent="-12mm" line-height="145%">
539
- <xsl:call-template name="processBibitem"/>
540
- </fo:block>
541
- </xsl:template>
542
-
543
-
544
- <xsl:template match="csa:bibitem/csa:note" priority="2">
545
- <fo:footnote>
546
- <xsl:variable name="number">
547
- <xsl:choose>
548
- <xsl:when test="ancestor::csa:references[preceding-sibling::csa:references]">
549
- <xsl:number level="any" count="csa:references[preceding-sibling::csa:references]//csa:bibitem/csa:note"/>
550
- </xsl:when>
551
- <xsl:otherwise>
552
- <xsl:number level="any" count="csa:bibitem/csa:note"/>
553
- </xsl:otherwise>
554
- </xsl:choose>
555
- </xsl:variable>
556
- <fo:inline font-size="65%" keep-with-previous.within-line="always" vertical-align="super"> <!-- 60% baseline-shift="35%" -->
557
- <fo:basic-link internal-destination="{generate-id()}" fox:alt-text="footnote {$number}">
558
- <xsl:value-of select="$number"/><!-- <xsl:text>)</xsl:text> -->
559
- </fo:basic-link>
560
- </fo:inline>
561
- <fo:footnote-body>
562
- <fo:block font-family="Azo Sans Lt" font-size="10pt" margin-bottom="12pt" start-indent="0pt" color="rgb(168, 170, 173)">
563
- <fo:inline id="{generate-id()}" keep-with-next.within-line="always" font-size="60%" vertical-align="super"><!-- baseline-shift="30%" padding-right="9mm" alignment-baseline="hanging" -->
564
- <xsl:value-of select="$number"/><!-- <xsl:text>)</xsl:text> -->
565
- </fo:inline>
566
- <xsl:apply-templates/>
567
- </fo:block>
568
- </fo:footnote-body>
569
- </fo:footnote>
570
- </xsl:template>
571
-
572
-
573
-
574
534
  <xsl:template match="csa:ul | csa:ol" mode="ul_ol">
575
535
  <xsl:choose>
576
536
  <xsl:when test="not(ancestor::csa:ul) and not(ancestor::csa:ol)">
@@ -652,8 +612,8 @@
652
612
  <fo:list-item-label><fo:block/></fo:list-item-label>
653
613
  <fo:list-item-body>
654
614
  <fo:block>
655
- <xsl:apply-templates select="csa:name" mode="presentation"/>
656
- <xsl:apply-templates/>
615
+ <xsl:apply-templates select="csa:name"/>
616
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
657
617
  </fo:block>
658
618
  </fo:list-item-body>
659
619
  </fo:list-item>
@@ -674,7 +634,7 @@
674
634
  </xsl:variable>
675
635
  <fo:block font-size="{$font-size}" role="H{$levelTerm}">
676
636
  <fo:block font-weight="bold" keep-with-next="always">
677
- <xsl:apply-templates select="ancestor::csa:term[1]/csa:name" mode="presentation"/>
637
+ <xsl:apply-templates select="ancestor::csa:term[1]/csa:name"/>
678
638
  </fo:block>
679
639
  <fo:block font-weight="bold" keep-with-next="always" line-height="1">
680
640
  <xsl:call-template name="setStyle_preferred"/>
@@ -684,106 +644,6 @@
684
644
  </xsl:template>
685
645
 
686
646
 
687
-
688
- <!-- [position() &gt; 1] -->
689
- <xsl:template match="csa:references[not(@normative='true')]">
690
- <fo:block break-after="page"/>
691
- <fo:block id="{@id}" line-height="145%">
692
- <xsl:apply-templates/>
693
- </fo:block>
694
- </xsl:template>
695
-
696
-
697
- <!-- Example: [1] ISO 9:1995, Information and documentation – Transliteration of Cyrillic characters into Latin characters – Slavic and non-Slavic languages -->
698
- <!-- <xsl:template match="csa:references[@id = '_bibliography']/csa:bibitem"> [position() &gt; 1] -->
699
- <xsl:template match="csa:references[not(@normative='true')]/csa:bibitem">
700
- <fo:block margin-bottom="12pt" line-height="145%">
701
- <fo:inline id="{@id}">
702
- <xsl:value-of select="csa:docidentifier[@type = 'metanorma-ordinal']"/>
703
- <xsl:if test="not(csa:docidentifier[@type = 'metanorma-ordinal'])">
704
- <xsl:number format="[1]"/>
705
- </xsl:if>
706
- </fo:inline>
707
-
708
- <xsl:if test="not(csa:formattedref)">
709
- <xsl:choose>
710
- <xsl:when test="csa:contributor[csa:role/@type='publisher']/csa:organization/csa:abbreviation">
711
- <xsl:for-each select="csa:contributor[csa:role/@type='publisher']/csa:organization/csa:abbreviation">
712
- <xsl:value-of select="."/>
713
- <xsl:if test="position() != last()">/</xsl:if>
714
- </xsl:for-each>
715
- <xsl:text>: </xsl:text>
716
- </xsl:when>
717
- <xsl:when test="csa:contributor[csa:role/@type='publisher']/csa:organization/csa:name">
718
- <xsl:value-of select="csa:contributor[csa:role/@type='publisher']/csa:organization/csa:name"/>
719
- <xsl:text>: </xsl:text>
720
- </xsl:when>
721
- </xsl:choose>
722
-
723
- </xsl:if>
724
-
725
- <xsl:if test="csa:docidentifier[not(@type = 'metanorma-ordinal')]">
726
- <xsl:choose>
727
- <xsl:when test="csa:docidentifier/@type = 'ISO' and csa:formattedref"/>
728
- <xsl:when test="csa:docidentifier/@type = 'OGC' and csa:formattedref"/>
729
- <xsl:otherwise><fo:inline>
730
- <!-- <xsl:if test="csa:docidentifier/@type = 'OGC'">OGC </xsl:if> -->
731
- <xsl:value-of select="csa:docidentifier[not(@type = 'metanorma-ordinal')]"/><xsl:apply-templates select="csa:note"/>, </fo:inline></xsl:otherwise>
732
- </xsl:choose>
733
- </xsl:if>
734
-
735
- <xsl:choose>
736
- <xsl:when test="csa:title[@type = 'main' and @language = 'en']">
737
- <xsl:apply-templates select="csa:title[@type = 'main' and @language = 'en']"/>
738
- </xsl:when>
739
- <xsl:otherwise>
740
- <xsl:apply-templates select="csa:title"/>
741
- </xsl:otherwise>
742
- </xsl:choose>
743
- <xsl:if test="csa:contributor[csa:role/@type='publisher']/csa:organization/csa:name">
744
- <xsl:text>, </xsl:text>
745
- <xsl:for-each select="csa:contributor[csa:role/@type='publisher']/csa:organization/csa:name">
746
- <xsl:if test="position() != last()">and </xsl:if>
747
- <xsl:value-of select="."/>
748
- </xsl:for-each>
749
-
750
- </xsl:if>
751
- <xsl:if test="csa:place">
752
- <xsl:text>, </xsl:text>
753
- <xsl:value-of select="csa:place"/>
754
- </xsl:if>
755
- <xsl:if test="csa:date[@type='published']/csa:on">
756
- <xsl:text> (</xsl:text><xsl:value-of select="csa:date[@type='published']/csa:on"/><xsl:text>).</xsl:text>
757
- </xsl:if>
758
- <xsl:apply-templates select="csa:formattedref"/>
759
-
760
-
761
- </fo:block>
762
- </xsl:template>
763
-
764
-
765
- <!-- <xsl:template match="csa:references[@id = '_bibliography']/csa:bibitem/csa:title"> [position() &gt; 1]-->
766
- <xsl:template match="csa:references[not(@normative='true')]/csa:bibitem/csa:title">
767
- <fo:inline font-style="italic">
768
- <xsl:apply-templates/>
769
- </fo:inline>
770
- </xsl:template>
771
-
772
-
773
-
774
- <xsl:template match="csa:admonition">
775
- <fo:block-container border="0.5pt solid rgb(79, 129, 189)" color="rgb(79, 129, 189)" margin-left="16mm" margin-right="16mm" margin-bottom="12pt">
776
- <fo:block-container margin-left="0mm" margin-right="0mm" padding="2mm" padding-top="3mm">
777
- <fo:block font-size="11pt" margin-bottom="6pt" font-weight="bold" font-style="italic" text-align="center">
778
- <xsl:value-of select="java:toUpperCase(java:java.lang.String.new(@type))"/>
779
- </fo:block>
780
- <fo:block font-style="italic">
781
- <xsl:apply-templates/>
782
- </fo:block>
783
- </fo:block-container>
784
- </fo:block-container>
785
- </xsl:template>
786
-
787
647
 
788
648
  <xsl:template match="csa:formula/csa:stem">
789
649
  <fo:block margin-top="6pt" margin-bottom="12pt">
@@ -799,7 +659,7 @@
799
659
  </fo:table-cell>
800
660
  <fo:table-cell display-align="center">
801
661
  <fo:block text-align="right">
802
- <xsl:apply-templates select="../csa:name" mode="presentation"/>
662
+ <xsl:apply-templates select="../csa:name" mode="formula_number"/>
803
663
  </fo:block>
804
664
  </fo:table-cell>
805
665
  </fo:table-row>
@@ -839,22 +699,18 @@
839
699
  <xsl:text>iVBORw0KGgoAAAANSUhEUgAAASEAAAEhCAYAAAAwHRYbAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA3BpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMDE0IDc5LjE1Njc5NywgMjAxNC8wOC8yMC0wOTo1MzowMiAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDplYWRhN2RlNC04YzAyLTQ1N2UtYjUwNy0zNGYzY2RjNWE2ZGQiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6MDUyNzBENDc3NjVCMTFFQTlDMDhGMEI2ODhENjUxQkIiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6MDUyNzBENDY3NjVCMTFFQTlDMDhGMEI2ODhENjUxQkIiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgSW5EZXNpZ24gMTQuMCAoTWFjaW50b3NoKSI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ1dWlkOmZiZjFiODZmLTIzMjMtM2U0OS1hMDMzLTVlOGQxYThlNmI1YiIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmlkOjFlMzVjZTE3LWU5NzAtNDQ1OS05ZjI0LTM1NzcwZWYzMjNjMiIvPiA8L3Jk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</xsl:text>
840
700
  </xsl:variable>
841
701
 
842
- <xsl:variable name="titles" select="xalan:nodeset($titles_)"/><xsl:variable name="titles_">
702
+ <xsl:variable name="titles_">
843
703
 
844
704
  <title-edition lang="en">
845
705
 
846
-
847
- <xsl:text>Version</xsl:text>
848
-
706
+ <xsl:text>Version</xsl:text>
707
+
849
708
  </title-edition>
850
709
 
851
710
  <title-edition lang="fr">
852
-
853
- <xsl:text>Édition </xsl:text>
854
-
711
+ <xsl:text>Édition </xsl:text>
855
712
  </title-edition>
856
713
 
857
-
858
714
  <!-- These titles of Table of contents renders different than determined in localized-strings -->
859
715
  <title-toc lang="en">
860
716
 
@@ -864,14 +720,13 @@
864
720
 
865
721
  </title-toc>
866
722
  <title-toc lang="fr">
723
+ <xsl:text>Sommaire</xsl:text>
724
+ </title-toc>
725
+ <title-toc lang="zh">
867
726
 
868
- <xsl:text>Sommaire</xsl:text>
869
-
727
+ <xsl:text>Contents</xsl:text>
728
+
870
729
  </title-toc>
871
-
872
- <title-toc lang="zh">Contents</title-toc>
873
-
874
-
875
730
 
876
731
  <title-descriptors lang="en">Descriptors</title-descriptors>
877
732
 
@@ -887,12 +742,8 @@
887
742
  </title-part>
888
743
  <title-part lang="zh">第 # 部分:</title-part>
889
744
 
890
- <title-subpart lang="en">
891
-
892
- </title-subpart>
893
- <title-subpart lang="fr">
894
-
895
- </title-subpart>
745
+ <title-subpart lang="en">Sub-part #</title-subpart>
746
+ <title-subpart lang="fr">Partie de sub #</title-subpart>
896
747
 
897
748
  <title-list-tables lang="en">List of Tables</title-list-tables>
898
749
 
@@ -907,7 +758,7 @@
907
758
  <title-continued lang="en">(continued)</title-continued>
908
759
  <title-continued lang="fr">(continué)</title-continued>
909
760
 
910
- </xsl:variable><xsl:variable name="bibdata">
761
+ </xsl:variable><xsl:variable name="titles" select="xalan:nodeset($titles_)"/><xsl:variable name="bibdata">
911
762
  <xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'bibdata']"/>
912
763
  <xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'localized-strings']"/>
913
764
  </xsl:variable><xsl:variable name="tab_zh">　</xsl:variable><xsl:template name="getTitle">
@@ -936,6 +787,23 @@
936
787
  </xsl:template><xsl:variable name="lower">abcdefghijklmnopqrstuvwxyz</xsl:variable><xsl:variable name="upper">ABCDEFGHIJKLMNOPQRSTUVWXYZ</xsl:variable><xsl:variable name="en_chars" select="concat($lower,$upper,',.`1234567890-=~!@#$%^*()_+[]{}\|?/')"/><xsl:variable name="linebreak" select="'&#8232;'"/><xsl:attribute-set name="root-style">
937
788
 
938
789
 
790
+
791
+ <xsl:attribute name="font-family">Azo Sans, STIX Two Math</xsl:attribute>
792
+ <xsl:attribute name="font-size">10pt</xsl:attribute>
793
+
794
+
795
+
796
+
797
+
798
+
799
+
800
+
801
+
802
+
803
+
804
+
805
+
806
+
939
807
  </xsl:attribute-set><xsl:attribute-set name="link-style">
940
808
 
941
809
 
@@ -945,6 +813,9 @@
945
813
  <xsl:attribute name="color">rgb(33, 94, 159)</xsl:attribute>
946
814
  <xsl:attribute name="text-decoration">underline</xsl:attribute>
947
815
 
816
+ </xsl:attribute-set><xsl:attribute-set name="sourcecode-container-style">
817
+ <xsl:attribute name="margin-left">0mm</xsl:attribute>
818
+
948
819
  </xsl:attribute-set><xsl:attribute-set name="sourcecode-style">
949
820
  <xsl:attribute name="white-space">pre</xsl:attribute>
950
821
  <xsl:attribute name="wrap-option">wrap</xsl:attribute>
@@ -959,10 +830,17 @@
959
830
 
960
831
 
961
832
 
833
+
834
+
835
+
836
+
837
+
962
838
 
963
839
 
964
840
 
965
841
 
842
+
843
+
966
844
  </xsl:attribute-set><xsl:attribute-set name="permission-style">
967
845
 
968
846
  </xsl:attribute-set><xsl:attribute-set name="permission-name-style">
@@ -1076,61 +954,52 @@
1076
954
 
1077
955
  </xsl:attribute-set><xsl:variable name="table-border_">
1078
956
 
1079
- </xsl:variable><xsl:variable name="table-border" select="normalize-space($table-border_)"/><xsl:attribute-set name="table-name-style">
1080
- <xsl:attribute name="keep-with-next">always</xsl:attribute>
1081
-
1082
-
957
+ </xsl:variable><xsl:variable name="table-border" select="normalize-space($table-border_)"/><xsl:attribute-set name="table-container-style">
958
+ <xsl:attribute name="margin-left">0mm</xsl:attribute>
959
+ <xsl:attribute name="margin-right">0mm</xsl:attribute>
1083
960
 
1084
961
 
1085
962
 
1086
-
1087
963
 
964
+
1088
965
 
1089
966
 
1090
-
1091
967
 
1092
968
 
1093
969
 
1094
970
 
1095
- </xsl:attribute-set><xsl:attribute-set name="table-footer-cell-style">
1096
971
 
1097
- </xsl:attribute-set><xsl:attribute-set name="appendix-style">
1098
972
 
1099
973
 
1100
974
 
1101
- </xsl:attribute-set><xsl:attribute-set name="appendix-example-style">
1102
975
 
1103
976
 
1104
977
 
1105
- </xsl:attribute-set><xsl:attribute-set name="xref-style">
1106
978
 
1107
979
 
1108
- <xsl:attribute name="text-decoration">underline</xsl:attribute>
980
+
1109
981
 
1110
982
 
983
+ </xsl:attribute-set><xsl:attribute-set name="table-style">
984
+ <xsl:attribute name="table-omit-footer-at-break">true</xsl:attribute>
985
+ <xsl:attribute name="table-layout">fixed</xsl:attribute>
986
+ <xsl:attribute name="margin-left">0mm</xsl:attribute>
987
+ <xsl:attribute name="margin-right">0mm</xsl:attribute>
1111
988
 
1112
989
 
1113
- </xsl:attribute-set><xsl:attribute-set name="eref-style">
1114
990
 
1115
991
 
1116
- <xsl:attribute name="color">rgb(33, 94, 159)</xsl:attribute>
1117
- <xsl:attribute name="text-decoration">underline</xsl:attribute>
992
+
1118
993
 
1119
994
 
1120
995
 
1121
996
 
1122
997
 
1123
- </xsl:attribute-set><xsl:attribute-set name="note-style">
1124
998
 
1125
999
 
1126
- <xsl:attribute name="font-size">10pt</xsl:attribute>
1127
- <xsl:attribute name="margin-top">12pt</xsl:attribute>
1128
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1129
- <xsl:attribute name="line-height">115%</xsl:attribute>
1130
1000
 
1131
1001
 
1132
1002
 
1133
-
1134
1003
 
1135
1004
 
1136
1005
 
@@ -1138,39 +1007,50 @@
1138
1007
 
1139
1008
 
1140
1009
 
1010
+ </xsl:attribute-set><xsl:attribute-set name="table-name-style">
1011
+ <xsl:attribute name="keep-with-next">always</xsl:attribute>
1012
+
1141
1013
 
1142
1014
 
1143
1015
 
1144
1016
 
1145
- </xsl:attribute-set><xsl:variable name="note-body-indent">10mm</xsl:variable><xsl:variable name="note-body-indent-table">5mm</xsl:variable><xsl:attribute-set name="note-name-style">
1017
+
1146
1018
 
1147
1019
 
1148
- <xsl:attribute name="padding-right">4mm</xsl:attribute>
1149
1020
 
1021
+
1150
1022
 
1151
1023
 
1152
1024
 
1153
1025
 
1026
+ </xsl:attribute-set><xsl:attribute-set name="table-row-style">
1027
+ <xsl:attribute name="min-height">4mm</xsl:attribute>
1154
1028
 
1155
1029
 
1156
1030
 
1157
1031
 
1032
+ </xsl:attribute-set><xsl:attribute-set name="table-header-row-style" use-attribute-sets="table-row-style">
1033
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
1158
1034
 
1159
1035
 
1160
1036
 
1161
- </xsl:attribute-set><xsl:attribute-set name="table-note-name-style">
1162
1037
 
1163
1038
 
1164
1039
 
1165
1040
 
1166
- </xsl:attribute-set><xsl:attribute-set name="note-p-style">
1041
+
1167
1042
 
1168
- <xsl:attribute name="margin-top">12pt</xsl:attribute>
1169
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1043
+ </xsl:attribute-set><xsl:attribute-set name="table-footer-row-style" use-attribute-sets="table-row-style">
1170
1044
 
1171
1045
 
1172
1046
 
1173
-
1047
+ </xsl:attribute-set><xsl:attribute-set name="table-body-row-style" use-attribute-sets="table-row-style">
1048
+
1049
+ </xsl:attribute-set><xsl:attribute-set name="table-header-cell-style">
1050
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
1051
+ <xsl:attribute name="border">solid black 1pt</xsl:attribute>
1052
+ <xsl:attribute name="padding-left">1mm</xsl:attribute>
1053
+ <xsl:attribute name="display-align">center</xsl:attribute>
1174
1054
 
1175
1055
 
1176
1056
 
@@ -1180,77 +1060,65 @@
1180
1060
 
1181
1061
 
1182
1062
 
1183
- </xsl:attribute-set><xsl:attribute-set name="termnote-style">
1184
1063
 
1185
1064
 
1186
- <xsl:attribute name="font-size">10pt</xsl:attribute>
1187
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1188
1065
 
1189
1066
 
1067
+ </xsl:attribute-set><xsl:attribute-set name="table-cell-style">
1068
+ <xsl:attribute name="display-align">center</xsl:attribute>
1069
+ <xsl:attribute name="border">solid black 1pt</xsl:attribute>
1070
+ <xsl:attribute name="padding-left">1mm</xsl:attribute>
1190
1071
 
1191
1072
 
1192
1073
 
1193
1074
 
1194
- </xsl:attribute-set><xsl:attribute-set name="termnote-name-style">
1195
1075
 
1196
-
1197
1076
 
1198
1077
 
1199
- </xsl:attribute-set><xsl:attribute-set name="quote-style">
1200
- <xsl:attribute name="role">BlockQuote</xsl:attribute>
1201
1078
 
1202
- <xsl:attribute name="margin-top">12pt</xsl:attribute>
1203
- <xsl:attribute name="margin-left">13mm</xsl:attribute>
1204
- <xsl:attribute name="margin-right">12mm</xsl:attribute>
1205
1079
 
1206
1080
 
1207
1081
 
1208
1082
 
1209
1083
 
1084
+ </xsl:attribute-set><xsl:attribute-set name="table-footer-cell-style">
1085
+ <xsl:attribute name="border">solid black 1pt</xsl:attribute>
1086
+ <xsl:attribute name="padding-left">1mm</xsl:attribute>
1087
+ <xsl:attribute name="padding-right">1mm</xsl:attribute>
1088
+ <xsl:attribute name="padding-top">1mm</xsl:attribute>
1210
1089
 
1211
1090
 
1212
- </xsl:attribute-set><xsl:attribute-set name="quote-source-style">
1213
1091
 
1214
- <xsl:attribute name="text-align">right</xsl:attribute>
1215
- <xsl:attribute name="margin-right">25mm</xsl:attribute>
1216
1092
 
1217
-
1218
-
1219
- </xsl:attribute-set><xsl:attribute-set name="termsource-style">
1220
1093
 
1221
1094
 
1222
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1223
- <xsl:attribute name="keep-with-previous">always</xsl:attribute>
1224
1095
 
1096
+
1225
1097
 
1226
1098
 
1227
1099
 
1100
+ </xsl:attribute-set><xsl:attribute-set name="table-note-style">
1101
+ <xsl:attribute name="font-size">10pt</xsl:attribute>
1102
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1228
1103
 
1229
1104
 
1230
- </xsl:attribute-set><xsl:attribute-set name="origin-style">
1231
1105
 
1232
- <xsl:attribute name="color">rgb(33, 94, 159)</xsl:attribute>
1233
- <xsl:attribute name="text-decoration">underline</xsl:attribute>
1234
1106
 
1235
1107
 
1236
1108
 
1237
1109
 
1238
- </xsl:attribute-set><xsl:attribute-set name="term-style">
1239
1110
 
1240
- </xsl:attribute-set><xsl:attribute-set name="figure-name-style">
1111
+ </xsl:attribute-set><xsl:attribute-set name="table-fn-style">
1112
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1241
1113
 
1242
1114
 
1243
1115
 
1244
- <xsl:attribute name="font-size">11pt</xsl:attribute>
1245
- <xsl:attribute name="font-weight">bold</xsl:attribute>
1246
- <xsl:attribute name="text-align">center</xsl:attribute>
1247
- <xsl:attribute name="margin-top">12pt</xsl:attribute>
1248
- <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
1249
- <xsl:attribute name="keep-with-previous">always</xsl:attribute>
1250
-
1251
1116
 
1252
1117
 
1253
1118
 
1119
+ </xsl:attribute-set><xsl:attribute-set name="table-fn-number-style">
1120
+ <xsl:attribute name="font-size">80%</xsl:attribute>
1121
+ <xsl:attribute name="padding-right">5mm</xsl:attribute>
1254
1122
 
1255
1123
 
1256
1124
 
@@ -1260,98 +1128,496 @@
1260
1128
 
1261
1129
 
1262
1130
 
1263
-
1264
1131
 
1265
1132
 
1266
1133
 
1267
-
1268
- </xsl:attribute-set><xsl:attribute-set name="formula-style">
1134
+ </xsl:attribute-set><xsl:attribute-set name="fn-container-body-style">
1135
+ <xsl:attribute name="text-indent">0</xsl:attribute>
1136
+ <xsl:attribute name="start-indent">0</xsl:attribute>
1269
1137
 
1270
- </xsl:attribute-set><xsl:attribute-set name="image-style">
1271
- <xsl:attribute name="text-align">center</xsl:attribute>
1272
1138
 
1139
+ </xsl:attribute-set><xsl:attribute-set name="table-fn-body-style">
1273
1140
 
1141
+ </xsl:attribute-set><xsl:attribute-set name="figure-fn-number-style">
1142
+ <xsl:attribute name="font-size">80%</xsl:attribute>
1143
+ <xsl:attribute name="padding-right">5mm</xsl:attribute>
1144
+ <xsl:attribute name="vertical-align">super</xsl:attribute>
1274
1145
 
1146
+ </xsl:attribute-set><xsl:attribute-set name="figure-fn-body-style">
1147
+ <xsl:attribute name="text-align">justify</xsl:attribute>
1148
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1275
1149
 
1150
+ </xsl:attribute-set><xsl:attribute-set name="dt-row-style">
1276
1151
 
1277
1152
 
1278
- </xsl:attribute-set><xsl:attribute-set name="figure-pseudocode-p-style">
1153
+ </xsl:attribute-set><xsl:attribute-set name="dt-style">
1154
+ <xsl:attribute name="margin-top">6pt</xsl:attribute>
1279
1155
 
1280
- </xsl:attribute-set><xsl:attribute-set name="image-graphic-style">
1281
1156
 
1282
1157
 
1283
- <xsl:attribute name="width">100%</xsl:attribute>
1284
- <xsl:attribute name="content-height">scale-to-fit</xsl:attribute>
1285
- <xsl:attribute name="scaling">uniform</xsl:attribute>
1286
1158
 
1287
1159
 
1288
1160
 
1289
-
1290
-
1291
- </xsl:attribute-set><xsl:attribute-set name="tt-style">
1292
1161
 
1293
- <xsl:attribute name="font-family">Source Code Pro</xsl:attribute>
1294
1162
 
1295
1163
 
1296
1164
 
1297
- </xsl:attribute-set><xsl:attribute-set name="sourcecode-name-style">
1298
- <xsl:attribute name="font-size">11pt</xsl:attribute>
1299
- <xsl:attribute name="font-weight">bold</xsl:attribute>
1300
- <xsl:attribute name="text-align">center</xsl:attribute>
1301
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1302
- <xsl:attribute name="keep-with-previous">always</xsl:attribute>
1165
+ </xsl:attribute-set><xsl:attribute-set name="appendix-style">
1303
1166
 
1304
- </xsl:attribute-set><xsl:attribute-set name="domain-style">
1305
-
1306
- </xsl:attribute-set><xsl:attribute-set name="admitted-style">
1307
1167
 
1308
1168
 
1169
+ </xsl:attribute-set><xsl:attribute-set name="appendix-example-style">
1309
1170
 
1310
- </xsl:attribute-set><xsl:attribute-set name="deprecates-style">
1311
1171
 
1312
1172
 
1313
- </xsl:attribute-set><xsl:attribute-set name="definition-style">
1173
+ </xsl:attribute-set><xsl:attribute-set name="xref-style">
1314
1174
 
1315
- <xsl:attribute name="space-after">6pt</xsl:attribute>
1316
1175
 
1176
+ <xsl:attribute name="text-decoration">underline</xsl:attribute>
1317
1177
 
1318
1178
 
1319
- </xsl:attribute-set><xsl:variable name="color-added-text">
1320
- <xsl:text>rgb(0, 255, 0)</xsl:text>
1321
- </xsl:variable><xsl:attribute-set name="add-style">
1322
- <xsl:attribute name="color">red</xsl:attribute>
1323
- <xsl:attribute name="text-decoration">underline</xsl:attribute>
1324
- <!-- <xsl:attribute name="color">black</xsl:attribute>
1325
- <xsl:attribute name="background-color"><xsl:value-of select="$color-added-text"/></xsl:attribute>
1326
- <xsl:attribute name="padding-top">1mm</xsl:attribute>
1327
- <xsl:attribute name="padding-bottom">0.5mm</xsl:attribute> -->
1328
- </xsl:attribute-set><xsl:variable name="color-deleted-text">
1329
- <xsl:text>red</xsl:text>
1330
- </xsl:variable><xsl:attribute-set name="del-style">
1331
- <xsl:attribute name="color"><xsl:value-of select="$color-deleted-text"/></xsl:attribute>
1332
- <xsl:attribute name="text-decoration">line-through</xsl:attribute>
1333
- </xsl:attribute-set><xsl:attribute-set name="mathml-style">
1334
- <xsl:attribute name="font-family">STIX Two Math</xsl:attribute>
1335
1179
 
1336
1180
 
1337
- </xsl:attribute-set><xsl:attribute-set name="list-style">
1181
+ </xsl:attribute-set><xsl:attribute-set name="eref-style">
1338
1182
 
1339
- </xsl:attribute-set><xsl:attribute-set name="toc-style">
1340
- <xsl:attribute name="line-height">135%</xsl:attribute>
1341
- </xsl:attribute-set><xsl:attribute-set name="fn-style">
1342
- <xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
1343
- </xsl:attribute-set><xsl:attribute-set name="fn-num-style">
1344
- <xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
1345
1183
 
1184
+ <xsl:attribute name="color">rgb(33, 94, 159)</xsl:attribute>
1185
+ <xsl:attribute name="text-decoration">underline</xsl:attribute>
1346
1186
 
1347
1187
 
1348
- <xsl:attribute name="font-size">65%</xsl:attribute>
1349
- <xsl:attribute name="vertical-align">super</xsl:attribute>
1350
1188
 
1351
1189
 
1352
1190
 
1191
+ </xsl:attribute-set><xsl:attribute-set name="note-style">
1353
1192
 
1354
1193
 
1194
+ <xsl:attribute name="font-size">10pt</xsl:attribute>
1195
+ <xsl:attribute name="margin-top">12pt</xsl:attribute>
1196
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1197
+ <xsl:attribute name="line-height">115%</xsl:attribute>
1198
+
1199
+
1200
+
1201
+
1202
+
1203
+
1204
+
1205
+
1206
+
1207
+
1208
+
1209
+
1210
+
1211
+
1212
+
1213
+ </xsl:attribute-set><xsl:variable name="note-body-indent">10mm</xsl:variable><xsl:variable name="note-body-indent-table">5mm</xsl:variable><xsl:attribute-set name="note-name-style">
1214
+
1215
+
1216
+ <xsl:attribute name="padding-right">4mm</xsl:attribute>
1217
+
1218
+
1219
+
1220
+
1221
+
1222
+
1223
+
1224
+
1225
+
1226
+
1227
+
1228
+
1229
+ </xsl:attribute-set><xsl:attribute-set name="table-note-name-style">
1230
+ <xsl:attribute name="padding-right">2mm</xsl:attribute>
1231
+
1232
+
1233
+
1234
+
1235
+ </xsl:attribute-set><xsl:attribute-set name="note-p-style">
1236
+
1237
+ <xsl:attribute name="margin-top">12pt</xsl:attribute>
1238
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1239
+
1240
+
1241
+
1242
+
1243
+
1244
+
1245
+
1246
+
1247
+
1248
+
1249
+
1250
+
1251
+
1252
+ </xsl:attribute-set><xsl:attribute-set name="termnote-style">
1253
+
1254
+
1255
+ <xsl:attribute name="font-size">10pt</xsl:attribute>
1256
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1257
+
1258
+
1259
+
1260
+
1261
+
1262
+
1263
+ </xsl:attribute-set><xsl:attribute-set name="termnote-name-style">
1264
+
1265
+
1266
+
1267
+
1268
+ </xsl:attribute-set><xsl:attribute-set name="quote-style">
1269
+ <xsl:attribute name="role">BlockQuote</xsl:attribute>
1270
+
1271
+ <xsl:attribute name="margin-top">12pt</xsl:attribute>
1272
+ <xsl:attribute name="margin-left">13mm</xsl:attribute>
1273
+ <xsl:attribute name="margin-right">12mm</xsl:attribute>
1274
+
1275
+
1276
+
1277
+
1278
+
1279
+
1280
+
1281
+ </xsl:attribute-set><xsl:attribute-set name="quote-source-style">
1282
+
1283
+ <xsl:attribute name="text-align">right</xsl:attribute>
1284
+ <xsl:attribute name="margin-right">25mm</xsl:attribute>
1285
+
1286
+
1287
+
1288
+ </xsl:attribute-set><xsl:attribute-set name="termsource-style">
1289
+
1290
+
1291
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1292
+ <xsl:attribute name="keep-with-previous">always</xsl:attribute>
1293
+
1294
+
1295
+
1296
+
1297
+
1298
+
1299
+ </xsl:attribute-set><xsl:attribute-set name="termsource-text-style">
1300
+
1301
+
1302
+ </xsl:attribute-set><xsl:attribute-set name="origin-style">
1303
+
1304
+ <xsl:attribute name="color">rgb(33, 94, 159)</xsl:attribute>
1305
+ <xsl:attribute name="text-decoration">underline</xsl:attribute>
1306
+
1307
+
1308
+
1309
+
1310
+ </xsl:attribute-set><xsl:attribute-set name="term-style">
1311
+
1312
+ </xsl:attribute-set><xsl:attribute-set name="figure-style">
1313
+
1314
+ </xsl:attribute-set><xsl:attribute-set name="figure-name-style">
1315
+
1316
+
1317
+
1318
+ <xsl:attribute name="font-size">11pt</xsl:attribute>
1319
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
1320
+ <xsl:attribute name="text-align">center</xsl:attribute>
1321
+ <xsl:attribute name="margin-top">12pt</xsl:attribute>
1322
+ <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
1323
+ <xsl:attribute name="keep-with-previous">always</xsl:attribute>
1324
+
1325
+
1326
+
1327
+
1328
+
1329
+
1330
+
1331
+
1332
+
1333
+
1334
+
1335
+
1336
+
1337
+
1338
+
1339
+
1340
+
1341
+
1342
+ </xsl:attribute-set><xsl:attribute-set name="formula-style">
1343
+
1344
+ </xsl:attribute-set><xsl:attribute-set name="image-style">
1345
+ <xsl:attribute name="text-align">center</xsl:attribute>
1346
+
1347
+
1348
+
1349
+
1350
+
1351
+
1352
+ </xsl:attribute-set><xsl:attribute-set name="figure-pseudocode-p-style">
1353
+
1354
+ </xsl:attribute-set><xsl:attribute-set name="image-graphic-style">
1355
+
1356
+
1357
+ <xsl:attribute name="width">100%</xsl:attribute>
1358
+ <xsl:attribute name="content-height">scale-to-fit</xsl:attribute>
1359
+ <xsl:attribute name="scaling">uniform</xsl:attribute>
1360
+
1361
+
1362
+
1363
+
1364
+
1365
+ </xsl:attribute-set><xsl:attribute-set name="tt-style">
1366
+
1367
+ <xsl:attribute name="font-family">Source Code Pro</xsl:attribute>
1368
+
1369
+
1370
+
1371
+ </xsl:attribute-set><xsl:attribute-set name="sourcecode-name-style">
1372
+ <xsl:attribute name="font-size">11pt</xsl:attribute>
1373
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
1374
+ <xsl:attribute name="text-align">center</xsl:attribute>
1375
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1376
+ <xsl:attribute name="keep-with-previous">always</xsl:attribute>
1377
+
1378
+ </xsl:attribute-set><xsl:attribute-set name="domain-style">
1379
+
1380
+ </xsl:attribute-set><xsl:attribute-set name="admitted-style">
1381
+
1382
+
1383
+
1384
+ </xsl:attribute-set><xsl:attribute-set name="deprecates-style">
1385
+
1386
+
1387
+ </xsl:attribute-set><xsl:attribute-set name="definition-style">
1388
+
1389
+ <xsl:attribute name="space-after">6pt</xsl:attribute>
1390
+
1391
+
1392
+
1393
+ </xsl:attribute-set><xsl:variable name="color-added-text">
1394
+ <xsl:text>rgb(0, 255, 0)</xsl:text>
1395
+ </xsl:variable><xsl:attribute-set name="add-style">
1396
+ <xsl:attribute name="color">red</xsl:attribute>
1397
+ <xsl:attribute name="text-decoration">underline</xsl:attribute>
1398
+ <!-- <xsl:attribute name="color">black</xsl:attribute>
1399
+ <xsl:attribute name="background-color"><xsl:value-of select="$color-added-text"/></xsl:attribute>
1400
+ <xsl:attribute name="padding-top">1mm</xsl:attribute>
1401
+ <xsl:attribute name="padding-bottom">0.5mm</xsl:attribute> -->
1402
+ </xsl:attribute-set><xsl:variable name="color-deleted-text">
1403
+ <xsl:text>red</xsl:text>
1404
+ </xsl:variable><xsl:attribute-set name="del-style">
1405
+ <xsl:attribute name="color"><xsl:value-of select="$color-deleted-text"/></xsl:attribute>
1406
+ <xsl:attribute name="text-decoration">line-through</xsl:attribute>
1407
+ </xsl:attribute-set><xsl:attribute-set name="mathml-style">
1408
+ <xsl:attribute name="font-family">STIX Two Math</xsl:attribute>
1409
+
1410
+
1411
+ </xsl:attribute-set><xsl:attribute-set name="list-style">
1412
+
1413
+ </xsl:attribute-set><xsl:attribute-set name="toc-style">
1414
+ <xsl:attribute name="line-height">135%</xsl:attribute>
1415
+ </xsl:attribute-set><xsl:attribute-set name="fn-reference-style">
1416
+ <xsl:attribute name="font-size">80%</xsl:attribute>
1417
+ <xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
1418
+
1419
+
1420
+
1421
+
1422
+
1423
+
1424
+
1425
+
1426
+ </xsl:attribute-set><xsl:attribute-set name="fn-style">
1427
+ <xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
1428
+ </xsl:attribute-set><xsl:attribute-set name="fn-num-style">
1429
+ <xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
1430
+
1431
+
1432
+
1433
+ <xsl:attribute name="font-size">65%</xsl:attribute>
1434
+ <xsl:attribute name="vertical-align">super</xsl:attribute>
1435
+
1436
+
1437
+
1438
+
1439
+
1440
+
1441
+
1442
+
1443
+
1444
+
1445
+
1446
+
1447
+
1448
+
1449
+ </xsl:attribute-set><xsl:attribute-set name="fn-body-style">
1450
+ <xsl:attribute name="font-weight">normal</xsl:attribute>
1451
+ <xsl:attribute name="font-style">normal</xsl:attribute>
1452
+ <xsl:attribute name="text-indent">0</xsl:attribute>
1453
+ <xsl:attribute name="start-indent">0</xsl:attribute>
1454
+
1455
+
1456
+
1457
+ <xsl:attribute name="font-family">Azo Sans Lt</xsl:attribute>
1458
+ <xsl:attribute name="font-size">10pt</xsl:attribute>
1459
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1460
+ <xsl:attribute name="color">rgb(168, 170, 173)</xsl:attribute>
1461
+ <xsl:attribute name="text-align">left</xsl:attribute>
1462
+
1463
+
1464
+
1465
+
1466
+
1467
+
1468
+
1469
+
1470
+
1471
+
1472
+
1473
+
1474
+
1475
+
1476
+
1477
+
1478
+ </xsl:attribute-set><xsl:attribute-set name="fn-body-num-style">
1479
+ <xsl:attribute name="keep-with-next.within-line">always</xsl:attribute>
1480
+
1481
+
1482
+
1483
+ <xsl:attribute name="font-size">60%</xsl:attribute>
1484
+ <xsl:attribute name="vertical-align">super</xsl:attribute>
1485
+
1486
+
1487
+
1488
+
1489
+
1490
+
1491
+
1492
+
1493
+
1494
+
1495
+
1496
+
1497
+
1498
+
1499
+
1500
+ </xsl:attribute-set><xsl:attribute-set name="admonition-style">
1501
+
1502
+ <xsl:attribute name="border">0.5pt solid rgb(79, 129, 189)</xsl:attribute>
1503
+ <xsl:attribute name="color">rgb(79, 129, 189)</xsl:attribute>
1504
+ <xsl:attribute name="margin-left">16mm</xsl:attribute>
1505
+ <xsl:attribute name="margin-right">16mm</xsl:attribute>
1506
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1507
+
1508
+
1509
+
1510
+
1511
+
1512
+
1513
+
1514
+
1515
+
1516
+
1517
+
1518
+
1519
+
1520
+
1521
+ </xsl:attribute-set><xsl:attribute-set name="admonition-container-style">
1522
+
1523
+ <xsl:attribute name="margin-left">0mm</xsl:attribute>
1524
+ <xsl:attribute name="margin-right">0mm</xsl:attribute>
1525
+ <xsl:attribute name="padding">2mm</xsl:attribute>
1526
+ <xsl:attribute name="padding-top">3mm</xsl:attribute>
1527
+
1528
+
1529
+
1530
+
1531
+
1532
+
1533
+
1534
+
1535
+
1536
+
1537
+ </xsl:attribute-set><xsl:attribute-set name="admonition-name-style">
1538
+ <xsl:attribute name="keep-with-next">always</xsl:attribute>
1539
+
1540
+ <xsl:attribute name="font-size">11pt</xsl:attribute>
1541
+ <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
1542
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
1543
+ <xsl:attribute name="font-style">italic</xsl:attribute>
1544
+ <xsl:attribute name="text-align">center</xsl:attribute>
1545
+
1546
+
1547
+
1548
+
1549
+
1550
+
1551
+
1552
+
1553
+
1554
+
1555
+
1556
+
1557
+
1558
+ </xsl:attribute-set><xsl:attribute-set name="admonition-p-style">
1559
+
1560
+ <xsl:attribute name="font-style">italic</xsl:attribute>
1561
+
1562
+
1563
+
1564
+
1565
+
1566
+
1567
+
1568
+
1569
+
1570
+
1571
+
1572
+ </xsl:attribute-set><xsl:attribute-set name="bibitem-normative-style">
1573
+
1574
+
1575
+
1576
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1577
+ <xsl:attribute name="start-indent">12mm</xsl:attribute>
1578
+ <xsl:attribute name="text-indent">-12mm</xsl:attribute>
1579
+ <xsl:attribute name="line-height">145%</xsl:attribute>
1580
+
1581
+
1582
+
1583
+
1584
+
1585
+
1586
+
1587
+
1588
+
1589
+
1590
+
1591
+
1592
+
1593
+
1594
+
1595
+
1596
+ </xsl:attribute-set><xsl:attribute-set name="bibitem-normative-list-style">
1597
+ <xsl:attribute name="provisional-distance-between-starts">12mm</xsl:attribute>
1598
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1599
+
1600
+
1601
+
1602
+
1603
+
1604
+
1605
+
1606
+
1607
+
1608
+
1609
+
1610
+ </xsl:attribute-set><xsl:attribute-set name="bibitem-non-normative-style">
1611
+
1612
+
1613
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1614
+ <xsl:attribute name="line-height">145%</xsl:attribute>
1615
+
1616
+
1617
+
1618
+ </xsl:attribute-set><xsl:attribute-set name="bibitem-non-normative-list-style">
1619
+ <xsl:attribute name="provisional-distance-between-starts">12mm</xsl:attribute>
1620
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1355
1621
 
1356
1622
 
1357
1623
 
@@ -1361,22 +1627,21 @@
1361
1627
 
1362
1628
 
1363
1629
 
1364
- </xsl:attribute-set><xsl:attribute-set name="fn-body-style">
1365
- <xsl:attribute name="font-weight">normal</xsl:attribute>
1366
- <xsl:attribute name="font-style">normal</xsl:attribute>
1367
- <xsl:attribute name="text-indent">0</xsl:attribute>
1368
- <xsl:attribute name="start-indent">0</xsl:attribute>
1369
1630
 
1370
1631
 
1632
+ </xsl:attribute-set><xsl:attribute-set name="bibitem-normative-list-body-style">
1633
+
1634
+
1635
+ </xsl:attribute-set><xsl:attribute-set name="bibitem-non-normative-list-body-style">
1371
1636
 
1372
- <xsl:attribute name="font-family">Azo Sans Lt</xsl:attribute>
1373
- <xsl:attribute name="font-size">10pt</xsl:attribute>
1374
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1375
- <xsl:attribute name="color">rgb(168, 170, 173)</xsl:attribute>
1376
- <xsl:attribute name="text-align">left</xsl:attribute>
1637
+
1638
+ </xsl:attribute-set><xsl:attribute-set name="bibitem-note-fn-style">
1639
+ <xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
1640
+ <xsl:attribute name="font-size">65%</xsl:attribute>
1377
1641
 
1378
1642
 
1379
1643
 
1644
+ <xsl:attribute name="vertical-align">super</xsl:attribute>
1380
1645
 
1381
1646
 
1382
1647
 
@@ -1390,7 +1655,8 @@
1390
1655
 
1391
1656
 
1392
1657
 
1393
- </xsl:attribute-set><xsl:attribute-set name="fn-body-num-style">
1658
+
1659
+ </xsl:attribute-set><xsl:attribute-set name="bibitem-note-fn-number-style">
1394
1660
  <xsl:attribute name="keep-with-next.within-line">always</xsl:attribute>
1395
1661
 
1396
1662
 
@@ -1411,31 +1677,35 @@
1411
1677
 
1412
1678
 
1413
1679
 
1680
+ </xsl:attribute-set><xsl:attribute-set name="bibitem-note-fn-body-style">
1681
+ <xsl:attribute name="font-size">10pt</xsl:attribute>
1682
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1683
+ <xsl:attribute name="start-indent">0pt</xsl:attribute>
1684
+
1685
+
1686
+ <xsl:attribute name="font-family">Azo Sans Lt</xsl:attribute>
1687
+ <xsl:attribute name="color">rgb(168, 170, 173)</xsl:attribute>
1688
+
1689
+
1690
+
1691
+
1692
+
1693
+
1694
+
1695
+
1696
+
1697
+
1698
+ </xsl:attribute-set><xsl:attribute-set name="references-non-normative-style">
1699
+
1700
+
1701
+ <xsl:attribute name="line-height">145%</xsl:attribute>
1414
1702
 
1415
- </xsl:attribute-set><xsl:variable name="border-block-added">2.5pt solid rgb(0, 176, 80)</xsl:variable><xsl:variable name="border-block-deleted">2.5pt solid rgb(255, 0, 0)</xsl:variable><xsl:variable name="ace_tag">ace-tag_</xsl:variable><xsl:template name="OLD_processPrefaceSectionsDefault_Contents">
1416
- <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='abstract']" mode="contents"/>
1417
- <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='foreword']" mode="contents"/>
1418
- <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='introduction']" mode="contents"/>
1419
- <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name() != 'abstract' and local-name() != 'foreword' and local-name() != 'introduction' and local-name() != 'acknowledgements']" mode="contents"/>
1420
- <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='acknowledgements']" mode="contents"/>
1421
- </xsl:template><xsl:template name="processPrefaceSectionsDefault_Contents">
1703
+
1704
+ </xsl:attribute-set><xsl:variable name="border-block-added">2.5pt solid rgb(0, 176, 80)</xsl:variable><xsl:variable name="border-block-deleted">2.5pt solid rgb(255, 0, 0)</xsl:variable><xsl:variable name="ace_tag">ace-tag_</xsl:variable><xsl:template name="processPrefaceSectionsDefault_Contents">
1422
1705
  <xsl:for-each select="/*/*[local-name()='preface']/*">
1423
1706
  <xsl:sort select="@displayorder" data-type="number"/>
1424
1707
  <xsl:apply-templates select="." mode="contents"/>
1425
1708
  </xsl:for-each>
1426
- </xsl:template><xsl:template name="OLD_processMainSectionsDefault_Contents">
1427
- <xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name()='clause'][@type='scope']" mode="contents"/>
1428
-
1429
- <!-- Normative references -->
1430
- <xsl:apply-templates select="/*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true'] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][@normative='true']]" mode="contents"/>
1431
- <!-- Terms and definitions -->
1432
- <xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name()='terms'] | /*/*[local-name()='sections']/*[local-name()='clause'][.//*[local-name()='terms']] | /*/*[local-name()='sections']/*[local-name()='definitions'] | /*/*[local-name()='sections']/*[local-name()='clause'][.//*[local-name()='definitions']]" mode="contents"/>
1433
- <!-- Another main sections -->
1434
- <xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name() != 'terms' and local-name() != 'definitions' and not(@type='scope') and not(local-name() = 'clause' and .//*[local-name()='terms']) and not(local-name() = 'clause' and .//*[local-name()='definitions'])]" mode="contents"/>
1435
- <xsl:apply-templates select="/*/*[local-name()='annex']" mode="contents"/>
1436
- <!-- Bibliography -->
1437
- <xsl:apply-templates select="/*/*[local-name()='bibliography']/*[local-name()='references'][not(@normative='true')] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]]" mode="contents"/>
1438
-
1439
1709
  </xsl:template><xsl:template name="processMainSectionsDefault_Contents">
1440
1710
 
1441
1711
  <xsl:for-each select="/*/*[local-name()='sections']/* | /*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true'] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][@normative='true']]">
@@ -1452,29 +1722,11 @@
1452
1722
  <xsl:sort select="@displayorder" data-type="number"/>
1453
1723
  <xsl:apply-templates select="." mode="contents"/>
1454
1724
  </xsl:for-each>
1455
- </xsl:template><xsl:template name="OLD_processPrefaceSectionsDefault">
1456
- <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='abstract']"/>
1457
- <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='foreword']"/>
1458
- <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='introduction']"/>
1459
- <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name() != 'abstract' and local-name() != 'foreword' and local-name() != 'introduction' and local-name() != 'acknowledgements']"/>
1460
- <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='acknowledgements']"/>
1461
1725
  </xsl:template><xsl:template name="processPrefaceSectionsDefault">
1462
1726
  <xsl:for-each select="/*/*[local-name()='preface']/*">
1463
1727
  <xsl:sort select="@displayorder" data-type="number"/>
1464
1728
  <xsl:apply-templates select="."/>
1465
1729
  </xsl:for-each>
1466
- </xsl:template><xsl:template name="OLD_processMainSectionsDefault">
1467
- <xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name()='clause'][@type='scope']"/>
1468
-
1469
- <!-- Normative references -->
1470
- <xsl:apply-templates select="/*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']"/>
1471
- <!-- Terms and definitions -->
1472
- <xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name()='terms'] | /*/*[local-name()='sections']/*[local-name()='clause'][.//*[local-name()='terms']] | /*/*[local-name()='sections']/*[local-name()='definitions'] | /*/*[local-name()='sections']/*[local-name()='clause'][.//*[local-name()='definitions']]"/>
1473
- <!-- Another main sections -->
1474
- <xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name() != 'terms' and local-name() != 'definitions' and not(@type='scope') and not(local-name() = 'clause' and .//*[local-name()='terms']) and not(local-name() = 'clause' and .//*[local-name()='definitions'])]"/>
1475
- <xsl:apply-templates select="/*/*[local-name()='annex']"/>
1476
- <!-- Bibliography -->
1477
- <xsl:apply-templates select="/*/*[local-name()='bibliography']/*[local-name()='references'][not(@normative='true')]"/>
1478
1730
  </xsl:template><xsl:template name="processMainSectionsDefault">
1479
1731
  <xsl:for-each select="/*/*[local-name()='sections']/* | /*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']">
1480
1732
  <xsl:sort select="@displayorder" data-type="number"/>
@@ -1511,41 +1763,17 @@
1511
1763
  <xsl:call-template name="getSimpleTable"/>
1512
1764
  </xsl:variable>
1513
1765
 
1514
- <!-- <xsl:if test="$namespace = 'bipm'">
1515
- <fo:block>&#xA0;</fo:block>
1516
- </xsl:if> -->
1517
-
1518
1766
 
1519
1767
  <!-- Display table's name before table as standalone block -->
1520
1768
  <!-- $namespace = 'iso' or -->
1521
1769
 
1522
- <xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
1523
-
1524
-
1525
-
1770
+ <xsl:apply-templates select="*[local-name()='name']"/> <!-- table's title rendered before table -->
1771
+
1526
1772
 
1527
1773
 
1528
-
1529
1774
 
1530
1775
  <xsl:variable name="cols-count" select="count(xalan:nodeset($simple-table)/*/tr[1]/td)"/>
1531
1776
 
1532
- <!-- <xsl:variable name="cols-count">
1533
- <xsl:choose>
1534
- <xsl:when test="*[local-name()='thead']">
1535
- <xsl:call-template name="calculate-columns-numbers">
1536
- <xsl:with-param name="table-row" select="*[local-name()='thead']/*[local-name()='tr'][1]"/>
1537
- </xsl:call-template>
1538
- </xsl:when>
1539
- <xsl:otherwise>
1540
- <xsl:call-template name="calculate-columns-numbers">
1541
- <xsl:with-param name="table-row" select="*[local-name()='tbody']/*[local-name()='tr'][1]"/>
1542
- </xsl:call-template>
1543
- </xsl:otherwise>
1544
- </xsl:choose>
1545
- </xsl:variable> -->
1546
- <!-- cols-count=<xsl:copy-of select="$cols-count"/> -->
1547
- <!-- cols-count2=<xsl:copy-of select="$cols-count2"/> -->
1548
-
1549
1777
  <xsl:variable name="colwidths">
1550
1778
  <xsl:if test="not(*[local-name()='colgroup']/*[local-name()='col'])">
1551
1779
  <xsl:call-template name="calculate-column-widths">
@@ -1556,17 +1784,8 @@
1556
1784
  </xsl:variable>
1557
1785
  <!-- colwidths=<xsl:copy-of select="$colwidths"/> -->
1558
1786
 
1559
- <!-- <xsl:variable name="colwidths2">
1560
- <xsl:call-template name="calculate-column-widths">
1561
- <xsl:with-param name="cols-count" select="$cols-count"/>
1562
- </xsl:call-template>
1563
- </xsl:variable> -->
1564
-
1565
- <!-- cols-count=<xsl:copy-of select="$cols-count"/>
1566
- colwidthsNew=<xsl:copy-of select="$colwidths"/>
1567
- colwidthsOld=<xsl:copy-of select="$colwidths2"/>z -->
1568
1787
 
1569
- <xsl:variable name="margin-left">
1788
+ <xsl:variable name="margin-side">
1570
1789
  <xsl:choose>
1571
1790
  <xsl:when test="sum(xalan:nodeset($colwidths)//column) &gt; 75">15</xsl:when>
1572
1791
  <xsl:otherwise>0</xsl:otherwise>
@@ -1574,63 +1793,67 @@
1574
1793
  </xsl:variable>
1575
1794
 
1576
1795
 
1577
- <fo:block-container margin-left="-{$margin-left}mm" margin-right="-{$margin-left}mm">
1578
-
1579
-
1580
-
1581
-
1582
-
1583
-
1796
+ <fo:block-container xsl:use-attribute-sets="table-container-style">
1797
+
1584
1798
 
1799
+ <xsl:attribute name="margin-left"><xsl:value-of select="-$margin-side"/>mm</xsl:attribute>
1800
+ <xsl:attribute name="margin-right"><xsl:value-of select="-$margin-side"/>mm</xsl:attribute>
1585
1801
 
1586
-
1802
+
1587
1803
 
1804
+
1588
1805
 
1806
+
1589
1807
 
1590
1808
 
1591
1809
 
1810
+
1592
1811
 
1593
1812
 
1594
1813
 
1595
1814
 
1596
1815
 
1816
+ <!-- end table block-container attributes -->
1597
1817
 
1598
1818
  <!-- display table's name before table for PAS inside block-container (2-columnn layout) -->
1599
1819
 
1600
1820
 
1821
+ <xsl:variable name="table_width_default">100%</xsl:variable>
1601
1822
  <xsl:variable name="table_width">
1602
1823
  <!-- for centered table always 100% (@width will be set for middle/second cell of outer table) -->
1603
- 100%
1604
-
1605
-
1824
+ <xsl:value-of select="$table_width_default"/>
1606
1825
  </xsl:variable>
1607
1826
 
1827
+
1608
1828
  <xsl:variable name="table_attributes">
1609
- <attribute name="table-layout">fixed</attribute>
1610
- <attribute name="width"><xsl:value-of select="normalize-space($table_width)"/></attribute>
1611
- <attribute name="margin-left"><xsl:value-of select="$margin-left"/>mm</attribute>
1612
- <attribute name="margin-right"><xsl:value-of select="$margin-left"/>mm</attribute>
1613
-
1614
-
1615
-
1616
-
1617
-
1618
-
1619
-
1620
-
1621
-
1622
-
1623
-
1624
-
1625
-
1626
-
1829
+
1830
+ <xsl:element name="table_attributes" use-attribute-sets="table-style">
1831
+ <xsl:attribute name="width"><xsl:value-of select="normalize-space($table_width)"/></xsl:attribute>
1832
+
1833
+
1834
+ <xsl:attribute name="margin-left"><xsl:value-of select="$margin-side"/>mm</xsl:attribute>
1835
+ <xsl:attribute name="margin-right"><xsl:value-of select="$margin-side"/>mm</xsl:attribute>
1836
+
1837
+
1838
+
1839
+
1840
+
1841
+
1842
+
1843
+
1844
+
1845
+
1846
+
1847
+
1848
+
1849
+ </xsl:element>
1627
1850
  </xsl:variable>
1628
1851
 
1629
1852
 
1630
- <fo:table id="{@id}" table-omit-footer-at-break="true">
1853
+ <fo:table id="{@id}">
1631
1854
 
1632
- <xsl:for-each select="xalan:nodeset($table_attributes)/attribute">
1633
- <xsl:attribute name="{@name}">
1855
+ <xsl:for-each select="xalan:nodeset($table_attributes)/table_attributes/@*">
1856
+ <xsl:attribute name="{local-name()}">
1634
1857
  <xsl:value-of select="."/>
1635
1858
  </xsl:attribute>
1636
1859
  </xsl:for-each>
@@ -1641,7 +1864,6 @@
1641
1864
  </xsl:if>
1642
1865
 
1643
1866
 
1644
-
1645
1867
  <xsl:choose>
1646
1868
  <xsl:when test="*[local-name()='colgroup']/*[local-name()='col']">
1647
1869
  <xsl:for-each select="*[local-name()='colgroup']/*[local-name()='col']">
@@ -1667,7 +1889,7 @@
1667
1889
  <xsl:apply-templates select="*[local-name()='thead']" mode="process_tbody"/>
1668
1890
  </xsl:when>
1669
1891
  <xsl:otherwise>
1670
- <xsl:apply-templates/>
1892
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
1671
1893
  </xsl:otherwise>
1672
1894
  </xsl:choose>
1673
1895
 
@@ -1682,25 +1904,6 @@
1682
1904
  </xsl:call-template>
1683
1905
  </xsl:for-each>
1684
1906
 
1685
- <!-- insert footer as table -->
1686
- <!-- <fo:table>
1687
- <xsl:for-each select="xalan::nodeset($table_attributes)/attribute">
1688
- <xsl:attribute name="{@name}">
1689
- <xsl:value-of select="."/>
1690
- </xsl:attribute>
1691
- </xsl:for-each>
1692
-
1693
- <xsl:for-each select="xalan:nodeset($colwidths)//column">
1694
- <xsl:choose>
1695
- <xsl:when test=". = 1 or . = 0">
1696
- <fo:table-column column-width="proportional-column-width(2)"/>
1697
- </xsl:when>
1698
- <xsl:otherwise>
1699
- <fo:table-column column-width="proportional-column-width({.})"/>
1700
- </xsl:otherwise>
1701
- </xsl:choose>
1702
- </xsl:for-each>
1703
- </fo:table>-->
1704
1907
 
1705
1908
 
1706
1909
 
@@ -1761,18 +1964,17 @@
1761
1964
  </xsl:otherwise>
1762
1965
  </xsl:choose>
1763
1966
 
1764
- </xsl:template><xsl:template match="*[local-name()='table']/*[local-name() = 'name']"/><xsl:template match="*[local-name()='table']/*[local-name() = 'name']" mode="presentation">
1967
+ </xsl:template><xsl:template match="*[local-name()='table']/*[local-name() = 'name']">
1765
1968
  <xsl:param name="continued"/>
1766
1969
  <xsl:if test="normalize-space() != ''">
1767
1970
  <fo:block xsl:use-attribute-sets="table-name-style">
1768
-
1971
+
1769
1972
 
1770
1973
 
1771
1974
 
1772
1975
 
1773
1976
  <xsl:choose>
1774
1977
  <xsl:when test="$continued = 'true'">
1775
- <!-- <xsl:if test="$namespace = 'bsi'"></xsl:if> -->
1776
1978
 
1777
1979
  </xsl:when>
1778
1980
  <xsl:otherwise>
@@ -1835,13 +2037,6 @@
1835
2037
  <xsl:for-each select="xalan:nodeset($table)/*/tr">
1836
2038
  <xsl:variable name="td_text">
1837
2039
  <xsl:apply-templates select="td[$curr-col]" mode="td_text"/>
1838
-
1839
- <!-- <xsl:if test="$namespace = 'bipm'">
1840
- <xsl:for-each select="*[local-name()='td'][$curr-col]//*[local-name()='math']">
1841
- <word><xsl:value-of select="normalize-space(.)"/></word>
1842
- </xsl:for-each>
1843
- </xsl:if> -->
1844
-
1845
2040
  </xsl:variable>
1846
2041
  <xsl:variable name="words">
1847
2042
  <xsl:variable name="string_with_added_zerospaces">
@@ -1878,7 +2073,6 @@
1878
2073
  </xsl:otherwise>
1879
2074
  </xsl:choose>
1880
2075
  </xsl:variable>
1881
-
1882
2076
 
1883
2077
  <column>
1884
2078
  <xsl:for-each select="xalan:nodeset($widths)//width">
@@ -1914,7 +2108,6 @@
1914
2108
  <xsl:value-of select="translate($math_text, ' ', '#')"/><!-- mathml images as one 'word' without spaces -->
1915
2109
  </xsl:template><xsl:template match="*[local-name()='table2']"/><xsl:template match="*[local-name()='thead']"/><xsl:template match="*[local-name()='thead']" mode="process">
1916
2110
  <xsl:param name="cols-count"/>
1917
- <!-- font-weight="bold" -->
1918
2111
  <fo:table-header>
1919
2112
 
1920
2113
 
@@ -1926,13 +2119,12 @@
1926
2119
  <fo:table-row>
1927
2120
  <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">
1928
2121
 
1929
- <xsl:apply-templates select="ancestor::*[local-name()='table']/*[local-name()='name']" mode="presentation">
2122
+ <xsl:apply-templates select="ancestor::*[local-name()='table']/*[local-name()='name']">
1930
2123
  <xsl:with-param name="continued">true</xsl:with-param>
1931
2124
  </xsl:apply-templates>
1932
2125
 
1933
2126
 
1934
2127
 
1935
-
1936
2128
  </fo:table-cell>
1937
2129
  </fo:table-row>
1938
2130
  </xsl:template><xsl:template match="*[local-name()='thead']" mode="process_tbody">
@@ -1948,64 +2140,6 @@
1948
2140
  <xsl:apply-templates select="../*[local-name()='tfoot']" mode="process"/>
1949
2141
  </fo:table-footer>
1950
2142
  </xsl:if>
1951
- </xsl:template><xsl:template name="insertTableFooter2">
1952
- <xsl:param name="cols-count"/>
1953
- <xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ..//*[local-name()='fn'][local-name(..) != 'name']"/>
1954
- <xsl:if test="../*[local-name()='tfoot'] or $isNoteOrFnExist = 'true'">
1955
-
1956
- <fo:table-footer>
1957
-
1958
- <xsl:apply-templates select="../*[local-name()='tfoot']" mode="process"/>
1959
-
1960
- <!-- if there are note(s) or fn(s) then create footer row -->
1961
- <xsl:if test="$isNoteOrFnExist = 'true'">
1962
-
1963
-
1964
-
1965
- <fo:table-row>
1966
- <fo:table-cell border="solid black 1pt" padding-left="1mm" padding-right="1mm" padding-top="1mm" number-columns-spanned="{$cols-count}">
1967
-
1968
-
1969
-
1970
- <!-- fn will be processed inside 'note' processing -->
1971
-
1972
-
1973
-
1974
-
1975
-
1976
-
1977
- <!-- except gb -->
1978
-
1979
- <xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
1980
-
1981
-
1982
- <!-- show Note under table in preface (ex. abstract) sections -->
1983
- <!-- empty, because notes show at page side in main sections -->
1984
- <!-- <xsl:if test="$namespace = 'bipm'">
1985
- <xsl:choose>
1986
- <xsl:when test="ancestor::*[local-name()='preface']">
1987
- <xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
1988
- </xsl:when>
1989
- <xsl:otherwise>
1990
- <fo:block/>
1991
- </xsl:otherwise>
1992
- </xsl:choose>
1993
- </xsl:if> -->
1994
-
1995
-
1996
- <!-- horizontal row separator -->
1997
-
1998
-
1999
- <!-- fn processing -->
2000
- <xsl:call-template name="fn_display"/>
2001
-
2002
- </fo:table-cell>
2003
- </fo:table-row>
2004
-
2005
- </xsl:if>
2006
- </fo:table-footer>
2007
-
2008
- </xsl:if>
2009
2143
  </xsl:template><xsl:template name="insertTableFooterInSeparateTable">
2010
2144
  <xsl:param name="table_attributes"/>
2011
2145
  <xsl:param name="colwidths"/>
@@ -2031,17 +2165,18 @@
2031
2165
  </xsl:variable>
2032
2166
 
2033
2167
  <fo:table keep-with-previous="always">
2034
- <xsl:for-each select="xalan:nodeset($table_attributes)/attribute">
2168
+ <xsl:for-each select="xalan:nodeset($table_attributes)/table_attributes/@*">
2169
+ <xsl:variable name="name" select="local-name()"/>
2035
2170
  <xsl:choose>
2036
- <xsl:when test="@name = 'border-top'">
2037
- <xsl:attribute name="{@name}">0pt solid black</xsl:attribute>
2171
+ <xsl:when test="$name = 'border-top'">
2172
+ <xsl:attribute name="{$name}">0pt solid black</xsl:attribute>
2038
2173
  </xsl:when>
2039
- <xsl:when test="@name = 'border'">
2040
- <xsl:attribute name="{@name}"><xsl:value-of select="."/></xsl:attribute>
2174
+ <xsl:when test="$name = 'border'">
2175
+ <xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
2041
2176
  <xsl:attribute name="border-top">0pt solid black</xsl:attribute>
2042
2177
  </xsl:when>
2043
2178
  <xsl:otherwise>
2044
- <xsl:attribute name="{@name}"><xsl:value-of select="."/></xsl:attribute>
2179
+ <xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
2045
2180
  </xsl:otherwise>
2046
2181
  </xsl:choose>
2047
2182
  </xsl:for-each>
@@ -2070,9 +2205,10 @@
2070
2205
 
2071
2206
  <fo:table-body>
2072
2207
  <fo:table-row>
2073
- <fo:table-cell border="solid black 1pt" padding-left="1mm" padding-right="1mm" padding-top="1mm" number-columns-spanned="{$cols-count}">
2208
+ <fo:table-cell xsl:use-attribute-sets="table-footer-cell-style" number-columns-spanned="{$cols-count}">
2074
2209
 
2075
2210
 
2211
+
2076
2212
 
2077
2213
 
2078
2214
  <!-- fn will be processed inside 'note' processing -->
@@ -2082,37 +2218,20 @@
2082
2218
 
2083
2219
 
2084
2220
 
2085
-
2086
-
2087
-
2088
2221
  <!-- for BSI (not PAS) display Notes before footnotes -->
2089
2222
 
2090
2223
 
2091
- <!-- except gb -->
2092
-
2093
- <xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
2094
-
2224
+ <!-- except gb and bsi -->
2095
2225
 
2096
- <!-- <xsl:if test="$namespace = 'bipm'">
2097
- <xsl:choose>
2098
- <xsl:when test="ancestor::*[local-name()='preface']">
2099
- show Note under table in preface (ex. abstract) sections
2100
- <xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
2101
- </xsl:when>
2102
- <xsl:otherwise>
2103
- empty, because notes show at page side in main sections
2104
- <fo:block/>
2105
- </xsl:otherwise>
2106
- </xsl:choose>
2107
- </xsl:if> -->
2226
+ <xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
2227
+
2108
2228
 
2109
2229
 
2110
2230
  <!-- horizontal row separator -->
2111
2231
 
2112
2232
 
2113
2233
  <!-- fn processing -->
2114
- <xsl:call-template name="fn_display"/>
2115
-
2234
+ <xsl:call-template name="table_fn_display"/>
2116
2235
 
2117
2236
  <!-- for PAS display Notes after footnotes -->
2118
2237
 
@@ -2154,78 +2273,57 @@
2154
2273
 
2155
2274
 
2156
2275
  <xsl:apply-templates/>
2157
- <!-- <xsl:apply-templates select="../*[local-name()='tfoot']" mode="process"/> -->
2158
-
2276
+
2159
2277
  </fo:table-body>
2160
2278
 
2161
- </xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='name']/text()[1]" priority="2" mode="presentation_name">
2162
- <xsl:choose>
2163
- <xsl:when test="substring-after(., '—') != ''">
2164
- <xsl:text>—</xsl:text><xsl:value-of select="substring-after(., '—')"/>
2165
- </xsl:when>
2166
- <xsl:otherwise>
2167
- <xsl:value-of select="."/>
2168
- </xsl:otherwise>
2169
- </xsl:choose>
2170
- </xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='name']" mode="presentation_name">
2171
- <xsl:apply-templates mode="presentation_name"/>
2172
- </xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='name']/node()" mode="presentation_name">
2173
- <xsl:apply-templates select="."/>
2174
- </xsl:template><xsl:template match="*[local-name()='tr']">
2175
- <xsl:variable name="parent-name" select="local-name(..)"/>
2176
- <!-- <xsl:variable name="namespace" select="substring-before(name(/*), '-')"/> -->
2177
- <fo:table-row min-height="4mm">
2178
- <xsl:if test="$parent-name = 'thead'">
2179
- <xsl:attribute name="font-weight">bold</xsl:attribute>
2180
-
2181
-
2182
-
2183
-
2184
-
2185
-
2186
-
2187
-
2188
- </xsl:if>
2189
- <xsl:if test="$parent-name = 'tfoot'">
2190
-
2191
-
2192
-
2193
- </xsl:if>
2194
-
2195
-
2196
-
2197
-
2198
-
2199
-
2200
-
2201
-
2202
-
2203
-
2204
- <!-- <xsl:if test="$namespace = 'bipm'">
2205
- <xsl:attribute name="height">8mm</xsl:attribute>
2206
- </xsl:if> -->
2207
-
2279
+ </xsl:template><xsl:template match="*[local-name()='thead']/*[local-name()='tr']" priority="2">
2280
+ <fo:table-row xsl:use-attribute-sets="table-header-row-style">
2281
+
2282
+
2283
+
2284
+
2285
+
2286
+
2287
+
2288
+ <xsl:call-template name="setTableRowAttributes"/>
2289
+
2208
2290
  <xsl:apply-templates/>
2209
2291
  </fo:table-row>
2210
- </xsl:template><xsl:template match="*[local-name()='th']">
2211
- <fo:table-cell text-align="{@align}" font-weight="bold" border="solid black 1pt" padding-left="1mm" display-align="center">
2212
- <xsl:attribute name="text-align">
2213
- <xsl:choose>
2214
- <xsl:when test="@align">
2215
- <xsl:call-template name="setAlignment"/>
2216
- <!-- <xsl:value-of select="@align"/> -->
2217
- </xsl:when>
2218
- <xsl:otherwise>center</xsl:otherwise>
2219
- </xsl:choose>
2220
- </xsl:attribute>
2221
-
2292
+ </xsl:template><xsl:template match="*[local-name()='tfoot']/*[local-name()='tr']" priority="2">
2293
+ <fo:table-row xsl:use-attribute-sets="table-footer-row-style">
2222
2294
 
2295
+ <xsl:call-template name="setTableRowAttributes"/>
2296
+ <xsl:apply-templates/>
2297
+ </fo:table-row>
2298
+ </xsl:template><xsl:template match="*[local-name()='tr']">
2299
+ <fo:table-row xsl:use-attribute-sets="table-body-row-style">
2300
+
2223
2301
 
2302
+
2224
2303
 
2304
+
2305
+ <xsl:call-template name="setTableRowAttributes"/>
2306
+ <xsl:apply-templates/>
2307
+ </fo:table-row>
2308
+ </xsl:template><xsl:template name="setTableRowAttributes">
2309
+
2310
+
2311
+
2312
+
2313
+
2314
+
2315
+
2316
+
2317
+ </xsl:template><xsl:template match="*[local-name()='th']">
2318
+ <fo:table-cell xsl:use-attribute-sets="table-header-cell-style"> <!-- text-align="{@align}" -->
2319
+ <xsl:call-template name="setTextAlignment">
2320
+ <xsl:with-param name="default">center</xsl:with-param>
2321
+ </xsl:call-template>
2225
2322
 
2226
2323
 
2227
2324
 
2228
2325
 
2326
+
2229
2327
 
2230
2328
 
2231
2329
 
@@ -2234,21 +2332,25 @@
2234
2332
  <xsl:if test="$lang = 'ar'">
2235
2333
  <xsl:attribute name="padding-right">1mm</xsl:attribute>
2236
2334
  </xsl:if>
2237
- <xsl:if test="@colspan">
2238
- <xsl:attribute name="number-columns-spanned">
2239
- <xsl:value-of select="@colspan"/>
2240
- </xsl:attribute>
2241
- </xsl:if>
2242
- <xsl:if test="@rowspan">
2243
- <xsl:attribute name="number-rows-spanned">
2244
- <xsl:value-of select="@rowspan"/>
2245
- </xsl:attribute>
2246
- </xsl:if>
2247
- <xsl:call-template name="display-align"/>
2335
+
2336
+ <xsl:call-template name="setTableCellAttributes"/>
2337
+
2248
2338
  <fo:block>
2249
2339
  <xsl:apply-templates/>
2250
2340
  </fo:block>
2251
2341
  </fo:table-cell>
2342
+ </xsl:template><xsl:template name="setTableCellAttributes">
2343
+ <xsl:if test="@colspan">
2344
+ <xsl:attribute name="number-columns-spanned">
2345
+ <xsl:value-of select="@colspan"/>
2346
+ </xsl:attribute>
2347
+ </xsl:if>
2348
+ <xsl:if test="@rowspan">
2349
+ <xsl:attribute name="number-rows-spanned">
2350
+ <xsl:value-of select="@rowspan"/>
2351
+ </xsl:attribute>
2352
+ </xsl:if>
2353
+ <xsl:call-template name="display-align"/>
2252
2354
  </xsl:template><xsl:template name="display-align">
2253
2355
  <xsl:if test="@valign">
2254
2356
  <xsl:attribute name="display-align">
@@ -2261,22 +2363,18 @@
2261
2363
  </xsl:attribute>
2262
2364
  </xsl:if>
2263
2365
  </xsl:template><xsl:template match="*[local-name()='td']">
2264
- <fo:table-cell text-align="{@align}" display-align="center" border="solid black 1pt" padding-left="1mm">
2265
- <xsl:attribute name="text-align">
2266
- <xsl:choose>
2267
- <xsl:when test="@align">
2268
- <xsl:call-template name="setAlignment"/>
2269
- <!-- <xsl:value-of select="@align"/> -->
2270
- </xsl:when>
2271
- <xsl:otherwise>left</xsl:otherwise>
2272
- </xsl:choose>
2273
- </xsl:attribute>
2366
+ <fo:table-cell xsl:use-attribute-sets="table-cell-style"> <!-- text-align="{@align}" -->
2367
+ <xsl:call-template name="setTextAlignment">
2368
+ <xsl:with-param name="default">left</xsl:with-param>
2369
+ </xsl:call-template>
2370
+
2274
2371
  <xsl:if test="$lang = 'ar'">
2275
2372
  <xsl:attribute name="padding-right">1mm</xsl:attribute>
2276
2373
  </xsl:if>
2277
2374
 
2278
2375
 
2279
2376
 
2377
+ <!-- bsi -->
2280
2378
 
2281
2379
 
2282
2380
 
@@ -2285,34 +2383,36 @@
2285
2383
 
2286
2384
 
2287
2385
 
2386
+
2387
+
2288
2388
 
2289
2389
 
2290
2390
 
2291
2391
 
2292
2392
 
2293
- <xsl:if test=".//*[local-name() = 'table']">
2393
+ <xsl:if test=".//*[local-name() = 'table']"> <!-- if there is nested table -->
2294
2394
  <xsl:attribute name="padding-right">1mm</xsl:attribute>
2295
2395
  </xsl:if>
2296
- <xsl:if test="@colspan">
2297
- <xsl:attribute name="number-columns-spanned">
2298
- <xsl:value-of select="@colspan"/>
2299
- </xsl:attribute>
2300
- </xsl:if>
2301
- <xsl:if test="@rowspan">
2302
- <xsl:attribute name="number-rows-spanned">
2303
- <xsl:value-of select="@rowspan"/>
2304
- </xsl:attribute>
2305
- </xsl:if>
2306
- <xsl:call-template name="display-align"/>
2396
+
2397
+ <xsl:call-template name="setTableCellAttributes"/>
2398
+
2307
2399
  <fo:block>
2308
-
2400
+
2401
+
2402
+
2309
2403
  <xsl:apply-templates/>
2310
2404
  </fo:block>
2311
2405
  </fo:table-cell>
2312
2406
  </xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='note']" priority="2"/><xsl:template match="*[local-name()='table']/*[local-name()='note']" mode="process">
2407
+
2408
+ <fo:block xsl:use-attribute-sets="table-note-style">
2409
+
2410
+
2411
+
2412
+
2313
2413
 
2314
-
2315
- <fo:block font-size="10pt" margin-bottom="12pt">
2414
+ <!-- Table's note name (NOTE, for example) -->
2415
+ <fo:inline xsl:use-attribute-sets="table-note-name-style">
2316
2416
 
2317
2417
 
2318
2418
 
@@ -2320,23 +2420,14 @@
2320
2420
 
2321
2421
 
2322
2422
 
2323
-
2324
- <!-- Table's note name (NOTE, for example) -->
2325
-
2326
- <fo:inline padding-right="2mm" xsl:use-attribute-sets="table-note-name-style">
2327
-
2328
-
2423
+ <xsl:apply-templates select="*[local-name() = 'name']"/>
2329
2424
 
2330
-
2331
-
2332
- <xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
2333
-
2334
- </fo:inline>
2335
-
2336
-
2337
-
2338
- <xsl:apply-templates mode="process"/>
2339
- </fo:block>
2425
+ </fo:inline>
2426
+
2427
+
2428
+
2429
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]" mode="process"/>
2430
+ </fo:block>
2340
2431
 
2341
2432
  </xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='note']/*[local-name()='name']" mode="process"/><xsl:template match="*[local-name()='table']/*[local-name()='note']/*[local-name()='p']" mode="process">
2342
2433
  <xsl:apply-templates/>
@@ -2416,8 +2507,7 @@
2416
2507
  <xsl:copy-of select="$footnote_inline"/>
2417
2508
  <fo:footnote-body>
2418
2509
 
2419
- <fo:block-container text-indent="0" start-indent="0">
2420
-
2510
+ <fo:block-container xsl:use-attribute-sets="fn-container-body-style">
2421
2511
 
2422
2512
  <fo:block xsl:use-attribute-sets="fn-body-style">
2423
2513
 
@@ -2436,7 +2526,7 @@
2436
2526
  <xsl:copy-of select="$footnote_inline"/>
2437
2527
  </xsl:otherwise>
2438
2528
  </xsl:choose>
2439
- </xsl:template><xsl:template name="fn_display">
2529
+ </xsl:template><xsl:template name="table_fn_display">
2440
2530
  <xsl:variable name="references">
2441
2531
 
2442
2532
  <xsl:for-each select="..//*[local-name()='fn'][local-name(..) != 'name']">
@@ -2447,31 +2537,26 @@
2447
2537
  <xsl:for-each select="xalan:nodeset($references)//fn">
2448
2538
  <xsl:variable name="reference" select="@reference"/>
2449
2539
  <xsl:if test="not(preceding-sibling::*[@reference = $reference])"> <!-- only unique reference puts in note-->
2450
- <fo:block margin-bottom="12pt">
2540
+ <fo:block xsl:use-attribute-sets="table-fn-style">
2451
2541
 
2452
2542
 
2453
2543
 
2454
-
2455
-
2456
-
2457
-
2458
- <fo:inline font-size="80%" padding-right="5mm" id="{@id}">
2544
+ <fo:inline id="{@id}" xsl:use-attribute-sets="table-fn-number-style">
2459
2545
 
2460
2546
 
2461
2547
 
2462
2548
 
2463
2549
 
2550
+ <xsl:value-of select="@reference"/>
2464
2551
 
2465
2552
 
2466
2553
 
2467
- <xsl:value-of select="@reference"/>
2468
2554
 
2469
2555
 
2470
2556
 
2471
- </fo:inline>
2472
- <fo:inline>
2473
2557
 
2474
- <!-- <xsl:apply-templates /> -->
2558
+ </fo:inline>
2559
+ <fo:inline xsl:use-attribute-sets="table-fn-body-style">
2475
2560
  <xsl:copy-of select="./node()"/>
2476
2561
  </fo:inline>
2477
2562
  </fo:block>
@@ -2483,15 +2568,7 @@
2483
2568
 
2484
2569
  <xsl:apply-templates/>
2485
2570
  </fn>
2486
- </xsl:template><xsl:template name="fn_name_display">
2487
- <!-- <xsl:variable name="references">
2488
- <xsl:for-each select="*[local-name()='name']//*[local-name()='fn']">
2489
- <fn reference="{@reference}" id="{@reference}_{ancestor::*[@id][1]/@id}">
2490
- <xsl:apply-templates />
2491
- </fn>
2492
- </xsl:for-each>
2493
- </xsl:variable>
2494
- $references=<xsl:copy-of select="$references"/> -->
2571
+ </xsl:template><xsl:template name="table_name_fn_display">
2495
2572
  <xsl:for-each select="*[local-name()='name']//*[local-name()='fn']">
2496
2573
  <xsl:variable name="reference" select="@reference"/>
2497
2574
  <fo:block id="{@reference}_{ancestor::*[@id][1]/@id}"><xsl:value-of select="@reference"/></fo:block>
@@ -2500,9 +2577,7 @@
2500
2577
  </fo:block>
2501
2578
  </xsl:for-each>
2502
2579
  </xsl:template><xsl:template name="fn_display_figure">
2503
- <xsl:variable name="key_iso">
2504
- <!-- and (not(@class) or @class !='pseudocode') -->
2505
- </xsl:variable>
2580
+
2506
2581
  <xsl:variable name="references">
2507
2582
  <xsl:for-each select=".//*[local-name()='fn'][not(parent::*[local-name()='name'])]">
2508
2583
  <fn reference="{@reference}" id="{@reference}_{ancestor::*[@id][1]/@id}">
@@ -2510,50 +2585,52 @@
2510
2585
  </fn>
2511
2586
  </xsl:for-each>
2512
2587
  </xsl:variable>
2588
+
2589
+ <xsl:if test="xalan:nodeset($references)//fn">
2513
2590
 
2514
- <!-- current hierarchy is 'figure' element -->
2515
- <xsl:variable name="following_dl_colwidths">
2516
- <xsl:if test="*[local-name() = 'dl']"><!-- if there is a 'dl', then set the same columns width as for 'dl' -->
2517
- <xsl:variable name="html-table">
2518
- <xsl:variable name="doc_ns">
2591
+ <xsl:variable name="key_iso">
2592
+
2593
+ </xsl:variable>
2594
+
2595
+ <!-- current hierarchy is 'figure' element -->
2596
+ <xsl:variable name="following_dl_colwidths">
2597
+ <xsl:if test="*[local-name() = 'dl']"><!-- if there is a 'dl', then set the same columns width as for 'dl' -->
2598
+ <xsl:variable name="html-table">
2599
+ <xsl:variable name="doc_ns">
2600
+
2601
+ </xsl:variable>
2602
+ <xsl:variable name="ns">
2603
+ <xsl:choose>
2604
+ <xsl:when test="normalize-space($doc_ns) != ''">
2605
+ <xsl:value-of select="normalize-space($doc_ns)"/>
2606
+ </xsl:when>
2607
+ <xsl:otherwise>
2608
+ <xsl:value-of select="substring-before(name(/*), '-')"/>
2609
+ </xsl:otherwise>
2610
+ </xsl:choose>
2611
+ </xsl:variable>
2519
2612
 
2520
- </xsl:variable>
2521
- <xsl:variable name="ns">
2522
- <xsl:choose>
2523
- <xsl:when test="normalize-space($doc_ns) != ''">
2524
- <xsl:value-of select="normalize-space($doc_ns)"/>
2525
- </xsl:when>
2526
- <xsl:otherwise>
2527
- <xsl:value-of select="substring-before(name(/*), '-')"/>
2528
- </xsl:otherwise>
2529
- </xsl:choose>
2530
- </xsl:variable>
2531
- <!-- <xsl:variable name="ns" select="substring-before(name(/*), '-')"/> -->
2532
- <!-- <xsl:element name="{$ns}:table"> -->
2533
2613
  <xsl:for-each select="*[local-name() = 'dl'][1]">
2534
2614
  <tbody>
2535
2615
  <xsl:apply-templates mode="dl"/>
2536
2616
  </tbody>
2537
2617
  </xsl:for-each>
2538
- <!-- </xsl:element> -->
2539
- </xsl:variable>
2540
-
2541
- <xsl:call-template name="calculate-column-widths">
2542
- <xsl:with-param name="cols-count" select="2"/>
2543
- <xsl:with-param name="table" select="$html-table"/>
2544
- </xsl:call-template>
2545
-
2546
- </xsl:if>
2547
- </xsl:variable>
2548
-
2549
-
2550
- <xsl:variable name="maxlength_dt">
2551
- <xsl:for-each select="*[local-name() = 'dl'][1]">
2552
- <xsl:call-template name="getMaxLength_dt"/>
2553
- </xsl:for-each>
2554
- </xsl:variable>
2555
-
2556
- <xsl:if test="xalan:nodeset($references)//fn">
2618
+ </xsl:variable>
2619
+
2620
+ <xsl:call-template name="calculate-column-widths">
2621
+ <xsl:with-param name="cols-count" select="2"/>
2622
+ <xsl:with-param name="table" select="$html-table"/>
2623
+ </xsl:call-template>
2624
+
2625
+ </xsl:if>
2626
+ </xsl:variable>
2627
+
2628
+ <xsl:variable name="maxlength_dt">
2629
+ <xsl:for-each select="*[local-name() = 'dl'][1]">
2630
+ <xsl:call-template name="getMaxLength_dt"/>
2631
+ </xsl:for-each>
2632
+ </xsl:variable>
2633
+
2557
2634
  <fo:block>
2558
2635
  <fo:table width="95%" table-layout="fixed">
2559
2636
  <xsl:if test="normalize-space($key_iso) = 'true'">
@@ -2580,20 +2657,18 @@
2580
2657
  <fo:table-row>
2581
2658
  <fo:table-cell>
2582
2659
  <fo:block>
2583
- <fo:inline font-size="80%" padding-right="5mm" vertical-align="super" id="{@id}">
2584
-
2660
+ <fo:inline id="{@id}" xsl:use-attribute-sets="figure-fn-number-style">
2585
2661
  <xsl:value-of select="@reference"/>
2586
2662
  </fo:inline>
2587
2663
  </fo:block>
2588
2664
  </fo:table-cell>
2589
2665
  <fo:table-cell>
2590
- <fo:block text-align="justify" margin-bottom="12pt">
2591
-
2666
+ <fo:block xsl:use-attribute-sets="figure-fn-body-style">
2592
2667
  <xsl:if test="normalize-space($key_iso) = 'true'">
2593
- <xsl:attribute name="margin-bottom">0</xsl:attribute>
2668
+
2669
+ <xsl:attribute name="margin-bottom">0</xsl:attribute>
2670
+
2594
2671
  </xsl:if>
2595
-
2596
- <!-- <xsl:apply-templates /> -->
2597
2672
  <xsl:copy-of select="./node()"/>
2598
2673
  </fo:block>
2599
2674
  </fo:table-cell>
@@ -2606,14 +2681,8 @@
2606
2681
  </xsl:if>
2607
2682
 
2608
2683
  </xsl:template><xsl:template match="*[local-name()='fn']">
2609
- <!-- <xsl:variable name="namespace" select="substring-before(name(/*), '-')"/> -->
2610
- <fo:inline font-size="80%" keep-with-previous.within-line="always">
2611
-
2612
-
2613
-
2614
-
2615
-
2616
-
2684
+ <fo:inline xsl:use-attribute-sets="fn-reference-style">
2685
+
2617
2686
 
2618
2687
 
2619
2688
 
@@ -2637,10 +2706,10 @@
2637
2706
  <xsl:variable name="isDeleted" select="@deleted"/>
2638
2707
  <fo:block-container>
2639
2708
 
2640
- <xsl:if test="not(ancestor::*[local-name() = 'quote'])">
2641
- <xsl:attribute name="margin-left">0mm</xsl:attribute>
2642
- </xsl:if>
2643
-
2709
+ <xsl:if test="not(ancestor::*[local-name() = 'quote'])">
2710
+ <xsl:attribute name="margin-left">0mm</xsl:attribute>
2711
+ </xsl:if>
2712
+
2644
2713
 
2645
2714
  <xsl:if test="parent::*[local-name() = 'note']">
2646
2715
  <xsl:attribute name="margin-left">
@@ -2657,11 +2726,11 @@
2657
2726
  <xsl:with-param name="isDeleted" select="$isDeleted"/>
2658
2727
  </xsl:call-template>
2659
2728
 
2660
- <fo:block-container>
2661
-
2662
- <xsl:attribute name="margin-left">0mm</xsl:attribute>
2663
- <xsl:attribute name="margin-right">0mm</xsl:attribute>
2729
+ <fo:block-container margin-left="0mm">
2730
+
2664
2731
 
2732
+ <xsl:attribute name="margin-right">0mm</xsl:attribute>
2733
+
2665
2734
 
2666
2735
  <xsl:variable name="parent" select="local-name(..)"/>
2667
2736
 
@@ -2672,20 +2741,19 @@
2672
2741
  <xsl:choose>
2673
2742
  <xsl:when test="$parent = 'formula' and count(*[local-name()='dt']) = 1"> <!-- only one component -->
2674
2743
 
2675
-
2676
- <fo:block margin-bottom="12pt" text-align="left">
2677
-
2678
- <xsl:variable name="title-where">
2679
- <xsl:call-template name="getLocalizedString">
2680
- <xsl:with-param name="key">where</xsl:with-param>
2681
- </xsl:call-template>
2682
- </xsl:variable>
2683
- <xsl:value-of select="$title-where"/><xsl:text> </xsl:text>
2684
- <xsl:apply-templates select="*[local-name()='dt']/*"/>
2685
- <xsl:text/>
2686
- <xsl:apply-templates select="*[local-name()='dd']/*" mode="inline"/>
2687
- </fo:block>
2688
-
2744
+ <fo:block margin-bottom="12pt" text-align="left">
2745
+
2746
+ <xsl:variable name="title-where">
2747
+ <xsl:call-template name="getLocalizedString">
2748
+ <xsl:with-param name="key">where</xsl:with-param>
2749
+ </xsl:call-template>
2750
+ </xsl:variable>
2751
+ <xsl:value-of select="$title-where"/><xsl:text> </xsl:text>
2752
+ <xsl:apply-templates select="*[local-name()='dt']/*"/>
2753
+ <xsl:text/>
2754
+ <xsl:apply-templates select="*[local-name()='dd']/*" mode="inline"/>
2755
+ </fo:block>
2756
+
2689
2757
  </xsl:when>
2690
2758
  <xsl:when test="$parent = 'formula'"> <!-- a few components -->
2691
2759
  <fo:block margin-bottom="12pt" text-align="left">
@@ -2732,9 +2800,7 @@
2732
2800
  <fo:table width="95%" table-layout="fixed">
2733
2801
 
2734
2802
  <xsl:choose>
2735
- <xsl:when test="normalize-space($key_iso) = 'true' and $parent = 'formula'">
2736
- <!-- <xsl:attribute name="font-size">11pt</xsl:attribute> -->
2737
- </xsl:when>
2803
+ <xsl:when test="normalize-space($key_iso) = 'true' and $parent = 'formula'"/>
2738
2804
  <xsl:when test="normalize-space($key_iso) = 'true'">
2739
2805
  <xsl:attribute name="font-size">10pt</xsl:attribute>
2740
2806
 
@@ -2755,12 +2821,9 @@
2755
2821
  </xsl:otherwise>
2756
2822
  </xsl:choose>
2757
2823
  </xsl:variable>
2758
- <!-- <xsl:variable name="ns" select="substring-before(name(/*), '-')"/> -->
2759
- <!-- <xsl:element name="{$ns}:table"> -->
2760
- <tbody>
2761
- <xsl:apply-templates mode="dl"/>
2762
- </tbody>
2763
- <!-- </xsl:element> -->
2824
+ <tbody>
2825
+ <xsl:apply-templates mode="dl"/>
2826
+ </tbody>
2764
2827
  </xsl:variable>
2765
2828
  <!-- html-table<xsl:copy-of select="$html-table"/> -->
2766
2829
  <xsl:variable name="colwidths">
@@ -2840,8 +2903,6 @@
2840
2903
  </xsl:for-each>
2841
2904
  </xsl:otherwise>
2842
2905
  </xsl:choose>
2843
- <!-- <fo:table-column column-width="15%"/>
2844
- <fo:table-column column-width="85%"/> -->
2845
2906
  </xsl:otherwise>
2846
2907
  </xsl:choose>
2847
2908
  </xsl:template><xsl:template name="getMaxLength_dt">
@@ -2856,12 +2917,6 @@
2856
2917
  </xsl:for-each>
2857
2918
  </xsl:variable>
2858
2919
  <xsl:variable name="maxLength">
2859
- <!-- <xsl:for-each select="*[local-name()='dt']">
2860
- <xsl:sort select="string-length(normalize-space(.))" data-type="number" order="descending"/>
2861
- <xsl:if test="position() = 1">
2862
- <xsl:value-of select="string-length(normalize-space(.))"/>
2863
- </xsl:if>
2864
- </xsl:for-each> -->
2865
2920
  <xsl:for-each select="xalan:nodeset($lengths)/length">
2866
2921
  <xsl:sort select="." data-type="number" order="descending"/>
2867
2922
  <xsl:if test="position() = 1">
@@ -2887,12 +2942,12 @@
2887
2942
  <xsl:if test="normalize-space($key_iso) = 'true'">
2888
2943
  <xsl:attribute name="margin-top">0</xsl:attribute>
2889
2944
  </xsl:if>
2890
- <xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
2945
+ <xsl:apply-templates select="*[local-name() = 'name']"/>
2891
2946
  </fo:block>
2892
2947
  </fo:table-cell>
2893
2948
  <fo:table-cell>
2894
2949
  <fo:block>
2895
- <xsl:apply-templates/>
2950
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
2896
2951
  </fo:block>
2897
2952
  </fo:table-cell>
2898
2953
  </fo:table-row>
@@ -2903,76 +2958,37 @@
2903
2958
  </td>
2904
2959
  <td>
2905
2960
 
2906
-
2907
- <xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]" mode="process"/>
2908
-
2961
+ <xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]" mode="process"/>
2962
+
2909
2963
  </td>
2910
2964
  </tr>
2911
2965
 
2912
2966
  </xsl:template><xsl:template match="*[local-name()='dt']">
2913
2967
  <xsl:param name="key_iso"/>
2914
2968
 
2915
- <fo:table-row>
2916
-
2917
-
2969
+ <fo:table-row xsl:use-attribute-sets="dt-row-style">
2918
2970
  <fo:table-cell>
2919
2971
 
2920
- <fo:block margin-top="6pt">
2972
+ <fo:block xsl:use-attribute-sets="dt-style">
2921
2973
  <xsl:copy-of select="@id"/>
2922
2974
 
2923
-
2924
2975
  <xsl:if test="normalize-space($key_iso) = 'true'">
2925
2976
  <xsl:attribute name="margin-top">0</xsl:attribute>
2926
-
2927
2977
  </xsl:if>
2928
2978
 
2929
2979
 
2930
2980
 
2931
-
2932
-
2933
-
2934
-
2935
2981
  <xsl:apply-templates/>
2936
- <!-- <xsl:if test="$namespace = 'gb'">
2937
- <xsl:if test="ancestor::*[local-name()='formula']">
2938
- <xsl:text>—</xsl:text>
2939
- </xsl:if>
2940
- </xsl:if> -->
2941
2982
  </fo:block>
2942
2983
  </fo:table-cell>
2943
2984
  <fo:table-cell>
2944
2985
  <fo:block>
2945
2986
 
2946
- <!-- <xsl:if test="$namespace = 'nist-cswp' or $namespace = 'nist-sp'">
2947
- <xsl:if test="local-name(*[1]) != 'stem'">
2948
- <xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]" mode="process"/>
2949
- </xsl:if>
2950
- </xsl:if> -->
2951
-
2952
- <xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]" mode="process"/>
2953
-
2987
+
2988
+ <xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]" mode="process"/>
2954
2989
  </fo:block>
2955
2990
  </fo:table-cell>
2956
2991
  </fo:table-row>
2957
- <!-- <xsl:if test="$namespace = 'nist-cswp' or $namespace = 'nist-sp'">
2958
- <xsl:if test="local-name(*[1]) = 'stem'">
2959
- <fo:table-row>
2960
- <fo:table-cell>
2961
- <fo:block margin-top="6pt">
2962
- <xsl:if test="normalize-space($key_iso) = 'true'">
2963
- <xsl:attribute name="margin-top">0</xsl:attribute>
2964
- </xsl:if>
2965
- <xsl:text>&#xA0;</xsl:text>
2966
- </fo:block>
2967
- </fo:table-cell>
2968
- <fo:table-cell>
2969
- <fo:block>
2970
- <xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]" mode="process"/>
2971
- </fo:block>
2972
- </fo:table-cell>
2973
- </fo:table-row>
2974
- </xsl:if>
2975
- </xsl:if> -->
2976
2992
  </xsl:template><xsl:template match="*[local-name()='dd']" mode="dl"/><xsl:template match="*[local-name()='dd']" mode="dl_process">
2977
2993
  <xsl:apply-templates/>
2978
2994
  </xsl:template><xsl:template match="*[local-name()='dd']"/><xsl:template match="*[local-name()='dd']" mode="process">
@@ -3001,6 +3017,7 @@
3001
3017
  </fo:inline>
3002
3018
  </xsl:template><xsl:template match="*[local-name()='tt']">
3003
3019
  <fo:inline xsl:use-attribute-sets="tt-style">
3020
+
3004
3021
  <xsl:variable name="_font-size">
3005
3022
  10
3006
3023
 
@@ -3037,15 +3054,21 @@
3037
3054
  <xsl:apply-templates/>
3038
3055
  </fo:inline>
3039
3056
  </xsl:template><xsl:template match="*[local-name()='add']">
3057
+ <xsl:param name="skip">true</xsl:param>
3040
3058
  <xsl:choose>
3041
3059
  <xsl:when test="starts-with(., $ace_tag)"> <!-- examples: ace-tag_A1_start, ace-tag_A2_end, C1_start, AC_start -->
3042
- <fo:inline>
3043
- <xsl:call-template name="insertTag">
3044
- <xsl:with-param name="type" select="substring-after(substring-after(., $ace_tag), '_')"/> <!-- start or end -->
3045
- <xsl:with-param name="kind" select="substring(substring-before(substring-after(., $ace_tag), '_'), 1, 1)"/> <!-- A or C -->
3046
- <xsl:with-param name="value" select="substring(substring-before(substring-after(., $ace_tag), '_'), 2)"/> <!-- 1, 2, C -->
3047
- </xsl:call-template>
3048
- </fo:inline>
3060
+ <xsl:choose>
3061
+ <xsl:when test="$skip = 'true' and ((local-name(../..) = 'note' and not(preceding-sibling::node())) or (local-name(..) = 'title' and preceding-sibling::node()[1][local-name() = 'tab'])) and ../node()[last()][local-name() = 'add'][starts-with(text(), $ace_tag)]"><!-- start tag displayed in template name="note" and title --></xsl:when>
3062
+ <xsl:otherwise>
3063
+ <fo:inline>
3064
+ <xsl:call-template name="insertTag">
3065
+ <xsl:with-param name="type" select="substring-after(substring-after(., $ace_tag), '_')"/> <!-- start or end -->
3066
+ <xsl:with-param name="kind" select="substring(substring-before(substring-after(., $ace_tag), '_'), 1, 1)"/> <!-- A or C -->
3067
+ <xsl:with-param name="value" select="substring(substring-before(substring-after(., $ace_tag), '_'), 2)"/> <!-- 1, 2, C -->
3068
+ </xsl:call-template>
3069
+ </fo:inline>
3070
+ </xsl:otherwise>
3071
+ </xsl:choose>
3049
3072
  </xsl:when>
3050
3073
  <xsl:when test="@amendment">
3051
3074
  <fo:inline>
@@ -3088,8 +3111,6 @@
3088
3111
  <xsl:variable name="add_width" select="string-length($value) * 20"/>
3089
3112
  <xsl:variable name="maxwidth" select="60 + $add_width"/>
3090
3113
  <fo:instream-foreign-object fox:alt-text="OpeningTag" baseline-shift="-20%"><!-- alignment-baseline="middle" -->
3091
- <!-- <xsl:attribute name="width">7mm</xsl:attribute>
3092
- <xsl:attribute name="content-height">100%</xsl:attribute> -->
3093
3114
  <xsl:attribute name="height">5mm</xsl:attribute>
3094
3115
  <xsl:attribute name="content-width">100%</xsl:attribute>
3095
3116
  <xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
@@ -3307,14 +3328,6 @@
3307
3328
 
3308
3329
  <xsl:copy-of select="xalan:nodeset($simple-table-rowspan)"/>
3309
3330
 
3310
- <!-- <xsl:choose>
3311
- <xsl:when test="current()//*[local-name()='th'][@colspan] or current()//*[local-name()='td'][@colspan] ">
3312
-
3313
- </xsl:when>
3314
- <xsl:otherwise>
3315
- <xsl:copy-of select="current()"/>
3316
- </xsl:otherwise>
3317
- </xsl:choose> -->
3318
3331
  </xsl:variable>
3319
3332
  <xsl:copy-of select="$simple-table"/>
3320
3333
  </xsl:template><xsl:template match="*[local-name()='thead'] | *[local-name()='tbody']" mode="simple-table-colspan">
@@ -3433,8 +3446,6 @@
3433
3446
  <xsl:choose>
3434
3447
  <xsl:when test="contains($str2, ' ')">
3435
3448
  <xsl:variable name="substr" select="substring-before($str2, ' ')"/>
3436
- <!-- <xsl:value-of select="translate(substring($substr, 1, 1), $lower, $upper)"/>
3437
- <xsl:value-of select="substring($substr, 2)"/> -->
3438
3449
  <xsl:call-template name="capitalize">
3439
3450
  <xsl:with-param name="str" select="$substr"/>
3440
3451
  </xsl:call-template>
@@ -3444,8 +3455,6 @@
3444
3455
  </xsl:call-template>
3445
3456
  </xsl:when>
3446
3457
  <xsl:otherwise>
3447
- <!-- <xsl:value-of select="translate(substring($str2, 1, 1), $lower, $upper)"/>
3448
- <xsl:value-of select="substring($str2, 2)"/> -->
3449
3458
  <xsl:call-template name="capitalize">
3450
3459
  <xsl:with-param name="str" select="$str2"/>
3451
3460
  </xsl:call-template>
@@ -3473,6 +3482,7 @@
3473
3482
  <xsl:apply-templates select="." mode="mathml"/>
3474
3483
  </xsl:variable>
3475
3484
  <fo:instream-foreign-object fox:alt-text="Math">
3485
+
3476
3486
 
3477
3487
 
3478
3488
  <xsl:variable name="comment_text_following" select="following-sibling::node()[1][self::comment()]"/>
@@ -3504,7 +3514,7 @@
3504
3514
  </xsl:attribute>
3505
3515
 
3506
3516
 
3507
- <!-- <xsl:copy-of select="."/> -->
3517
+
3508
3518
  <xsl:copy-of select="xalan:nodeset($mathml)"/>
3509
3519
  </fo:instream-foreign-object>
3510
3520
  </fo:inline>
@@ -3563,6 +3573,10 @@
3563
3573
 
3564
3574
 
3565
3575
 
3576
+
3577
+
3578
+
3579
+
3566
3580
  <xsl:choose>
3567
3581
  <xsl:when test="$target_text = ''">
3568
3582
  <xsl:apply-templates/>
@@ -3620,7 +3634,6 @@
3620
3634
  </fo:inline>
3621
3635
  </xsl:template><xsl:template match="*[local-name() = 'xref']">
3622
3636
  <fo:basic-link internal-destination="{@target}" fox:alt-text="{@target}" xsl:use-attribute-sets="xref-style">
3623
-
3624
3637
  <xsl:apply-templates/>
3625
3638
  </fo:basic-link>
3626
3639
  </xsl:template><xsl:template match="*[local-name() = 'formula']" name="formula">
@@ -3648,22 +3661,26 @@
3648
3661
  <fo:inline>
3649
3662
  <xsl:apply-templates/>
3650
3663
  </fo:inline>
3651
- </xsl:template><xsl:template match="*[local-name() = 'formula']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'formula']/*[local-name() = 'name']" mode="presentation">
3664
+ </xsl:template><xsl:template match="*[local-name() = 'formula']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'formula']/*[local-name() = 'name']" mode="formula_number"> <!-- show by demand -->
3652
3665
  <xsl:if test="normalize-space() != ''">
3653
3666
  <xsl:text>(</xsl:text><xsl:apply-templates/><xsl:text>)</xsl:text>
3654
3667
  </xsl:if>
3655
3668
  </xsl:template><xsl:template match="*[local-name() = 'note']" name="note">
3656
3669
 
3657
3670
  <fo:block-container id="{@id}" xsl:use-attribute-sets="note-style">
3671
+
3672
+
3673
+
3658
3674
 
3659
3675
 
3660
3676
 
3661
3677
 
3662
3678
 
3679
+
3680
+
3681
+
3663
3682
  <fo:block-container margin-left="0mm">
3664
-
3665
-
3666
-
3683
+
3667
3684
 
3668
3685
  <xsl:if test="ancestor::csa:ul or ancestor::csa:ol and not(ancestor::csa:note[1]/following-sibling::*)">
3669
3686
  <xsl:attribute name="margin-bottom">0pt</xsl:attribute>
@@ -3671,30 +3688,41 @@
3671
3688
 
3672
3689
 
3673
3690
 
3674
-
3691
+
3675
3692
 
3676
- <fo:block>
3677
-
3678
-
3679
-
3680
-
3681
-
3693
+ <fo:block>
3694
+
3695
+
3682
3696
 
3683
- <fo:inline xsl:use-attribute-sets="note-name-style">
3684
3697
 
3685
- <xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
3686
- </fo:inline>
3687
- <xsl:apply-templates/>
3688
- </fo:block>
3689
-
3690
-
3698
+
3699
+
3700
+
3701
+ <fo:inline xsl:use-attribute-sets="note-name-style">
3702
+
3703
+
3704
+
3705
+ <!-- if note contains only one element and first and last childs are `add` ace-tag, then move start ace-tag before NOTE's name-->
3706
+ <xsl:if test="count(*[not(local-name() = 'name')]) = 1 and *[not(local-name() = 'name')]/node()[last()][local-name() = 'add'][starts-with(text(), $ace_tag)]">
3707
+ <xsl:apply-templates select="*[not(local-name() = 'name')]/node()[1][local-name() = 'add'][starts-with(text(), $ace_tag)]">
3708
+ <xsl:with-param name="skip">false</xsl:with-param>
3709
+ </xsl:apply-templates>
3710
+ </xsl:if>
3711
+
3712
+ <xsl:apply-templates select="*[local-name() = 'name']"/>
3713
+
3714
+ </fo:inline>
3715
+
3716
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
3717
+ </fo:block>
3718
+
3691
3719
  </fo:block-container>
3692
3720
  </fo:block-container>
3693
3721
 
3694
3722
  </xsl:template><xsl:template match="*[local-name() = 'note']/*[local-name() = 'p']">
3695
3723
  <xsl:variable name="num"><xsl:number/></xsl:variable>
3696
3724
  <xsl:choose>
3697
- <xsl:when test="$num = 1">
3725
+ <xsl:when test="$num = 1"> <!-- display first NOTE's paragraph in the same line with label NOTE -->
3698
3726
  <fo:inline xsl:use-attribute-sets="note-p-style">
3699
3727
  <xsl:apply-templates/>
3700
3728
  </fo:inline>
@@ -3709,12 +3737,16 @@
3709
3737
  <fo:block id="{@id}" xsl:use-attribute-sets="termnote-style">
3710
3738
 
3711
3739
  <fo:inline xsl:use-attribute-sets="termnote-name-style">
3740
+
3741
+
3742
+
3743
+ <xsl:apply-templates select="*[local-name() = 'name']"/>
3712
3744
 
3713
- <xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
3714
3745
  </fo:inline>
3715
- <xsl:apply-templates/>
3746
+
3747
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
3716
3748
  </fo:block>
3717
- </xsl:template><xsl:template match="*[local-name() = 'note']/*[local-name() = 'name'] | *[local-name() = 'termnote']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'note']/*[local-name() = 'name']" mode="presentation">
3749
+ </xsl:template><xsl:template match="*[local-name() = 'note']/*[local-name() = 'name']">
3718
3750
  <xsl:param name="sfx"/>
3719
3751
  <xsl:variable name="suffix">
3720
3752
  <xsl:choose>
@@ -3731,7 +3763,7 @@
3731
3763
  <xsl:apply-templates/>
3732
3764
  <xsl:value-of select="$suffix"/>
3733
3765
  </xsl:if>
3734
- </xsl:template><xsl:template match="*[local-name() = 'termnote']/*[local-name() = 'name']" mode="presentation">
3766
+ </xsl:template><xsl:template match="*[local-name() = 'termnote']/*[local-name() = 'name']">
3735
3767
  <xsl:param name="sfx"/>
3736
3768
  <xsl:variable name="suffix">
3737
3769
  <xsl:choose>
@@ -3756,25 +3788,23 @@
3756
3788
  <xsl:apply-templates/>
3757
3789
  </fo:block>
3758
3790
  </xsl:template><xsl:template match="*[local-name() = 'term']">
3759
- <!-- <xsl:message>'term' <xsl:number/> processing, name=<xsl:value-of select="iso:name"/>, preferred=<xsl:value-of select="iso:preferred"/>...</xsl:message> -->
3760
3791
  <fo:block id="{@id}" xsl:use-attribute-sets="term-style">
3761
3792
 
3762
3793
 
3794
+
3795
+
3763
3796
  <xsl:if test="parent::*[local-name() = 'term'] and not(preceding-sibling::*[local-name() = 'term'])">
3764
3797
 
3765
3798
  </xsl:if>
3766
- <xsl:apply-templates/>
3799
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
3767
3800
  </fo:block>
3768
- </xsl:template><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']" mode="presentation">
3801
+ </xsl:template><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']">
3769
3802
  <xsl:if test="normalize-space() != ''">
3770
3803
  <xsl:variable name="level">
3771
3804
  <xsl:call-template name="getLevelTermName"/>
3772
3805
  </xsl:variable>
3773
3806
  <fo:inline role="H{$level}">
3774
3807
  <xsl:apply-templates/>
3775
- <!-- <xsl:if test="$namespace = 'gb' or $namespace = 'ogc'">
3776
- <xsl:text>.</xsl:text>
3777
- </xsl:if> -->
3778
3808
  </fo:inline>
3779
3809
  </xsl:if>
3780
3810
  </xsl:template><xsl:template match="*[local-name() = 'figure']" name="figure">
@@ -3787,9 +3817,10 @@
3787
3817
  <xsl:with-param name="isDeleted" select="$isDeleted"/>
3788
3818
  </xsl:call-template>
3789
3819
 
3790
- <fo:block>
3791
-
3792
- <xsl:apply-templates/>
3820
+
3821
+
3822
+ <fo:block xsl:use-attribute-sets="figure-style">
3823
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
3793
3824
  </fo:block>
3794
3825
  <xsl:call-template name="fn_display_figure"/>
3795
3826
  <xsl:for-each select="*[local-name() = 'note']">
@@ -3797,14 +3828,15 @@
3797
3828
  </xsl:for-each>
3798
3829
 
3799
3830
 
3800
- <xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
3831
+ <xsl:apply-templates select="*[local-name() = 'name']"/> <!-- show figure's name AFTER image -->
3832
+
3801
3833
 
3802
3834
  </fo:block-container>
3803
3835
  </xsl:template><xsl:template match="*[local-name() = 'figure'][@class = 'pseudocode']">
3804
3836
  <fo:block id="{@id}">
3805
- <xsl:apply-templates/>
3837
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
3806
3838
  </fo:block>
3807
- <xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
3839
+ <xsl:apply-templates select="*[local-name() = 'name']"/>
3808
3840
  </xsl:template><xsl:template match="*[local-name() = 'figure'][@class = 'pseudocode']//*[local-name() = 'p']">
3809
3841
  <fo:block xsl:use-attribute-sets="figure-pseudocode-p-style">
3810
3842
  <xsl:apply-templates/>
@@ -3911,9 +3943,7 @@
3911
3943
  <xsl:variable name="bis" select="java:java.io.ByteArrayInputStream.new($fileContent)"/>
3912
3944
  <xsl:variable name="bufferedImage" select="java:javax.imageio.ImageIO.read($bis)"/>
3913
3945
  <xsl:variable name="width" select="java:getWidth($bufferedImage)"/>
3914
- <!-- width=<xsl:value-of select="$width"/> -->
3915
3946
  <xsl:variable name="height" select="java:getHeight($bufferedImage)"/>
3916
- <!-- height=<xsl:value-of select="$height"/> -->
3917
3947
  <svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" style="enable-background:new 0 0 595.28 841.89;" height="{$height}" width="{$width}" viewBox="0 0 {$width} {$height}" y="0px" x="0px" id="Layer_1" version="1.1">
3918
3948
  <image xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="{@src}" height="{$height}" width="{$width}" style="overflow:visible;"/>
3919
3949
  <xsl:call-template name="svg_cross">
@@ -4183,7 +4213,7 @@
4183
4213
  </fo:basic-link>
4184
4214
  </fo:block>
4185
4215
  </fo:block-container>
4186
- </xsl:template><xsl:template match="*[local-name() = 'emf']"/><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] | *[local-name() = 'table']/*[local-name() = 'name'] | *[local-name() = 'permission']/*[local-name() = 'name'] | *[local-name() = 'recommendation']/*[local-name() = 'name'] | *[local-name() = 'requirement']/*[local-name() = 'name']" mode="contents">
4216
+ </xsl:template><xsl:template match="*[local-name() = 'emf']"/><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] | *[local-name() = 'table']/*[local-name() = 'name'] | *[local-name() = 'permission']/*[local-name() = 'name'] | *[local-name() = 'recommendation']/*[local-name() = 'name'] | *[local-name() = 'requirement']/*[local-name() = 'name']" mode="contents">
4187
4217
  <xsl:apply-templates mode="contents"/>
4188
4218
  <xsl:text> </xsl:text>
4189
4219
  </xsl:template><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] | *[local-name() = 'table']/*[local-name() = 'name'] | *[local-name() = 'permission']/*[local-name() = 'name'] | *[local-name() = 'recommendation']/*[local-name() = 'name'] | *[local-name() = 'requirement']/*[local-name() = 'name'] | *[local-name() = 'sourcecode']/*[local-name() = 'name']" mode="bookmarks">
@@ -4336,8 +4366,6 @@
4336
4366
 
4337
4367
 
4338
4368
 
4339
-
4340
-
4341
4369
  </fo:bookmark-tree>
4342
4370
  </xsl:if>
4343
4371
  </xsl:template><xsl:template name="insertFigureBookmarks">
@@ -4408,7 +4436,7 @@
4408
4436
  <xsl:apply-templates mode="bookmark"/>
4409
4437
  </xsl:otherwise>
4410
4438
  </xsl:choose>
4411
- </xsl:template><xsl:template match="title" mode="bookmark"/><xsl:template match="text()" mode="bookmark"/><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] | *[local-name() = 'image']/*[local-name() = 'name']" mode="presentation">
4439
+ </xsl:template><xsl:template match="title" mode="bookmark"/><xsl:template match="text()" mode="bookmark"/><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] | *[local-name() = 'image']/*[local-name() = 'name']">
4412
4440
  <xsl:if test="normalize-space() != ''">
4413
4441
  <fo:block xsl:use-attribute-sets="figure-name-style">
4414
4442
 
@@ -4424,12 +4452,6 @@
4424
4452
  <!-- <xsl:text> </xsl:text> -->
4425
4453
  </xsl:template><xsl:template name="getSection">
4426
4454
  <xsl:value-of select="*[local-name() = 'title']/*[local-name() = 'tab'][1]/preceding-sibling::node()"/>
4427
- <!--
4428
- <xsl:for-each select="*[local-name() = 'title']/*[local-name() = 'tab'][1]/preceding-sibling::node()">
4429
- <xsl:value-of select="."/>
4430
- </xsl:for-each>
4431
- -->
4432
-
4433
4455
  </xsl:template><xsl:template name="getName">
4434
4456
  <xsl:choose>
4435
4457
  <xsl:when test="*[local-name() = 'title']/*[local-name() = 'tab']">
@@ -4498,16 +4520,21 @@
4498
4520
  <xsl:apply-templates mode="contents_item">
4499
4521
  <xsl:with-param name="mode" select="$mode"/>
4500
4522
  </xsl:apply-templates>
4501
- </xsl:template><xsl:template match="*[local-name() = 'add'][starts-with(text(), $ace_tag)]" mode="contents_item">
4523
+ </xsl:template><xsl:template match="*[local-name() = 'add']" mode="contents_item">
4502
4524
  <xsl:param name="mode">bookmarks</xsl:param>
4503
- <xsl:if test="$mode = 'contents'">
4504
- <xsl:copy>
4505
- <xsl:apply-templates mode="contents_item"/>
4506
- </xsl:copy>
4507
- </xsl:if>
4525
+ <xsl:choose>
4526
+ <xsl:when test="starts-with(text(), $ace_tag)">
4527
+ <xsl:if test="$mode = 'contents'">
4528
+ <xsl:copy>
4529
+ <xsl:apply-templates mode="contents_item"/>
4530
+ </xsl:copy>
4531
+ </xsl:if>
4532
+ </xsl:when>
4533
+ <xsl:otherwise><xsl:apply-templates mode="contents_item"/></xsl:otherwise>
4534
+ </xsl:choose>
4508
4535
  </xsl:template><xsl:template match="*[local-name()='sourcecode']" name="sourcecode">
4509
4536
 
4510
- <fo:block-container margin-left="0mm">
4537
+ <fo:block-container xsl:use-attribute-sets="sourcecode-container-style">
4511
4538
  <xsl:copy-of select="@id"/>
4512
4539
 
4513
4540
  <xsl:if test="parent::*[local-name() = 'note']">
@@ -4544,6 +4571,7 @@
4544
4571
 
4545
4572
 
4546
4573
  </xsl:variable>
4574
+
4547
4575
  <xsl:variable name="font-size" select="normalize-space($_font-size)"/>
4548
4576
  <xsl:if test="$font-size != ''">
4549
4577
  <xsl:attribute name="font-size">
@@ -4560,11 +4588,11 @@
4560
4588
 
4561
4589
 
4562
4590
 
4563
- <xsl:apply-templates/>
4591
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
4564
4592
  </fo:block>
4565
4593
 
4566
4594
 
4567
- <xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
4595
+ <xsl:apply-templates select="*[local-name()='name']"/> <!-- show sourcecode's name AFTER content -->
4568
4596
 
4569
4597
 
4570
4598
 
@@ -4578,7 +4606,7 @@
4578
4606
  <xsl:call-template name="add-zero-spaces-java">
4579
4607
  <xsl:with-param name="text" select="$text"/>
4580
4608
  </xsl:call-template>
4581
- </xsl:template><xsl:template match="*[local-name() = 'sourcecode']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'sourcecode']/*[local-name() = 'name']" mode="presentation">
4609
+ </xsl:template><xsl:template match="*[local-name() = 'sourcecode']/*[local-name() = 'name']">
4582
4610
  <xsl:if test="normalize-space() != ''">
4583
4611
  <fo:block xsl:use-attribute-sets="sourcecode-name-style">
4584
4612
  <xsl:apply-templates/>
@@ -4586,10 +4614,10 @@
4586
4614
  </xsl:if>
4587
4615
  </xsl:template><xsl:template match="*[local-name() = 'permission']">
4588
4616
  <fo:block id="{@id}" xsl:use-attribute-sets="permission-style">
4589
- <xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
4590
- <xsl:apply-templates/>
4617
+ <xsl:apply-templates select="*[local-name()='name']"/>
4618
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
4591
4619
  </fo:block>
4592
- </xsl:template><xsl:template match="*[local-name() = 'permission']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'permission']/*[local-name() = 'name']" mode="presentation">
4620
+ </xsl:template><xsl:template match="*[local-name() = 'permission']/*[local-name() = 'name']">
4593
4621
  <xsl:if test="normalize-space() != ''">
4594
4622
  <fo:block xsl:use-attribute-sets="permission-name-style">
4595
4623
  <xsl:apply-templates/>
@@ -4602,13 +4630,13 @@
4602
4630
  </fo:block>
4603
4631
  </xsl:template><xsl:template match="*[local-name() = 'requirement']">
4604
4632
  <fo:block id="{@id}" xsl:use-attribute-sets="requirement-style">
4605
- <xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
4606
- <xsl:apply-templates select="*[local-name()='label']" mode="presentation"/>
4607
- <xsl:apply-templates select="@obligation" mode="presentation"/>
4608
- <xsl:apply-templates select="*[local-name()='subject']" mode="presentation"/>
4609
- <xsl:apply-templates/>
4633
+ <xsl:apply-templates select="*[local-name()='name']"/>
4634
+ <xsl:apply-templates select="*[local-name()='label']"/>
4635
+ <xsl:apply-templates select="@obligation"/>
4636
+ <xsl:apply-templates select="*[local-name()='subject']"/>
4637
+ <xsl:apply-templates select="node()[not(local-name() = 'name') and not(local-name() = 'label') and not(local-name() = 'subject')]"/>
4610
4638
  </fo:block>
4611
- </xsl:template><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'name']" mode="presentation">
4639
+ </xsl:template><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'name']">
4612
4640
  <xsl:if test="normalize-space() != ''">
4613
4641
  <fo:block xsl:use-attribute-sets="requirement-name-style">
4614
4642
 
@@ -4616,20 +4644,24 @@
4616
4644
 
4617
4645
  </fo:block>
4618
4646
  </xsl:if>
4619
- </xsl:template><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'label']"/><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'label']" mode="presentation">
4647
+ </xsl:template><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'label']">
4620
4648
  <fo:block xsl:use-attribute-sets="requirement-label-style">
4621
4649
  <xsl:apply-templates/>
4622
4650
  </fo:block>
4623
- </xsl:template><xsl:template match="*[local-name() = 'requirement']/@obligation" mode="presentation">
4651
+ </xsl:template><xsl:template match="*[local-name() = 'requirement']/@obligation">
4624
4652
  <fo:block>
4625
4653
  <fo:inline padding-right="3mm">Obligation</fo:inline><xsl:value-of select="."/>
4626
4654
  </fo:block>
4655
+ </xsl:template><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'subject']" priority="2">
4656
+ <fo:block xsl:use-attribute-sets="subject-style">
4657
+ <xsl:text>Target Type </xsl:text><xsl:apply-templates/>
4658
+ </fo:block>
4627
4659
  </xsl:template><xsl:template match="*[local-name() = 'recommendation']">
4628
4660
  <fo:block id="{@id}" xsl:use-attribute-sets="recommendation-style">
4629
- <xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
4630
- <xsl:apply-templates/>
4661
+ <xsl:apply-templates select="*[local-name()='name']"/>
4662
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
4631
4663
  </fo:block>
4632
- </xsl:template><xsl:template match="*[local-name() = 'recommendation']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'recommendation']/*[local-name() = 'name']" mode="presentation">
4664
+ </xsl:template><xsl:template match="*[local-name() = 'recommendation']/*[local-name() = 'name']">
4633
4665
  <xsl:if test="normalize-space() != ''">
4634
4666
  <fo:block xsl:use-attribute-sets="recommendation-name-style">
4635
4667
  <xsl:apply-templates/>
@@ -4640,10 +4672,6 @@
4640
4672
  <fo:block xsl:use-attribute-sets="recommendation-label-style">
4641
4673
  <xsl:apply-templates/>
4642
4674
  </fo:block>
4643
- </xsl:template><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'subject']" priority="2"/><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'subject']" mode="presentation">
4644
- <fo:block xsl:use-attribute-sets="subject-style">
4645
- <xsl:text>Target Type </xsl:text><xsl:apply-templates/>
4646
- </fo:block>
4647
4675
  </xsl:template><xsl:template match="*[local-name() = 'subject']">
4648
4676
  <fo:block xsl:use-attribute-sets="subject-style">
4649
4677
  <xsl:text>Target Type </xsl:text><xsl:apply-templates/>
@@ -4687,8 +4715,6 @@
4687
4715
  </xsl:variable>
4688
4716
  <xsl:variable name="cols-count" select="count(xalan:nodeset($simple-table)//tr[1]/td)"/>
4689
4717
  <xsl:if test="$cols-count = 2 and not(ancestor::*[local-name()='table'])">
4690
- <!-- <fo:table-column column-width="35mm"/>
4691
- <fo:table-column column-width="115mm"/> -->
4692
4718
  <fo:table-column column-width="30%"/>
4693
4719
  <fo:table-column column-width="70%"/>
4694
4720
  </xsl:if>
@@ -4698,7 +4724,7 @@
4698
4724
  <xsl:if test=".//*[local-name() = 'fn']">
4699
4725
  <xsl:for-each select="*[local-name() = 'tbody']">
4700
4726
  <fo:block font-size="90%" border-bottom="1pt solid black">
4701
- <xsl:call-template name="fn_display"/>
4727
+ <xsl:call-template name="table_fn_display"/>
4702
4728
  </fo:block>
4703
4729
  </xsl:for-each>
4704
4730
  </xsl:if>
@@ -4715,7 +4741,6 @@
4715
4741
  </xsl:template><xsl:template match="*[local-name()='tr']" mode="requirement">
4716
4742
  <fo:table-row height="7mm" border-bottom="0.5pt solid grey">
4717
4743
  <xsl:if test="parent::*[local-name()='thead']"> <!-- and not(ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']) -->
4718
- <!-- <xsl:attribute name="border">1pt solid black</xsl:attribute> -->
4719
4744
  <xsl:attribute name="background-color">rgb(33, 55, 92)</xsl:attribute>
4720
4745
  </xsl:if>
4721
4746
  <xsl:if test="starts-with(*[local-name()='td'][1], 'Requirement ')">
@@ -4728,34 +4753,11 @@
4728
4753
  </fo:table-row>
4729
4754
  </xsl:template><xsl:template match="*[local-name()='th']" mode="requirement">
4730
4755
  <fo:table-cell text-align="{@align}" display-align="center" padding="1mm" padding-left="2mm"> <!-- border="0.5pt solid black" -->
4731
- <xsl:attribute name="text-align">
4732
- <xsl:choose>
4733
- <xsl:when test="@align">
4734
- <xsl:value-of select="@align"/>
4735
- </xsl:when>
4736
- <xsl:otherwise>left</xsl:otherwise>
4737
- </xsl:choose>
4738
- </xsl:attribute>
4739
- <xsl:if test="@colspan">
4740
- <xsl:attribute name="number-columns-spanned">
4741
- <xsl:value-of select="@colspan"/>
4742
- </xsl:attribute>
4743
- </xsl:if>
4744
- <xsl:if test="@rowspan">
4745
- <xsl:attribute name="number-rows-spanned">
4746
- <xsl:value-of select="@rowspan"/>
4747
- </xsl:attribute>
4748
- </xsl:if>
4749
- <xsl:call-template name="display-align"/>
4756
+ <xsl:call-template name="setTextAlignment">
4757
+ <xsl:with-param name="default">left</xsl:with-param>
4758
+ </xsl:call-template>
4750
4759
 
4751
- <!-- <xsl:if test="ancestor::*[local-name()='table']/@type = 'recommend'">
4752
- <xsl:attribute name="padding-top">0.5mm</xsl:attribute>
4753
- <xsl:attribute name="background-color">rgb(165, 165, 165)</xsl:attribute>
4754
- </xsl:if>
4755
- <xsl:if test="ancestor::*[local-name()='table']/@type = 'recommendtest'">
4756
- <xsl:attribute name="padding-top">0.5mm</xsl:attribute>
4757
- <xsl:attribute name="background-color">rgb(201, 201, 201)</xsl:attribute>
4758
- </xsl:if> -->
4760
+ <xsl:call-template name="setTableCellAttributes"/>
4759
4761
 
4760
4762
  <fo:block>
4761
4763
  <xsl:apply-templates/>
@@ -4767,37 +4769,15 @@
4767
4769
  <xsl:attribute name="padding">0mm</xsl:attribute>
4768
4770
  <xsl:attribute name="padding-left">0mm</xsl:attribute>
4769
4771
  </xsl:if>
4770
- <xsl:attribute name="text-align">
4771
- <xsl:choose>
4772
- <xsl:when test="@align">
4773
- <xsl:value-of select="@align"/>
4774
- </xsl:when>
4775
- <xsl:otherwise>left</xsl:otherwise>
4776
- </xsl:choose>
4777
- </xsl:attribute>
4772
+ <xsl:call-template name="setTextAlignment">
4773
+ <xsl:with-param name="default">left</xsl:with-param>
4774
+ </xsl:call-template>
4775
+
4778
4776
  <xsl:if test="following-sibling::*[local-name()='td'] and not(preceding-sibling::*[local-name()='td'])">
4779
4777
  <xsl:attribute name="font-weight">bold</xsl:attribute>
4780
4778
  </xsl:if>
4781
- <xsl:if test="@colspan">
4782
- <xsl:attribute name="number-columns-spanned">
4783
- <xsl:value-of select="@colspan"/>
4784
- </xsl:attribute>
4785
- </xsl:if>
4786
- <xsl:if test="@rowspan">
4787
- <xsl:attribute name="number-rows-spanned">
4788
- <xsl:value-of select="@rowspan"/>
4789
- </xsl:attribute>
4790
- </xsl:if>
4791
- <xsl:call-template name="display-align"/>
4792
4779
 
4793
- <!-- <xsl:if test="ancestor::*[local-name()='table']/@type = 'recommend'">
4794
- <xsl:attribute name="padding-left">0.5mm</xsl:attribute>
4795
- <xsl:attribute name="padding-top">0.5mm</xsl:attribute>
4796
- <xsl:if test="parent::*[local-name()='tr']/preceding-sibling::*[local-name()='tr'] and not(*[local-name()='table'])">
4797
- <xsl:attribute name="background-color">rgb(201, 201, 201)</xsl:attribute>
4798
- </xsl:if>
4799
- </xsl:if> -->
4800
- <!-- 2nd line and below -->
4780
+ <xsl:call-template name="setTableCellAttributes"/>
4801
4781
 
4802
4782
  <fo:block>
4803
4783
  <xsl:apply-templates/>
@@ -4809,15 +4789,15 @@
4809
4789
  <xsl:apply-templates/>
4810
4790
  </fo:block>
4811
4791
  </xsl:template><xsl:template match="*[local-name() = 'p2'][ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']]">
4812
- <fo:block> <!-- margin-bottom="10pt" -->
4792
+ <fo:block>
4813
4793
  <xsl:apply-templates/>
4814
4794
  </fo:block>
4815
4795
  </xsl:template><xsl:template match="*[local-name() = 'termexample']">
4816
4796
  <fo:block id="{@id}" xsl:use-attribute-sets="termexample-style">
4817
- <xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
4818
- <xsl:apply-templates/>
4797
+ <xsl:apply-templates select="*[local-name()='name']"/>
4798
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
4819
4799
  </fo:block>
4820
- </xsl:template><xsl:template match="*[local-name() = 'termexample']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'termexample']/*[local-name() = 'name']" mode="presentation">
4800
+ </xsl:template><xsl:template match="*[local-name() = 'termexample']/*[local-name() = 'name']">
4821
4801
  <xsl:if test="normalize-space() != ''">
4822
4802
  <fo:inline xsl:use-attribute-sets="termexample-name-style">
4823
4803
  <xsl:apply-templates/>
@@ -4843,9 +4823,7 @@
4843
4823
 
4844
4824
  <xsl:variable name="fo_element">
4845
4825
  <xsl:if test=".//*[local-name() = 'table'] or .//*[local-name() = 'dl']">block</xsl:if>
4846
- block
4847
-
4848
-
4826
+ block
4849
4827
  </xsl:variable>
4850
4828
 
4851
4829
  <!-- display 'EXAMPLE' -->
@@ -4918,6 +4896,8 @@
4918
4896
  </xsl:template><xsl:template match="*[local-name() = 'termsource']" name="termsource">
4919
4897
  <fo:block xsl:use-attribute-sets="termsource-style">
4920
4898
 
4899
+
4900
+
4921
4901
  <!-- Example: [SOURCE: ISO 5127:2017, 3.1.6.02] -->
4922
4902
  <xsl:variable name="termsource_text">
4923
4903
  <xsl:apply-templates/>
@@ -4955,9 +4935,7 @@
4955
4935
  <xsl:value-of select="."/>
4956
4936
  </xsl:if>
4957
4937
  </xsl:template><xsl:template match="*[local-name() = 'termsource']/*[local-name() = 'strong'][1][following-sibling::*[1][local-name() = 'origin']]/text()">
4958
- <fo:inline>
4959
-
4960
-
4938
+ <fo:inline xsl:use-attribute-sets="termsource-text-style">
4961
4939
  <xsl:value-of select="."/>
4962
4940
  </fo:inline>
4963
4941
  </xsl:template><xsl:template match="*[local-name() = 'origin']">
@@ -5000,7 +4978,6 @@
5000
4978
  <fo:block-container margin-left="0mm">
5001
4979
 
5002
4980
  <fo:block xsl:use-attribute-sets="quote-style">
5003
- <!-- <xsl:apply-templates select=".//*[local-name() = 'p']"/> -->
5004
4981
 
5005
4982
  <xsl:apply-templates select="./node()[not(local-name() = 'author') and not(local-name() = 'source')]"/> <!-- process all nested nodes, except author and source -->
5006
4983
  </fo:block>
@@ -5043,15 +5020,13 @@
5043
5020
  </xsl:variable>
5044
5021
 
5045
5022
  <xsl:choose>
5046
- <xsl:when test="normalize-space($bibitemid) != ''">
5023
+ <xsl:when test="normalize-space($bibitemid) != ''"> <!-- if in the bibliography there is the item with @bibitemid (and not hidden), then create link -->
5047
5024
  <fo:inline xsl:use-attribute-sets="eref-style">
5048
5025
  <xsl:if test="@type = 'footnote'">
5049
-
5050
- <xsl:attribute name="keep-together.within-line">always</xsl:attribute>
5051
- <xsl:attribute name="font-size">80%</xsl:attribute>
5052
- <xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
5053
- <xsl:attribute name="vertical-align">super</xsl:attribute>
5054
-
5026
+ <xsl:attribute name="keep-together.within-line">always</xsl:attribute>
5027
+ <xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
5028
+ <xsl:attribute name="vertical-align">super</xsl:attribute>
5029
+ <xsl:attribute name="font-size">80%</xsl:attribute>
5055
5030
 
5056
5031
  </xsl:if>
5057
5032
 
@@ -5068,7 +5043,6 @@
5068
5043
 
5069
5044
 
5070
5045
 
5071
-
5072
5046
  </xsl:if>
5073
5047
 
5074
5048
 
@@ -5121,8 +5095,6 @@
5121
5095
  </xsl:choose>
5122
5096
  </xsl:variable>
5123
5097
 
5124
- <!-- <xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/> -->
5125
-
5126
5098
  <xsl:choose>
5127
5099
  <xsl:when test="$lang = 'zh'">
5128
5100
  <fo:inline><xsl:value-of select="$tab_zh"/></fo:inline>
@@ -5178,7 +5150,6 @@
5178
5150
  <xsl:apply-templates/>
5179
5151
  </xsl:template><xsl:template match="*[local-name() = 'definition'][preceding-sibling::*[local-name() = 'domain']]/*[local-name() = 'p'][1]">
5180
5152
  <fo:inline> <xsl:apply-templates/></fo:inline>
5181
- <!-- <fo:block>&#xA0;</fo:block> -->
5182
5153
  <fo:block/>
5183
5154
  </xsl:template><xsl:template match="/*/*[local-name() = 'sections']/*" priority="2">
5184
5155
 
@@ -5219,11 +5190,6 @@
5219
5190
  <xsl:apply-templates/>
5220
5191
  </fo:block>
5221
5192
  </xsl:template><xsl:template match="*[local-name() = 'definitions']">
5222
- <fo:block id="{@id}">
5223
- <xsl:apply-templates/>
5224
- </fo:block>
5225
- </xsl:template><xsl:template match="*[local-name() = 'references'][@hidden='true']" priority="3"/><xsl:template match="*[local-name() = 'bibitem'][@hidden='true']" priority="3"/><xsl:template match="/*/*[local-name() = 'bibliography']/*[local-name() = 'references'][@normative='true']">
5226
-
5227
5193
  <fo:block id="{@id}">
5228
5194
  <xsl:apply-templates/>
5229
5195
  </fo:block>
@@ -5493,75 +5459,148 @@
5493
5459
  <fo:table-cell border="1pt solid black" padding-left="1mm" padding-top="0.5mm">
5494
5460
  <fo:block><xsl:apply-templates/></fo:block>
5495
5461
  </fo:table-cell>
5496
- </xsl:template><xsl:template name="processBibitem">
5497
-
5498
-
5462
+ </xsl:template><xsl:template match="*[local-name() = 'references'][@hidden='true']" priority="3"/><xsl:template match="*[local-name() = 'bibitem'][@hidden='true']" priority="3"/><xsl:template match="*[local-name() = 'bibitem'][starts-with(@id, 'hidden_bibitem_')]" priority="3"/><xsl:template match="*[local-name() = 'references'][@normative='true']" priority="2">
5499
5463
 
5500
5464
 
5501
5465
 
5466
+ <fo:block id="{@id}">
5467
+ <xsl:apply-templates/>
5468
+ </fo:block>
5469
+ </xsl:template><xsl:template match="*[local-name() = 'references']">
5470
+ <xsl:if test="not(ancestor::*[local-name() = 'annex'])">
5471
+
5472
+ <fo:block break-after="page"/>
5473
+
5474
+ </xsl:if>
5502
5475
 
5503
- <!-- start CSA bibtem processing -->
5504
- <xsl:if test=".//csa:fn">
5505
- <xsl:attribute name="line-height-shift-adjustment">disregard-shifts</xsl:attribute>
5476
+ <!-- <xsl:if test="ancestor::*[local-name() = 'annex']">
5477
+ <xsl:if test="$namespace = 'csa' or $namespace = 'csd' or $namespace = 'gb' or $namespace = 'iec' or $namespace = 'iso' or $namespace = 'itu'">
5478
+ <fo:block break-after="page"/>
5506
5479
  </xsl:if>
5507
- <xsl:choose>
5508
- <xsl:when test="csa:formattedref">
5509
- <xsl:apply-templates select="csa:formattedref"/>
5510
- </xsl:when>
5511
- <xsl:otherwise>
5512
- <xsl:for-each select="csa:contributor[csa:role/@type='publisher']/csa:organization/csa:name">
5513
- <xsl:apply-templates/>
5514
- <xsl:if test="position() != last()">, </xsl:if>
5515
- <xsl:if test="position() = last()">: </xsl:if>
5516
- </xsl:for-each>
5517
- <!-- csa:docidentifier -->
5518
- <!-- <xsl:if test="csa:docidentifier">
5519
- <xsl:value-of select="csa:docidentifier/@type"/><xsl:text> </xsl:text>
5520
- <xsl:value-of select="csa:docidentifier"/>
5521
- </xsl:if> -->
5522
- <xsl:value-of select="csa:docidentifier[not(@type = 'metanorma-ordinal')]"/>
5523
- <xsl:apply-templates select="csa:note"/>
5524
- <xsl:if test="csa:docidentifier[not(@type = 'metanorma-ordinal')]">, </xsl:if>
5525
- <fo:inline font-style="italic">
5526
- <xsl:choose>
5527
- <xsl:when test="csa:title[@type = 'main' and @language = 'en']">
5528
- <xsl:value-of select="csa:title[@type = 'main' and @language = 'en']"/><xsl:text>. </xsl:text>
5529
- </xsl:when>
5530
- <xsl:otherwise>
5531
- <xsl:value-of select="csa:title"/><xsl:text>. </xsl:text>
5532
- </xsl:otherwise>
5533
- </xsl:choose>
5534
- </fo:inline>
5535
- <xsl:for-each select="csa:contributor[csa:role/@type='publisher']/csa:organization/csa:name">
5536
- <xsl:apply-templates/>
5537
- <xsl:if test="position() != last()">, </xsl:if>
5538
- </xsl:for-each>
5539
- <xsl:if test="csa:date[@type='published']/csa:on">
5540
- <xsl:text>(</xsl:text><xsl:value-of select="csa:date[@type='published']/csa:on"/><xsl:text>)</xsl:text>
5541
- </xsl:if>
5542
- </xsl:otherwise>
5543
- </xsl:choose>
5544
- <!-- end CSA bibtem processing -->
5545
-
5546
-
5547
-
5480
+ </xsl:if> -->
5548
5481
 
5482
+ <fo:block id="{@id}" xsl:use-attribute-sets="references-non-normative-style">
5483
+ <xsl:apply-templates/>
5484
+ </fo:block>
5549
5485
 
5550
5486
 
5551
-
5552
5487
 
5553
5488
 
5554
-
5489
+ </xsl:template><xsl:template match="*[local-name() = 'bibitem']">
5490
+ <xsl:call-template name="bibitem"/>
5491
+ </xsl:template><xsl:template match="*[local-name() = 'references'][@normative='true']/*[local-name() = 'bibitem']" name="bibitem" priority="2">
5555
5492
 
5493
+ <fo:block id="{@id}" xsl:use-attribute-sets="bibitem-normative-style">
5494
+ <xsl:call-template name="processBibitem"/>
5495
+ </fo:block>
5496
+
5556
5497
 
5498
+ </xsl:template><xsl:template match="*[local-name() = 'references'][not(@normative='true')]/*[local-name() = 'bibitem']" priority="2">
5557
5499
 
5558
- <!-- end MPFD bibitem processing -->
5559
5500
 
5560
- <!-- start M3D bibitem processing -->
5501
+ <fo:block xsl:use-attribute-sets="bibitem-non-normative-style">
5502
+ <fo:inline id="{@id}">
5503
+ <xsl:value-of select="csa:docidentifier[@type = 'metanorma-ordinal']"/>
5504
+ <xsl:if test="not(csa:docidentifier[@type = 'metanorma-ordinal'])">
5505
+ <xsl:number format="[1]"/>
5506
+ </xsl:if>
5507
+ </fo:inline>
5508
+
5509
+ <xsl:if test="not(csa:formattedref)">
5510
+ <xsl:choose>
5511
+ <xsl:when test="csa:contributor[csa:role/@type='publisher']/csa:organization/csa:abbreviation">
5512
+ <xsl:for-each select="csa:contributor[csa:role/@type='publisher']/csa:organization/csa:abbreviation">
5513
+ <xsl:value-of select="."/>
5514
+ <xsl:if test="position() != last()">/</xsl:if>
5515
+ </xsl:for-each>
5516
+ <xsl:text>: </xsl:text>
5517
+ </xsl:when>
5518
+ <xsl:when test="csa:contributor[csa:role/@type='publisher']/csa:organization/csa:name">
5519
+ <xsl:value-of select="csa:contributor[csa:role/@type='publisher']/csa:organization/csa:name"/>
5520
+ <xsl:text>: </xsl:text>
5521
+ </xsl:when>
5522
+ </xsl:choose>
5523
+
5524
+ </xsl:if>
5525
+
5526
+ <xsl:if test="csa:docidentifier[not(@type = 'metanorma-ordinal')]">
5527
+ <xsl:choose>
5528
+ <xsl:when test="csa:docidentifier/@type = 'ISO' and csa:formattedref"/>
5529
+ <xsl:when test="csa:docidentifier/@type = 'OGC' and csa:formattedref"/>
5530
+ <xsl:otherwise><fo:inline>
5531
+ <!-- <xsl:if test="csa:docidentifier/@type = 'OGC'">OGC </xsl:if> -->
5532
+ <xsl:value-of select="csa:docidentifier[not(@type = 'metanorma-ordinal')]"/><xsl:apply-templates select="csa:note"/>, </fo:inline></xsl:otherwise>
5533
+ </xsl:choose>
5534
+ </xsl:if>
5535
+
5536
+ <xsl:choose>
5537
+ <xsl:when test="csa:title[@type = 'main' and @language = 'en']">
5538
+ <xsl:apply-templates select="csa:title[@type = 'main' and @language = 'en']"/>
5539
+ </xsl:when>
5540
+ <xsl:otherwise>
5541
+ <xsl:apply-templates select="csa:title"/>
5542
+ </xsl:otherwise>
5543
+ </xsl:choose>
5544
+ <xsl:if test="csa:contributor[csa:role/@type='publisher']/csa:organization/csa:name">
5545
+ <xsl:text>, </xsl:text>
5546
+ <xsl:for-each select="csa:contributor[csa:role/@type='publisher']/csa:organization/csa:name">
5547
+ <xsl:if test="position() != last()">and </xsl:if>
5548
+ <xsl:value-of select="."/>
5549
+ </xsl:for-each>
5550
+
5551
+ </xsl:if>
5552
+ <xsl:if test="csa:place">
5553
+ <xsl:text>, </xsl:text>
5554
+ <xsl:value-of select="csa:place"/>
5555
+ </xsl:if>
5556
+ <xsl:if test="csa:date[@type='published']/csa:on">
5557
+ <xsl:text> (</xsl:text><xsl:value-of select="csa:date[@type='published']/csa:on"/><xsl:text>).</xsl:text>
5558
+ </xsl:if>
5559
+ <xsl:apply-templates select="csa:formattedref"/>
5560
+
5561
+ </fo:block>
5562
+
5561
5563
 
5564
+ </xsl:template><xsl:template name="processBibitem">
5562
5565
 
5563
-
5564
5566
 
5567
+ <!-- start CSA bibitem processing -->
5568
+ <xsl:if test=".//csa:fn">
5569
+ <xsl:attribute name="line-height-shift-adjustment">disregard-shifts</xsl:attribute>
5570
+ </xsl:if>
5571
+ <xsl:choose>
5572
+ <xsl:when test="csa:formattedref">
5573
+ <xsl:apply-templates select="csa:formattedref"/>
5574
+ </xsl:when>
5575
+ <xsl:otherwise>
5576
+ <xsl:for-each select="csa:contributor[csa:role/@type='publisher']/csa:organization/csa:name">
5577
+ <xsl:apply-templates/>
5578
+ <xsl:if test="position() != last()">, </xsl:if>
5579
+ <xsl:if test="position() = last()">: </xsl:if>
5580
+ </xsl:for-each>
5581
+ <!-- csa:docidentifier -->
5582
+ <xsl:value-of select="csa:docidentifier[not(@type = 'metanorma-ordinal')]"/>
5583
+ <xsl:apply-templates select="csa:note"/>
5584
+ <xsl:if test="csa:docidentifier[not(@type = 'metanorma-ordinal')]">, </xsl:if>
5585
+ <xsl:choose>
5586
+ <xsl:when test="csa:title[@type = 'main' and @language = 'en']">
5587
+ <fo:inline><xsl:apply-templates select="csa:title[@type = 'main' and @language = 'en']"/><xsl:text>. </xsl:text></fo:inline>
5588
+ </xsl:when>
5589
+ <xsl:otherwise>
5590
+ <fo:inline><xsl:apply-templates select="csa:title"/><xsl:text>. </xsl:text></fo:inline>
5591
+ </xsl:otherwise>
5592
+ </xsl:choose>
5593
+ <xsl:for-each select="csa:contributor[csa:role/@type='publisher']/csa:organization/csa:name">
5594
+ <xsl:apply-templates/>
5595
+ <xsl:if test="position() != last()">, </xsl:if>
5596
+ </xsl:for-each>
5597
+ <xsl:if test="csa:date[@type='published']/csa:on">
5598
+ <xsl:text>(</xsl:text><xsl:value-of select="csa:date[@type='published']/csa:on"/><xsl:text>)</xsl:text>
5599
+ </xsl:if>
5600
+ </xsl:otherwise>
5601
+ </xsl:choose>
5602
+ <!-- end CSA bibitem processing -->
5603
+
5565
5604
  </xsl:template><xsl:template name="processBibitemDocId">
5566
5605
  <xsl:variable name="_doc_ident" select="*[local-name() = 'docidentifier'][not(@type = 'DOI' or @type = 'metanorma' or @type = 'metanorma-ordinal' or @type = 'ISSN' or @type = 'ISBN' or @type = 'rfc-anchor')]"/>
5567
5606
  <xsl:choose>
@@ -5618,6 +5657,55 @@
5618
5657
  <xsl:value-of select="substring(.,1,1)"/>
5619
5658
  </xsl:template><xsl:template match="*[local-name() = 'title']" mode="title">
5620
5659
  <fo:inline><xsl:apply-templates/></fo:inline>
5660
+ </xsl:template><xsl:template match="*[local-name() = 'bibitem']/*[local-name() = 'title']" priority="2">
5661
+ <!-- <fo:inline><xsl:apply-templates /></fo:inline> -->
5662
+ <fo:inline font-style="italic"> <!-- BIPM BSI CSD CSA GB IEC IHO ISO ITU JCGM -->
5663
+ <xsl:apply-templates/>
5664
+ </fo:inline>
5665
+ </xsl:template><xsl:template match="*[local-name() = 'bibitem']/*[local-name() = 'note']" priority="2">
5666
+ <fo:footnote>
5667
+ <xsl:variable name="number">
5668
+
5669
+ <xsl:choose>
5670
+ <xsl:when test="ancestor::*[local-name() = 'references'][preceding-sibling::*[local-name() = 'references']]">
5671
+ <xsl:number level="any" count="*[local-name() = 'references'][preceding-sibling::*[local-name() = 'references']]//*[local-name() = 'bibitem']/*[local-name() = 'note']"/>
5672
+ </xsl:when>
5673
+ <xsl:otherwise>
5674
+ <xsl:number level="any" count="*[local-name() = 'bibitem']/*[local-name() = 'note']"/>
5675
+ </xsl:otherwise>
5676
+ </xsl:choose>
5677
+
5678
+ </xsl:variable>
5679
+ <fo:inline xsl:use-attribute-sets="bibitem-note-fn-style">
5680
+ <fo:basic-link internal-destination="{generate-id()}" fox:alt-text="footnote {$number}">
5681
+ <xsl:value-of select="$number"/>
5682
+
5683
+ </fo:basic-link>
5684
+ </fo:inline>
5685
+ <fo:footnote-body>
5686
+ <fo:block xsl:use-attribute-sets="bibitem-note-fn-body-style">
5687
+ <fo:inline id="{generate-id()}" xsl:use-attribute-sets="bibitem-note-fn-number-style">
5688
+ <xsl:value-of select="$number"/>
5689
+
5690
+ </fo:inline>
5691
+ <xsl:apply-templates/>
5692
+ </fo:block>
5693
+ </fo:footnote-body>
5694
+ </fo:footnote>
5695
+ </xsl:template><xsl:template match="*[local-name() = 'bibitem']/*[local-name() = 'edition']"> <!-- for iho -->
5696
+ <xsl:text> edition </xsl:text>
5697
+ <xsl:value-of select="."/>
5698
+ </xsl:template><xsl:template match="*[local-name() = 'bibitem']/*[local-name() = 'uri']"> <!-- for iho -->
5699
+ <xsl:text> (</xsl:text>
5700
+ <fo:inline xsl:use-attribute-sets="link-style">
5701
+ <fo:basic-link external-destination="." fox:alt-text=".">
5702
+ <xsl:value-of select="."/>
5703
+ </fo:basic-link>
5704
+ </fo:inline>
5705
+ <xsl:text>)</xsl:text>
5706
+ </xsl:template><xsl:template match="*[local-name() = 'bibitem']/*[local-name() = 'docidentifier']"/><xsl:template match="*[local-name() = 'formattedref']">
5707
+
5708
+ <xsl:apply-templates/>
5621
5709
  </xsl:template><xsl:template match="*[local-name() = 'form']">
5622
5710
  <fo:block>
5623
5711
  <xsl:apply-templates/>
@@ -5690,24 +5778,7 @@
5690
5778
  <xsl:when test="$htmltoclevels != ''"><xsl:value-of select="number($htmltoclevels)"/></xsl:when> <!-- if there is value in xml -->
5691
5779
  <xsl:when test="$toclevels != ''"><xsl:value-of select="number($toclevels)"/></xsl:when> <!-- if there is value in xml -->
5692
5780
  <xsl:otherwise><!-- default value -->
5693
-
5694
-
5695
5781
  2
5696
-
5697
-
5698
-
5699
-
5700
-
5701
-
5702
-
5703
-
5704
-
5705
-
5706
-
5707
-
5708
-
5709
-
5710
-
5711
5782
  </xsl:otherwise>
5712
5783
  </xsl:choose>
5713
5784
  </xsl:variable><xsl:template match="*[local-name() = 'toc']">
@@ -5805,6 +5876,56 @@
5805
5876
  <xsl:copy-of select="."/>
5806
5877
  </xsl:template><xsl:template match="*[local-name() = 'p'][@type = 'floating-title']" priority="4">
5807
5878
  <xsl:call-template name="title"/>
5879
+ </xsl:template><xsl:template match="*[local-name() = 'admonition']">
5880
+
5881
+
5882
+
5883
+
5884
+
5885
+ <!-- text in the box -->
5886
+ <fo:block-container id="{@id}" xsl:use-attribute-sets="admonition-style">
5887
+
5888
+
5889
+
5890
+
5891
+
5892
+ <fo:block-container xsl:use-attribute-sets="admonition-container-style">
5893
+
5894
+
5895
+ <fo:block-container margin-left="0mm" margin-right="0mm">
5896
+ <fo:block>
5897
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
5898
+ </fo:block>
5899
+ </fo:block-container>
5900
+
5901
+ </fo:block-container>
5902
+
5903
+ </fo:block-container>
5904
+
5905
+ </xsl:template><xsl:template name="displayAdmonitionName">
5906
+
5907
+ <xsl:apply-templates select="*[local-name() = 'name']"/>
5908
+ <xsl:if test="not(*[local-name() = 'name'])">
5909
+ <xsl:apply-templates select="@type"/>
5910
+ </xsl:if>
5911
+
5912
+ </xsl:template><xsl:template match="*[local-name() = 'admonition']/*[local-name() = 'name']">
5913
+ <xsl:apply-templates/>
5914
+ </xsl:template><xsl:template match="*[local-name() = 'admonition']/@type">
5915
+ <xsl:variable name="admonition_type_">
5916
+ <xsl:call-template name="getLocalizedString">
5917
+ <xsl:with-param name="key">admonition.<xsl:value-of select="."/></xsl:with-param>
5918
+ </xsl:call-template>
5919
+ </xsl:variable>
5920
+ <xsl:variable name="admonition_type" select="normalize-space(java:toUpperCase(java:java.lang.String.new($admonition_type_)))"/>
5921
+ <xsl:value-of select="$admonition_type"/>
5922
+ <xsl:if test="$admonition_type = ''">
5923
+ <xsl:value-of select="java:toUpperCase(java:java.lang.String.new(.))"/>
5924
+ </xsl:if>
5925
+ </xsl:template><xsl:template match="*[local-name() = 'admonition']/*[local-name() = 'p']">
5926
+ <!-- processing for admonition/p found in the template for 'p' -->
5927
+ <xsl:call-template name="paragraph"/>
5928
+
5808
5929
  </xsl:template><xsl:template name="convertDate">
5809
5930
  <xsl:param name="date"/>
5810
5931
  <xsl:param name="format" select="'short'"/>
@@ -5813,78 +5934,39 @@
5813
5934
  <xsl:variable name="day" select="substring($date, 9, 2)"/>
5814
5935
  <xsl:variable name="monthStr">
5815
5936
  <xsl:choose>
5816
- <xsl:when test="$month = '01'">January</xsl:when>
5817
- <xsl:when test="$month = '02'">February</xsl:when>
5818
- <xsl:when test="$month = '03'">March</xsl:when>
5819
- <xsl:when test="$month = '04'">April</xsl:when>
5820
- <xsl:when test="$month = '05'">May</xsl:when>
5821
- <xsl:when test="$month = '06'">June</xsl:when>
5822
- <xsl:when test="$month = '07'">July</xsl:when>
5823
- <xsl:when test="$month = '08'">August</xsl:when>
5824
- <xsl:when test="$month = '09'">September</xsl:when>
5825
- <xsl:when test="$month = '10'">October</xsl:when>
5826
- <xsl:when test="$month = '11'">November</xsl:when>
5827
- <xsl:when test="$month = '12'">December</xsl:when>
5828
- </xsl:choose>
5829
- </xsl:variable>
5830
- <xsl:variable name="result">
5831
- <xsl:choose>
5832
- <xsl:when test="$format = 'ddMMyyyy'">
5833
- <xsl:if test="$day != ''"><xsl:value-of select="number($day)"/></xsl:if>
5834
- <xsl:text> </xsl:text>
5835
- <xsl:value-of select="normalize-space(concat($monthStr, ' ' , $year))"/>
5836
- </xsl:when>
5837
- <xsl:when test="$format = 'ddMM'">
5838
- <xsl:if test="$day != ''"><xsl:value-of select="number($day)"/></xsl:if>
5839
- <xsl:text> </xsl:text><xsl:value-of select="$monthStr"/>
5840
- </xsl:when>
5841
- <xsl:when test="$format = 'short' or $day = ''">
5842
- <xsl:value-of select="normalize-space(concat($monthStr, ' ', $year))"/>
5843
- </xsl:when>
5844
- <xsl:otherwise>
5845
- <xsl:value-of select="normalize-space(concat($monthStr, ' ', $day, ', ' , $year))"/>
5846
- </xsl:otherwise>
5937
+ <xsl:when test="$month = '01'">january</xsl:when>
5938
+ <xsl:when test="$month = '02'">february</xsl:when>
5939
+ <xsl:when test="$month = '03'">march</xsl:when>
5940
+ <xsl:when test="$month = '04'">april</xsl:when>
5941
+ <xsl:when test="$month = '05'">may</xsl:when>
5942
+ <xsl:when test="$month = '06'">june</xsl:when>
5943
+ <xsl:when test="$month = '07'">july</xsl:when>
5944
+ <xsl:when test="$month = '08'">august</xsl:when>
5945
+ <xsl:when test="$month = '09'">september</xsl:when>
5946
+ <xsl:when test="$month = '10'">october</xsl:when>
5947
+ <xsl:when test="$month = '11'">november</xsl:when>
5948
+ <xsl:when test="$month = '12'">december</xsl:when>
5847
5949
  </xsl:choose>
5848
5950
  </xsl:variable>
5849
- <xsl:value-of select="$result"/>
5850
- </xsl:template><xsl:template name="convertDateLocalized">
5851
- <xsl:param name="date"/>
5852
- <xsl:param name="format" select="'short'"/>
5853
- <xsl:variable name="year" select="substring($date, 1, 4)"/>
5854
- <xsl:variable name="month" select="substring($date, 6, 2)"/>
5855
- <xsl:variable name="day" select="substring($date, 9, 2)"/>
5856
- <xsl:variable name="monthStr">
5857
- <xsl:choose>
5858
- <xsl:when test="$month = '01'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_january</xsl:with-param></xsl:call-template></xsl:when>
5859
- <xsl:when test="$month = '02'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_february</xsl:with-param></xsl:call-template></xsl:when>
5860
- <xsl:when test="$month = '03'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_march</xsl:with-param></xsl:call-template></xsl:when>
5861
- <xsl:when test="$month = '04'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_april</xsl:with-param></xsl:call-template></xsl:when>
5862
- <xsl:when test="$month = '05'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_may</xsl:with-param></xsl:call-template></xsl:when>
5863
- <xsl:when test="$month = '06'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_june</xsl:with-param></xsl:call-template></xsl:when>
5864
- <xsl:when test="$month = '07'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_july</xsl:with-param></xsl:call-template></xsl:when>
5865
- <xsl:when test="$month = '08'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_august</xsl:with-param></xsl:call-template></xsl:when>
5866
- <xsl:when test="$month = '09'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_september</xsl:with-param></xsl:call-template></xsl:when>
5867
- <xsl:when test="$month = '10'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_october</xsl:with-param></xsl:call-template></xsl:when>
5868
- <xsl:when test="$month = '11'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_november</xsl:with-param></xsl:call-template></xsl:when>
5869
- <xsl:when test="$month = '12'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_december</xsl:with-param></xsl:call-template></xsl:when>
5870
- </xsl:choose>
5951
+ <xsl:variable name="monthStr_localized">
5952
+ <xsl:if test="normalize-space($monthStr) != ''"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_<xsl:value-of select="$monthStr"/></xsl:with-param></xsl:call-template></xsl:if>
5871
5953
  </xsl:variable>
5872
5954
  <xsl:variable name="result">
5873
5955
  <xsl:choose>
5874
5956
  <xsl:when test="$format = 'ddMMyyyy'">
5875
5957
  <xsl:if test="$day != ''"><xsl:value-of select="number($day)"/></xsl:if>
5876
5958
  <xsl:text> </xsl:text>
5877
- <xsl:value-of select="normalize-space(concat($monthStr, ' ' , $year))"/>
5959
+ <xsl:value-of select="normalize-space(concat($monthStr_localized, ' ' , $year))"/>
5878
5960
  </xsl:when>
5879
5961
  <xsl:when test="$format = 'ddMM'">
5880
5962
  <xsl:if test="$day != ''"><xsl:value-of select="number($day)"/></xsl:if>
5881
- <xsl:text> </xsl:text><xsl:value-of select="$monthStr"/>
5963
+ <xsl:text> </xsl:text><xsl:value-of select="$monthStr_localized"/>
5882
5964
  </xsl:when>
5883
5965
  <xsl:when test="$format = 'short' or $day = ''">
5884
- <xsl:value-of select="normalize-space(concat($monthStr, ' ', $year))"/>
5966
+ <xsl:value-of select="normalize-space(concat($monthStr_localized, ' ', $year))"/>
5885
5967
  </xsl:when>
5886
5968
  <xsl:otherwise>
5887
- <xsl:value-of select="normalize-space(concat($monthStr, ' ', $day, ', ' , $year))"/>
5969
+ <xsl:value-of select="normalize-space(concat($monthStr_localized, ' ', $day, ', ' , $year))"/>
5888
5970
  </xsl:otherwise>
5889
5971
  </xsl:choose>
5890
5972
  </xsl:variable>
@@ -5936,14 +6018,9 @@
5936
6018
  <dc:title>
5937
6019
  <xsl:variable name="title">
5938
6020
  <xsl:for-each select="(//*[contains(local-name(), '-standard')])[1]/*[local-name() = 'bibdata']">
5939
-
5940
-
5941
-
5942
-
5943
- <xsl:value-of select="*[local-name() = 'title'][@language = $lang]"/>
5944
-
5945
-
5946
6021
 
6022
+ <xsl:value-of select="*[local-name() = 'title'][@language = $lang]"/>
6023
+
5947
6024
  </xsl:for-each>
5948
6025
  </xsl:variable>
5949
6026
  <xsl:choose>
@@ -5958,21 +6035,18 @@
5958
6035
  <dc:creator>
5959
6036
  <xsl:for-each select="(//*[contains(local-name(), '-standard')])[1]/*[local-name() = 'bibdata']">
5960
6037
 
5961
- <xsl:for-each select="*[local-name() = 'contributor'][*[local-name() = 'role']/@type='author']">
5962
- <xsl:value-of select="*[local-name() = 'organization']/*[local-name() = 'name']"/>
5963
- <xsl:if test="position() != last()">; </xsl:if>
5964
- </xsl:for-each>
5965
-
5966
-
5967
-
6038
+ <xsl:for-each select="*[local-name() = 'contributor'][*[local-name() = 'role']/@type='author']">
6039
+ <xsl:value-of select="*[local-name() = 'organization']/*[local-name() = 'name']"/>
6040
+ <xsl:if test="position() != last()">; </xsl:if>
6041
+ </xsl:for-each>
6042
+
5968
6043
  </xsl:for-each>
5969
6044
  </dc:creator>
5970
6045
  <dc:description>
5971
6046
  <xsl:variable name="abstract">
5972
6047
 
5973
- <xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*[local-name() = 'abstract']//text()"/>
5974
-
5975
-
6048
+ <xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*[local-name() = 'abstract']//text()"/>
6049
+
5976
6050
  </xsl:variable>
5977
6051
  <xsl:value-of select="normalize-space($abstract)"/>
5978
6052
  </dc:description>
@@ -5992,7 +6066,6 @@
5992
6066
  <xsl:value-of select="../@id"/>
5993
6067
  </xsl:when>
5994
6068
  <xsl:otherwise>
5995
- <!-- <xsl:value-of select="concat(local-name(..), '_', text())"/> -->
5996
6069
  <xsl:value-of select="concat(generate-id(..), '_', text())"/>
5997
6070
  </xsl:otherwise>
5998
6071
  </xsl:choose>
@@ -6018,9 +6091,6 @@
6018
6091
  <xsl:when test="ancestor::*[local-name() = 'preface']">
6019
6092
  <xsl:value-of select="$level_total - 2"/>
6020
6093
  </xsl:when>
6021
- <!-- <xsl:when test="parent::*[local-name() = 'sections']">
6022
- <xsl:value-of select="$level_total - 1"/>
6023
- </xsl:when> -->
6024
6094
  <xsl:when test="ancestor::*[local-name() = 'sections']">
6025
6095
  <xsl:value-of select="$level_total - 1"/>
6026
6096
  </xsl:when>
@@ -6210,7 +6280,6 @@
6210
6280
  <xsl:value-of select="$key_"/>
6211
6281
  </xsl:otherwise>
6212
6282
  </xsl:choose>
6213
-
6214
6283
  </xsl:template><xsl:template name="setTrackChangesStyles">
6215
6284
  <xsl:param name="isAdded"/>
6216
6285
  <xsl:param name="isDeleted"/>
@@ -6233,7 +6302,6 @@
6233
6302
  <xsl:if test="local-name() = 'table'">
6234
6303
  <xsl:attribute name="background-color">rgb(255, 185, 185)</xsl:attribute>
6235
6304
  </xsl:if>
6236
- <!-- <xsl:attribute name="color"><xsl:value-of select="$color-deleted-text"/></xsl:attribute> -->
6237
6305
  <xsl:attribute name="padding">2mm</xsl:attribute>
6238
6306
  </xsl:if>
6239
6307
  </xsl:otherwise>
@@ -6253,15 +6321,18 @@
6253
6321
  </xsl:choose>
6254
6322
  </xsl:template><xsl:template name="setTextAlignment">
6255
6323
  <xsl:param name="default">left</xsl:param>
6324
+ <xsl:variable name="align" select="normalize-space(@align)"/>
6256
6325
  <xsl:attribute name="text-align">
6257
6326
  <xsl:choose>
6258
- <xsl:when test="@align and not(@align = 'indent')"><xsl:value-of select="@align"/></xsl:when>
6327
+ <xsl:when test="$lang = 'ar' and $align = 'left'">start</xsl:when>
6328
+ <xsl:when test="$lang = 'ar' and $align = 'right'">end</xsl:when>
6329
+ <xsl:when test="$align != '' and not($align = 'indent')"><xsl:value-of select="$align"/></xsl:when>
6259
6330
  <xsl:when test="ancestor::*[local-name() = 'td']/@align"><xsl:value-of select="ancestor::*[local-name() = 'td']/@align"/></xsl:when>
6260
6331
  <xsl:when test="ancestor::*[local-name() = 'th']/@align"><xsl:value-of select="ancestor::*[local-name() = 'th']/@align"/></xsl:when>
6261
6332
  <xsl:otherwise><xsl:value-of select="$default"/></xsl:otherwise>
6262
6333
  </xsl:choose>
6263
6334
  </xsl:attribute>
6264
- <xsl:if test="@align = 'indent'">
6335
+ <xsl:if test="$align = 'indent'">
6265
6336
  <xsl:attribute name="margin-left">7mm</xsl:attribute>
6266
6337
  </xsl:if>
6267
6338
  </xsl:template><xsl:template name="number-to-words">