metanorma-ogc 1.4.1 → 1.4.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/asciidoctor/ogc/cleanup.rb +145 -0
- data/lib/asciidoctor/ogc/converter.rb +9 -76
- data/lib/asciidoctor/ogc/isodoc.rng +17 -2
- data/lib/asciidoctor/ogc/validate.rb +35 -20
- data/lib/isodoc/ogc/base_convert.rb +47 -10
- data/lib/isodoc/ogc/html/htmlstyle.css +10 -0
- data/lib/isodoc/ogc/html/htmlstyle.scss +12 -0
- data/lib/isodoc/ogc/html/ogc.css +4 -0
- data/lib/isodoc/ogc/html/ogc.scss +4 -0
- data/lib/isodoc/ogc/i18n-en.yaml +10 -8
- data/lib/isodoc/ogc/ogc.abstract-specification-topic.xsl +28 -8
- data/lib/isodoc/ogc/ogc.best-practice.xsl +28 -8
- data/lib/isodoc/ogc/ogc.change-request-supporting-document.xsl +28 -8
- data/lib/isodoc/ogc/ogc.community-practice.xsl +28 -8
- data/lib/isodoc/ogc/ogc.community-standard.xsl +28 -8
- data/lib/isodoc/ogc/ogc.discussion-paper.xsl +28 -8
- data/lib/isodoc/ogc/ogc.engineering-report.xsl +28 -8
- data/lib/isodoc/ogc/ogc.other.xsl +28 -8
- data/lib/isodoc/ogc/ogc.policy.xsl +28 -8
- data/lib/isodoc/ogc/ogc.reference-model.xsl +28 -8
- data/lib/isodoc/ogc/ogc.release-notes.xsl +28 -8
- data/lib/isodoc/ogc/ogc.standard.xsl +28 -8
- data/lib/isodoc/ogc/ogc.test-suite.xsl +28 -8
- data/lib/isodoc/ogc/ogc.user-guide.xsl +28 -8
- data/lib/isodoc/ogc/ogc.white-paper.xsl +1 -0
- data/lib/isodoc/ogc/presentation_xml_convert.rb +6 -3
- data/lib/isodoc/ogc/reqt.rb +48 -36
- data/lib/isodoc/ogc/xref.rb +1 -2
- data/lib/metanorma/ogc/version.rb +1 -1
- metadata +3 -2
|
@@ -364,7 +364,7 @@
|
|
|
364
364
|
|
|
365
365
|
<xsl:choose>
|
|
366
366
|
<xsl:when test="@level = 1">
|
|
367
|
-
<fo:list-block provisional-distance-between-starts="
|
|
367
|
+
<fo:list-block provisional-distance-between-starts="8mm">
|
|
368
368
|
<xsl:if test="@type = 'annex'">
|
|
369
369
|
<xsl:attribute name="provisional-distance-between-starts">0mm</xsl:attribute>
|
|
370
370
|
</xsl:if>
|
|
@@ -393,7 +393,7 @@
|
|
|
393
393
|
</fo:list-block>
|
|
394
394
|
</xsl:when>
|
|
395
395
|
<xsl:otherwise>
|
|
396
|
-
<fo:block text-align-last="justify" margin-left="
|
|
396
|
+
<fo:block text-align-last="justify" margin-left="8mm">
|
|
397
397
|
<fo:basic-link internal-destination="{@id}" fox:alt-text="{text()}">
|
|
398
398
|
<xsl:value-of select="java:toUpperCase(java:java.lang.String.new(@section))"/>
|
|
399
399
|
<xsl:text> </xsl:text>
|
|
@@ -579,7 +579,7 @@
|
|
|
579
579
|
<xsl:value-of select="translate(., $thinspace, ' ')"/>
|
|
580
580
|
</xsl:template>
|
|
581
581
|
|
|
582
|
-
<xsl:template match="text()" priority="3" mode="contents">
|
|
582
|
+
<xsl:template match="ogc:title//text() | ogc:name//text()" priority="3" mode="contents">
|
|
583
583
|
<xsl:value-of select="translate(., $thinspace, ' ')"/>
|
|
584
584
|
</xsl:template>
|
|
585
585
|
|
|
@@ -587,7 +587,9 @@
|
|
|
587
587
|
<xsl:variable name="content">
|
|
588
588
|
<xsl:call-template name="add-zero-spaces"/>
|
|
589
589
|
</xsl:variable>
|
|
590
|
-
|
|
590
|
+
<!-- add zero-width space in the words like 'adeOfAbstractTransportaonSpace' to split it in the table's cell -->
|
|
591
|
+
<xsl:variable name="content2" select="java:replaceAll(java:java.lang.String.new($content),'([a-z]{2,})([A-Z])(.?)','$1$2$3')"/>
|
|
592
|
+
<xsl:value-of select="translate($content2, $thinspace, ' ')"/>
|
|
591
593
|
</xsl:template>
|
|
592
594
|
|
|
593
595
|
|
|
@@ -1057,6 +1059,9 @@
|
|
|
1057
1059
|
<xsl:if test="ancestor::ogc:table">
|
|
1058
1060
|
<xsl:attribute name="margin-left">1.5mm</xsl:attribute>
|
|
1059
1061
|
</xsl:if>
|
|
1062
|
+
<xsl:if test="ancestor::ogc:ul or ancestor::ogc:ol">
|
|
1063
|
+
<xsl:attribute name="margin-top">10pt</xsl:attribute>
|
|
1064
|
+
</xsl:if>
|
|
1060
1065
|
<fo:block-container margin-left="0mm">
|
|
1061
1066
|
<fo:list-block provisional-distance-between-starts="12mm" space-after="12pt" line-height="115%">
|
|
1062
1067
|
<xsl:if test="ancestor::ogc:table">
|
|
@@ -1091,17 +1096,25 @@
|
|
|
1091
1096
|
<xsl:number format="a)" lang="en"/>
|
|
1092
1097
|
</xsl:when>
|
|
1093
1098
|
<xsl:when test="../@type = 'alphabet'">
|
|
1094
|
-
<xsl:number format="1
|
|
1099
|
+
<xsl:number format="1."/>
|
|
1095
1100
|
</xsl:when>
|
|
1096
1101
|
<xsl:when test="../@type = 'alphabet_upper'">
|
|
1097
1102
|
<xsl:number format="A)" lang="en"/>
|
|
1098
1103
|
</xsl:when>
|
|
1099
|
-
|
|
1100
1104
|
<xsl:when test="../@type = 'roman'">
|
|
1101
1105
|
<xsl:number format="i)"/>
|
|
1102
1106
|
</xsl:when>
|
|
1107
|
+
<xsl:when test="ancestor::ogc:table">
|
|
1108
|
+
<xsl:variable name="level" select="count(ancestor-or-self::ogc:li[ancestor::ogc:table])"/>
|
|
1109
|
+
<xsl:choose>
|
|
1110
|
+
<xsl:when test="$level = 1"><xsl:number format="a)" lang="en"/></xsl:when>
|
|
1111
|
+
<xsl:when test="$level = 2"><xsl:number format="1."/></xsl:when>
|
|
1112
|
+
<xsl:when test="$level = 3"><xsl:number format="i)"/></xsl:when>
|
|
1113
|
+
<xsl:otherwise><xsl:number format="a)" lang="en"/></xsl:otherwise>
|
|
1114
|
+
</xsl:choose>
|
|
1115
|
+
</xsl:when>
|
|
1103
1116
|
<xsl:otherwise>
|
|
1104
|
-
<xsl:number format="1
|
|
1117
|
+
<xsl:number format="1."/>
|
|
1105
1118
|
</xsl:otherwise>
|
|
1106
1119
|
</xsl:choose>
|
|
1107
1120
|
</xsl:otherwise>
|
|
@@ -1110,6 +1123,9 @@
|
|
|
1110
1123
|
</fo:list-item-label>
|
|
1111
1124
|
<fo:list-item-body start-indent="body-start()" line-height-shift-adjustment="disregard-shifts">
|
|
1112
1125
|
<fo:block margin-bottom="10pt">
|
|
1126
|
+
<xsl:if test="not(following-sibling::*) and not(../following-sibling::*)">
|
|
1127
|
+
<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
|
|
1128
|
+
</xsl:if>
|
|
1113
1129
|
<xsl:apply-templates/>
|
|
1114
1130
|
</fo:block>
|
|
1115
1131
|
</fo:list-item-body>
|
|
@@ -1834,7 +1850,7 @@
|
|
|
1834
1850
|
|
|
1835
1851
|
<xsl:attribute name="text-align">left</xsl:attribute>
|
|
1836
1852
|
<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
|
|
1837
|
-
<xsl:attribute name="font-weight">
|
|
1853
|
+
<xsl:attribute name="font-weight">bold</xsl:attribute><!-- normal -->
|
|
1838
1854
|
<xsl:attribute name="font-size">11pt</xsl:attribute>
|
|
1839
1855
|
|
|
1840
1856
|
|
|
@@ -1994,6 +2010,7 @@
|
|
|
1994
2010
|
|
|
1995
2011
|
|
|
1996
2012
|
|
|
2013
|
+
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
|
1997
2014
|
<xsl:attribute name="margin-top">12pt</xsl:attribute>
|
|
1998
2015
|
<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
|
|
1999
2016
|
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
|
@@ -2954,6 +2971,8 @@
|
|
|
2954
2971
|
|
|
2955
2972
|
|
|
2956
2973
|
<xsl:attribute name="border">solid 0pt white</xsl:attribute>
|
|
2974
|
+
<xsl:attribute name="padding-top">1mm</xsl:attribute>
|
|
2975
|
+
<xsl:attribute name="padding-bottom">1mm</xsl:attribute>
|
|
2957
2976
|
|
|
2958
2977
|
|
|
2959
2978
|
|
|
@@ -5957,6 +5976,7 @@
|
|
|
5957
5976
|
</xsl:template><xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'li']" priority="4">
|
|
5958
5977
|
<xsl:variable name="level" select="count(ancestor::*[local-name() = 'ul'])"/>
|
|
5959
5978
|
<fo:block start-indent="{5 * $level}mm" text-indent="-5mm">
|
|
5979
|
+
|
|
5960
5980
|
<xsl:apply-templates/>
|
|
5961
5981
|
</fo:block>
|
|
5962
5982
|
</xsl:template><xsl:template match="*[local-name() = 'bookmark']" name="bookmark">
|
|
@@ -364,7 +364,7 @@
|
|
|
364
364
|
|
|
365
365
|
<xsl:choose>
|
|
366
366
|
<xsl:when test="@level = 1">
|
|
367
|
-
<fo:list-block provisional-distance-between-starts="
|
|
367
|
+
<fo:list-block provisional-distance-between-starts="8mm">
|
|
368
368
|
<xsl:if test="@type = 'annex'">
|
|
369
369
|
<xsl:attribute name="provisional-distance-between-starts">0mm</xsl:attribute>
|
|
370
370
|
</xsl:if>
|
|
@@ -393,7 +393,7 @@
|
|
|
393
393
|
</fo:list-block>
|
|
394
394
|
</xsl:when>
|
|
395
395
|
<xsl:otherwise>
|
|
396
|
-
<fo:block text-align-last="justify" margin-left="
|
|
396
|
+
<fo:block text-align-last="justify" margin-left="8mm">
|
|
397
397
|
<fo:basic-link internal-destination="{@id}" fox:alt-text="{text()}">
|
|
398
398
|
<xsl:value-of select="java:toUpperCase(java:java.lang.String.new(@section))"/>
|
|
399
399
|
<xsl:text> </xsl:text>
|
|
@@ -579,7 +579,7 @@
|
|
|
579
579
|
<xsl:value-of select="translate(., $thinspace, ' ')"/>
|
|
580
580
|
</xsl:template>
|
|
581
581
|
|
|
582
|
-
<xsl:template match="text()" priority="3" mode="contents">
|
|
582
|
+
<xsl:template match="ogc:title//text() | ogc:name//text()" priority="3" mode="contents">
|
|
583
583
|
<xsl:value-of select="translate(., $thinspace, ' ')"/>
|
|
584
584
|
</xsl:template>
|
|
585
585
|
|
|
@@ -587,7 +587,9 @@
|
|
|
587
587
|
<xsl:variable name="content">
|
|
588
588
|
<xsl:call-template name="add-zero-spaces"/>
|
|
589
589
|
</xsl:variable>
|
|
590
|
-
|
|
590
|
+
<!-- add zero-width space in the words like 'adeOfAbstractTransportaonSpace' to split it in the table's cell -->
|
|
591
|
+
<xsl:variable name="content2" select="java:replaceAll(java:java.lang.String.new($content),'([a-z]{2,})([A-Z])(.?)','$1$2$3')"/>
|
|
592
|
+
<xsl:value-of select="translate($content2, $thinspace, ' ')"/>
|
|
591
593
|
</xsl:template>
|
|
592
594
|
|
|
593
595
|
|
|
@@ -1057,6 +1059,9 @@
|
|
|
1057
1059
|
<xsl:if test="ancestor::ogc:table">
|
|
1058
1060
|
<xsl:attribute name="margin-left">1.5mm</xsl:attribute>
|
|
1059
1061
|
</xsl:if>
|
|
1062
|
+
<xsl:if test="ancestor::ogc:ul or ancestor::ogc:ol">
|
|
1063
|
+
<xsl:attribute name="margin-top">10pt</xsl:attribute>
|
|
1064
|
+
</xsl:if>
|
|
1060
1065
|
<fo:block-container margin-left="0mm">
|
|
1061
1066
|
<fo:list-block provisional-distance-between-starts="12mm" space-after="12pt" line-height="115%">
|
|
1062
1067
|
<xsl:if test="ancestor::ogc:table">
|
|
@@ -1091,17 +1096,25 @@
|
|
|
1091
1096
|
<xsl:number format="a)" lang="en"/>
|
|
1092
1097
|
</xsl:when>
|
|
1093
1098
|
<xsl:when test="../@type = 'alphabet'">
|
|
1094
|
-
<xsl:number format="1
|
|
1099
|
+
<xsl:number format="1."/>
|
|
1095
1100
|
</xsl:when>
|
|
1096
1101
|
<xsl:when test="../@type = 'alphabet_upper'">
|
|
1097
1102
|
<xsl:number format="A)" lang="en"/>
|
|
1098
1103
|
</xsl:when>
|
|
1099
|
-
|
|
1100
1104
|
<xsl:when test="../@type = 'roman'">
|
|
1101
1105
|
<xsl:number format="i)"/>
|
|
1102
1106
|
</xsl:when>
|
|
1107
|
+
<xsl:when test="ancestor::ogc:table">
|
|
1108
|
+
<xsl:variable name="level" select="count(ancestor-or-self::ogc:li[ancestor::ogc:table])"/>
|
|
1109
|
+
<xsl:choose>
|
|
1110
|
+
<xsl:when test="$level = 1"><xsl:number format="a)" lang="en"/></xsl:when>
|
|
1111
|
+
<xsl:when test="$level = 2"><xsl:number format="1."/></xsl:when>
|
|
1112
|
+
<xsl:when test="$level = 3"><xsl:number format="i)"/></xsl:when>
|
|
1113
|
+
<xsl:otherwise><xsl:number format="a)" lang="en"/></xsl:otherwise>
|
|
1114
|
+
</xsl:choose>
|
|
1115
|
+
</xsl:when>
|
|
1103
1116
|
<xsl:otherwise>
|
|
1104
|
-
<xsl:number format="1
|
|
1117
|
+
<xsl:number format="1."/>
|
|
1105
1118
|
</xsl:otherwise>
|
|
1106
1119
|
</xsl:choose>
|
|
1107
1120
|
</xsl:otherwise>
|
|
@@ -1110,6 +1123,9 @@
|
|
|
1110
1123
|
</fo:list-item-label>
|
|
1111
1124
|
<fo:list-item-body start-indent="body-start()" line-height-shift-adjustment="disregard-shifts">
|
|
1112
1125
|
<fo:block margin-bottom="10pt">
|
|
1126
|
+
<xsl:if test="not(following-sibling::*) and not(../following-sibling::*)">
|
|
1127
|
+
<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
|
|
1128
|
+
</xsl:if>
|
|
1113
1129
|
<xsl:apply-templates/>
|
|
1114
1130
|
</fo:block>
|
|
1115
1131
|
</fo:list-item-body>
|
|
@@ -1834,7 +1850,7 @@
|
|
|
1834
1850
|
|
|
1835
1851
|
<xsl:attribute name="text-align">left</xsl:attribute>
|
|
1836
1852
|
<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
|
|
1837
|
-
<xsl:attribute name="font-weight">
|
|
1853
|
+
<xsl:attribute name="font-weight">bold</xsl:attribute><!-- normal -->
|
|
1838
1854
|
<xsl:attribute name="font-size">11pt</xsl:attribute>
|
|
1839
1855
|
|
|
1840
1856
|
|
|
@@ -1994,6 +2010,7 @@
|
|
|
1994
2010
|
|
|
1995
2011
|
|
|
1996
2012
|
|
|
2013
|
+
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
|
1997
2014
|
<xsl:attribute name="margin-top">12pt</xsl:attribute>
|
|
1998
2015
|
<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
|
|
1999
2016
|
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
|
@@ -2954,6 +2971,8 @@
|
|
|
2954
2971
|
|
|
2955
2972
|
|
|
2956
2973
|
<xsl:attribute name="border">solid 0pt white</xsl:attribute>
|
|
2974
|
+
<xsl:attribute name="padding-top">1mm</xsl:attribute>
|
|
2975
|
+
<xsl:attribute name="padding-bottom">1mm</xsl:attribute>
|
|
2957
2976
|
|
|
2958
2977
|
|
|
2959
2978
|
|
|
@@ -5957,6 +5976,7 @@
|
|
|
5957
5976
|
</xsl:template><xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'li']" priority="4">
|
|
5958
5977
|
<xsl:variable name="level" select="count(ancestor::*[local-name() = 'ul'])"/>
|
|
5959
5978
|
<fo:block start-indent="{5 * $level}mm" text-indent="-5mm">
|
|
5979
|
+
|
|
5960
5980
|
<xsl:apply-templates/>
|
|
5961
5981
|
</fo:block>
|
|
5962
5982
|
</xsl:template><xsl:template match="*[local-name() = 'bookmark']" name="bookmark">
|
|
@@ -364,7 +364,7 @@
|
|
|
364
364
|
|
|
365
365
|
<xsl:choose>
|
|
366
366
|
<xsl:when test="@level = 1">
|
|
367
|
-
<fo:list-block provisional-distance-between-starts="
|
|
367
|
+
<fo:list-block provisional-distance-between-starts="8mm">
|
|
368
368
|
<xsl:if test="@type = 'annex'">
|
|
369
369
|
<xsl:attribute name="provisional-distance-between-starts">0mm</xsl:attribute>
|
|
370
370
|
</xsl:if>
|
|
@@ -393,7 +393,7 @@
|
|
|
393
393
|
</fo:list-block>
|
|
394
394
|
</xsl:when>
|
|
395
395
|
<xsl:otherwise>
|
|
396
|
-
<fo:block text-align-last="justify" margin-left="
|
|
396
|
+
<fo:block text-align-last="justify" margin-left="8mm">
|
|
397
397
|
<fo:basic-link internal-destination="{@id}" fox:alt-text="{text()}">
|
|
398
398
|
<xsl:value-of select="java:toUpperCase(java:java.lang.String.new(@section))"/>
|
|
399
399
|
<xsl:text> </xsl:text>
|
|
@@ -579,7 +579,7 @@
|
|
|
579
579
|
<xsl:value-of select="translate(., $thinspace, ' ')"/>
|
|
580
580
|
</xsl:template>
|
|
581
581
|
|
|
582
|
-
<xsl:template match="text()" priority="3" mode="contents">
|
|
582
|
+
<xsl:template match="ogc:title//text() | ogc:name//text()" priority="3" mode="contents">
|
|
583
583
|
<xsl:value-of select="translate(., $thinspace, ' ')"/>
|
|
584
584
|
</xsl:template>
|
|
585
585
|
|
|
@@ -587,7 +587,9 @@
|
|
|
587
587
|
<xsl:variable name="content">
|
|
588
588
|
<xsl:call-template name="add-zero-spaces"/>
|
|
589
589
|
</xsl:variable>
|
|
590
|
-
|
|
590
|
+
<!-- add zero-width space in the words like 'adeOfAbstractTransportaonSpace' to split it in the table's cell -->
|
|
591
|
+
<xsl:variable name="content2" select="java:replaceAll(java:java.lang.String.new($content),'([a-z]{2,})([A-Z])(.?)','$1$2$3')"/>
|
|
592
|
+
<xsl:value-of select="translate($content2, $thinspace, ' ')"/>
|
|
591
593
|
</xsl:template>
|
|
592
594
|
|
|
593
595
|
|
|
@@ -1057,6 +1059,9 @@
|
|
|
1057
1059
|
<xsl:if test="ancestor::ogc:table">
|
|
1058
1060
|
<xsl:attribute name="margin-left">1.5mm</xsl:attribute>
|
|
1059
1061
|
</xsl:if>
|
|
1062
|
+
<xsl:if test="ancestor::ogc:ul or ancestor::ogc:ol">
|
|
1063
|
+
<xsl:attribute name="margin-top">10pt</xsl:attribute>
|
|
1064
|
+
</xsl:if>
|
|
1060
1065
|
<fo:block-container margin-left="0mm">
|
|
1061
1066
|
<fo:list-block provisional-distance-between-starts="12mm" space-after="12pt" line-height="115%">
|
|
1062
1067
|
<xsl:if test="ancestor::ogc:table">
|
|
@@ -1091,17 +1096,25 @@
|
|
|
1091
1096
|
<xsl:number format="a)" lang="en"/>
|
|
1092
1097
|
</xsl:when>
|
|
1093
1098
|
<xsl:when test="../@type = 'alphabet'">
|
|
1094
|
-
<xsl:number format="1
|
|
1099
|
+
<xsl:number format="1."/>
|
|
1095
1100
|
</xsl:when>
|
|
1096
1101
|
<xsl:when test="../@type = 'alphabet_upper'">
|
|
1097
1102
|
<xsl:number format="A)" lang="en"/>
|
|
1098
1103
|
</xsl:when>
|
|
1099
|
-
|
|
1100
1104
|
<xsl:when test="../@type = 'roman'">
|
|
1101
1105
|
<xsl:number format="i)"/>
|
|
1102
1106
|
</xsl:when>
|
|
1107
|
+
<xsl:when test="ancestor::ogc:table">
|
|
1108
|
+
<xsl:variable name="level" select="count(ancestor-or-self::ogc:li[ancestor::ogc:table])"/>
|
|
1109
|
+
<xsl:choose>
|
|
1110
|
+
<xsl:when test="$level = 1"><xsl:number format="a)" lang="en"/></xsl:when>
|
|
1111
|
+
<xsl:when test="$level = 2"><xsl:number format="1."/></xsl:when>
|
|
1112
|
+
<xsl:when test="$level = 3"><xsl:number format="i)"/></xsl:when>
|
|
1113
|
+
<xsl:otherwise><xsl:number format="a)" lang="en"/></xsl:otherwise>
|
|
1114
|
+
</xsl:choose>
|
|
1115
|
+
</xsl:when>
|
|
1103
1116
|
<xsl:otherwise>
|
|
1104
|
-
<xsl:number format="1
|
|
1117
|
+
<xsl:number format="1."/>
|
|
1105
1118
|
</xsl:otherwise>
|
|
1106
1119
|
</xsl:choose>
|
|
1107
1120
|
</xsl:otherwise>
|
|
@@ -1110,6 +1123,9 @@
|
|
|
1110
1123
|
</fo:list-item-label>
|
|
1111
1124
|
<fo:list-item-body start-indent="body-start()" line-height-shift-adjustment="disregard-shifts">
|
|
1112
1125
|
<fo:block margin-bottom="10pt">
|
|
1126
|
+
<xsl:if test="not(following-sibling::*) and not(../following-sibling::*)">
|
|
1127
|
+
<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
|
|
1128
|
+
</xsl:if>
|
|
1113
1129
|
<xsl:apply-templates/>
|
|
1114
1130
|
</fo:block>
|
|
1115
1131
|
</fo:list-item-body>
|
|
@@ -1834,7 +1850,7 @@
|
|
|
1834
1850
|
|
|
1835
1851
|
<xsl:attribute name="text-align">left</xsl:attribute>
|
|
1836
1852
|
<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
|
|
1837
|
-
<xsl:attribute name="font-weight">
|
|
1853
|
+
<xsl:attribute name="font-weight">bold</xsl:attribute><!-- normal -->
|
|
1838
1854
|
<xsl:attribute name="font-size">11pt</xsl:attribute>
|
|
1839
1855
|
|
|
1840
1856
|
|
|
@@ -1994,6 +2010,7 @@
|
|
|
1994
2010
|
|
|
1995
2011
|
|
|
1996
2012
|
|
|
2013
|
+
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
|
1997
2014
|
<xsl:attribute name="margin-top">12pt</xsl:attribute>
|
|
1998
2015
|
<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
|
|
1999
2016
|
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
|
@@ -2954,6 +2971,8 @@
|
|
|
2954
2971
|
|
|
2955
2972
|
|
|
2956
2973
|
<xsl:attribute name="border">solid 0pt white</xsl:attribute>
|
|
2974
|
+
<xsl:attribute name="padding-top">1mm</xsl:attribute>
|
|
2975
|
+
<xsl:attribute name="padding-bottom">1mm</xsl:attribute>
|
|
2957
2976
|
|
|
2958
2977
|
|
|
2959
2978
|
|
|
@@ -5957,6 +5976,7 @@
|
|
|
5957
5976
|
</xsl:template><xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'li']" priority="4">
|
|
5958
5977
|
<xsl:variable name="level" select="count(ancestor::*[local-name() = 'ul'])"/>
|
|
5959
5978
|
<fo:block start-indent="{5 * $level}mm" text-indent="-5mm">
|
|
5979
|
+
|
|
5960
5980
|
<xsl:apply-templates/>
|
|
5961
5981
|
</fo:block>
|
|
5962
5982
|
</xsl:template><xsl:template match="*[local-name() = 'bookmark']" name="bookmark">
|
|
@@ -364,7 +364,7 @@
|
|
|
364
364
|
|
|
365
365
|
<xsl:choose>
|
|
366
366
|
<xsl:when test="@level = 1">
|
|
367
|
-
<fo:list-block provisional-distance-between-starts="
|
|
367
|
+
<fo:list-block provisional-distance-between-starts="8mm">
|
|
368
368
|
<xsl:if test="@type = 'annex'">
|
|
369
369
|
<xsl:attribute name="provisional-distance-between-starts">0mm</xsl:attribute>
|
|
370
370
|
</xsl:if>
|
|
@@ -393,7 +393,7 @@
|
|
|
393
393
|
</fo:list-block>
|
|
394
394
|
</xsl:when>
|
|
395
395
|
<xsl:otherwise>
|
|
396
|
-
<fo:block text-align-last="justify" margin-left="
|
|
396
|
+
<fo:block text-align-last="justify" margin-left="8mm">
|
|
397
397
|
<fo:basic-link internal-destination="{@id}" fox:alt-text="{text()}">
|
|
398
398
|
<xsl:value-of select="java:toUpperCase(java:java.lang.String.new(@section))"/>
|
|
399
399
|
<xsl:text> </xsl:text>
|
|
@@ -579,7 +579,7 @@
|
|
|
579
579
|
<xsl:value-of select="translate(., $thinspace, ' ')"/>
|
|
580
580
|
</xsl:template>
|
|
581
581
|
|
|
582
|
-
<xsl:template match="text()" priority="3" mode="contents">
|
|
582
|
+
<xsl:template match="ogc:title//text() | ogc:name//text()" priority="3" mode="contents">
|
|
583
583
|
<xsl:value-of select="translate(., $thinspace, ' ')"/>
|
|
584
584
|
</xsl:template>
|
|
585
585
|
|
|
@@ -587,7 +587,9 @@
|
|
|
587
587
|
<xsl:variable name="content">
|
|
588
588
|
<xsl:call-template name="add-zero-spaces"/>
|
|
589
589
|
</xsl:variable>
|
|
590
|
-
|
|
590
|
+
<!-- add zero-width space in the words like 'adeOfAbstractTransportaonSpace' to split it in the table's cell -->
|
|
591
|
+
<xsl:variable name="content2" select="java:replaceAll(java:java.lang.String.new($content),'([a-z]{2,})([A-Z])(.?)','$1$2$3')"/>
|
|
592
|
+
<xsl:value-of select="translate($content2, $thinspace, ' ')"/>
|
|
591
593
|
</xsl:template>
|
|
592
594
|
|
|
593
595
|
|
|
@@ -1057,6 +1059,9 @@
|
|
|
1057
1059
|
<xsl:if test="ancestor::ogc:table">
|
|
1058
1060
|
<xsl:attribute name="margin-left">1.5mm</xsl:attribute>
|
|
1059
1061
|
</xsl:if>
|
|
1062
|
+
<xsl:if test="ancestor::ogc:ul or ancestor::ogc:ol">
|
|
1063
|
+
<xsl:attribute name="margin-top">10pt</xsl:attribute>
|
|
1064
|
+
</xsl:if>
|
|
1060
1065
|
<fo:block-container margin-left="0mm">
|
|
1061
1066
|
<fo:list-block provisional-distance-between-starts="12mm" space-after="12pt" line-height="115%">
|
|
1062
1067
|
<xsl:if test="ancestor::ogc:table">
|
|
@@ -1091,17 +1096,25 @@
|
|
|
1091
1096
|
<xsl:number format="a)" lang="en"/>
|
|
1092
1097
|
</xsl:when>
|
|
1093
1098
|
<xsl:when test="../@type = 'alphabet'">
|
|
1094
|
-
<xsl:number format="1
|
|
1099
|
+
<xsl:number format="1."/>
|
|
1095
1100
|
</xsl:when>
|
|
1096
1101
|
<xsl:when test="../@type = 'alphabet_upper'">
|
|
1097
1102
|
<xsl:number format="A)" lang="en"/>
|
|
1098
1103
|
</xsl:when>
|
|
1099
|
-
|
|
1100
1104
|
<xsl:when test="../@type = 'roman'">
|
|
1101
1105
|
<xsl:number format="i)"/>
|
|
1102
1106
|
</xsl:when>
|
|
1107
|
+
<xsl:when test="ancestor::ogc:table">
|
|
1108
|
+
<xsl:variable name="level" select="count(ancestor-or-self::ogc:li[ancestor::ogc:table])"/>
|
|
1109
|
+
<xsl:choose>
|
|
1110
|
+
<xsl:when test="$level = 1"><xsl:number format="a)" lang="en"/></xsl:when>
|
|
1111
|
+
<xsl:when test="$level = 2"><xsl:number format="1."/></xsl:when>
|
|
1112
|
+
<xsl:when test="$level = 3"><xsl:number format="i)"/></xsl:when>
|
|
1113
|
+
<xsl:otherwise><xsl:number format="a)" lang="en"/></xsl:otherwise>
|
|
1114
|
+
</xsl:choose>
|
|
1115
|
+
</xsl:when>
|
|
1103
1116
|
<xsl:otherwise>
|
|
1104
|
-
<xsl:number format="1
|
|
1117
|
+
<xsl:number format="1."/>
|
|
1105
1118
|
</xsl:otherwise>
|
|
1106
1119
|
</xsl:choose>
|
|
1107
1120
|
</xsl:otherwise>
|
|
@@ -1110,6 +1123,9 @@
|
|
|
1110
1123
|
</fo:list-item-label>
|
|
1111
1124
|
<fo:list-item-body start-indent="body-start()" line-height-shift-adjustment="disregard-shifts">
|
|
1112
1125
|
<fo:block margin-bottom="10pt">
|
|
1126
|
+
<xsl:if test="not(following-sibling::*) and not(../following-sibling::*)">
|
|
1127
|
+
<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
|
|
1128
|
+
</xsl:if>
|
|
1113
1129
|
<xsl:apply-templates/>
|
|
1114
1130
|
</fo:block>
|
|
1115
1131
|
</fo:list-item-body>
|
|
@@ -1834,7 +1850,7 @@
|
|
|
1834
1850
|
|
|
1835
1851
|
<xsl:attribute name="text-align">left</xsl:attribute>
|
|
1836
1852
|
<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
|
|
1837
|
-
<xsl:attribute name="font-weight">
|
|
1853
|
+
<xsl:attribute name="font-weight">bold</xsl:attribute><!-- normal -->
|
|
1838
1854
|
<xsl:attribute name="font-size">11pt</xsl:attribute>
|
|
1839
1855
|
|
|
1840
1856
|
|
|
@@ -1994,6 +2010,7 @@
|
|
|
1994
2010
|
|
|
1995
2011
|
|
|
1996
2012
|
|
|
2013
|
+
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
|
1997
2014
|
<xsl:attribute name="margin-top">12pt</xsl:attribute>
|
|
1998
2015
|
<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
|
|
1999
2016
|
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
|
@@ -2954,6 +2971,8 @@
|
|
|
2954
2971
|
|
|
2955
2972
|
|
|
2956
2973
|
<xsl:attribute name="border">solid 0pt white</xsl:attribute>
|
|
2974
|
+
<xsl:attribute name="padding-top">1mm</xsl:attribute>
|
|
2975
|
+
<xsl:attribute name="padding-bottom">1mm</xsl:attribute>
|
|
2957
2976
|
|
|
2958
2977
|
|
|
2959
2978
|
|
|
@@ -5957,6 +5976,7 @@
|
|
|
5957
5976
|
</xsl:template><xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'li']" priority="4">
|
|
5958
5977
|
<xsl:variable name="level" select="count(ancestor::*[local-name() = 'ul'])"/>
|
|
5959
5978
|
<fo:block start-indent="{5 * $level}mm" text-indent="-5mm">
|
|
5979
|
+
|
|
5960
5980
|
<xsl:apply-templates/>
|
|
5961
5981
|
</fo:block>
|
|
5962
5982
|
</xsl:template><xsl:template match="*[local-name() = 'bookmark']" name="bookmark">
|