metanorma-iso 2.4.6 → 2.4.7

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/lib/isodoc/iso/iso.amendment.xsl +299 -182
  3. data/lib/isodoc/iso/iso.international-standard.xsl +299 -182
  4. data/lib/metanorma/iso/front.rb +6 -3
  5. data/lib/metanorma/iso/version.rb +1 -1
  6. metadata +2 -2
data/lib/isodoc/iso/iso.international-standard.xsl CHANGED
@@ -517,13 +517,13 @@
517
517
  <xsl:when test="$stage-abbreviation != ''">
518
518
  <fo:page-sequence master-reference="cover-page-publishedISO" force-page-count="no-force">
519
519
  <fo:static-content flow-name="cover-page-footer" font-size="10pt">
520
- <fo:table table-layout="fixed" width="100%">
520
+ <fo:table table-layout="fixed" width="100%" role="SKIP">
521
521
  <fo:table-column column-width="52mm"/>
522
522
  <fo:table-column column-width="7.5mm"/>
523
523
  <fo:table-column column-width="112.5mm"/>
524
- <fo:table-body>
525
- <fo:table-row>
526
- <fo:table-cell font-size="6.5pt" text-align="justify" display-align="after" padding-bottom="8mm">
524
+ <fo:table-body role="SKIP">
525
+ <fo:table-row role="SKIP">
526
+ <fo:table-cell font-size="6.5pt" text-align="justify" display-align="after" padding-bottom="8mm" role="SKIP">
527
527
  <xsl:if test="$stage-abbreviation = 'DAmd' or $stage-abbreviation = 'DAM'">
528
528
  <xsl:attribute name="font-size">7pt</xsl:attribute>
529
529
  </xsl:if>
@@ -555,11 +555,11 @@
555
555
  </xsl:if>
556
556
  </fo:block>
557
557
  </fo:table-cell>
558
- <fo:table-cell>
559
- <fo:block> </fo:block>
558
+ <fo:table-cell role="SKIP">
559
+ <fo:block role="SKIP"><fo:wrapper role="artifact"> </fo:wrapper></fo:block>
560
560
  </fo:table-cell>
561
- <fo:table-cell display-align="after" padding-bottom="3mm">
562
- <fo:block-container height="22.5mm" display-align="center">
561
+ <fo:table-cell display-align="after" padding-bottom="3mm" role="SKIP">
562
+ <fo:block-container height="22.5mm" display-align="center" role="SKIP">
563
563
 
564
564
  <xsl:variable name="iso-fast-track">false</xsl:variable>
565
565
 
@@ -577,7 +577,7 @@
577
577
  </xsl:for-each>
578
578
  </xsl:variable>
579
579
  <xsl:if test="normalize-space($text) != ''">
580
- <fo:block-container margin-left="1mm"> <!-- margin-bottom="7mm" margin-top="-15mm" -->
580
+ <fo:block-container margin-left="1mm" role="SKIP"> <!-- margin-bottom="7mm" margin-top="-15mm" -->
581
581
  <fo:block font-size="9pt" border="0.5pt solid black" fox:border-radius="5pt" padding-left="2mm" padding-top="2mm" padding-bottom="2mm">
582
582
  <!-- <xsl:text>This document is circulated as received from the committee secretariat.</xsl:text> -->
583
583
  <xsl:copy-of select="xalan:nodeset($text)/node()"/>
@@ -586,9 +586,9 @@
586
586
  </xsl:if>
587
587
 
588
588
  <xsl:if test="normalize-space($iso-fast-track) = 'true'">
589
- <fo:block-container space-before="2mm">
590
- <fo:block background-color="rgb(77,77,77)" color="white" fox:border-radius="5pt" text-align="center" display-align="center" font-size="19pt" font-weight="bold">
591
- <fo:block-container height="13.2mm">
589
+ <fo:block-container space-before="2mm" role="SKIP">
590
+ <fo:block background-color="rgb(77,77,77)" color="white" fox:border-radius="5pt" text-align="center" display-align="center" font-size="19pt" font-weight="bold" role="SKIP">
591
+ <fo:block-container height="13.2mm" role="SKIP">
592
592
  <fo:block>
593
593
  <xsl:text>FAST TRACK PROCEDURE</xsl:text>
594
594
  </fo:block>
@@ -599,14 +599,14 @@
599
599
  </xsl:if>
600
600
  </fo:block>
601
601
  </fo:block-container>
602
- <fo:block>
602
+ <fo:block role="SKIP">
603
603
  <xsl:call-template name="insertTripleLine"/>
604
- <fo:table table-layout="fixed" width="100%"> <!-- margin-bottom="3mm" -->
604
+ <fo:table table-layout="fixed" width="100%" role="SKIP"> <!-- margin-bottom="3mm" -->
605
605
  <fo:table-column column-width="50%"/>
606
606
  <fo:table-column column-width="50%"/>
607
- <fo:table-body>
608
- <fo:table-row height="34mm">
609
- <fo:table-cell display-align="center">
607
+ <fo:table-body role="SKIP">
608
+ <fo:table-row height="34mm" role="SKIP">
609
+ <fo:table-cell display-align="center" role="SKIP">
610
610
 
611
611
  <xsl:if test="$copyrightAbbrIEEE != ''">
612
612
  <xsl:attribute name="display-align">before</xsl:attribute>
@@ -638,7 +638,7 @@
638
638
  <xsl:otherwise/>
639
639
  </xsl:choose>
640
640
  <xsl:if test="position() != last()">
641
- <fo:inline padding-right="1mm"> </fo:inline>
641
+ <fo:inline padding-right="1mm" role="SKIP"> </fo:inline>
642
642
  </xsl:if>
643
643
  </xsl:for-each>
644
644
  <xsl:if test="$copyrightAbbrIEEE != ''">
@@ -648,8 +648,8 @@
648
648
  </xsl:if>
649
649
  </fo:block>
650
650
  </fo:table-cell>
651
- <fo:table-cell display-align="center">
652
- <fo:block text-align="right">
651
+ <fo:table-cell display-align="center" role="SKIP">
652
+ <fo:block text-align="right" role="SKIP">
653
653
  <!-- Reference number -->
654
654
  <fo:block>
655
655
  <xsl:call-template name="getLocalizedString">
@@ -686,7 +686,7 @@
686
686
  <!-- COVER PAGE for DIS document only -->
687
687
  <xsl:when test="$stage-abbreviation = 'DIS' or $stage-abbreviation = 'DAmd' or $stage-abbreviation = 'DAM'">
688
688
  <fo:flow flow-name="xsl-region-body">
689
- <fo:block-container>
689
+ <fo:block-container role="SKIP">
690
690
  <fo:block margin-top="-1mm" font-size="20pt" text-align="right">
691
691
  <xsl:value-of select="$stage-fullname-uppercased"/>
692
692
  </fo:block>
@@ -753,9 +753,9 @@
753
753
  </fo:table-body>
754
754
  </fo:table>
755
755
 
756
- <fo:block-container line-height="1.1" margin-top="3mm">
756
+ <fo:block-container line-height="1.1" margin-top="3mm" role="SKIP">
757
757
  <xsl:call-template name="insertTripleLine"/>
758
- <fo:block margin-right="5mm">
758
+ <fo:block margin-right="5mm" role="SKIP">
759
759
  <fo:block font-size="18pt" font-weight="bold" margin-top="6pt" role="H1">
760
760
 
761
761
  <xsl:apply-templates select="/iso:iso-standard/iso:bibdata/iso:title[@language = $lang and @type = 'title-intro']"/>
@@ -775,7 +775,7 @@
775
775
  <xsl:for-each select="xalan:nodeset($lang_other)/lang">
776
776
  <xsl:variable name="lang_other" select="."/>
777
777
 
778
- <fo:block font-size="12pt"><xsl:value-of select="$linebreak"/></fo:block>
778
+ <fo:block font-size="12pt" role="SKIP"><xsl:value-of select="$linebreak"/></fo:block>
779
779
  <fo:block font-size="11pt" font-style="italic" line-height="1.1" role="H1">
780
780
 
781
781
  <!-- Example: title-intro fr -->
@@ -809,14 +809,14 @@
809
809
 
810
810
  <!-- COVER PAGE for all documents except DIS, DAmd and DAM -->
811
811
  <fo:flow flow-name="xsl-region-body">
812
- <fo:block-container>
813
- <fo:table table-layout="fixed" width="100%" font-size="24pt" line-height="1"> <!-- margin-bottom="35mm" -->
812
+ <fo:block-container role="SKIP">
813
+ <fo:table table-layout="fixed" width="100%" font-size="24pt" line-height="1" role="SKIP"> <!-- margin-bottom="35mm" -->
814
814
  <fo:table-column column-width="59.5mm"/>
815
815
  <fo:table-column column-width="67.5mm"/>
816
816
  <fo:table-column column-width="45.5mm"/>
817
- <fo:table-body>
818
- <fo:table-row>
819
- <fo:table-cell>
817
+ <fo:table-body role="SKIP">
818
+ <fo:table-row role="SKIP">
819
+ <fo:table-cell role="SKIP">
820
820
  <fo:block font-size="18pt">
821
821
 
822
822
  <xsl:value-of select="translate($stagename-header-coverpage, ' ', $linebreak)"/>
@@ -840,7 +840,7 @@
840
840
  </xsl:variable>
841
841
  <xsl:variable name="font-size"><xsl:if test="string-length($lastWord) &gt;= 12">90%</xsl:if></xsl:variable> <!-- to prevent overlapping 'NORME INTERNATIONALE' to number -->
842
842
 
843
- <fo:table-cell>
843
+ <fo:table-cell role="SKIP">
844
844
  <fo:block text-align="left">
845
845
  <xsl:choose>
846
846
  <xsl:when test="$stage-abbreviation = 'FDAmd' or $stage-abbreviation = 'FDAM'"><xsl:value-of select="$doctype_uppercased"/></xsl:when>
@@ -856,7 +856,7 @@
856
856
  </xsl:choose>
857
857
  </fo:block>
858
858
  </fo:table-cell>
859
- <fo:table-cell>
859
+ <fo:table-cell role="SKIP">
860
860
  <fo:block text-align="right" font-weight="bold" margin-bottom="13mm">
861
861
  <xsl:if test="$font-size != ''">
862
862
  <xsl:attribute name="font-size"><xsl:value-of select="$font-size"/></xsl:attribute>
@@ -865,8 +865,8 @@
865
865
  </fo:block>
866
866
  </fo:table-cell>
867
867
  </fo:table-row>
868
- <fo:table-row height="25mm">
869
- <fo:table-cell number-columns-spanned="3" font-size="10pt" line-height="1.2">
868
+ <fo:table-row height="25mm" role="SKIP">
869
+ <fo:table-cell number-columns-spanned="3" font-size="10pt" line-height="1.2" role="SKIP">
870
870
  <fo:block text-align="right">
871
871
  <xsl:if test="$stage-abbreviation = 'PRF' or $stage-abbreviation = 'IS' or $stage-abbreviation = 'D' or $stage-abbreviation = 'published'">
872
872
  <xsl:call-template name="printEdition"/>
@@ -893,7 +893,7 @@
893
893
  <!-- <xsl:value-of select="$linebreak"/>
894
894
  <xsl:value-of select="/iso:iso-standard/iso:bibdata/iso:version/iso:revision-date"/> -->
895
895
  <xsl:if test="$doctype = 'amendment' and not($stage-abbreviation = 'FDAmd' or $stage-abbreviation = 'FDAM')">
896
- <fo:block text-align="right" margin-right="0.5mm">
896
+ <fo:block text-align="right" margin-right="0.5mm" role="SKIP">
897
897
  <fo:block font-weight="bold" margin-top="4pt" role="H1">
898
898
  <xsl:value-of select="$doctype_uppercased"/>
899
899
  <xsl:text> </xsl:text>
@@ -911,22 +911,22 @@
911
911
  </xsl:if>
912
912
  </fo:table-cell>
913
913
  </fo:table-row>
914
- <fo:table-row height="17mm">
915
- <fo:table-cell><fo:block/></fo:table-cell>
916
- <fo:table-cell number-columns-spanned="2" font-size="10pt" line-height="1.2" display-align="center">
917
- <fo:block>
914
+ <fo:table-row height="17mm" role="SKIP">
915
+ <fo:table-cell role="SKIP"><fo:block role="SKIP"/></fo:table-cell>
916
+ <fo:table-cell number-columns-spanned="2" font-size="10pt" line-height="1.2" display-align="center" role="SKIP">
917
+ <fo:block role="SKIP">
918
918
  <xsl:if test="$stage-abbreviation = 'NWIP' or $stage-abbreviation = 'NP' or $stage-abbreviation = 'PWI' or $stage-abbreviation = 'AWI' or $stage-abbreviation = 'WD' or $stage-abbreviation = 'CD' or $stage-abbreviation = 'FDIS'">
919
- <fo:table table-layout="fixed" width="100%">
919
+ <fo:table table-layout="fixed" width="100%" role="SKIP">
920
920
  <fo:table-column column-width="50%"/>
921
921
  <fo:table-column column-width="50%"/>
922
- <fo:table-body>
923
- <fo:table-row>
924
- <fo:table-cell>
922
+ <fo:table-body role="SKIP">
923
+ <fo:table-row role="SKIP">
924
+ <fo:table-cell role="SKIP">
925
925
  <fo:block>
926
926
  <xsl:copy-of select="$editorialgroup"/>
927
927
  </fo:block>
928
928
  </fo:table-cell>
929
- <fo:table-cell>
929
+ <fo:table-cell role="SKIP">
930
930
  <fo:block>
931
931
  <xsl:copy-of select="$secretariat"/>
932
932
  </fo:block>
@@ -942,17 +942,17 @@
942
942
  </fo:table-body>
943
943
  </fo:table>
944
944
 
945
- <fo:table table-layout="fixed" width="100%">
945
+ <fo:table table-layout="fixed" width="100%" role="SKIP">
946
946
  <fo:table-column column-width="52mm"/>
947
947
  <fo:table-column column-width="7.5mm"/>
948
948
  <fo:table-column column-width="112.5mm"/>
949
- <fo:table-body>
950
- <fo:table-row> <!-- border="1pt solid black" height="150mm" -->
951
- <fo:table-cell font-size="11pt">
952
- <fo:block>
949
+ <fo:table-body role="SKIP">
950
+ <fo:table-row role="SKIP"> <!-- border="1pt solid black" height="150mm" -->
951
+ <fo:table-cell font-size="11pt" role="SKIP">
952
+ <fo:block role="SKIP">
953
953
  <xsl:if test="$stage-abbreviation = 'FDIS' or $stage-abbreviation = 'FDAmd' or $stage-abbreviation = 'FDAM'">
954
- <fo:block-container border="0.5mm solid black" width="51mm">
955
- <fo:block margin="2mm">
954
+ <fo:block-container border="0.5mm solid black" width="51mm" role="SKIP">
955
+ <fo:block margin="2mm" role="SKIP">
956
956
  <fo:block margin-bottom="8pt"><xsl:copy-of select="$editorialgroup"/></fo:block>
957
957
  <fo:block margin-bottom="6pt"><xsl:copy-of select="$secretariat"/></fo:block>
958
958
  <fo:block margin-bottom="6pt">Voting begins on:<xsl:value-of select="$linebreak"/>
@@ -980,13 +980,13 @@
980
980
  </xsl:if>
981
981
  </fo:block>
982
982
  </fo:table-cell>
983
- <fo:table-cell>
984
- <fo:block> </fo:block>
983
+ <fo:table-cell role="SKIP">
984
+ <fo:block role="SKIP"><fo:wrapper role="artifact"> </fo:wrapper></fo:block>
985
985
  </fo:table-cell>
986
- <fo:table-cell>
986
+ <fo:table-cell role="SKIP">
987
987
  <xsl:call-template name="insertTripleLine"/>
988
- <fo:block-container line-height="1.1">
989
- <fo:block margin-right="3.5mm">
988
+ <fo:block-container line-height="1.1" role="SKIP">
989
+ <fo:block margin-right="3.5mm" role="SKIP">
990
990
  <fo:block font-size="18pt" font-weight="bold" margin-top="12pt" role="H1">
991
991
 
992
992
  <xsl:apply-templates select="/iso:iso-standard/iso:bibdata/iso:title[@language = $lang and @type = 'title-intro']"/>
@@ -1007,7 +1007,7 @@
1007
1007
  <xsl:for-each select="xalan:nodeset($lang_other)/lang">
1008
1008
  <xsl:variable name="lang_other" select="."/>
1009
1009
 
1010
- <fo:block font-size="12pt"><xsl:value-of select="$linebreak"/></fo:block>
1010
+ <fo:block font-size="12pt" role="SKIP"><xsl:value-of select="$linebreak"/></fo:block>
1011
1011
  <fo:block font-size="11pt" font-style="italic" line-height="1.1" role="H1">
1012
1012
 
1013
1013
  <!-- Example: title-intro fr -->
@@ -1040,8 +1040,8 @@
1040
1040
  </fo:table-body>
1041
1041
  </fo:table>
1042
1042
  </fo:block-container>
1043
- <fo:block-container position="absolute" left="60mm" top="222mm" height="25mm" display-align="after">
1044
- <fo:block margin-bottom="2mm">
1043
+ <fo:block-container position="absolute" left="60mm" top="222mm" height="25mm" display-align="after" role="SKIP">
1044
+ <fo:block margin-bottom="2mm" role="SKIP">
1045
1045
  <xsl:if test="$stage-abbreviation = 'PRF'">
1046
1046
  <fo:block font-size="36pt" font-weight="bold" margin-left="1mm">
1047
1047
  <xsl:call-template name="add-letter-spacing">
@@ -1063,26 +1063,26 @@
1063
1063
  <fo:page-sequence master-reference="cover-page-published" force-page-count="no-force">
1064
1064
  <fo:static-content flow-name="cover-page-footer" font-size="10pt">
1065
1065
  <xsl:call-template name="insertTripleLine"/>
1066
- <fo:table table-layout="fixed" width="100%" margin-bottom="3mm">
1066
+ <fo:table table-layout="fixed" width="100%" margin-bottom="3mm" role="SKIP">
1067
1067
  <fo:table-column column-width="50%"/>
1068
1068
  <fo:table-column column-width="50%"/>
1069
- <fo:table-body>
1070
- <fo:table-row height="32mm">
1071
- <fo:table-cell display-align="center">
1069
+ <fo:table-body role="SKIP">
1070
+ <fo:table-row height="32mm" role="SKIP">
1071
+ <fo:table-cell display-align="center" role="SKIP">
1072
1072
  <fo:block text-align="left">
1073
1073
  <fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-ISO-Logo))}" width="21mm" content-height="21mm" content-width="scale-to-fit" scaling="uniform" fox:alt-text="Image {@alt}"/>
1074
1074
  </fo:block>
1075
1075
  </fo:table-cell>
1076
- <fo:table-cell display-align="center">
1077
- <fo:block text-align="right">
1076
+ <fo:table-cell display-align="center" role="SKIP">
1077
+ <fo:block text-align="right" role="SKIP">
1078
1078
  <fo:block>
1079
1079
  <xsl:call-template name="getLocalizedString">
1080
1080
  <xsl:with-param name="key">reference_number</xsl:with-param>
1081
1081
  </xsl:call-template>
1082
1082
  </fo:block>
1083
1083
  <fo:block><xsl:value-of select="$ISOname"/></fo:block>
1084
- <fo:block> </fo:block>
1085
- <fo:block> </fo:block>
1084
+ <fo:block role="SKIP"> </fo:block>
1085
+ <fo:block role="SKIP"> </fo:block>
1086
1086
  <fo:block><fo:inline font-size="9pt">©</fo:inline><xsl:value-of select="concat(' ', $copyrightAbbr, ' ', $copyrightYear)"/>
1087
1087
  <xsl:if test="$copyrightAbbrIEEE != ''">
1088
1088
  <xsl:value-of select="$linebreak"/>
@@ -1097,25 +1097,25 @@
1097
1097
  </fo:table>
1098
1098
  </fo:static-content>
1099
1099
  <fo:flow flow-name="xsl-region-body">
1100
- <fo:block-container>
1101
- <fo:table table-layout="fixed" width="100%" font-size="24pt" line-height="1" margin-bottom="35mm">
1100
+ <fo:block-container role="SKIP">
1101
+ <fo:table table-layout="fixed" width="100%" font-size="24pt" line-height="1" margin-bottom="35mm" role="SKIP">
1102
1102
  <fo:table-column column-width="60%"/>
1103
1103
  <fo:table-column column-width="40%"/>
1104
- <fo:table-body>
1105
- <fo:table-row>
1106
- <fo:table-cell>
1104
+ <fo:table-body role="SKIP">
1105
+ <fo:table-row role="SKIP">
1106
+ <fo:table-cell role="SKIP">
1107
1107
  <fo:block text-align="left">
1108
1108
  <xsl:value-of select="$doctype_uppercased"/>
1109
1109
  </fo:block>
1110
1110
  </fo:table-cell>
1111
- <fo:table-cell>
1111
+ <fo:table-cell role="SKIP">
1112
1112
  <fo:block text-align="right" font-weight="bold" margin-bottom="13mm">
1113
1113
  <xsl:value-of select="$docidentifierISO_with_break"/>
1114
1114
  </fo:block>
1115
1115
  </fo:table-cell>
1116
1116
  </fo:table-row>
1117
- <fo:table-row>
1118
- <fo:table-cell number-columns-spanned="2" font-size="10pt" line-height="1.2">
1117
+ <fo:table-row role="SKIP">
1118
+ <fo:table-cell number-columns-spanned="2" font-size="10pt" line-height="1.2" role="SKIP">
1119
1119
  <fo:block text-align="right">
1120
1120
  <xsl:call-template name="printEdition"/>
1121
1121
  <xsl:value-of select="$linebreak"/>
@@ -1126,8 +1126,8 @@
1126
1126
  </fo:table>
1127
1127
 
1128
1128
  <xsl:call-template name="insertTripleLine"/>
1129
- <fo:block-container line-height="1.1">
1130
- <fo:block margin-right="40mm">
1129
+ <fo:block-container line-height="1.1" role="SKIP">
1130
+ <fo:block margin-right="40mm" role="SKIP">
1131
1131
  <fo:block font-size="18pt" font-weight="bold" margin-top="12pt" role="H1">
1132
1132
 
1133
1133
  <xsl:apply-templates select="/iso:iso-standard/iso:bibdata/iso:title[@language = $lang and @type = 'title-intro']"/>
@@ -1143,7 +1143,7 @@
1143
1143
  <xsl:for-each select="xalan:nodeset($lang_other)/lang">
1144
1144
  <xsl:variable name="lang_other" select="."/>
1145
1145
 
1146
- <fo:block font-size="12pt"><xsl:value-of select="$linebreak"/></fo:block>
1146
+ <fo:block font-size="12pt" role="SKIP"><xsl:value-of select="$linebreak"/></fo:block>
1147
1147
  <fo:block font-size="11pt" font-style="italic" line-height="1.1" role="H1">
1148
1148
 
1149
1149
  <!-- Example: title-intro fr -->
@@ -1173,7 +1173,7 @@
1173
1173
  </fo:block-container>
1174
1174
  </fo:static-content>
1175
1175
  <fo:flow flow-name="xsl-region-body">
1176
- <fo:block-container text-align="right">
1176
+ <fo:block-container text-align="right" role="SKIP">
1177
1177
  <xsl:choose>
1178
1178
  <xsl:when test="/iso:iso-standard/iso:bibdata/iso:docidentifier[@type = 'iso-tc']">
1179
1179
  <!-- 17301 -->
@@ -1213,7 +1213,7 @@
1213
1213
  </fo:block>
1214
1214
 
1215
1215
  </fo:block-container>
1216
- <fo:block-container font-size="16pt">
1216
+ <fo:block-container font-size="16pt" role="SKIP">
1217
1217
  <!-- Information and documentation — Codes for transcription systems -->
1218
1218
  <fo:block font-weight="bold" role="H1">
1219
1219
 
@@ -1230,7 +1230,7 @@
1230
1230
  <xsl:for-each select="xalan:nodeset($lang_other)/lang">
1231
1231
  <xsl:variable name="lang_other" select="."/>
1232
1232
 
1233
- <fo:block font-size="12pt"><xsl:value-of select="$linebreak"/></fo:block>
1233
+ <fo:block font-size="12pt" role="SKIP"><xsl:value-of select="$linebreak"/></fo:block>
1234
1234
  <fo:block role="H1">
1235
1235
 
1236
1236
  <!-- Example: title-intro fr -->
@@ -1247,8 +1247,8 @@
1247
1247
  </xsl:for-each>
1248
1248
 
1249
1249
  </fo:block-container>
1250
- <fo:block font-size="11pt" margin-bottom="8pt"><xsl:value-of select="$linebreak"/></fo:block>
1251
- <fo:block-container font-size="40pt" text-align="center" margin-bottom="12pt" border="0.5pt solid black">
1250
+ <fo:block font-size="11pt" margin-bottom="8pt" role="SKIP"><xsl:value-of select="$linebreak"/></fo:block>
1251
+ <fo:block-container font-size="40pt" text-align="center" margin-bottom="12pt" border="0.5pt solid black" role="SKIP">
1252
1252
  <xsl:variable name="stage-title" select="substring-after(substring-before($docidentifierISO, ' '), '/')"/>
1253
1253
  <xsl:choose>
1254
1254
  <xsl:when test="normalize-space($stage-title) != ''">
@@ -1256,14 +1256,14 @@
1256
1256
  </xsl:when>
1257
1257
  <xsl:otherwise>
1258
1258
  <xsl:attribute name="border">0pt solid white</xsl:attribute>
1259
- <fo:block> </fo:block>
1259
+ <fo:block role="SKIP"> </fo:block>
1260
1260
  </xsl:otherwise>
1261
1261
  </xsl:choose>
1262
1262
  </fo:block-container>
1263
- <fo:block><xsl:value-of select="$linebreak"/></fo:block>
1263
+ <fo:block role="SKIP"><xsl:value-of select="$linebreak"/></fo:block>
1264
1264
 
1265
1265
  <xsl:if test="/iso:iso-standard/iso:boilerplate/iso:license-statement">
1266
- <fo:block-container font-size="10pt" margin-top="12pt" margin-bottom="6pt" border="0.5pt solid black">
1266
+ <fo:block-container font-size="10pt" margin-top="12pt" margin-bottom="6pt" border="0.5pt solid black" role="SKIP">
1267
1267
  <fo:block padding-top="1mm">
1268
1268
  <xsl:apply-templates select="/iso:iso-standard/iso:boilerplate/iso:license-statement"/>
1269
1269
  </fo:block>
@@ -1300,13 +1300,13 @@
1300
1300
  <fo:flow flow-name="xsl-region-body" line-height="115%">
1301
1301
  <xsl:if test="/iso:iso-standard/iso:boilerplate/iso:copyright-statement">
1302
1302
 
1303
- <fo:block-container height="252mm" display-align="after">
1303
+ <fo:block-container height="252mm" display-align="after" role="SKIP">
1304
1304
  <!-- <fo:block margin-bottom="3mm">
1305
1305
  <fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-Attention))}" width="14mm" content-height="13mm" content-width="scale-to-fit" scaling="uniform" fox:alt-text="Image {@alt}"/>
1306
1306
  <fo:inline padding-left="6mm" font-size="12pt" font-weight="bold"></fo:inline>
1307
1307
  </fo:block> -->
1308
- <fo:block line-height="90%">
1309
- <fo:block font-size="9pt" text-align="justify">
1308
+ <fo:block line-height="90%" role="SKIP">
1309
+ <fo:block font-size="9pt" text-align="justify" role="SKIP">
1310
1310
  <xsl:apply-templates select="/iso:iso-standard/iso:boilerplate/iso:copyright-statement"/>
1311
1311
  </fo:block>
1312
1312
  </fo:block>
@@ -1339,9 +1339,9 @@
1339
1339
  <xsl:value-of select="$title-en"/>
1340
1340
  </fo:block>
1341
1341
  -->
1342
- <fo:block font-size="18pt" font-weight="bold" margin-top="40pt" margin-bottom="20pt" line-height="1.1">
1342
+ <fo:block font-size="18pt" font-weight="bold" margin-top="40pt" margin-bottom="20pt" line-height="1.1" role="H1">
1343
1343
 
1344
- <fo:block role="H1">
1344
+ <fo:block role="SKIP">
1345
1345
 
1346
1346
  <xsl:apply-templates select="/iso:iso-standard/iso:bibdata/iso:title[@language = $lang and @type = 'title-intro']"/>
1347
1347
 
@@ -1353,7 +1353,7 @@
1353
1353
  </xsl:apply-templates>
1354
1354
 
1355
1355
  </fo:block>
1356
- <fo:block role="H1">
1356
+ <fo:block role="SKIP">
1357
1357
  <xsl:apply-templates select="/iso:iso-standard/iso:bibdata/iso:title[@language = $lang and @type = 'title-part']/node()"/>
1358
1358
  </fo:block>
1359
1359
 
@@ -1377,7 +1377,7 @@
1377
1377
  </xsl:otherwise>
1378
1378
  </xsl:choose>
1379
1379
 
1380
- <fo:block id="lastBlock" font-size="1pt"> </fo:block>
1380
+ <fo:block id="lastBlock" font-size="1pt" role="SKIP"> </fo:block>
1381
1381
  </fo:block>
1382
1382
 
1383
1383
  </fo:flow>
@@ -1682,18 +1682,18 @@
1682
1682
  </xsl:variable>
1683
1683
  <xsl:choose>
1684
1684
  <xsl:when test="$isMainBody = 'true'">
1685
- <fo:block font-weight="normal" margin-top="12pt" line-height="1.1">
1685
+ <fo:block font-weight="normal" margin-top="12pt" line-height="1.1" role="SKIP">
1686
1686
  <xsl:value-of select="$part-text"/>
1687
1687
  </fo:block>
1688
1688
  </xsl:when>
1689
1689
  <xsl:when test="$isMainLang = 'true'">
1690
- <fo:block font-weight="normal" margin-top="6pt">
1690
+ <fo:block font-weight="normal" margin-top="6pt" role="SKIP">
1691
1691
  <xsl:value-of select="$part-text"/>
1692
1692
  </fo:block>
1693
1693
  </xsl:when>
1694
1694
  <xsl:otherwise>
1695
1695
  <!-- <xsl:value-of select="$linebreak"/> -->
1696
- <fo:block font-size="1pt" margin-top="5pt"> </fo:block>
1696
+ <fo:block font-size="1pt" margin-top="5pt" role="SKIP"> </fo:block>
1697
1697
  <xsl:value-of select="$part-text"/>
1698
1698
  <xsl:text> </xsl:text>
1699
1699
  </xsl:otherwise>
@@ -1717,7 +1717,7 @@
1717
1717
  <xsl:attribute name="margin-right">0mm</xsl:attribute>
1718
1718
  </xsl:if>
1719
1719
 
1720
- <fo:block font-weight="normal" line-height="1.1">
1720
+ <fo:block font-weight="normal" line-height="1.1" role="SKIP">
1721
1721
  <xsl:choose>
1722
1722
  <xsl:when test="$isMainLang = 'false' and $curr_lang = 'fr'">AMENDEMENT</xsl:when>
1723
1723
  <xsl:otherwise><xsl:value-of select="$doctype_uppercased"/></xsl:otherwise>
@@ -1832,7 +1832,7 @@
1832
1832
  <fo:block margin-left="0.5mm" margin-bottom="3mm" role="H1">
1833
1833
  <fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-Attention))}" width="14mm" content-height="13mm" content-width="scale-to-fit" scaling="uniform" fox:alt-text="Image {@alt}"/>
1834
1834
  <!-- <fo:inline padding-left="6mm" font-size="12pt" font-weight="bold">COPYRIGHT PROTECTED DOCUMENT</fo:inline> -->
1835
- <fo:inline padding-left="6mm" font-size="12pt" font-weight="bold"><xsl:apply-templates/></fo:inline>
1835
+ <fo:inline padding-left="6mm" font-size="12pt" font-weight="bold" role="SKIP"><xsl:apply-templates/></fo:inline>
1836
1836
  </fo:block>
1837
1837
  </xsl:template>
1838
1838
 
@@ -1964,7 +1964,7 @@
1964
1964
  </xsl:element>
1965
1965
 
1966
1966
  <xsl:if test="$element-name = 'fo:inline' and not(following-sibling::iso:p)">
1967
- <fo:block> <!-- margin-bottom="12pt" -->
1967
+ <fo:block role="SKIP"> <!-- margin-bottom="12pt" -->
1968
1968
  <xsl:value-of select="$linebreak"/>
1969
1969
  </fo:block>
1970
1970
  </xsl:if>
@@ -2041,6 +2041,9 @@
2041
2041
  <xsl:attribute name="margin-bottom">0pt</xsl:attribute>
2042
2042
  <xsl:attribute name="line-height">0</xsl:attribute>
2043
2043
  </xsl:if>
2044
+ <xsl:if test="$element-name = 'fo:inline'">
2045
+ <xsl:attribute name="role">P</xsl:attribute>
2046
+ </xsl:if>
2044
2047
  <xsl:if test="ancestor::*[local-name() = 'li' or local-name() = 'td' or local-name() = 'th' or local-name() = 'dd']">
2045
2048
  <xsl:attribute name="role">SKIP</xsl:attribute>
2046
2049
  </xsl:if>
@@ -2049,7 +2052,7 @@
2049
2052
  </xsl:apply-templates>
2050
2053
  </xsl:element>
2051
2054
  <xsl:if test="$element-name = 'fo:inline' and not($inline = 'true') and not(local-name(..) = 'admonition')">
2052
- <fo:block margin-bottom="12pt">
2055
+ <fo:block margin-bottom="12pt" role="SKIP">
2053
2056
  <xsl:if test="ancestor::iso:annex or following-sibling::iso:table">
2054
2057
  <xsl:attribute name="margin-bottom">0</xsl:attribute>
2055
2058
  </xsl:if>
@@ -2057,7 +2060,7 @@
2057
2060
  </fo:block>
2058
2061
  </xsl:if>
2059
2062
  <xsl:if test="$inline = 'true'">
2060
- <fo:block> </fo:block>
2063
+ <fo:block role="SKIP"> </fo:block>
2061
2064
  </xsl:if>
2062
2065
  </xsl:template>
2063
2066
 
@@ -2278,10 +2281,10 @@
2278
2281
  </xsl:template>
2279
2282
 
2280
2283
  <xsl:template name="insertTripleLine">
2281
- <fo:block font-size="1.25pt">
2282
- <fo:block><fo:leader leader-pattern="rule" rule-thickness="0.75pt" leader-length="100%"/></fo:block>
2283
- <fo:block><fo:leader leader-pattern="rule" rule-thickness="0.75pt" leader-length="100%"/></fo:block>
2284
- <fo:block><fo:leader leader-pattern="rule" rule-thickness="0.75pt" leader-length="100%"/></fo:block>
2284
+ <fo:block font-size="1.25pt" role="SKIP">
2285
+ <fo:block role="SKIP"><fo:leader leader-pattern="rule" rule-thickness="0.75pt" leader-length="100%"/></fo:block>
2286
+ <fo:block role="SKIP"><fo:leader leader-pattern="rule" rule-thickness="0.75pt" leader-length="100%"/></fo:block>
2287
+ <fo:block role="SKIP"><fo:leader leader-pattern="rule" rule-thickness="0.75pt" leader-length="100%"/></fo:block>
2285
2288
  </fo:block>
2286
2289
  </xsl:template>
2287
2290
 
@@ -3351,6 +3354,7 @@
3351
3354
  </xsl:attribute-set>
3352
3355
 
3353
3356
  <xsl:attribute-set name="figure-block-style">
3357
+ <xsl:attribute name="role">SKIP</xsl:attribute>
3354
3358
 
3355
3359
  <xsl:attribute name="space-after">12pt</xsl:attribute>
3356
3360
 
@@ -3361,6 +3365,7 @@
3361
3365
  </xsl:attribute-set>
3362
3366
 
3363
3367
  <xsl:attribute-set name="figure-name-style">
3368
+ <xsl:attribute name="role">Caption</xsl:attribute>
3364
3369
 
3365
3370
  <xsl:attribute name="font-weight">bold</xsl:attribute>
3366
3371
  <xsl:attribute name="text-align">center</xsl:attribute>
@@ -3408,6 +3413,7 @@
3408
3413
  </xsl:template>
3409
3414
 
3410
3415
  <xsl:attribute-set name="image-style">
3416
+ <xsl:attribute name="role">SKIP</xsl:attribute>
3411
3417
  <xsl:attribute name="text-align">center</xsl:attribute>
3412
3418
 
3413
3419
  </xsl:attribute-set>
@@ -3676,6 +3682,13 @@
3676
3682
 
3677
3683
  </xsl:attribute-set> <!-- bibitem-non-normative-list-style -->
3678
3684
 
3685
+ <xsl:attribute-set name="bibitem-non-normative-list-item-style">
3686
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
3687
+
3688
+ <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
3689
+
3690
+ </xsl:attribute-set>
3691
+
3679
3692
  <!-- bibitem in bibliography section (references/@normative="false"), list body -->
3680
3693
  <xsl:attribute-set name="bibitem-normative-list-body-style">
3681
3694
 
@@ -4066,14 +4079,14 @@
4066
4079
  <xsl:value-of select="$sep"/><xsl:value-of select="$zero_width_space"/>
4067
4080
  </xsl:when>
4068
4081
  <xsl:otherwise>
4069
- <fo:inline keep-together.within-line="always"><xsl:apply-templates/></fo:inline>
4082
+ <fo:inline keep-together.within-line="always" role="SKIP"><xsl:apply-templates/></fo:inline>
4070
4083
  </xsl:otherwise>
4071
4084
  </xsl:choose>
4072
4085
  </xsl:for-each>
4073
4086
  </xsl:when>
4074
4087
 
4075
4088
  <xsl:otherwise>
4076
- <fo:inline keep-together.within-line="always"><xsl:apply-templates/></fo:inline>
4089
+ <fo:inline keep-together.within-line="always" role="SKIP"><xsl:apply-templates/></fo:inline>
4077
4090
  </xsl:otherwise>
4078
4091
 
4079
4092
  </xsl:choose>
@@ -4083,7 +4096,7 @@
4083
4096
  <!-- Preface boilerplate sections processing -->
4084
4097
  <!-- ================================= -->
4085
4098
  <xsl:template match="*[local-name()='copyright-statement']">
4086
- <fo:block xsl:use-attribute-sets="copyright-statement-style">
4099
+ <fo:block xsl:use-attribute-sets="copyright-statement-style" role="SKIP">
4087
4100
  <xsl:apply-templates/>
4088
4101
  </fo:block>
4089
4102
  </xsl:template> <!-- copyright-statement -->
@@ -4262,7 +4275,7 @@
4262
4275
  </xsl:choose>
4263
4276
  </xsl:variable>
4264
4277
 
4265
- <fo:block-container xsl:use-attribute-sets="table-container-style">
4278
+ <fo:block-container xsl:use-attribute-sets="table-container-style" role="SKIP">
4266
4279
 
4267
4280
  <xsl:call-template name="refine_table-container-style">
4268
4281
  <xsl:with-param name="margin-side" select="$margin-side"/>
@@ -5370,7 +5383,7 @@
5370
5383
  </xsl:choose>
5371
5384
  </xsl:variable>
5372
5385
  <xsl:variable name="footnote_inline">
5373
- <fo:inline>
5386
+ <fo:inline role="Reference">
5374
5387
 
5375
5388
  <xsl:variable name="fn_styles">
5376
5389
  <xsl:choose>
@@ -5393,7 +5406,7 @@
5393
5406
 
5394
5407
  <xsl:call-template name="insert_basic_link">
5395
5408
  <xsl:with-param name="element">
5396
- <fo:basic-link internal-destination="{$ref_id}" fox:alt-text="footnote {$current_fn_number}">
5409
+ <fo:basic-link internal-destination="{$ref_id}" fox:alt-text="footnote {$current_fn_number}" role="Lbl">
5397
5410
  <xsl:copy-of select="$current_fn_number_text"/>
5398
5411
  </fo:basic-link>
5399
5412
  </xsl:with-param>
@@ -5406,17 +5419,17 @@
5406
5419
  <xsl:copy-of select="$footnote_inline"/>
5407
5420
  </xsl:when>
5408
5421
  <xsl:when test="$p_fn//fn[@gen_id = $gen_id] or normalize-space(@skip_footnote_body) = 'false'">
5409
- <fo:footnote xsl:use-attribute-sets="fn-style">
5422
+ <fo:footnote xsl:use-attribute-sets="fn-style" role="SKIP">
5410
5423
  <xsl:copy-of select="$footnote_inline"/>
5411
- <fo:footnote-body>
5424
+ <fo:footnote-body role="Note">
5412
5425
 
5413
- <fo:block-container xsl:use-attribute-sets="fn-container-body-style">
5426
+ <fo:block-container xsl:use-attribute-sets="fn-container-body-style" role="SKIP">
5414
5427
 
5415
- <fo:block xsl:use-attribute-sets="fn-body-style">
5428
+ <fo:block xsl:use-attribute-sets="fn-body-style" role="SKIP">
5416
5429
 
5417
5430
  <xsl:call-template name="refine_fn-body-style"/>
5418
5431
 
5419
- <fo:inline id="{$ref_id}" xsl:use-attribute-sets="fn-body-num-style">
5432
+ <fo:inline id="{$ref_id}" xsl:use-attribute-sets="fn-body-num-style" role="Lbl">
5420
5433
 
5421
5434
  <xsl:call-template name="refine_fn-body-num-style"/>
5422
5435
 
@@ -5678,11 +5691,11 @@
5678
5691
  </xsl:template>
5679
5692
 
5680
5693
  <xsl:template match="*[local-name()='fn']/text()[normalize-space() != '']">
5681
- <fo:inline><xsl:value-of select="."/></fo:inline>
5694
+ <fo:inline role="SKIP"><xsl:value-of select="."/></fo:inline>
5682
5695
  </xsl:template>
5683
5696
 
5684
5697
  <xsl:template match="*[local-name()='fn']//*[local-name()='p']">
5685
- <fo:inline>
5698
+ <fo:inline role="P">
5686
5699
  <xsl:apply-templates/>
5687
5700
  </fo:inline>
5688
5701
  </xsl:template>
@@ -5697,7 +5710,7 @@
5697
5710
  <xsl:variable name="isAdded" select="@added"/>
5698
5711
  <xsl:variable name="isDeleted" select="@deleted"/>
5699
5712
  <!-- <dl><xsl:copy-of select="."/></dl> -->
5700
- <fo:block-container xsl:use-attribute-sets="dl-block-style">
5713
+ <fo:block-container xsl:use-attribute-sets="dl-block-style" role="SKIP">
5701
5714
 
5702
5715
  <xsl:call-template name="setBlockSpanAll"/>
5703
5716
 
@@ -5732,7 +5745,7 @@
5732
5745
  <xsl:with-param name="isDeleted" select="$isDeleted"/>
5733
5746
  </xsl:call-template>
5734
5747
 
5735
- <fo:block-container margin-left="0mm">
5748
+ <fo:block-container margin-left="0mm" role="SKIP">
5736
5749
 
5737
5750
  <xsl:attribute name="margin-right">0mm</xsl:attribute>
5738
5751
 
@@ -5801,7 +5814,7 @@
5801
5814
 
5802
5815
  <!-- a few components -->
5803
5816
  <xsl:if test="$onlyOneComponent = 'false'">
5804
- <fo:block>
5817
+ <fo:block role="SKIP">
5805
5818
 
5806
5819
  <xsl:call-template name="refine_multicomponent_style"/>
5807
5820
 
@@ -5809,7 +5822,7 @@
5809
5822
  <xsl:attribute name="margin-top">0</xsl:attribute>
5810
5823
  </xsl:if>
5811
5824
 
5812
- <fo:block>
5825
+ <fo:block role="SKIP">
5813
5826
 
5814
5827
  <xsl:call-template name="refine_multicomponent_block_style"/>
5815
5828
 
@@ -6426,6 +6439,9 @@
6426
6439
  <xsl:attribute name="role">SKIP</xsl:attribute>
6427
6440
  </xsl:if>
6428
6441
 
6442
+ <xsl:if test="ancestor::*['preferred']">
6443
+ <xsl:attribute name="role">SKIP</xsl:attribute>
6444
+ </xsl:if>
6429
6445
  </xsl:template>
6430
6446
 
6431
6447
  <xsl:template match="*[local-name()='padding']">
@@ -7428,6 +7444,18 @@
7428
7444
  </xsl:copy>
7429
7445
  </xsl:template>
7430
7446
 
7447
+ <xsl:variable name="font_main_root_style">
7448
+ <root-style xsl:use-attribute-sets="root-style">
7449
+ </root-style>
7450
+ </xsl:variable>
7451
+ <xsl:variable name="font_main_root_style_font_family" select="xalan:nodeset($font_main_root_style)/root-style/@font-family"/>
7452
+ <xsl:variable name="font_main">
7453
+ <xsl:choose>
7454
+ <xsl:when test="contains($font_main_root_style_font_family, ',')"><xsl:value-of select="substring-before($font_main_root_style_font_family, ',')"/></xsl:when>
7455
+ <xsl:otherwise><xsl:value-of select="$font_main_root_style_font_family"/></xsl:otherwise>
7456
+ </xsl:choose>
7457
+ </xsl:variable>
7458
+
7431
7459
  <xsl:template match="*[local-name()='th' or local-name()='td']" mode="simple-table-id">
7432
7460
  <xsl:param name="id"/>
7433
7461
  <xsl:copy>
@@ -7466,6 +7494,33 @@
7466
7494
 
7467
7495
  <!-- td_text='<xsl:copy-of select="$td_text"/>' -->
7468
7496
 
7497
+ <xsl:variable name="words_with_width">
7498
+ <!-- calculate width for 'word' which contain text only (without formatting tags inside) -->
7499
+ <xsl:for-each select="xalan:nodeset($td_text)//*[local-name() = 'word'][normalize-space() != ''][not(*)]">
7500
+ <xsl:copy>
7501
+ <xsl:copy-of select="@*"/>
7502
+ <xsl:attribute name="width">
7503
+ <xsl:value-of select="java:org.metanorma.fop.Util.getStringWidth(., $font_main)"/> <!-- Example: 'Times New Roman' -->
7504
+ </xsl:attribute>
7505
+ <xsl:copy-of select="node()"/>
7506
+ </xsl:copy>
7507
+ </xsl:for-each>
7508
+ </xsl:variable>
7509
+
7510
+ <xsl:variable name="words_with_width_sorted">
7511
+ <xsl:for-each select="xalan:nodeset($words_with_width)//*[local-name() = 'word']">
7512
+ <xsl:sort select="@width" data-type="number" order="descending"/>
7513
+ <!-- select word maximal width only -->
7514
+ <xsl:if test="position() = 1">
7515
+ <xsl:copy-of select="."/>
7516
+ </xsl:if>
7517
+ </xsl:for-each>
7518
+ <!-- add 'word' with formatting tags inside -->
7519
+ <xsl:for-each select="xalan:nodeset($td_text)//*[local-name() = 'word'][normalize-space() != ''][*]">
7520
+ <xsl:copy-of select="."/>
7521
+ </xsl:for-each>
7522
+ </xsl:variable>
7523
+
7469
7524
  <xsl:variable name="words">
7470
7525
  <xsl:for-each select=".//*[local-name() = 'image' or local-name() = 'stem']">
7471
7526
  <word>
@@ -7473,9 +7528,12 @@
7473
7528
  </word>
7474
7529
  </xsl:for-each>
7475
7530
 
7476
- <xsl:for-each select="xalan:nodeset($td_text)//*[local-name() = 'word'][normalize-space() != '']">
7531
+ <xsl:for-each select="xalan:nodeset($words_with_width_sorted)//*[local-name() = 'word'][normalize-space() != '']">
7477
7532
  <xsl:copy-of select="."/>
7478
7533
  </xsl:for-each>
7534
+ <!-- <xsl:for-each select="xalan:nodeset($td_text)//*[local-name() = 'word'][normalize-space() != '']">
7535
+ <xsl:copy-of select="."/>
7536
+ </xsl:for-each> -->
7479
7537
 
7480
7538
  </xsl:variable>
7481
7539
 
@@ -7943,10 +8001,10 @@
7943
8001
  <xsl:copy>
7944
8002
  <xsl:apply-templates select="@*" mode="mathml"/>
7945
8003
  <xsl:if test="not(@lspace)">
7946
- <xsl:attribute name="lspace">0.4em</xsl:attribute>
8004
+ <xsl:attribute name="lspace">0.2em</xsl:attribute>
7947
8005
  </xsl:if>
7948
- <xsl:if test="not(@rspace)">
7949
- <xsl:attribute name="rspace">0.4em</xsl:attribute>
8006
+ <xsl:if test="not(@rspace) and not(following-sibling::*[1][self::mathml:mo and normalize-space(text()) = '|'])">
8007
+ <xsl:attribute name="rspace">0.2em</xsl:attribute>
7950
8008
  </xsl:if>
7951
8009
  <xsl:apply-templates mode="mathml"/>
7952
8010
  </xsl:copy>
@@ -7963,6 +8021,27 @@
7963
8021
  </xsl:copy>
7964
8022
  </xsl:template>
7965
8023
 
8024
+ <!-- increase space before '(' -->
8025
+ <xsl:template match="mathml:mo[normalize-space(text()) = '(']" mode="mathml">
8026
+ <xsl:copy>
8027
+ <xsl:apply-templates select="@*" mode="mathml"/>
8028
+ <xsl:if test="(preceding-sibling::* and not(preceding-sibling::*[1][self::mathml:mo])) or (../preceding-sibling::* and not(../preceding-sibling::*[1][self::mathml:mo]))">
8029
+ <xsl:if test="not(@lspace)">
8030
+ <xsl:attribute name="lspace">0.4em</xsl:attribute>
8031
+ <xsl:choose>
8032
+ <xsl:when test="preceding-sibling::*[1][self::mathml:mi or self::mathml:mstyle]">
8033
+ <xsl:attribute name="lspace">0.2em</xsl:attribute>
8034
+ </xsl:when>
8035
+ <xsl:when test="../preceding-sibling::*[1][self::mathml:mi or self::mathml:mstyle]">
8036
+ <xsl:attribute name="lspace">0.2em</xsl:attribute>
8037
+ </xsl:when>
8038
+ </xsl:choose>
8039
+ </xsl:if>
8040
+ </xsl:if>
8041
+ <xsl:apply-templates mode="mathml"/>
8042
+ </xsl:copy>
8043
+ </xsl:template>
8044
+
7966
8045
  <!-- Examples:
7967
8046
  <stem type="AsciiMath">x = 1</stem>
7968
8047
  <stem type="AsciiMath"><asciimath>x = 1</asciimath></stem>
@@ -8122,7 +8201,7 @@
8122
8201
  <!-- formula -->
8123
8202
  <!-- ====== -->
8124
8203
  <xsl:template match="*[local-name() = 'formula']" name="formula">
8125
- <fo:block-container margin-left="0mm">
8204
+ <fo:block-container margin-left="0mm" role="SKIP">
8126
8205
  <xsl:if test="parent::*[local-name() = 'note']">
8127
8206
  <xsl:attribute name="margin-left">
8128
8207
  <xsl:choose>
@@ -8132,7 +8211,7 @@
8132
8211
  </xsl:attribute>
8133
8212
 
8134
8213
  </xsl:if>
8135
- <fo:block-container margin-left="0mm">
8214
+ <fo:block-container margin-left="0mm" role="SKIP">
8136
8215
  <fo:block id="{@id}">
8137
8216
  <xsl:apply-templates select="node()[not(local-name() = 'name')]"/> <!-- formula's number will be process in 'stem' template -->
8138
8217
  </fo:block>
@@ -8212,13 +8291,13 @@
8212
8291
 
8213
8292
  <xsl:template match="*[local-name() = 'note']" name="note">
8214
8293
 
8215
- <fo:block-container id="{@id}" xsl:use-attribute-sets="note-style">
8294
+ <fo:block-container id="{@id}" xsl:use-attribute-sets="note-style" role="SKIP">
8216
8295
 
8217
8296
  <xsl:call-template name="setBlockSpanAll"/>
8218
8297
 
8219
8298
  <xsl:call-template name="refine_note-style"/>
8220
8299
 
8221
- <fo:block-container margin-left="0mm" margin-right="0mm">
8300
+ <fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
8222
8301
 
8223
8302
  <fo:block>
8224
8303
 
@@ -8384,12 +8463,13 @@
8384
8463
 
8385
8464
  <xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']">
8386
8465
  <xsl:if test="normalize-space() != ''">
8387
- <xsl:variable name="level">
8466
+ <!-- <xsl:variable name="level">
8388
8467
  <xsl:call-template name="getLevelTermName"/>
8389
8468
  </xsl:variable>
8390
8469
  <fo:inline role="H{$level}">
8391
- <xsl:apply-templates/>
8392
- </fo:inline>
8470
+ <xsl:apply-templates />
8471
+ </fo:inline> -->
8472
+ <xsl:apply-templates/>
8393
8473
  </xsl:if>
8394
8474
  </xsl:template>
8395
8475
  <!-- ====== -->
@@ -8413,7 +8493,7 @@
8413
8493
  <!-- Example: Dimensions in millimeters -->
8414
8494
  <xsl:apply-templates select="*[local-name() = 'note'][@type = 'units']"/>
8415
8495
 
8416
- <fo:block xsl:use-attribute-sets="figure-style">
8496
+ <fo:block xsl:use-attribute-sets="figure-style" role="SKIP">
8417
8497
  <xsl:apply-templates select="node()[not(local-name() = 'name') and not(local-name() = 'note' and @type = 'units')]"/>
8418
8498
  </fo:block>
8419
8499
  <xsl:for-each select="*[local-name() = 'note'][not(@type = 'units')]">
@@ -9546,7 +9626,7 @@
9546
9626
  </xsl:when>
9547
9627
 
9548
9628
  <xsl:otherwise>
9549
- <fo:block-container xsl:use-attribute-sets="sourcecode-container-style">
9629
+ <fo:block-container xsl:use-attribute-sets="sourcecode-container-style" role="SKIP">
9550
9630
 
9551
9631
  <xsl:if test="not(ancestor::*[local-name() = 'li']) or ancestor::*[local-name() = 'example']">
9552
9632
  <xsl:attribute name="margin-left">0mm</xsl:attribute>
@@ -9567,7 +9647,7 @@
9567
9647
  </xsl:attribute>
9568
9648
 
9569
9649
  </xsl:if>
9570
- <fo:block-container margin-left="0mm">
9650
+ <fo:block-container margin-left="0mm" role="SKIP">
9571
9651
 
9572
9652
  <fo:block xsl:use-attribute-sets="sourcecode-style">
9573
9653
 
@@ -10115,11 +10195,11 @@
10115
10195
  <!-- requirement, recommendation, permission table -->
10116
10196
  <!-- ========== -->
10117
10197
  <xsl:template match="*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']">
10118
- <fo:block-container margin-left="0mm" margin-right="0mm" margin-bottom="12pt">
10198
+ <fo:block-container margin-left="0mm" margin-right="0mm" margin-bottom="12pt" role="SKIP">
10119
10199
  <xsl:if test="ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']">
10120
10200
  <xsl:attribute name="margin-bottom">0pt</xsl:attribute>
10121
10201
  </xsl:if>
10122
- <fo:block-container margin-left="0mm" margin-right="0mm">
10202
+ <fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
10123
10203
  <fo:table id="{@id}" table-layout="fixed" width="100%"> <!-- border="1pt solid black" -->
10124
10204
  <xsl:if test="ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']">
10125
10205
  <!-- <xsl:attribute name="border">0.5pt solid black</xsl:attribute> -->
@@ -10281,7 +10361,7 @@
10281
10361
  -->
10282
10362
  <xsl:template match="*[local-name() = 'example']">
10283
10363
 
10284
- <fo:block-container id="{@id}" xsl:use-attribute-sets="example-style">
10364
+ <fo:block-container id="{@id}" xsl:use-attribute-sets="example-style" role="SKIP">
10285
10365
 
10286
10366
  <xsl:call-template name="setBlockSpanAll"/>
10287
10367
 
@@ -10292,7 +10372,7 @@
10292
10372
  inline
10293
10373
  </xsl:variable>
10294
10374
 
10295
- <fo:block-container margin-left="0mm">
10375
+ <fo:block-container margin-left="0mm" role="SKIP">
10296
10376
 
10297
10377
  <xsl:choose>
10298
10378
 
@@ -10305,8 +10385,8 @@
10305
10385
  </xsl:apply-templates>
10306
10386
  </fo:block>
10307
10387
 
10308
- <fo:block-container xsl:use-attribute-sets="example-body-style">
10309
- <fo:block-container margin-left="0mm" margin-right="0mm">
10388
+ <fo:block-container xsl:use-attribute-sets="example-body-style" role="SKIP">
10389
+ <fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
10310
10390
  <xsl:apply-templates select="node()[not(local-name() = 'name')]">
10311
10391
  <xsl:with-param name="fo_element" select="$fo_element"/>
10312
10392
  </xsl:apply-templates>
@@ -10359,8 +10439,8 @@
10359
10439
 
10360
10440
  <xsl:if test="*[not(local-name() = 'name')][position() &gt; 1]">
10361
10441
  <!-- display further elements in blocks -->
10362
- <fo:block-container xsl:use-attribute-sets="example-body-style">
10363
- <fo:block-container margin-left="0mm" margin-right="0mm">
10442
+ <fo:block-container xsl:use-attribute-sets="example-body-style" role="SKIP">
10443
+ <fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
10364
10444
  <xsl:apply-templates select="*[not(local-name() = 'name')][position() &gt; 1]">
10365
10445
  <xsl:with-param name="fo_element" select="'block'"/>
10366
10446
  </xsl:apply-templates>
@@ -10418,7 +10498,7 @@
10418
10498
  </xsl:variable>
10419
10499
  <xsl:choose>
10420
10500
  <xsl:when test="starts-with(normalize-space($element), 'block')">
10421
- <fo:block-container>
10501
+ <fo:block-container role="SKIP">
10422
10502
  <xsl:if test="ancestor::*[local-name() = 'li'] and contains(normalize-space($fo_element), 'block')">
10423
10503
  <xsl:attribute name="margin-left">0mm</xsl:attribute>
10424
10504
  <xsl:attribute name="margin-right">0mm</xsl:attribute>
@@ -10559,7 +10639,7 @@
10559
10639
  <!-- author -->
10560
10640
  <!-- ====== -->
10561
10641
  <xsl:template match="*[local-name() = 'quote']">
10562
- <fo:block-container margin-left="0mm">
10642
+ <fo:block-container margin-left="0mm" role="SKIP">
10563
10643
 
10564
10644
  <xsl:call-template name="setBlockSpanAll"/>
10565
10645
 
@@ -10569,12 +10649,12 @@
10569
10649
  </xsl:if>
10570
10650
  </xsl:if>
10571
10651
 
10572
- <fo:block-container margin-left="0mm">
10573
- <fo:block-container xsl:use-attribute-sets="quote-style">
10652
+ <fo:block-container margin-left="0mm" role="SKIP">
10653
+ <fo:block-container xsl:use-attribute-sets="quote-style" role="SKIP">
10574
10654
 
10575
10655
  <xsl:call-template name="refine_quote-style"/>
10576
10656
 
10577
- <fo:block-container margin-left="0mm" margin-right="0mm">
10657
+ <fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
10578
10658
  <fo:block role="BlockQuote">
10579
10659
  <xsl:apply-templates select="./node()[not(local-name() = 'author') and not(local-name() = 'source')]"/> <!-- process all nested nodes, except author and source -->
10580
10660
  </fo:block>
@@ -10730,10 +10810,10 @@
10730
10810
 
10731
10811
  <xsl:choose>
10732
10812
  <xsl:when test="$lang = 'zh'">
10733
- <fo:inline><xsl:value-of select="$tab_zh"/></fo:inline>
10813
+ <fo:inline role="SKIP"><xsl:value-of select="$tab_zh"/></fo:inline>
10734
10814
  </xsl:when>
10735
10815
  <xsl:when test="../../@inline-header = 'true'">
10736
- <fo:inline font-size="90%">
10816
+ <fo:inline font-size="90%" role="SKIP">
10737
10817
  <xsl:call-template name="insertNonBreakSpaces">
10738
10818
  <xsl:with-param name="count" select="$padding-right"/>
10739
10819
  </xsl:call-template>
@@ -10741,7 +10821,7 @@
10741
10821
  </xsl:when>
10742
10822
  <xsl:otherwise>
10743
10823
  <xsl:variable name="direction"><xsl:if test="$lang = 'ar'"><xsl:value-of select="$RLM"/></xsl:if></xsl:variable>
10744
- <fo:inline padding-right="{$padding-right}mm"><xsl:value-of select="$direction"/>​</fo:inline>
10824
+ <fo:inline padding-right="{$padding-right}mm" role="SKIP"><xsl:value-of select="$direction"/>​</fo:inline>
10745
10825
  </xsl:otherwise>
10746
10826
  </xsl:choose>
10747
10827
 
@@ -10771,12 +10851,12 @@
10771
10851
  <fo:block font-size="{normalize-space($font-size)}" role="H{$levelTerm}" xsl:use-attribute-sets="preferred-block-style">
10772
10852
 
10773
10853
  <xsl:if test="parent::*[local-name() = 'term'] and not(preceding-sibling::*[local-name() = 'preferred'])"> <!-- if first preffered in term, then display term's name -->
10774
- <fo:block xsl:use-attribute-sets="term-name-style">
10854
+ <fo:block xsl:use-attribute-sets="term-name-style" role="SKIP">
10775
10855
  <xsl:apply-templates select="ancestor::*[local-name() = 'term'][1]/*[local-name() = 'name']"/>
10776
10856
  </fo:block>
10777
10857
  </xsl:if>
10778
10858
 
10779
- <fo:block xsl:use-attribute-sets="preferred-term-style">
10859
+ <fo:block xsl:use-attribute-sets="preferred-term-style" role="SKIP">
10780
10860
  <xsl:call-template name="setStyle_preferred"/>
10781
10861
  <xsl:apply-templates/>
10782
10862
  </fo:block>
@@ -10817,7 +10897,7 @@
10817
10897
  <!-- definition -->
10818
10898
  <!-- ========== -->
10819
10899
  <xsl:template match="*[local-name() = 'definition']">
10820
- <fo:block xsl:use-attribute-sets="definition-style">
10900
+ <fo:block xsl:use-attribute-sets="definition-style" role="SKIP">
10821
10901
  <xsl:apply-templates/>
10822
10902
  </fo:block>
10823
10903
  </xsl:template>
@@ -10865,6 +10945,10 @@
10865
10945
 
10866
10946
  <xsl:template match="*[local-name() = 'clause']">
10867
10947
  <fo:block>
10948
+ <xsl:if test="parent::*[local-name() = 'copyright-statement']">
10949
+ <xsl:attribute name="role">SKIP</xsl:attribute>
10950
+ </xsl:if>
10951
+
10868
10952
  <xsl:call-template name="setId"/>
10869
10953
 
10870
10954
  <xsl:call-template name="setBlockSpanAll"/>
@@ -11101,7 +11185,7 @@
11101
11185
  <xsl:template match="*[local-name() = 'ul'] | *[local-name() = 'ol']">
11102
11186
  <xsl:choose>
11103
11187
  <xsl:when test="parent::*[local-name() = 'note'] or parent::*[local-name() = 'termnote']">
11104
- <fo:block-container>
11188
+ <fo:block-container role="SKIP">
11105
11189
  <xsl:attribute name="margin-left">
11106
11190
  <xsl:choose>
11107
11191
  <xsl:when test="not(ancestor::*[local-name() = 'table'])"><xsl:value-of select="$note-body-indent"/></xsl:when>
@@ -11111,7 +11195,7 @@
11111
11195
 
11112
11196
  <xsl:call-template name="refine_list_container_style"/>
11113
11197
 
11114
- <fo:block-container margin-left="0mm">
11198
+ <fo:block-container margin-left="0mm" role="SKIP">
11115
11199
  <fo:block>
11116
11200
  <xsl:apply-templates select="." mode="list"/>
11117
11201
  </fo:block>
@@ -11120,7 +11204,7 @@
11120
11204
  </xsl:when>
11121
11205
  <xsl:otherwise>
11122
11206
 
11123
- <fo:block>
11207
+ <fo:block role="SKIP">
11124
11208
  <xsl:apply-templates select="." mode="list"/>
11125
11209
  </fo:block>
11126
11210
 
@@ -11538,7 +11622,16 @@
11538
11622
  <!-- Reference sections (Normative References and Bibliography) -->
11539
11623
  <!-- ========================================================== -->
11540
11624
  <xsl:template match="*[local-name() = 'references'][@hidden='true']" priority="3"/>
11541
- <xsl:template match="*[local-name() = 'bibitem'][@hidden='true']" priority="3"/>
11625
+ <xsl:template match="*[local-name() = 'bibitem'][@hidden='true']" priority="3">
11626
+ <xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][local-name() = 'bibitem'] and 1 = 1)"/>
11627
+
11628
+ <xsl:if test="ancestor::*[local-name() = 'references'][not(@normative='true')] or preceding-sibling::*[local-name() = 'references'][1][not(@normative='true')]">
11629
+ <xsl:apply-templates select="following-sibling::*[1][local-name() = 'bibitem']">
11630
+ <xsl:with-param name="skip" select="$skip"/>
11631
+ </xsl:apply-templates>
11632
+ </xsl:if>
11633
+
11634
+ </xsl:template>
11542
11635
  <!-- don't display bibitem with @id starts with '_hidden', that was introduced for references integrity -->
11543
11636
  <xsl:template match="*[local-name() = 'bibitem'][starts-with(@id, 'hidden_bibitem_')]" priority="3"/>
11544
11637
 
@@ -11585,36 +11678,60 @@
11585
11678
 
11586
11679
  </xsl:template> <!-- bibitem -->
11587
11680
 
11681
+ <!-- start list for bibitem sequence -->
11682
+ <xsl:template match="*[local-name() = 'references'][not(@normative='true')]/*[local-name() = 'bibitem'][1]" priority="4">
11683
+ <xsl:variable name="list_items">
11684
+ <xsl:call-template name="insertListItem_Bibitem"/>
11685
+ </xsl:variable>
11686
+ <xsl:if test="normalize-space($list_items) != ''">
11687
+ <fo:list-block xsl:use-attribute-sets="bibitem-non-normative-list-style">
11688
+ <xsl:copy-of select="$list_items"/>
11689
+ </fo:list-block>
11690
+ </xsl:if>
11691
+ </xsl:template>
11692
+
11588
11693
  <!-- Bibliography (non-normative references) -->
11589
11694
  <xsl:template match="*[local-name() = 'references'][not(@normative='true')]/*[local-name() = 'bibitem']" name="bibitem_non_normative" priority="2">
11695
+ <xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][local-name() = 'bibitem'] and 1 = 1)"/> <!-- current bibiitem is non-first -->
11590
11696
 
11591
- <!-- $namespace = 'csd' or $namespace = 'gb' or $namespace = 'iec' or $namespace = 'ieee' or $namespace = 'iso' or $namespace = 'jcgm' or $namespace = 'm3d' or
11592
- $namespace = 'mpfd' or $namespace = 'ogc' or $namespace = 'ogc-white-paper' -->
11593
- <!-- Example: [1] ISO 9:1995, Information and documentation – Transliteration of Cyrillic characters into Latin characters – Slavic and non-Slavic languages -->
11594
- <fo:list-block id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-list-style">
11595
- <fo:list-item>
11596
- <fo:list-item-label end-indent="label-end()">
11597
- <fo:block role="SKIP">
11598
- <fo:inline role="SKIP">
11599
-
11600
- <xsl:apply-templates select="*[local-name() = 'biblio-tag']">
11601
- <xsl:with-param name="biblio_tag_part">first</xsl:with-param>
11602
- </xsl:apply-templates>
11603
- </fo:inline>
11604
- </fo:block>
11605
- </fo:list-item-label>
11606
- <fo:list-item-body start-indent="body-start()">
11607
- <fo:block xsl:use-attribute-sets="bibitem-non-normative-list-body-style" role="SKIP">
11608
- <xsl:call-template name="processBibitem">
11609
- <xsl:with-param name="biblio_tag_part">last</xsl:with-param>
11610
- </xsl:call-template>
11611
- </fo:block>
11612
- </fo:list-item-body>
11613
- </fo:list-item>
11614
- </fo:list-block>
11697
+ <xsl:choose>
11698
+ <xsl:when test="$skip = 'true'"><!-- skip bibitem --></xsl:when>
11699
+ <xsl:otherwise>
11700
+ <xsl:call-template name="insertListItem_Bibitem"/>
11701
+ </xsl:otherwise>
11702
+ </xsl:choose>
11615
11703
 
11616
11704
  </xsl:template> <!-- references[not(@normative='true')]/bibitem -->
11617
11705
 
11706
+ <xsl:template name="insertListItem_Bibitem">
11707
+ <xsl:choose>
11708
+ <xsl:when test="@hidden = 'true'"><!-- skip --></xsl:when>
11709
+ <xsl:otherwise>
11710
+ <fo:list-item id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-list-item-style">
11711
+ <fo:list-item-label end-indent="label-end()">
11712
+ <fo:block role="SKIP">
11713
+ <fo:inline role="SKIP">
11714
+ <xsl:apply-templates select="*[local-name() = 'biblio-tag']">
11715
+ <xsl:with-param name="biblio_tag_part">first</xsl:with-param>
11716
+ </xsl:apply-templates>
11717
+ </fo:inline>
11718
+ </fo:block>
11719
+ </fo:list-item-label>
11720
+ <fo:list-item-body start-indent="body-start()">
11721
+ <fo:block xsl:use-attribute-sets="bibitem-non-normative-list-body-style" role="SKIP">
11722
+ <xsl:call-template name="processBibitem">
11723
+ <xsl:with-param name="biblio_tag_part">last</xsl:with-param>
11724
+ </xsl:call-template>
11725
+ </fo:block>
11726
+ </fo:list-item-body>
11727
+ </fo:list-item>
11728
+ </xsl:otherwise>
11729
+ </xsl:choose>
11730
+ <xsl:apply-templates select="following-sibling::*[1][local-name() = 'bibitem']">
11731
+ <xsl:with-param name="skip">false</xsl:with-param>
11732
+ </xsl:apply-templates>
11733
+ </xsl:template>
11734
+
11618
11735
  <xsl:template name="processBibitem">
11619
11736
  <xsl:param name="biblio_tag_part">both</xsl:param>
11620
11737