metanorma-m3aawg 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 (7) hide show
  1. checksums.yaml +4 -4
  2. data/lib/isodoc/m3aawg/html/htmlstyle.css +20 -16
  3. data/lib/isodoc/m3aawg/html/htmlstyle.scss +7 -2
  4. data/lib/isodoc/m3aawg/m3aawg.policy.xsl +1126 -1065
  5. data/lib/isodoc/m3aawg/m3aawg.report.xsl +1126 -1065
  6. data/lib/metanorma/m3aawg/version.rb +1 -1
  7. metadata +2 -2
data/lib/isodoc/m3aawg/m3aawg.policy.xsl CHANGED
@@ -39,7 +39,7 @@
39
39
 
40
40
  <xsl:template match="/">
41
41
  <xsl:call-template name="namespaceCheck"/>
42
- <fo:root font-family="EB Garamond 12" font-size="12pt" xml:lang="{$lang}">
42
+ <fo:root xsl:use-attribute-sets="root-style" xml:lang="{$lang}">
43
43
  <fo:layout-master-set>
44
44
 
45
45
  <!-- cover page -->
@@ -346,11 +346,7 @@
346
346
  <!-- ============================= -->
347
347
  <!-- CONTENTS -->
348
348
  <!-- ============================= -->
349
- <xsl:template match="node()" mode="contents">
350
- <xsl:apply-templates mode="contents"/>
351
- </xsl:template>
352
-
353
-
349
+
354
350
  <!-- element with title -->
355
351
  <xsl:template match="*[m3d:title]" mode="contents">
356
352
  <xsl:variable name="level">
@@ -535,7 +531,7 @@
535
531
  <!-- ====== -->
536
532
 
537
533
 
538
- <xsl:template match="m3d:p">
534
+ <xsl:template match="m3d:p" name="paragraph">
539
535
  <xsl:param name="inline" select="'false'"/>
540
536
  <xsl:variable name="previous-element" select="local-name(preceding-sibling::*[1])"/>
541
537
  <xsl:variable name="element-name">
@@ -593,36 +589,6 @@
593
589
  </xsl:template>
594
590
 
595
591
 
596
- <xsl:template match="m3d:bibitem">
597
- <fo:block id="{@id}" margin-bottom="12pt" text-indent="-11.7mm" margin-left="11.7mm"> <!-- 12 pt -->
598
- <xsl:call-template name="processBibitem"/>
599
- </fo:block>
600
- </xsl:template>
601
-
602
-
603
- <xsl:template match="m3d:bibitem/m3d:note" priority="2">
604
- <fo:footnote>
605
- <xsl:variable name="number">
606
- <xsl:number level="any" count="m3d:bibitem/m3d:note"/>
607
- </xsl:variable>
608
- <fo:inline font-size="7pt" keep-with-previous.within-line="always" baseline-shift="30%">
609
- <fo:basic-link internal-destination="{generate-id()}" fox:alt-text="footnote {$number}">
610
- <xsl:value-of select="$number"/>
611
- </fo:basic-link>
612
- </fo:inline>
613
- <fo:footnote-body>
614
- <fo:block font-size="9pt" margin-bottom="4pt" start-indent="0pt">
615
- <fo:inline font-size="6pt" id="{generate-id()}" keep-with-next.within-line="always" baseline-shift="30%" padding-right="1mm"><!-- alignment-baseline="hanging" font-size="60%" -->
616
- <xsl:value-of select="$number"/>
617
- </fo:inline>
618
- <xsl:apply-templates/>
619
- </fo:block>
620
- </fo:footnote-body>
621
- </fo:footnote>
622
- </xsl:template>
623
-
624
-
625
-
626
592
  <xsl:template match="m3d:ul | m3d:ol" mode="ul_ol">
627
593
  <fo:block-container margin-left="6mm">
628
594
  <fo:block-container margin-left="0mm">
@@ -680,9 +646,9 @@
680
646
  <fo:block-container margin-left="0mm" margin-top="4pt" line-height="125%">
681
647
  <fo:block>
682
648
  <fo:inline padding-right="1mm">
683
- <xsl:apply-templates select="m3d:name" mode="presentation"/>
649
+ <xsl:apply-templates select="m3d:name"/>
684
650
  </fo:inline>
685
- <xsl:apply-templates/>
651
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
686
652
  </fo:block>
687
653
  </fo:block-container>
688
654
  </xsl:template>
@@ -695,53 +661,6 @@
695
661
 
696
662
 
697
663
 
698
- <!-- <xsl:template match="m3d:references[@id = '_bibliography']"> -->
699
- <xsl:template match="m3d:references[not(@normative='true')]">
700
- <fo:block break-after="page"/>
701
- <fo:block id="{@id}">
702
- <xsl:apply-templates/>
703
- </fo:block>
704
- <fo:block-container text-align="center">
705
- <fo:block-container margin-left="63mm" width="42mm" border-bottom="2pt solid black">
706
- <fo:block> </fo:block>
707
- </fo:block-container>
708
- </fo:block-container>
709
- </xsl:template>
710
-
711
-
712
- <!-- Example: [1] ISO 9:1995, Information and documentation – Transliteration of Cyrillic characters into Latin characters – Slavic and non-Slavic languages -->
713
- <!-- <xsl:template match="m3d:references[@id = '_bibliography']/m3d:bibitem"> -->
714
- <xsl:template match="m3d:references[not(@normative='true')]/m3d:bibitem">
715
- <fo:list-block margin-bottom="12pt" provisional-distance-between-starts="12mm">
716
- <fo:list-item>
717
- <fo:list-item-label end-indent="label-end()">
718
- <fo:block>
719
- <fo:inline id="{@id}">
720
- <xsl:value-of select="m3d:docidentifier[@type = 'metanorma-ordinal']"/>
721
- <xsl:if test="not(m3d:docidentifier[@type = 'metanorma-ordinal'])">
722
- <xsl:number format="[1]"/>
723
- </xsl:if>
724
- </fo:inline>
725
- </fo:block>
726
- </fo:list-item-label>
727
- <fo:list-item-body start-indent="body-start()">
728
- <fo:block text-align="justify">
729
- <xsl:call-template name="processBibitem"/>
730
- </fo:block>
731
- </fo:list-item-body>
732
- </fo:list-item>
733
- </fo:list-block>
734
- </xsl:template>
735
-
736
-
737
- <!-- <xsl:template match="m3d:references[@id = '_bibliography']/m3d:bibitem/m3d:title"> -->
738
- <xsl:template match="m3d:references/m3d:bibitem/m3d:title">
739
- <fo:inline font-style="italic">
740
- <xsl:apply-templates/>
741
- </fo:inline>
742
- </xsl:template>
743
-
744
-
745
664
  <xsl:template match="mathml:math" priority="2">
746
665
  <fo:inline font-family="Cambria Math">
747
666
  <xsl:variable name="mathml">
@@ -753,31 +672,7 @@
753
672
  </fo:instream-foreign-object>
754
673
  </fo:inline>
755
674
  </xsl:template>
756
-
757
-
758
- <!-- <xsl:template match="m3d:note/m3d:p" name="note">
759
- <fo:block-container margin-left="0mm" margin-top="4pt" line-height="125%">
760
- <fo:block>
761
- <fo:inline >
762
- <xsl:apply-templates select="../m3d:name" mode="presentation">
763
- <xsl:with-param name="sfx" select="':'"/>
764
- </xsl:apply-templates>
765
- </fo:inline>
766
- <xsl:apply-templates />
767
- </fo:block>
768
- </fo:block-container>
769
- </xsl:template> -->
770
675
 
771
-
772
-
773
- <xsl:template match="m3d:admonition">
774
- <fo:block text-align="center" margin-bottom="12pt" font-weight="bold">
775
- <xsl:value-of select="java:toUpperCase(java:java.lang.String.new(@type))"/>
776
- </fo:block>
777
- <fo:block font-weight="bold">
778
- <xsl:apply-templates/>
779
- </fo:block>
780
- </xsl:template>
781
676
 
782
677
 
783
678
  <xsl:template match="m3d:formula/m3d:stem">
@@ -794,7 +689,7 @@
794
689
  </fo:table-cell>
795
690
  <fo:table-cell display-align="center">
796
691
  <fo:block text-align="left">
797
- <xsl:apply-templates select="../m3d:name" mode="presentation"/>
692
+ <xsl:apply-templates select="../m3d:name" mode="formula_number"/>
798
693
  </fo:block>
799
694
  </fo:table-cell>
800
695
  </fo:table-row>
@@ -808,22 +703,18 @@
808
703
  <xsl:text>iVBORw0KGgoAAAANSUhEUgAAAjUAAAA8CAYAAACehUt5AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA99pVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgeG1wTU06T3JpZ2luYWxEb2N1bWVudElEPSJ1dWlkOmZhZjViZGQ1LWJhM2QtMTFkYS1hZDMxLWQzM2Q3NTE4MmYxYiIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDo1QjFGQUNFRDVCODYxMUU0OUZCN0FCODI3QzkxM0M3RiIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDo1QjFGQUNFQzVCODYxMUU0OUZCN0FCODI3QzkxM0M3RiIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M2IChXaW5kb3dzKSI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkMwOEQ1MzE4OTE1NUU0MTE4ODdFRjlCOTFBMkJDOUNFIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjg1QjAy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</xsl:text>
809
704
  </xsl:variable>
810
705
 
811
- <xsl:variable name="titles" select="xalan:nodeset($titles_)"/><xsl:variable name="titles_">
706
+ <xsl:variable name="titles_">
812
707
 
813
708
  <title-edition lang="en">
814
709
 
815
-
816
- <xsl:text>Version</xsl:text>
817
-
710
+ <xsl:text>Version</xsl:text>
711
+
818
712
  </title-edition>
819
713
 
820
714
  <title-edition lang="fr">
821
-
822
- <xsl:text>Édition </xsl:text>
823
-
715
+ <xsl:text>Édition </xsl:text>
824
716
  </title-edition>
825
717
 
826
-
827
718
  <!-- These titles of Table of contents renders different than determined in localized-strings -->
828
719
  <title-toc lang="en">
829
720
 
@@ -833,14 +724,13 @@
833
724
 
834
725
  </title-toc>
835
726
  <title-toc lang="fr">
727
+ <xsl:text>Sommaire</xsl:text>
728
+ </title-toc>
729
+ <title-toc lang="zh">
836
730
 
837
- <xsl:text>Sommaire</xsl:text>
838
-
731
+ <xsl:text>Contents</xsl:text>
732
+
839
733
  </title-toc>
840
-
841
- <title-toc lang="zh">Contents</title-toc>
842
-
843
-
844
734
 
845
735
  <title-descriptors lang="en">Descriptors</title-descriptors>
846
736
 
@@ -856,12 +746,8 @@
856
746
  </title-part>
857
747
  <title-part lang="zh">第 # 部分:</title-part>
858
748
 
859
- <title-subpart lang="en">
860
-
861
- </title-subpart>
862
- <title-subpart lang="fr">
863
-
864
- </title-subpart>
749
+ <title-subpart lang="en">Sub-part #</title-subpart>
750
+ <title-subpart lang="fr">Partie de sub #</title-subpart>
865
751
 
866
752
  <title-list-tables lang="en">List of Tables</title-list-tables>
867
753
 
@@ -876,7 +762,7 @@
876
762
  <title-continued lang="en">(continued)</title-continued>
877
763
  <title-continued lang="fr">(continué)</title-continued>
878
764
 
879
- </xsl:variable><xsl:variable name="bibdata">
765
+ </xsl:variable><xsl:variable name="titles" select="xalan:nodeset($titles_)"/><xsl:variable name="bibdata">
880
766
  <xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'bibdata']"/>
881
767
  <xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'localized-strings']"/>
882
768
  </xsl:variable><xsl:variable name="tab_zh">　</xsl:variable><xsl:template name="getTitle">
@@ -905,6 +791,23 @@
905
791
  </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">
906
792
 
907
793
 
794
+
795
+
796
+
797
+
798
+
799
+
800
+
801
+
802
+ <xsl:attribute name="font-family">EB Garamond 12</xsl:attribute>
803
+ <xsl:attribute name="font-size">12pt</xsl:attribute>
804
+
805
+
806
+
807
+
808
+
809
+
810
+
908
811
  </xsl:attribute-set><xsl:attribute-set name="link-style">
909
812
 
910
813
 
@@ -914,6 +817,9 @@
914
817
 
915
818
 
916
819
 
820
+ </xsl:attribute-set><xsl:attribute-set name="sourcecode-container-style">
821
+ <xsl:attribute name="margin-left">0mm</xsl:attribute>
822
+
917
823
  </xsl:attribute-set><xsl:attribute-set name="sourcecode-style">
918
824
  <xsl:attribute name="white-space">pre</xsl:attribute>
919
825
  <xsl:attribute name="wrap-option">wrap</xsl:attribute>
@@ -924,12 +830,19 @@
924
830
 
925
831
 
926
832
 
833
+
834
+
835
+
836
+
837
+
927
838
  <xsl:attribute name="font-family">Courier New</xsl:attribute>
928
839
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
929
840
 
930
841
 
931
842
 
932
843
 
844
+
845
+
933
846
  </xsl:attribute-set><xsl:attribute-set name="permission-style">
934
847
 
935
848
  </xsl:attribute-set><xsl:attribute-set name="permission-name-style">
@@ -1043,289 +956,498 @@
1043
956
 
1044
957
  </xsl:attribute-set><xsl:variable name="table-border_">
1045
958
 
1046
- </xsl:variable><xsl:variable name="table-border" select="normalize-space($table-border_)"/><xsl:attribute-set name="table-name-style">
1047
- <xsl:attribute name="keep-with-next">always</xsl:attribute>
1048
-
959
+ </xsl:variable><xsl:variable name="table-border" select="normalize-space($table-border_)"/><xsl:attribute-set name="table-container-style">
960
+ <xsl:attribute name="margin-left">0mm</xsl:attribute>
961
+ <xsl:attribute name="margin-right">0mm</xsl:attribute>
1049
962
 
1050
- <xsl:attribute name="font-weight">bold</xsl:attribute>
1051
- <xsl:attribute name="text-align">center</xsl:attribute>
1052
- <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
1053
963
 
1054
964
 
1055
965
 
1056
966
 
1057
-
1058
967
 
1059
968
 
1060
969
 
1061
-
1062
970
 
1063
971
 
1064
972
 
1065
973
 
1066
- </xsl:attribute-set><xsl:attribute-set name="table-footer-cell-style">
974
+
1067
975
 
1068
- </xsl:attribute-set><xsl:attribute-set name="appendix-style">
1069
-
1070
- <xsl:attribute name="font-size">12pt</xsl:attribute>
1071
- <xsl:attribute name="font-weight">bold</xsl:attribute>
1072
- <xsl:attribute name="margin-top">12pt</xsl:attribute>
1073
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1074
976
 
1075
977
 
1076
978
 
1077
- </xsl:attribute-set><xsl:attribute-set name="appendix-example-style">
1078
979
 
1079
- <xsl:attribute name="font-size">10pt</xsl:attribute>
1080
- <xsl:attribute name="margin-top">8pt</xsl:attribute>
1081
- <xsl:attribute name="margin-bottom">8pt</xsl:attribute>
1082
980
 
1083
981
 
982
+
1084
983
 
1085
- </xsl:attribute-set><xsl:attribute-set name="xref-style">
1086
984
 
985
+ </xsl:attribute-set><xsl:attribute-set name="table-style">
986
+ <xsl:attribute name="table-omit-footer-at-break">true</xsl:attribute>
987
+ <xsl:attribute name="table-layout">fixed</xsl:attribute>
988
+ <xsl:attribute name="margin-left">0mm</xsl:attribute>
989
+ <xsl:attribute name="margin-right">0mm</xsl:attribute>
1087
990
 
1088
991
 
1089
992
 
1090
993
 
1091
- </xsl:attribute-set><xsl:attribute-set name="eref-style">
1092
994
 
1093
995
 
1094
996
 
1095
997
 
1096
998
 
1097
999
 
1098
- </xsl:attribute-set><xsl:attribute-set name="note-style">
1099
1000
 
1100
1001
 
1002
+
1101
1003
 
1102
1004
 
1103
-
1104
1005
 
1105
1006
 
1106
1007
 
1107
1008
 
1108
- <xsl:attribute name="margin-left">0mm</xsl:attribute>
1109
- <xsl:attribute name="margin-top">4pt</xsl:attribute>
1110
- <xsl:attribute name="text-align">justify</xsl:attribute>
1111
- <xsl:attribute name="line-height">125%</xsl:attribute>
1112
1009
 
1113
1010
 
1114
1011
 
1012
+ </xsl:attribute-set><xsl:attribute-set name="table-name-style">
1013
+ <xsl:attribute name="keep-with-next">always</xsl:attribute>
1014
+
1115
1015
 
1016
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
1017
+ <xsl:attribute name="text-align">center</xsl:attribute>
1018
+ <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
1116
1019
 
1117
1020
 
1118
1021
 
1119
1022
 
1120
- </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">
1023
+
1121
1024
 
1122
1025
 
1123
1026
 
1027
+
1124
1028
 
1125
1029
 
1126
1030
 
1127
1031
 
1032
+ </xsl:attribute-set><xsl:attribute-set name="table-row-style">
1033
+ <xsl:attribute name="min-height">4mm</xsl:attribute>
1128
1034
 
1129
1035
 
1130
- <xsl:attribute name="padding-right">5mm</xsl:attribute>
1131
- <xsl:attribute name="font-weight">bold</xsl:attribute>
1132
1036
 
1133
1037
 
1038
+ </xsl:attribute-set><xsl:attribute-set name="table-header-row-style" use-attribute-sets="table-row-style">
1039
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
1134
1040
 
1135
1041
 
1136
1042
 
1137
- </xsl:attribute-set><xsl:attribute-set name="table-note-name-style">
1138
1043
 
1139
1044
 
1140
1045
 
1141
1046
 
1142
- </xsl:attribute-set><xsl:attribute-set name="note-p-style">
1047
+
1143
1048
 
1049
+ </xsl:attribute-set><xsl:attribute-set name="table-footer-row-style" use-attribute-sets="table-row-style">
1144
1050
 
1145
1051
 
1146
-
1147
1052
 
1053
+ </xsl:attribute-set><xsl:attribute-set name="table-body-row-style" use-attribute-sets="table-row-style">
1054
+
1055
+ </xsl:attribute-set><xsl:attribute-set name="table-header-cell-style">
1056
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
1057
+ <xsl:attribute name="border">solid black 1pt</xsl:attribute>
1058
+ <xsl:attribute name="padding-left">1mm</xsl:attribute>
1059
+ <xsl:attribute name="display-align">center</xsl:attribute>
1148
1060
 
1149
1061
 
1150
1062
 
1151
- <xsl:attribute name="margin-left">0mm</xsl:attribute>
1152
- <xsl:attribute name="margin-top">4pt</xsl:attribute>
1153
1063
 
1154
1064
 
1155
1065
 
1156
1066
 
1157
1067
 
1158
1068
 
1159
- </xsl:attribute-set><xsl:attribute-set name="termnote-style">
1160
1069
 
1161
1070
 
1162
1071
 
1163
1072
 
1073
+ </xsl:attribute-set><xsl:attribute-set name="table-cell-style">
1074
+ <xsl:attribute name="display-align">center</xsl:attribute>
1075
+ <xsl:attribute name="border">solid black 1pt</xsl:attribute>
1076
+ <xsl:attribute name="padding-left">1mm</xsl:attribute>
1164
1077
 
1165
1078
 
1166
1079
 
1167
- </xsl:attribute-set><xsl:attribute-set name="termnote-name-style">
1168
1080
 
1169
-
1170
1081
 
1171
1082
 
1172
- </xsl:attribute-set><xsl:attribute-set name="quote-style">
1173
- <xsl:attribute name="role">BlockQuote</xsl:attribute>
1174
1083
 
1175
1084
 
1176
- <xsl:attribute name="margin-top">12pt</xsl:attribute>
1177
- <xsl:attribute name="margin-left">12mm</xsl:attribute>
1178
- <xsl:attribute name="margin-right">12mm</xsl:attribute>
1179
1085
 
1180
1086
 
1181
1087
 
1182
1088
 
1183
1089
 
1090
+ </xsl:attribute-set><xsl:attribute-set name="table-footer-cell-style">
1091
+ <xsl:attribute name="border">solid black 1pt</xsl:attribute>
1092
+ <xsl:attribute name="padding-left">1mm</xsl:attribute>
1093
+ <xsl:attribute name="padding-right">1mm</xsl:attribute>
1094
+ <xsl:attribute name="padding-top">1mm</xsl:attribute>
1184
1095
 
1185
- </xsl:attribute-set><xsl:attribute-set name="quote-source-style">
1186
1096
 
1187
1097
 
1188
- <xsl:attribute name="text-align">right</xsl:attribute>
1189
-
1190
-
1191
- </xsl:attribute-set><xsl:attribute-set name="termsource-style">
1192
1098
 
1193
1099
 
1194
1100
 
1195
1101
 
1102
+
1196
1103
 
1197
1104
 
1198
1105
 
1199
- </xsl:attribute-set><xsl:attribute-set name="origin-style">
1106
+ </xsl:attribute-set><xsl:attribute-set name="table-note-style">
1107
+ <xsl:attribute name="font-size">10pt</xsl:attribute>
1108
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1200
1109
 
1201
1110
 
1202
1111
 
1203
1112
 
1204
- </xsl:attribute-set><xsl:attribute-set name="term-style">
1205
1113
 
1206
- </xsl:attribute-set><xsl:attribute-set name="figure-name-style">
1207
1114
 
1208
1115
 
1209
-
1210
1116
 
1117
+ </xsl:attribute-set><xsl:attribute-set name="table-fn-style">
1118
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1211
1119
 
1212
1120
 
1213
1121
 
1214
1122
 
1215
1123
 
1216
1124
 
1125
+ </xsl:attribute-set><xsl:attribute-set name="table-fn-number-style">
1126
+ <xsl:attribute name="font-size">80%</xsl:attribute>
1127
+ <xsl:attribute name="padding-right">5mm</xsl:attribute>
1217
1128
 
1218
-
1219
- <xsl:attribute name="text-align">center</xsl:attribute>
1220
- <xsl:attribute name="margin-top">12pt</xsl:attribute>
1221
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1222
- <xsl:attribute name="keep-with-previous">always</xsl:attribute>
1223
1129
 
1224
1130
 
1225
1131
 
1226
1132
 
1227
-
1228
1133
 
1229
1134
 
1230
1135
 
1231
-
1232
- </xsl:attribute-set><xsl:attribute-set name="formula-style">
1233
1136
 
1234
- </xsl:attribute-set><xsl:attribute-set name="image-style">
1235
- <xsl:attribute name="text-align">center</xsl:attribute>
1137
+ <xsl:attribute name="vertical-align">super</xsl:attribute>
1236
1138
 
1237
1139
 
1238
1140
 
1239
1141
 
1142
+ </xsl:attribute-set><xsl:attribute-set name="fn-container-body-style">
1143
+ <xsl:attribute name="text-indent">0</xsl:attribute>
1144
+ <xsl:attribute name="start-indent">0</xsl:attribute>
1240
1145
 
1241
1146
 
1242
- </xsl:attribute-set><xsl:attribute-set name="figure-pseudocode-p-style">
1147
+ </xsl:attribute-set><xsl:attribute-set name="table-fn-body-style">
1243
1148
 
1244
- </xsl:attribute-set><xsl:attribute-set name="image-graphic-style">
1149
+ </xsl:attribute-set><xsl:attribute-set name="figure-fn-number-style">
1150
+ <xsl:attribute name="font-size">80%</xsl:attribute>
1151
+ <xsl:attribute name="padding-right">5mm</xsl:attribute>
1152
+ <xsl:attribute name="vertical-align">super</xsl:attribute>
1245
1153
 
1154
+ </xsl:attribute-set><xsl:attribute-set name="figure-fn-body-style">
1155
+ <xsl:attribute name="text-align">justify</xsl:attribute>
1156
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1246
1157
 
1158
+ </xsl:attribute-set><xsl:attribute-set name="dt-row-style">
1247
1159
 
1248
- <xsl:attribute name="width">100%</xsl:attribute>
1249
- <xsl:attribute name="content-height">100%</xsl:attribute>
1250
- <xsl:attribute name="content-width">scale-to-fit</xsl:attribute>
1251
- <xsl:attribute name="scaling">uniform</xsl:attribute>
1252
1160
 
1161
+ </xsl:attribute-set><xsl:attribute-set name="dt-style">
1162
+ <xsl:attribute name="margin-top">6pt</xsl:attribute>
1253
1163
 
1254
-
1255
-
1256
- </xsl:attribute-set><xsl:attribute-set name="tt-style">
1257
1164
 
1258
1165
 
1259
- <xsl:attribute name="font-family">Courier New</xsl:attribute>
1260
1166
 
1261
1167
 
1262
- </xsl:attribute-set><xsl:attribute-set name="sourcecode-name-style">
1263
- <xsl:attribute name="font-size">11pt</xsl:attribute>
1264
- <xsl:attribute name="font-weight">bold</xsl:attribute>
1265
- <xsl:attribute name="text-align">center</xsl:attribute>
1266
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1267
- <xsl:attribute name="keep-with-previous">always</xsl:attribute>
1268
1168
 
1269
- </xsl:attribute-set><xsl:attribute-set name="domain-style">
1270
-
1271
- </xsl:attribute-set><xsl:attribute-set name="admitted-style">
1272
1169
 
1273
1170
 
1274
1171
 
1275
- </xsl:attribute-set><xsl:attribute-set name="deprecates-style">
1276
1172
 
1173
+ </xsl:attribute-set><xsl:attribute-set name="appendix-style">
1174
+
1175
+ <xsl:attribute name="font-size">12pt</xsl:attribute>
1176
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
1177
+ <xsl:attribute name="margin-top">12pt</xsl:attribute>
1178
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1277
1179
 
1278
- </xsl:attribute-set><xsl:attribute-set name="definition-style">
1279
1180
 
1280
1181
 
1182
+ </xsl:attribute-set><xsl:attribute-set name="appendix-example-style">
1281
1183
 
1282
- </xsl:attribute-set><xsl:variable name="color-added-text">
1283
- <xsl:text>rgb(0, 255, 0)</xsl:text>
1284
- </xsl:variable><xsl:attribute-set name="add-style">
1285
- <xsl:attribute name="color">red</xsl:attribute>
1286
- <xsl:attribute name="text-decoration">underline</xsl:attribute>
1287
- <!-- <xsl:attribute name="color">black</xsl:attribute>
1288
- <xsl:attribute name="background-color"><xsl:value-of select="$color-added-text"/></xsl:attribute>
1289
- <xsl:attribute name="padding-top">1mm</xsl:attribute>
1290
- <xsl:attribute name="padding-bottom">0.5mm</xsl:attribute> -->
1291
- </xsl:attribute-set><xsl:variable name="color-deleted-text">
1292
- <xsl:text>red</xsl:text>
1293
- </xsl:variable><xsl:attribute-set name="del-style">
1294
- <xsl:attribute name="color"><xsl:value-of select="$color-deleted-text"/></xsl:attribute>
1295
- <xsl:attribute name="text-decoration">line-through</xsl:attribute>
1296
- </xsl:attribute-set><xsl:attribute-set name="mathml-style">
1297
- <xsl:attribute name="font-family">STIX Two Math</xsl:attribute>
1184
+ <xsl:attribute name="font-size">10pt</xsl:attribute>
1185
+ <xsl:attribute name="margin-top">8pt</xsl:attribute>
1186
+ <xsl:attribute name="margin-bottom">8pt</xsl:attribute>
1298
1187
 
1299
1188
 
1300
- </xsl:attribute-set><xsl:attribute-set name="list-style">
1301
1189
 
1302
- </xsl:attribute-set><xsl:attribute-set name="toc-style">
1303
- <xsl:attribute name="line-height">135%</xsl:attribute>
1304
- </xsl:attribute-set><xsl:attribute-set name="fn-style">
1305
- <xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
1306
- </xsl:attribute-set><xsl:attribute-set name="fn-num-style">
1307
- <xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
1190
+ </xsl:attribute-set><xsl:attribute-set name="xref-style">
1308
1191
 
1309
1192
 
1310
1193
 
1311
1194
 
1312
1195
 
1196
+ </xsl:attribute-set><xsl:attribute-set name="eref-style">
1313
1197
 
1314
1198
 
1315
1199
 
1316
1200
 
1317
1201
 
1318
- <xsl:attribute name="font-size">7pt</xsl:attribute>
1319
- <xsl:attribute name="vertical-align">super</xsl:attribute>
1320
1202
 
1203
+ </xsl:attribute-set><xsl:attribute-set name="note-style">
1321
1204
 
1322
1205
 
1323
1206
 
1324
1207
 
1208
+
1325
1209
 
1326
1210
 
1327
- </xsl:attribute-set><xsl:attribute-set name="fn-body-style">
1328
- <xsl:attribute name="font-weight">normal</xsl:attribute>
1211
+
1212
+
1213
+ <xsl:attribute name="margin-left">0mm</xsl:attribute>
1214
+ <xsl:attribute name="margin-top">4pt</xsl:attribute>
1215
+ <xsl:attribute name="text-align">justify</xsl:attribute>
1216
+ <xsl:attribute name="line-height">125%</xsl:attribute>
1217
+
1218
+
1219
+
1220
+
1221
+
1222
+
1223
+
1224
+
1225
+ </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">
1226
+
1227
+
1228
+
1229
+
1230
+
1231
+
1232
+
1233
+
1234
+
1235
+ <xsl:attribute name="padding-right">5mm</xsl:attribute>
1236
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
1237
+
1238
+
1239
+
1240
+
1241
+
1242
+ </xsl:attribute-set><xsl:attribute-set name="table-note-name-style">
1243
+ <xsl:attribute name="padding-right">2mm</xsl:attribute>
1244
+
1245
+
1246
+
1247
+
1248
+ </xsl:attribute-set><xsl:attribute-set name="note-p-style">
1249
+
1250
+
1251
+
1252
+
1253
+
1254
+
1255
+
1256
+
1257
+ <xsl:attribute name="margin-left">0mm</xsl:attribute>
1258
+ <xsl:attribute name="margin-top">4pt</xsl:attribute>
1259
+
1260
+
1261
+
1262
+
1263
+
1264
+
1265
+ </xsl:attribute-set><xsl:attribute-set name="termnote-style">
1266
+
1267
+
1268
+
1269
+
1270
+
1271
+
1272
+
1273
+ </xsl:attribute-set><xsl:attribute-set name="termnote-name-style">
1274
+
1275
+
1276
+
1277
+
1278
+ </xsl:attribute-set><xsl:attribute-set name="quote-style">
1279
+ <xsl:attribute name="role">BlockQuote</xsl:attribute>
1280
+
1281
+
1282
+ <xsl:attribute name="margin-top">12pt</xsl:attribute>
1283
+ <xsl:attribute name="margin-left">12mm</xsl:attribute>
1284
+ <xsl:attribute name="margin-right">12mm</xsl:attribute>
1285
+
1286
+
1287
+
1288
+
1289
+
1290
+
1291
+ </xsl:attribute-set><xsl:attribute-set name="quote-source-style">
1292
+
1293
+
1294
+ <xsl:attribute name="text-align">right</xsl:attribute>
1295
+
1296
+
1297
+ </xsl:attribute-set><xsl:attribute-set name="termsource-style">
1298
+
1299
+
1300
+
1301
+
1302
+
1303
+
1304
+
1305
+ </xsl:attribute-set><xsl:attribute-set name="termsource-text-style">
1306
+
1307
+
1308
+ </xsl:attribute-set><xsl:attribute-set name="origin-style">
1309
+
1310
+
1311
+
1312
+
1313
+ </xsl:attribute-set><xsl:attribute-set name="term-style">
1314
+
1315
+ </xsl:attribute-set><xsl:attribute-set name="figure-style">
1316
+
1317
+ </xsl:attribute-set><xsl:attribute-set name="figure-name-style">
1318
+
1319
+
1320
+
1321
+
1322
+
1323
+
1324
+
1325
+
1326
+
1327
+
1328
+
1329
+
1330
+ <xsl:attribute name="text-align">center</xsl:attribute>
1331
+ <xsl:attribute name="margin-top">12pt</xsl:attribute>
1332
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1333
+ <xsl:attribute name="keep-with-previous">always</xsl:attribute>
1334
+
1335
+
1336
+
1337
+
1338
+
1339
+
1340
+
1341
+
1342
+
1343
+ </xsl:attribute-set><xsl:attribute-set name="formula-style">
1344
+
1345
+ </xsl:attribute-set><xsl:attribute-set name="image-style">
1346
+ <xsl:attribute name="text-align">center</xsl:attribute>
1347
+
1348
+
1349
+
1350
+
1351
+
1352
+
1353
+ </xsl:attribute-set><xsl:attribute-set name="figure-pseudocode-p-style">
1354
+
1355
+ </xsl:attribute-set><xsl:attribute-set name="image-graphic-style">
1356
+
1357
+
1358
+
1359
+ <xsl:attribute name="width">100%</xsl:attribute>
1360
+ <xsl:attribute name="content-height">100%</xsl:attribute>
1361
+ <xsl:attribute name="content-width">scale-to-fit</xsl:attribute>
1362
+ <xsl:attribute name="scaling">uniform</xsl:attribute>
1363
+
1364
+
1365
+
1366
+
1367
+ </xsl:attribute-set><xsl:attribute-set name="tt-style">
1368
+
1369
+
1370
+ <xsl:attribute name="font-family">Courier New</xsl:attribute>
1371
+
1372
+
1373
+ </xsl:attribute-set><xsl:attribute-set name="sourcecode-name-style">
1374
+ <xsl:attribute name="font-size">11pt</xsl:attribute>
1375
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
1376
+ <xsl:attribute name="text-align">center</xsl:attribute>
1377
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1378
+ <xsl:attribute name="keep-with-previous">always</xsl:attribute>
1379
+
1380
+ </xsl:attribute-set><xsl:attribute-set name="domain-style">
1381
+
1382
+ </xsl:attribute-set><xsl:attribute-set name="admitted-style">
1383
+
1384
+
1385
+
1386
+ </xsl:attribute-set><xsl:attribute-set name="deprecates-style">
1387
+
1388
+
1389
+ </xsl:attribute-set><xsl:attribute-set name="definition-style">
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
+
1434
+
1435
+
1436
+
1437
+
1438
+
1439
+
1440
+ <xsl:attribute name="font-size">7pt</xsl:attribute>
1441
+ <xsl:attribute name="vertical-align">super</xsl:attribute>
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>
1329
1451
  <xsl:attribute name="font-style">normal</xsl:attribute>
1330
1452
  <xsl:attribute name="text-indent">0</xsl:attribute>
1331
1453
  <xsl:attribute name="start-indent">0</xsl:attribute>
@@ -1339,8 +1461,114 @@
1339
1461
 
1340
1462
 
1341
1463
 
1342
- <xsl:attribute name="font-size">9pt</xsl:attribute>
1464
+ <xsl:attribute name="font-size">9pt</xsl:attribute>
1465
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1466
+
1467
+
1468
+
1469
+
1470
+
1471
+
1472
+
1473
+
1474
+
1475
+ </xsl:attribute-set><xsl:attribute-set name="fn-body-num-style">
1476
+ <xsl:attribute name="keep-with-next.within-line">always</xsl:attribute>
1477
+
1478
+
1479
+
1480
+
1481
+
1482
+
1483
+
1484
+
1485
+
1486
+
1487
+ <xsl:attribute name="font-size">6pt</xsl:attribute>
1488
+ <xsl:attribute name="vertical-align">super</xsl:attribute>
1489
+ <xsl:attribute name="padding-right">1mm</xsl:attribute>
1490
+
1491
+
1492
+
1493
+
1494
+
1495
+
1496
+
1497
+
1498
+ </xsl:attribute-set><xsl:attribute-set name="admonition-style">
1499
+
1500
+
1501
+
1502
+
1503
+
1504
+
1505
+
1506
+
1507
+
1508
+
1509
+
1510
+
1511
+
1512
+
1513
+ </xsl:attribute-set><xsl:attribute-set name="admonition-container-style">
1514
+
1515
+
1516
+
1517
+
1518
+
1519
+
1520
+
1521
+
1522
+
1523
+
1524
+ </xsl:attribute-set><xsl:attribute-set name="admonition-name-style">
1525
+ <xsl:attribute name="keep-with-next">always</xsl:attribute>
1526
+
1527
+
1528
+
1529
+
1530
+
1531
+
1532
+ <xsl:attribute name="text-align">center</xsl:attribute>
1533
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1534
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
1535
+
1536
+
1537
+
1538
+
1539
+
1540
+
1541
+
1542
+
1543
+ </xsl:attribute-set><xsl:attribute-set name="admonition-p-style">
1544
+
1545
+
1546
+
1547
+
1548
+
1549
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
1550
+
1551
+
1552
+
1553
+
1554
+
1555
+
1556
+
1557
+ </xsl:attribute-set><xsl:attribute-set name="bibitem-normative-style">
1558
+
1559
+
1560
+
1561
+
1562
+
1563
+
1564
+
1565
+
1566
+
1567
+
1568
+
1343
1569
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1570
+ <xsl:attribute name="text-indent">-11.7mm</xsl:attribute>
1571
+ <xsl:attribute name="margin-left">11.7mm</xsl:attribute>
1344
1572
 
1345
1573
 
1346
1574
 
@@ -1349,8 +1577,68 @@
1349
1577
 
1350
1578
 
1351
1579
 
1580
+ </xsl:attribute-set><xsl:attribute-set name="bibitem-normative-list-style">
1581
+ <xsl:attribute name="provisional-distance-between-starts">12mm</xsl:attribute>
1582
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1352
1583
 
1353
- </xsl:attribute-set><xsl:attribute-set name="fn-body-num-style">
1584
+
1585
+
1586
+
1587
+
1588
+
1589
+
1590
+
1591
+
1592
+
1593
+
1594
+ </xsl:attribute-set><xsl:attribute-set name="bibitem-non-normative-style">
1595
+
1596
+
1597
+
1598
+
1599
+ </xsl:attribute-set><xsl:attribute-set name="bibitem-non-normative-list-style">
1600
+ <xsl:attribute name="provisional-distance-between-starts">12mm</xsl:attribute>
1601
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1602
+
1603
+
1604
+
1605
+
1606
+
1607
+
1608
+
1609
+
1610
+
1611
+
1612
+
1613
+ </xsl:attribute-set><xsl:attribute-set name="bibitem-normative-list-body-style">
1614
+
1615
+
1616
+ </xsl:attribute-set><xsl:attribute-set name="bibitem-non-normative-list-body-style">
1617
+
1618
+
1619
+ </xsl:attribute-set><xsl:attribute-set name="bibitem-note-fn-style">
1620
+ <xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
1621
+ <xsl:attribute name="font-size">65%</xsl:attribute>
1622
+
1623
+
1624
+
1625
+
1626
+
1627
+
1628
+
1629
+
1630
+
1631
+
1632
+
1633
+ <xsl:attribute name="font-size">7pt</xsl:attribute>
1634
+ <xsl:attribute name="baseline-shift">30%</xsl:attribute>
1635
+
1636
+
1637
+
1638
+
1639
+
1640
+
1641
+ </xsl:attribute-set><xsl:attribute-set name="bibitem-note-fn-number-style">
1354
1642
  <xsl:attribute name="keep-with-next.within-line">always</xsl:attribute>
1355
1643
 
1356
1644
 
@@ -1362,8 +1650,9 @@
1362
1650
 
1363
1651
 
1364
1652
 
1653
+
1365
1654
  <xsl:attribute name="font-size">6pt</xsl:attribute>
1366
- <xsl:attribute name="vertical-align">super</xsl:attribute>
1655
+ <xsl:attribute name="baseline-shift">30%</xsl:attribute>
1367
1656
  <xsl:attribute name="padding-right">1mm</xsl:attribute>
1368
1657
 
1369
1658
 
@@ -1371,32 +1660,33 @@
1371
1660
 
1372
1661
 
1373
1662
 
1663
+ </xsl:attribute-set><xsl:attribute-set name="bibitem-note-fn-body-style">
1664
+ <xsl:attribute name="font-size">10pt</xsl:attribute>
1665
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1666
+ <xsl:attribute name="start-indent">0pt</xsl:attribute>
1667
+
1668
+
1669
+
1670
+
1671
+
1672
+
1673
+
1674
+
1675
+
1676
+ <xsl:attribute name="font-size">9pt</xsl:attribute>
1677
+ <xsl:attribute name="margin-bottom">4pt</xsl:attribute>
1678
+
1679
+
1680
+
1681
+ </xsl:attribute-set><xsl:attribute-set name="references-non-normative-style">
1682
+
1374
1683
 
1375
1684
 
1376
- </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">
1377
- <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='abstract']" mode="contents"/>
1378
- <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='foreword']" mode="contents"/>
1379
- <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='introduction']" mode="contents"/>
1380
- <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name() != 'abstract' and local-name() != 'foreword' and local-name() != 'introduction' and local-name() != 'acknowledgements']" mode="contents"/>
1381
- <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='acknowledgements']" mode="contents"/>
1382
- </xsl:template><xsl:template name="processPrefaceSectionsDefault_Contents">
1685
+ </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">
1383
1686
  <xsl:for-each select="/*/*[local-name()='preface']/*">
1384
1687
  <xsl:sort select="@displayorder" data-type="number"/>
1385
1688
  <xsl:apply-templates select="." mode="contents"/>
1386
1689
  </xsl:for-each>
1387
- </xsl:template><xsl:template name="OLD_processMainSectionsDefault_Contents">
1388
- <xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name()='clause'][@type='scope']" mode="contents"/>
1389
-
1390
- <!-- Normative references -->
1391
- <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"/>
1392
- <!-- Terms and definitions -->
1393
- <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"/>
1394
- <!-- Another main sections -->
1395
- <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"/>
1396
- <xsl:apply-templates select="/*/*[local-name()='annex']" mode="contents"/>
1397
- <!-- Bibliography -->
1398
- <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"/>
1399
-
1400
1690
  </xsl:template><xsl:template name="processMainSectionsDefault_Contents">
1401
1691
 
1402
1692
  <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']]">
@@ -1413,33 +1703,11 @@
1413
1703
  <xsl:sort select="@displayorder" data-type="number"/>
1414
1704
  <xsl:apply-templates select="." mode="contents"/>
1415
1705
  </xsl:for-each>
1416
- </xsl:template><xsl:template name="OLD_processPrefaceSectionsDefault">
1417
- <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='abstract']"/>
1418
- <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='foreword']"/>
1419
- <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='introduction']"/>
1420
- <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name() != 'abstract' and local-name() != 'foreword' and local-name() != 'introduction' and local-name() != 'acknowledgements']"/>
1421
- <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='acknowledgements']"/>
1422
1706
  </xsl:template><xsl:template name="processPrefaceSectionsDefault">
1423
1707
  <xsl:for-each select="/*/*[local-name()='preface']/*">
1424
1708
  <xsl:sort select="@displayorder" data-type="number"/>
1425
1709
  <xsl:apply-templates select="."/>
1426
1710
  </xsl:for-each>
1427
- </xsl:template><xsl:template name="OLD_processMainSectionsDefault">
1428
- <xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name()='clause'][@type='scope']"/>
1429
-
1430
- <xsl:if test="/*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']">
1431
- <fo:block break-after="page"/>
1432
- </xsl:if>
1433
-
1434
- <!-- Normative references -->
1435
- <xsl:apply-templates select="/*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']"/>
1436
- <!-- Terms and definitions -->
1437
- <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']]"/>
1438
- <!-- Another main sections -->
1439
- <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'])]"/>
1440
- <xsl:apply-templates select="/*/*[local-name()='annex']"/>
1441
- <!-- Bibliography -->
1442
- <xsl:apply-templates select="/*/*[local-name()='bibliography']/*[local-name()='references'][not(@normative='true')]"/>
1443
1711
  </xsl:template><xsl:template name="processMainSectionsDefault">
1444
1712
  <xsl:for-each select="/*/*[local-name()='sections']/* | /*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']">
1445
1713
  <xsl:sort select="@displayorder" data-type="number"/>
@@ -1482,43 +1750,19 @@
1482
1750
  <xsl:call-template name="getSimpleTable"/>
1483
1751
  </xsl:variable>
1484
1752
 
1485
- <!-- <xsl:if test="$namespace = 'bipm'">
1486
- <fo:block>&#xA0;</fo:block>
1487
- </xsl:if> -->
1488
-
1489
1753
 
1490
1754
  <!-- Display table's name before table as standalone block -->
1491
1755
  <!-- $namespace = 'iso' or -->
1492
1756
 
1493
- <xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
1494
-
1495
-
1496
-
1497
-
1757
+ <xsl:apply-templates select="*[local-name()='name']"/> <!-- table's title rendered before table -->
1758
+
1498
1759
 
1499
- <xsl:call-template name="fn_name_display"/>
1500
1760
 
1761
+ <xsl:call-template name="table_name_fn_display"/>
1501
1762
 
1502
1763
 
1503
1764
  <xsl:variable name="cols-count" select="count(xalan:nodeset($simple-table)/*/tr[1]/td)"/>
1504
1765
 
1505
- <!-- <xsl:variable name="cols-count">
1506
- <xsl:choose>
1507
- <xsl:when test="*[local-name()='thead']">
1508
- <xsl:call-template name="calculate-columns-numbers">
1509
- <xsl:with-param name="table-row" select="*[local-name()='thead']/*[local-name()='tr'][1]"/>
1510
- </xsl:call-template>
1511
- </xsl:when>
1512
- <xsl:otherwise>
1513
- <xsl:call-template name="calculate-columns-numbers">
1514
- <xsl:with-param name="table-row" select="*[local-name()='tbody']/*[local-name()='tr'][1]"/>
1515
- </xsl:call-template>
1516
- </xsl:otherwise>
1517
- </xsl:choose>
1518
- </xsl:variable> -->
1519
- <!-- cols-count=<xsl:copy-of select="$cols-count"/> -->
1520
- <!-- cols-count2=<xsl:copy-of select="$cols-count2"/> -->
1521
-
1522
1766
  <xsl:variable name="colwidths">
1523
1767
  <xsl:if test="not(*[local-name()='colgroup']/*[local-name()='col'])">
1524
1768
  <xsl:call-template name="calculate-column-widths">
@@ -1529,17 +1773,8 @@
1529
1773
  </xsl:variable>
1530
1774
  <!-- colwidths=<xsl:copy-of select="$colwidths"/> -->
1531
1775
 
1532
- <!-- <xsl:variable name="colwidths2">
1533
- <xsl:call-template name="calculate-column-widths">
1534
- <xsl:with-param name="cols-count" select="$cols-count"/>
1535
- </xsl:call-template>
1536
- </xsl:variable> -->
1537
-
1538
- <!-- cols-count=<xsl:copy-of select="$cols-count"/>
1539
- colwidthsNew=<xsl:copy-of select="$colwidths"/>
1540
- colwidthsOld=<xsl:copy-of select="$colwidths2"/>z -->
1541
1776
 
1542
- <xsl:variable name="margin-left">
1777
+ <xsl:variable name="margin-side">
1543
1778
  <xsl:choose>
1544
1779
  <xsl:when test="sum(xalan:nodeset($colwidths)//column) &gt; 75">15</xsl:when>
1545
1780
  <xsl:otherwise>0</xsl:otherwise>
@@ -1547,63 +1782,67 @@
1547
1782
  </xsl:variable>
1548
1783
 
1549
1784
 
1550
- <fo:block-container margin-left="-{$margin-left}mm" margin-right="-{$margin-left}mm">
1551
-
1552
-
1553
-
1554
-
1555
-
1556
-
1785
+ <fo:block-container xsl:use-attribute-sets="table-container-style">
1786
+
1557
1787
 
1788
+ <xsl:attribute name="margin-left"><xsl:value-of select="-$margin-side"/>mm</xsl:attribute>
1789
+ <xsl:attribute name="margin-right"><xsl:value-of select="-$margin-side"/>mm</xsl:attribute>
1558
1790
 
1559
-
1791
+
1560
1792
 
1793
+
1561
1794
 
1795
+
1562
1796
 
1563
1797
 
1564
1798
 
1799
+
1565
1800
 
1566
1801
 
1567
1802
 
1568
1803
 
1569
1804
 
1805
+ <!-- end table block-container attributes -->
1570
1806
 
1571
1807
  <!-- display table's name before table for PAS inside block-container (2-columnn layout) -->
1572
1808
 
1573
1809
 
1810
+ <xsl:variable name="table_width_default">100%</xsl:variable>
1574
1811
  <xsl:variable name="table_width">
1575
1812
  <!-- for centered table always 100% (@width will be set for middle/second cell of outer table) -->
1576
- 100%
1577
-
1578
-
1813
+ <xsl:value-of select="$table_width_default"/>
1579
1814
  </xsl:variable>
1580
1815
 
1816
+
1581
1817
  <xsl:variable name="table_attributes">
1582
- <attribute name="table-layout">fixed</attribute>
1583
- <attribute name="width"><xsl:value-of select="normalize-space($table_width)"/></attribute>
1584
- <attribute name="margin-left"><xsl:value-of select="$margin-left"/>mm</attribute>
1585
- <attribute name="margin-right"><xsl:value-of select="$margin-left"/>mm</attribute>
1586
-
1587
-
1588
-
1589
-
1590
-
1591
-
1592
-
1593
-
1594
-
1595
-
1596
-
1597
-
1598
-
1599
-
1818
+
1819
+ <xsl:element name="table_attributes" use-attribute-sets="table-style">
1820
+ <xsl:attribute name="width"><xsl:value-of select="normalize-space($table_width)"/></xsl:attribute>
1821
+
1822
+
1823
+ <xsl:attribute name="margin-left"><xsl:value-of select="$margin-side"/>mm</xsl:attribute>
1824
+ <xsl:attribute name="margin-right"><xsl:value-of select="$margin-side"/>mm</xsl:attribute>
1825
+
1826
+
1827
+
1828
+
1829
+
1830
+
1831
+
1832
+
1833
+
1834
+
1835
+
1836
+
1837
+
1838
+ </xsl:element>
1600
1839
  </xsl:variable>
1601
1840
 
1602
1841
 
1603
- <fo:table id="{@id}" table-omit-footer-at-break="true">
1842
+ <fo:table id="{@id}">
1604
1843
 
1605
- <xsl:for-each select="xalan:nodeset($table_attributes)/attribute">
1606
- <xsl:attribute name="{@name}">
1844
+ <xsl:for-each select="xalan:nodeset($table_attributes)/table_attributes/@*">
1845
+ <xsl:attribute name="{local-name()}">
1607
1846
  <xsl:value-of select="."/>
1608
1847
  </xsl:attribute>
1609
1848
  </xsl:for-each>
@@ -1614,7 +1853,6 @@
1614
1853
  </xsl:if>
1615
1854
 
1616
1855
 
1617
-
1618
1856
  <xsl:choose>
1619
1857
  <xsl:when test="*[local-name()='colgroup']/*[local-name()='col']">
1620
1858
  <xsl:for-each select="*[local-name()='colgroup']/*[local-name()='col']">
@@ -1640,7 +1878,7 @@
1640
1878
  <xsl:apply-templates select="*[local-name()='thead']" mode="process_tbody"/>
1641
1879
  </xsl:when>
1642
1880
  <xsl:otherwise>
1643
- <xsl:apply-templates/>
1881
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
1644
1882
  </xsl:otherwise>
1645
1883
  </xsl:choose>
1646
1884
 
@@ -1655,25 +1893,6 @@
1655
1893
  </xsl:call-template>
1656
1894
  </xsl:for-each>
1657
1895
 
1658
- <!-- insert footer as table -->
1659
- <!-- <fo:table>
1660
- <xsl:for-each select="xalan::nodeset($table_attributes)/attribute">
1661
- <xsl:attribute name="{@name}">
1662
- <xsl:value-of select="."/>
1663
- </xsl:attribute>
1664
- </xsl:for-each>
1665
-
1666
- <xsl:for-each select="xalan:nodeset($colwidths)//column">
1667
- <xsl:choose>
1668
- <xsl:when test=". = 1 or . = 0">
1669
- <fo:table-column column-width="proportional-column-width(2)"/>
1670
- </xsl:when>
1671
- <xsl:otherwise>
1672
- <fo:table-column column-width="proportional-column-width({.})"/>
1673
- </xsl:otherwise>
1674
- </xsl:choose>
1675
- </xsl:for-each>
1676
- </fo:table>-->
1677
1896
 
1678
1897
 
1679
1898
 
@@ -1734,18 +1953,17 @@
1734
1953
  </xsl:otherwise>
1735
1954
  </xsl:choose>
1736
1955
 
1737
- </xsl:template><xsl:template match="*[local-name()='table']/*[local-name() = 'name']"/><xsl:template match="*[local-name()='table']/*[local-name() = 'name']" mode="presentation">
1956
+ </xsl:template><xsl:template match="*[local-name()='table']/*[local-name() = 'name']">
1738
1957
  <xsl:param name="continued"/>
1739
1958
  <xsl:if test="normalize-space() != ''">
1740
1959
  <fo:block xsl:use-attribute-sets="table-name-style">
1741
-
1960
+
1742
1961
 
1743
1962
 
1744
1963
 
1745
1964
 
1746
1965
  <xsl:choose>
1747
1966
  <xsl:when test="$continued = 'true'">
1748
- <!-- <xsl:if test="$namespace = 'bsi'"></xsl:if> -->
1749
1967
 
1750
1968
  </xsl:when>
1751
1969
  <xsl:otherwise>
@@ -1808,13 +2026,6 @@
1808
2026
  <xsl:for-each select="xalan:nodeset($table)/*/tr">
1809
2027
  <xsl:variable name="td_text">
1810
2028
  <xsl:apply-templates select="td[$curr-col]" mode="td_text"/>
1811
-
1812
- <!-- <xsl:if test="$namespace = 'bipm'">
1813
- <xsl:for-each select="*[local-name()='td'][$curr-col]//*[local-name()='math']">
1814
- <word><xsl:value-of select="normalize-space(.)"/></word>
1815
- </xsl:for-each>
1816
- </xsl:if> -->
1817
-
1818
2029
  </xsl:variable>
1819
2030
  <xsl:variable name="words">
1820
2031
  <xsl:variable name="string_with_added_zerospaces">
@@ -1851,7 +2062,6 @@
1851
2062
  </xsl:otherwise>
1852
2063
  </xsl:choose>
1853
2064
  </xsl:variable>
1854
-
1855
2065
 
1856
2066
  <column>
1857
2067
  <xsl:for-each select="xalan:nodeset($widths)//width">
@@ -1887,7 +2097,6 @@
1887
2097
  <xsl:value-of select="translate($math_text, ' ', '#')"/><!-- mathml images as one 'word' without spaces -->
1888
2098
  </xsl:template><xsl:template match="*[local-name()='table2']"/><xsl:template match="*[local-name()='thead']"/><xsl:template match="*[local-name()='thead']" mode="process">
1889
2099
  <xsl:param name="cols-count"/>
1890
- <!-- font-weight="bold" -->
1891
2100
  <fo:table-header>
1892
2101
 
1893
2102
 
@@ -1899,13 +2108,12 @@
1899
2108
  <fo:table-row>
1900
2109
  <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">
1901
2110
 
1902
- <xsl:apply-templates select="ancestor::*[local-name()='table']/*[local-name()='name']" mode="presentation">
2111
+ <xsl:apply-templates select="ancestor::*[local-name()='table']/*[local-name()='name']">
1903
2112
  <xsl:with-param name="continued">true</xsl:with-param>
1904
2113
  </xsl:apply-templates>
1905
2114
 
1906
2115
 
1907
2116
 
1908
-
1909
2117
  </fo:table-cell>
1910
2118
  </fo:table-row>
1911
2119
  </xsl:template><xsl:template match="*[local-name()='thead']" mode="process_tbody">
@@ -1921,64 +2129,6 @@
1921
2129
  <xsl:apply-templates select="../*[local-name()='tfoot']" mode="process"/>
1922
2130
  </fo:table-footer>
1923
2131
  </xsl:if>
1924
- </xsl:template><xsl:template name="insertTableFooter2">
1925
- <xsl:param name="cols-count"/>
1926
- <xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ..//*[local-name()='fn'][local-name(..) != 'name']"/>
1927
- <xsl:if test="../*[local-name()='tfoot'] or $isNoteOrFnExist = 'true'">
1928
-
1929
- <fo:table-footer>
1930
-
1931
- <xsl:apply-templates select="../*[local-name()='tfoot']" mode="process"/>
1932
-
1933
- <!-- if there are note(s) or fn(s) then create footer row -->
1934
- <xsl:if test="$isNoteOrFnExist = 'true'">
1935
-
1936
-
1937
-
1938
- <fo:table-row>
1939
- <fo:table-cell border="solid black 1pt" padding-left="1mm" padding-right="1mm" padding-top="1mm" number-columns-spanned="{$cols-count}">
1940
-
1941
-
1942
-
1943
- <!-- fn will be processed inside 'note' processing -->
1944
-
1945
-
1946
-
1947
-
1948
-
1949
-
1950
- <!-- except gb -->
1951
-
1952
- <xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
1953
-
1954
-
1955
- <!-- show Note under table in preface (ex. abstract) sections -->
1956
- <!-- empty, because notes show at page side in main sections -->
1957
- <!-- <xsl:if test="$namespace = 'bipm'">
1958
- <xsl:choose>
1959
- <xsl:when test="ancestor::*[local-name()='preface']">
1960
- <xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
1961
- </xsl:when>
1962
- <xsl:otherwise>
1963
- <fo:block/>
1964
- </xsl:otherwise>
1965
- </xsl:choose>
1966
- </xsl:if> -->
1967
-
1968
-
1969
- <!-- horizontal row separator -->
1970
-
1971
-
1972
- <!-- fn processing -->
1973
- <xsl:call-template name="fn_display"/>
1974
-
1975
- </fo:table-cell>
1976
- </fo:table-row>
1977
-
1978
- </xsl:if>
1979
- </fo:table-footer>
1980
-
1981
- </xsl:if>
1982
2132
  </xsl:template><xsl:template name="insertTableFooterInSeparateTable">
1983
2133
  <xsl:param name="table_attributes"/>
1984
2134
  <xsl:param name="colwidths"/>
@@ -2004,17 +2154,18 @@
2004
2154
  </xsl:variable>
2005
2155
 
2006
2156
  <fo:table keep-with-previous="always">
2007
- <xsl:for-each select="xalan:nodeset($table_attributes)/attribute">
2157
+ <xsl:for-each select="xalan:nodeset($table_attributes)/table_attributes/@*">
2158
+ <xsl:variable name="name" select="local-name()"/>
2008
2159
  <xsl:choose>
2009
- <xsl:when test="@name = 'border-top'">
2010
- <xsl:attribute name="{@name}">0pt solid black</xsl:attribute>
2160
+ <xsl:when test="$name = 'border-top'">
2161
+ <xsl:attribute name="{$name}">0pt solid black</xsl:attribute>
2011
2162
  </xsl:when>
2012
- <xsl:when test="@name = 'border'">
2013
- <xsl:attribute name="{@name}"><xsl:value-of select="."/></xsl:attribute>
2163
+ <xsl:when test="$name = 'border'">
2164
+ <xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
2014
2165
  <xsl:attribute name="border-top">0pt solid black</xsl:attribute>
2015
2166
  </xsl:when>
2016
2167
  <xsl:otherwise>
2017
- <xsl:attribute name="{@name}"><xsl:value-of select="."/></xsl:attribute>
2168
+ <xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
2018
2169
  </xsl:otherwise>
2019
2170
  </xsl:choose>
2020
2171
  </xsl:for-each>
@@ -2043,9 +2194,10 @@
2043
2194
 
2044
2195
  <fo:table-body>
2045
2196
  <fo:table-row>
2046
- <fo:table-cell border="solid black 1pt" padding-left="1mm" padding-right="1mm" padding-top="1mm" number-columns-spanned="{$cols-count}">
2197
+ <fo:table-cell xsl:use-attribute-sets="table-footer-cell-style" number-columns-spanned="{$cols-count}">
2047
2198
 
2048
2199
 
2200
+
2049
2201
 
2050
2202
 
2051
2203
  <!-- fn will be processed inside 'note' processing -->
@@ -2055,37 +2207,20 @@
2055
2207
 
2056
2208
 
2057
2209
 
2058
-
2059
-
2060
-
2061
2210
  <!-- for BSI (not PAS) display Notes before footnotes -->
2062
2211
 
2063
2212
 
2064
- <!-- except gb -->
2065
-
2066
- <xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
2213
+ <!-- except gb and bsi -->
2067
2214
 
2068
-
2069
- <!-- <xsl:if test="$namespace = 'bipm'">
2070
- <xsl:choose>
2071
- <xsl:when test="ancestor::*[local-name()='preface']">
2072
- show Note under table in preface (ex. abstract) sections
2073
- <xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
2074
- </xsl:when>
2075
- <xsl:otherwise>
2076
- empty, because notes show at page side in main sections
2077
- <fo:block/>
2078
- </xsl:otherwise>
2079
- </xsl:choose>
2080
- </xsl:if> -->
2215
+ <xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
2216
+
2081
2217
 
2082
2218
 
2083
2219
  <!-- horizontal row separator -->
2084
2220
 
2085
2221
 
2086
2222
  <!-- fn processing -->
2087
- <xsl:call-template name="fn_display"/>
2088
-
2223
+ <xsl:call-template name="table_fn_display"/>
2089
2224
 
2090
2225
  <!-- for PAS display Notes after footnotes -->
2091
2226
 
@@ -2127,78 +2262,57 @@
2127
2262
 
2128
2263
 
2129
2264
  <xsl:apply-templates/>
2130
- <!-- <xsl:apply-templates select="../*[local-name()='tfoot']" mode="process"/> -->
2131
-
2265
+
2132
2266
  </fo:table-body>
2133
2267
 
2134
- </xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='name']/text()[1]" priority="2" mode="presentation_name">
2135
- <xsl:choose>
2136
- <xsl:when test="substring-after(., '—') != ''">
2137
- <xsl:text>—</xsl:text><xsl:value-of select="substring-after(., '—')"/>
2138
- </xsl:when>
2139
- <xsl:otherwise>
2140
- <xsl:value-of select="."/>
2141
- </xsl:otherwise>
2142
- </xsl:choose>
2143
- </xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='name']" mode="presentation_name">
2144
- <xsl:apply-templates mode="presentation_name"/>
2145
- </xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='name']/node()" mode="presentation_name">
2146
- <xsl:apply-templates select="."/>
2147
- </xsl:template><xsl:template match="*[local-name()='tr']">
2148
- <xsl:variable name="parent-name" select="local-name(..)"/>
2149
- <!-- <xsl:variable name="namespace" select="substring-before(name(/*), '-')"/> -->
2150
- <fo:table-row min-height="4mm">
2151
- <xsl:if test="$parent-name = 'thead'">
2152
- <xsl:attribute name="font-weight">bold</xsl:attribute>
2153
-
2154
-
2155
-
2156
-
2157
-
2158
-
2159
-
2160
-
2161
- </xsl:if>
2162
- <xsl:if test="$parent-name = 'tfoot'">
2163
-
2164
-
2165
-
2166
- </xsl:if>
2167
-
2168
-
2169
-
2170
-
2171
-
2172
-
2173
-
2174
-
2175
-
2176
-
2177
- <!-- <xsl:if test="$namespace = 'bipm'">
2178
- <xsl:attribute name="height">8mm</xsl:attribute>
2179
- </xsl:if> -->
2180
-
2268
+ </xsl:template><xsl:template match="*[local-name()='thead']/*[local-name()='tr']" priority="2">
2269
+ <fo:table-row xsl:use-attribute-sets="table-header-row-style">
2270
+
2271
+
2272
+
2273
+
2274
+
2275
+
2276
+
2277
+ <xsl:call-template name="setTableRowAttributes"/>
2278
+
2181
2279
  <xsl:apply-templates/>
2182
2280
  </fo:table-row>
2183
- </xsl:template><xsl:template match="*[local-name()='th']">
2184
- <fo:table-cell text-align="{@align}" font-weight="bold" border="solid black 1pt" padding-left="1mm" display-align="center">
2185
- <xsl:attribute name="text-align">
2186
- <xsl:choose>
2187
- <xsl:when test="@align">
2188
- <xsl:call-template name="setAlignment"/>
2189
- <!-- <xsl:value-of select="@align"/> -->
2190
- </xsl:when>
2191
- <xsl:otherwise>center</xsl:otherwise>
2192
- </xsl:choose>
2193
- </xsl:attribute>
2194
-
2281
+ </xsl:template><xsl:template match="*[local-name()='tfoot']/*[local-name()='tr']" priority="2">
2282
+ <fo:table-row xsl:use-attribute-sets="table-footer-row-style">
2195
2283
 
2284
+ <xsl:call-template name="setTableRowAttributes"/>
2285
+ <xsl:apply-templates/>
2286
+ </fo:table-row>
2287
+ </xsl:template><xsl:template match="*[local-name()='tr']">
2288
+ <fo:table-row xsl:use-attribute-sets="table-body-row-style">
2289
+
2196
2290
 
2291
+
2197
2292
 
2293
+
2294
+ <xsl:call-template name="setTableRowAttributes"/>
2295
+ <xsl:apply-templates/>
2296
+ </fo:table-row>
2297
+ </xsl:template><xsl:template name="setTableRowAttributes">
2298
+
2299
+
2300
+
2301
+
2302
+
2303
+
2304
+
2305
+
2306
+ </xsl:template><xsl:template match="*[local-name()='th']">
2307
+ <fo:table-cell xsl:use-attribute-sets="table-header-cell-style"> <!-- text-align="{@align}" -->
2308
+ <xsl:call-template name="setTextAlignment">
2309
+ <xsl:with-param name="default">center</xsl:with-param>
2310
+ </xsl:call-template>
2198
2311
 
2199
2312
 
2200
2313
 
2201
2314
 
2315
+
2202
2316
 
2203
2317
 
2204
2318
 
@@ -2207,21 +2321,25 @@
2207
2321
  <xsl:if test="$lang = 'ar'">
2208
2322
  <xsl:attribute name="padding-right">1mm</xsl:attribute>
2209
2323
  </xsl:if>
2210
- <xsl:if test="@colspan">
2211
- <xsl:attribute name="number-columns-spanned">
2212
- <xsl:value-of select="@colspan"/>
2213
- </xsl:attribute>
2214
- </xsl:if>
2215
- <xsl:if test="@rowspan">
2216
- <xsl:attribute name="number-rows-spanned">
2217
- <xsl:value-of select="@rowspan"/>
2218
- </xsl:attribute>
2219
- </xsl:if>
2220
- <xsl:call-template name="display-align"/>
2324
+
2325
+ <xsl:call-template name="setTableCellAttributes"/>
2326
+
2221
2327
  <fo:block>
2222
2328
  <xsl:apply-templates/>
2223
2329
  </fo:block>
2224
2330
  </fo:table-cell>
2331
+ </xsl:template><xsl:template name="setTableCellAttributes">
2332
+ <xsl:if test="@colspan">
2333
+ <xsl:attribute name="number-columns-spanned">
2334
+ <xsl:value-of select="@colspan"/>
2335
+ </xsl:attribute>
2336
+ </xsl:if>
2337
+ <xsl:if test="@rowspan">
2338
+ <xsl:attribute name="number-rows-spanned">
2339
+ <xsl:value-of select="@rowspan"/>
2340
+ </xsl:attribute>
2341
+ </xsl:if>
2342
+ <xsl:call-template name="display-align"/>
2225
2343
  </xsl:template><xsl:template name="display-align">
2226
2344
  <xsl:if test="@valign">
2227
2345
  <xsl:attribute name="display-align">
@@ -2234,22 +2352,18 @@
2234
2352
  </xsl:attribute>
2235
2353
  </xsl:if>
2236
2354
  </xsl:template><xsl:template match="*[local-name()='td']">
2237
- <fo:table-cell text-align="{@align}" display-align="center" border="solid black 1pt" padding-left="1mm">
2238
- <xsl:attribute name="text-align">
2239
- <xsl:choose>
2240
- <xsl:when test="@align">
2241
- <xsl:call-template name="setAlignment"/>
2242
- <!-- <xsl:value-of select="@align"/> -->
2243
- </xsl:when>
2244
- <xsl:otherwise>left</xsl:otherwise>
2245
- </xsl:choose>
2246
- </xsl:attribute>
2355
+ <fo:table-cell xsl:use-attribute-sets="table-cell-style"> <!-- text-align="{@align}" -->
2356
+ <xsl:call-template name="setTextAlignment">
2357
+ <xsl:with-param name="default">left</xsl:with-param>
2358
+ </xsl:call-template>
2359
+
2247
2360
  <xsl:if test="$lang = 'ar'">
2248
2361
  <xsl:attribute name="padding-right">1mm</xsl:attribute>
2249
2362
  </xsl:if>
2250
2363
 
2251
2364
 
2252
2365
 
2366
+ <!-- bsi -->
2253
2367
 
2254
2368
 
2255
2369
 
@@ -2258,34 +2372,36 @@
2258
2372
 
2259
2373
 
2260
2374
 
2375
+
2376
+
2261
2377
 
2262
2378
 
2263
2379
 
2264
2380
 
2265
2381
 
2266
- <xsl:if test=".//*[local-name() = 'table']">
2382
+ <xsl:if test=".//*[local-name() = 'table']"> <!-- if there is nested table -->
2267
2383
  <xsl:attribute name="padding-right">1mm</xsl:attribute>
2268
2384
  </xsl:if>
2269
- <xsl:if test="@colspan">
2270
- <xsl:attribute name="number-columns-spanned">
2271
- <xsl:value-of select="@colspan"/>
2272
- </xsl:attribute>
2273
- </xsl:if>
2274
- <xsl:if test="@rowspan">
2275
- <xsl:attribute name="number-rows-spanned">
2276
- <xsl:value-of select="@rowspan"/>
2277
- </xsl:attribute>
2278
- </xsl:if>
2279
- <xsl:call-template name="display-align"/>
2385
+
2386
+ <xsl:call-template name="setTableCellAttributes"/>
2387
+
2280
2388
  <fo:block>
2281
-
2389
+
2390
+
2391
+
2282
2392
  <xsl:apply-templates/>
2283
2393
  </fo:block>
2284
2394
  </fo:table-cell>
2285
2395
  </xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='note']" priority="2"/><xsl:template match="*[local-name()='table']/*[local-name()='note']" mode="process">
2396
+
2397
+ <fo:block xsl:use-attribute-sets="table-note-style">
2398
+
2399
+
2400
+
2401
+
2286
2402
 
2287
-
2288
- <fo:block font-size="10pt" margin-bottom="12pt">
2403
+ <!-- Table's note name (NOTE, for example) -->
2404
+ <fo:inline xsl:use-attribute-sets="table-note-name-style">
2289
2405
 
2290
2406
 
2291
2407
 
@@ -2293,23 +2409,14 @@
2293
2409
 
2294
2410
 
2295
2411
 
2296
-
2297
- <!-- Table's note name (NOTE, for example) -->
2298
-
2299
- <fo:inline padding-right="2mm" xsl:use-attribute-sets="table-note-name-style">
2300
-
2301
-
2412
+ <xsl:apply-templates select="*[local-name() = 'name']"/>
2302
2413
 
2303
-
2304
-
2305
- <xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
2306
-
2307
- </fo:inline>
2308
-
2309
-
2310
-
2311
- <xsl:apply-templates mode="process"/>
2312
- </fo:block>
2414
+ </fo:inline>
2415
+
2416
+
2417
+
2418
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]" mode="process"/>
2419
+ </fo:block>
2313
2420
 
2314
2421
  </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">
2315
2422
  <xsl:apply-templates/>
@@ -2389,8 +2496,7 @@
2389
2496
  <xsl:copy-of select="$footnote_inline"/>
2390
2497
  <fo:footnote-body>
2391
2498
 
2392
- <fo:block-container text-indent="0" start-indent="0">
2393
-
2499
+ <fo:block-container xsl:use-attribute-sets="fn-container-body-style">
2394
2500
 
2395
2501
  <fo:block xsl:use-attribute-sets="fn-body-style">
2396
2502
 
@@ -2409,7 +2515,7 @@
2409
2515
  <xsl:copy-of select="$footnote_inline"/>
2410
2516
  </xsl:otherwise>
2411
2517
  </xsl:choose>
2412
- </xsl:template><xsl:template name="fn_display">
2518
+ </xsl:template><xsl:template name="table_fn_display">
2413
2519
  <xsl:variable name="references">
2414
2520
 
2415
2521
  <xsl:for-each select="..//*[local-name()='fn'][local-name(..) != 'name']">
@@ -2420,33 +2526,26 @@
2420
2526
  <xsl:for-each select="xalan:nodeset($references)//fn">
2421
2527
  <xsl:variable name="reference" select="@reference"/>
2422
2528
  <xsl:if test="not(preceding-sibling::*[@reference = $reference])"> <!-- only unique reference puts in note-->
2423
- <fo:block margin-bottom="12pt">
2529
+ <fo:block xsl:use-attribute-sets="table-fn-style">
2424
2530
 
2425
2531
 
2426
2532
 
2427
-
2428
-
2429
-
2430
-
2431
- <fo:inline font-size="80%" padding-right="5mm" id="{@id}">
2533
+ <fo:inline id="{@id}" xsl:use-attribute-sets="table-fn-number-style">
2432
2534
 
2433
- <xsl:attribute name="vertical-align">super</xsl:attribute>
2434
2535
 
2435
2536
 
2436
2537
 
2437
2538
 
2539
+ <xsl:value-of select="@reference"/>
2438
2540
 
2439
2541
 
2440
2542
 
2441
2543
 
2442
- <xsl:value-of select="@reference"/>
2443
2544
 
2444
2545
 
2445
2546
 
2446
2547
  </fo:inline>
2447
- <fo:inline>
2448
-
2449
- <!-- <xsl:apply-templates /> -->
2548
+ <fo:inline xsl:use-attribute-sets="table-fn-body-style">
2450
2549
  <xsl:copy-of select="./node()"/>
2451
2550
  </fo:inline>
2452
2551
  </fo:block>
@@ -2458,15 +2557,7 @@
2458
2557
 
2459
2558
  <xsl:apply-templates/>
2460
2559
  </fn>
2461
- </xsl:template><xsl:template name="fn_name_display">
2462
- <!-- <xsl:variable name="references">
2463
- <xsl:for-each select="*[local-name()='name']//*[local-name()='fn']">
2464
- <fn reference="{@reference}" id="{@reference}_{ancestor::*[@id][1]/@id}">
2465
- <xsl:apply-templates />
2466
- </fn>
2467
- </xsl:for-each>
2468
- </xsl:variable>
2469
- $references=<xsl:copy-of select="$references"/> -->
2560
+ </xsl:template><xsl:template name="table_name_fn_display">
2470
2561
  <xsl:for-each select="*[local-name()='name']//*[local-name()='fn']">
2471
2562
  <xsl:variable name="reference" select="@reference"/>
2472
2563
  <fo:block id="{@reference}_{ancestor::*[@id][1]/@id}"><xsl:value-of select="@reference"/></fo:block>
@@ -2475,9 +2566,7 @@
2475
2566
  </fo:block>
2476
2567
  </xsl:for-each>
2477
2568
  </xsl:template><xsl:template name="fn_display_figure">
2478
- <xsl:variable name="key_iso">
2479
- <!-- and (not(@class) or @class !='pseudocode') -->
2480
- </xsl:variable>
2569
+
2481
2570
  <xsl:variable name="references">
2482
2571
  <xsl:for-each select=".//*[local-name()='fn'][not(parent::*[local-name()='name'])]">
2483
2572
  <fn reference="{@reference}" id="{@reference}_{ancestor::*[@id][1]/@id}">
@@ -2485,50 +2574,52 @@
2485
2574
  </fn>
2486
2575
  </xsl:for-each>
2487
2576
  </xsl:variable>
2577
+
2578
+ <xsl:if test="xalan:nodeset($references)//fn">
2488
2579
 
2489
- <!-- current hierarchy is 'figure' element -->
2490
- <xsl:variable name="following_dl_colwidths">
2491
- <xsl:if test="*[local-name() = 'dl']"><!-- if there is a 'dl', then set the same columns width as for 'dl' -->
2492
- <xsl:variable name="html-table">
2493
- <xsl:variable name="doc_ns">
2580
+ <xsl:variable name="key_iso">
2581
+
2582
+ </xsl:variable>
2583
+
2584
+ <!-- current hierarchy is 'figure' element -->
2585
+ <xsl:variable name="following_dl_colwidths">
2586
+ <xsl:if test="*[local-name() = 'dl']"><!-- if there is a 'dl', then set the same columns width as for 'dl' -->
2587
+ <xsl:variable name="html-table">
2588
+ <xsl:variable name="doc_ns">
2589
+
2590
+ </xsl:variable>
2591
+ <xsl:variable name="ns">
2592
+ <xsl:choose>
2593
+ <xsl:when test="normalize-space($doc_ns) != ''">
2594
+ <xsl:value-of select="normalize-space($doc_ns)"/>
2595
+ </xsl:when>
2596
+ <xsl:otherwise>
2597
+ <xsl:value-of select="substring-before(name(/*), '-')"/>
2598
+ </xsl:otherwise>
2599
+ </xsl:choose>
2600
+ </xsl:variable>
2494
2601
 
2495
- </xsl:variable>
2496
- <xsl:variable name="ns">
2497
- <xsl:choose>
2498
- <xsl:when test="normalize-space($doc_ns) != ''">
2499
- <xsl:value-of select="normalize-space($doc_ns)"/>
2500
- </xsl:when>
2501
- <xsl:otherwise>
2502
- <xsl:value-of select="substring-before(name(/*), '-')"/>
2503
- </xsl:otherwise>
2504
- </xsl:choose>
2505
- </xsl:variable>
2506
- <!-- <xsl:variable name="ns" select="substring-before(name(/*), '-')"/> -->
2507
- <!-- <xsl:element name="{$ns}:table"> -->
2508
2602
  <xsl:for-each select="*[local-name() = 'dl'][1]">
2509
2603
  <tbody>
2510
2604
  <xsl:apply-templates mode="dl"/>
2511
2605
  </tbody>
2512
2606
  </xsl:for-each>
2513
- <!-- </xsl:element> -->
2514
- </xsl:variable>
2515
-
2516
- <xsl:call-template name="calculate-column-widths">
2517
- <xsl:with-param name="cols-count" select="2"/>
2518
- <xsl:with-param name="table" select="$html-table"/>
2519
- </xsl:call-template>
2520
-
2521
- </xsl:if>
2522
- </xsl:variable>
2523
-
2524
-
2525
- <xsl:variable name="maxlength_dt">
2526
- <xsl:for-each select="*[local-name() = 'dl'][1]">
2527
- <xsl:call-template name="getMaxLength_dt"/>
2528
- </xsl:for-each>
2529
- </xsl:variable>
2530
-
2531
- <xsl:if test="xalan:nodeset($references)//fn">
2607
+ </xsl:variable>
2608
+
2609
+ <xsl:call-template name="calculate-column-widths">
2610
+ <xsl:with-param name="cols-count" select="2"/>
2611
+ <xsl:with-param name="table" select="$html-table"/>
2612
+ </xsl:call-template>
2613
+
2614
+ </xsl:if>
2615
+ </xsl:variable>
2616
+
2617
+ <xsl:variable name="maxlength_dt">
2618
+ <xsl:for-each select="*[local-name() = 'dl'][1]">
2619
+ <xsl:call-template name="getMaxLength_dt"/>
2620
+ </xsl:for-each>
2621
+ </xsl:variable>
2622
+
2532
2623
  <fo:block>
2533
2624
  <fo:table width="95%" table-layout="fixed">
2534
2625
  <xsl:if test="normalize-space($key_iso) = 'true'">
@@ -2555,20 +2646,18 @@
2555
2646
  <fo:table-row>
2556
2647
  <fo:table-cell>
2557
2648
  <fo:block>
2558
- <fo:inline font-size="80%" padding-right="5mm" vertical-align="super" id="{@id}">
2559
-
2649
+ <fo:inline id="{@id}" xsl:use-attribute-sets="figure-fn-number-style">
2560
2650
  <xsl:value-of select="@reference"/>
2561
2651
  </fo:inline>
2562
2652
  </fo:block>
2563
2653
  </fo:table-cell>
2564
2654
  <fo:table-cell>
2565
- <fo:block text-align="justify" margin-bottom="12pt">
2566
-
2655
+ <fo:block xsl:use-attribute-sets="figure-fn-body-style">
2567
2656
  <xsl:if test="normalize-space($key_iso) = 'true'">
2568
- <xsl:attribute name="margin-bottom">0</xsl:attribute>
2657
+
2658
+ <xsl:attribute name="margin-bottom">0</xsl:attribute>
2659
+
2569
2660
  </xsl:if>
2570
-
2571
- <!-- <xsl:apply-templates /> -->
2572
2661
  <xsl:copy-of select="./node()"/>
2573
2662
  </fo:block>
2574
2663
  </fo:table-cell>
@@ -2581,14 +2670,8 @@
2581
2670
  </xsl:if>
2582
2671
 
2583
2672
  </xsl:template><xsl:template match="*[local-name()='fn']">
2584
- <!-- <xsl:variable name="namespace" select="substring-before(name(/*), '-')"/> -->
2585
- <fo:inline font-size="80%" keep-with-previous.within-line="always">
2586
-
2587
-
2588
-
2589
-
2590
-
2591
-
2673
+ <fo:inline xsl:use-attribute-sets="fn-reference-style">
2674
+
2592
2675
 
2593
2676
 
2594
2677
 
@@ -2612,10 +2695,10 @@
2612
2695
  <xsl:variable name="isDeleted" select="@deleted"/>
2613
2696
  <fo:block-container>
2614
2697
 
2615
- <xsl:if test="not(ancestor::*[local-name() = 'quote'])">
2616
- <xsl:attribute name="margin-left">0mm</xsl:attribute>
2617
- </xsl:if>
2618
-
2698
+ <xsl:if test="not(ancestor::*[local-name() = 'quote'])">
2699
+ <xsl:attribute name="margin-left">0mm</xsl:attribute>
2700
+ </xsl:if>
2701
+
2619
2702
 
2620
2703
  <xsl:if test="parent::*[local-name() = 'note']">
2621
2704
  <xsl:attribute name="margin-left">
@@ -2632,11 +2715,11 @@
2632
2715
  <xsl:with-param name="isDeleted" select="$isDeleted"/>
2633
2716
  </xsl:call-template>
2634
2717
 
2635
- <fo:block-container>
2636
-
2637
- <xsl:attribute name="margin-left">0mm</xsl:attribute>
2638
- <xsl:attribute name="margin-right">0mm</xsl:attribute>
2718
+ <fo:block-container margin-left="0mm">
2719
+
2639
2720
 
2721
+ <xsl:attribute name="margin-right">0mm</xsl:attribute>
2722
+
2640
2723
 
2641
2724
  <xsl:variable name="parent" select="local-name(..)"/>
2642
2725
 
@@ -2647,20 +2730,19 @@
2647
2730
  <xsl:choose>
2648
2731
  <xsl:when test="$parent = 'formula' and count(*[local-name()='dt']) = 1"> <!-- only one component -->
2649
2732
 
2650
-
2651
- <fo:block margin-bottom="12pt" text-align="left">
2652
-
2653
- <xsl:variable name="title-where">
2654
- <xsl:call-template name="getLocalizedString">
2655
- <xsl:with-param name="key">where</xsl:with-param>
2656
- </xsl:call-template>
2657
- </xsl:variable>
2658
- <xsl:value-of select="$title-where"/><xsl:text> </xsl:text>
2659
- <xsl:apply-templates select="*[local-name()='dt']/*"/>
2660
- <xsl:text/>
2661
- <xsl:apply-templates select="*[local-name()='dd']/*" mode="inline"/>
2662
- </fo:block>
2663
-
2733
+ <fo:block margin-bottom="12pt" text-align="left">
2734
+
2735
+ <xsl:variable name="title-where">
2736
+ <xsl:call-template name="getLocalizedString">
2737
+ <xsl:with-param name="key">where</xsl:with-param>
2738
+ </xsl:call-template>
2739
+ </xsl:variable>
2740
+ <xsl:value-of select="$title-where"/><xsl:text> </xsl:text>
2741
+ <xsl:apply-templates select="*[local-name()='dt']/*"/>
2742
+ <xsl:text/>
2743
+ <xsl:apply-templates select="*[local-name()='dd']/*" mode="inline"/>
2744
+ </fo:block>
2745
+
2664
2746
  </xsl:when>
2665
2747
  <xsl:when test="$parent = 'formula'"> <!-- a few components -->
2666
2748
  <fo:block margin-bottom="12pt" text-align="left">
@@ -2707,9 +2789,7 @@
2707
2789
  <fo:table width="95%" table-layout="fixed">
2708
2790
 
2709
2791
  <xsl:choose>
2710
- <xsl:when test="normalize-space($key_iso) = 'true' and $parent = 'formula'">
2711
- <!-- <xsl:attribute name="font-size">11pt</xsl:attribute> -->
2712
- </xsl:when>
2792
+ <xsl:when test="normalize-space($key_iso) = 'true' and $parent = 'formula'"/>
2713
2793
  <xsl:when test="normalize-space($key_iso) = 'true'">
2714
2794
  <xsl:attribute name="font-size">10pt</xsl:attribute>
2715
2795
 
@@ -2730,12 +2810,9 @@
2730
2810
  </xsl:otherwise>
2731
2811
  </xsl:choose>
2732
2812
  </xsl:variable>
2733
- <!-- <xsl:variable name="ns" select="substring-before(name(/*), '-')"/> -->
2734
- <!-- <xsl:element name="{$ns}:table"> -->
2735
- <tbody>
2736
- <xsl:apply-templates mode="dl"/>
2737
- </tbody>
2738
- <!-- </xsl:element> -->
2813
+ <tbody>
2814
+ <xsl:apply-templates mode="dl"/>
2815
+ </tbody>
2739
2816
  </xsl:variable>
2740
2817
  <!-- html-table<xsl:copy-of select="$html-table"/> -->
2741
2818
  <xsl:variable name="colwidths">
@@ -2815,8 +2892,6 @@
2815
2892
  </xsl:for-each>
2816
2893
  </xsl:otherwise>
2817
2894
  </xsl:choose>
2818
- <!-- <fo:table-column column-width="15%"/>
2819
- <fo:table-column column-width="85%"/> -->
2820
2895
  </xsl:otherwise>
2821
2896
  </xsl:choose>
2822
2897
  </xsl:template><xsl:template name="getMaxLength_dt">
@@ -2831,12 +2906,6 @@
2831
2906
  </xsl:for-each>
2832
2907
  </xsl:variable>
2833
2908
  <xsl:variable name="maxLength">
2834
- <!-- <xsl:for-each select="*[local-name()='dt']">
2835
- <xsl:sort select="string-length(normalize-space(.))" data-type="number" order="descending"/>
2836
- <xsl:if test="position() = 1">
2837
- <xsl:value-of select="string-length(normalize-space(.))"/>
2838
- </xsl:if>
2839
- </xsl:for-each> -->
2840
2909
  <xsl:for-each select="xalan:nodeset($lengths)/length">
2841
2910
  <xsl:sort select="." data-type="number" order="descending"/>
2842
2911
  <xsl:if test="position() = 1">
@@ -2862,12 +2931,12 @@
2862
2931
  <xsl:if test="normalize-space($key_iso) = 'true'">
2863
2932
  <xsl:attribute name="margin-top">0</xsl:attribute>
2864
2933
  </xsl:if>
2865
- <xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
2934
+ <xsl:apply-templates select="*[local-name() = 'name']"/>
2866
2935
  </fo:block>
2867
2936
  </fo:table-cell>
2868
2937
  <fo:table-cell>
2869
2938
  <fo:block>
2870
- <xsl:apply-templates/>
2939
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
2871
2940
  </fo:block>
2872
2941
  </fo:table-cell>
2873
2942
  </fo:table-row>
@@ -2878,76 +2947,37 @@
2878
2947
  </td>
2879
2948
  <td>
2880
2949
 
2881
-
2882
- <xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]" mode="process"/>
2883
-
2950
+ <xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]" mode="process"/>
2951
+
2884
2952
  </td>
2885
2953
  </tr>
2886
2954
 
2887
2955
  </xsl:template><xsl:template match="*[local-name()='dt']">
2888
2956
  <xsl:param name="key_iso"/>
2889
2957
 
2890
- <fo:table-row>
2891
-
2892
-
2958
+ <fo:table-row xsl:use-attribute-sets="dt-row-style">
2893
2959
  <fo:table-cell>
2894
2960
 
2895
- <fo:block margin-top="6pt">
2961
+ <fo:block xsl:use-attribute-sets="dt-style">
2896
2962
  <xsl:copy-of select="@id"/>
2897
2963
 
2898
-
2899
2964
  <xsl:if test="normalize-space($key_iso) = 'true'">
2900
2965
  <xsl:attribute name="margin-top">0</xsl:attribute>
2901
-
2902
2966
  </xsl:if>
2903
2967
 
2904
2968
 
2905
2969
 
2906
-
2907
-
2908
-
2909
-
2910
2970
  <xsl:apply-templates/>
2911
- <!-- <xsl:if test="$namespace = 'gb'">
2912
- <xsl:if test="ancestor::*[local-name()='formula']">
2913
- <xsl:text>—</xsl:text>
2914
- </xsl:if>
2915
- </xsl:if> -->
2916
2971
  </fo:block>
2917
2972
  </fo:table-cell>
2918
2973
  <fo:table-cell>
2919
2974
  <fo:block>
2920
2975
 
2921
- <!-- <xsl:if test="$namespace = 'nist-cswp' or $namespace = 'nist-sp'">
2922
- <xsl:if test="local-name(*[1]) != 'stem'">
2923
- <xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]" mode="process"/>
2924
- </xsl:if>
2925
- </xsl:if> -->
2926
-
2927
- <xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]" mode="process"/>
2928
-
2976
+
2977
+ <xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]" mode="process"/>
2929
2978
  </fo:block>
2930
2979
  </fo:table-cell>
2931
2980
  </fo:table-row>
2932
- <!-- <xsl:if test="$namespace = 'nist-cswp' or $namespace = 'nist-sp'">
2933
- <xsl:if test="local-name(*[1]) = 'stem'">
2934
- <fo:table-row>
2935
- <fo:table-cell>
2936
- <fo:block margin-top="6pt">
2937
- <xsl:if test="normalize-space($key_iso) = 'true'">
2938
- <xsl:attribute name="margin-top">0</xsl:attribute>
2939
- </xsl:if>
2940
- <xsl:text>&#xA0;</xsl:text>
2941
- </fo:block>
2942
- </fo:table-cell>
2943
- <fo:table-cell>
2944
- <fo:block>
2945
- <xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]" mode="process"/>
2946
- </fo:block>
2947
- </fo:table-cell>
2948
- </fo:table-row>
2949
- </xsl:if>
2950
- </xsl:if> -->
2951
2981
  </xsl:template><xsl:template match="*[local-name()='dd']" mode="dl"/><xsl:template match="*[local-name()='dd']" mode="dl_process">
2952
2982
  <xsl:apply-templates/>
2953
2983
  </xsl:template><xsl:template match="*[local-name()='dd']"/><xsl:template match="*[local-name()='dd']" mode="process">
@@ -2976,6 +3006,7 @@
2976
3006
  </fo:inline>
2977
3007
  </xsl:template><xsl:template match="*[local-name()='tt']">
2978
3008
  <fo:inline xsl:use-attribute-sets="tt-style">
3009
+
2979
3010
  <xsl:variable name="_font-size">
2980
3011
 
2981
3012
 
@@ -3017,15 +3048,21 @@
3017
3048
  <xsl:apply-templates/>
3018
3049
  </fo:inline>
3019
3050
  </xsl:template><xsl:template match="*[local-name()='add']">
3051
+ <xsl:param name="skip">true</xsl:param>
3020
3052
  <xsl:choose>
3021
3053
  <xsl:when test="starts-with(., $ace_tag)"> <!-- examples: ace-tag_A1_start, ace-tag_A2_end, C1_start, AC_start -->
3022
- <fo:inline>
3023
- <xsl:call-template name="insertTag">
3024
- <xsl:with-param name="type" select="substring-after(substring-after(., $ace_tag), '_')"/> <!-- start or end -->
3025
- <xsl:with-param name="kind" select="substring(substring-before(substring-after(., $ace_tag), '_'), 1, 1)"/> <!-- A or C -->
3026
- <xsl:with-param name="value" select="substring(substring-before(substring-after(., $ace_tag), '_'), 2)"/> <!-- 1, 2, C -->
3027
- </xsl:call-template>
3028
- </fo:inline>
3054
+ <xsl:choose>
3055
+ <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>
3056
+ <xsl:otherwise>
3057
+ <fo:inline>
3058
+ <xsl:call-template name="insertTag">
3059
+ <xsl:with-param name="type" select="substring-after(substring-after(., $ace_tag), '_')"/> <!-- start or end -->
3060
+ <xsl:with-param name="kind" select="substring(substring-before(substring-after(., $ace_tag), '_'), 1, 1)"/> <!-- A or C -->
3061
+ <xsl:with-param name="value" select="substring(substring-before(substring-after(., $ace_tag), '_'), 2)"/> <!-- 1, 2, C -->
3062
+ </xsl:call-template>
3063
+ </fo:inline>
3064
+ </xsl:otherwise>
3065
+ </xsl:choose>
3029
3066
  </xsl:when>
3030
3067
  <xsl:when test="@amendment">
3031
3068
  <fo:inline>
@@ -3068,8 +3105,6 @@
3068
3105
  <xsl:variable name="add_width" select="string-length($value) * 20"/>
3069
3106
  <xsl:variable name="maxwidth" select="60 + $add_width"/>
3070
3107
  <fo:instream-foreign-object fox:alt-text="OpeningTag" baseline-shift="-20%"><!-- alignment-baseline="middle" -->
3071
- <!-- <xsl:attribute name="width">7mm</xsl:attribute>
3072
- <xsl:attribute name="content-height">100%</xsl:attribute> -->
3073
3108
  <xsl:attribute name="height">5mm</xsl:attribute>
3074
3109
  <xsl:attribute name="content-width">100%</xsl:attribute>
3075
3110
  <xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
@@ -3287,14 +3322,6 @@
3287
3322
 
3288
3323
  <xsl:copy-of select="xalan:nodeset($simple-table-rowspan)"/>
3289
3324
 
3290
- <!-- <xsl:choose>
3291
- <xsl:when test="current()//*[local-name()='th'][@colspan] or current()//*[local-name()='td'][@colspan] ">
3292
-
3293
- </xsl:when>
3294
- <xsl:otherwise>
3295
- <xsl:copy-of select="current()"/>
3296
- </xsl:otherwise>
3297
- </xsl:choose> -->
3298
3325
  </xsl:variable>
3299
3326
  <xsl:copy-of select="$simple-table"/>
3300
3327
  </xsl:template><xsl:template match="*[local-name()='thead'] | *[local-name()='tbody']" mode="simple-table-colspan">
@@ -3413,8 +3440,6 @@
3413
3440
  <xsl:choose>
3414
3441
  <xsl:when test="contains($str2, ' ')">
3415
3442
  <xsl:variable name="substr" select="substring-before($str2, ' ')"/>
3416
- <!-- <xsl:value-of select="translate(substring($substr, 1, 1), $lower, $upper)"/>
3417
- <xsl:value-of select="substring($substr, 2)"/> -->
3418
3443
  <xsl:call-template name="capitalize">
3419
3444
  <xsl:with-param name="str" select="$substr"/>
3420
3445
  </xsl:call-template>
@@ -3424,8 +3449,6 @@
3424
3449
  </xsl:call-template>
3425
3450
  </xsl:when>
3426
3451
  <xsl:otherwise>
3427
- <!-- <xsl:value-of select="translate(substring($str2, 1, 1), $lower, $upper)"/>
3428
- <xsl:value-of select="substring($str2, 2)"/> -->
3429
3452
  <xsl:call-template name="capitalize">
3430
3453
  <xsl:with-param name="str" select="$str2"/>
3431
3454
  </xsl:call-template>
@@ -3453,6 +3476,7 @@
3453
3476
  <xsl:apply-templates select="." mode="mathml"/>
3454
3477
  </xsl:variable>
3455
3478
  <fo:instream-foreign-object fox:alt-text="Math">
3479
+
3456
3480
 
3457
3481
 
3458
3482
  <xsl:variable name="comment_text_following" select="following-sibling::node()[1][self::comment()]"/>
@@ -3484,7 +3508,7 @@
3484
3508
  </xsl:attribute>
3485
3509
 
3486
3510
 
3487
- <!-- <xsl:copy-of select="."/> -->
3511
+
3488
3512
  <xsl:copy-of select="xalan:nodeset($mathml)"/>
3489
3513
  </fo:instream-foreign-object>
3490
3514
  </fo:inline>
@@ -3543,6 +3567,10 @@
3543
3567
 
3544
3568
 
3545
3569
 
3570
+
3571
+
3572
+
3573
+
3546
3574
  <xsl:choose>
3547
3575
  <xsl:when test="$target_text = ''">
3548
3576
  <xsl:apply-templates/>
@@ -3600,7 +3628,6 @@
3600
3628
  </fo:inline>
3601
3629
  </xsl:template><xsl:template match="*[local-name() = 'xref']">
3602
3630
  <fo:basic-link internal-destination="{@target}" fox:alt-text="{@target}" xsl:use-attribute-sets="xref-style">
3603
-
3604
3631
  <xsl:apply-templates/>
3605
3632
  </fo:basic-link>
3606
3633
  </xsl:template><xsl:template match="*[local-name() = 'formula']" name="formula">
@@ -3628,49 +3655,64 @@
3628
3655
  <fo:inline>
3629
3656
  <xsl:apply-templates/>
3630
3657
  </fo:inline>
3631
- </xsl:template><xsl:template match="*[local-name() = 'formula']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'formula']/*[local-name() = 'name']" mode="presentation">
3658
+ </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 -->
3632
3659
  <xsl:if test="normalize-space() != ''">
3633
3660
  <xsl:text>(</xsl:text><xsl:apply-templates/><xsl:text>)</xsl:text>
3634
3661
  </xsl:if>
3635
3662
  </xsl:template><xsl:template match="*[local-name() = 'note']" name="note">
3636
3663
 
3637
3664
  <fo:block-container id="{@id}" xsl:use-attribute-sets="note-style">
3665
+
3666
+
3667
+
3638
3668
 
3639
3669
 
3640
3670
 
3641
3671
 
3642
3672
 
3673
+
3674
+
3675
+
3643
3676
  <fo:block-container margin-left="0mm">
3677
+
3644
3678
 
3645
3679
 
3646
3680
 
3681
+
3647
3682
 
3648
-
3649
-
3650
-
3651
-
3652
- <fo:block>
3653
-
3654
-
3655
-
3656
-
3657
-
3683
+ <fo:block>
3684
+
3685
+
3658
3686
 
3659
- <fo:inline xsl:use-attribute-sets="note-name-style">
3660
3687
 
3661
- <xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
3662
- </fo:inline>
3663
- <xsl:apply-templates/>
3664
- </fo:block>
3665
-
3666
-
3688
+
3689
+
3690
+
3691
+ <fo:inline xsl:use-attribute-sets="note-name-style">
3692
+
3693
+
3694
+
3695
+ <!-- if note contains only one element and first and last childs are `add` ace-tag, then move start ace-tag before NOTE's name-->
3696
+ <xsl:if test="count(*[not(local-name() = 'name')]) = 1 and *[not(local-name() = 'name')]/node()[last()][local-name() = 'add'][starts-with(text(), $ace_tag)]">
3697
+ <xsl:apply-templates select="*[not(local-name() = 'name')]/node()[1][local-name() = 'add'][starts-with(text(), $ace_tag)]">
3698
+ <xsl:with-param name="skip">false</xsl:with-param>
3699
+ </xsl:apply-templates>
3700
+ </xsl:if>
3701
+
3702
+ <xsl:apply-templates select="*[local-name() = 'name']"/>
3703
+
3704
+ </fo:inline>
3705
+
3706
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
3707
+ </fo:block>
3708
+
3667
3709
  </fo:block-container>
3668
3710
  </fo:block-container>
3669
3711
 
3670
3712
  </xsl:template><xsl:template match="*[local-name() = 'note']/*[local-name() = 'p']">
3671
3713
  <xsl:variable name="num"><xsl:number/></xsl:variable>
3672
3714
  <xsl:choose>
3673
- <xsl:when test="$num = 1">
3715
+ <xsl:when test="$num = 1"> <!-- display first NOTE's paragraph in the same line with label NOTE -->
3674
3716
  <fo:inline xsl:use-attribute-sets="note-p-style">
3675
3717
  <xsl:apply-templates/>
3676
3718
  </fo:inline>
@@ -3685,12 +3727,16 @@
3685
3727
  <fo:block id="{@id}" xsl:use-attribute-sets="termnote-style">
3686
3728
 
3687
3729
  <fo:inline xsl:use-attribute-sets="termnote-name-style">
3730
+
3731
+
3732
+
3733
+ <xsl:apply-templates select="*[local-name() = 'name']"/>
3688
3734
 
3689
- <xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
3690
3735
  </fo:inline>
3691
- <xsl:apply-templates/>
3736
+
3737
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
3692
3738
  </fo:block>
3693
- </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">
3739
+ </xsl:template><xsl:template match="*[local-name() = 'note']/*[local-name() = 'name']">
3694
3740
  <xsl:param name="sfx"/>
3695
3741
  <xsl:variable name="suffix">
3696
3742
  <xsl:choose>
@@ -3709,7 +3755,7 @@
3709
3755
  <xsl:apply-templates/>
3710
3756
  <xsl:value-of select="$suffix"/>
3711
3757
  </xsl:if>
3712
- </xsl:template><xsl:template match="*[local-name() = 'termnote']/*[local-name() = 'name']" mode="presentation">
3758
+ </xsl:template><xsl:template match="*[local-name() = 'termnote']/*[local-name() = 'name']">
3713
3759
  <xsl:param name="sfx"/>
3714
3760
  <xsl:variable name="suffix">
3715
3761
  <xsl:choose>
@@ -3734,29 +3780,27 @@
3734
3780
  <xsl:apply-templates/>
3735
3781
  </fo:block>
3736
3782
  </xsl:template><xsl:template match="*[local-name() = 'term']">
3737
- <!-- <xsl:message>'term' <xsl:number/> processing, name=<xsl:value-of select="iso:name"/>, preferred=<xsl:value-of select="iso:preferred"/>...</xsl:message> -->
3738
3783
  <fo:block id="{@id}" xsl:use-attribute-sets="term-style">
3739
3784
 
3740
3785
 
3741
3786
  <fo:block keep-with-next="always" margin-top="10pt" margin-bottom="8pt" line-height="1.1">
3742
- <xsl:apply-templates select="m3d:name" mode="presentation"/>
3787
+ <xsl:apply-templates select="m3d:name"/>
3743
3788
  </fo:block>
3744
3789
 
3790
+
3791
+
3745
3792
  <xsl:if test="parent::*[local-name() = 'term'] and not(preceding-sibling::*[local-name() = 'term'])">
3746
3793
 
3747
3794
  </xsl:if>
3748
- <xsl:apply-templates/>
3795
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
3749
3796
  </fo:block>
3750
- </xsl:template><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']" mode="presentation">
3797
+ </xsl:template><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']">
3751
3798
  <xsl:if test="normalize-space() != ''">
3752
3799
  <xsl:variable name="level">
3753
3800
  <xsl:call-template name="getLevelTermName"/>
3754
3801
  </xsl:variable>
3755
3802
  <fo:inline role="H{$level}">
3756
3803
  <xsl:apply-templates/>
3757
- <!-- <xsl:if test="$namespace = 'gb' or $namespace = 'ogc'">
3758
- <xsl:text>.</xsl:text>
3759
- </xsl:if> -->
3760
3804
  </fo:inline>
3761
3805
  </xsl:if>
3762
3806
  </xsl:template><xsl:template match="*[local-name() = 'figure']" name="figure">
@@ -3769,9 +3813,10 @@
3769
3813
  <xsl:with-param name="isDeleted" select="$isDeleted"/>
3770
3814
  </xsl:call-template>
3771
3815
 
3772
- <fo:block>
3773
-
3774
- <xsl:apply-templates/>
3816
+
3817
+
3818
+ <fo:block xsl:use-attribute-sets="figure-style">
3819
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
3775
3820
  </fo:block>
3776
3821
  <xsl:call-template name="fn_display_figure"/>
3777
3822
  <xsl:for-each select="*[local-name() = 'note']">
@@ -3779,14 +3824,15 @@
3779
3824
  </xsl:for-each>
3780
3825
 
3781
3826
 
3782
- <xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
3827
+ <xsl:apply-templates select="*[local-name() = 'name']"/> <!-- show figure's name AFTER image -->
3828
+
3783
3829
 
3784
3830
  </fo:block-container>
3785
3831
  </xsl:template><xsl:template match="*[local-name() = 'figure'][@class = 'pseudocode']">
3786
3832
  <fo:block id="{@id}">
3787
- <xsl:apply-templates/>
3833
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
3788
3834
  </fo:block>
3789
- <xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
3835
+ <xsl:apply-templates select="*[local-name() = 'name']"/>
3790
3836
  </xsl:template><xsl:template match="*[local-name() = 'figure'][@class = 'pseudocode']//*[local-name() = 'p']">
3791
3837
  <fo:block xsl:use-attribute-sets="figure-pseudocode-p-style">
3792
3838
  <xsl:apply-templates/>
@@ -3893,9 +3939,7 @@
3893
3939
  <xsl:variable name="bis" select="java:java.io.ByteArrayInputStream.new($fileContent)"/>
3894
3940
  <xsl:variable name="bufferedImage" select="java:javax.imageio.ImageIO.read($bis)"/>
3895
3941
  <xsl:variable name="width" select="java:getWidth($bufferedImage)"/>
3896
- <!-- width=<xsl:value-of select="$width"/> -->
3897
3942
  <xsl:variable name="height" select="java:getHeight($bufferedImage)"/>
3898
- <!-- height=<xsl:value-of select="$height"/> -->
3899
3943
  <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">
3900
3944
  <image xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="{@src}" height="{$height}" width="{$width}" style="overflow:visible;"/>
3901
3945
  <xsl:call-template name="svg_cross">
@@ -4165,7 +4209,7 @@
4165
4209
  </fo:basic-link>
4166
4210
  </fo:block>
4167
4211
  </fo:block-container>
4168
- </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">
4212
+ </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">
4169
4213
  <xsl:apply-templates mode="contents"/>
4170
4214
  <xsl:text> </xsl:text>
4171
4215
  </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">
@@ -4318,8 +4362,6 @@
4318
4362
 
4319
4363
 
4320
4364
 
4321
-
4322
-
4323
4365
  </fo:bookmark-tree>
4324
4366
  </xsl:if>
4325
4367
  </xsl:template><xsl:template name="insertFigureBookmarks">
@@ -4390,7 +4432,7 @@
4390
4432
  <xsl:apply-templates mode="bookmark"/>
4391
4433
  </xsl:otherwise>
4392
4434
  </xsl:choose>
4393
- </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">
4435
+ </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']">
4394
4436
  <xsl:if test="normalize-space() != ''">
4395
4437
  <fo:block xsl:use-attribute-sets="figure-name-style">
4396
4438
 
@@ -4406,12 +4448,6 @@
4406
4448
  <!-- <xsl:text> </xsl:text> -->
4407
4449
  </xsl:template><xsl:template name="getSection">
4408
4450
  <xsl:value-of select="*[local-name() = 'title']/*[local-name() = 'tab'][1]/preceding-sibling::node()"/>
4409
- <!--
4410
- <xsl:for-each select="*[local-name() = 'title']/*[local-name() = 'tab'][1]/preceding-sibling::node()">
4411
- <xsl:value-of select="."/>
4412
- </xsl:for-each>
4413
- -->
4414
-
4415
4451
  </xsl:template><xsl:template name="getName">
4416
4452
  <xsl:choose>
4417
4453
  <xsl:when test="*[local-name() = 'title']/*[local-name() = 'tab']">
@@ -4480,16 +4516,21 @@
4480
4516
  <xsl:apply-templates mode="contents_item">
4481
4517
  <xsl:with-param name="mode" select="$mode"/>
4482
4518
  </xsl:apply-templates>
4483
- </xsl:template><xsl:template match="*[local-name() = 'add'][starts-with(text(), $ace_tag)]" mode="contents_item">
4519
+ </xsl:template><xsl:template match="*[local-name() = 'add']" mode="contents_item">
4484
4520
  <xsl:param name="mode">bookmarks</xsl:param>
4485
- <xsl:if test="$mode = 'contents'">
4486
- <xsl:copy>
4487
- <xsl:apply-templates mode="contents_item"/>
4488
- </xsl:copy>
4489
- </xsl:if>
4521
+ <xsl:choose>
4522
+ <xsl:when test="starts-with(text(), $ace_tag)">
4523
+ <xsl:if test="$mode = 'contents'">
4524
+ <xsl:copy>
4525
+ <xsl:apply-templates mode="contents_item"/>
4526
+ </xsl:copy>
4527
+ </xsl:if>
4528
+ </xsl:when>
4529
+ <xsl:otherwise><xsl:apply-templates mode="contents_item"/></xsl:otherwise>
4530
+ </xsl:choose>
4490
4531
  </xsl:template><xsl:template match="*[local-name()='sourcecode']" name="sourcecode">
4491
4532
 
4492
- <fo:block-container margin-left="0mm">
4533
+ <fo:block-container xsl:use-attribute-sets="sourcecode-container-style">
4493
4534
  <xsl:copy-of select="@id"/>
4494
4535
 
4495
4536
  <xsl:if test="parent::*[local-name() = 'note']">
@@ -4526,6 +4567,7 @@
4526
4567
 
4527
4568
 
4528
4569
  </xsl:variable>
4570
+
4529
4571
  <xsl:variable name="font-size" select="normalize-space($_font-size)"/>
4530
4572
  <xsl:if test="$font-size != ''">
4531
4573
  <xsl:attribute name="font-size">
@@ -4542,11 +4584,11 @@
4542
4584
 
4543
4585
 
4544
4586
 
4545
- <xsl:apply-templates/>
4587
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
4546
4588
  </fo:block>
4547
4589
 
4548
4590
 
4549
- <xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
4591
+ <xsl:apply-templates select="*[local-name()='name']"/> <!-- show sourcecode's name AFTER content -->
4550
4592
 
4551
4593
 
4552
4594
 
@@ -4560,7 +4602,7 @@
4560
4602
  <xsl:call-template name="add-zero-spaces-java">
4561
4603
  <xsl:with-param name="text" select="$text"/>
4562
4604
  </xsl:call-template>
4563
- </xsl:template><xsl:template match="*[local-name() = 'sourcecode']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'sourcecode']/*[local-name() = 'name']" mode="presentation">
4605
+ </xsl:template><xsl:template match="*[local-name() = 'sourcecode']/*[local-name() = 'name']">
4564
4606
  <xsl:if test="normalize-space() != ''">
4565
4607
  <fo:block xsl:use-attribute-sets="sourcecode-name-style">
4566
4608
  <xsl:apply-templates/>
@@ -4568,10 +4610,10 @@
4568
4610
  </xsl:if>
4569
4611
  </xsl:template><xsl:template match="*[local-name() = 'permission']">
4570
4612
  <fo:block id="{@id}" xsl:use-attribute-sets="permission-style">
4571
- <xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
4572
- <xsl:apply-templates/>
4613
+ <xsl:apply-templates select="*[local-name()='name']"/>
4614
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
4573
4615
  </fo:block>
4574
- </xsl:template><xsl:template match="*[local-name() = 'permission']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'permission']/*[local-name() = 'name']" mode="presentation">
4616
+ </xsl:template><xsl:template match="*[local-name() = 'permission']/*[local-name() = 'name']">
4575
4617
  <xsl:if test="normalize-space() != ''">
4576
4618
  <fo:block xsl:use-attribute-sets="permission-name-style">
4577
4619
  <xsl:apply-templates/>
@@ -4584,13 +4626,13 @@
4584
4626
  </fo:block>
4585
4627
  </xsl:template><xsl:template match="*[local-name() = 'requirement']">
4586
4628
  <fo:block id="{@id}" xsl:use-attribute-sets="requirement-style">
4587
- <xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
4588
- <xsl:apply-templates select="*[local-name()='label']" mode="presentation"/>
4589
- <xsl:apply-templates select="@obligation" mode="presentation"/>
4590
- <xsl:apply-templates select="*[local-name()='subject']" mode="presentation"/>
4591
- <xsl:apply-templates/>
4629
+ <xsl:apply-templates select="*[local-name()='name']"/>
4630
+ <xsl:apply-templates select="*[local-name()='label']"/>
4631
+ <xsl:apply-templates select="@obligation"/>
4632
+ <xsl:apply-templates select="*[local-name()='subject']"/>
4633
+ <xsl:apply-templates select="node()[not(local-name() = 'name') and not(local-name() = 'label') and not(local-name() = 'subject')]"/>
4592
4634
  </fo:block>
4593
- </xsl:template><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'name']" mode="presentation">
4635
+ </xsl:template><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'name']">
4594
4636
  <xsl:if test="normalize-space() != ''">
4595
4637
  <fo:block xsl:use-attribute-sets="requirement-name-style">
4596
4638
 
@@ -4598,20 +4640,24 @@
4598
4640
 
4599
4641
  </fo:block>
4600
4642
  </xsl:if>
4601
- </xsl:template><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'label']"/><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'label']" mode="presentation">
4643
+ </xsl:template><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'label']">
4602
4644
  <fo:block xsl:use-attribute-sets="requirement-label-style">
4603
4645
  <xsl:apply-templates/>
4604
4646
  </fo:block>
4605
- </xsl:template><xsl:template match="*[local-name() = 'requirement']/@obligation" mode="presentation">
4647
+ </xsl:template><xsl:template match="*[local-name() = 'requirement']/@obligation">
4606
4648
  <fo:block>
4607
4649
  <fo:inline padding-right="3mm">Obligation</fo:inline><xsl:value-of select="."/>
4608
4650
  </fo:block>
4651
+ </xsl:template><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'subject']" priority="2">
4652
+ <fo:block xsl:use-attribute-sets="subject-style">
4653
+ <xsl:text>Target Type </xsl:text><xsl:apply-templates/>
4654
+ </fo:block>
4609
4655
  </xsl:template><xsl:template match="*[local-name() = 'recommendation']">
4610
4656
  <fo:block id="{@id}" xsl:use-attribute-sets="recommendation-style">
4611
- <xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
4612
- <xsl:apply-templates/>
4657
+ <xsl:apply-templates select="*[local-name()='name']"/>
4658
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
4613
4659
  </fo:block>
4614
- </xsl:template><xsl:template match="*[local-name() = 'recommendation']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'recommendation']/*[local-name() = 'name']" mode="presentation">
4660
+ </xsl:template><xsl:template match="*[local-name() = 'recommendation']/*[local-name() = 'name']">
4615
4661
  <xsl:if test="normalize-space() != ''">
4616
4662
  <fo:block xsl:use-attribute-sets="recommendation-name-style">
4617
4663
  <xsl:apply-templates/>
@@ -4622,10 +4668,6 @@
4622
4668
  <fo:block xsl:use-attribute-sets="recommendation-label-style">
4623
4669
  <xsl:apply-templates/>
4624
4670
  </fo:block>
4625
- </xsl:template><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'subject']" priority="2"/><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'subject']" mode="presentation">
4626
- <fo:block xsl:use-attribute-sets="subject-style">
4627
- <xsl:text>Target Type </xsl:text><xsl:apply-templates/>
4628
- </fo:block>
4629
4671
  </xsl:template><xsl:template match="*[local-name() = 'subject']">
4630
4672
  <fo:block xsl:use-attribute-sets="subject-style">
4631
4673
  <xsl:text>Target Type </xsl:text><xsl:apply-templates/>
@@ -4669,8 +4711,6 @@
4669
4711
  </xsl:variable>
4670
4712
  <xsl:variable name="cols-count" select="count(xalan:nodeset($simple-table)//tr[1]/td)"/>
4671
4713
  <xsl:if test="$cols-count = 2 and not(ancestor::*[local-name()='table'])">
4672
- <!-- <fo:table-column column-width="35mm"/>
4673
- <fo:table-column column-width="115mm"/> -->
4674
4714
  <fo:table-column column-width="30%"/>
4675
4715
  <fo:table-column column-width="70%"/>
4676
4716
  </xsl:if>
@@ -4680,7 +4720,7 @@
4680
4720
  <xsl:if test=".//*[local-name() = 'fn']">
4681
4721
  <xsl:for-each select="*[local-name() = 'tbody']">
4682
4722
  <fo:block font-size="90%" border-bottom="1pt solid black">
4683
- <xsl:call-template name="fn_display"/>
4723
+ <xsl:call-template name="table_fn_display"/>
4684
4724
  </fo:block>
4685
4725
  </xsl:for-each>
4686
4726
  </xsl:if>
@@ -4697,7 +4737,6 @@
4697
4737
  </xsl:template><xsl:template match="*[local-name()='tr']" mode="requirement">
4698
4738
  <fo:table-row height="7mm" border-bottom="0.5pt solid grey">
4699
4739
  <xsl:if test="parent::*[local-name()='thead']"> <!-- and not(ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']) -->
4700
- <!-- <xsl:attribute name="border">1pt solid black</xsl:attribute> -->
4701
4740
  <xsl:attribute name="background-color">rgb(33, 55, 92)</xsl:attribute>
4702
4741
  </xsl:if>
4703
4742
  <xsl:if test="starts-with(*[local-name()='td'][1], 'Requirement ')">
@@ -4710,34 +4749,11 @@
4710
4749
  </fo:table-row>
4711
4750
  </xsl:template><xsl:template match="*[local-name()='th']" mode="requirement">
4712
4751
  <fo:table-cell text-align="{@align}" display-align="center" padding="1mm" padding-left="2mm"> <!-- border="0.5pt solid black" -->
4713
- <xsl:attribute name="text-align">
4714
- <xsl:choose>
4715
- <xsl:when test="@align">
4716
- <xsl:value-of select="@align"/>
4717
- </xsl:when>
4718
- <xsl:otherwise>left</xsl:otherwise>
4719
- </xsl:choose>
4720
- </xsl:attribute>
4721
- <xsl:if test="@colspan">
4722
- <xsl:attribute name="number-columns-spanned">
4723
- <xsl:value-of select="@colspan"/>
4724
- </xsl:attribute>
4725
- </xsl:if>
4726
- <xsl:if test="@rowspan">
4727
- <xsl:attribute name="number-rows-spanned">
4728
- <xsl:value-of select="@rowspan"/>
4729
- </xsl:attribute>
4730
- </xsl:if>
4731
- <xsl:call-template name="display-align"/>
4752
+ <xsl:call-template name="setTextAlignment">
4753
+ <xsl:with-param name="default">left</xsl:with-param>
4754
+ </xsl:call-template>
4732
4755
 
4733
- <!-- <xsl:if test="ancestor::*[local-name()='table']/@type = 'recommend'">
4734
- <xsl:attribute name="padding-top">0.5mm</xsl:attribute>
4735
- <xsl:attribute name="background-color">rgb(165, 165, 165)</xsl:attribute>
4736
- </xsl:if>
4737
- <xsl:if test="ancestor::*[local-name()='table']/@type = 'recommendtest'">
4738
- <xsl:attribute name="padding-top">0.5mm</xsl:attribute>
4739
- <xsl:attribute name="background-color">rgb(201, 201, 201)</xsl:attribute>
4740
- </xsl:if> -->
4756
+ <xsl:call-template name="setTableCellAttributes"/>
4741
4757
 
4742
4758
  <fo:block>
4743
4759
  <xsl:apply-templates/>
@@ -4749,37 +4765,15 @@
4749
4765
  <xsl:attribute name="padding">0mm</xsl:attribute>
4750
4766
  <xsl:attribute name="padding-left">0mm</xsl:attribute>
4751
4767
  </xsl:if>
4752
- <xsl:attribute name="text-align">
4753
- <xsl:choose>
4754
- <xsl:when test="@align">
4755
- <xsl:value-of select="@align"/>
4756
- </xsl:when>
4757
- <xsl:otherwise>left</xsl:otherwise>
4758
- </xsl:choose>
4759
- </xsl:attribute>
4768
+ <xsl:call-template name="setTextAlignment">
4769
+ <xsl:with-param name="default">left</xsl:with-param>
4770
+ </xsl:call-template>
4771
+
4760
4772
  <xsl:if test="following-sibling::*[local-name()='td'] and not(preceding-sibling::*[local-name()='td'])">
4761
4773
  <xsl:attribute name="font-weight">bold</xsl:attribute>
4762
4774
  </xsl:if>
4763
- <xsl:if test="@colspan">
4764
- <xsl:attribute name="number-columns-spanned">
4765
- <xsl:value-of select="@colspan"/>
4766
- </xsl:attribute>
4767
- </xsl:if>
4768
- <xsl:if test="@rowspan">
4769
- <xsl:attribute name="number-rows-spanned">
4770
- <xsl:value-of select="@rowspan"/>
4771
- </xsl:attribute>
4772
- </xsl:if>
4773
- <xsl:call-template name="display-align"/>
4774
4775
 
4775
- <!-- <xsl:if test="ancestor::*[local-name()='table']/@type = 'recommend'">
4776
- <xsl:attribute name="padding-left">0.5mm</xsl:attribute>
4777
- <xsl:attribute name="padding-top">0.5mm</xsl:attribute>
4778
- <xsl:if test="parent::*[local-name()='tr']/preceding-sibling::*[local-name()='tr'] and not(*[local-name()='table'])">
4779
- <xsl:attribute name="background-color">rgb(201, 201, 201)</xsl:attribute>
4780
- </xsl:if>
4781
- </xsl:if> -->
4782
- <!-- 2nd line and below -->
4776
+ <xsl:call-template name="setTableCellAttributes"/>
4783
4777
 
4784
4778
  <fo:block>
4785
4779
  <xsl:apply-templates/>
@@ -4791,15 +4785,15 @@
4791
4785
  <xsl:apply-templates/>
4792
4786
  </fo:block>
4793
4787
  </xsl:template><xsl:template match="*[local-name() = 'p2'][ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']]">
4794
- <fo:block> <!-- margin-bottom="10pt" -->
4788
+ <fo:block>
4795
4789
  <xsl:apply-templates/>
4796
4790
  </fo:block>
4797
4791
  </xsl:template><xsl:template match="*[local-name() = 'termexample']">
4798
4792
  <fo:block id="{@id}" xsl:use-attribute-sets="termexample-style">
4799
- <xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
4800
- <xsl:apply-templates/>
4793
+ <xsl:apply-templates select="*[local-name()='name']"/>
4794
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
4801
4795
  </fo:block>
4802
- </xsl:template><xsl:template match="*[local-name() = 'termexample']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'termexample']/*[local-name() = 'name']" mode="presentation">
4796
+ </xsl:template><xsl:template match="*[local-name() = 'termexample']/*[local-name() = 'name']">
4803
4797
  <xsl:if test="normalize-space() != ''">
4804
4798
  <fo:inline xsl:use-attribute-sets="termexample-name-style">
4805
4799
  <xsl:apply-templates/>
@@ -4825,9 +4819,7 @@
4825
4819
 
4826
4820
  <xsl:variable name="fo_element">
4827
4821
  <xsl:if test=".//*[local-name() = 'table'] or .//*[local-name() = 'dl']">block</xsl:if>
4828
-
4829
4822
  inline
4830
-
4831
4823
  </xsl:variable>
4832
4824
 
4833
4825
  <!-- display 'EXAMPLE' -->
@@ -4900,6 +4892,8 @@
4900
4892
  </xsl:template><xsl:template match="*[local-name() = 'termsource']" name="termsource">
4901
4893
  <fo:block xsl:use-attribute-sets="termsource-style">
4902
4894
 
4895
+
4896
+
4903
4897
  <!-- Example: [SOURCE: ISO 5127:2017, 3.1.6.02] -->
4904
4898
  <xsl:variable name="termsource_text">
4905
4899
  <xsl:apply-templates/>
@@ -4937,9 +4931,7 @@
4937
4931
  <xsl:value-of select="."/>
4938
4932
  </xsl:if>
4939
4933
  </xsl:template><xsl:template match="*[local-name() = 'termsource']/*[local-name() = 'strong'][1][following-sibling::*[1][local-name() = 'origin']]/text()">
4940
- <fo:inline>
4941
-
4942
-
4934
+ <fo:inline xsl:use-attribute-sets="termsource-text-style">
4943
4935
  <xsl:value-of select="."/>
4944
4936
  </fo:inline>
4945
4937
  </xsl:template><xsl:template match="*[local-name() = 'origin']">
@@ -4982,7 +4974,6 @@
4982
4974
  <fo:block-container margin-left="0mm">
4983
4975
 
4984
4976
  <fo:block xsl:use-attribute-sets="quote-style">
4985
- <!-- <xsl:apply-templates select=".//*[local-name() = 'p']"/> -->
4986
4977
 
4987
4978
  <xsl:apply-templates select="./node()[not(local-name() = 'author') and not(local-name() = 'source')]"/> <!-- process all nested nodes, except author and source -->
4988
4979
  </fo:block>
@@ -5025,15 +5016,15 @@
5025
5016
  </xsl:variable>
5026
5017
 
5027
5018
  <xsl:choose>
5028
- <xsl:when test="normalize-space($bibitemid) != ''">
5019
+ <xsl:when test="normalize-space($bibitemid) != ''"> <!-- if in the bibliography there is the item with @bibitemid (and not hidden), then create link -->
5029
5020
  <fo:inline xsl:use-attribute-sets="eref-style">
5030
5021
  <xsl:if test="@type = 'footnote'">
5031
-
5022
+ <xsl:attribute name="keep-together.within-line">always</xsl:attribute>
5023
+ <xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
5024
+ <xsl:attribute name="vertical-align">super</xsl:attribute>
5025
+ <xsl:attribute name="font-size">80%</xsl:attribute>
5032
5026
 
5033
- <xsl:attribute name="keep-together.within-line">always</xsl:attribute>
5034
5027
  <xsl:attribute name="font-size">50%</xsl:attribute>
5035
- <xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
5036
- <xsl:attribute name="vertical-align">super</xsl:attribute>
5037
5028
 
5038
5029
  </xsl:if>
5039
5030
 
@@ -5050,7 +5041,6 @@
5050
5041
 
5051
5042
 
5052
5043
 
5053
-
5054
5044
  </xsl:if>
5055
5045
 
5056
5046
 
@@ -5111,8 +5101,6 @@
5111
5101
  </xsl:choose>
5112
5102
  </xsl:variable>
5113
5103
 
5114
- <!-- <xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/> -->
5115
-
5116
5104
  <xsl:choose>
5117
5105
  <xsl:when test="$lang = 'zh'">
5118
5106
  <fo:inline><xsl:value-of select="$tab_zh"/></fo:inline>
@@ -5168,7 +5156,6 @@
5168
5156
  <xsl:apply-templates/>
5169
5157
  </xsl:template><xsl:template match="*[local-name() = 'definition'][preceding-sibling::*[local-name() = 'domain']]/*[local-name() = 'p'][1]">
5170
5158
  <fo:inline> <xsl:apply-templates/></fo:inline>
5171
- <!-- <fo:block>&#xA0;</fo:block> -->
5172
5159
  <fo:block/>
5173
5160
  </xsl:template><xsl:template match="/*/*[local-name() = 'sections']/*" priority="2">
5174
5161
 
@@ -5211,11 +5198,6 @@
5211
5198
  <xsl:apply-templates/>
5212
5199
  </fo:block>
5213
5200
  </xsl:template><xsl:template match="*[local-name() = 'definitions']">
5214
- <fo:block id="{@id}">
5215
- <xsl:apply-templates/>
5216
- </fo:block>
5217
- </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']">
5218
-
5219
5201
  <fo:block id="{@id}">
5220
5202
  <xsl:apply-templates/>
5221
5203
  </fo:block>
@@ -5483,54 +5465,107 @@
5483
5465
  <fo:table-cell border="1pt solid black" padding-left="1mm" padding-top="0.5mm">
5484
5466
  <fo:block><xsl:apply-templates/></fo:block>
5485
5467
  </fo:table-cell>
5486
- </xsl:template><xsl:template name="processBibitem">
5487
-
5488
-
5489
-
5468
+ </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">
5490
5469
 
5491
5470
 
5492
5471
 
5472
+ <fo:block id="{@id}">
5473
+ <xsl:apply-templates/>
5474
+ </fo:block>
5475
+ </xsl:template><xsl:template match="*[local-name() = 'references']">
5476
+ <xsl:if test="not(ancestor::*[local-name() = 'annex'])">
5477
+
5478
+ <fo:block break-after="page"/>
5479
+
5480
+ </xsl:if>
5493
5481
 
5482
+ <!-- <xsl:if test="ancestor::*[local-name() = 'annex']">
5483
+ <xsl:if test="$namespace = 'csa' or $namespace = 'csd' or $namespace = 'gb' or $namespace = 'iec' or $namespace = 'iso' or $namespace = 'itu'">
5484
+ <fo:block break-after="page"/>
5485
+ </xsl:if>
5486
+ </xsl:if> -->
5494
5487
 
5488
+ <fo:block id="{@id}" xsl:use-attribute-sets="references-non-normative-style">
5489
+ <xsl:apply-templates/>
5490
+ </fo:block>
5495
5491
 
5496
5492
 
5493
+ <!-- horizontal line -->
5494
+ <fo:block-container text-align="center">
5495
+ <fo:block-container margin-left="63mm" width="42mm" border-bottom="2pt solid black">
5496
+ <fo:block> </fo:block>
5497
+ </fo:block-container>
5498
+ </fo:block-container>
5497
5499
 
5498
-
5499
5500
 
5500
5501
 
5501
-
5502
+ </xsl:template><xsl:template match="*[local-name() = 'bibitem']">
5503
+ <xsl:call-template name="bibitem"/>
5504
+ </xsl:template><xsl:template match="*[local-name() = 'references'][@normative='true']/*[local-name() = 'bibitem']" name="bibitem" priority="2">
5502
5505
 
5506
+ <fo:block id="{@id}" xsl:use-attribute-sets="bibitem-normative-style">
5507
+ <xsl:call-template name="processBibitem"/>
5508
+ </fo:block>
5509
+
5503
5510
 
5511
+ </xsl:template><xsl:template match="*[local-name() = 'references'][not(@normative='true')]/*[local-name() = 'bibitem']" priority="2">
5512
+
5513
+ <!-- $namespace = 'csd' or $namespace = 'gb' or $namespace = 'iec' or $namespace = 'iso' or $namespace = 'jcgm' or $namespace = 'm3d' or
5514
+ $namespace = 'mpfd' or $namespace = 'ogc' or $namespace = 'ogc-white-paper' -->
5515
+ <!-- Example: [1] ISO 9:1995, Information and documentation – Transliteration of Cyrillic characters into Latin characters – Slavic and non-Slavic languages -->
5516
+ <fo:list-block id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-list-style">
5517
+ <fo:list-item>
5518
+ <fo:list-item-label end-indent="label-end()">
5519
+ <fo:block>
5520
+ <fo:inline>
5521
+
5522
+ <xsl:value-of select="*[local-name()='docidentifier'][@type = 'metanorma-ordinal']"/>
5523
+ <xsl:if test="not(*[local-name()='docidentifier'][@type = 'metanorma-ordinal'])">
5524
+ <xsl:number format="[1]"/>
5525
+ </xsl:if>
5526
+
5527
+ </fo:inline>
5528
+ </fo:block>
5529
+ </fo:list-item-label>
5530
+ <fo:list-item-body start-indent="body-start()">
5531
+ <fo:block xsl:use-attribute-sets="bibitem-non-normative-list-body-style">
5532
+ <xsl:call-template name="processBibitem"/>
5533
+ </fo:block>
5534
+ </fo:list-item-body>
5535
+ </fo:list-item>
5536
+ </fo:list-block>
5537
+
5504
5538
 
5505
- <!-- end MPFD bibitem processing -->
5539
+ </xsl:template><xsl:template name="processBibitem">
5506
5540
 
5507
- <!-- start M3D bibitem processing -->
5508
5541
 
5509
- <xsl:variable name="docidentifier">
5510
- <xsl:if test="m3d:docidentifier">
5542
+ <!-- start bibitem processing -->
5543
+ <xsl:if test=".//*[local-name() = 'fn']">
5544
+ <xsl:attribute name="line-height-shift-adjustment">disregard-shifts</xsl:attribute>
5545
+ </xsl:if>
5546
+ <xsl:variable name="docidentifier">
5511
5547
  <xsl:choose>
5512
- <xsl:when test="m3d:docidentifier/@type = 'metanorma'"/>
5513
- <xsl:otherwise><xsl:value-of select="m3d:docidentifier[not(@type = 'metanorma-ordinal')]"/></xsl:otherwise>
5548
+ <xsl:when test="*[local-name() = 'docidentifier']/@type = 'metanorma'"/>
5549
+ <xsl:otherwise><xsl:value-of select="*[local-name() = 'docidentifier'][not(@type = 'metanorma-ordinal')]"/></xsl:otherwise>
5514
5550
  </xsl:choose>
5515
- </xsl:if>
5516
- </xsl:variable>
5517
- <fo:inline><xsl:value-of select="$docidentifier"/></fo:inline>
5518
- <xsl:apply-templates select="m3d:note"/>
5519
- <xsl:if test="normalize-space($docidentifier) != ''">, </xsl:if>
5520
- <xsl:choose>
5521
- <xsl:when test="m3d:title[@type = 'main' and @language = 'en']">
5522
- <xsl:apply-templates select="m3d:title[@type = 'main' and @language = 'en']"/>
5523
- </xsl:when>
5524
- <xsl:otherwise>
5525
- <xsl:apply-templates select="m3d:title"/>
5526
- </xsl:otherwise>
5527
- </xsl:choose>
5528
- <xsl:apply-templates select="m3d:formattedref"/>
5529
- <!-- end MPFD bibitem processing -->
5530
-
5531
-
5532
-
5533
-
5551
+ </xsl:variable>
5552
+ <fo:inline><xsl:value-of select="$docidentifier"/></fo:inline>
5553
+ <xsl:apply-templates select="*[local-name() = 'note']"/>
5554
+ <xsl:if test="normalize-space($docidentifier) != ''">, </xsl:if>
5555
+ <xsl:choose>
5556
+ <xsl:when test="*[local-name() = 'title'][@type = 'main' and @language = $lang]">
5557
+ <xsl:apply-templates select="*[local-name() = 'title'][@type = 'main' and @language = $lang]"/>
5558
+ </xsl:when>
5559
+ <xsl:when test="*[local-name() = 'title'][@type = 'main' and @language = 'en']">
5560
+ <xsl:apply-templates select="*[local-name() = 'title'][@type = 'main' and @language = 'en']"/>
5561
+ </xsl:when>
5562
+ <xsl:otherwise>
5563
+ <xsl:apply-templates select="*[local-name() = 'title']"/>
5564
+ </xsl:otherwise>
5565
+ </xsl:choose>
5566
+ <xsl:apply-templates select="*[local-name() = 'formattedref']"/>
5567
+ <!-- end bibitem processing -->
5568
+
5534
5569
  </xsl:template><xsl:template name="processBibitemDocId">
5535
5570
  <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')]"/>
5536
5571
  <xsl:choose>
@@ -5587,6 +5622,48 @@
5587
5622
  <xsl:value-of select="substring(.,1,1)"/>
5588
5623
  </xsl:template><xsl:template match="*[local-name() = 'title']" mode="title">
5589
5624
  <fo:inline><xsl:apply-templates/></fo:inline>
5625
+ </xsl:template><xsl:template match="*[local-name() = 'bibitem']/*[local-name() = 'title']" priority="2">
5626
+ <!-- <fo:inline><xsl:apply-templates /></fo:inline> -->
5627
+ <fo:inline font-style="italic"> <!-- BIPM BSI CSD CSA GB IEC IHO ISO ITU JCGM -->
5628
+ <xsl:apply-templates/>
5629
+ </fo:inline>
5630
+ </xsl:template><xsl:template match="*[local-name() = 'bibitem']/*[local-name() = 'note']" priority="2">
5631
+ <fo:footnote>
5632
+ <xsl:variable name="number">
5633
+
5634
+ <xsl:number level="any" count="*[local-name() = 'bibitem']/*[local-name() = 'note']"/>
5635
+
5636
+ </xsl:variable>
5637
+ <fo:inline xsl:use-attribute-sets="bibitem-note-fn-style">
5638
+ <fo:basic-link internal-destination="{generate-id()}" fox:alt-text="footnote {$number}">
5639
+ <xsl:value-of select="$number"/>
5640
+
5641
+ </fo:basic-link>
5642
+ </fo:inline>
5643
+ <fo:footnote-body>
5644
+ <fo:block xsl:use-attribute-sets="bibitem-note-fn-body-style">
5645
+ <fo:inline id="{generate-id()}" xsl:use-attribute-sets="bibitem-note-fn-number-style">
5646
+ <xsl:value-of select="$number"/>
5647
+
5648
+ </fo:inline>
5649
+ <xsl:apply-templates/>
5650
+ </fo:block>
5651
+ </fo:footnote-body>
5652
+ </fo:footnote>
5653
+ </xsl:template><xsl:template match="*[local-name() = 'bibitem']/*[local-name() = 'edition']"> <!-- for iho -->
5654
+ <xsl:text> edition </xsl:text>
5655
+ <xsl:value-of select="."/>
5656
+ </xsl:template><xsl:template match="*[local-name() = 'bibitem']/*[local-name() = 'uri']"> <!-- for iho -->
5657
+ <xsl:text> (</xsl:text>
5658
+ <fo:inline xsl:use-attribute-sets="link-style">
5659
+ <fo:basic-link external-destination="." fox:alt-text=".">
5660
+ <xsl:value-of select="."/>
5661
+ </fo:basic-link>
5662
+ </fo:inline>
5663
+ <xsl:text>)</xsl:text>
5664
+ </xsl:template><xsl:template match="*[local-name() = 'bibitem']/*[local-name() = 'docidentifier']"/><xsl:template match="*[local-name() = 'formattedref']">
5665
+
5666
+ <xsl:apply-templates/>
5590
5667
  </xsl:template><xsl:template match="*[local-name() = 'form']">
5591
5668
  <fo:block>
5592
5669
  <xsl:apply-templates/>
@@ -5659,24 +5736,7 @@
5659
5736
  <xsl:when test="$htmltoclevels != ''"><xsl:value-of select="number($htmltoclevels)"/></xsl:when> <!-- if there is value in xml -->
5660
5737
  <xsl:when test="$toclevels != ''"><xsl:value-of select="number($toclevels)"/></xsl:when> <!-- if there is value in xml -->
5661
5738
  <xsl:otherwise><!-- default value -->
5662
-
5663
-
5664
-
5665
-
5666
-
5667
-
5668
-
5669
-
5670
-
5671
5739
  3
5672
-
5673
-
5674
-
5675
-
5676
-
5677
-
5678
-
5679
-
5680
5740
  </xsl:otherwise>
5681
5741
  </xsl:choose>
5682
5742
  </xsl:variable><xsl:template match="*[local-name() = 'toc']">
@@ -5774,6 +5834,57 @@
5774
5834
  <xsl:copy-of select="."/>
5775
5835
  </xsl:template><xsl:template match="*[local-name() = 'p'][@type = 'floating-title']" priority="4">
5776
5836
  <xsl:call-template name="title"/>
5837
+ </xsl:template><xsl:template match="*[local-name() = 'admonition']">
5838
+
5839
+
5840
+
5841
+
5842
+
5843
+ <!-- text in the box -->
5844
+ <fo:block-container id="{@id}" xsl:use-attribute-sets="admonition-style">
5845
+
5846
+
5847
+
5848
+
5849
+
5850
+ <fo:block-container xsl:use-attribute-sets="admonition-container-style">
5851
+
5852
+
5853
+ <fo:block xsl:use-attribute-sets="admonition-name-style">
5854
+ <xsl:call-template name="displayAdmonitionName"/>
5855
+ </fo:block>
5856
+ <fo:block xsl:use-attribute-sets="admonition-p-style">
5857
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
5858
+ </fo:block>
5859
+
5860
+ </fo:block-container>
5861
+
5862
+ </fo:block-container>
5863
+
5864
+ </xsl:template><xsl:template name="displayAdmonitionName">
5865
+
5866
+ <xsl:apply-templates select="*[local-name() = 'name']"/>
5867
+ <xsl:if test="not(*[local-name() = 'name'])">
5868
+ <xsl:apply-templates select="@type"/>
5869
+ </xsl:if>
5870
+
5871
+ </xsl:template><xsl:template match="*[local-name() = 'admonition']/*[local-name() = 'name']">
5872
+ <xsl:apply-templates/>
5873
+ </xsl:template><xsl:template match="*[local-name() = 'admonition']/@type">
5874
+ <xsl:variable name="admonition_type_">
5875
+ <xsl:call-template name="getLocalizedString">
5876
+ <xsl:with-param name="key">admonition.<xsl:value-of select="."/></xsl:with-param>
5877
+ </xsl:call-template>
5878
+ </xsl:variable>
5879
+ <xsl:variable name="admonition_type" select="normalize-space(java:toUpperCase(java:java.lang.String.new($admonition_type_)))"/>
5880
+ <xsl:value-of select="$admonition_type"/>
5881
+ <xsl:if test="$admonition_type = ''">
5882
+ <xsl:value-of select="java:toUpperCase(java:java.lang.String.new(.))"/>
5883
+ </xsl:if>
5884
+ </xsl:template><xsl:template match="*[local-name() = 'admonition']/*[local-name() = 'p']">
5885
+ <!-- processing for admonition/p found in the template for 'p' -->
5886
+ <xsl:call-template name="paragraph"/>
5887
+
5777
5888
  </xsl:template><xsl:template name="convertDate">
5778
5889
  <xsl:param name="date"/>
5779
5890
  <xsl:param name="format" select="'short'"/>
@@ -5782,78 +5893,39 @@
5782
5893
  <xsl:variable name="day" select="substring($date, 9, 2)"/>
5783
5894
  <xsl:variable name="monthStr">
5784
5895
  <xsl:choose>
5785
- <xsl:when test="$month = '01'">January</xsl:when>
5786
- <xsl:when test="$month = '02'">February</xsl:when>
5787
- <xsl:when test="$month = '03'">March</xsl:when>
5788
- <xsl:when test="$month = '04'">April</xsl:when>
5789
- <xsl:when test="$month = '05'">May</xsl:when>
5790
- <xsl:when test="$month = '06'">June</xsl:when>
5791
- <xsl:when test="$month = '07'">July</xsl:when>
5792
- <xsl:when test="$month = '08'">August</xsl:when>
5793
- <xsl:when test="$month = '09'">September</xsl:when>
5794
- <xsl:when test="$month = '10'">October</xsl:when>
5795
- <xsl:when test="$month = '11'">November</xsl:when>
5796
- <xsl:when test="$month = '12'">December</xsl:when>
5797
- </xsl:choose>
5798
- </xsl:variable>
5799
- <xsl:variable name="result">
5800
- <xsl:choose>
5801
- <xsl:when test="$format = 'ddMMyyyy'">
5802
- <xsl:if test="$day != ''"><xsl:value-of select="number($day)"/></xsl:if>
5803
- <xsl:text> </xsl:text>
5804
- <xsl:value-of select="normalize-space(concat($monthStr, ' ' , $year))"/>
5805
- </xsl:when>
5806
- <xsl:when test="$format = 'ddMM'">
5807
- <xsl:if test="$day != ''"><xsl:value-of select="number($day)"/></xsl:if>
5808
- <xsl:text> </xsl:text><xsl:value-of select="$monthStr"/>
5809
- </xsl:when>
5810
- <xsl:when test="$format = 'short' or $day = ''">
5811
- <xsl:value-of select="normalize-space(concat($monthStr, ' ', $year))"/>
5812
- </xsl:when>
5813
- <xsl:otherwise>
5814
- <xsl:value-of select="normalize-space(concat($monthStr, ' ', $day, ', ' , $year))"/>
5815
- </xsl:otherwise>
5896
+ <xsl:when test="$month = '01'">january</xsl:when>
5897
+ <xsl:when test="$month = '02'">february</xsl:when>
5898
+ <xsl:when test="$month = '03'">march</xsl:when>
5899
+ <xsl:when test="$month = '04'">april</xsl:when>
5900
+ <xsl:when test="$month = '05'">may</xsl:when>
5901
+ <xsl:when test="$month = '06'">june</xsl:when>
5902
+ <xsl:when test="$month = '07'">july</xsl:when>
5903
+ <xsl:when test="$month = '08'">august</xsl:when>
5904
+ <xsl:when test="$month = '09'">september</xsl:when>
5905
+ <xsl:when test="$month = '10'">october</xsl:when>
5906
+ <xsl:when test="$month = '11'">november</xsl:when>
5907
+ <xsl:when test="$month = '12'">december</xsl:when>
5816
5908
  </xsl:choose>
5817
5909
  </xsl:variable>
5818
- <xsl:value-of select="$result"/>
5819
- </xsl:template><xsl:template name="convertDateLocalized">
5820
- <xsl:param name="date"/>
5821
- <xsl:param name="format" select="'short'"/>
5822
- <xsl:variable name="year" select="substring($date, 1, 4)"/>
5823
- <xsl:variable name="month" select="substring($date, 6, 2)"/>
5824
- <xsl:variable name="day" select="substring($date, 9, 2)"/>
5825
- <xsl:variable name="monthStr">
5826
- <xsl:choose>
5827
- <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>
5828
- <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>
5829
- <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>
5830
- <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>
5831
- <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>
5832
- <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>
5833
- <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>
5834
- <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>
5835
- <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>
5836
- <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>
5837
- <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>
5838
- <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>
5839
- </xsl:choose>
5910
+ <xsl:variable name="monthStr_localized">
5911
+ <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>
5840
5912
  </xsl:variable>
5841
5913
  <xsl:variable name="result">
5842
5914
  <xsl:choose>
5843
5915
  <xsl:when test="$format = 'ddMMyyyy'">
5844
5916
  <xsl:if test="$day != ''"><xsl:value-of select="number($day)"/></xsl:if>
5845
5917
  <xsl:text> </xsl:text>
5846
- <xsl:value-of select="normalize-space(concat($monthStr, ' ' , $year))"/>
5918
+ <xsl:value-of select="normalize-space(concat($monthStr_localized, ' ' , $year))"/>
5847
5919
  </xsl:when>
5848
5920
  <xsl:when test="$format = 'ddMM'">
5849
5921
  <xsl:if test="$day != ''"><xsl:value-of select="number($day)"/></xsl:if>
5850
- <xsl:text> </xsl:text><xsl:value-of select="$monthStr"/>
5922
+ <xsl:text> </xsl:text><xsl:value-of select="$monthStr_localized"/>
5851
5923
  </xsl:when>
5852
5924
  <xsl:when test="$format = 'short' or $day = ''">
5853
- <xsl:value-of select="normalize-space(concat($monthStr, ' ', $year))"/>
5925
+ <xsl:value-of select="normalize-space(concat($monthStr_localized, ' ', $year))"/>
5854
5926
  </xsl:when>
5855
5927
  <xsl:otherwise>
5856
- <xsl:value-of select="normalize-space(concat($monthStr, ' ', $day, ', ' , $year))"/>
5928
+ <xsl:value-of select="normalize-space(concat($monthStr_localized, ' ', $day, ', ' , $year))"/>
5857
5929
  </xsl:otherwise>
5858
5930
  </xsl:choose>
5859
5931
  </xsl:variable>
@@ -5906,13 +5978,8 @@
5906
5978
  <xsl:variable name="title">
5907
5979
  <xsl:for-each select="(//*[contains(local-name(), '-standard')])[1]/*[local-name() = 'bibdata']">
5908
5980
 
5909
-
5910
-
5911
-
5912
-
5913
- <xsl:value-of select="*[local-name() = 'title']"/>
5914
-
5915
-
5981
+ <xsl:value-of select="*[local-name() = 'title']"/>
5982
+
5916
5983
  </xsl:for-each>
5917
5984
  </xsl:variable>
5918
5985
  <xsl:choose>
@@ -5927,21 +5994,18 @@
5927
5994
  <dc:creator>
5928
5995
  <xsl:for-each select="(//*[contains(local-name(), '-standard')])[1]/*[local-name() = 'bibdata']">
5929
5996
 
5930
- <xsl:for-each select="*[local-name() = 'contributor'][*[local-name() = 'role']/@type='author']">
5931
- <xsl:value-of select="*[local-name() = 'organization']/*[local-name() = 'name']"/>
5932
- <xsl:if test="position() != last()">; </xsl:if>
5933
- </xsl:for-each>
5934
-
5935
-
5936
-
5997
+ <xsl:for-each select="*[local-name() = 'contributor'][*[local-name() = 'role']/@type='author']">
5998
+ <xsl:value-of select="*[local-name() = 'organization']/*[local-name() = 'name']"/>
5999
+ <xsl:if test="position() != last()">; </xsl:if>
6000
+ </xsl:for-each>
6001
+
5937
6002
  </xsl:for-each>
5938
6003
  </dc:creator>
5939
6004
  <dc:description>
5940
6005
  <xsl:variable name="abstract">
5941
6006
 
5942
- <xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*[local-name() = 'abstract']//text()"/>
5943
-
5944
-
6007
+ <xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*[local-name() = 'abstract']//text()"/>
6008
+
5945
6009
  </xsl:variable>
5946
6010
  <xsl:value-of select="normalize-space($abstract)"/>
5947
6011
  </dc:description>
@@ -5961,7 +6025,6 @@
5961
6025
  <xsl:value-of select="../@id"/>
5962
6026
  </xsl:when>
5963
6027
  <xsl:otherwise>
5964
- <!-- <xsl:value-of select="concat(local-name(..), '_', text())"/> -->
5965
6028
  <xsl:value-of select="concat(generate-id(..), '_', text())"/>
5966
6029
  </xsl:otherwise>
5967
6030
  </xsl:choose>
@@ -5987,9 +6050,6 @@
5987
6050
  <xsl:when test="ancestor::*[local-name() = 'preface']">
5988
6051
  <xsl:value-of select="$level_total - 2"/>
5989
6052
  </xsl:when>
5990
- <!-- <xsl:when test="parent::*[local-name() = 'sections']">
5991
- <xsl:value-of select="$level_total - 1"/>
5992
- </xsl:when> -->
5993
6053
  <xsl:when test="ancestor::*[local-name() = 'sections']">
5994
6054
  <xsl:value-of select="$level_total - 1"/>
5995
6055
  </xsl:when>
@@ -6179,7 +6239,6 @@
6179
6239
  <xsl:value-of select="$key_"/>
6180
6240
  </xsl:otherwise>
6181
6241
  </xsl:choose>
6182
-
6183
6242
  </xsl:template><xsl:template name="setTrackChangesStyles">
6184
6243
  <xsl:param name="isAdded"/>
6185
6244
  <xsl:param name="isDeleted"/>
@@ -6202,7 +6261,6 @@
6202
6261
  <xsl:if test="local-name() = 'table'">
6203
6262
  <xsl:attribute name="background-color">rgb(255, 185, 185)</xsl:attribute>
6204
6263
  </xsl:if>
6205
- <!-- <xsl:attribute name="color"><xsl:value-of select="$color-deleted-text"/></xsl:attribute> -->
6206
6264
  <xsl:attribute name="padding">2mm</xsl:attribute>
6207
6265
  </xsl:if>
6208
6266
  </xsl:otherwise>
@@ -6222,15 +6280,18 @@
6222
6280
  </xsl:choose>
6223
6281
  </xsl:template><xsl:template name="setTextAlignment">
6224
6282
  <xsl:param name="default">left</xsl:param>
6283
+ <xsl:variable name="align" select="normalize-space(@align)"/>
6225
6284
  <xsl:attribute name="text-align">
6226
6285
  <xsl:choose>
6227
- <xsl:when test="@align and not(@align = 'indent')"><xsl:value-of select="@align"/></xsl:when>
6286
+ <xsl:when test="$lang = 'ar' and $align = 'left'">start</xsl:when>
6287
+ <xsl:when test="$lang = 'ar' and $align = 'right'">end</xsl:when>
6288
+ <xsl:when test="$align != '' and not($align = 'indent')"><xsl:value-of select="$align"/></xsl:when>
6228
6289
  <xsl:when test="ancestor::*[local-name() = 'td']/@align"><xsl:value-of select="ancestor::*[local-name() = 'td']/@align"/></xsl:when>
6229
6290
  <xsl:when test="ancestor::*[local-name() = 'th']/@align"><xsl:value-of select="ancestor::*[local-name() = 'th']/@align"/></xsl:when>
6230
6291
  <xsl:otherwise><xsl:value-of select="$default"/></xsl:otherwise>
6231
6292
  </xsl:choose>
6232
6293
  </xsl:attribute>
6233
- <xsl:if test="@align = 'indent'">
6294
+ <xsl:if test="$align = 'indent'">
6234
6295
  <xsl:attribute name="margin-left">7mm</xsl:attribute>
6235
6296
  </xsl:if>
6236
6297
  </xsl:template><xsl:template name="number-to-words">