metanorma-un 0.7.4 → 0.8.2

Sign up to get free protection for your applications and to get access to all the features.
@@ -13,8 +13,6 @@
13
13
 
14
14
 
15
15
 
16
- <xsl:variable name="pageWidth" select="210"/>
17
- <xsl:variable name="pageHeight" select="297"/>
18
16
  <xsl:variable name="marginLeftRight1" select="40"/>
19
17
  <xsl:variable name="marginLeftRight2" select="40"/>
20
18
  <xsl:variable name="marginTop" select="30"/>
@@ -45,7 +43,7 @@
45
43
 
46
44
  <xsl:template match="/">
47
45
  <xsl:call-template name="namespaceCheck"/>
48
- <fo:root font-family="Times New Roman, STIX Two Math, Source Han Sans" font-size="10pt" xml:lang="{$lang}">
46
+ <fo:root xsl:use-attribute-sets="root-style" xml:lang="{$lang}">
49
47
  <fo:layout-master-set>
50
48
  <!-- Cover page -->
51
49
  <fo:simple-page-master master-name="cover-page" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
@@ -123,8 +121,9 @@
123
121
  <xsl:text>Distr.: </xsl:text><xsl:value-of select="/un:un-standard/un:bibdata/un:ext/un:distribution"/>
124
122
  </fo:block>
125
123
  <fo:block margin-bottom="12pt">
126
- <xsl:call-template name="formatDate">
124
+ <xsl:call-template name="convertDate">
127
125
  <xsl:with-param name="date" select="/un:un-standard/un:bibdata/un:version/un:revision-date"/>
126
+ <xsl:with-param name="format">ddMMyyyy</xsl:with-param>
128
127
  </xsl:call-template>
129
128
  </fo:block>
130
129
  <fo:block>
@@ -325,9 +324,6 @@
325
324
  <!-- ============================= -->
326
325
  <!-- CONTENTS -->
327
326
  <!-- ============================= -->
328
- <xsl:template match="node()" mode="contents">
329
- <xsl:apply-templates mode="contents"/>
330
- </xsl:template>
331
327
 
332
328
  <!-- element with title -->
333
329
  <xsl:template match="*[un:title]" mode="contents">
@@ -376,7 +372,6 @@
376
372
  </xsl:if>
377
373
 
378
374
  </xsl:template>
379
- <xsl:template match="un:references[not(@normative='true')]/un:bibitem" mode="contents"/>
380
375
  <!-- ============================= -->
381
376
  <!-- ============================= -->
382
377
 
@@ -394,12 +389,9 @@
394
389
  <fo:table-body>
395
390
  <fo:table-row>
396
391
  <fo:table-cell padding-left="6mm" padding-top="2.5mm">
397
- <xsl:variable name="title-summary">
398
- <xsl:call-template name="getTitle">
399
- <xsl:with-param name="name" select="'title-summary'"/>
400
- </xsl:call-template>
401
- </xsl:variable>
402
- <fo:block font-size="12pt" font-style="italic" margin-bottom="6pt"><xsl:value-of select="$title-summary"/></fo:block>
392
+ <fo:block font-size="12pt" font-style="italic" margin-bottom="6pt" role="H2">
393
+ <xsl:apply-templates select="un:title/node()"/>
394
+ </fo:block>
403
395
  </fo:table-cell>
404
396
  <fo:table-cell>
405
397
  <fo:block> </fo:block>
@@ -413,7 +405,7 @@
413
405
  <fo:block> </fo:block>
414
406
  </fo:table-cell>
415
407
  <fo:table-cell text-align="justify" padding-bottom="12pt" padding-right="3mm">
416
- <fo:block font-size="10pt" line-height="120%"><xsl:apply-templates/></fo:block>
408
+ <fo:block font-size="10pt" line-height="120%"><xsl:apply-templates select="node()[not(self::un:title)]"/></fo:block>
417
409
  </fo:table-cell>
418
410
  <fo:table-cell>
419
411
  <fo:block> </fo:block>
@@ -502,7 +494,7 @@
502
494
  </fo:block>
503
495
  </xsl:template>
504
496
 
505
- <xsl:template match="un:p"> <!-- priority="3" [not(parent::un:note)]-->
497
+ <xsl:template match="un:p" name="paragraph"> <!-- priority="3" [not(parent::un:note)]-->
506
498
 
507
499
  <fo:block margin-bottom="6pt" line-height="122%">
508
500
  <xsl:if test="following-sibling::*">
@@ -564,24 +556,12 @@
564
556
  <xsl:template match="un:ul | un:ol" mode="ul_ol">
565
557
  <fo:block-container margin-left="8mm" text-indent="0mm">
566
558
  <fo:list-block provisional-distance-between-starts="4mm" margin-left="-8mm">
567
- <xsl:apply-templates/>
559
+ <xsl:apply-templates select="node()[not(local-name() = 'note')]"/>
568
560
  </fo:list-block>
569
- <xsl:apply-templates select="./un:note" mode="process"/>
561
+ <xsl:apply-templates select="./un:note"/>
570
562
  </fo:block-container>
571
563
  </xsl:template>
572
564
 
573
- <xsl:template match="un:ul//un:note | un:ol//un:note" priority="2"/>
574
- <xsl:template match="un:ul//un:note/un:name | un:ol//un:note/un:name" mode="process" priority="2"/>
575
- <xsl:template match="un:ul//un:note/un:p | un:ol//un:note/un:p" mode="process" priority="2">
576
- <fo:block margin-top="4pt">
577
- <xsl:apply-templates select="../un:name" mode="presentation"/>
578
- <xsl:apply-templates/>
579
- </fo:block>
580
- </xsl:template>
581
-
582
- <xsl:template match="un:ul//un:note/* | un:ol//un:note/*" mode="process">
583
- <xsl:apply-templates select="."/>
584
- </xsl:template>
585
565
 
586
566
  <xsl:template match="un:li">
587
567
  <xsl:variable name="level">
@@ -591,8 +571,9 @@
591
571
  <fo:list-item-label end-indent="label-end()">
592
572
  <fo:block>
593
573
  <xsl:choose>
594
- <!-- <xsl:when test="local-name(..) = 'ul'">&#x2014;</xsl:when> --> <!-- dash -->
595
- <xsl:when test="local-name(..) = 'ul'">•</xsl:when>
574
+ <xsl:when test="local-name(..) = 'ul'">
575
+ <xsl:call-template name="setULLabel"/>
576
+ </xsl:when>
596
577
  <xsl:otherwise> <!-- for ordered lists -->
597
578
  <xsl:choose>
598
579
  <xsl:when test="../@type = 'arabic'">
@@ -624,8 +605,8 @@
624
605
  </fo:list-item-label>
625
606
  <fo:list-item-body start-indent="body-start()">
626
607
  <fo:block>
627
- <xsl:apply-templates/>
628
- <xsl:apply-templates select=".//un:note" mode="process"/>
608
+ <xsl:apply-templates select="node()[not(local-name() = 'note')]"/>
609
+ <xsl:apply-templates select="./un:note"/>
629
610
  </fo:block>
630
611
  </fo:list-item-body>
631
612
  </fo:list-item>
@@ -647,32 +628,6 @@
647
628
  </xsl:template>
648
629
 
649
630
 
650
- <xsl:template match="un:admonition">
651
- <fo:block text-align="center" font-style="italic" keep-with-next="always" margin-bottom="6pt">
652
- <xsl:apply-templates select="un:name" mode="process"/>
653
- </fo:block>
654
- <fo:block-container border="0.25pt solid black" margin-left="-3mm" margin-right="-3mm" padding-top="4mm">
655
- <fo:block id="{@id}" font-weight="bold" margin-left="6mm" margin-right="6mm" keep-with-next="always">
656
- <xsl:apply-templates select="un:name" mode="process"/>
657
- </fo:block>
658
- <fo:block-container margin-left="2mm" margin-right="2mm">
659
- <fo:block-container margin-left="0mm" margin-right="0mm">
660
- <xsl:apply-templates/>
661
- </fo:block-container>
662
- </fo:block-container>
663
- </fo:block-container>
664
- <fo:block margin-bottom="4pt"> </fo:block>
665
- </xsl:template>
666
-
667
- <xsl:template match="un:admonition/un:name"/>
668
- <xsl:template match="un:admonition/un:name" mode="process">
669
- <xsl:apply-templates/>
670
- </xsl:template>
671
-
672
- <xsl:template match="un:admonition/un:p">
673
- <fo:block text-align="justify" margin-bottom="6pt" line-height="122%"><xsl:apply-templates/></fo:block>
674
- </xsl:template>
675
-
676
631
  <!-- ============================= -->
677
632
  <!-- ============================= -->
678
633
 
@@ -733,7 +688,7 @@
733
688
 
734
689
  <xsl:template match="un:title[parent::un:clause[@inline-header = 'true']]" priority="3"/>
735
690
 
736
- <xsl:template match="un:title">
691
+ <xsl:template match="un:title" name="title">
737
692
 
738
693
  <xsl:variable name="level">
739
694
  <xsl:call-template name="getLevel"/>
@@ -813,42 +768,13 @@
813
768
  <!-- for further use -->
814
769
  <!-- ============================ -->
815
770
 
816
-
817
-
818
- <xsl:template match="un:bibitem">
819
- <fo:block id="{@id}" margin-top="6pt" margin-left="14mm" text-indent="-14mm">
820
- <fo:inline padding-right="5mm">[<xsl:value-of select="un:docidentifier"/>]</fo:inline><xsl:value-of select="un:docidentifier"/>
821
- <xsl:if test="un:title">
822
- <fo:inline font-style="italic">
823
- <xsl:text>, </xsl:text>
824
- <xsl:choose>
825
- <xsl:when test="un:title[@type = 'main' and @language = 'en']">
826
- <xsl:value-of select="un:title[@type = 'main' and @language = 'en']"/>
827
- </xsl:when>
828
- <xsl:otherwise>
829
- <xsl:value-of select="un:title"/>
830
- </xsl:otherwise>
831
- </xsl:choose>
832
- </fo:inline>
833
- </xsl:if>
834
- <xsl:apply-templates select="un:formattedref"/>
835
- </fo:block>
836
- </xsl:template>
837
- <xsl:template match="un:bibitem/un:docidentifier"/>
838
-
839
- <xsl:template match="un:bibitem/un:title"/>
840
-
841
- <xsl:template match="un:formattedref">
842
- <xsl:text>, </xsl:text><xsl:apply-templates/>
843
- </xsl:template>
844
-
845
771
 
846
772
  <xsl:template match="un:figure" priority="2">
847
773
  <fo:block-container id="{@id}">
848
774
  <fo:block>
849
- <xsl:apply-templates/>
775
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
850
776
  </fo:block>
851
- <xsl:apply-templates select="un:name" mode="presentation"/>
777
+ <xsl:apply-templates select="un:name"/>
852
778
  <!-- <xsl:call-template name="fn_display_figure"/> -->
853
779
  <xsl:for-each select="un:note">
854
780
  <xsl:call-template name="note"/>
@@ -886,7 +812,7 @@
886
812
  </xsl:when>
887
813
  <xsl:otherwise>
888
814
  <xsl:apply-templates select="un:formattedref"/>
889
- <xsl:apply-templates select="un:docidentifier[@type != 'metanorma' or not(@type)]" mode="process"/>
815
+ <xsl:apply-templates select="un:docidentifier[(@type != 'metanorma' and @type != 'metanorma-ordinal') or not(@type)]" mode="process"/>
890
816
  </xsl:otherwise>
891
817
  </xsl:choose>
892
818
  </xsl:if>
@@ -926,10 +852,10 @@
926
852
  <xsl:apply-templates/>
927
853
  </xsl:template>
928
854
 
929
- <xsl:template match="un:docidentifier[@type = 'metanorma']" mode="process">
855
+ <xsl:template match="un:docidentifier[@type = 'metanorma' or @type = 'metanorma-ordinal']" mode="process">
930
856
  <xsl:apply-templates/>
931
857
  </xsl:template>
932
- <xsl:template match="un:docidentifier[@type != 'metanorma' or not(@type)]" mode="process">
858
+ <xsl:template match="un:docidentifier[(@type != 'metanorma' and @type != 'metanorma-ordinal') or not(@type)]" mode="process">
933
859
  <xsl:text> [</xsl:text><xsl:apply-templates/><xsl:text>]</xsl:text>
934
860
  </xsl:template>
935
861
  <xsl:template match="un:docidentifier"/>
@@ -959,12 +885,12 @@
959
885
  <xsl:attribute name="text-align">left</xsl:attribute>
960
886
  <xsl:attribute name="margin-left">7mm</xsl:attribute>
961
887
  </xsl:if>
962
- <xsl:apply-templates/>
888
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
963
889
  </fo:block>
964
890
  </fo:table-cell>
965
891
  <fo:table-cell> <!-- display-align="center" -->
966
892
  <fo:block text-align="right">
967
- <xsl:apply-templates select="un:name" mode="presentation"/>
893
+ <xsl:apply-templates select="un:name"/>
968
894
  </fo:block>
969
895
  </fo:table-cell>
970
896
  </fo:table-row>
@@ -977,20 +903,7 @@
977
903
  </xsl:template>
978
904
 
979
905
 
980
- <xsl:template match="un:formula" mode="process">
981
- <xsl:call-template name="formula-un"/>
982
- </xsl:template>
983
906
 
984
-
985
-
986
- <xsl:template match="un:references">
987
- <fo:block>
988
- <xsl:if test="not(un:title)">
989
- <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
990
- </xsl:if>
991
- <xsl:apply-templates/>
992
- </fo:block>
993
- </xsl:template>
994
907
 
995
908
  <xsl:template match="un:dl" priority="2">
996
909
  <fo:block-container margin-left="0mm">
@@ -1058,32 +971,6 @@
1058
971
  </xsl:template>
1059
972
 
1060
973
 
1061
- <!-- convert YYYY-MM-DD to (Month YYYY) -->
1062
- <xsl:template name="formatDate">
1063
- <xsl:param name="date"/>
1064
- <xsl:variable name="year" select="substring($date, 1, 4)"/>
1065
- <xsl:variable name="month" select="substring($date, 6, 2)"/>
1066
- <xsl:variable name="day" select="number(substring($date, 9))"/>
1067
- <xsl:variable name="monthStr">
1068
- <xsl:choose>
1069
- <xsl:when test="$month = '01'">January</xsl:when>
1070
- <xsl:when test="$month = '02'">February</xsl:when>
1071
- <xsl:when test="$month = '03'">March</xsl:when>
1072
- <xsl:when test="$month = '04'">April</xsl:when>
1073
- <xsl:when test="$month = '05'">May</xsl:when>
1074
- <xsl:when test="$month = '06'">June</xsl:when>
1075
- <xsl:when test="$month = '07'">July</xsl:when>
1076
- <xsl:when test="$month = '08'">August</xsl:when>
1077
- <xsl:when test="$month = '09'">September</xsl:when>
1078
- <xsl:when test="$month = '10'">October</xsl:when>
1079
- <xsl:when test="$month = '11'">November</xsl:when>
1080
- <xsl:when test="$month = '12'">December</xsl:when>
1081
- </xsl:choose>
1082
- </xsl:variable>
1083
- <xsl:variable name="result" select="normalize-space(concat($day, ' ', $monthStr, ' ', $year))"/>
1084
- <xsl:value-of select="$result"/>
1085
- </xsl:template>
1086
-
1087
974
  <xsl:variable name="Image-Logo">
1088
975
  <xsl:text>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/GMzLdsAADsgaVRYdFhNTDpjb20uYWRvYmUueG1wAAAAAAA8P3hwYWNrZXQgYmVnaW49Iu+7vyIgaWQ9Ilc1TTBNcENlaGlIenJlU3pOVGN6a2M5ZCI/Pgo8eDp4bXBtZXRhIHhtbG5zOng9ImFkb2JlOm5zOm1ldGEvIiB4OnhtcHRrPSJBZG9iZSBYTVAgQ29yZSA1LjYtYzAxNCA3OS4xNTY3OTcsIDIwMTQvMDgvMjAtMDk6NTM6MDIgICAgICAgICI+CiAgIDxyZGY6UkRGIHhtbG5zOnJkZj0iaHR0cDovL3d3dy53My5vcmcvMTk5OS8wMi8yMi1yZGYtc3ludGF4LW5zIyI+CiAgICAgIDxyZGY6RGVzY3JpcHRpb24gcmRmOmFib3V0PSIiCiAgICAgICAgICAgIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIKICAgICAgICAgICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICAgICAgICAgICB4bWxuczpwaG90b3Nob3A9Imh0dHA6Ly9ucy5hZG9iZS5jb20vcGhvdG9zaG9wLzEuMC8iCiAgICAgICAgICAgIHhtbG5zOnhtcE1NPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvbW0vIgogICAgICAgICAgICB4bWxuczpzdEV2dD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL3NUeXBlL1Jlc291cmNlRXZlbnQjIgogICAgICAgICAgICB4bWxuczp0aWZmPSJodHRwOi8vbnMuYWRvYmUuY29tL3RpZmYvMS4wLyIKICAgICAgICAgICAgeG1sbnM6ZXhpZj0iaHR0cDovL25zLmFkb2JlLmNvbS9leGlmLzEuMC8iPgogICAgICAgICA8eG1wOkNyZWF0b3JUb29sPkFkb2JlIFBob3Rvc2hvcCBDQyAyMDE0IChXaW5kb3dzKTwveG1wOkNyZWF0b3JUb29sPgogICAgICAgICA8eG1wOkNyZWF0ZURhdGU+MjAyMC0wMy0yNVQyMTowNTo0MSswMzowMDwveG1wOkNyZWF0ZURhdGU+CiAgICAgICAgIDx4bXA6TW9kaWZ5RGF0ZT4yMDIwLTAzLTI1VDIxOjA3OjQzKzAzOjAwPC94bXA6TW9kaWZ5RGF0ZT4KICAgICAgICAgPHhtcDpNZXRhZGF0YURhdGU+MjAyMC0wMy0yNVQyMTowNzo0MyswMzowMDwveG1wOk1ldGFkYXRhRGF0ZT4KICAgICAgICAgPGRjOmZvcm1hdD5pbWFnZS9wbmc8L2RjOmZvcm1hdD4KICAgICAgICAgPHBob3Rvc2hvcDpDb2xvck1vZGU+MzwvcGhvdG9zaG9wOkNvbG9yTW9kZT4KICAgICAgICAgPHBob3Rvc2hvcDpJQ0NQcm9maWxlPnNSR0IgSUVDNjE5NjYtMi4xPC9waG90b3Nob3A6SUNDUHJvZmlsZT4KICAgICAgICAgPHhtcE1NOkluc3RhbmNlSUQ+eG1wLmlpZDpjMTQ1NzAyOS1iYTI0LWIwNDYtYmU5NC0wOTY5ZDRkOGRkNTE8L3htcE1NOkluc3RhbmNlSUQ+CiAgICAgICAgIDx4bXBNTTpEb2N1bWVudElEPmFkb2JlOmRvY2lkOnBob3Rvc2hvcDo4NWRmOTdiMi02ZWMzLTExZWEtOGRjNC1kOTAxZWM0NGU2YWM8L3htcE1NOkRvY3VtZW50SUQ+CiAgICAgICAgIDx4bXBNTTpPcmlnaW5hbERvY3VtZW50SUQ+eG1wLmRpZDo3NTMzOTU5ZS1hYzZjLTQwNGYtOWZlNi0wZDg0ZGNkOGRkZGQ8L3htcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD4KICAgICAgICAgPHhtcE1NOkhpc3Rvcnk+CiAgICAgICAgICAgIDxyZGY6U2VxPgogICAgICAgICAgICAgICA8cmRmOmxpIHJkZjpwYXJzZVR5cGU9IlJlc291cmNlIj4KICAgICAgICAgICAgICAgICAgPHN0RXZ0OmFjdGlvbj5jcmVhdGVkPC9zdEV2dDphY3Rpb24+CiAgICAgICAgICAgICAgICAgIDxzdEV2dDppbnN0YW5jZUlEPnhtcC5paWQ6NzUzMzk1OWUtYWM2Yy00MDRmLTlmZTYtMGQ4NGRjZDhkZGRkPC9zdEV2dDppbnN0YW5jZUlEPgogICAgICAgICAgICAgICAgICA8c3RFdnQ6d2hlbj4yMDIwLTAzLTI1VDIxOjA1OjQxKzAzOjAwPC9zdEV2dDp3aGVuPgogICAgICAgICAgICAgICAgICA8c3RFdnQ6c29mdHdhcmVBZ2VudD5BZG9iZSBQaG90b3Nob3AgQ0MgMjAxNCAoV2luZG93cyk8L3N0RXZ0OnNvZnR3YXJlQWdlbnQ+CiAgICAgICAgICAgICAgIDwvcmRmOmxpPgogICAgICAgICAgICAgICA8cmRmOmxpIHJkZjpwYXJzZVR5cGU9IlJlc291cmNlIj4KICAgICAgICAgICAgICAgICAgPHN0RXZ0OmFjdGlvbj5jb252ZXJ0ZWQ8L3N0RXZ0OmFjdGlvbj4KICAgICAgICAgICAgICAgICAgPHN0RXZ0OnBhcmFtZXRlcnM+ZnJvbSBhcHBsaWNhdGlvbi92bmQuYWRvYmUucGhvdG9zaG9wIHRvIGltYWdlL3BuZzwvc3RFdnQ6cGFyYW1ldGVycz4KICAgICAgICAgICAgICAgPC9yZGY6bGk+CiAgICAgICAgICAgICAgIDxyZGY6bGkgcmRmOnBhcnNlVHlwZT0iUmVzb3VyY2UiPgogICAgICAgICAgICAgICAgICA8c3RFdnQ6YWN0aW9uPnNhdmVkPC9zdEV2dDphY3Rpb24+CiAgICAgICAgICAgICAgICAgIDxzdEV2dDppbnN0YW5jZUlEPnhtcC5paWQ6YzE0NTcwMjktYmEyNC1iMDQ2LWJlOTQtMDk2OWQ0ZDhkZDUxPC9zdEV2dDppbnN0YW5jZUlEPgogICAgICAgICAgICAgICAgICA8c3RFdnQ6d2hlbj4yMDIwLTAzLTI1VDIxOjA3OjQzKzAzOjAwPC9zdEV2dDp3aGVuPgogICAgICAgICAgICAgICAgICA8c3RFdnQ6c29mdHdhcmVBZ2VudD5BZG9iZSBQaG90b3Nob3AgQ0MgMjAxNCAoV2luZG93cyk8L3N0RXZ0OnNvZnR3YXJlQWdlbnQ+CiAgICAgICAgICAgICAgICAgIDxzdEV2dDpjaGFuZ2VkPi88L3N0RXZ0OmNoYW5nZWQ+CiAgICAgICAgICAgICAgIDwvcmRmOmxpPgogICAgICAgICAgICA8L3JkZjpTZXE+CiAgICAgICAgIDwveG1wTU06SGlzdG9yeT4KICAgICAgICAgPHRpZmY6T3JpZW50YXRpb24+MTwvdGlmZjpPcmllbnRhdGlvbj4KICAgICAgICAgPHRpZmY6WFJlc29sdXRpb24+MzAwMDAwMC8xMDAwMDwvdGlmZjpYUmVzb2x1dGlvbj4KICAgICAgICAgPHRpZmY6WVJlc29sdXRpb24+MzAwMDAwMC8xMDAwMDwvdGlmZjpZUmVzb2x1dGlvbj4KICAgICAgICAgPHRpZmY6UmVzb2x1dGlvblVuaXQ+MjwvdGlmZjpSZXNvbHV0aW9uVW5pdD4KICAgICAgICAgPGV4aWY6Q29sb3JTcGFjZT4xPC9leGlmOkNvbG9yU3BhY2U+CiAgICAgICAgIDxleGlmOlBpeGVsWERpbWVuc2lvbj4yMjU8L2V4aWY6UGl4ZWxYRGltZW5zaW9uPgogICAgICAgICA8ZXhpZjpQaXhlbFlEaW1lbnNpb24+MTgwPC9leGlmOlBpeGVsWURpbWVuc2lvbj4KICAgICAgPC9yZGY6RGVzY3JpcHRpb24+CiAgIDwvcmRmOlJERj4KPC94OnhtcG1ldGE+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgCjw/eHBhY2tldCBlbmQ9InciPz4xznjNAAAAIGNIUk0AAHolAACAgwAA+f8AAIDpAAB1MAAA6mAAADqYAAAXb5JfxUYAAFWJSURBVHja7F1nWBVHFz50sCCxghUFFOzG2EuIBTti7OKnRI01xhrFEmOMRmOP3aixE1vsGmOvKMaCqNhQUBBBUBAREYTz/di5uHd2Zsu9l2LCeZ55Ermzs7Ozc3ZmznnPe8wg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</xsl:text>
1089
976
  </xsl:variable>
@@ -1092,51 +979,36 @@
1092
979
  <xsl:text>iVBORw0KGgoAAAANSUhEUgAAAJkAAAAmCAYAAADXwDkaAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA+lpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMDE0IDc5LjE1Njc5NywgMjAxNC8wOC8yMC0wOTo1MzowMiAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczpkYz0iaHR0cDovL3B1cmwub3JnL2RjL2VsZW1lbnRzLzEuMS8iIHhtbG5zOnhtcE1NPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvbW0vIiB4bWxuczpzdFJlZj0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL3NUeXBlL1Jlc291cmNlUmVmIyIgeG1wOkNyZWF0b3JUb29sPSJNaWNyb3NvZnTCriBXb3JkIDIwMTYiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6MzM0NUVBQ0U2RUMzMTFFQUIzQjg4RDg3OEE1NEI2QzAiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6MzM0NUVBQ0Y2RUMzMTFFQUIzQjg4RDg3OEE1NEI2QzAiPiA8ZGM6Y3JlYXRvcj4gPHJkZjpTZXE+IDxyZGY6bGk+RGhhbmplZTwvcmRmOmxpPiA8L3JkZjpTZXE+IDwvZGM6Y3JlYXRvcj4gPGRjOnRpdGxlPiA8cmRmOkFsdD4gPHJkZjpsaSB4bWw6bGFuZz0ieC1kZWZhdWx0Ij4xODAxNzYzPC9yZGY6bGk+IDwvcmRmOkFsdD4gPC9kYzp0aXRsZT4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVm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</xsl:text>
1093
980
  </xsl:variable>
1094
981
 
1095
- <xsl:variable name="titles" select="xalan:nodeset($titles_)"/><xsl:variable name="titles_">
1096
-
1097
- <title-annex lang="en">Annex </title-annex>
1098
- <title-annex lang="fr">Annexe </title-annex>
1099
-
1100
- <title-annex lang="zh">Annex </title-annex>
1101
-
1102
-
982
+ <xsl:variable name="pageWidth_">
983
+ 210
984
+ </xsl:variable><xsl:variable name="pageWidth" select="normalize-space($pageWidth_)"/><xsl:variable name="pageHeight_">
985
+ 297
986
+ </xsl:variable><xsl:variable name="pageHeight" select="normalize-space($pageHeight_)"/><xsl:variable name="titles_">
1103
987
 
1104
988
  <title-edition lang="en">
1105
989
 
1106
- <xsl:text>Edition </xsl:text>
1107
-
1108
-
990
+ <xsl:text>Edition </xsl:text>
991
+
1109
992
  </title-edition>
1110
993
 
1111
994
  <title-edition lang="fr">
1112
-
1113
- <xsl:text>Édition </xsl:text>
1114
-
995
+ <xsl:text>Édition </xsl:text>
1115
996
  </title-edition>
1116
997
 
1117
-
998
+ <!-- These titles of Table of contents renders different than determined in localized-strings -->
1118
999
  <title-toc lang="en">
1119
1000
 
1120
1001
 
1121
1002
 
1122
1003
  </title-toc>
1123
1004
  <title-toc lang="fr">
1005
+ <xsl:text>Sommaire</xsl:text>
1006
+ </title-toc>
1007
+ <title-toc lang="zh">
1124
1008
 
1125
-
1126
- </title-toc>
1127
-
1128
- <title-toc lang="zh">Contents</title-toc>
1129
-
1130
-
1131
-
1132
- <title-page lang="en">Page</title-page>
1133
- <title-page lang="fr">Page</title-page>
1134
-
1135
- <title-key lang="en">Key</title-key>
1136
- <title-key lang="fr">Légende</title-key>
1137
-
1138
- <title-where lang="en">where</title-where>
1139
- <title-where lang="fr">où</title-where>
1009
+ <xsl:text>Contents</xsl:text>
1010
+
1011
+ </title-toc>
1140
1012
 
1141
1013
  <title-descriptors lang="en">Descriptors</title-descriptors>
1142
1014
 
@@ -1152,32 +1024,9 @@
1152
1024
  </title-part>
1153
1025
  <title-part lang="zh">第 # 部分:</title-part>
1154
1026
 
1155
- <title-subpart lang="en">
1156
-
1157
- </title-subpart>
1158
- <title-subpart lang="fr">
1159
-
1160
- </title-subpart>
1161
-
1162
- <title-modified lang="en">modified</title-modified>
1163
- <title-modified lang="fr">modifiée</title-modified>
1027
+ <title-subpart lang="en">Sub-part #</title-subpart>
1028
+ <title-subpart lang="fr">Partie de sub #</title-subpart>
1164
1029
 
1165
- <title-modified lang="zh">modified</title-modified>
1166
-
1167
-
1168
-
1169
- <title-source lang="en">
1170
-
1171
- <xsl:text>SOURCE</xsl:text>
1172
-
1173
-
1174
- </title-source>
1175
-
1176
- <title-keywords lang="en">Keywords</title-keywords>
1177
-
1178
- <title-deprecated lang="en">DEPRECATED</title-deprecated>
1179
- <title-deprecated lang="fr">DEPRECATED</title-deprecated>
1180
-
1181
1030
  <title-list-tables lang="en">List of Tables</title-list-tables>
1182
1031
 
1183
1032
  <title-list-figures lang="en">List of Figures</title-list-figures>
@@ -1186,41 +1035,12 @@
1186
1035
 
1187
1036
  <title-list-recommendations lang="en">List of Recommendations</title-list-recommendations>
1188
1037
 
1189
- <title-acknowledgements lang="en">Acknowledgements</title-acknowledgements>
1190
-
1191
- <title-abstract lang="en">Abstract</title-abstract>
1192
-
1193
1038
  <title-summary lang="en">Summary</title-summary>
1194
1039
 
1195
- <title-in lang="en">in </title-in>
1196
-
1197
- <title-partly-supercedes lang="en">Partly Supercedes </title-partly-supercedes>
1198
- <title-partly-supercedes lang="zh">部分代替 </title-partly-supercedes>
1199
-
1200
- <title-completion-date lang="en">Completion date for this manuscript</title-completion-date>
1201
- <title-completion-date lang="zh">本稿完成日期</title-completion-date>
1202
-
1203
- <title-issuance-date lang="en">Issuance Date: #</title-issuance-date>
1204
- <title-issuance-date lang="zh"># 发布</title-issuance-date>
1205
-
1206
- <title-implementation-date lang="en">Implementation Date: #</title-implementation-date>
1207
- <title-implementation-date lang="zh"># 实施</title-implementation-date>
1208
-
1209
- <title-obligation-normative lang="en">normative</title-obligation-normative>
1210
- <title-obligation-normative lang="zh">规范性附录</title-obligation-normative>
1211
-
1212
- <title-caution lang="en">CAUTION</title-caution>
1213
- <title-caution lang="zh">注意</title-caution>
1214
-
1215
- <title-warning lang="en">WARNING</title-warning>
1216
- <title-warning lang="zh">警告</title-warning>
1217
-
1218
- <title-amendment lang="en">AMENDMENT</title-amendment>
1219
-
1220
1040
  <title-continued lang="en">(continued)</title-continued>
1221
1041
  <title-continued lang="fr">(continué)</title-continued>
1222
1042
 
1223
- </xsl:variable><xsl:variable name="bibdata">
1043
+ </xsl:variable><xsl:variable name="titles" select="xalan:nodeset($titles_)"/><xsl:variable name="bibdata">
1224
1044
  <xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'bibdata']"/>
1225
1045
  <xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'localized-strings']"/>
1226
1046
  </xsl:variable><xsl:variable name="tab_zh"> </xsl:variable><xsl:template name="getTitle">
@@ -1249,12 +1069,79 @@
1249
1069
  </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">
1250
1070
 
1251
1071
 
1072
+
1073
+
1074
+
1075
+
1076
+
1077
+
1078
+
1079
+
1080
+
1081
+
1082
+
1083
+
1084
+
1085
+
1086
+ <xsl:attribute name="font-family">Times New Roman, STIX Two Math, Source Han Sans</xsl:attribute>
1087
+ <xsl:attribute name="font-size">10pt</xsl:attribute>
1088
+
1089
+ </xsl:attribute-set><xsl:attribute-set name="copyright-statement-style">
1090
+
1091
+ </xsl:attribute-set><xsl:attribute-set name="copyright-statement-title-style">
1092
+
1093
+
1094
+ </xsl:attribute-set><xsl:attribute-set name="copyright-statement-p-style">
1095
+
1096
+
1097
+
1098
+ </xsl:attribute-set><xsl:attribute-set name="license-statement-style">
1099
+
1100
+
1101
+ </xsl:attribute-set><xsl:attribute-set name="license-statement-title-style">
1102
+ <xsl:attribute name="keep-with-next">always</xsl:attribute>
1103
+
1104
+
1105
+
1106
+
1107
+
1108
+
1109
+ </xsl:attribute-set><xsl:attribute-set name="license-statement-p-style">
1110
+
1111
+
1112
+
1113
+
1114
+ </xsl:attribute-set><xsl:attribute-set name="legal-statement-style">
1115
+
1116
+
1117
+
1118
+ </xsl:attribute-set><xsl:attribute-set name="legal-statement-title-style">
1119
+ <xsl:attribute name="keep-with-next">always</xsl:attribute>
1120
+
1121
+
1122
+
1123
+
1124
+
1125
+ </xsl:attribute-set><xsl:attribute-set name="legal-statement-p-style">
1126
+
1127
+ </xsl:attribute-set><xsl:attribute-set name="feedback-statement-style">
1128
+
1129
+
1130
+ </xsl:attribute-set><xsl:attribute-set name="feedback-statement-title-style">
1131
+ <xsl:attribute name="keep-with-next">always</xsl:attribute>
1132
+
1133
+ </xsl:attribute-set><xsl:attribute-set name="feedback-statement-p-style">
1134
+
1135
+
1252
1136
  </xsl:attribute-set><xsl:attribute-set name="link-style">
1253
1137
 
1254
1138
 
1255
1139
 
1256
1140
 
1257
1141
 
1142
+ </xsl:attribute-set><xsl:attribute-set name="sourcecode-container-style">
1143
+ <xsl:attribute name="margin-left">0mm</xsl:attribute>
1144
+
1258
1145
  </xsl:attribute-set><xsl:attribute-set name="sourcecode-style">
1259
1146
  <xsl:attribute name="white-space">pre</xsl:attribute>
1260
1147
  <xsl:attribute name="wrap-option">wrap</xsl:attribute>
@@ -1264,14 +1151,21 @@
1264
1151
 
1265
1152
 
1266
1153
 
1267
- <xsl:attribute name="font-family">Courier New</xsl:attribute>
1268
- <xsl:attribute name="margin-top">6pt</xsl:attribute>
1269
- <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
1154
+
1155
+
1156
+
1157
+
1270
1158
 
1271
1159
 
1272
1160
 
1273
1161
 
1274
1162
 
1163
+
1164
+
1165
+ <xsl:attribute name="font-family">Courier New</xsl:attribute>
1166
+ <xsl:attribute name="margin-top">6pt</xsl:attribute>
1167
+ <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
1168
+
1275
1169
  </xsl:attribute-set><xsl:attribute-set name="permission-style">
1276
1170
 
1277
1171
  </xsl:attribute-set><xsl:attribute-set name="permission-name-style">
@@ -1320,11 +1214,14 @@
1320
1214
 
1321
1215
 
1322
1216
 
1217
+
1323
1218
  </xsl:attribute-set><xsl:attribute-set name="example-body-style">
1324
1219
 
1325
1220
 
1326
1221
 
1222
+
1327
1223
  </xsl:attribute-set><xsl:attribute-set name="example-name-style">
1224
+ <xsl:attribute name="keep-with-next">always</xsl:attribute>
1328
1225
 
1329
1226
 
1330
1227
 
@@ -1341,7 +1238,6 @@
1341
1238
  <xsl:attribute name="font-size">10pt</xsl:attribute>
1342
1239
  <xsl:attribute name="font-weight">bold</xsl:attribute>
1343
1240
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1344
- <xsl:attribute name="keep-with-next">always</xsl:attribute>
1345
1241
 
1346
1242
 
1347
1243
 
@@ -1359,6 +1255,7 @@
1359
1255
 
1360
1256
 
1361
1257
 
1258
+
1362
1259
  <xsl:attribute name="font-size">11pt</xsl:attribute>
1363
1260
  <xsl:attribute name="margin-top">12pt</xsl:attribute>
1364
1261
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
@@ -1375,128 +1272,141 @@
1375
1272
 
1376
1273
  </xsl:attribute-set><xsl:variable name="table-border_">
1377
1274
 
1378
- </xsl:variable><xsl:variable name="table-border" select="normalize-space($table-border_)"/><xsl:attribute-set name="table-name-style">
1379
- <xsl:attribute name="keep-with-next">always</xsl:attribute>
1380
-
1275
+ </xsl:variable><xsl:variable name="table-border" select="normalize-space($table-border_)"/><xsl:attribute-set name="table-container-style">
1276
+ <xsl:attribute name="margin-left">0mm</xsl:attribute>
1277
+ <xsl:attribute name="margin-right">0mm</xsl:attribute>
1381
1278
 
1382
1279
 
1383
1280
 
1384
1281
 
1385
-
1386
1282
 
1387
1283
 
1388
1284
 
1389
1285
 
1390
- <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
1391
- <xsl:attribute name="font-weight">normal</xsl:attribute>
1392
- <xsl:attribute name="font-style">italic</xsl:attribute>
1393
- <xsl:attribute name="font-size">10pt</xsl:attribute>
1394
- <xsl:attribute name="text-align">left</xsl:attribute>
1395
- <xsl:attribute name="text-indent">0mm</xsl:attribute>
1396
-
1397
1286
 
1398
1287
 
1399
1288
 
1400
1289
 
1401
- </xsl:attribute-set><xsl:attribute-set name="table-footer-cell-style">
1402
1290
 
1403
- </xsl:attribute-set><xsl:attribute-set name="appendix-style">
1404
1291
 
1405
1292
 
1406
1293
 
1407
- </xsl:attribute-set><xsl:attribute-set name="appendix-example-style">
1408
1294
 
1409
1295
 
1410
1296
 
1411
- </xsl:attribute-set><xsl:attribute-set name="xref-style">
1297
+ <xsl:attribute name="margin-bottom">18pt</xsl:attribute>
1298
+ <xsl:attribute name="font-size">8pt</xsl:attribute>
1299
+
1412
1300
 
1413
1301
 
1302
+ </xsl:attribute-set><xsl:attribute-set name="table-style">
1303
+ <xsl:attribute name="table-omit-footer-at-break">true</xsl:attribute>
1304
+ <xsl:attribute name="table-layout">fixed</xsl:attribute>
1305
+ <xsl:attribute name="margin-left">0mm</xsl:attribute>
1306
+ <xsl:attribute name="margin-right">0mm</xsl:attribute>
1414
1307
 
1415
1308
 
1416
1309
 
1417
- </xsl:attribute-set><xsl:attribute-set name="eref-style">
1418
1310
 
1419
1311
 
1420
1312
 
1421
1313
 
1422
1314
 
1423
- <xsl:attribute name="color">blue</xsl:attribute>
1424
1315
 
1425
1316
 
1426
- </xsl:attribute-set><xsl:attribute-set name="note-style">
1427
1317
 
1428
1318
 
1429
1319
 
1430
1320
 
1431
-
1432
1321
 
1433
1322
 
1434
1323
 
1435
1324
 
1436
1325
 
1326
+ <xsl:attribute name="border-top">0.5pt solid black</xsl:attribute>
1437
1327
 
1438
1328
 
1439
-
1440
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1329
+ </xsl:attribute-set><xsl:attribute-set name="table-name-style">
1330
+ <xsl:attribute name="keep-with-next">always</xsl:attribute>
1331
+
1441
1332
 
1442
1333
 
1443
1334
 
1444
1335
 
1445
- </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">
1336
+
1446
1337
 
1447
1338
 
1448
1339
 
1449
1340
 
1341
+ <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
1342
+ <xsl:attribute name="font-weight">normal</xsl:attribute>
1343
+ <xsl:attribute name="font-style">italic</xsl:attribute>
1344
+ <xsl:attribute name="font-size">10pt</xsl:attribute>
1345
+ <xsl:attribute name="text-align">left</xsl:attribute>
1346
+ <xsl:attribute name="text-indent">0mm</xsl:attribute>
1347
+
1450
1348
 
1451
1349
 
1452
1350
 
1453
1351
 
1352
+ </xsl:attribute-set><xsl:attribute-set name="table-row-style">
1353
+ <xsl:attribute name="min-height">4mm</xsl:attribute>
1454
1354
 
1455
1355
 
1456
1356
 
1457
1357
 
1458
- <xsl:attribute name="padding-right">4mm</xsl:attribute>
1358
+ </xsl:attribute-set><xsl:attribute-set name="table-header-row-style" use-attribute-sets="table-row-style">
1359
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
1459
1360
 
1460
1361
 
1461
- </xsl:attribute-set><xsl:attribute-set name="table-note-name-style">
1462
1362
 
1463
1363
 
1464
1364
 
1465
1365
 
1466
- </xsl:attribute-set><xsl:attribute-set name="note-p-style">
1467
1366
 
1367
+
1468
1368
 
1369
+ </xsl:attribute-set><xsl:attribute-set name="table-footer-row-style" use-attribute-sets="table-row-style">
1469
1370
 
1470
-
1471
1371
 
1472
1372
 
1373
+ </xsl:attribute-set><xsl:attribute-set name="table-body-row-style" use-attribute-sets="table-row-style">
1374
+
1375
+ </xsl:attribute-set><xsl:attribute-set name="table-header-cell-style">
1376
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
1377
+ <xsl:attribute name="border">solid black 1pt</xsl:attribute>
1378
+ <xsl:attribute name="padding-left">1mm</xsl:attribute>
1379
+ <xsl:attribute name="display-align">center</xsl:attribute>
1473
1380
 
1474
1381
 
1475
1382
 
1476
1383
 
1477
1384
 
1478
-
1479
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1480
- <xsl:attribute name="text-indent">0</xsl:attribute>
1481
1385
 
1482
1386
 
1483
- </xsl:attribute-set><xsl:attribute-set name="termnote-style">
1484
1387
 
1485
1388
 
1486
1389
 
1487
1390
 
1488
-
1489
- <xsl:attribute name="margin-top">4pt</xsl:attribute>
1490
1391
 
1392
+ <xsl:attribute name="display-align">center</xsl:attribute>
1393
+ <xsl:attribute name="font-style">italic</xsl:attribute>
1394
+ <xsl:attribute name="font-weight">normal</xsl:attribute>
1395
+ <xsl:attribute name="padding-top">2mm</xsl:attribute>
1396
+ <xsl:attribute name="padding-left">2mm</xsl:attribute>
1397
+ <xsl:attribute name="border">solid black 0pt</xsl:attribute>
1398
+ <xsl:attribute name="border-top">solid black 0.2pt</xsl:attribute>
1399
+ <xsl:attribute name="border-bottom">solid black 1.5pt</xsl:attribute>
1400
+ <xsl:attribute name="text-indent">0mm</xsl:attribute>
1491
1401
 
1492
1402
 
1493
- </xsl:attribute-set><xsl:attribute-set name="termnote-name-style">
1403
+ </xsl:attribute-set><xsl:attribute-set name="table-cell-style">
1404
+ <xsl:attribute name="display-align">center</xsl:attribute>
1405
+ <xsl:attribute name="border">solid black 1pt</xsl:attribute>
1406
+ <xsl:attribute name="padding-left">1mm</xsl:attribute>
1494
1407
 
1495
-
1496
1408
 
1497
1409
 
1498
- </xsl:attribute-set><xsl:attribute-set name="quote-style">
1499
- <xsl:attribute name="role">BlockQuote</xsl:attribute>
1500
1410
 
1501
1411
 
1502
1412
 
@@ -1504,29 +1414,37 @@
1504
1414
 
1505
1415
 
1506
1416
 
1507
- </xsl:attribute-set><xsl:attribute-set name="quote-source-style">
1508
1417
 
1509
-
1510
-
1511
- </xsl:attribute-set><xsl:attribute-set name="termsource-style">
1512
1418
 
1419
+ <xsl:attribute name="display-align">before</xsl:attribute>
1420
+ <xsl:attribute name="padding-left">0mm</xsl:attribute>
1421
+ <xsl:attribute name="padding-top">2mm</xsl:attribute>
1422
+ <xsl:attribute name="padding-bottom">1mm</xsl:attribute>
1423
+ <xsl:attribute name="border">solid black 0pt</xsl:attribute>
1424
+ <xsl:attribute name="border-bottom">solid black 1.5pt</xsl:attribute>
1425
+ <xsl:attribute name="text-indent">0mm</xsl:attribute>
1513
1426
 
1514
1427
 
1428
+ </xsl:attribute-set><xsl:attribute-set name="table-footer-cell-style">
1429
+ <xsl:attribute name="border">solid black 1pt</xsl:attribute>
1430
+ <xsl:attribute name="padding-left">1mm</xsl:attribute>
1431
+ <xsl:attribute name="padding-right">1mm</xsl:attribute>
1432
+ <xsl:attribute name="padding-top">1mm</xsl:attribute>
1515
1433
 
1516
1434
 
1517
1435
 
1518
1436
 
1519
- </xsl:attribute-set><xsl:attribute-set name="origin-style">
1520
1437
 
1521
1438
 
1522
1439
 
1440
+
1523
1441
 
1524
- </xsl:attribute-set><xsl:attribute-set name="term-style">
1525
1442
 
1526
- </xsl:attribute-set><xsl:attribute-set name="figure-name-style">
1527
1443
 
1444
+ </xsl:attribute-set><xsl:attribute-set name="table-note-style">
1445
+ <xsl:attribute name="font-size">10pt</xsl:attribute>
1446
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1528
1447
 
1529
-
1530
1448
 
1531
1449
 
1532
1450
 
@@ -1534,35 +1452,233 @@
1534
1452
 
1535
1453
 
1536
1454
 
1455
+ </xsl:attribute-set><xsl:attribute-set name="table-fn-style">
1456
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1537
1457
 
1538
1458
 
1539
1459
 
1540
1460
 
1541
1461
 
1542
-
1543
1462
 
1544
- <xsl:attribute name="text-align">center</xsl:attribute>
1545
- <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
1546
- <xsl:attribute name="keep-with-previous">always</xsl:attribute>
1463
+ </xsl:attribute-set><xsl:attribute-set name="table-fn-number-style">
1464
+ <xsl:attribute name="font-size">80%</xsl:attribute>
1465
+ <xsl:attribute name="padding-right">5mm</xsl:attribute>
1547
1466
 
1548
1467
 
1549
1468
 
1550
-
1551
- </xsl:attribute-set><xsl:attribute-set name="formula-style">
1552
1469
 
1553
- </xsl:attribute-set><xsl:attribute-set name="image-style">
1554
- <xsl:attribute name="text-align">center</xsl:attribute>
1555
1470
 
1556
1471
 
1557
1472
 
1558
1473
 
1559
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1560
- <xsl:attribute name="keep-with-next">always</xsl:attribute>
1561
- <xsl:attribute name="border">2pt solid black</xsl:attribute>
1562
1474
 
1563
1475
 
1564
1476
 
1565
- </xsl:attribute-set><xsl:attribute-set name="figure-pseudocode-p-style">
1477
+
1478
+ <xsl:attribute name="vertical-align">super</xsl:attribute>
1479
+
1480
+ </xsl:attribute-set><xsl:attribute-set name="fn-container-body-style">
1481
+ <xsl:attribute name="text-indent">0</xsl:attribute>
1482
+ <xsl:attribute name="start-indent">0</xsl:attribute>
1483
+
1484
+
1485
+ <xsl:attribute name="margin-left">-8mm</xsl:attribute>
1486
+
1487
+ </xsl:attribute-set><xsl:attribute-set name="table-fn-body-style">
1488
+
1489
+ </xsl:attribute-set><xsl:attribute-set name="figure-fn-number-style">
1490
+ <xsl:attribute name="font-size">80%</xsl:attribute>
1491
+ <xsl:attribute name="padding-right">5mm</xsl:attribute>
1492
+ <xsl:attribute name="vertical-align">super</xsl:attribute>
1493
+
1494
+ </xsl:attribute-set><xsl:attribute-set name="figure-fn-body-style">
1495
+ <xsl:attribute name="text-align">justify</xsl:attribute>
1496
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1497
+
1498
+ </xsl:attribute-set><xsl:attribute-set name="dt-row-style">
1499
+
1500
+
1501
+ </xsl:attribute-set><xsl:attribute-set name="dt-style">
1502
+ <xsl:attribute name="margin-top">6pt</xsl:attribute>
1503
+
1504
+
1505
+
1506
+
1507
+
1508
+
1509
+
1510
+
1511
+
1512
+
1513
+ </xsl:attribute-set><xsl:attribute-set name="appendix-style">
1514
+
1515
+
1516
+
1517
+ </xsl:attribute-set><xsl:attribute-set name="appendix-example-style">
1518
+
1519
+
1520
+
1521
+ </xsl:attribute-set><xsl:attribute-set name="xref-style">
1522
+
1523
+
1524
+
1525
+
1526
+
1527
+ </xsl:attribute-set><xsl:attribute-set name="eref-style">
1528
+
1529
+
1530
+
1531
+
1532
+
1533
+ <xsl:attribute name="color">blue</xsl:attribute>
1534
+
1535
+
1536
+ </xsl:attribute-set><xsl:attribute-set name="note-style">
1537
+
1538
+
1539
+
1540
+
1541
+
1542
+
1543
+
1544
+
1545
+
1546
+
1547
+
1548
+
1549
+
1550
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1551
+
1552
+
1553
+
1554
+
1555
+ </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">
1556
+
1557
+
1558
+
1559
+
1560
+
1561
+
1562
+
1563
+
1564
+
1565
+
1566
+
1567
+
1568
+ <xsl:attribute name="padding-right">4mm</xsl:attribute>
1569
+
1570
+
1571
+ </xsl:attribute-set><xsl:attribute-set name="table-note-name-style">
1572
+ <xsl:attribute name="padding-right">2mm</xsl:attribute>
1573
+
1574
+
1575
+
1576
+
1577
+ </xsl:attribute-set><xsl:attribute-set name="note-p-style">
1578
+
1579
+
1580
+
1581
+
1582
+
1583
+
1584
+
1585
+
1586
+
1587
+
1588
+
1589
+
1590
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1591
+ <xsl:attribute name="text-indent">0</xsl:attribute>
1592
+
1593
+
1594
+ </xsl:attribute-set><xsl:attribute-set name="termnote-style">
1595
+
1596
+
1597
+
1598
+
1599
+
1600
+ <xsl:attribute name="margin-top">4pt</xsl:attribute>
1601
+
1602
+
1603
+
1604
+ </xsl:attribute-set><xsl:attribute-set name="termnote-name-style">
1605
+
1606
+
1607
+
1608
+
1609
+ </xsl:attribute-set><xsl:attribute-set name="quote-style">
1610
+ <xsl:attribute name="role">BlockQuote</xsl:attribute>
1611
+
1612
+
1613
+
1614
+
1615
+
1616
+
1617
+
1618
+ </xsl:attribute-set><xsl:attribute-set name="quote-source-style">
1619
+
1620
+
1621
+
1622
+ </xsl:attribute-set><xsl:attribute-set name="termsource-style">
1623
+
1624
+
1625
+
1626
+
1627
+
1628
+
1629
+
1630
+ </xsl:attribute-set><xsl:attribute-set name="termsource-text-style">
1631
+
1632
+
1633
+ </xsl:attribute-set><xsl:attribute-set name="origin-style">
1634
+
1635
+
1636
+
1637
+
1638
+ </xsl:attribute-set><xsl:attribute-set name="term-style">
1639
+
1640
+ </xsl:attribute-set><xsl:attribute-set name="figure-style">
1641
+
1642
+ </xsl:attribute-set><xsl:attribute-set name="figure-name-style">
1643
+
1644
+
1645
+
1646
+
1647
+
1648
+
1649
+
1650
+
1651
+
1652
+
1653
+
1654
+
1655
+
1656
+
1657
+
1658
+
1659
+
1660
+ <xsl:attribute name="text-align">center</xsl:attribute>
1661
+ <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
1662
+ <xsl:attribute name="keep-with-previous">always</xsl:attribute>
1663
+
1664
+
1665
+
1666
+
1667
+ </xsl:attribute-set><xsl:attribute-set name="formula-style">
1668
+
1669
+ </xsl:attribute-set><xsl:attribute-set name="image-style">
1670
+ <xsl:attribute name="text-align">center</xsl:attribute>
1671
+
1672
+
1673
+
1674
+
1675
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1676
+ <xsl:attribute name="keep-with-next">always</xsl:attribute>
1677
+ <xsl:attribute name="border">2pt solid black</xsl:attribute>
1678
+
1679
+
1680
+
1681
+ </xsl:attribute-set><xsl:attribute-set name="figure-pseudocode-p-style">
1566
1682
 
1567
1683
  </xsl:attribute-set><xsl:attribute-set name="image-graphic-style">
1568
1684
 
@@ -1622,6 +1738,17 @@
1622
1738
 
1623
1739
  </xsl:attribute-set><xsl:attribute-set name="toc-style">
1624
1740
  <xsl:attribute name="line-height">135%</xsl:attribute>
1741
+ </xsl:attribute-set><xsl:attribute-set name="fn-reference-style">
1742
+ <xsl:attribute name="font-size">80%</xsl:attribute>
1743
+ <xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
1744
+
1745
+
1746
+
1747
+
1748
+
1749
+
1750
+
1751
+
1625
1752
  </xsl:attribute-set><xsl:attribute-set name="fn-style">
1626
1753
  <xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
1627
1754
  </xsl:attribute-set><xsl:attribute-set name="fn-num-style">
@@ -1696,30 +1823,206 @@
1696
1823
  <xsl:attribute name="padding-right">8mm</xsl:attribute>
1697
1824
 
1698
1825
 
1699
- </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:template name="OLD_processPrefaceSectionsDefault_Contents">
1700
- <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='abstract']" mode="contents"/>
1701
- <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='foreword']" mode="contents"/>
1702
- <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='introduction']" mode="contents"/>
1703
- <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name() != 'abstract' and local-name() != 'foreword' and local-name() != 'introduction' and local-name() != 'acknowledgements']" mode="contents"/>
1704
- <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='acknowledgements']" mode="contents"/>
1705
- </xsl:template><xsl:template name="processPrefaceSectionsDefault_Contents">
1826
+ </xsl:attribute-set><xsl:attribute-set name="admonition-style">
1827
+
1828
+
1829
+
1830
+
1831
+
1832
+
1833
+
1834
+
1835
+
1836
+
1837
+
1838
+
1839
+
1840
+ <xsl:attribute name="border">0.25pt solid black</xsl:attribute>
1841
+ <xsl:attribute name="margin-left">-3mm</xsl:attribute>
1842
+ <xsl:attribute name="margin-right">-3mm</xsl:attribute>
1843
+ <xsl:attribute name="padding-top">4mm</xsl:attribute>
1844
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1845
+
1846
+
1847
+ </xsl:attribute-set><xsl:attribute-set name="admonition-container-style">
1848
+
1849
+
1850
+
1851
+
1852
+
1853
+
1854
+
1855
+
1856
+
1857
+ <xsl:attribute name="margin-left">2mm</xsl:attribute>
1858
+ <xsl:attribute name="margin-right">2mm</xsl:attribute>
1859
+
1860
+
1861
+ </xsl:attribute-set><xsl:attribute-set name="admonition-name-style">
1862
+ <xsl:attribute name="keep-with-next">always</xsl:attribute>
1863
+
1864
+
1865
+
1866
+
1867
+
1868
+
1869
+
1870
+
1871
+
1872
+
1873
+
1874
+
1875
+ <xsl:attribute name="text-align">center</xsl:attribute>
1876
+ <xsl:attribute name="font-style">italic</xsl:attribute>
1877
+ <xsl:attribute name="keep-with-next">always</xsl:attribute>
1878
+ <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
1879
+
1880
+
1881
+ </xsl:attribute-set><xsl:attribute-set name="admonition-p-style">
1882
+
1883
+
1884
+
1885
+
1886
+
1887
+
1888
+
1889
+
1890
+
1891
+
1892
+ <xsl:attribute name="text-align">justify</xsl:attribute>
1893
+ <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
1894
+ <xsl:attribute name="line-height">122%</xsl:attribute>
1895
+
1896
+
1897
+ </xsl:attribute-set><xsl:attribute-set name="bibitem-normative-style">
1898
+
1899
+
1900
+
1901
+
1902
+
1903
+
1904
+
1905
+
1906
+
1907
+
1908
+
1909
+
1910
+
1911
+
1912
+
1913
+
1914
+
1915
+
1916
+ <xsl:attribute name="margin-top">6pt</xsl:attribute>
1917
+ <xsl:attribute name="margin-left">14mm</xsl:attribute>
1918
+ <xsl:attribute name="text-indent">-14mm</xsl:attribute>
1919
+
1920
+ </xsl:attribute-set><xsl:attribute-set name="bibitem-normative-list-style">
1921
+ <xsl:attribute name="provisional-distance-between-starts">12mm</xsl:attribute>
1922
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1923
+
1924
+
1925
+
1926
+
1927
+
1928
+
1929
+
1930
+
1931
+
1932
+
1933
+
1934
+ </xsl:attribute-set><xsl:attribute-set name="bibitem-non-normative-style">
1935
+
1936
+
1937
+
1938
+
1939
+ </xsl:attribute-set><xsl:attribute-set name="bibitem-non-normative-list-style">
1940
+ <xsl:attribute name="provisional-distance-between-starts">12mm</xsl:attribute>
1941
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1942
+
1943
+
1944
+
1945
+
1946
+
1947
+
1948
+
1949
+
1950
+
1951
+
1952
+
1953
+ </xsl:attribute-set><xsl:attribute-set name="bibitem-normative-list-body-style">
1954
+
1955
+
1956
+ </xsl:attribute-set><xsl:attribute-set name="bibitem-non-normative-list-body-style">
1957
+
1958
+
1959
+
1960
+ </xsl:attribute-set><xsl:attribute-set name="bibitem-note-fn-style">
1961
+ <xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
1962
+ <xsl:attribute name="font-size">65%</xsl:attribute>
1963
+
1964
+
1965
+
1966
+
1967
+
1968
+
1969
+
1970
+
1971
+
1972
+
1973
+
1974
+
1975
+
1976
+
1977
+
1978
+
1979
+ <xsl:attribute name="vertical-align">super</xsl:attribute>
1980
+
1981
+ </xsl:attribute-set><xsl:attribute-set name="bibitem-note-fn-number-style">
1982
+ <xsl:attribute name="keep-with-next.within-line">always</xsl:attribute>
1983
+
1984
+
1985
+
1986
+
1987
+
1988
+
1989
+
1990
+
1991
+
1992
+
1993
+
1994
+
1995
+
1996
+
1997
+
1998
+
1999
+ <xsl:attribute name="font-size">60%</xsl:attribute>
2000
+ <xsl:attribute name="vertical-align">super</xsl:attribute>
2001
+
2002
+ </xsl:attribute-set><xsl:attribute-set name="bibitem-note-fn-body-style">
2003
+ <xsl:attribute name="font-size">10pt</xsl:attribute>
2004
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
2005
+ <xsl:attribute name="start-indent">0pt</xsl:attribute>
2006
+
2007
+
2008
+
2009
+
2010
+
2011
+
2012
+
2013
+
2014
+
2015
+
2016
+
2017
+ </xsl:attribute-set><xsl:attribute-set name="references-non-normative-style">
2018
+
2019
+
2020
+
2021
+ </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">
1706
2022
  <xsl:for-each select="/*/*[local-name()='preface']/*">
1707
2023
  <xsl:sort select="@displayorder" data-type="number"/>
1708
2024
  <xsl:apply-templates select="." mode="contents"/>
1709
2025
  </xsl:for-each>
1710
- </xsl:template><xsl:template name="OLD_processMainSectionsDefault_Contents">
1711
- <xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name()='clause'][@type='scope']" mode="contents"/>
1712
-
1713
- <!-- Normative references -->
1714
- <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"/>
1715
- <!-- Terms and definitions -->
1716
- <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"/>
1717
- <!-- Another main sections -->
1718
- <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"/>
1719
- <xsl:apply-templates select="/*/*[local-name()='annex']" mode="contents"/>
1720
- <!-- Bibliography -->
1721
- <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"/>
1722
-
1723
2026
  </xsl:template><xsl:template name="processMainSectionsDefault_Contents">
1724
2027
 
1725
2028
  <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']]">
@@ -1736,29 +2039,11 @@
1736
2039
  <xsl:sort select="@displayorder" data-type="number"/>
1737
2040
  <xsl:apply-templates select="." mode="contents"/>
1738
2041
  </xsl:for-each>
1739
- </xsl:template><xsl:template name="OLD_processPrefaceSectionsDefault">
1740
- <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='abstract']"/>
1741
- <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='foreword']"/>
1742
- <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='introduction']"/>
1743
- <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name() != 'abstract' and local-name() != 'foreword' and local-name() != 'introduction' and local-name() != 'acknowledgements']"/>
1744
- <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='acknowledgements']"/>
1745
2042
  </xsl:template><xsl:template name="processPrefaceSectionsDefault">
1746
2043
  <xsl:for-each select="/*/*[local-name()='preface']/*">
1747
2044
  <xsl:sort select="@displayorder" data-type="number"/>
1748
2045
  <xsl:apply-templates select="."/>
1749
2046
  </xsl:for-each>
1750
- </xsl:template><xsl:template name="OLD_processMainSectionsDefault">
1751
- <xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name()='clause'][@type='scope']"/>
1752
-
1753
- <!-- Normative references -->
1754
- <xsl:apply-templates select="/*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']"/>
1755
- <!-- Terms and definitions -->
1756
- <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']]"/>
1757
- <!-- Another main sections -->
1758
- <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'])]"/>
1759
- <xsl:apply-templates select="/*/*[local-name()='annex']"/>
1760
- <!-- Bibliography -->
1761
- <xsl:apply-templates select="/*/*[local-name()='bibliography']/*[local-name()='references'][not(@normative='true')]"/>
1762
2047
  </xsl:template><xsl:template name="processMainSectionsDefault">
1763
2048
  <xsl:for-each select="/*/*[local-name()='sections']/* | /*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']">
1764
2049
  <xsl:sort select="@displayorder" data-type="number"/>
@@ -1779,6 +2064,64 @@
1779
2064
  <xsl:value-of select="."/>
1780
2065
  </xsl:template><xsl:template match="*[local-name()='br']">
1781
2066
  <xsl:value-of select="$linebreak"/>
2067
+ </xsl:template><xsl:template match="*[local-name()='copyright-statement']">
2068
+ <fo:block xsl:use-attribute-sets="copyright-statement-style">
2069
+ <xsl:apply-templates/>
2070
+ </fo:block>
2071
+ </xsl:template><xsl:template match="*[local-name()='copyright-statement']//*[local-name()='title']">
2072
+
2073
+ <!-- process in the template 'title' -->
2074
+ <xsl:call-template name="title"/>
2075
+
2076
+ </xsl:template><xsl:template match="*[local-name()='copyright-statement']//*[local-name()='p']">
2077
+
2078
+
2079
+ <!-- process in the template 'paragraph' -->
2080
+ <xsl:call-template name="paragraph"/>
2081
+
2082
+ </xsl:template><xsl:template match="*[local-name()='license-statement']">
2083
+ <fo:block xsl:use-attribute-sets="license-statement-style">
2084
+ <xsl:apply-templates/>
2085
+ </fo:block>
2086
+ </xsl:template><xsl:template match="*[local-name()='license-statement']//*[local-name()='title']">
2087
+
2088
+ <!-- process in the template 'title' -->
2089
+ <xsl:call-template name="title"/>
2090
+
2091
+ </xsl:template><xsl:template match="*[local-name()='license-statement']//*[local-name()='p']">
2092
+
2093
+ <!-- process in the template 'paragraph' -->
2094
+ <xsl:call-template name="paragraph"/>
2095
+
2096
+ </xsl:template><xsl:template match="*[local-name()='legal-statement']">
2097
+ <fo:block xsl:use-attribute-sets="legal-statement-style">
2098
+ <xsl:apply-templates/>
2099
+ </fo:block>
2100
+ </xsl:template><xsl:template match="*[local-name()='legal-statement']//*[local-name()='title']">
2101
+
2102
+ <!-- process in the template 'title' -->
2103
+ <xsl:call-template name="title"/>
2104
+
2105
+
2106
+ </xsl:template><xsl:template match="*[local-name()='legal-statement']//*[local-name()='p']">
2107
+
2108
+ <!-- process in the template 'paragraph' -->
2109
+ <xsl:call-template name="paragraph"/>
2110
+
2111
+ </xsl:template><xsl:template match="*[local-name()='feedback-statement']">
2112
+ <fo:block xsl:use-attribute-sets="feedback-statement-style">
2113
+ <xsl:apply-templates/>
2114
+ </fo:block>
2115
+ </xsl:template><xsl:template match="*[local-name()='feedback-statement']//*[local-name()='title']">
2116
+
2117
+ <!-- process in the template 'title' -->
2118
+ <xsl:call-template name="title"/>
2119
+
2120
+ </xsl:template><xsl:template match="*[local-name()='feedback-statement']//*[local-name()='p']">
2121
+
2122
+ <!-- process in the template 'paragraph' -->
2123
+ <xsl:call-template name="paragraph"/>
2124
+
1782
2125
  </xsl:template><xsl:template match="*[local-name()='td']//text() | *[local-name()='th']//text() | *[local-name()='dt']//text() | *[local-name()='dd']//text()" priority="1">
1783
2126
  <!-- <xsl:call-template name="add-zero-spaces"/> -->
1784
2127
  <xsl:call-template name="add-zero-spaces-java"/>
@@ -1795,43 +2138,19 @@
1795
2138
  <xsl:call-template name="getSimpleTable"/>
1796
2139
  </xsl:variable>
1797
2140
 
1798
- <!-- <xsl:if test="$namespace = 'bipm'">
1799
- <fo:block>&#xA0;</fo:block>
1800
- </xsl:if> -->
1801
-
1802
2141
 
1803
2142
  <!-- Display table's name before table as standalone block -->
1804
2143
  <!-- $namespace = 'iso' or -->
1805
2144
 
1806
- <xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
1807
-
1808
-
1809
-
1810
-
2145
+ <xsl:apply-templates select="*[local-name()='name']"/> <!-- table's title rendered before table -->
2146
+
1811
2147
 
1812
- <xsl:call-template name="fn_name_display"/>
1813
2148
 
2149
+ <xsl:call-template name="table_name_fn_display"/>
1814
2150
 
1815
2151
 
1816
2152
  <xsl:variable name="cols-count" select="count(xalan:nodeset($simple-table)/*/tr[1]/td)"/>
1817
2153
 
1818
- <!-- <xsl:variable name="cols-count">
1819
- <xsl:choose>
1820
- <xsl:when test="*[local-name()='thead']">
1821
- <xsl:call-template name="calculate-columns-numbers">
1822
- <xsl:with-param name="table-row" select="*[local-name()='thead']/*[local-name()='tr'][1]"/>
1823
- </xsl:call-template>
1824
- </xsl:when>
1825
- <xsl:otherwise>
1826
- <xsl:call-template name="calculate-columns-numbers">
1827
- <xsl:with-param name="table-row" select="*[local-name()='tbody']/*[local-name()='tr'][1]"/>
1828
- </xsl:call-template>
1829
- </xsl:otherwise>
1830
- </xsl:choose>
1831
- </xsl:variable> -->
1832
- <!-- cols-count=<xsl:copy-of select="$cols-count"/> -->
1833
- <!-- cols-count2=<xsl:copy-of select="$cols-count2"/> -->
1834
-
1835
2154
  <xsl:variable name="colwidths">
1836
2155
  <xsl:if test="not(*[local-name()='colgroup']/*[local-name()='col'])">
1837
2156
  <xsl:call-template name="calculate-column-widths">
@@ -1842,17 +2161,8 @@
1842
2161
  </xsl:variable>
1843
2162
  <!-- colwidths=<xsl:copy-of select="$colwidths"/> -->
1844
2163
 
1845
- <!-- <xsl:variable name="colwidths2">
1846
- <xsl:call-template name="calculate-column-widths">
1847
- <xsl:with-param name="cols-count" select="$cols-count"/>
1848
- </xsl:call-template>
1849
- </xsl:variable> -->
1850
-
1851
- <!-- cols-count=<xsl:copy-of select="$cols-count"/>
1852
- colwidthsNew=<xsl:copy-of select="$colwidths"/>
1853
- colwidthsOld=<xsl:copy-of select="$colwidths2"/>z -->
1854
2164
 
1855
- <xsl:variable name="margin-left">
2165
+ <xsl:variable name="margin-side">
1856
2166
  <xsl:choose>
1857
2167
  <xsl:when test="sum(xalan:nodeset($colwidths)//column) &gt; 75">15</xsl:when>
1858
2168
  <xsl:otherwise>0</xsl:otherwise>
@@ -1860,73 +2170,72 @@
1860
2170
  </xsl:variable>
1861
2171
 
1862
2172
 
1863
- <fo:block-container margin-left="-{$margin-left}mm" margin-right="-{$margin-left}mm">
1864
-
1865
-
1866
-
1867
-
1868
-
1869
-
1870
- <xsl:attribute name="margin-bottom">18pt</xsl:attribute>
1871
- <xsl:attribute name="font-size">8pt</xsl:attribute>
1872
-
2173
+ <fo:block-container xsl:use-attribute-sets="table-container-style">
2174
+
1873
2175
 
2176
+ <xsl:attribute name="margin-left"><xsl:value-of select="-$margin-side"/>mm</xsl:attribute>
2177
+ <xsl:attribute name="margin-right"><xsl:value-of select="-$margin-side"/>mm</xsl:attribute>
1874
2178
 
1875
-
2179
+
1876
2180
 
2181
+
1877
2182
 
2183
+
1878
2184
 
1879
2185
 
1880
2186
 
2187
+
1881
2188
 
1882
2189
 
1883
2190
 
1884
2191
 
1885
2192
 
2193
+ <!-- end table block-container attributes -->
1886
2194
 
1887
2195
  <!-- display table's name before table for PAS inside block-container (2-columnn layout) -->
1888
2196
 
1889
2197
 
2198
+ <xsl:variable name="table_width_default">100%</xsl:variable>
1890
2199
  <xsl:variable name="table_width">
1891
2200
  <!-- for centered table always 100% (@width will be set for middle/second cell of outer table) -->
1892
2201
 
1893
-
1894
-
1895
- <xsl:choose>
1896
- <xsl:when test="@width"><xsl:value-of select="@width"/></xsl:when>
1897
- <xsl:otherwise>100%</xsl:otherwise>
1898
- </xsl:choose>
1899
-
2202
+ <xsl:choose>
2203
+ <xsl:when test="@width"><xsl:value-of select="@width"/></xsl:when>
2204
+ <xsl:otherwise><xsl:value-of select="$table_width_default"/></xsl:otherwise>
2205
+ </xsl:choose>
2206
+
1900
2207
  </xsl:variable>
1901
2208
 
2209
+
1902
2210
  <xsl:variable name="table_attributes">
1903
- <attribute name="table-layout">fixed</attribute>
1904
- <attribute name="width"><xsl:value-of select="normalize-space($table_width)"/></attribute>
1905
- <attribute name="margin-left"><xsl:value-of select="$margin-left"/>mm</attribute>
1906
- <attribute name="margin-right"><xsl:value-of select="$margin-left"/>mm</attribute>
1907
-
1908
-
1909
-
1910
-
1911
-
1912
-
1913
-
1914
-
1915
-
1916
-
1917
- <attribute name="border-top">0.5pt solid black</attribute>
1918
-
1919
-
1920
-
1921
-
1922
-
2211
+
2212
+ <xsl:element name="table_attributes" use-attribute-sets="table-style">
2213
+ <xsl:attribute name="width"><xsl:value-of select="normalize-space($table_width)"/></xsl:attribute>
2214
+
2215
+
2216
+ <xsl:attribute name="margin-left"><xsl:value-of select="$margin-side"/>mm</xsl:attribute>
2217
+ <xsl:attribute name="margin-right"><xsl:value-of select="$margin-side"/>mm</xsl:attribute>
2218
+
2219
+
2220
+
2221
+
2222
+
2223
+
2224
+
2225
+
2226
+
2227
+
2228
+
2229
+
2230
+
2231
+ </xsl:element>
1923
2232
  </xsl:variable>
1924
2233
 
1925
2234
 
1926
- <fo:table id="{@id}" table-omit-footer-at-break="true">
2235
+ <fo:table id="{@id}">
1927
2236
 
1928
- <xsl:for-each select="xalan:nodeset($table_attributes)/attribute">
1929
- <xsl:attribute name="{@name}">
2237
+ <xsl:for-each select="xalan:nodeset($table_attributes)/table_attributes/@*">
2238
+ <xsl:attribute name="{local-name()}">
1930
2239
  <xsl:value-of select="."/>
1931
2240
  </xsl:attribute>
1932
2241
  </xsl:for-each>
@@ -1937,7 +2246,6 @@
1937
2246
  </xsl:if>
1938
2247
 
1939
2248
 
1940
-
1941
2249
  <xsl:choose>
1942
2250
  <xsl:when test="*[local-name()='colgroup']/*[local-name()='col']">
1943
2251
  <xsl:for-each select="*[local-name()='colgroup']/*[local-name()='col']">
@@ -1963,7 +2271,7 @@
1963
2271
  <xsl:apply-templates select="*[local-name()='thead']" mode="process_tbody"/>
1964
2272
  </xsl:when>
1965
2273
  <xsl:otherwise>
1966
- <xsl:apply-templates/>
2274
+ <xsl:apply-templates select="node()[not(local-name() = 'name') and not(local-name() = 'note') and not(local-name() = 'thead') and not(local-name() = 'tfoot')]"/> <!-- process all table' elements, except name, header, footer and note that renders separaterely -->
1967
2275
  </xsl:otherwise>
1968
2276
  </xsl:choose>
1969
2277
 
@@ -1978,25 +2286,6 @@
1978
2286
  </xsl:call-template>
1979
2287
  </xsl:for-each>
1980
2288
 
1981
- <!-- insert footer as table -->
1982
- <!-- <fo:table>
1983
- <xsl:for-each select="xalan::nodeset($table_attributes)/attribute">
1984
- <xsl:attribute name="{@name}">
1985
- <xsl:value-of select="."/>
1986
- </xsl:attribute>
1987
- </xsl:for-each>
1988
-
1989
- <xsl:for-each select="xalan:nodeset($colwidths)//column">
1990
- <xsl:choose>
1991
- <xsl:when test=". = 1 or . = 0">
1992
- <fo:table-column column-width="proportional-column-width(2)"/>
1993
- </xsl:when>
1994
- <xsl:otherwise>
1995
- <fo:table-column column-width="proportional-column-width({.})"/>
1996
- </xsl:otherwise>
1997
- </xsl:choose>
1998
- </xsl:for-each>
1999
- </fo:table>-->
2000
2289
 
2001
2290
 
2002
2291
 
@@ -2054,18 +2343,17 @@
2054
2343
  </xsl:otherwise>
2055
2344
  </xsl:choose>
2056
2345
 
2057
- </xsl:template><xsl:template match="*[local-name()='table']/*[local-name() = 'name']"/><xsl:template match="*[local-name()='table']/*[local-name() = 'name']" mode="presentation">
2346
+ </xsl:template><xsl:template match="*[local-name()='table']/*[local-name() = 'name']">
2058
2347
  <xsl:param name="continued"/>
2059
2348
  <xsl:if test="normalize-space() != ''">
2060
2349
  <fo:block xsl:use-attribute-sets="table-name-style">
2061
-
2350
+
2062
2351
 
2063
2352
 
2064
2353
 
2065
2354
 
2066
2355
  <xsl:choose>
2067
2356
  <xsl:when test="$continued = 'true'">
2068
- <!-- <xsl:if test="$namespace = 'bsi'"></xsl:if> -->
2069
2357
 
2070
2358
  </xsl:when>
2071
2359
  <xsl:otherwise>
@@ -2128,13 +2416,6 @@
2128
2416
  <xsl:for-each select="xalan:nodeset($table)/*/tr">
2129
2417
  <xsl:variable name="td_text">
2130
2418
  <xsl:apply-templates select="td[$curr-col]" mode="td_text"/>
2131
-
2132
- <!-- <xsl:if test="$namespace = 'bipm'">
2133
- <xsl:for-each select="*[local-name()='td'][$curr-col]//*[local-name()='math']">
2134
- <word><xsl:value-of select="normalize-space(.)"/></word>
2135
- </xsl:for-each>
2136
- </xsl:if> -->
2137
-
2138
2419
  </xsl:variable>
2139
2420
  <xsl:variable name="words">
2140
2421
  <xsl:variable name="string_with_added_zerospaces">
@@ -2171,7 +2452,6 @@
2171
2452
  </xsl:otherwise>
2172
2453
  </xsl:choose>
2173
2454
  </xsl:variable>
2174
-
2175
2455
 
2176
2456
  <column>
2177
2457
  <xsl:for-each select="xalan:nodeset($widths)//width">
@@ -2205,9 +2485,8 @@
2205
2485
 
2206
2486
  <xsl:variable name="math_text" select="normalize-space(xalan:nodeset($mathml))"/>
2207
2487
  <xsl:value-of select="translate($math_text, ' ', '#')"/><!-- mathml images as one 'word' without spaces -->
2208
- </xsl:template><xsl:template match="*[local-name()='table2']"/><xsl:template match="*[local-name()='thead']"/><xsl:template match="*[local-name()='thead']" mode="process">
2488
+ </xsl:template><xsl:template match="*[local-name()='thead']">
2209
2489
  <xsl:param name="cols-count"/>
2210
- <!-- font-weight="bold" -->
2211
2490
  <fo:table-header>
2212
2491
 
2213
2492
 
@@ -2219,85 +2498,26 @@
2219
2498
  <fo:table-row>
2220
2499
  <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">
2221
2500
 
2222
- <xsl:apply-templates select="ancestor::*[local-name()='table']/*[local-name()='name']" mode="presentation">
2501
+ <xsl:apply-templates select="ancestor::*[local-name()='table']/*[local-name()='name']">
2223
2502
  <xsl:with-param name="continued">true</xsl:with-param>
2224
2503
  </xsl:apply-templates>
2225
2504
 
2226
2505
 
2227
2506
 
2228
-
2229
2507
  </fo:table-cell>
2230
2508
  </fo:table-row>
2231
2509
  </xsl:template><xsl:template match="*[local-name()='thead']" mode="process_tbody">
2232
2510
  <fo:table-body>
2233
2511
  <xsl:apply-templates/>
2234
2512
  </fo:table-body>
2235
- </xsl:template><xsl:template match="*[local-name()='tfoot']"/><xsl:template match="*[local-name()='tfoot']" mode="process">
2513
+ </xsl:template><xsl:template match="*[local-name()='tfoot']">
2236
2514
  <xsl:apply-templates/>
2237
2515
  </xsl:template><xsl:template name="insertTableFooter">
2238
2516
  <xsl:param name="cols-count"/>
2239
2517
  <xsl:if test="../*[local-name()='tfoot']">
2240
2518
  <fo:table-footer>
2241
- <xsl:apply-templates select="../*[local-name()='tfoot']" mode="process"/>
2242
- </fo:table-footer>
2243
- </xsl:if>
2244
- </xsl:template><xsl:template name="insertTableFooter2">
2245
- <xsl:param name="cols-count"/>
2246
- <xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ..//*[local-name()='fn'][local-name(..) != 'name']"/>
2247
- <xsl:if test="../*[local-name()='tfoot'] or $isNoteOrFnExist = 'true'">
2248
-
2249
- <fo:table-footer>
2250
-
2251
- <xsl:apply-templates select="../*[local-name()='tfoot']" mode="process"/>
2252
-
2253
- <!-- if there are note(s) or fn(s) then create footer row -->
2254
- <xsl:if test="$isNoteOrFnExist = 'true'">
2255
-
2256
-
2257
-
2258
- <fo:table-row>
2259
- <fo:table-cell border="solid black 1pt" padding-left="1mm" padding-right="1mm" padding-top="1mm" number-columns-spanned="{$cols-count}">
2260
-
2261
-
2262
-
2263
- <!-- fn will be processed inside 'note' processing -->
2264
-
2265
-
2266
-
2267
-
2268
-
2269
-
2270
- <!-- except gb -->
2271
-
2272
- <xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
2273
-
2274
-
2275
- <!-- show Note under table in preface (ex. abstract) sections -->
2276
- <!-- empty, because notes show at page side in main sections -->
2277
- <!-- <xsl:if test="$namespace = 'bipm'">
2278
- <xsl:choose>
2279
- <xsl:when test="ancestor::*[local-name()='preface']">
2280
- <xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
2281
- </xsl:when>
2282
- <xsl:otherwise>
2283
- <fo:block/>
2284
- </xsl:otherwise>
2285
- </xsl:choose>
2286
- </xsl:if> -->
2287
-
2288
-
2289
- <!-- horizontal row separator -->
2290
-
2291
-
2292
- <!-- fn processing -->
2293
- <xsl:call-template name="fn_display"/>
2294
-
2295
- </fo:table-cell>
2296
- </fo:table-row>
2297
-
2298
- </xsl:if>
2519
+ <xsl:apply-templates select="../*[local-name()='tfoot']"/>
2299
2520
  </fo:table-footer>
2300
-
2301
2521
  </xsl:if>
2302
2522
  </xsl:template><xsl:template name="insertTableFooterInSeparateTable">
2303
2523
  <xsl:param name="table_attributes"/>
@@ -2324,17 +2544,18 @@
2324
2544
  </xsl:variable>
2325
2545
 
2326
2546
  <fo:table keep-with-previous="always">
2327
- <xsl:for-each select="xalan:nodeset($table_attributes)/attribute">
2547
+ <xsl:for-each select="xalan:nodeset($table_attributes)/table_attributes/@*">
2548
+ <xsl:variable name="name" select="local-name()"/>
2328
2549
  <xsl:choose>
2329
- <xsl:when test="@name = 'border-top'">
2330
- <xsl:attribute name="{@name}">0pt solid black</xsl:attribute>
2550
+ <xsl:when test="$name = 'border-top'">
2551
+ <xsl:attribute name="{$name}">0pt solid black</xsl:attribute>
2331
2552
  </xsl:when>
2332
- <xsl:when test="@name = 'border'">
2333
- <xsl:attribute name="{@name}"><xsl:value-of select="."/></xsl:attribute>
2553
+ <xsl:when test="$name = 'border'">
2554
+ <xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
2334
2555
  <xsl:attribute name="border-top">0pt solid black</xsl:attribute>
2335
2556
  </xsl:when>
2336
2557
  <xsl:otherwise>
2337
- <xsl:attribute name="{@name}"><xsl:value-of select="."/></xsl:attribute>
2558
+ <xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
2338
2559
  </xsl:otherwise>
2339
2560
  </xsl:choose>
2340
2561
  </xsl:for-each>
@@ -2363,9 +2584,10 @@
2363
2584
 
2364
2585
  <fo:table-body>
2365
2586
  <fo:table-row>
2366
- <fo:table-cell border="solid black 1pt" padding-left="1mm" padding-right="1mm" padding-top="1mm" number-columns-spanned="{$cols-count}">
2587
+ <fo:table-cell xsl:use-attribute-sets="table-footer-cell-style" number-columns-spanned="{$cols-count}">
2367
2588
 
2368
2589
 
2590
+
2369
2591
 
2370
2592
 
2371
2593
  <!-- fn will be processed inside 'note' processing -->
@@ -2375,37 +2597,20 @@
2375
2597
 
2376
2598
 
2377
2599
 
2378
-
2379
-
2380
-
2381
2600
  <!-- for BSI (not PAS) display Notes before footnotes -->
2382
2601
 
2383
2602
 
2384
- <!-- except gb -->
2385
-
2386
- <xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
2603
+ <!-- except gb and bsi -->
2387
2604
 
2388
-
2389
- <!-- <xsl:if test="$namespace = 'bipm'">
2390
- <xsl:choose>
2391
- <xsl:when test="ancestor::*[local-name()='preface']">
2392
- show Note under table in preface (ex. abstract) sections
2393
- <xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
2394
- </xsl:when>
2395
- <xsl:otherwise>
2396
- empty, because notes show at page side in main sections
2397
- <fo:block/>
2398
- </xsl:otherwise>
2399
- </xsl:choose>
2400
- </xsl:if> -->
2605
+ <xsl:apply-templates select="../*[local-name()='note']"/>
2606
+
2401
2607
 
2402
2608
 
2403
2609
  <!-- horizontal row separator -->
2404
2610
 
2405
2611
 
2406
2612
  <!-- fn processing -->
2407
- <xsl:call-template name="fn_display"/>
2408
-
2613
+ <xsl:call-template name="table_fn_display"/>
2409
2614
 
2410
2615
  <!-- for PAS display Notes after footnotes -->
2411
2616
 
@@ -2435,7 +2640,7 @@
2435
2640
 
2436
2641
 
2437
2642
 
2438
- <xsl:apply-templates select="../*[local-name()='thead']" mode="process">
2643
+ <xsl:apply-templates select="../*[local-name()='thead']">
2439
2644
  <xsl:with-param name="cols-count" select="$cols-count"/>
2440
2645
  </xsl:apply-templates>
2441
2646
 
@@ -2447,93 +2652,62 @@
2447
2652
 
2448
2653
 
2449
2654
  <xsl:apply-templates/>
2450
- <!-- <xsl:apply-templates select="../*[local-name()='tfoot']" mode="process"/> -->
2451
-
2655
+
2452
2656
  </fo:table-body>
2453
2657
 
2454
- </xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='name']/text()[1]" priority="2" mode="presentation_name">
2455
- <xsl:choose>
2456
- <xsl:when test="substring-after(., '—') != ''">
2457
- <xsl:text>—</xsl:text><xsl:value-of select="substring-after(., '—')"/>
2458
- </xsl:when>
2459
- <xsl:otherwise>
2460
- <xsl:value-of select="."/>
2461
- </xsl:otherwise>
2462
- </xsl:choose>
2463
- </xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='name']" mode="presentation_name">
2464
- <xsl:apply-templates mode="presentation_name"/>
2465
- </xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='name']/node()" mode="presentation_name">
2466
- <xsl:apply-templates select="."/>
2467
- </xsl:template><xsl:template match="*[local-name()='tr']">
2468
- <xsl:variable name="parent-name" select="local-name(..)"/>
2469
- <!-- <xsl:variable name="namespace" select="substring-before(name(/*), '-')"/> -->
2470
- <fo:table-row min-height="4mm">
2471
- <xsl:if test="$parent-name = 'thead'">
2472
- <xsl:attribute name="font-weight">bold</xsl:attribute>
2473
-
2474
-
2475
-
2476
-
2477
-
2478
-
2479
-
2480
-
2481
- </xsl:if>
2482
- <xsl:if test="$parent-name = 'tfoot'">
2483
-
2484
-
2485
-
2486
- </xsl:if>
2487
-
2488
-
2489
- <xsl:if test="not(*[local-name()='th'])">
2490
- <xsl:attribute name="min-height">8mm</xsl:attribute>
2491
- </xsl:if>
2492
-
2493
-
2494
-
2495
-
2496
-
2497
-
2498
-
2499
-
2500
-
2501
- <!-- <xsl:if test="$namespace = 'bipm'">
2502
- <xsl:attribute name="height">8mm</xsl:attribute>
2503
- </xsl:if> -->
2504
-
2505
- <xsl:apply-templates/>
2506
- </fo:table-row>
2507
- </xsl:template><xsl:template match="*[local-name()='th']">
2508
- <fo:table-cell text-align="{@align}" font-weight="bold" border="solid black 1pt" padding-left="1mm" display-align="center">
2509
- <xsl:attribute name="text-align">
2510
- <xsl:choose>
2511
- <xsl:when test="@align">
2512
- <xsl:call-template name="setAlignment"/>
2513
- <!-- <xsl:value-of select="@align"/> -->
2514
- </xsl:when>
2515
- <xsl:otherwise>center</xsl:otherwise>
2516
- </xsl:choose>
2517
- </xsl:attribute>
2658
+ </xsl:template><xsl:template match="*[local-name()='thead']/*[local-name()='tr']" priority="2">
2659
+ <fo:table-row xsl:use-attribute-sets="table-header-row-style">
2660
+
2661
+
2662
+
2663
+
2664
+
2518
2665
 
2519
2666
 
2667
+ <xsl:call-template name="setTableRowAttributes"/>
2668
+
2669
+ <xsl:apply-templates/>
2670
+ </fo:table-row>
2671
+ </xsl:template><xsl:template match="*[local-name()='tfoot']/*[local-name()='tr']" priority="2">
2672
+ <fo:table-row xsl:use-attribute-sets="table-footer-row-style">
2520
2673
 
2674
+ <xsl:call-template name="setTableRowAttributes"/>
2675
+ <xsl:apply-templates/>
2676
+ </fo:table-row>
2677
+ </xsl:template><xsl:template match="*[local-name()='tr']">
2678
+ <fo:table-row xsl:use-attribute-sets="table-body-row-style">
2679
+
2521
2680
 
2681
+
2522
2682
 
2683
+
2684
+ <xsl:call-template name="setTableRowAttributes"/>
2685
+ <xsl:apply-templates/>
2686
+ </fo:table-row>
2687
+ </xsl:template><xsl:template name="setTableRowAttributes">
2688
+
2689
+
2690
+
2691
+
2692
+
2693
+
2694
+
2695
+
2696
+ <xsl:if test="not(*[local-name()='th'])">
2697
+ <xsl:attribute name="min-height">8mm</xsl:attribute>
2698
+ </xsl:if>
2699
+
2700
+ </xsl:template><xsl:template match="*[local-name()='th']">
2701
+ <fo:table-cell xsl:use-attribute-sets="table-header-cell-style"> <!-- text-align="{@align}" -->
2702
+ <xsl:call-template name="setTextAlignment">
2703
+ <xsl:with-param name="default">center</xsl:with-param>
2704
+ </xsl:call-template>
2523
2705
 
2524
2706
 
2525
2707
 
2526
2708
 
2709
+
2527
2710
 
2528
- <xsl:attribute name="display-align">center</xsl:attribute>
2529
- <xsl:attribute name="font-style">italic</xsl:attribute>
2530
- <xsl:attribute name="font-weight">normal</xsl:attribute>
2531
- <xsl:attribute name="padding-top">2mm</xsl:attribute>
2532
- <xsl:attribute name="padding-left">2mm</xsl:attribute>
2533
- <xsl:attribute name="border">solid black 0pt</xsl:attribute>
2534
- <xsl:attribute name="border-top">solid black 0.2pt</xsl:attribute>
2535
- <xsl:attribute name="border-bottom">solid black 1.5pt</xsl:attribute>
2536
- <xsl:attribute name="text-indent">0mm</xsl:attribute>
2537
2711
 
2538
2712
 
2539
2713
 
@@ -2541,21 +2715,25 @@
2541
2715
  <xsl:if test="$lang = 'ar'">
2542
2716
  <xsl:attribute name="padding-right">1mm</xsl:attribute>
2543
2717
  </xsl:if>
2544
- <xsl:if test="@colspan">
2545
- <xsl:attribute name="number-columns-spanned">
2546
- <xsl:value-of select="@colspan"/>
2547
- </xsl:attribute>
2548
- </xsl:if>
2549
- <xsl:if test="@rowspan">
2550
- <xsl:attribute name="number-rows-spanned">
2551
- <xsl:value-of select="@rowspan"/>
2552
- </xsl:attribute>
2553
- </xsl:if>
2554
- <xsl:call-template name="display-align"/>
2718
+
2719
+ <xsl:call-template name="setTableCellAttributes"/>
2720
+
2555
2721
  <fo:block>
2556
2722
  <xsl:apply-templates/>
2557
2723
  </fo:block>
2558
2724
  </fo:table-cell>
2725
+ </xsl:template><xsl:template name="setTableCellAttributes">
2726
+ <xsl:if test="@colspan">
2727
+ <xsl:attribute name="number-columns-spanned">
2728
+ <xsl:value-of select="@colspan"/>
2729
+ </xsl:attribute>
2730
+ </xsl:if>
2731
+ <xsl:if test="@rowspan">
2732
+ <xsl:attribute name="number-rows-spanned">
2733
+ <xsl:value-of select="@rowspan"/>
2734
+ </xsl:attribute>
2735
+ </xsl:if>
2736
+ <xsl:call-template name="display-align"/>
2559
2737
  </xsl:template><xsl:template name="display-align">
2560
2738
  <xsl:if test="@valign">
2561
2739
  <xsl:attribute name="display-align">
@@ -2568,22 +2746,18 @@
2568
2746
  </xsl:attribute>
2569
2747
  </xsl:if>
2570
2748
  </xsl:template><xsl:template match="*[local-name()='td']">
2571
- <fo:table-cell text-align="{@align}" display-align="center" border="solid black 1pt" padding-left="1mm">
2572
- <xsl:attribute name="text-align">
2573
- <xsl:choose>
2574
- <xsl:when test="@align">
2575
- <xsl:call-template name="setAlignment"/>
2576
- <!-- <xsl:value-of select="@align"/> -->
2577
- </xsl:when>
2578
- <xsl:otherwise>left</xsl:otherwise>
2579
- </xsl:choose>
2580
- </xsl:attribute>
2749
+ <fo:table-cell xsl:use-attribute-sets="table-cell-style"> <!-- text-align="{@align}" -->
2750
+ <xsl:call-template name="setTextAlignment">
2751
+ <xsl:with-param name="default">left</xsl:with-param>
2752
+ </xsl:call-template>
2753
+
2581
2754
  <xsl:if test="$lang = 'ar'">
2582
2755
  <xsl:attribute name="padding-right">1mm</xsl:attribute>
2583
2756
  </xsl:if>
2584
2757
 
2585
2758
 
2586
2759
 
2760
+ <!-- bsi -->
2587
2761
 
2588
2762
 
2589
2763
 
@@ -2592,78 +2766,57 @@
2592
2766
 
2593
2767
 
2594
2768
 
2595
- <xsl:attribute name="display-align">before</xsl:attribute>
2596
- <xsl:attribute name="padding-left">0mm</xsl:attribute>
2597
- <xsl:attribute name="padding-top">2mm</xsl:attribute>
2598
- <xsl:attribute name="padding-bottom">1mm</xsl:attribute>
2599
- <xsl:attribute name="border">solid black 0pt</xsl:attribute>
2600
- <xsl:attribute name="border-bottom">solid black 1.5pt</xsl:attribute>
2601
- <xsl:attribute name="text-indent">0mm</xsl:attribute>
2769
+
2602
2770
 
2603
2771
 
2604
2772
 
2605
2773
 
2606
2774
 
2607
2775
 
2608
- <xsl:if test=".//*[local-name() = 'table']">
2776
+ <xsl:if test=".//*[local-name() = 'table']"> <!-- if there is nested table -->
2609
2777
  <xsl:attribute name="padding-right">1mm</xsl:attribute>
2610
2778
  </xsl:if>
2611
- <xsl:if test="@colspan">
2612
- <xsl:attribute name="number-columns-spanned">
2613
- <xsl:value-of select="@colspan"/>
2614
- </xsl:attribute>
2615
- </xsl:if>
2616
- <xsl:if test="@rowspan">
2617
- <xsl:attribute name="number-rows-spanned">
2618
- <xsl:value-of select="@rowspan"/>
2619
- </xsl:attribute>
2620
- </xsl:if>
2621
- <xsl:call-template name="display-align"/>
2779
+
2780
+ <xsl:call-template name="setTableCellAttributes"/>
2781
+
2622
2782
  <fo:block>
2623
-
2783
+
2784
+
2785
+
2624
2786
  <xsl:apply-templates/>
2625
2787
  </fo:block>
2626
2788
  </fo:table-cell>
2627
- </xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='note']" priority="2"/><xsl:template match="*[local-name()='table']/*[local-name()='note']" mode="process">
2628
-
2789
+ </xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='note']" priority="2">
2790
+
2791
+ <fo:block xsl:use-attribute-sets="table-note-style">
2792
+
2793
+
2794
+
2795
+
2629
2796
 
2630
- <fo:block font-size="10pt" margin-bottom="12pt">
2797
+ <!-- Table's note name (NOTE, for example) -->
2798
+ <fo:inline xsl:use-attribute-sets="table-note-name-style">
2631
2799
 
2632
2800
 
2633
2801
 
2634
2802
 
2635
2803
 
2636
2804
 
2805
+ <xsl:if test="@type = 'source' or @type = 'abbreviation'">
2806
+ <xsl:attribute name="font-size">9pt</xsl:attribute>
2807
+ </xsl:if>
2637
2808
 
2638
2809
 
2639
- <!-- Table's note name (NOTE, for example) -->
2640
-
2641
- <fo:inline padding-right="2mm" xsl:use-attribute-sets="table-note-name-style">
2642
-
2643
-
2644
-
2645
- <xsl:if test="@type = 'source' or @type = 'abbreviation'">
2646
- <xsl:attribute name="font-size">9pt</xsl:attribute>
2647
- <!-- <fo:inline>
2648
- <xsl:call-template name="capitalize">
2649
- <xsl:with-param name="str" select="@type"/>
2650
- </xsl:call-template>
2651
- <xsl:text>: </xsl:text>
2652
- </fo:inline> -->
2653
- </xsl:if>
2654
-
2655
-
2810
+ <xsl:apply-templates select="*[local-name() = 'name']"/>
2656
2811
 
2657
- <xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
2658
-
2659
- </fo:inline>
2660
-
2661
-
2662
-
2663
- <xsl:apply-templates mode="process"/>
2664
- </fo:block>
2812
+ </fo:inline>
2813
+
2814
+
2815
+
2816
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
2817
+ </fo:block>
2665
2818
 
2666
- </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">
2819
+ </xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='note']/*[local-name()='p']" priority="2">
2667
2820
  <xsl:apply-templates/>
2668
2821
  </xsl:template><xsl:template match="*[local-name() = 'fn'][not(ancestor::*[(local-name() = 'table' or local-name() = 'figure') and not(ancestor::*[local-name() = 'name'])])]" priority="2" name="fn">
2669
2822
 
@@ -2741,10 +2894,7 @@
2741
2894
  <xsl:copy-of select="$footnote_inline"/>
2742
2895
  <fo:footnote-body>
2743
2896
 
2744
- <fo:block-container text-indent="0" start-indent="0">
2745
-
2746
-
2747
- <xsl:attribute name="margin-left">-8mm</xsl:attribute>
2897
+ <fo:block-container xsl:use-attribute-sets="fn-container-body-style">
2748
2898
 
2749
2899
  <fo:block xsl:use-attribute-sets="fn-body-style">
2750
2900
 
@@ -2763,7 +2913,7 @@
2763
2913
  <xsl:copy-of select="$footnote_inline"/>
2764
2914
  </xsl:otherwise>
2765
2915
  </xsl:choose>
2766
- </xsl:template><xsl:template name="fn_display">
2916
+ </xsl:template><xsl:template name="table_fn_display">
2767
2917
  <xsl:variable name="references">
2768
2918
 
2769
2919
  <xsl:for-each select="..//*[local-name()='fn'][local-name(..) != 'name']">
@@ -2774,33 +2924,26 @@
2774
2924
  <xsl:for-each select="xalan:nodeset($references)//fn">
2775
2925
  <xsl:variable name="reference" select="@reference"/>
2776
2926
  <xsl:if test="not(preceding-sibling::*[@reference = $reference])"> <!-- only unique reference puts in note-->
2777
- <fo:block margin-bottom="12pt">
2927
+ <fo:block xsl:use-attribute-sets="table-fn-style">
2778
2928
 
2779
2929
 
2780
2930
 
2781
-
2782
-
2783
-
2784
-
2785
- <fo:inline font-size="80%" padding-right="5mm" id="{@id}">
2931
+ <fo:inline id="{@id}" xsl:use-attribute-sets="table-fn-number-style">
2786
2932
 
2787
- <xsl:attribute name="vertical-align">super</xsl:attribute>
2788
2933
 
2789
2934
 
2790
2935
 
2791
2936
 
2937
+ <xsl:value-of select="@reference"/>
2792
2938
 
2793
2939
 
2794
2940
 
2795
2941
 
2796
- <xsl:value-of select="@reference"/>
2797
2942
 
2798
2943
 
2799
2944
 
2800
2945
  </fo:inline>
2801
- <fo:inline>
2802
-
2803
- <!-- <xsl:apply-templates /> -->
2946
+ <fo:inline xsl:use-attribute-sets="table-fn-body-style">
2804
2947
  <xsl:copy-of select="./node()"/>
2805
2948
  </fo:inline>
2806
2949
  </fo:block>
@@ -2812,15 +2955,7 @@
2812
2955
 
2813
2956
  <xsl:apply-templates/>
2814
2957
  </fn>
2815
- </xsl:template><xsl:template name="fn_name_display">
2816
- <!-- <xsl:variable name="references">
2817
- <xsl:for-each select="*[local-name()='name']//*[local-name()='fn']">
2818
- <fn reference="{@reference}" id="{@reference}_{ancestor::*[@id][1]/@id}">
2819
- <xsl:apply-templates />
2820
- </fn>
2821
- </xsl:for-each>
2822
- </xsl:variable>
2823
- $references=<xsl:copy-of select="$references"/> -->
2958
+ </xsl:template><xsl:template name="table_name_fn_display">
2824
2959
  <xsl:for-each select="*[local-name()='name']//*[local-name()='fn']">
2825
2960
  <xsl:variable name="reference" select="@reference"/>
2826
2961
  <fo:block id="{@reference}_{ancestor::*[@id][1]/@id}"><xsl:value-of select="@reference"/></fo:block>
@@ -2829,9 +2964,7 @@
2829
2964
  </fo:block>
2830
2965
  </xsl:for-each>
2831
2966
  </xsl:template><xsl:template name="fn_display_figure">
2832
- <xsl:variable name="key_iso">
2833
- <!-- and (not(@class) or @class !='pseudocode') -->
2834
- </xsl:variable>
2967
+
2835
2968
  <xsl:variable name="references">
2836
2969
  <xsl:for-each select=".//*[local-name()='fn'][not(parent::*[local-name()='name'])]">
2837
2970
  <fn reference="{@reference}" id="{@reference}_{ancestor::*[@id][1]/@id}">
@@ -2839,50 +2972,52 @@
2839
2972
  </fn>
2840
2973
  </xsl:for-each>
2841
2974
  </xsl:variable>
2975
+
2976
+ <xsl:if test="xalan:nodeset($references)//fn">
2842
2977
 
2843
- <!-- current hierarchy is 'figure' element -->
2844
- <xsl:variable name="following_dl_colwidths">
2845
- <xsl:if test="*[local-name() = 'dl']"><!-- if there is a 'dl', then set the same columns width as for 'dl' -->
2846
- <xsl:variable name="html-table">
2847
- <xsl:variable name="doc_ns">
2848
-
2849
- </xsl:variable>
2850
- <xsl:variable name="ns">
2851
- <xsl:choose>
2852
- <xsl:when test="normalize-space($doc_ns) != ''">
2853
- <xsl:value-of select="normalize-space($doc_ns)"/>
2854
- </xsl:when>
2855
- <xsl:otherwise>
2856
- <xsl:value-of select="substring-before(name(/*), '-')"/>
2857
- </xsl:otherwise>
2858
- </xsl:choose>
2859
- </xsl:variable>
2860
- <!-- <xsl:variable name="ns" select="substring-before(name(/*), '-')"/> -->
2861
- <!-- <xsl:element name="{$ns}:table"> -->
2862
- <xsl:for-each select="*[local-name() = 'dl'][1]">
2863
- <tbody>
2864
- <xsl:apply-templates mode="dl"/>
2865
- </tbody>
2866
- </xsl:for-each>
2867
- <!-- </xsl:element> -->
2868
- </xsl:variable>
2869
-
2870
- <xsl:call-template name="calculate-column-widths">
2871
- <xsl:with-param name="cols-count" select="2"/>
2872
- <xsl:with-param name="table" select="$html-table"/>
2873
- </xsl:call-template>
2978
+ <xsl:variable name="key_iso">
2874
2979
 
2875
- </xsl:if>
2876
- </xsl:variable>
2877
-
2878
-
2879
- <xsl:variable name="maxlength_dt">
2880
- <xsl:for-each select="*[local-name() = 'dl'][1]">
2881
- <xsl:call-template name="getMaxLength_dt"/>
2882
- </xsl:for-each>
2883
- </xsl:variable>
2884
-
2885
- <xsl:if test="xalan:nodeset($references)//fn">
2980
+ </xsl:variable>
2981
+
2982
+ <!-- current hierarchy is 'figure' element -->
2983
+ <xsl:variable name="following_dl_colwidths">
2984
+ <xsl:if test="*[local-name() = 'dl']"><!-- if there is a 'dl', then set the same columns width as for 'dl' -->
2985
+ <xsl:variable name="html-table">
2986
+ <xsl:variable name="doc_ns">
2987
+
2988
+ </xsl:variable>
2989
+ <xsl:variable name="ns">
2990
+ <xsl:choose>
2991
+ <xsl:when test="normalize-space($doc_ns) != ''">
2992
+ <xsl:value-of select="normalize-space($doc_ns)"/>
2993
+ </xsl:when>
2994
+ <xsl:otherwise>
2995
+ <xsl:value-of select="substring-before(name(/*), '-')"/>
2996
+ </xsl:otherwise>
2997
+ </xsl:choose>
2998
+ </xsl:variable>
2999
+
3000
+ <xsl:for-each select="*[local-name() = 'dl'][1]">
3001
+ <tbody>
3002
+ <xsl:apply-templates mode="dl"/>
3003
+ </tbody>
3004
+ </xsl:for-each>
3005
+ </xsl:variable>
3006
+
3007
+ <xsl:call-template name="calculate-column-widths">
3008
+ <xsl:with-param name="cols-count" select="2"/>
3009
+ <xsl:with-param name="table" select="$html-table"/>
3010
+ </xsl:call-template>
3011
+
3012
+ </xsl:if>
3013
+ </xsl:variable>
3014
+
3015
+ <xsl:variable name="maxlength_dt">
3016
+ <xsl:for-each select="*[local-name() = 'dl'][1]">
3017
+ <xsl:call-template name="getMaxLength_dt"/>
3018
+ </xsl:for-each>
3019
+ </xsl:variable>
3020
+
2886
3021
  <fo:block>
2887
3022
  <fo:table width="95%" table-layout="fixed">
2888
3023
  <xsl:if test="normalize-space($key_iso) = 'true'">
@@ -2909,20 +3044,18 @@
2909
3044
  <fo:table-row>
2910
3045
  <fo:table-cell>
2911
3046
  <fo:block>
2912
- <fo:inline font-size="80%" padding-right="5mm" vertical-align="super" id="{@id}">
2913
-
3047
+ <fo:inline id="{@id}" xsl:use-attribute-sets="figure-fn-number-style">
2914
3048
  <xsl:value-of select="@reference"/>
2915
3049
  </fo:inline>
2916
3050
  </fo:block>
2917
3051
  </fo:table-cell>
2918
3052
  <fo:table-cell>
2919
- <fo:block text-align="justify" margin-bottom="12pt">
2920
-
3053
+ <fo:block xsl:use-attribute-sets="figure-fn-body-style">
2921
3054
  <xsl:if test="normalize-space($key_iso) = 'true'">
2922
- <xsl:attribute name="margin-bottom">0</xsl:attribute>
3055
+
3056
+ <xsl:attribute name="margin-bottom">0</xsl:attribute>
3057
+
2923
3058
  </xsl:if>
2924
-
2925
- <!-- <xsl:apply-templates /> -->
2926
3059
  <xsl:copy-of select="./node()"/>
2927
3060
  </fo:block>
2928
3061
  </fo:table-cell>
@@ -2935,14 +3068,8 @@
2935
3068
  </xsl:if>
2936
3069
 
2937
3070
  </xsl:template><xsl:template match="*[local-name()='fn']">
2938
- <!-- <xsl:variable name="namespace" select="substring-before(name(/*), '-')"/> -->
2939
- <fo:inline font-size="80%" keep-with-previous.within-line="always">
2940
-
2941
-
2942
-
2943
-
2944
-
2945
-
3071
+ <fo:inline xsl:use-attribute-sets="fn-reference-style">
3072
+
2946
3073
 
2947
3074
 
2948
3075
 
@@ -2966,10 +3093,10 @@
2966
3093
  <xsl:variable name="isDeleted" select="@deleted"/>
2967
3094
  <fo:block-container>
2968
3095
 
2969
- <xsl:if test="not(ancestor::*[local-name() = 'quote'])">
2970
- <xsl:attribute name="margin-left">0mm</xsl:attribute>
2971
- </xsl:if>
2972
-
3096
+ <xsl:if test="not(ancestor::*[local-name() = 'quote'])">
3097
+ <xsl:attribute name="margin-left">0mm</xsl:attribute>
3098
+ </xsl:if>
3099
+
2973
3100
 
2974
3101
  <xsl:if test="parent::*[local-name() = 'note']">
2975
3102
  <xsl:attribute name="margin-left">
@@ -2986,11 +3113,11 @@
2986
3113
  <xsl:with-param name="isDeleted" select="$isDeleted"/>
2987
3114
  </xsl:call-template>
2988
3115
 
2989
- <fo:block-container>
2990
-
2991
- <xsl:attribute name="margin-left">0mm</xsl:attribute>
2992
- <xsl:attribute name="margin-right">0mm</xsl:attribute>
3116
+ <fo:block-container margin-left="0mm">
3117
+
2993
3118
 
3119
+ <xsl:attribute name="margin-right">0mm</xsl:attribute>
3120
+
2994
3121
 
2995
3122
  <xsl:variable name="parent" select="local-name(..)"/>
2996
3123
 
@@ -3001,23 +3128,19 @@
3001
3128
  <xsl:choose>
3002
3129
  <xsl:when test="$parent = 'formula' and count(*[local-name()='dt']) = 1"> <!-- only one component -->
3003
3130
 
3004
-
3005
- <fo:block margin-bottom="12pt" text-align="left">
3006
-
3007
- <xsl:variable name="title-where">
3008
-
3131
+ <fo:block margin-bottom="12pt" text-align="left">
3009
3132
 
3010
- <xsl:call-template name="getTitle">
3011
- <xsl:with-param name="name" select="'title-where'"/>
3133
+ <xsl:variable name="title-where">
3134
+ <xsl:call-template name="getLocalizedString">
3135
+ <xsl:with-param name="key">where</xsl:with-param>
3012
3136
  </xsl:call-template>
3013
-
3014
- </xsl:variable>
3015
- <xsl:value-of select="$title-where"/><xsl:text> </xsl:text>
3016
- <xsl:apply-templates select="*[local-name()='dt']/*"/>
3017
- <xsl:text/>
3018
- <xsl:apply-templates select="*[local-name()='dd']/*" mode="inline"/>
3019
- </fo:block>
3020
-
3137
+ </xsl:variable>
3138
+ <xsl:value-of select="$title-where"/><xsl:text> </xsl:text>
3139
+ <xsl:apply-templates select="*[local-name()='dt']/*"/>
3140
+ <xsl:text/>
3141
+ <xsl:apply-templates select="*[local-name()='dd']/*" mode="inline"/>
3142
+ </fo:block>
3143
+
3021
3144
  </xsl:when>
3022
3145
  <xsl:when test="$parent = 'formula'"> <!-- a few components -->
3023
3146
  <fo:block margin-bottom="12pt" text-align="left">
@@ -3026,12 +3149,9 @@
3026
3149
 
3027
3150
 
3028
3151
  <xsl:variable name="title-where">
3029
-
3030
-
3031
- <xsl:call-template name="getTitle">
3032
- <xsl:with-param name="name" select="'title-where'"/>
3033
- </xsl:call-template>
3034
-
3152
+ <xsl:call-template name="getLocalizedString">
3153
+ <xsl:with-param name="key">where</xsl:with-param>
3154
+ </xsl:call-template>
3035
3155
  </xsl:variable>
3036
3156
  <xsl:value-of select="$title-where"/>
3037
3157
  </fo:block>
@@ -3043,12 +3163,9 @@
3043
3163
 
3044
3164
 
3045
3165
  <xsl:variable name="title-key">
3046
-
3047
-
3048
- <xsl:call-template name="getTitle">
3049
- <xsl:with-param name="name" select="'title-key'"/>
3050
- </xsl:call-template>
3051
-
3166
+ <xsl:call-template name="getLocalizedString">
3167
+ <xsl:with-param name="key">key</xsl:with-param>
3168
+ </xsl:call-template>
3052
3169
  </xsl:variable>
3053
3170
  <xsl:value-of select="$title-key"/>
3054
3171
  </fo:block>
@@ -3070,9 +3187,7 @@
3070
3187
  <fo:table width="95%" table-layout="fixed">
3071
3188
 
3072
3189
  <xsl:choose>
3073
- <xsl:when test="normalize-space($key_iso) = 'true' and $parent = 'formula'">
3074
- <!-- <xsl:attribute name="font-size">11pt</xsl:attribute> -->
3075
- </xsl:when>
3190
+ <xsl:when test="normalize-space($key_iso) = 'true' and $parent = 'formula'"/>
3076
3191
  <xsl:when test="normalize-space($key_iso) = 'true'">
3077
3192
  <xsl:attribute name="font-size">10pt</xsl:attribute>
3078
3193
 
@@ -3093,12 +3208,9 @@
3093
3208
  </xsl:otherwise>
3094
3209
  </xsl:choose>
3095
3210
  </xsl:variable>
3096
- <!-- <xsl:variable name="ns" select="substring-before(name(/*), '-')"/> -->
3097
- <!-- <xsl:element name="{$ns}:table"> -->
3098
- <tbody>
3099
- <xsl:apply-templates mode="dl"/>
3100
- </tbody>
3101
- <!-- </xsl:element> -->
3211
+ <tbody>
3212
+ <xsl:apply-templates mode="dl"/>
3213
+ </tbody>
3102
3214
  </xsl:variable>
3103
3215
  <!-- html-table<xsl:copy-of select="$html-table"/> -->
3104
3216
  <xsl:variable name="colwidths">
@@ -3178,8 +3290,6 @@
3178
3290
  </xsl:for-each>
3179
3291
  </xsl:otherwise>
3180
3292
  </xsl:choose>
3181
- <!-- <fo:table-column column-width="15%"/>
3182
- <fo:table-column column-width="85%"/> -->
3183
3293
  </xsl:otherwise>
3184
3294
  </xsl:choose>
3185
3295
  </xsl:template><xsl:template name="getMaxLength_dt">
@@ -3194,12 +3304,6 @@
3194
3304
  </xsl:for-each>
3195
3305
  </xsl:variable>
3196
3306
  <xsl:variable name="maxLength">
3197
- <!-- <xsl:for-each select="*[local-name()='dt']">
3198
- <xsl:sort select="string-length(normalize-space(.))" data-type="number" order="descending"/>
3199
- <xsl:if test="position() = 1">
3200
- <xsl:value-of select="string-length(normalize-space(.))"/>
3201
- </xsl:if>
3202
- </xsl:for-each> -->
3203
3307
  <xsl:for-each select="xalan:nodeset($lengths)/length">
3204
3308
  <xsl:sort select="." data-type="number" order="descending"/>
3205
3309
  <xsl:if test="position() = 1">
@@ -3225,12 +3329,12 @@
3225
3329
  <xsl:if test="normalize-space($key_iso) = 'true'">
3226
3330
  <xsl:attribute name="margin-top">0</xsl:attribute>
3227
3331
  </xsl:if>
3228
- <xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
3332
+ <xsl:apply-templates select="*[local-name() = 'name']"/>
3229
3333
  </fo:block>
3230
3334
  </fo:table-cell>
3231
3335
  <fo:table-cell>
3232
3336
  <fo:block>
3233
- <xsl:apply-templates/>
3337
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
3234
3338
  </fo:block>
3235
3339
  </fo:table-cell>
3236
3340
  </fo:table-row>
@@ -3241,80 +3345,49 @@
3241
3345
  </td>
3242
3346
  <td>
3243
3347
 
3244
-
3245
- <xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]" mode="process"/>
3246
-
3348
+ <xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]">
3349
+ <xsl:with-param name="process">true</xsl:with-param>
3350
+ </xsl:apply-templates>
3351
+
3247
3352
  </td>
3248
3353
  </tr>
3249
3354
 
3250
3355
  </xsl:template><xsl:template match="*[local-name()='dt']">
3251
3356
  <xsl:param name="key_iso"/>
3252
3357
 
3253
- <fo:table-row>
3254
-
3255
-
3358
+ <fo:table-row xsl:use-attribute-sets="dt-row-style">
3256
3359
  <fo:table-cell>
3257
3360
 
3258
- <fo:block margin-top="6pt">
3361
+ <fo:block xsl:use-attribute-sets="dt-style">
3259
3362
  <xsl:copy-of select="@id"/>
3260
3363
 
3261
-
3262
3364
  <xsl:if test="normalize-space($key_iso) = 'true'">
3263
3365
  <xsl:attribute name="margin-top">0</xsl:attribute>
3264
-
3265
3366
  </xsl:if>
3266
3367
 
3267
3368
 
3268
3369
 
3269
-
3270
-
3271
-
3272
-
3273
3370
  <xsl:apply-templates/>
3274
- <!-- <xsl:if test="$namespace = 'gb'">
3275
- <xsl:if test="ancestor::*[local-name()='formula']">
3276
- <xsl:text>—</xsl:text>
3277
- </xsl:if>
3278
- </xsl:if> -->
3279
3371
  </fo:block>
3280
3372
  </fo:table-cell>
3281
3373
  <fo:table-cell>
3282
3374
  <fo:block>
3283
3375
 
3284
- <!-- <xsl:if test="$namespace = 'nist-cswp' or $namespace = 'nist-sp'">
3285
- <xsl:if test="local-name(*[1]) != 'stem'">
3286
- <xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]" mode="process"/>
3287
- </xsl:if>
3288
- </xsl:if> -->
3289
-
3290
- <xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]" mode="process"/>
3291
-
3376
+
3377
+ <xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]">
3378
+ <xsl:with-param name="process">true</xsl:with-param>
3379
+ </xsl:apply-templates>
3292
3380
  </fo:block>
3293
3381
  </fo:table-cell>
3294
3382
  </fo:table-row>
3295
- <!-- <xsl:if test="$namespace = 'nist-cswp' or $namespace = 'nist-sp'">
3296
- <xsl:if test="local-name(*[1]) = 'stem'">
3297
- <fo:table-row>
3298
- <fo:table-cell>
3299
- <fo:block margin-top="6pt">
3300
- <xsl:if test="normalize-space($key_iso) = 'true'">
3301
- <xsl:attribute name="margin-top">0</xsl:attribute>
3302
- </xsl:if>
3303
- <xsl:text>&#xA0;</xsl:text>
3304
- </fo:block>
3305
- </fo:table-cell>
3306
- <fo:table-cell>
3307
- <fo:block>
3308
- <xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]" mode="process"/>
3309
- </fo:block>
3310
- </fo:table-cell>
3311
- </fo:table-row>
3312
- </xsl:if>
3313
- </xsl:if> -->
3314
3383
  </xsl:template><xsl:template match="*[local-name()='dd']" mode="dl"/><xsl:template match="*[local-name()='dd']" mode="dl_process">
3315
3384
  <xsl:apply-templates/>
3316
- </xsl:template><xsl:template match="*[local-name()='dd']"/><xsl:template match="*[local-name()='dd']" mode="process">
3317
- <xsl:apply-templates/>
3385
+ </xsl:template><xsl:template match="*[local-name()='dd']">
3386
+ <xsl:param name="process">false</xsl:param>
3387
+ <xsl:if test="$process = 'true'">
3388
+ <xsl:apply-templates select="@language"/>
3389
+ <xsl:apply-templates/>
3390
+ </xsl:if>
3318
3391
  </xsl:template><xsl:template match="*[local-name()='dd']/*[local-name()='p']" mode="inline">
3319
3392
  <fo:inline><xsl:text> </xsl:text><xsl:apply-templates/></fo:inline>
3320
3393
  </xsl:template><xsl:template match="*[local-name()='em']">
@@ -3338,6 +3411,7 @@
3338
3411
  </fo:inline>
3339
3412
  </xsl:template><xsl:template match="*[local-name()='tt']">
3340
3413
  <fo:inline xsl:use-attribute-sets="tt-style">
3414
+
3341
3415
  <xsl:variable name="_font-size">
3342
3416
 
3343
3417
 
@@ -3374,7 +3448,22 @@
3374
3448
  <xsl:apply-templates/>
3375
3449
  </fo:inline>
3376
3450
  </xsl:template><xsl:template match="*[local-name()='add']">
3451
+ <xsl:param name="skip">true</xsl:param>
3377
3452
  <xsl:choose>
3453
+ <xsl:when test="starts-with(., $ace_tag)"> <!-- examples: ace-tag_A1_start, ace-tag_A2_end, C1_start, AC_start -->
3454
+ <xsl:choose>
3455
+ <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>
3456
+ <xsl:otherwise>
3457
+ <fo:inline>
3458
+ <xsl:call-template name="insertTag">
3459
+ <xsl:with-param name="type" select="substring-after(substring-after(., $ace_tag), '_')"/> <!-- start or end -->
3460
+ <xsl:with-param name="kind" select="substring(substring-before(substring-after(., $ace_tag), '_'), 1, 1)"/> <!-- A or C -->
3461
+ <xsl:with-param name="value" select="substring(substring-before(substring-after(., $ace_tag), '_'), 2)"/> <!-- 1, 2, C -->
3462
+ </xsl:call-template>
3463
+ </fo:inline>
3464
+ </xsl:otherwise>
3465
+ </xsl:choose>
3466
+ </xsl:when>
3378
3467
  <xsl:when test="@amendment">
3379
3468
  <fo:inline>
3380
3469
  <xsl:call-template name="insertTag">
@@ -3409,7 +3498,6 @@
3409
3498
  </fo:inline>
3410
3499
  </xsl:otherwise>
3411
3500
  </xsl:choose>
3412
-
3413
3501
  </xsl:template><xsl:template name="insertTag">
3414
3502
  <xsl:param name="type"/>
3415
3503
  <xsl:param name="kind"/>
@@ -3417,22 +3505,20 @@
3417
3505
  <xsl:variable name="add_width" select="string-length($value) * 20"/>
3418
3506
  <xsl:variable name="maxwidth" select="60 + $add_width"/>
3419
3507
  <fo:instream-foreign-object fox:alt-text="OpeningTag" baseline-shift="-20%"><!-- alignment-baseline="middle" -->
3420
- <!-- <xsl:attribute name="width">7mm</xsl:attribute>
3421
- <xsl:attribute name="content-height">100%</xsl:attribute> -->
3422
3508
  <xsl:attribute name="height">5mm</xsl:attribute>
3423
3509
  <xsl:attribute name="content-width">100%</xsl:attribute>
3424
3510
  <xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
3425
3511
  <xsl:attribute name="scaling">uniform</xsl:attribute>
3426
3512
  <svg xmlns="http://www.w3.org/2000/svg" width="{$maxwidth + 32}" height="80">
3427
3513
  <g>
3428
- <xsl:if test="$type = 'closing'">
3514
+ <xsl:if test="$type = 'closing' or $type = 'end'">
3429
3515
  <xsl:attribute name="transform">scale(-1 1) translate(-<xsl:value-of select="$maxwidth + 32"/>,0)</xsl:attribute>
3430
3516
  </xsl:if>
3431
3517
  <polyline points="0,0 {$maxwidth},0 {$maxwidth + 30},40 {$maxwidth},80 0,80 " stroke="black" stroke-width="5" fill="white"/>
3432
3518
  <line x1="0" y1="0" x2="0" y2="80" stroke="black" stroke-width="20"/>
3433
3519
  </g>
3434
3520
  <text font-family="Arial" x="15" y="57" font-size="40pt">
3435
- <xsl:if test="$type = 'closing'">
3521
+ <xsl:if test="$type = 'closing' or $type = 'end'">
3436
3522
  <xsl:attribute name="x">25</xsl:attribute>
3437
3523
  </xsl:if>
3438
3524
  <xsl:value-of select="$kind"/><tspan dy="10" font-size="30pt"><xsl:value-of select="$value"/></tspan>
@@ -3476,7 +3562,11 @@
3476
3562
  <xsl:with-param name="text" select="substring($text,2)"/>
3477
3563
  </xsl:call-template>
3478
3564
  </xsl:if>
3479
- </xsl:template><xsl:template name="tokenize">
3565
+ </xsl:template><xsl:template match="*[local-name() = 'pagebreak']">
3566
+ <fo:block break-after="page"/>
3567
+ <fo:block> </fo:block>
3568
+ <fo:block break-after="page"/>
3569
+ </xsl:template><xsl:template name="tokenize">
3480
3570
  <xsl:param name="text"/>
3481
3571
  <xsl:param name="separator" select="' '"/>
3482
3572
  <xsl:choose>
@@ -3636,14 +3726,6 @@
3636
3726
 
3637
3727
  <xsl:copy-of select="xalan:nodeset($simple-table-rowspan)"/>
3638
3728
 
3639
- <!-- <xsl:choose>
3640
- <xsl:when test="current()//*[local-name()='th'][@colspan] or current()//*[local-name()='td'][@colspan] ">
3641
-
3642
- </xsl:when>
3643
- <xsl:otherwise>
3644
- <xsl:copy-of select="current()"/>
3645
- </xsl:otherwise>
3646
- </xsl:choose> -->
3647
3729
  </xsl:variable>
3648
3730
  <xsl:copy-of select="$simple-table"/>
3649
3731
  </xsl:template><xsl:template match="*[local-name()='thead'] | *[local-name()='tbody']" mode="simple-table-colspan">
@@ -3762,8 +3844,6 @@
3762
3844
  <xsl:choose>
3763
3845
  <xsl:when test="contains($str2, ' ')">
3764
3846
  <xsl:variable name="substr" select="substring-before($str2, ' ')"/>
3765
- <!-- <xsl:value-of select="translate(substring($substr, 1, 1), $lower, $upper)"/>
3766
- <xsl:value-of select="substring($substr, 2)"/> -->
3767
3847
  <xsl:call-template name="capitalize">
3768
3848
  <xsl:with-param name="str" select="$substr"/>
3769
3849
  </xsl:call-template>
@@ -3773,8 +3853,6 @@
3773
3853
  </xsl:call-template>
3774
3854
  </xsl:when>
3775
3855
  <xsl:otherwise>
3776
- <!-- <xsl:value-of select="translate(substring($str2, 1, 1), $lower, $upper)"/>
3777
- <xsl:value-of select="substring($str2, 2)"/> -->
3778
3856
  <xsl:call-template name="capitalize">
3779
3857
  <xsl:with-param name="str" select="$str2"/>
3780
3858
  </xsl:call-template>
@@ -3802,6 +3880,7 @@
3802
3880
  <xsl:apply-templates select="." mode="mathml"/>
3803
3881
  </xsl:variable>
3804
3882
  <fo:instream-foreign-object fox:alt-text="Math">
3883
+
3805
3884
 
3806
3885
 
3807
3886
  <xsl:variable name="comment_text_following" select="following-sibling::node()[1][self::comment()]"/>
@@ -3833,7 +3912,7 @@
3833
3912
  </xsl:attribute>
3834
3913
 
3835
3914
 
3836
- <!-- <xsl:copy-of select="."/> -->
3915
+
3837
3916
  <xsl:copy-of select="xalan:nodeset($mathml)"/>
3838
3917
  </fo:instream-foreign-object>
3839
3918
  </fo:inline>
@@ -3892,6 +3971,10 @@
3892
3971
 
3893
3972
 
3894
3973
 
3974
+
3975
+
3976
+
3977
+
3895
3978
  <xsl:choose>
3896
3979
  <xsl:when test="$target_text = ''">
3897
3980
  <xsl:apply-templates/>
@@ -3915,19 +3998,19 @@
3915
3998
  </fo:inline>
3916
3999
  </xsl:template><xsl:template match="*[local-name()='appendix']">
3917
4000
  <fo:block id="{@id}" xsl:use-attribute-sets="appendix-style">
3918
- <xsl:apply-templates select="*[local-name()='title']" mode="process"/>
4001
+ <xsl:apply-templates select="*[local-name()='title']"/>
3919
4002
  </fo:block>
3920
- <xsl:apply-templates/>
3921
- </xsl:template><xsl:template match="*[local-name()='appendix']/*[local-name()='title']"/><xsl:template match="*[local-name()='appendix']/*[local-name()='title']" mode="process">
4003
+ <xsl:apply-templates select="node()[not(local-name()='title')]"/>
4004
+ </xsl:template><xsl:template match="*[local-name()='appendix']/*[local-name()='title']" priority="2">
3922
4005
  <xsl:variable name="level">
3923
4006
  <xsl:call-template name="getLevel"/>
3924
4007
  </xsl:variable>
3925
4008
  <fo:inline role="H{$level}"><xsl:apply-templates/></fo:inline>
3926
4009
  </xsl:template><xsl:template match="*[local-name()='appendix']//*[local-name()='example']" priority="2">
3927
4010
  <fo:block id="{@id}" xsl:use-attribute-sets="appendix-example-style">
3928
- <xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
4011
+ <xsl:apply-templates select="*[local-name()='name']"/>
3929
4012
  </fo:block>
3930
- <xsl:apply-templates/>
4013
+ <xsl:apply-templates select="node()[not(local-name()='name')]"/>
3931
4014
  </xsl:template><xsl:template match="*[local-name() = 'callout']">
3932
4015
  <fo:basic-link internal-destination="{@target}" fox:alt-text="{@target}">&lt;<xsl:apply-templates/>&gt;</fo:basic-link>
3933
4016
  </xsl:template><xsl:template match="*[local-name() = 'annotation']">
@@ -3949,7 +4032,6 @@
3949
4032
  </fo:inline>
3950
4033
  </xsl:template><xsl:template match="*[local-name() = 'xref']">
3951
4034
  <fo:basic-link internal-destination="{@target}" fox:alt-text="{@target}" xsl:use-attribute-sets="xref-style">
3952
-
3953
4035
  <xsl:apply-templates/>
3954
4036
  </fo:basic-link>
3955
4037
  </xsl:template><xsl:template match="*[local-name() = 'formula']" name="formula">
@@ -3977,58 +4059,73 @@
3977
4059
  <fo:inline>
3978
4060
  <xsl:apply-templates/>
3979
4061
  </fo:inline>
3980
- </xsl:template><xsl:template match="*[local-name() = 'formula']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'formula']/*[local-name() = 'name']" mode="presentation">
4062
+ </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 -->
3981
4063
  <xsl:if test="normalize-space() != ''">
3982
4064
  <xsl:text>(</xsl:text><xsl:apply-templates/><xsl:text>)</xsl:text>
3983
4065
  </xsl:if>
3984
4066
  </xsl:template><xsl:template match="*[local-name() = 'note']" name="note">
3985
4067
 
3986
4068
  <fo:block-container id="{@id}" xsl:use-attribute-sets="note-style">
4069
+
4070
+
3987
4071
 
3988
4072
 
3989
4073
 
3990
4074
 
3991
4075
 
4076
+
4077
+
4078
+
4079
+
3992
4080
  <fo:block-container margin-left="0mm">
4081
+
3993
4082
 
3994
4083
 
3995
4084
 
4085
+
3996
4086
 
3997
-
3998
-
3999
-
4000
-
4001
- <fo:block>
4002
-
4003
-
4004
- <xsl:attribute name="font-size">10pt</xsl:attribute>
4005
- <xsl:attribute name="text-indent">0</xsl:attribute>
4006
- <xsl:attribute name="padding-top">1.5mm</xsl:attribute>
4007
- <xsl:if test="../@type = 'source' or ../@type = 'abbreviation'">
4008
- <xsl:attribute name="font-size">9pt</xsl:attribute>
4009
- <xsl:attribute name="text-align">justify</xsl:attribute>
4010
- <xsl:attribute name="padding-top">0mm</xsl:attribute>
4011
- </xsl:if>
4012
-
4013
-
4014
-
4015
-
4087
+ <fo:block>
4088
+
4089
+
4016
4090
 
4017
- <fo:inline xsl:use-attribute-sets="note-name-style">
4018
4091
 
4019
- <xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
4020
- </fo:inline>
4021
- <xsl:apply-templates/>
4022
- </fo:block>
4023
-
4024
-
4092
+
4093
+
4094
+ <xsl:attribute name="font-size">10pt</xsl:attribute>
4095
+ <xsl:attribute name="text-indent">0</xsl:attribute>
4096
+ <xsl:attribute name="padding-top">1.5mm</xsl:attribute>
4097
+ <xsl:if test="../@type = 'source' or ../@type = 'abbreviation'">
4098
+ <xsl:attribute name="font-size">9pt</xsl:attribute>
4099
+ <xsl:attribute name="text-align">justify</xsl:attribute>
4100
+ <xsl:attribute name="padding-top">0mm</xsl:attribute>
4101
+ </xsl:if>
4102
+
4103
+
4104
+ <fo:inline xsl:use-attribute-sets="note-name-style">
4105
+
4106
+
4107
+
4108
+ <!-- if note contains only one element and first and last childs are `add` ace-tag, then move start ace-tag before NOTE's name-->
4109
+ <xsl:if test="count(*[not(local-name() = 'name')]) = 1 and *[not(local-name() = 'name')]/node()[last()][local-name() = 'add'][starts-with(text(), $ace_tag)]">
4110
+ <xsl:apply-templates select="*[not(local-name() = 'name')]/node()[1][local-name() = 'add'][starts-with(text(), $ace_tag)]">
4111
+ <xsl:with-param name="skip">false</xsl:with-param>
4112
+ </xsl:apply-templates>
4113
+ </xsl:if>
4114
+
4115
+ <xsl:apply-templates select="*[local-name() = 'name']"/>
4116
+
4117
+ </fo:inline>
4118
+
4119
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
4120
+ </fo:block>
4121
+
4025
4122
  </fo:block-container>
4026
4123
  </fo:block-container>
4027
4124
 
4028
4125
  </xsl:template><xsl:template match="*[local-name() = 'note']/*[local-name() = 'p']">
4029
4126
  <xsl:variable name="num"><xsl:number/></xsl:variable>
4030
4127
  <xsl:choose>
4031
- <xsl:when test="$num = 1">
4128
+ <xsl:when test="$num = 1"> <!-- display first NOTE's paragraph in the same line with label NOTE -->
4032
4129
  <fo:inline xsl:use-attribute-sets="note-p-style">
4033
4130
  <xsl:apply-templates/>
4034
4131
  </fo:inline>
@@ -4043,12 +4140,16 @@
4043
4140
  <fo:block id="{@id}" xsl:use-attribute-sets="termnote-style">
4044
4141
 
4045
4142
  <fo:inline xsl:use-attribute-sets="termnote-name-style">
4143
+
4144
+
4145
+
4146
+ <xsl:apply-templates select="*[local-name() = 'name']"/>
4046
4147
 
4047
- <xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
4048
4148
  </fo:inline>
4049
- <xsl:apply-templates/>
4149
+
4150
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
4050
4151
  </fo:block>
4051
- </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">
4152
+ </xsl:template><xsl:template match="*[local-name() = 'note']/*[local-name() = 'name']">
4052
4153
  <xsl:param name="sfx"/>
4053
4154
  <xsl:variable name="suffix">
4054
4155
  <xsl:choose>
@@ -4067,7 +4168,7 @@
4067
4168
  <xsl:apply-templates/>
4068
4169
  <xsl:value-of select="$suffix"/>
4069
4170
  </xsl:if>
4070
- </xsl:template><xsl:template match="*[local-name() = 'termnote']/*[local-name() = 'name']" mode="presentation">
4171
+ </xsl:template><xsl:template match="*[local-name() = 'termnote']/*[local-name() = 'name']">
4071
4172
  <xsl:param name="sfx"/>
4072
4173
  <xsl:variable name="suffix">
4073
4174
  <xsl:choose>
@@ -4094,25 +4195,23 @@
4094
4195
  <xsl:apply-templates/>
4095
4196
  </fo:block>
4096
4197
  </xsl:template><xsl:template match="*[local-name() = 'term']">
4097
- <!-- <xsl:message>'term' <xsl:number/> processing, name=<xsl:value-of select="iso:name"/>, preferred=<xsl:value-of select="iso:preferred"/>...</xsl:message> -->
4098
4198
  <fo:block id="{@id}" xsl:use-attribute-sets="term-style">
4099
4199
 
4100
4200
 
4201
+
4202
+
4101
4203
  <xsl:if test="parent::*[local-name() = 'term'] and not(preceding-sibling::*[local-name() = 'term'])">
4102
4204
 
4103
4205
  </xsl:if>
4104
- <xsl:apply-templates/>
4206
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
4105
4207
  </fo:block>
4106
- </xsl:template><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']" mode="presentation">
4208
+ </xsl:template><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']">
4107
4209
  <xsl:if test="normalize-space() != ''">
4108
4210
  <xsl:variable name="level">
4109
4211
  <xsl:call-template name="getLevelTermName"/>
4110
4212
  </xsl:variable>
4111
4213
  <fo:inline role="H{$level}">
4112
4214
  <xsl:apply-templates/>
4113
- <!-- <xsl:if test="$namespace = 'gb' or $namespace = 'ogc'">
4114
- <xsl:text>.</xsl:text>
4115
- </xsl:if> -->
4116
4215
  </fo:inline>
4117
4216
  </xsl:if>
4118
4217
  </xsl:template><xsl:template match="*[local-name() = 'figure']" name="figure">
@@ -4125,9 +4224,10 @@
4125
4224
  <xsl:with-param name="isDeleted" select="$isDeleted"/>
4126
4225
  </xsl:call-template>
4127
4226
 
4128
- <fo:block>
4129
-
4130
- <xsl:apply-templates/>
4227
+
4228
+
4229
+ <fo:block xsl:use-attribute-sets="figure-style">
4230
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
4131
4231
  </fo:block>
4132
4232
  <xsl:call-template name="fn_display_figure"/>
4133
4233
  <xsl:for-each select="*[local-name() = 'note']">
@@ -4135,14 +4235,15 @@
4135
4235
  </xsl:for-each>
4136
4236
 
4137
4237
 
4138
- <xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
4238
+ <xsl:apply-templates select="*[local-name() = 'name']"/> <!-- show figure's name AFTER image -->
4239
+
4139
4240
 
4140
4241
  </fo:block-container>
4141
4242
  </xsl:template><xsl:template match="*[local-name() = 'figure'][@class = 'pseudocode']">
4142
4243
  <fo:block id="{@id}">
4143
- <xsl:apply-templates/>
4244
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
4144
4245
  </fo:block>
4145
- <xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
4246
+ <xsl:apply-templates select="*[local-name() = 'name']"/>
4146
4247
  </xsl:template><xsl:template match="*[local-name() = 'figure'][@class = 'pseudocode']//*[local-name() = 'p']">
4147
4248
  <fo:block xsl:use-attribute-sets="figure-pseudocode-p-style">
4148
4249
  <xsl:apply-templates/>
@@ -4249,9 +4350,7 @@
4249
4350
  <xsl:variable name="bis" select="java:java.io.ByteArrayInputStream.new($fileContent)"/>
4250
4351
  <xsl:variable name="bufferedImage" select="java:javax.imageio.ImageIO.read($bis)"/>
4251
4352
  <xsl:variable name="width" select="java:getWidth($bufferedImage)"/>
4252
- <!-- width=<xsl:value-of select="$width"/> -->
4253
4353
  <xsl:variable name="height" select="java:getHeight($bufferedImage)"/>
4254
- <!-- height=<xsl:value-of select="$height"/> -->
4255
4354
  <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">
4256
4355
  <image xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="{@src}" height="{$height}" width="{$width}" style="overflow:visible;"/>
4257
4356
  <xsl:call-template name="svg_cross">
@@ -4521,7 +4620,7 @@
4521
4620
  </fo:basic-link>
4522
4621
  </fo:block>
4523
4622
  </fo:block-container>
4524
- </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">
4623
+ </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">
4525
4624
  <xsl:apply-templates mode="contents"/>
4526
4625
  <xsl:text> </xsl:text>
4527
4626
  </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">
@@ -4533,11 +4632,72 @@
4533
4632
  <xsl:value-of select="."/>
4534
4633
  </xsl:template><xsl:template match="node()" mode="contents">
4535
4634
  <xsl:apply-templates mode="contents"/>
4635
+ </xsl:template><xsl:template match="*[local-name() = 'p'][@type = 'floating-title' or @type = 'section-title']" priority="2" mode="contents">
4636
+ <xsl:variable name="level">
4637
+ <xsl:call-template name="getLevel">
4638
+ <xsl:with-param name="depth" select="@depth"/>
4639
+ </xsl:call-template>
4640
+ </xsl:variable>
4641
+
4642
+ <xsl:variable name="section">
4643
+ <xsl:choose>
4644
+ <xsl:when test="@type = 'section-title'"/>
4645
+ <xsl:otherwise>
4646
+ <xsl:value-of select="*[local-name() = 'tab'][1]/preceding-sibling::node()"/>
4647
+ </xsl:otherwise>
4648
+ </xsl:choose>
4649
+ </xsl:variable>
4650
+
4651
+ <xsl:variable name="type"><xsl:value-of select="@type"/></xsl:variable>
4652
+
4653
+ <xsl:variable name="display">
4654
+ <xsl:choose>
4655
+ <xsl:when test="normalize-space(@id) = ''">false</xsl:when>
4656
+ <xsl:when test="$level &lt;= $toc_level">true</xsl:when>
4657
+ <xsl:otherwise>false</xsl:otherwise>
4658
+ </xsl:choose>
4659
+ </xsl:variable>
4660
+
4661
+ <xsl:variable name="skip">false</xsl:variable>
4662
+
4663
+ <xsl:if test="$skip = 'false'">
4664
+
4665
+ <xsl:variable name="title">
4666
+ <xsl:choose>
4667
+ <xsl:when test="*[local-name() = 'tab']">
4668
+ <xsl:choose>
4669
+ <xsl:when test="@type = 'section-title'">
4670
+ <xsl:value-of select="*[local-name() = 'tab'][1]/preceding-sibling::node()"/>
4671
+ <xsl:text>: </xsl:text>
4672
+ <xsl:copy-of select="*[local-name() = 'tab'][1]/following-sibling::node()"/>
4673
+ </xsl:when>
4674
+ <xsl:otherwise>
4675
+ <xsl:copy-of select="*[local-name() = 'tab'][1]/following-sibling::node()"/>
4676
+ </xsl:otherwise>
4677
+ </xsl:choose>
4678
+ </xsl:when>
4679
+ <xsl:otherwise>
4680
+ <xsl:copy-of select="node()"/>
4681
+ </xsl:otherwise>
4682
+ </xsl:choose>
4683
+ </xsl:variable>
4684
+
4685
+ <xsl:variable name="root">
4686
+ <xsl:if test="ancestor-or-self::*[local-name() = 'preface']">preface</xsl:if>
4687
+ <xsl:if test="ancestor-or-self::*[local-name() = 'annex']">annex</xsl:if>
4688
+ </xsl:variable>
4689
+
4690
+ <item id="{@id}" level="{$level}" section="{$section}" type="{$type}" root="{$root}" display="{$display}">
4691
+ <title>
4692
+ <xsl:apply-templates select="xalan:nodeset($title)" mode="contents_item"/>
4693
+ </title>
4694
+ </item>
4695
+ </xsl:if>
4536
4696
  </xsl:template><xsl:template match="node()" mode="bookmarks">
4537
4697
  <xsl:apply-templates mode="bookmarks"/>
4538
4698
  </xsl:template><xsl:template match="*[local-name() = 'title' or local-name() = 'name']//*[local-name() = 'stem']" mode="contents">
4539
4699
  <xsl:apply-templates select="."/>
4540
- </xsl:template><xsl:template match="*[local-name() = 'references'][@hidden='true']" mode="contents" priority="3"/><xsl:template match="*[local-name() = 'stem']" mode="bookmarks">
4700
+ </xsl:template><xsl:template match="*[local-name() = 'references'][@hidden='true']" mode="contents" priority="3"/><xsl:template match="*[local-name() = 'references']/*[local-name() = 'bibitem']" mode="contents"/><xsl:template match="*[local-name() = 'stem']" mode="bookmarks">
4541
4701
  <xsl:apply-templates mode="bookmarks"/>
4542
4702
  </xsl:template><xsl:template name="addBookmarks">
4543
4703
  <xsl:param name="contents"/>
@@ -4627,8 +4787,6 @@
4627
4787
 
4628
4788
 
4629
4789
 
4630
-
4631
-
4632
4790
  </fo:bookmark-tree>
4633
4791
  </xsl:if>
4634
4792
  </xsl:template><xsl:template name="insertFigureBookmarks">
@@ -4699,7 +4857,7 @@
4699
4857
  <xsl:apply-templates mode="bookmark"/>
4700
4858
  </xsl:otherwise>
4701
4859
  </xsl:choose>
4702
- </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">
4860
+ </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']">
4703
4861
  <xsl:if test="normalize-space() != ''">
4704
4862
  <fo:block xsl:use-attribute-sets="figure-name-style">
4705
4863
 
@@ -4708,16 +4866,13 @@
4708
4866
  </fo:block>
4709
4867
  </xsl:if>
4710
4868
  </xsl:template><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'fn']" priority="2"/><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'note']"/><xsl:template match="*[local-name() = 'title']" mode="contents_item">
4711
- <xsl:apply-templates mode="contents_item"/>
4869
+ <xsl:param name="mode">bookmarks</xsl:param>
4870
+ <xsl:apply-templates mode="contents_item">
4871
+ <xsl:with-param name="mode" select="$mode"/>
4872
+ </xsl:apply-templates>
4712
4873
  <!-- <xsl:text> </xsl:text> -->
4713
4874
  </xsl:template><xsl:template name="getSection">
4714
4875
  <xsl:value-of select="*[local-name() = 'title']/*[local-name() = 'tab'][1]/preceding-sibling::node()"/>
4715
- <!--
4716
- <xsl:for-each select="*[local-name() = 'title']/*[local-name() = 'tab'][1]/preceding-sibling::node()">
4717
- <xsl:value-of select="."/>
4718
- </xsl:for-each>
4719
- -->
4720
-
4721
4876
  </xsl:template><xsl:template name="getName">
4722
4877
  <xsl:choose>
4723
4878
  <xsl:when test="*[local-name() = 'title']/*[local-name() = 'tab']">
@@ -4781,9 +4936,26 @@
4781
4936
  <xsl:copy-of select="."/>
4782
4937
  </xsl:template><xsl:template match="*[local-name() = 'br']" mode="contents_item">
4783
4938
  <xsl:text> </xsl:text>
4939
+ </xsl:template><xsl:template match="*[local-name() = 'name']" mode="contents_item">
4940
+ <xsl:param name="mode">bookmarks</xsl:param>
4941
+ <xsl:apply-templates mode="contents_item">
4942
+ <xsl:with-param name="mode" select="$mode"/>
4943
+ </xsl:apply-templates>
4944
+ </xsl:template><xsl:template match="*[local-name() = 'add']" mode="contents_item">
4945
+ <xsl:param name="mode">bookmarks</xsl:param>
4946
+ <xsl:choose>
4947
+ <xsl:when test="starts-with(text(), $ace_tag)">
4948
+ <xsl:if test="$mode = 'contents'">
4949
+ <xsl:copy>
4950
+ <xsl:apply-templates mode="contents_item"/>
4951
+ </xsl:copy>
4952
+ </xsl:if>
4953
+ </xsl:when>
4954
+ <xsl:otherwise><xsl:apply-templates mode="contents_item"/></xsl:otherwise>
4955
+ </xsl:choose>
4784
4956
  </xsl:template><xsl:template match="*[local-name()='sourcecode']" name="sourcecode">
4785
4957
 
4786
- <fo:block-container margin-left="0mm">
4958
+ <fo:block-container xsl:use-attribute-sets="sourcecode-container-style">
4787
4959
  <xsl:copy-of select="@id"/>
4788
4960
 
4789
4961
  <xsl:if test="parent::*[local-name() = 'note']">
@@ -4820,6 +4992,7 @@
4820
4992
 
4821
4993
  10
4822
4994
  </xsl:variable>
4995
+
4823
4996
  <xsl:variable name="font-size" select="normalize-space($_font-size)"/>
4824
4997
  <xsl:if test="$font-size != ''">
4825
4998
  <xsl:attribute name="font-size">
@@ -4836,11 +5009,11 @@
4836
5009
 
4837
5010
 
4838
5011
 
4839
- <xsl:apply-templates/>
5012
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
4840
5013
  </fo:block>
4841
5014
 
4842
5015
 
4843
- <xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
5016
+ <xsl:apply-templates select="*[local-name()='name']"/> <!-- show sourcecode's name AFTER content -->
4844
5017
 
4845
5018
 
4846
5019
 
@@ -4854,7 +5027,7 @@
4854
5027
  <xsl:call-template name="add-zero-spaces-java">
4855
5028
  <xsl:with-param name="text" select="$text"/>
4856
5029
  </xsl:call-template>
4857
- </xsl:template><xsl:template match="*[local-name() = 'sourcecode']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'sourcecode']/*[local-name() = 'name']" mode="presentation">
5030
+ </xsl:template><xsl:template match="*[local-name() = 'sourcecode']/*[local-name() = 'name']">
4858
5031
  <xsl:if test="normalize-space() != ''">
4859
5032
  <fo:block xsl:use-attribute-sets="sourcecode-name-style">
4860
5033
  <xsl:apply-templates/>
@@ -4862,10 +5035,10 @@
4862
5035
  </xsl:if>
4863
5036
  </xsl:template><xsl:template match="*[local-name() = 'permission']">
4864
5037
  <fo:block id="{@id}" xsl:use-attribute-sets="permission-style">
4865
- <xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
4866
- <xsl:apply-templates/>
5038
+ <xsl:apply-templates select="*[local-name()='name']"/>
5039
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
4867
5040
  </fo:block>
4868
- </xsl:template><xsl:template match="*[local-name() = 'permission']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'permission']/*[local-name() = 'name']" mode="presentation">
5041
+ </xsl:template><xsl:template match="*[local-name() = 'permission']/*[local-name() = 'name']">
4869
5042
  <xsl:if test="normalize-space() != ''">
4870
5043
  <fo:block xsl:use-attribute-sets="permission-name-style">
4871
5044
  <xsl:apply-templates/>
@@ -4878,13 +5051,13 @@
4878
5051
  </fo:block>
4879
5052
  </xsl:template><xsl:template match="*[local-name() = 'requirement']">
4880
5053
  <fo:block id="{@id}" xsl:use-attribute-sets="requirement-style">
4881
- <xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
4882
- <xsl:apply-templates select="*[local-name()='label']" mode="presentation"/>
4883
- <xsl:apply-templates select="@obligation" mode="presentation"/>
4884
- <xsl:apply-templates select="*[local-name()='subject']" mode="presentation"/>
4885
- <xsl:apply-templates/>
5054
+ <xsl:apply-templates select="*[local-name()='name']"/>
5055
+ <xsl:apply-templates select="*[local-name()='label']"/>
5056
+ <xsl:apply-templates select="@obligation"/>
5057
+ <xsl:apply-templates select="*[local-name()='subject']"/>
5058
+ <xsl:apply-templates select="node()[not(local-name() = 'name') and not(local-name() = 'label') and not(local-name() = 'subject')]"/>
4886
5059
  </fo:block>
4887
- </xsl:template><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'name']" mode="presentation">
5060
+ </xsl:template><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'name']">
4888
5061
  <xsl:if test="normalize-space() != ''">
4889
5062
  <fo:block xsl:use-attribute-sets="requirement-name-style">
4890
5063
 
@@ -4892,20 +5065,24 @@
4892
5065
 
4893
5066
  </fo:block>
4894
5067
  </xsl:if>
4895
- </xsl:template><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'label']"/><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'label']" mode="presentation">
5068
+ </xsl:template><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'label']">
4896
5069
  <fo:block xsl:use-attribute-sets="requirement-label-style">
4897
5070
  <xsl:apply-templates/>
4898
5071
  </fo:block>
4899
- </xsl:template><xsl:template match="*[local-name() = 'requirement']/@obligation" mode="presentation">
5072
+ </xsl:template><xsl:template match="*[local-name() = 'requirement']/@obligation">
4900
5073
  <fo:block>
4901
5074
  <fo:inline padding-right="3mm">Obligation</fo:inline><xsl:value-of select="."/>
4902
5075
  </fo:block>
5076
+ </xsl:template><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'subject']" priority="2">
5077
+ <fo:block xsl:use-attribute-sets="subject-style">
5078
+ <xsl:text>Target Type </xsl:text><xsl:apply-templates/>
5079
+ </fo:block>
4903
5080
  </xsl:template><xsl:template match="*[local-name() = 'recommendation']">
4904
5081
  <fo:block id="{@id}" xsl:use-attribute-sets="recommendation-style">
4905
- <xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
4906
- <xsl:apply-templates/>
5082
+ <xsl:apply-templates select="*[local-name()='name']"/>
5083
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
4907
5084
  </fo:block>
4908
- </xsl:template><xsl:template match="*[local-name() = 'recommendation']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'recommendation']/*[local-name() = 'name']" mode="presentation">
5085
+ </xsl:template><xsl:template match="*[local-name() = 'recommendation']/*[local-name() = 'name']">
4909
5086
  <xsl:if test="normalize-space() != ''">
4910
5087
  <fo:block xsl:use-attribute-sets="recommendation-name-style">
4911
5088
  <xsl:apply-templates/>
@@ -4916,10 +5093,6 @@
4916
5093
  <fo:block xsl:use-attribute-sets="recommendation-label-style">
4917
5094
  <xsl:apply-templates/>
4918
5095
  </fo:block>
4919
- </xsl:template><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'subject']" priority="2"/><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'subject']" mode="presentation">
4920
- <fo:block xsl:use-attribute-sets="subject-style">
4921
- <xsl:text>Target Type </xsl:text><xsl:apply-templates/>
4922
- </fo:block>
4923
5096
  </xsl:template><xsl:template match="*[local-name() = 'subject']">
4924
5097
  <fo:block xsl:use-attribute-sets="subject-style">
4925
5098
  <xsl:text>Target Type </xsl:text><xsl:apply-templates/>
@@ -4963,8 +5136,6 @@
4963
5136
  </xsl:variable>
4964
5137
  <xsl:variable name="cols-count" select="count(xalan:nodeset($simple-table)//tr[1]/td)"/>
4965
5138
  <xsl:if test="$cols-count = 2 and not(ancestor::*[local-name()='table'])">
4966
- <!-- <fo:table-column column-width="35mm"/>
4967
- <fo:table-column column-width="115mm"/> -->
4968
5139
  <fo:table-column column-width="30%"/>
4969
5140
  <fo:table-column column-width="70%"/>
4970
5141
  </xsl:if>
@@ -4974,7 +5145,7 @@
4974
5145
  <xsl:if test=".//*[local-name() = 'fn']">
4975
5146
  <xsl:for-each select="*[local-name() = 'tbody']">
4976
5147
  <fo:block font-size="90%" border-bottom="1pt solid black">
4977
- <xsl:call-template name="fn_display"/>
5148
+ <xsl:call-template name="table_fn_display"/>
4978
5149
  </fo:block>
4979
5150
  </xsl:for-each>
4980
5151
  </xsl:if>
@@ -4991,7 +5162,6 @@
4991
5162
  </xsl:template><xsl:template match="*[local-name()='tr']" mode="requirement">
4992
5163
  <fo:table-row height="7mm" border-bottom="0.5pt solid grey">
4993
5164
  <xsl:if test="parent::*[local-name()='thead']"> <!-- and not(ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']) -->
4994
- <!-- <xsl:attribute name="border">1pt solid black</xsl:attribute> -->
4995
5165
  <xsl:attribute name="background-color">rgb(33, 55, 92)</xsl:attribute>
4996
5166
  </xsl:if>
4997
5167
  <xsl:if test="starts-with(*[local-name()='td'][1], 'Requirement ')">
@@ -5002,36 +5172,13 @@
5002
5172
  </xsl:if>
5003
5173
  <xsl:apply-templates mode="requirement"/>
5004
5174
  </fo:table-row>
5005
- </xsl:template><xsl:template match="*[local-name()='th']" mode="requirement">
5006
- <fo:table-cell text-align="{@align}" display-align="center" padding="1mm" padding-left="2mm"> <!-- border="0.5pt solid black" -->
5007
- <xsl:attribute name="text-align">
5008
- <xsl:choose>
5009
- <xsl:when test="@align">
5010
- <xsl:value-of select="@align"/>
5011
- </xsl:when>
5012
- <xsl:otherwise>left</xsl:otherwise>
5013
- </xsl:choose>
5014
- </xsl:attribute>
5015
- <xsl:if test="@colspan">
5016
- <xsl:attribute name="number-columns-spanned">
5017
- <xsl:value-of select="@colspan"/>
5018
- </xsl:attribute>
5019
- </xsl:if>
5020
- <xsl:if test="@rowspan">
5021
- <xsl:attribute name="number-rows-spanned">
5022
- <xsl:value-of select="@rowspan"/>
5023
- </xsl:attribute>
5024
- </xsl:if>
5025
- <xsl:call-template name="display-align"/>
5175
+ </xsl:template><xsl:template match="*[local-name()='th']" mode="requirement">
5176
+ <fo:table-cell text-align="{@align}" display-align="center" padding="1mm" padding-left="2mm"> <!-- border="0.5pt solid black" -->
5177
+ <xsl:call-template name="setTextAlignment">
5178
+ <xsl:with-param name="default">left</xsl:with-param>
5179
+ </xsl:call-template>
5026
5180
 
5027
- <!-- <xsl:if test="ancestor::*[local-name()='table']/@type = 'recommend'">
5028
- <xsl:attribute name="padding-top">0.5mm</xsl:attribute>
5029
- <xsl:attribute name="background-color">rgb(165, 165, 165)</xsl:attribute>
5030
- </xsl:if>
5031
- <xsl:if test="ancestor::*[local-name()='table']/@type = 'recommendtest'">
5032
- <xsl:attribute name="padding-top">0.5mm</xsl:attribute>
5033
- <xsl:attribute name="background-color">rgb(201, 201, 201)</xsl:attribute>
5034
- </xsl:if> -->
5181
+ <xsl:call-template name="setTableCellAttributes"/>
5035
5182
 
5036
5183
  <fo:block>
5037
5184
  <xsl:apply-templates/>
@@ -5043,37 +5190,15 @@
5043
5190
  <xsl:attribute name="padding">0mm</xsl:attribute>
5044
5191
  <xsl:attribute name="padding-left">0mm</xsl:attribute>
5045
5192
  </xsl:if>
5046
- <xsl:attribute name="text-align">
5047
- <xsl:choose>
5048
- <xsl:when test="@align">
5049
- <xsl:value-of select="@align"/>
5050
- </xsl:when>
5051
- <xsl:otherwise>left</xsl:otherwise>
5052
- </xsl:choose>
5053
- </xsl:attribute>
5193
+ <xsl:call-template name="setTextAlignment">
5194
+ <xsl:with-param name="default">left</xsl:with-param>
5195
+ </xsl:call-template>
5196
+
5054
5197
  <xsl:if test="following-sibling::*[local-name()='td'] and not(preceding-sibling::*[local-name()='td'])">
5055
5198
  <xsl:attribute name="font-weight">bold</xsl:attribute>
5056
5199
  </xsl:if>
5057
- <xsl:if test="@colspan">
5058
- <xsl:attribute name="number-columns-spanned">
5059
- <xsl:value-of select="@colspan"/>
5060
- </xsl:attribute>
5061
- </xsl:if>
5062
- <xsl:if test="@rowspan">
5063
- <xsl:attribute name="number-rows-spanned">
5064
- <xsl:value-of select="@rowspan"/>
5065
- </xsl:attribute>
5066
- </xsl:if>
5067
- <xsl:call-template name="display-align"/>
5068
5200
 
5069
- <!-- <xsl:if test="ancestor::*[local-name()='table']/@type = 'recommend'">
5070
- <xsl:attribute name="padding-left">0.5mm</xsl:attribute>
5071
- <xsl:attribute name="padding-top">0.5mm</xsl:attribute>
5072
- <xsl:if test="parent::*[local-name()='tr']/preceding-sibling::*[local-name()='tr'] and not(*[local-name()='table'])">
5073
- <xsl:attribute name="background-color">rgb(201, 201, 201)</xsl:attribute>
5074
- </xsl:if>
5075
- </xsl:if> -->
5076
- <!-- 2nd line and below -->
5201
+ <xsl:call-template name="setTableCellAttributes"/>
5077
5202
 
5078
5203
  <fo:block>
5079
5204
  <xsl:apply-templates/>
@@ -5085,15 +5210,15 @@
5085
5210
  <xsl:apply-templates/>
5086
5211
  </fo:block>
5087
5212
  </xsl:template><xsl:template match="*[local-name() = 'p2'][ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']]">
5088
- <fo:block> <!-- margin-bottom="10pt" -->
5213
+ <fo:block>
5089
5214
  <xsl:apply-templates/>
5090
5215
  </fo:block>
5091
5216
  </xsl:template><xsl:template match="*[local-name() = 'termexample']">
5092
5217
  <fo:block id="{@id}" xsl:use-attribute-sets="termexample-style">
5093
- <xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
5094
- <xsl:apply-templates/>
5218
+ <xsl:apply-templates select="*[local-name()='name']"/>
5219
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
5095
5220
  </fo:block>
5096
- </xsl:template><xsl:template match="*[local-name() = 'termexample']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'termexample']/*[local-name() = 'name']" mode="presentation">
5221
+ </xsl:template><xsl:template match="*[local-name() = 'termexample']/*[local-name() = 'name']">
5097
5222
  <xsl:if test="normalize-space() != ''">
5098
5223
  <fo:inline xsl:use-attribute-sets="termexample-name-style">
5099
5224
  <xsl:apply-templates/>
@@ -5117,42 +5242,46 @@
5117
5242
  <fo:block id="{@id}" xsl:use-attribute-sets="example-style">
5118
5243
 
5119
5244
 
5120
- <xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
5121
-
5122
- <xsl:variable name="element">
5123
- block
5124
-
5125
- <xsl:if test=".//*[local-name() = 'table']">block</xsl:if>
5245
+ <xsl:variable name="fo_element">
5246
+ <xsl:if test=".//*[local-name() = 'table'] or .//*[local-name() = 'dl']">block</xsl:if>
5247
+ block
5126
5248
  </xsl:variable>
5127
5249
 
5250
+ <!-- display 'EXAMPLE' -->
5251
+ <xsl:apply-templates select="*[local-name()='name']">
5252
+ <xsl:with-param name="fo_element" select="$fo_element"/>
5253
+ </xsl:apply-templates>
5254
+
5128
5255
  <xsl:choose>
5129
- <xsl:when test="contains(normalize-space($element), 'block')">
5130
- <fo:block xsl:use-attribute-sets="example-body-style">
5131
- <xsl:apply-templates/>
5132
- </fo:block>
5256
+ <xsl:when test="contains(normalize-space($fo_element), 'block')">
5257
+ <fo:block-container xsl:use-attribute-sets="example-body-style">
5258
+ <fo:block-container margin-left="0mm" margin-right="0mm">
5259
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]">
5260
+ <xsl:with-param name="fo_element" select="$fo_element"/>
5261
+ </xsl:apply-templates>
5262
+ </fo:block-container>
5263
+ </fo:block-container>
5133
5264
  </xsl:when>
5134
5265
  <xsl:otherwise>
5135
5266
  <fo:inline>
5136
- <xsl:apply-templates/>
5267
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]">
5268
+ <xsl:with-param name="fo_element" select="$fo_element"/>
5269
+ </xsl:apply-templates>
5137
5270
  </fo:inline>
5138
5271
  </xsl:otherwise>
5139
5272
  </xsl:choose>
5140
5273
 
5141
5274
  </fo:block>
5142
- </xsl:template><xsl:template match="*[local-name() = 'example']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'example']/*[local-name() = 'name']" mode="presentation">
5143
-
5144
- <xsl:variable name="element">
5145
- block
5146
-
5147
- <xsl:if test="following-sibling::*[1][local-name() = 'table']">block</xsl:if>
5148
- </xsl:variable>
5275
+ </xsl:template><xsl:template match="*[local-name() = 'example']/*[local-name() = 'name']">
5276
+ <xsl:param name="fo_element">block</xsl:param>
5277
+
5149
5278
  <xsl:choose>
5150
5279
  <xsl:when test="ancestor::*[local-name() = 'appendix']">
5151
5280
  <fo:inline>
5152
5281
  <xsl:apply-templates/>
5153
5282
  </fo:inline>
5154
5283
  </xsl:when>
5155
- <xsl:when test="contains(normalize-space($element), 'block')">
5284
+ <xsl:when test="contains(normalize-space($fo_element), 'block')">
5156
5285
  <fo:block xsl:use-attribute-sets="example-name-style">
5157
5286
  <xsl:apply-templates/>
5158
5287
  </fo:block>
@@ -5165,17 +5294,17 @@
5165
5294
  </xsl:choose>
5166
5295
 
5167
5296
  </xsl:template><xsl:template match="*[local-name() = 'example']/*[local-name() = 'p']">
5297
+ <xsl:param name="fo_element">block</xsl:param>
5298
+
5168
5299
  <xsl:variable name="num"><xsl:number/></xsl:variable>
5169
5300
  <xsl:variable name="element">
5170
- block
5171
-
5172
5301
 
5302
+ <xsl:value-of select="$fo_element"/>
5173
5303
  </xsl:variable>
5174
5304
  <xsl:choose>
5175
- <xsl:when test="normalize-space($element) = 'block'">
5305
+ <xsl:when test="starts-with(normalize-space($element), 'block')">
5176
5306
  <fo:block xsl:use-attribute-sets="example-p-style">
5177
5307
 
5178
- <xsl:variable name="num"><xsl:number/></xsl:variable>
5179
5308
  <xsl:if test="$num = 1">
5180
5309
  <xsl:attribute name="margin-left">5mm</xsl:attribute>
5181
5310
  </xsl:if>
@@ -5192,6 +5321,8 @@
5192
5321
  </xsl:template><xsl:template match="*[local-name() = 'termsource']" name="termsource">
5193
5322
  <fo:block xsl:use-attribute-sets="termsource-style">
5194
5323
 
5324
+
5325
+
5195
5326
  <!-- Example: [SOURCE: ISO 5127:2017, 3.1.6.02] -->
5196
5327
  <xsl:variable name="termsource_text">
5197
5328
  <xsl:apply-templates/>
@@ -5229,9 +5360,7 @@
5229
5360
  <xsl:value-of select="."/>
5230
5361
  </xsl:if>
5231
5362
  </xsl:template><xsl:template match="*[local-name() = 'termsource']/*[local-name() = 'strong'][1][following-sibling::*[1][local-name() = 'origin']]/text()">
5232
- <fo:inline>
5233
-
5234
-
5363
+ <fo:inline xsl:use-attribute-sets="termsource-text-style">
5235
5364
  <xsl:value-of select="."/>
5236
5365
  </fo:inline>
5237
5366
  </xsl:template><xsl:template match="*[local-name() = 'origin']">
@@ -5245,12 +5374,9 @@
5245
5374
  </fo:basic-link>
5246
5375
  </xsl:template><xsl:template match="*[local-name() = 'modification']">
5247
5376
  <xsl:variable name="title-modified">
5248
-
5249
-
5250
- <xsl:call-template name="getTitle">
5251
- <xsl:with-param name="name" select="'title-modified'"/>
5252
- </xsl:call-template>
5253
-
5377
+ <xsl:call-template name="getLocalizedString">
5378
+ <xsl:with-param name="key">modified</xsl:with-param>
5379
+ </xsl:call-template>
5254
5380
  </xsl:variable>
5255
5381
 
5256
5382
  <xsl:variable name="text"><xsl:apply-templates/></xsl:variable>
@@ -5277,7 +5403,6 @@
5277
5403
  <fo:block-container margin-left="0mm">
5278
5404
 
5279
5405
  <fo:block xsl:use-attribute-sets="quote-style">
5280
- <!-- <xsl:apply-templates select=".//*[local-name() = 'p']"/> -->
5281
5406
 
5282
5407
  <xsl:apply-templates select="./node()[not(local-name() = 'author') and not(local-name() = 'source')]"/> <!-- process all nested nodes, except author and source -->
5283
5408
  </fo:block>
@@ -5320,15 +5445,13 @@
5320
5445
  </xsl:variable>
5321
5446
 
5322
5447
  <xsl:choose>
5323
- <xsl:when test="normalize-space($bibitemid) != ''">
5448
+ <xsl:when test="normalize-space($bibitemid) != ''"> <!-- if in the bibliography there is the item with @bibitemid (and not hidden), then create link -->
5324
5449
  <fo:inline xsl:use-attribute-sets="eref-style">
5325
5450
  <xsl:if test="@type = 'footnote'">
5326
-
5327
- <xsl:attribute name="keep-together.within-line">always</xsl:attribute>
5328
- <xsl:attribute name="font-size">80%</xsl:attribute>
5329
- <xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
5330
- <xsl:attribute name="vertical-align">super</xsl:attribute>
5331
-
5451
+ <xsl:attribute name="keep-together.within-line">always</xsl:attribute>
5452
+ <xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
5453
+ <xsl:attribute name="vertical-align">super</xsl:attribute>
5454
+ <xsl:attribute name="font-size">80%</xsl:attribute>
5332
5455
 
5333
5456
  </xsl:if>
5334
5457
 
@@ -5345,7 +5468,6 @@
5345
5468
 
5346
5469
 
5347
5470
 
5348
-
5349
5471
  <xsl:attribute name="text-decoration">underline</xsl:attribute>
5350
5472
 
5351
5473
  </xsl:if>
@@ -5405,8 +5527,6 @@
5405
5527
  </xsl:choose>
5406
5528
  </xsl:variable>
5407
5529
 
5408
- <!-- <xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/> -->
5409
-
5410
5530
  <xsl:choose>
5411
5531
  <xsl:when test="$lang = 'zh'">
5412
5532
  <fo:inline><xsl:value-of select="$tab_zh"/></fo:inline>
@@ -5441,12 +5561,9 @@
5441
5561
  </fo:block>
5442
5562
  </xsl:template><xsl:template match="*[local-name() = 'deprecates']">
5443
5563
  <xsl:variable name="title-deprecated">
5444
-
5445
-
5446
- <xsl:call-template name="getTitle">
5447
- <xsl:with-param name="name" select="'title-deprecated'"/>
5448
- </xsl:call-template>
5449
-
5564
+ <xsl:call-template name="getLocalizedString">
5565
+ <xsl:with-param name="key">deprecated</xsl:with-param>
5566
+ </xsl:call-template>
5450
5567
  </xsl:variable>
5451
5568
  <fo:block xsl:use-attribute-sets="deprecates-style">
5452
5569
  <xsl:value-of select="$title-deprecated"/>: <xsl:apply-templates/>
@@ -5455,6 +5572,8 @@
5455
5572
  <xsl:if test="*[local-name() = 'strong']">
5456
5573
  <xsl:attribute name="font-weight">normal</xsl:attribute>
5457
5574
  </xsl:if>
5575
+ </xsl:template><xsl:template match="*[local-name() = 'preferred']/text()[contains(., ';')] | *[local-name() = 'preferred']/*[local-name() = 'strong']/text()[contains(., ';')]">
5576
+ <xsl:value-of select="java:replaceAll(java:java.lang.String.new(.), ';', $linebreak)"/>
5458
5577
  </xsl:template><xsl:template match="*[local-name() = 'definition']">
5459
5578
  <fo:block xsl:use-attribute-sets="definition-style">
5460
5579
  <xsl:apply-templates/>
@@ -5463,7 +5582,6 @@
5463
5582
  <xsl:apply-templates/>
5464
5583
  </xsl:template><xsl:template match="*[local-name() = 'definition'][preceding-sibling::*[local-name() = 'domain']]/*[local-name() = 'p'][1]">
5465
5584
  <fo:inline> <xsl:apply-templates/></fo:inline>
5466
- <!-- <fo:block>&#xA0;</fo:block> -->
5467
5585
  <fo:block/>
5468
5586
  </xsl:template><xsl:template match="/*/*[local-name() = 'sections']/*" priority="2">
5469
5587
 
@@ -5504,11 +5622,6 @@
5504
5622
  <xsl:apply-templates/>
5505
5623
  </fo:block>
5506
5624
  </xsl:template><xsl:template match="*[local-name() = 'definitions']">
5507
- <fo:block id="{@id}">
5508
- <xsl:apply-templates/>
5509
- </fo:block>
5510
- </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']">
5511
-
5512
5625
  <fo:block id="{@id}">
5513
5626
  <xsl:apply-templates/>
5514
5627
  </fo:block>
@@ -5530,6 +5643,51 @@
5530
5643
  </xsl:template><xsl:template match="*[local-name() = 'name']/text()">
5531
5644
  <!-- 0xA0 to space replacement -->
5532
5645
  <xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),' ',' ')"/>
5646
+ </xsl:template><xsl:variable name="ul_labels_">
5647
+
5648
+
5649
+
5650
+
5651
+
5652
+
5653
+
5654
+
5655
+
5656
+
5657
+
5658
+
5659
+
5660
+
5661
+
5662
+
5663
+ <label>•</label>
5664
+
5665
+
5666
+ </xsl:variable><xsl:variable name="ul_labels" select="xalan:nodeset($ul_labels_)"/><xsl:template name="setULLabel">
5667
+ <xsl:variable name="list_level_" select="count(ancestor::*[local-name() = 'ul']) + count(ancestor::*[local-name() = 'ol'])"/>
5668
+ <xsl:variable name="list_level">
5669
+ <xsl:choose>
5670
+ <xsl:when test="$list_level_ &lt;= 3"><xsl:value-of select="$list_level_"/></xsl:when>
5671
+ <xsl:otherwise><xsl:value-of select="$list_level_ mod 3"/></xsl:otherwise>
5672
+ </xsl:choose>
5673
+ </xsl:variable>
5674
+ <xsl:choose>
5675
+ <xsl:when test="$ul_labels/label[not(@level)]"> <!-- one label for all levels -->
5676
+ <xsl:apply-templates select="$ul_labels/label[not(@level)]" mode="ul_labels"/>
5677
+ </xsl:when>
5678
+ <xsl:when test="$list_level mod 3 = 0">
5679
+ <xsl:apply-templates select="$ul_labels/label[@level = 3]" mode="ul_labels"/>
5680
+ </xsl:when>
5681
+ <xsl:when test="$list_level mod 2 = 0">
5682
+ <xsl:apply-templates select="$ul_labels/label[@level = 2]" mode="ul_labels"/>
5683
+ </xsl:when>
5684
+ <xsl:otherwise>
5685
+ <xsl:apply-templates select="$ul_labels/label[@level = 1]" mode="ul_labels"/>
5686
+ </xsl:otherwise>
5687
+ </xsl:choose>
5688
+ </xsl:template><xsl:template match="label" mode="ul_labels">
5689
+ <xsl:copy-of select="@*[not(local-name() = 'level')]"/>
5690
+ <xsl:value-of select="."/>
5533
5691
  </xsl:template><xsl:template match="*[local-name() = 'ul'] | *[local-name() = 'ol']">
5534
5692
  <xsl:choose>
5535
5693
  <xsl:when test="parent::*[local-name() = 'note'] or parent::*[local-name() = 'termnote']">
@@ -5736,20 +5894,70 @@
5736
5894
  <fo:table-cell border="1pt solid black" padding-left="1mm" padding-top="0.5mm">
5737
5895
  <fo:block><xsl:apply-templates/></fo:block>
5738
5896
  </fo:table-cell>
5739
- </xsl:template><xsl:template name="processBibitem">
5897
+ </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">
5898
+
5899
+
5900
+
5901
+ <fo:block id="{@id}">
5902
+ <xsl:apply-templates/>
5903
+ </fo:block>
5904
+ </xsl:template><xsl:template match="*[local-name() = 'references']">
5905
+ <xsl:if test="not(ancestor::*[local-name() = 'annex'])">
5906
+
5907
+ </xsl:if>
5908
+
5909
+ <!-- <xsl:if test="ancestor::*[local-name() = 'annex']">
5910
+ <xsl:if test="$namespace = 'csa' or $namespace = 'csd' or $namespace = 'gb' or $namespace = 'iec' or $namespace = 'iso' or $namespace = 'itu'">
5911
+ <fo:block break-after="page"/>
5912
+ </xsl:if>
5913
+ </xsl:if> -->
5914
+
5915
+ <fo:block id="{@id}" xsl:use-attribute-sets="references-non-normative-style">
5916
+ <xsl:apply-templates/>
5917
+ </fo:block>
5740
5918
 
5741
5919
 
5742
5920
 
5743
-
5744
5921
 
5922
+ </xsl:template><xsl:template match="*[local-name() = 'bibitem']">
5923
+ <xsl:call-template name="bibitem"/>
5924
+ </xsl:template><xsl:template match="*[local-name() = 'references'][@normative='true']/*[local-name() = 'bibitem']" name="bibitem" priority="2">
5925
+
5926
+ <fo:block id="{@id}" xsl:use-attribute-sets="bibitem-normative-style">
5927
+ <xsl:call-template name="processBibitem"/>
5928
+ </fo:block>
5929
+
5930
+
5931
+ </xsl:template><xsl:template match="*[local-name() = 'references'][not(@normative='true')]/*[local-name() = 'bibitem']" priority="2">
5745
5932
 
5746
-
5747
5933
 
5934
+ <fo:block id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-style">
5935
+ <xsl:call-template name="processBibitem"/>
5936
+ </fo:block>
5937
+
5748
5938
 
5939
+ </xsl:template><xsl:template name="processBibitem">
5749
5940
 
5750
5941
 
5942
+ <fo:inline padding-right="5mm">[<xsl:value-of select="un:docidentifier"/>]</fo:inline><xsl:value-of select="un:docidentifier"/>
5943
+ <xsl:if test="un:title">
5944
+ <fo:inline font-style="italic">
5945
+ <xsl:text>, </xsl:text>
5946
+ <xsl:choose>
5947
+ <xsl:when test="un:title[@type = 'main' and @language = 'en']">
5948
+ <xsl:apply-templates select="un:title[@type = 'main' and @language = 'en']"/>
5949
+ </xsl:when>
5950
+ <xsl:otherwise>
5951
+ <xsl:apply-templates select="un:title"/>
5952
+ </xsl:otherwise>
5953
+ </xsl:choose>
5954
+ </fo:inline>
5955
+ </xsl:if>
5956
+ <xsl:apply-templates select="un:formattedref"/>
5957
+
5958
+
5751
5959
  </xsl:template><xsl:template name="processBibitemDocId">
5752
- <xsl:variable name="_doc_ident" select="*[local-name() = 'docidentifier'][not(@type = 'DOI' or @type = 'metanorma' or @type = 'ISSN' or @type = 'ISBN' or @type = 'rfc-anchor')]"/>
5960
+ <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')]"/>
5753
5961
  <xsl:choose>
5754
5962
  <xsl:when test="normalize-space($_doc_ident) != ''">
5755
5963
  <!-- <xsl:variable name="type" select="*[local-name() = 'docidentifier'][not(@type = 'DOI' or @type = 'metanorma' or @type = 'ISSN' or @type = 'ISBN' or @type = 'rfc-anchor')]/@type"/>
@@ -5763,7 +5971,7 @@
5763
5971
  <xsl:if test="$type != ''">
5764
5972
  <xsl:value-of select="$type"/><xsl:text> </xsl:text>
5765
5973
  </xsl:if> -->
5766
- <xsl:value-of select="*[local-name() = 'docidentifier'][not(@type = 'metanorma')]"/>
5974
+ <xsl:value-of select="*[local-name() = 'docidentifier'][not(@type = 'metanorma') and not(@type = 'metanorma-ordinal')]"/>
5767
5975
  </xsl:otherwise>
5768
5976
  </xsl:choose>
5769
5977
  </xsl:template><xsl:template name="processPersonalAuthor">
@@ -5804,6 +6012,50 @@
5804
6012
  <xsl:value-of select="substring(.,1,1)"/>
5805
6013
  </xsl:template><xsl:template match="*[local-name() = 'title']" mode="title">
5806
6014
  <fo:inline><xsl:apply-templates/></fo:inline>
6015
+ </xsl:template><xsl:template match="*[local-name() = 'bibitem']/*[local-name() = 'title']" priority="2">
6016
+ <!-- <fo:inline><xsl:apply-templates /></fo:inline> -->
6017
+ <fo:inline font-style="italic"> <!-- BIPM BSI CSD CSA GB IEC IHO ISO ITU JCGM -->
6018
+ <xsl:apply-templates/>
6019
+ </fo:inline>
6020
+ </xsl:template><xsl:template match="*[local-name() = 'bibitem']/*[local-name() = 'note']" priority="2">
6021
+ <fo:footnote>
6022
+ <xsl:variable name="number">
6023
+
6024
+ <xsl:number level="any" count="*[local-name() = 'bibitem']/*[local-name() = 'note']"/>
6025
+
6026
+ </xsl:variable>
6027
+ <fo:inline xsl:use-attribute-sets="bibitem-note-fn-style">
6028
+ <fo:basic-link internal-destination="{generate-id()}" fox:alt-text="footnote {$number}">
6029
+ <xsl:value-of select="$number"/>
6030
+
6031
+ </fo:basic-link>
6032
+ </fo:inline>
6033
+ <fo:footnote-body>
6034
+ <fo:block xsl:use-attribute-sets="bibitem-note-fn-body-style">
6035
+ <fo:inline id="{generate-id()}" xsl:use-attribute-sets="bibitem-note-fn-number-style">
6036
+ <xsl:value-of select="$number"/>
6037
+
6038
+ </fo:inline>
6039
+ <xsl:apply-templates/>
6040
+ </fo:block>
6041
+ </fo:footnote-body>
6042
+ </fo:footnote>
6043
+ </xsl:template><xsl:template match="*[local-name() = 'bibitem']/*[local-name() = 'edition']"> <!-- for iho -->
6044
+ <xsl:text> edition </xsl:text>
6045
+ <xsl:value-of select="."/>
6046
+ </xsl:template><xsl:template match="*[local-name() = 'bibitem']/*[local-name() = 'uri']"> <!-- for iho -->
6047
+ <xsl:text> (</xsl:text>
6048
+ <fo:inline xsl:use-attribute-sets="link-style">
6049
+ <fo:basic-link external-destination="." fox:alt-text=".">
6050
+ <xsl:value-of select="."/>
6051
+ </fo:basic-link>
6052
+ </fo:inline>
6053
+ <xsl:text>)</xsl:text>
6054
+ </xsl:template><xsl:template match="*[local-name() = 'bibitem']/*[local-name() = 'docidentifier']"/><xsl:template match="*[local-name() = 'formattedref']">
6055
+
6056
+ <xsl:text>, </xsl:text>
6057
+
6058
+ <xsl:apply-templates/>
5807
6059
  </xsl:template><xsl:template match="*[local-name() = 'form']">
5808
6060
  <fo:block>
5809
6061
  <xsl:apply-templates/>
@@ -5869,27 +6121,14 @@
5869
6121
  <fo:block> </fo:block>
5870
6122
  </fo:block-container>
5871
6123
  </xsl:template><xsl:variable name="toc_level">
6124
+ <!-- https://www.metanorma.org/author/ref/document-attributes/ -->
6125
+ <xsl:variable name="htmltoclevels" select="normalize-space(//*[local-name() = 'misc-container']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name']/text() = 'HTML TOC Heading Levels']/*[local-name() = 'value'])"/> <!-- :htmltoclevels Number of table of contents levels to render in HTML/PDF output; used to override :toclevels:-->
6126
+ <xsl:variable name="toclevels" select="normalize-space(//*[local-name() = 'misc-container']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name']/text() = 'TOC Heading Levels']/*[local-name() = 'value'])"/> <!-- Number of table of contents levels to render -->
5872
6127
  <xsl:choose>
5873
- <xsl:when test="1 = 2"/> <!-- to do https://github.com/metanorma/mn-native-pdf/issues/337: if there is value in xml -->
6128
+ <xsl:when test="$htmltoclevels != ''"><xsl:value-of select="number($htmltoclevels)"/></xsl:when> <!-- if there is value in xml -->
6129
+ <xsl:when test="$toclevels != ''"><xsl:value-of select="number($toclevels)"/></xsl:when> <!-- if there is value in xml -->
5874
6130
  <xsl:otherwise><!-- default value -->
5875
-
5876
-
5877
-
5878
-
5879
-
5880
-
5881
-
5882
-
5883
-
5884
-
5885
-
5886
-
5887
-
5888
-
5889
-
5890
-
5891
6131
  3
5892
-
5893
6132
  </xsl:otherwise>
5894
6133
  </xsl:choose>
5895
6134
  </xsl:variable><xsl:template match="*[local-name() = 'toc']">
@@ -5972,7 +6211,7 @@
5972
6211
  </td>
5973
6212
  </xsl:for-each>
5974
6213
  <td>333</td> <!-- page number, just for fill -->
5975
- </xsl:template><xsl:template match="*[local-name() = 'variant-title'][@type = 'sub']"/><xsl:template match="*[local-name() = 'variant-title'][@type = 'sub']" mode="subtitle">
6214
+ </xsl:template><xsl:template match="*[local-name() = 'variant-title']"/><xsl:template match="*[local-name() = 'variant-title'][@type = 'sub']" mode="subtitle">
5976
6215
  <fo:inline padding-right="5mm"> </fo:inline>
5977
6216
  <fo:inline><xsl:apply-templates/></fo:inline>
5978
6217
  </xsl:template><xsl:template match="*[local-name() = 'blacksquare']" name="blacksquare">
@@ -5983,6 +6222,69 @@
5983
6222
  </svg>
5984
6223
  </fo:instream-foreign-object>
5985
6224
  </fo:inline>
6225
+ </xsl:template><xsl:template match="@language">
6226
+ <xsl:copy-of select="."/>
6227
+ </xsl:template><xsl:template match="*[local-name() = 'p'][@type = 'floating-title' or @type = 'section-title']" priority="4">
6228
+ <xsl:call-template name="title"/>
6229
+ </xsl:template><xsl:template match="*[local-name() = 'admonition']">
6230
+
6231
+
6232
+
6233
+ <!-- display name before box -->
6234
+ <fo:block xsl:use-attribute-sets="admonition-name-style">
6235
+ <xsl:call-template name="displayAdmonitionName"/>
6236
+ </fo:block>
6237
+
6238
+
6239
+ <!-- text in the box -->
6240
+ <fo:block-container id="{@id}" xsl:use-attribute-sets="admonition-style">
6241
+
6242
+
6243
+
6244
+
6245
+
6246
+ <fo:block-container xsl:use-attribute-sets="admonition-container-style">
6247
+
6248
+
6249
+ <fo:block-container margin-left="0mm" margin-right="0mm">
6250
+ <fo:block>
6251
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
6252
+ </fo:block>
6253
+ </fo:block-container>
6254
+
6255
+ </fo:block-container>
6256
+
6257
+ </fo:block-container>
6258
+
6259
+ </xsl:template><xsl:template name="displayAdmonitionName">
6260
+
6261
+ <xsl:apply-templates select="*[local-name() = 'name']"/>
6262
+ <xsl:if test="not(*[local-name() = 'name'])">
6263
+ <xsl:apply-templates select="@type"/>
6264
+ </xsl:if>
6265
+
6266
+ </xsl:template><xsl:template match="*[local-name() = 'admonition']/*[local-name() = 'name']">
6267
+ <xsl:apply-templates/>
6268
+ </xsl:template><xsl:template match="*[local-name() = 'admonition']/@type">
6269
+ <xsl:variable name="admonition_type_">
6270
+ <xsl:call-template name="getLocalizedString">
6271
+ <xsl:with-param name="key">admonition.<xsl:value-of select="."/></xsl:with-param>
6272
+ </xsl:call-template>
6273
+ </xsl:variable>
6274
+ <xsl:variable name="admonition_type" select="normalize-space(java:toUpperCase(java:java.lang.String.new($admonition_type_)))"/>
6275
+ <xsl:value-of select="$admonition_type"/>
6276
+ <xsl:if test="$admonition_type = ''">
6277
+ <xsl:value-of select="java:toUpperCase(java:java.lang.String.new(.))"/>
6278
+ </xsl:if>
6279
+ </xsl:template><xsl:template match="*[local-name() = 'admonition']/*[local-name() = 'p']">
6280
+
6281
+ <fo:block xsl:use-attribute-sets="admonition-p-style">
6282
+
6283
+
6284
+
6285
+ <xsl:apply-templates/>
6286
+ </fo:block>
6287
+
5986
6288
  </xsl:template><xsl:template name="convertDate">
5987
6289
  <xsl:param name="date"/>
5988
6290
  <xsl:param name="format" select="'short'"/>
@@ -5990,83 +6292,80 @@
5990
6292
  <xsl:variable name="month" select="substring($date, 6, 2)"/>
5991
6293
  <xsl:variable name="day" select="substring($date, 9, 2)"/>
5992
6294
  <xsl:variable name="monthStr">
5993
- <xsl:choose>
5994
- <xsl:when test="$month = '01'">January</xsl:when>
5995
- <xsl:when test="$month = '02'">February</xsl:when>
5996
- <xsl:when test="$month = '03'">March</xsl:when>
5997
- <xsl:when test="$month = '04'">April</xsl:when>
5998
- <xsl:when test="$month = '05'">May</xsl:when>
5999
- <xsl:when test="$month = '06'">June</xsl:when>
6000
- <xsl:when test="$month = '07'">July</xsl:when>
6001
- <xsl:when test="$month = '08'">August</xsl:when>
6002
- <xsl:when test="$month = '09'">September</xsl:when>
6003
- <xsl:when test="$month = '10'">October</xsl:when>
6004
- <xsl:when test="$month = '11'">November</xsl:when>
6005
- <xsl:when test="$month = '12'">December</xsl:when>
6006
- </xsl:choose>
6295
+ <xsl:call-template name="getMonthByNum">
6296
+ <xsl:with-param name="num" select="$month"/>
6297
+ <xsl:with-param name="lowercase" select="'true'"/>
6298
+ </xsl:call-template>
6299
+ </xsl:variable>
6300
+ <xsl:variable name="monthStr_localized">
6301
+ <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>
6007
6302
  </xsl:variable>
6008
6303
  <xsl:variable name="result">
6009
6304
  <xsl:choose>
6010
- <xsl:when test="$format = 'ddMMyyyy'">
6305
+ <xsl:when test="$format = 'ddMMyyyy'"> <!-- convert date from format 2007-04-01 to 1 April 2007 -->
6011
6306
  <xsl:if test="$day != ''"><xsl:value-of select="number($day)"/></xsl:if>
6012
6307
  <xsl:text> </xsl:text>
6013
- <xsl:value-of select="normalize-space(concat($monthStr, ' ' , $year))"/>
6308
+ <xsl:value-of select="normalize-space(concat($monthStr_localized, ' ' , $year))"/>
6014
6309
  </xsl:when>
6015
6310
  <xsl:when test="$format = 'ddMM'">
6016
6311
  <xsl:if test="$day != ''"><xsl:value-of select="number($day)"/></xsl:if>
6017
- <xsl:text> </xsl:text><xsl:value-of select="$monthStr"/>
6312
+ <xsl:text> </xsl:text><xsl:value-of select="$monthStr_localized"/>
6018
6313
  </xsl:when>
6019
6314
  <xsl:when test="$format = 'short' or $day = ''">
6020
- <xsl:value-of select="normalize-space(concat($monthStr, ' ', $year))"/>
6315
+ <xsl:value-of select="normalize-space(concat($monthStr_localized, ' ', $year))"/>
6021
6316
  </xsl:when>
6022
6317
  <xsl:otherwise>
6023
- <xsl:value-of select="normalize-space(concat($monthStr, ' ', $day, ', ' , $year))"/>
6318
+ <xsl:value-of select="normalize-space(concat($monthStr_localized, ' ', $day, ', ' , $year))"/> <!-- January 01, 2022 -->
6024
6319
  </xsl:otherwise>
6025
6320
  </xsl:choose>
6026
6321
  </xsl:variable>
6027
6322
  <xsl:value-of select="$result"/>
6028
- </xsl:template><xsl:template name="convertDateLocalized">
6029
- <xsl:param name="date"/>
6030
- <xsl:param name="format" select="'short'"/>
6031
- <xsl:variable name="year" select="substring($date, 1, 4)"/>
6032
- <xsl:variable name="month" select="substring($date, 6, 2)"/>
6033
- <xsl:variable name="day" select="substring($date, 9, 2)"/>
6034
- <xsl:variable name="monthStr">
6035
- <xsl:choose>
6036
- <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>
6037
- <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>
6038
- <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>
6039
- <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>
6040
- <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>
6041
- <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>
6042
- <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>
6043
- <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>
6044
- <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>
6045
- <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>
6046
- <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>
6047
- <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>
6048
- </xsl:choose>
6049
- </xsl:variable>
6050
- <xsl:variable name="result">
6323
+ </xsl:template><xsl:template name="getMonthByNum">
6324
+ <xsl:param name="num"/>
6325
+ <xsl:param name="lang">en</xsl:param>
6326
+ <xsl:param name="lowercase">false</xsl:param> <!-- return 'january' instead of 'January' -->
6327
+ <xsl:variable name="monthStr_">
6051
6328
  <xsl:choose>
6052
- <xsl:when test="$format = 'ddMMyyyy'">
6053
- <xsl:if test="$day != ''"><xsl:value-of select="number($day)"/></xsl:if>
6054
- <xsl:text> </xsl:text>
6055
- <xsl:value-of select="normalize-space(concat($monthStr, ' ' , $year))"/>
6056
- </xsl:when>
6057
- <xsl:when test="$format = 'ddMM'">
6058
- <xsl:if test="$day != ''"><xsl:value-of select="number($day)"/></xsl:if>
6059
- <xsl:text> </xsl:text><xsl:value-of select="$monthStr"/>
6060
- </xsl:when>
6061
- <xsl:when test="$format = 'short' or $day = ''">
6062
- <xsl:value-of select="normalize-space(concat($monthStr, ' ', $year))"/>
6329
+ <xsl:when test="$lang = 'fr'">
6330
+ <xsl:choose>
6331
+ <xsl:when test="$num = '01'">Janvier</xsl:when>
6332
+ <xsl:when test="$num = '02'">Février</xsl:when>
6333
+ <xsl:when test="$num = '03'">Mars</xsl:when>
6334
+ <xsl:when test="$num = '04'">Avril</xsl:when>
6335
+ <xsl:when test="$num = '05'">Mai</xsl:when>
6336
+ <xsl:when test="$num = '06'">Juin</xsl:when>
6337
+ <xsl:when test="$num = '07'">Juillet</xsl:when>
6338
+ <xsl:when test="$num = '08'">Août</xsl:when>
6339
+ <xsl:when test="$num = '09'">Septembre</xsl:when>
6340
+ <xsl:when test="$num = '10'">Octobre</xsl:when>
6341
+ <xsl:when test="$num = '11'">Novembre</xsl:when>
6342
+ <xsl:when test="$num = '12'">Décembre</xsl:when>
6343
+ </xsl:choose>
6063
6344
  </xsl:when>
6064
6345
  <xsl:otherwise>
6065
- <xsl:value-of select="normalize-space(concat($monthStr, ' ', $day, ', ' , $year))"/>
6346
+ <xsl:choose>
6347
+ <xsl:when test="$num = '01'">January</xsl:when>
6348
+ <xsl:when test="$num = '02'">February</xsl:when>
6349
+ <xsl:when test="$num = '03'">March</xsl:when>
6350
+ <xsl:when test="$num = '04'">April</xsl:when>
6351
+ <xsl:when test="$num = '05'">May</xsl:when>
6352
+ <xsl:when test="$num = '06'">June</xsl:when>
6353
+ <xsl:when test="$num = '07'">July</xsl:when>
6354
+ <xsl:when test="$num = '08'">August</xsl:when>
6355
+ <xsl:when test="$num = '09'">September</xsl:when>
6356
+ <xsl:when test="$num = '10'">October</xsl:when>
6357
+ <xsl:when test="$num = '11'">November</xsl:when>
6358
+ <xsl:when test="$num = '12'">December</xsl:when>
6359
+ </xsl:choose>
6066
6360
  </xsl:otherwise>
6067
6361
  </xsl:choose>
6068
6362
  </xsl:variable>
6069
- <xsl:value-of select="$result"/>
6363
+ <xsl:choose>
6364
+ <xsl:when test="normalize-space($lowercase) = 'true'">
6365
+ <xsl:value-of select="java:toLowerCase(java:java.lang.String.new($monthStr_))"/>
6366
+ </xsl:when>
6367
+ <xsl:otherwise><xsl:value-of select="$monthStr_"/></xsl:otherwise>
6368
+ </xsl:choose>
6070
6369
  </xsl:template><xsl:template name="insertKeywords">
6071
6370
  <xsl:param name="sorting" select="'true'"/>
6072
6371
  <xsl:param name="charAtEnd" select="'.'"/>
@@ -6115,13 +6414,8 @@
6115
6414
  <xsl:variable name="title">
6116
6415
  <xsl:for-each select="(//*[contains(local-name(), '-standard')])[1]/*[local-name() = 'bibdata']">
6117
6416
 
6118
- <xsl:value-of select="*[local-name() = 'title'][@language = $lang and @type = 'main']"/>
6119
-
6120
-
6121
-
6122
-
6123
-
6124
-
6417
+ <xsl:value-of select="*[local-name() = 'title'][@language = $lang and @type = 'main']"/>
6418
+
6125
6419
  </xsl:for-each>
6126
6420
  </xsl:variable>
6127
6421
  <xsl:choose>
@@ -6136,21 +6430,18 @@
6136
6430
  <dc:creator>
6137
6431
  <xsl:for-each select="(//*[contains(local-name(), '-standard')])[1]/*[local-name() = 'bibdata']">
6138
6432
 
6139
- <xsl:for-each select="*[local-name() = 'contributor'][*[local-name() = 'role']/@type='author']">
6140
- <xsl:value-of select="*[local-name() = 'organization']/*[local-name() = 'name']"/>
6141
- <xsl:if test="position() != last()">; </xsl:if>
6142
- </xsl:for-each>
6143
-
6144
-
6145
-
6433
+ <xsl:for-each select="*[local-name() = 'contributor'][*[local-name() = 'role']/@type='author']">
6434
+ <xsl:value-of select="*[local-name() = 'organization']/*[local-name() = 'name']"/>
6435
+ <xsl:if test="position() != last()">; </xsl:if>
6436
+ </xsl:for-each>
6437
+
6146
6438
  </xsl:for-each>
6147
6439
  </dc:creator>
6148
6440
  <dc:description>
6149
6441
  <xsl:variable name="abstract">
6150
6442
 
6151
- <xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*[local-name() = 'abstract']//text()"/>
6152
-
6153
-
6443
+ <xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*[local-name() = 'abstract']//text()"/>
6444
+
6154
6445
  </xsl:variable>
6155
6446
  <xsl:value-of select="normalize-space($abstract)"/>
6156
6447
  </dc:description>
@@ -6170,7 +6461,6 @@
6170
6461
  <xsl:value-of select="../@id"/>
6171
6462
  </xsl:when>
6172
6463
  <xsl:otherwise>
6173
- <!-- <xsl:value-of select="concat(local-name(..), '_', text())"/> -->
6174
6464
  <xsl:value-of select="concat(generate-id(..), '_', text())"/>
6175
6465
  </xsl:otherwise>
6176
6466
  </xsl:choose>
@@ -6196,9 +6486,6 @@
6196
6486
  <xsl:when test="ancestor::*[local-name() = 'preface']">
6197
6487
  <xsl:value-of select="$level_total - 2"/>
6198
6488
  </xsl:when>
6199
- <!-- <xsl:when test="parent::*[local-name() = 'sections']">
6200
- <xsl:value-of select="$level_total - 1"/>
6201
- </xsl:when> -->
6202
6489
  <xsl:when test="ancestor::*[local-name() = 'sections']">
6203
6490
  <xsl:value-of select="$level_total - 1"/>
6204
6491
  </xsl:when>
@@ -6340,9 +6627,15 @@
6340
6627
  </xsl:template><xsl:template name="getLocalizedString">
6341
6628
  <xsl:param name="key"/>
6342
6629
  <xsl:param name="formatted">false</xsl:param>
6630
+ <xsl:param name="lang"/>
6343
6631
 
6344
6632
  <xsl:variable name="curr_lang">
6345
- <xsl:call-template name="getLang"/>
6633
+ <xsl:choose>
6634
+ <xsl:when test="$lang != ''"><xsl:value-of select="$lang"/></xsl:when>
6635
+ <xsl:otherwise>
6636
+ <xsl:call-template name="getLang"/>
6637
+ </xsl:otherwise>
6638
+ </xsl:choose>
6346
6639
  </xsl:variable>
6347
6640
 
6348
6641
  <xsl:variable name="data_value">
@@ -6382,7 +6675,6 @@
6382
6675
  <xsl:value-of select="$key_"/>
6383
6676
  </xsl:otherwise>
6384
6677
  </xsl:choose>
6385
-
6386
6678
  </xsl:template><xsl:template name="setTrackChangesStyles">
6387
6679
  <xsl:param name="isAdded"/>
6388
6680
  <xsl:param name="isDeleted"/>
@@ -6405,7 +6697,6 @@
6405
6697
  <xsl:if test="local-name() = 'table'">
6406
6698
  <xsl:attribute name="background-color">rgb(255, 185, 185)</xsl:attribute>
6407
6699
  </xsl:if>
6408
- <!-- <xsl:attribute name="color"><xsl:value-of select="$color-deleted-text"/></xsl:attribute> -->
6409
6700
  <xsl:attribute name="padding">2mm</xsl:attribute>
6410
6701
  </xsl:if>
6411
6702
  </xsl:otherwise>
@@ -6425,15 +6716,18 @@
6425
6716
  </xsl:choose>
6426
6717
  </xsl:template><xsl:template name="setTextAlignment">
6427
6718
  <xsl:param name="default">left</xsl:param>
6719
+ <xsl:variable name="align" select="normalize-space(@align)"/>
6428
6720
  <xsl:attribute name="text-align">
6429
6721
  <xsl:choose>
6430
- <xsl:when test="@align and not(@align = 'indent')"><xsl:value-of select="@align"/></xsl:when>
6722
+ <xsl:when test="$lang = 'ar' and $align = 'left'">start</xsl:when>
6723
+ <xsl:when test="$lang = 'ar' and $align = 'right'">end</xsl:when>
6724
+ <xsl:when test="$align != '' and not($align = 'indent')"><xsl:value-of select="$align"/></xsl:when>
6431
6725
  <xsl:when test="ancestor::*[local-name() = 'td']/@align"><xsl:value-of select="ancestor::*[local-name() = 'td']/@align"/></xsl:when>
6432
6726
  <xsl:when test="ancestor::*[local-name() = 'th']/@align"><xsl:value-of select="ancestor::*[local-name() = 'th']/@align"/></xsl:when>
6433
6727
  <xsl:otherwise><xsl:value-of select="$default"/></xsl:otherwise>
6434
6728
  </xsl:choose>
6435
6729
  </xsl:attribute>
6436
- <xsl:if test="@align = 'indent'">
6730
+ <xsl:if test="$align = 'indent'">
6437
6731
  <xsl:attribute name="margin-left">7mm</xsl:attribute>
6438
6732
  </xsl:if>
6439
6733
  </xsl:template><xsl:template name="number-to-words">
@@ -6532,6 +6826,25 @@
6532
6826
  </xsl:otherwise>
6533
6827
  </xsl:choose>
6534
6828
  </xsl:if>
6829
+ </xsl:template><xsl:template name="number-to-ordinal">
6830
+ <xsl:param name="number"/>
6831
+ <xsl:param name="curr_lang"/>
6832
+ <xsl:choose>
6833
+ <xsl:when test="$curr_lang = 'fr'">
6834
+ <xsl:choose>
6835
+ <xsl:when test="$number = '1'">re</xsl:when>
6836
+ <xsl:otherwise>e</xsl:otherwise>
6837
+ </xsl:choose>
6838
+ </xsl:when>
6839
+ <xsl:otherwise>
6840
+ <xsl:choose>
6841
+ <xsl:when test="$number = 1">st</xsl:when>
6842
+ <xsl:when test="$number = 2">nd</xsl:when>
6843
+ <xsl:when test="$number = 3">rd</xsl:when>
6844
+ <xsl:otherwise>th</xsl:otherwise>
6845
+ </xsl:choose>
6846
+ </xsl:otherwise>
6847
+ </xsl:choose>
6535
6848
  </xsl:template><xsl:template name="setAltText">
6536
6849
  <xsl:param name="value"/>
6537
6850
  <xsl:attribute name="fox:alt-text">