metanorma-ogc 1.2.11 → 1.2.12
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/asciidoctor/ogc/basicdoc.rng +5 -3
- data/lib/asciidoctor/ogc/isodoc.rng +3 -0
- data/lib/isodoc/ogc/html_convert.rb +2 -2
- data/lib/isodoc/ogc/ogc.abstract-specification-topic.xsl +77 -10
- data/lib/isodoc/ogc/ogc.best-practice.xsl +77 -10
- data/lib/isodoc/ogc/ogc.change-request-supporting-document.xsl +77 -10
- data/lib/isodoc/ogc/ogc.community-practice.xsl +77 -10
- data/lib/isodoc/ogc/ogc.community-standard.xsl +77 -10
- data/lib/isodoc/ogc/ogc.discussion-paper.xsl +77 -10
- data/lib/isodoc/ogc/ogc.engineering-report.xsl +77 -10
- data/lib/isodoc/ogc/ogc.other.xsl +77 -10
- data/lib/isodoc/ogc/ogc.policy.xsl +77 -10
- data/lib/isodoc/ogc/ogc.reference-model.xsl +77 -10
- data/lib/isodoc/ogc/ogc.release-notes.xsl +77 -10
- data/lib/isodoc/ogc/ogc.standard.xsl +77 -10
- data/lib/isodoc/ogc/ogc.test-suite.xsl +77 -10
- data/lib/isodoc/ogc/ogc.user-guide.xsl +77 -10
- data/lib/isodoc/ogc/ogc.white-paper.xsl +71 -4
- data/lib/isodoc/ogc/word_convert.rb +7 -9
- data/lib/metanorma/ogc/version.rb +1 -1
- data/metanorma-ogc.gemspec +2 -2
- metadata +6 -6
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: e95cb5e967227b7768df33d08b3e2e3b70bfcbd7030ba0f5aefa091315bd8aec
|
|
4
|
+
data.tar.gz: 45585c842aae29e420d1f077bc9a3d8a37712a94bb0b2bc14de8e37c2878c48e
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: b095cea06604606bf565a4ee2699ac4c84553b7be09a90cf9bf5e4a9a4ad65566e3e425161063d3282a2a802e411487df3167352089506b3412e99b5f4017c43
|
|
7
|
+
data.tar.gz: 9320167efb0439ae364797ff99495502f4bd5e287e977701bc4c7b673bfb3328fe73ed45a7cdefc91cc5e3320a6505af6d7c94ff6382050b536de8a5619a6457
|
|
@@ -729,9 +729,11 @@
|
|
|
729
729
|
</define>
|
|
730
730
|
<define name="index">
|
|
731
731
|
<element name="index">
|
|
732
|
-
<
|
|
733
|
-
<
|
|
734
|
-
|
|
732
|
+
<optional>
|
|
733
|
+
<attribute name="to">
|
|
734
|
+
<data type="IDREF"/>
|
|
735
|
+
</attribute>
|
|
736
|
+
</optional>
|
|
735
737
|
<element name="primary">
|
|
736
738
|
<oneOrMore>
|
|
737
739
|
<ref name="PureTextElement"/>
|
|
@@ -18,8 +18,8 @@ module IsoDoc
|
|
|
18
18
|
|
|
19
19
|
def default_fonts(options)
|
|
20
20
|
{
|
|
21
|
-
bodyfont:
|
|
22
|
-
headerfont:
|
|
21
|
+
bodyfont: '"Overpass",sans-serif',
|
|
22
|
+
headerfont: '"Overpass",sans-serif',
|
|
23
23
|
monospacefont: '"Space Mono",monospace',
|
|
24
24
|
normalfontsize: "16px",
|
|
25
25
|
monospacefontsize: "0.8em",
|
|
@@ -118,14 +118,14 @@
|
|
|
118
118
|
<fo:flow flow-name="xsl-region-body" color="white">
|
|
119
119
|
|
|
120
120
|
<!-- background image -->
|
|
121
|
-
<fo:block-container absolute-position="fixed" left="0mm" top="0mm">
|
|
121
|
+
<fo:block-container absolute-position="fixed" left="0mm" top="0mm" font-size="0">
|
|
122
122
|
<fo:block>
|
|
123
123
|
<fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-Cover-Background))}" width="{$pageWidth}" content-height="scale-to-fit" scaling="uniform" fox:alt-text="Image Front"/>
|
|
124
124
|
</fo:block>
|
|
125
125
|
</fo:block-container>
|
|
126
126
|
|
|
127
127
|
<!-- background color -->
|
|
128
|
-
<fo:block-container absolute-position="fixed" left="0" top="0">
|
|
128
|
+
<fo:block-container absolute-position="fixed" left="0" top="0" font-size="0">
|
|
129
129
|
<fo:block>
|
|
130
130
|
<fo:instream-foreign-object content-height="{$pageHeight}" fox:alt-text="Background color">
|
|
131
131
|
<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="215.9mm" height="279.4mm">
|
|
@@ -268,7 +268,7 @@
|
|
|
268
268
|
</xsl:if>
|
|
269
269
|
|
|
270
270
|
<!-- crossing lines -->
|
|
271
|
-
<fo:block-container absolute-position="fixed" width="{$pageWidth}" height="{$pageHeight}">
|
|
271
|
+
<fo:block-container absolute-position="fixed" width="{$pageWidth}" height="{$pageHeight}" font-size="0">
|
|
272
272
|
<fo:block>
|
|
273
273
|
<fo:instream-foreign-object content-height="{$pageHeight}" content-width="{$pageWidth}" fox:alt-text="Crossing lines">
|
|
274
274
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2159 2794" width="{$pageWidth}" height="{$pageHeight}">
|
|
@@ -301,7 +301,7 @@
|
|
|
301
301
|
<fo:flow flow-name="xsl-region-body">
|
|
302
302
|
|
|
303
303
|
<!-- crossing lines -->
|
|
304
|
-
<fo:block-container absolute-position="fixed" width="{$pageWidth}" height="{$pageHeight}">
|
|
304
|
+
<fo:block-container absolute-position="fixed" width="{$pageWidth}" height="{$pageHeight}" font-size="0">
|
|
305
305
|
<fo:block>
|
|
306
306
|
<fo:instream-foreign-object content-height="{$pageHeight}" content-width="{$pageWidth}" fox:alt-text="Crossing lines">
|
|
307
307
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2159 2794" width="{$pageWidth}" height="{$pageHeight}">
|
|
@@ -595,7 +595,7 @@
|
|
|
595
595
|
</xsl:call-template>
|
|
596
596
|
<fo:flow flow-name="xsl-region-body">
|
|
597
597
|
<!-- background color -->
|
|
598
|
-
<fo:block-container absolute-position="fixed" left="0" top="0">
|
|
598
|
+
<fo:block-container absolute-position="fixed" left="0" top="0" font-size="0">
|
|
599
599
|
<fo:block>
|
|
600
600
|
<fo:instream-foreign-object content-height="{$pageHeight}" fox:alt-text="Background color">
|
|
601
601
|
<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="{$pageWidth}" height="{$pageHeight}">
|
|
@@ -1351,7 +1351,7 @@
|
|
|
1351
1351
|
</xsl:template>
|
|
1352
1352
|
|
|
1353
1353
|
<xsl:template name="insertCrossingLines">
|
|
1354
|
-
<fo:block-container absolute-position="fixed" width="{$pageWidth}" height="{$pageHeight}">
|
|
1354
|
+
<fo:block-container absolute-position="fixed" width="{$pageWidth}" height="{$pageHeight}" font-size="0">
|
|
1355
1355
|
<fo:block>
|
|
1356
1356
|
<fo:instream-foreign-object content-height="{$pageHeight}" content-width="{$pageWidth}" fox:alt-text="Crossing lines">
|
|
1357
1357
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2159 2794" width="{$pageWidth}" height="{$pageHeight}">
|
|
@@ -1899,6 +1899,7 @@
|
|
|
1899
1899
|
|
|
1900
1900
|
|
|
1901
1901
|
|
|
1902
|
+
|
|
1902
1903
|
</xsl:attribute-set><xsl:attribute-set name="quote-source-style">
|
|
1903
1904
|
|
|
1904
1905
|
<xsl:attribute name="text-align">right</xsl:attribute>
|
|
@@ -2039,7 +2040,7 @@
|
|
|
2039
2040
|
</xsl:template><xsl:template match="*[local-name()='td']//text() | *[local-name()='th']//text() | *[local-name()='dt']//text() | *[local-name()='dd']//text()" priority="1">
|
|
2040
2041
|
<!-- <xsl:call-template name="add-zero-spaces"/> -->
|
|
2041
2042
|
<xsl:call-template name="add-zero-spaces-java"/>
|
|
2042
|
-
</xsl:template><xsl:template match="*[local-name()='table']">
|
|
2043
|
+
</xsl:template><xsl:template match="*[local-name()='table']" name="table">
|
|
2043
2044
|
|
|
2044
2045
|
<xsl:variable name="simple-table">
|
|
2045
2046
|
<xsl:call-template name="getSimpleTable"/>
|
|
@@ -3319,6 +3320,7 @@
|
|
|
3319
3320
|
|
|
3320
3321
|
|
|
3321
3322
|
|
|
3323
|
+
|
|
3322
3324
|
10
|
|
3323
3325
|
|
|
3324
3326
|
|
|
@@ -3923,7 +3925,7 @@
|
|
|
3923
3925
|
</xsl:if> -->
|
|
3924
3926
|
</fo:inline>
|
|
3925
3927
|
</xsl:if>
|
|
3926
|
-
</xsl:template><xsl:template match="*[local-name() = 'figure']">
|
|
3928
|
+
</xsl:template><xsl:template match="*[local-name() = 'figure']" name="figure">
|
|
3927
3929
|
<fo:block-container id="{@id}">
|
|
3928
3930
|
|
|
3929
3931
|
<fo:block>
|
|
@@ -4173,6 +4175,12 @@
|
|
|
4173
4175
|
<!-- <xsl:text> </xsl:text> -->
|
|
4174
4176
|
</xsl:template><xsl:template name="getSection">
|
|
4175
4177
|
<xsl:value-of select="*[local-name() = 'title']/*[local-name() = 'tab'][1]/preceding-sibling::node()"/>
|
|
4178
|
+
<!--
|
|
4179
|
+
<xsl:for-each select="*[local-name() = 'title']/*[local-name() = 'tab'][1]/preceding-sibling::node()">
|
|
4180
|
+
<xsl:value-of select="."/>
|
|
4181
|
+
</xsl:for-each>
|
|
4182
|
+
-->
|
|
4183
|
+
|
|
4176
4184
|
</xsl:template><xsl:template name="getName">
|
|
4177
4185
|
<xsl:choose>
|
|
4178
4186
|
<xsl:when test="*[local-name() = 'title']/*[local-name() = 'tab']">
|
|
@@ -4225,6 +4233,10 @@
|
|
|
4225
4233
|
<xsl:copy>
|
|
4226
4234
|
<xsl:apply-templates mode="contents_item"/>
|
|
4227
4235
|
</xsl:copy>
|
|
4236
|
+
</xsl:template><xsl:template match="*[local-name() = 'em']" mode="contents_item">
|
|
4237
|
+
<xsl:copy>
|
|
4238
|
+
<xsl:apply-templates mode="contents_item"/>
|
|
4239
|
+
</xsl:copy>
|
|
4228
4240
|
</xsl:template><xsl:template match="*[local-name() = 'br']" mode="contents_item">
|
|
4229
4241
|
<xsl:text> </xsl:text>
|
|
4230
4242
|
</xsl:template><xsl:template match="*[local-name()='sourcecode']" name="sourcecode">
|
|
@@ -4250,6 +4262,7 @@
|
|
|
4250
4262
|
|
|
4251
4263
|
|
|
4252
4264
|
|
|
4265
|
+
|
|
4253
4266
|
|
|
4254
4267
|
|
|
4255
4268
|
|
|
@@ -4793,6 +4806,7 @@
|
|
|
4793
4806
|
|
|
4794
4807
|
|
|
4795
4808
|
|
|
4809
|
+
|
|
4796
4810
|
|
|
4797
4811
|
|
|
4798
4812
|
|
|
@@ -4809,7 +4823,7 @@
|
|
|
4809
4823
|
|
|
4810
4824
|
|
|
4811
4825
|
|
|
4812
|
-
</xsl:template><xsl:template match="
|
|
4826
|
+
</xsl:template><xsl:template match="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*" priority="2"> <!-- /*/*[local-name() = 'preface']/* -->
|
|
4813
4827
|
<fo:block break-after="page"/>
|
|
4814
4828
|
<fo:block>
|
|
4815
4829
|
<xsl:call-template name="setId"/>
|
|
@@ -4817,7 +4831,8 @@
|
|
|
4817
4831
|
</fo:block>
|
|
4818
4832
|
</xsl:template><xsl:template match="*[local-name() = 'clause']">
|
|
4819
4833
|
<fo:block>
|
|
4820
|
-
<xsl:call-template name="setId"/>
|
|
4834
|
+
<xsl:call-template name="setId"/>
|
|
4835
|
+
|
|
4821
4836
|
|
|
4822
4837
|
<xsl:apply-templates/>
|
|
4823
4838
|
</fo:block>
|
|
@@ -5131,6 +5146,57 @@
|
|
|
5131
5146
|
</xsl:variable>
|
|
5132
5147
|
<xsl:variable name="result">
|
|
5133
5148
|
<xsl:choose>
|
|
5149
|
+
<xsl:when test="$format = 'ddMMyyyy'">
|
|
5150
|
+
<xsl:if test="$day != ''"><xsl:value-of select="number($day)"/></xsl:if>
|
|
5151
|
+
<xsl:text> </xsl:text>
|
|
5152
|
+
<xsl:value-of select="normalize-space(concat($monthStr, ' ' , $year))"/>
|
|
5153
|
+
</xsl:when>
|
|
5154
|
+
<xsl:when test="$format = 'ddMM'">
|
|
5155
|
+
<xsl:if test="$day != ''"><xsl:value-of select="number($day)"/></xsl:if>
|
|
5156
|
+
<xsl:text> </xsl:text><xsl:value-of select="$monthStr"/>
|
|
5157
|
+
</xsl:when>
|
|
5158
|
+
<xsl:when test="$format = 'short' or $day = ''">
|
|
5159
|
+
<xsl:value-of select="normalize-space(concat($monthStr, ' ', $year))"/>
|
|
5160
|
+
</xsl:when>
|
|
5161
|
+
<xsl:otherwise>
|
|
5162
|
+
<xsl:value-of select="normalize-space(concat($monthStr, ' ', $day, ', ' , $year))"/>
|
|
5163
|
+
</xsl:otherwise>
|
|
5164
|
+
</xsl:choose>
|
|
5165
|
+
</xsl:variable>
|
|
5166
|
+
<xsl:value-of select="$result"/>
|
|
5167
|
+
</xsl:template><xsl:template name="convertDateLocalized">
|
|
5168
|
+
<xsl:param name="date"/>
|
|
5169
|
+
<xsl:param name="format" select="'short'"/>
|
|
5170
|
+
<xsl:variable name="year" select="substring($date, 1, 4)"/>
|
|
5171
|
+
<xsl:variable name="month" select="substring($date, 6, 2)"/>
|
|
5172
|
+
<xsl:variable name="day" select="substring($date, 9, 2)"/>
|
|
5173
|
+
<xsl:variable name="monthStr">
|
|
5174
|
+
<xsl:choose>
|
|
5175
|
+
<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>
|
|
5176
|
+
<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>
|
|
5177
|
+
<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>
|
|
5178
|
+
<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>
|
|
5179
|
+
<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>
|
|
5180
|
+
<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>
|
|
5181
|
+
<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>
|
|
5182
|
+
<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>
|
|
5183
|
+
<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>
|
|
5184
|
+
<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>
|
|
5185
|
+
<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>
|
|
5186
|
+
<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>
|
|
5187
|
+
</xsl:choose>
|
|
5188
|
+
</xsl:variable>
|
|
5189
|
+
<xsl:variable name="result">
|
|
5190
|
+
<xsl:choose>
|
|
5191
|
+
<xsl:when test="$format = 'ddMMyyyy'">
|
|
5192
|
+
<xsl:if test="$day != ''"><xsl:value-of select="number($day)"/></xsl:if>
|
|
5193
|
+
<xsl:text> </xsl:text>
|
|
5194
|
+
<xsl:value-of select="normalize-space(concat($monthStr, ' ' , $year))"/>
|
|
5195
|
+
</xsl:when>
|
|
5196
|
+
<xsl:when test="$format = 'ddMM'">
|
|
5197
|
+
<xsl:if test="$day != ''"><xsl:value-of select="number($day)"/></xsl:if>
|
|
5198
|
+
<xsl:text> </xsl:text><xsl:value-of select="$monthStr"/>
|
|
5199
|
+
</xsl:when>
|
|
5134
5200
|
<xsl:when test="$format = 'short' or $day = ''">
|
|
5135
5201
|
<xsl:value-of select="normalize-space(concat($monthStr, ' ', $year))"/>
|
|
5136
5202
|
</xsl:when>
|
|
@@ -5325,6 +5391,7 @@
|
|
|
5325
5391
|
|
|
5326
5392
|
|
|
5327
5393
|
|
|
5394
|
+
|
|
5328
5395
|
</xsl:variable>
|
|
5329
5396
|
<xsl:if test="$documentNS != $XSLNS">
|
|
5330
5397
|
<xsl:message>[WARNING]: Document namespace: '<xsl:value-of select="$documentNS"/>' doesn't equal to xslt namespace '<xsl:value-of select="$XSLNS"/>'</xsl:message>
|
|
@@ -118,14 +118,14 @@
|
|
|
118
118
|
<fo:flow flow-name="xsl-region-body" color="white">
|
|
119
119
|
|
|
120
120
|
<!-- background image -->
|
|
121
|
-
<fo:block-container absolute-position="fixed" left="0mm" top="0mm">
|
|
121
|
+
<fo:block-container absolute-position="fixed" left="0mm" top="0mm" font-size="0">
|
|
122
122
|
<fo:block>
|
|
123
123
|
<fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-Cover-Background))}" width="{$pageWidth}" content-height="scale-to-fit" scaling="uniform" fox:alt-text="Image Front"/>
|
|
124
124
|
</fo:block>
|
|
125
125
|
</fo:block-container>
|
|
126
126
|
|
|
127
127
|
<!-- background color -->
|
|
128
|
-
<fo:block-container absolute-position="fixed" left="0" top="0">
|
|
128
|
+
<fo:block-container absolute-position="fixed" left="0" top="0" font-size="0">
|
|
129
129
|
<fo:block>
|
|
130
130
|
<fo:instream-foreign-object content-height="{$pageHeight}" fox:alt-text="Background color">
|
|
131
131
|
<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="215.9mm" height="279.4mm">
|
|
@@ -268,7 +268,7 @@
|
|
|
268
268
|
</xsl:if>
|
|
269
269
|
|
|
270
270
|
<!-- crossing lines -->
|
|
271
|
-
<fo:block-container absolute-position="fixed" width="{$pageWidth}" height="{$pageHeight}">
|
|
271
|
+
<fo:block-container absolute-position="fixed" width="{$pageWidth}" height="{$pageHeight}" font-size="0">
|
|
272
272
|
<fo:block>
|
|
273
273
|
<fo:instream-foreign-object content-height="{$pageHeight}" content-width="{$pageWidth}" fox:alt-text="Crossing lines">
|
|
274
274
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2159 2794" width="{$pageWidth}" height="{$pageHeight}">
|
|
@@ -301,7 +301,7 @@
|
|
|
301
301
|
<fo:flow flow-name="xsl-region-body">
|
|
302
302
|
|
|
303
303
|
<!-- crossing lines -->
|
|
304
|
-
<fo:block-container absolute-position="fixed" width="{$pageWidth}" height="{$pageHeight}">
|
|
304
|
+
<fo:block-container absolute-position="fixed" width="{$pageWidth}" height="{$pageHeight}" font-size="0">
|
|
305
305
|
<fo:block>
|
|
306
306
|
<fo:instream-foreign-object content-height="{$pageHeight}" content-width="{$pageWidth}" fox:alt-text="Crossing lines">
|
|
307
307
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2159 2794" width="{$pageWidth}" height="{$pageHeight}">
|
|
@@ -595,7 +595,7 @@
|
|
|
595
595
|
</xsl:call-template>
|
|
596
596
|
<fo:flow flow-name="xsl-region-body">
|
|
597
597
|
<!-- background color -->
|
|
598
|
-
<fo:block-container absolute-position="fixed" left="0" top="0">
|
|
598
|
+
<fo:block-container absolute-position="fixed" left="0" top="0" font-size="0">
|
|
599
599
|
<fo:block>
|
|
600
600
|
<fo:instream-foreign-object content-height="{$pageHeight}" fox:alt-text="Background color">
|
|
601
601
|
<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="{$pageWidth}" height="{$pageHeight}">
|
|
@@ -1351,7 +1351,7 @@
|
|
|
1351
1351
|
</xsl:template>
|
|
1352
1352
|
|
|
1353
1353
|
<xsl:template name="insertCrossingLines">
|
|
1354
|
-
<fo:block-container absolute-position="fixed" width="{$pageWidth}" height="{$pageHeight}">
|
|
1354
|
+
<fo:block-container absolute-position="fixed" width="{$pageWidth}" height="{$pageHeight}" font-size="0">
|
|
1355
1355
|
<fo:block>
|
|
1356
1356
|
<fo:instream-foreign-object content-height="{$pageHeight}" content-width="{$pageWidth}" fox:alt-text="Crossing lines">
|
|
1357
1357
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2159 2794" width="{$pageWidth}" height="{$pageHeight}">
|
|
@@ -1899,6 +1899,7 @@
|
|
|
1899
1899
|
|
|
1900
1900
|
|
|
1901
1901
|
|
|
1902
|
+
|
|
1902
1903
|
</xsl:attribute-set><xsl:attribute-set name="quote-source-style">
|
|
1903
1904
|
|
|
1904
1905
|
<xsl:attribute name="text-align">right</xsl:attribute>
|
|
@@ -2039,7 +2040,7 @@
|
|
|
2039
2040
|
</xsl:template><xsl:template match="*[local-name()='td']//text() | *[local-name()='th']//text() | *[local-name()='dt']//text() | *[local-name()='dd']//text()" priority="1">
|
|
2040
2041
|
<!-- <xsl:call-template name="add-zero-spaces"/> -->
|
|
2041
2042
|
<xsl:call-template name="add-zero-spaces-java"/>
|
|
2042
|
-
</xsl:template><xsl:template match="*[local-name()='table']">
|
|
2043
|
+
</xsl:template><xsl:template match="*[local-name()='table']" name="table">
|
|
2043
2044
|
|
|
2044
2045
|
<xsl:variable name="simple-table">
|
|
2045
2046
|
<xsl:call-template name="getSimpleTable"/>
|
|
@@ -3319,6 +3320,7 @@
|
|
|
3319
3320
|
|
|
3320
3321
|
|
|
3321
3322
|
|
|
3323
|
+
|
|
3322
3324
|
10
|
|
3323
3325
|
|
|
3324
3326
|
|
|
@@ -3923,7 +3925,7 @@
|
|
|
3923
3925
|
</xsl:if> -->
|
|
3924
3926
|
</fo:inline>
|
|
3925
3927
|
</xsl:if>
|
|
3926
|
-
</xsl:template><xsl:template match="*[local-name() = 'figure']">
|
|
3928
|
+
</xsl:template><xsl:template match="*[local-name() = 'figure']" name="figure">
|
|
3927
3929
|
<fo:block-container id="{@id}">
|
|
3928
3930
|
|
|
3929
3931
|
<fo:block>
|
|
@@ -4173,6 +4175,12 @@
|
|
|
4173
4175
|
<!-- <xsl:text> </xsl:text> -->
|
|
4174
4176
|
</xsl:template><xsl:template name="getSection">
|
|
4175
4177
|
<xsl:value-of select="*[local-name() = 'title']/*[local-name() = 'tab'][1]/preceding-sibling::node()"/>
|
|
4178
|
+
<!--
|
|
4179
|
+
<xsl:for-each select="*[local-name() = 'title']/*[local-name() = 'tab'][1]/preceding-sibling::node()">
|
|
4180
|
+
<xsl:value-of select="."/>
|
|
4181
|
+
</xsl:for-each>
|
|
4182
|
+
-->
|
|
4183
|
+
|
|
4176
4184
|
</xsl:template><xsl:template name="getName">
|
|
4177
4185
|
<xsl:choose>
|
|
4178
4186
|
<xsl:when test="*[local-name() = 'title']/*[local-name() = 'tab']">
|
|
@@ -4225,6 +4233,10 @@
|
|
|
4225
4233
|
<xsl:copy>
|
|
4226
4234
|
<xsl:apply-templates mode="contents_item"/>
|
|
4227
4235
|
</xsl:copy>
|
|
4236
|
+
</xsl:template><xsl:template match="*[local-name() = 'em']" mode="contents_item">
|
|
4237
|
+
<xsl:copy>
|
|
4238
|
+
<xsl:apply-templates mode="contents_item"/>
|
|
4239
|
+
</xsl:copy>
|
|
4228
4240
|
</xsl:template><xsl:template match="*[local-name() = 'br']" mode="contents_item">
|
|
4229
4241
|
<xsl:text> </xsl:text>
|
|
4230
4242
|
</xsl:template><xsl:template match="*[local-name()='sourcecode']" name="sourcecode">
|
|
@@ -4250,6 +4262,7 @@
|
|
|
4250
4262
|
|
|
4251
4263
|
|
|
4252
4264
|
|
|
4265
|
+
|
|
4253
4266
|
|
|
4254
4267
|
|
|
4255
4268
|
|
|
@@ -4793,6 +4806,7 @@
|
|
|
4793
4806
|
|
|
4794
4807
|
|
|
4795
4808
|
|
|
4809
|
+
|
|
4796
4810
|
|
|
4797
4811
|
|
|
4798
4812
|
|
|
@@ -4809,7 +4823,7 @@
|
|
|
4809
4823
|
|
|
4810
4824
|
|
|
4811
4825
|
|
|
4812
|
-
</xsl:template><xsl:template match="
|
|
4826
|
+
</xsl:template><xsl:template match="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*" priority="2"> <!-- /*/*[local-name() = 'preface']/* -->
|
|
4813
4827
|
<fo:block break-after="page"/>
|
|
4814
4828
|
<fo:block>
|
|
4815
4829
|
<xsl:call-template name="setId"/>
|
|
@@ -4817,7 +4831,8 @@
|
|
|
4817
4831
|
</fo:block>
|
|
4818
4832
|
</xsl:template><xsl:template match="*[local-name() = 'clause']">
|
|
4819
4833
|
<fo:block>
|
|
4820
|
-
<xsl:call-template name="setId"/>
|
|
4834
|
+
<xsl:call-template name="setId"/>
|
|
4835
|
+
|
|
4821
4836
|
|
|
4822
4837
|
<xsl:apply-templates/>
|
|
4823
4838
|
</fo:block>
|
|
@@ -5131,6 +5146,57 @@
|
|
|
5131
5146
|
</xsl:variable>
|
|
5132
5147
|
<xsl:variable name="result">
|
|
5133
5148
|
<xsl:choose>
|
|
5149
|
+
<xsl:when test="$format = 'ddMMyyyy'">
|
|
5150
|
+
<xsl:if test="$day != ''"><xsl:value-of select="number($day)"/></xsl:if>
|
|
5151
|
+
<xsl:text> </xsl:text>
|
|
5152
|
+
<xsl:value-of select="normalize-space(concat($monthStr, ' ' , $year))"/>
|
|
5153
|
+
</xsl:when>
|
|
5154
|
+
<xsl:when test="$format = 'ddMM'">
|
|
5155
|
+
<xsl:if test="$day != ''"><xsl:value-of select="number($day)"/></xsl:if>
|
|
5156
|
+
<xsl:text> </xsl:text><xsl:value-of select="$monthStr"/>
|
|
5157
|
+
</xsl:when>
|
|
5158
|
+
<xsl:when test="$format = 'short' or $day = ''">
|
|
5159
|
+
<xsl:value-of select="normalize-space(concat($monthStr, ' ', $year))"/>
|
|
5160
|
+
</xsl:when>
|
|
5161
|
+
<xsl:otherwise>
|
|
5162
|
+
<xsl:value-of select="normalize-space(concat($monthStr, ' ', $day, ', ' , $year))"/>
|
|
5163
|
+
</xsl:otherwise>
|
|
5164
|
+
</xsl:choose>
|
|
5165
|
+
</xsl:variable>
|
|
5166
|
+
<xsl:value-of select="$result"/>
|
|
5167
|
+
</xsl:template><xsl:template name="convertDateLocalized">
|
|
5168
|
+
<xsl:param name="date"/>
|
|
5169
|
+
<xsl:param name="format" select="'short'"/>
|
|
5170
|
+
<xsl:variable name="year" select="substring($date, 1, 4)"/>
|
|
5171
|
+
<xsl:variable name="month" select="substring($date, 6, 2)"/>
|
|
5172
|
+
<xsl:variable name="day" select="substring($date, 9, 2)"/>
|
|
5173
|
+
<xsl:variable name="monthStr">
|
|
5174
|
+
<xsl:choose>
|
|
5175
|
+
<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>
|
|
5176
|
+
<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>
|
|
5177
|
+
<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>
|
|
5178
|
+
<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>
|
|
5179
|
+
<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>
|
|
5180
|
+
<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>
|
|
5181
|
+
<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>
|
|
5182
|
+
<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>
|
|
5183
|
+
<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>
|
|
5184
|
+
<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>
|
|
5185
|
+
<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>
|
|
5186
|
+
<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>
|
|
5187
|
+
</xsl:choose>
|
|
5188
|
+
</xsl:variable>
|
|
5189
|
+
<xsl:variable name="result">
|
|
5190
|
+
<xsl:choose>
|
|
5191
|
+
<xsl:when test="$format = 'ddMMyyyy'">
|
|
5192
|
+
<xsl:if test="$day != ''"><xsl:value-of select="number($day)"/></xsl:if>
|
|
5193
|
+
<xsl:text> </xsl:text>
|
|
5194
|
+
<xsl:value-of select="normalize-space(concat($monthStr, ' ' , $year))"/>
|
|
5195
|
+
</xsl:when>
|
|
5196
|
+
<xsl:when test="$format = 'ddMM'">
|
|
5197
|
+
<xsl:if test="$day != ''"><xsl:value-of select="number($day)"/></xsl:if>
|
|
5198
|
+
<xsl:text> </xsl:text><xsl:value-of select="$monthStr"/>
|
|
5199
|
+
</xsl:when>
|
|
5134
5200
|
<xsl:when test="$format = 'short' or $day = ''">
|
|
5135
5201
|
<xsl:value-of select="normalize-space(concat($monthStr, ' ', $year))"/>
|
|
5136
5202
|
</xsl:when>
|
|
@@ -5325,6 +5391,7 @@
|
|
|
5325
5391
|
|
|
5326
5392
|
|
|
5327
5393
|
|
|
5394
|
+
|
|
5328
5395
|
</xsl:variable>
|
|
5329
5396
|
<xsl:if test="$documentNS != $XSLNS">
|
|
5330
5397
|
<xsl:message>[WARNING]: Document namespace: '<xsl:value-of select="$documentNS"/>' doesn't equal to xslt namespace '<xsl:value-of select="$XSLNS"/>'</xsl:message>
|