metanorma-mpfa 0.5.9 → 0.5.10
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/mpfa/basicdoc.rng +18 -3
- data/lib/asciidoctor/mpfa/isodoc.rng +7 -0
- data/lib/isodoc/mpfa/base_convert.rb +2 -2
- data/lib/isodoc/mpfa/mpfd.circular.xsl +92 -8
- data/lib/isodoc/mpfa/mpfd.compliance-standards-for-mpf-trustees.xsl +92 -8
- data/lib/isodoc/mpfa/mpfd.guidelines.xsl +92 -8
- data/lib/isodoc/mpfa/mpfd.standards.xsl +92 -8
- data/lib/isodoc/mpfa/mpfd.supervision-of-mpf-intermediaries.xsl +92 -8
- data/lib/metanorma/mpfa/processor.rb +7 -0
- data/lib/metanorma/mpfa/version.rb +1 -1
- data/metanorma-mpfd.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: 34aa33b015cf044867e8acdb9ed23bc2d9d4eda4a8ce72b9897d6da904e1dac3
|
4
|
+
data.tar.gz: ed7f870dc1e11a4eee461d41a594ecdc25b6d47b10c310c5222683091c31bf5d
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 27f5c653e39d1d072e2aafc064bb4f0e268c1b61a43e17b9345b011d9233e1c14a8bc9de23241c60b61d61a5957a06070c0541fa8d3b4e746600f273f9d31439
|
7
|
+
data.tar.gz: 437e85029b70c0758505167b5b6bf0aeef3c883bfc8693c0a742e775e4465fff8406f5dd886ee84571bd97fab2033ad3565e7a57b70de0c2530b4e52d54e1346
|
@@ -729,12 +729,27 @@
|
|
729
729
|
</define>
|
730
730
|
<define name="index">
|
731
731
|
<element name="index">
|
732
|
-
<attribute name="
|
732
|
+
<attribute name="to">
|
733
|
+
<data type="IDREF"/>
|
734
|
+
</attribute>
|
735
|
+
<element name="primary">
|
736
|
+
<oneOrMore>
|
737
|
+
<ref name="PureTextElement"/>
|
738
|
+
</oneOrMore>
|
739
|
+
</element>
|
733
740
|
<optional>
|
734
|
-
<
|
741
|
+
<element name="secondary">
|
742
|
+
<oneOrMore>
|
743
|
+
<ref name="PureTextElement"/>
|
744
|
+
</oneOrMore>
|
745
|
+
</element>
|
735
746
|
</optional>
|
736
747
|
<optional>
|
737
|
-
<
|
748
|
+
<element name="tertiary">
|
749
|
+
<oneOrMore>
|
750
|
+
<ref name="PureTextElement"/>
|
751
|
+
</oneOrMore>
|
752
|
+
</element>
|
738
753
|
</optional>
|
739
754
|
</element>
|
740
755
|
</define>
|
@@ -55,6 +55,13 @@
|
|
55
55
|
<param name="pattern">\i\c*|\c+#\c+</param>
|
56
56
|
</data>
|
57
57
|
</attribute>
|
58
|
+
<optional>
|
59
|
+
<attribute name="to">
|
60
|
+
<data type="string">
|
61
|
+
<param name="pattern">\i\c*|\c+#\c+</param>
|
62
|
+
</data>
|
63
|
+
</attribute>
|
64
|
+
</optional>
|
58
65
|
<optional>
|
59
66
|
<attribute name="type">
|
60
67
|
<ref name="ReferenceFormat"/>
|
@@ -40,7 +40,7 @@ module IsoDoc
|
|
40
40
|
end
|
41
41
|
end
|
42
42
|
|
43
|
-
def middle_clause
|
43
|
+
def middle_clause(_docxml)
|
44
44
|
"//clause[parent::sections][not(descendant::terms)]"
|
45
45
|
end
|
46
46
|
|
@@ -59,7 +59,7 @@ module IsoDoc
|
|
59
59
|
end
|
60
60
|
|
61
61
|
def clause(isoxml, out)
|
62
|
-
isoxml.xpath(ns(middle_clause)).each do |c|
|
62
|
+
isoxml.xpath(ns(middle_clause(isoxml))).each do |c|
|
63
63
|
out.div **attr_code(id: c["id"]) do |s|
|
64
64
|
clause_name(nil, c&.at(ns("./title")), s,
|
65
65
|
class: c["container"] ? "containerhdr" : nil )
|
@@ -1138,6 +1138,7 @@
|
|
1138
1138
|
|
1139
1139
|
</xsl:attribute-set><xsl:attribute-set name="termnote-name-style">
|
1140
1140
|
|
1141
|
+
|
1141
1142
|
</xsl:attribute-set><xsl:attribute-set name="quote-style">
|
1142
1143
|
|
1143
1144
|
|
@@ -2147,7 +2148,9 @@
|
|
2147
2148
|
</xsl:template><xsl:template match="*[local-name()='dl']">
|
2148
2149
|
<fo:block-container>
|
2149
2150
|
|
2150
|
-
<xsl:
|
2151
|
+
<xsl:if test="not(ancestor::*[local-name() = 'quote'])">
|
2152
|
+
<xsl:attribute name="margin-left">0mm</xsl:attribute>
|
2153
|
+
</xsl:if>
|
2151
2154
|
|
2152
2155
|
|
2153
2156
|
<xsl:if test="parent::*[local-name() = 'note']">
|
@@ -2162,6 +2165,7 @@
|
|
2162
2165
|
<fo:block-container>
|
2163
2166
|
|
2164
2167
|
<xsl:attribute name="margin-left">0mm</xsl:attribute>
|
2168
|
+
<xsl:attribute name="margin-right">0mm</xsl:attribute>
|
2165
2169
|
|
2166
2170
|
|
2167
2171
|
<xsl:variable name="parent" select="local-name(..)"/>
|
@@ -2345,12 +2349,32 @@
|
|
2345
2349
|
</xsl:otherwise>
|
2346
2350
|
</xsl:choose>
|
2347
2351
|
</xsl:template><xsl:template name="getMaxLength_dt">
|
2348
|
-
<xsl:
|
2349
|
-
<xsl:
|
2350
|
-
|
2351
|
-
<xsl:
|
2352
|
-
|
2353
|
-
|
2352
|
+
<xsl:variable name="lengths">
|
2353
|
+
<xsl:for-each select="*[local-name()='dt']">
|
2354
|
+
<xsl:variable name="maintext_length" select="string-length(normalize-space(.))"/>
|
2355
|
+
<xsl:variable name="attributes">
|
2356
|
+
<xsl:for-each select=".//@open"><xsl:value-of select="."/></xsl:for-each>
|
2357
|
+
<xsl:for-each select=".//@close"><xsl:value-of select="."/></xsl:for-each>
|
2358
|
+
</xsl:variable>
|
2359
|
+
<length><xsl:value-of select="string-length(normalize-space(.)) + string-length($attributes)"/></length>
|
2360
|
+
</xsl:for-each>
|
2361
|
+
</xsl:variable>
|
2362
|
+
<xsl:variable name="maxLength">
|
2363
|
+
<!-- <xsl:for-each select="*[local-name()='dt']">
|
2364
|
+
<xsl:sort select="string-length(normalize-space(.))" data-type="number" order="descending"/>
|
2365
|
+
<xsl:if test="position() = 1">
|
2366
|
+
<xsl:value-of select="string-length(normalize-space(.))"/>
|
2367
|
+
</xsl:if>
|
2368
|
+
</xsl:for-each> -->
|
2369
|
+
<xsl:for-each select="xalan:nodeset($lengths)/length">
|
2370
|
+
<xsl:sort select="." data-type="number" order="descending"/>
|
2371
|
+
<xsl:if test="position() = 1">
|
2372
|
+
<xsl:value-of select="."/>
|
2373
|
+
</xsl:if>
|
2374
|
+
</xsl:for-each>
|
2375
|
+
</xsl:variable>
|
2376
|
+
<!-- <xsl:message>DEBUG:<xsl:value-of select="$maxLength"/></xsl:message> -->
|
2377
|
+
<xsl:value-of select="$maxLength"/>
|
2354
2378
|
</xsl:template><xsl:template match="*[local-name()='dl']/*[local-name()='note']" priority="2">
|
2355
2379
|
<xsl:param name="key_iso"/>
|
2356
2380
|
|
@@ -3147,6 +3171,8 @@
|
|
3147
3171
|
<xsl:variable name="bookmark-title_">
|
3148
3172
|
<xsl:call-template name="getLangVersion">
|
3149
3173
|
<xsl:with-param name="lang" select="@lang"/>
|
3174
|
+
<xsl:with-param name="doctype" select="@doctype"/>
|
3175
|
+
<xsl:with-param name="title" select="@title-part"/>
|
3150
3176
|
</xsl:call-template>
|
3151
3177
|
</xsl:variable>
|
3152
3178
|
<xsl:choose>
|
@@ -3164,13 +3190,34 @@
|
|
3164
3190
|
</xsl:choose>
|
3165
3191
|
</fo:bookmark-title>
|
3166
3192
|
<xsl:apply-templates select="contents/item" mode="bookmark"/>
|
3193
|
+
|
3194
|
+
<xsl:call-template name="insertFigureBookmarks">
|
3195
|
+
<xsl:with-param name="contents" select="contents"/>
|
3196
|
+
</xsl:call-template>
|
3197
|
+
|
3198
|
+
<xsl:call-template name="insertTableBookmarks">
|
3199
|
+
<xsl:with-param name="contents" select="contents"/>
|
3200
|
+
<xsl:with-param name="lang" select="@lang"/>
|
3201
|
+
</xsl:call-template>
|
3202
|
+
|
3167
3203
|
</fo:bookmark>
|
3168
3204
|
|
3169
3205
|
</xsl:for-each>
|
3170
3206
|
</xsl:when>
|
3171
3207
|
<xsl:otherwise>
|
3172
3208
|
<xsl:for-each select="xalan:nodeset($contents)/doc">
|
3209
|
+
|
3173
3210
|
<xsl:apply-templates select="contents/item" mode="bookmark"/>
|
3211
|
+
|
3212
|
+
<xsl:call-template name="insertFigureBookmarks">
|
3213
|
+
<xsl:with-param name="contents" select="contents"/>
|
3214
|
+
</xsl:call-template>
|
3215
|
+
|
3216
|
+
<xsl:call-template name="insertTableBookmarks">
|
3217
|
+
<xsl:with-param name="contents" select="contents"/>
|
3218
|
+
<xsl:with-param name="lang" select="@lang"/>
|
3219
|
+
</xsl:call-template>
|
3220
|
+
|
3174
3221
|
</xsl:for-each>
|
3175
3222
|
</xsl:otherwise>
|
3176
3223
|
</xsl:choose>
|
@@ -3189,8 +3236,44 @@
|
|
3189
3236
|
|
3190
3237
|
</fo:bookmark-tree>
|
3191
3238
|
</xsl:if>
|
3239
|
+
</xsl:template><xsl:template name="insertFigureBookmarks">
|
3240
|
+
<xsl:param name="contents"/>
|
3241
|
+
<xsl:if test="xalan:nodeset($contents)/figure">
|
3242
|
+
<fo:bookmark internal-destination="{xalan:nodeset($contents)/figure[1]/@id}" starting-state="hide">
|
3243
|
+
<fo:bookmark-title>Figures</fo:bookmark-title>
|
3244
|
+
<xsl:for-each select="xalan:nodeset($contents)/figure">
|
3245
|
+
<fo:bookmark internal-destination="{@id}">
|
3246
|
+
<fo:bookmark-title>
|
3247
|
+
<xsl:value-of select="normalize-space(title)"/>
|
3248
|
+
</fo:bookmark-title>
|
3249
|
+
</fo:bookmark>
|
3250
|
+
</xsl:for-each>
|
3251
|
+
</fo:bookmark>
|
3252
|
+
</xsl:if>
|
3253
|
+
</xsl:template><xsl:template name="insertTableBookmarks">
|
3254
|
+
<xsl:param name="contents"/>
|
3255
|
+
<xsl:param name="lang"/>
|
3256
|
+
<xsl:if test="xalan:nodeset($contents)/table">
|
3257
|
+
<fo:bookmark internal-destination="{xalan:nodeset($contents)/table[1]/@id}" starting-state="hide">
|
3258
|
+
<fo:bookmark-title>
|
3259
|
+
<xsl:choose>
|
3260
|
+
<xsl:when test="$lang = 'fr'">Tableaux</xsl:when>
|
3261
|
+
<xsl:otherwise>Tables</xsl:otherwise>
|
3262
|
+
</xsl:choose>
|
3263
|
+
</fo:bookmark-title>
|
3264
|
+
<xsl:for-each select="xalan:nodeset($contents)/table">
|
3265
|
+
<fo:bookmark internal-destination="{@id}">
|
3266
|
+
<fo:bookmark-title>
|
3267
|
+
<xsl:value-of select="normalize-space(title)"/>
|
3268
|
+
</fo:bookmark-title>
|
3269
|
+
</fo:bookmark>
|
3270
|
+
</xsl:for-each>
|
3271
|
+
</fo:bookmark>
|
3272
|
+
</xsl:if>
|
3192
3273
|
</xsl:template><xsl:template name="getLangVersion">
|
3193
3274
|
<xsl:param name="lang"/>
|
3275
|
+
<xsl:param name="doctype" select="''"/>
|
3276
|
+
<xsl:param name="title" select="''"/>
|
3194
3277
|
<xsl:choose>
|
3195
3278
|
<xsl:when test="$lang = 'en'">
|
3196
3279
|
|
@@ -3682,7 +3765,8 @@
|
|
3682
3765
|
<fo:block-container margin-left="0mm">
|
3683
3766
|
|
3684
3767
|
<fo:block xsl:use-attribute-sets="quote-style">
|
3685
|
-
<xsl:apply-templates select=".//*[local-name() = 'p']"/>
|
3768
|
+
<!-- <xsl:apply-templates select=".//*[local-name() = 'p']"/> -->
|
3769
|
+
<xsl:apply-templates select="./*[not(local-name() = 'author') and not(local-name() = 'source')]"/> <!-- process all nested nodes, except author and source -->
|
3686
3770
|
</fo:block>
|
3687
3771
|
<xsl:if test="*[local-name() = 'author'] or *[local-name() = 'source']">
|
3688
3772
|
<fo:block xsl:use-attribute-sets="quote-source-style">
|
@@ -1138,6 +1138,7 @@
|
|
1138
1138
|
|
1139
1139
|
</xsl:attribute-set><xsl:attribute-set name="termnote-name-style">
|
1140
1140
|
|
1141
|
+
|
1141
1142
|
</xsl:attribute-set><xsl:attribute-set name="quote-style">
|
1142
1143
|
|
1143
1144
|
|
@@ -2147,7 +2148,9 @@
|
|
2147
2148
|
</xsl:template><xsl:template match="*[local-name()='dl']">
|
2148
2149
|
<fo:block-container>
|
2149
2150
|
|
2150
|
-
<xsl:
|
2151
|
+
<xsl:if test="not(ancestor::*[local-name() = 'quote'])">
|
2152
|
+
<xsl:attribute name="margin-left">0mm</xsl:attribute>
|
2153
|
+
</xsl:if>
|
2151
2154
|
|
2152
2155
|
|
2153
2156
|
<xsl:if test="parent::*[local-name() = 'note']">
|
@@ -2162,6 +2165,7 @@
|
|
2162
2165
|
<fo:block-container>
|
2163
2166
|
|
2164
2167
|
<xsl:attribute name="margin-left">0mm</xsl:attribute>
|
2168
|
+
<xsl:attribute name="margin-right">0mm</xsl:attribute>
|
2165
2169
|
|
2166
2170
|
|
2167
2171
|
<xsl:variable name="parent" select="local-name(..)"/>
|
@@ -2345,12 +2349,32 @@
|
|
2345
2349
|
</xsl:otherwise>
|
2346
2350
|
</xsl:choose>
|
2347
2351
|
</xsl:template><xsl:template name="getMaxLength_dt">
|
2348
|
-
<xsl:
|
2349
|
-
<xsl:
|
2350
|
-
|
2351
|
-
<xsl:
|
2352
|
-
|
2353
|
-
|
2352
|
+
<xsl:variable name="lengths">
|
2353
|
+
<xsl:for-each select="*[local-name()='dt']">
|
2354
|
+
<xsl:variable name="maintext_length" select="string-length(normalize-space(.))"/>
|
2355
|
+
<xsl:variable name="attributes">
|
2356
|
+
<xsl:for-each select=".//@open"><xsl:value-of select="."/></xsl:for-each>
|
2357
|
+
<xsl:for-each select=".//@close"><xsl:value-of select="."/></xsl:for-each>
|
2358
|
+
</xsl:variable>
|
2359
|
+
<length><xsl:value-of select="string-length(normalize-space(.)) + string-length($attributes)"/></length>
|
2360
|
+
</xsl:for-each>
|
2361
|
+
</xsl:variable>
|
2362
|
+
<xsl:variable name="maxLength">
|
2363
|
+
<!-- <xsl:for-each select="*[local-name()='dt']">
|
2364
|
+
<xsl:sort select="string-length(normalize-space(.))" data-type="number" order="descending"/>
|
2365
|
+
<xsl:if test="position() = 1">
|
2366
|
+
<xsl:value-of select="string-length(normalize-space(.))"/>
|
2367
|
+
</xsl:if>
|
2368
|
+
</xsl:for-each> -->
|
2369
|
+
<xsl:for-each select="xalan:nodeset($lengths)/length">
|
2370
|
+
<xsl:sort select="." data-type="number" order="descending"/>
|
2371
|
+
<xsl:if test="position() = 1">
|
2372
|
+
<xsl:value-of select="."/>
|
2373
|
+
</xsl:if>
|
2374
|
+
</xsl:for-each>
|
2375
|
+
</xsl:variable>
|
2376
|
+
<!-- <xsl:message>DEBUG:<xsl:value-of select="$maxLength"/></xsl:message> -->
|
2377
|
+
<xsl:value-of select="$maxLength"/>
|
2354
2378
|
</xsl:template><xsl:template match="*[local-name()='dl']/*[local-name()='note']" priority="2">
|
2355
2379
|
<xsl:param name="key_iso"/>
|
2356
2380
|
|
@@ -3147,6 +3171,8 @@
|
|
3147
3171
|
<xsl:variable name="bookmark-title_">
|
3148
3172
|
<xsl:call-template name="getLangVersion">
|
3149
3173
|
<xsl:with-param name="lang" select="@lang"/>
|
3174
|
+
<xsl:with-param name="doctype" select="@doctype"/>
|
3175
|
+
<xsl:with-param name="title" select="@title-part"/>
|
3150
3176
|
</xsl:call-template>
|
3151
3177
|
</xsl:variable>
|
3152
3178
|
<xsl:choose>
|
@@ -3164,13 +3190,34 @@
|
|
3164
3190
|
</xsl:choose>
|
3165
3191
|
</fo:bookmark-title>
|
3166
3192
|
<xsl:apply-templates select="contents/item" mode="bookmark"/>
|
3193
|
+
|
3194
|
+
<xsl:call-template name="insertFigureBookmarks">
|
3195
|
+
<xsl:with-param name="contents" select="contents"/>
|
3196
|
+
</xsl:call-template>
|
3197
|
+
|
3198
|
+
<xsl:call-template name="insertTableBookmarks">
|
3199
|
+
<xsl:with-param name="contents" select="contents"/>
|
3200
|
+
<xsl:with-param name="lang" select="@lang"/>
|
3201
|
+
</xsl:call-template>
|
3202
|
+
|
3167
3203
|
</fo:bookmark>
|
3168
3204
|
|
3169
3205
|
</xsl:for-each>
|
3170
3206
|
</xsl:when>
|
3171
3207
|
<xsl:otherwise>
|
3172
3208
|
<xsl:for-each select="xalan:nodeset($contents)/doc">
|
3209
|
+
|
3173
3210
|
<xsl:apply-templates select="contents/item" mode="bookmark"/>
|
3211
|
+
|
3212
|
+
<xsl:call-template name="insertFigureBookmarks">
|
3213
|
+
<xsl:with-param name="contents" select="contents"/>
|
3214
|
+
</xsl:call-template>
|
3215
|
+
|
3216
|
+
<xsl:call-template name="insertTableBookmarks">
|
3217
|
+
<xsl:with-param name="contents" select="contents"/>
|
3218
|
+
<xsl:with-param name="lang" select="@lang"/>
|
3219
|
+
</xsl:call-template>
|
3220
|
+
|
3174
3221
|
</xsl:for-each>
|
3175
3222
|
</xsl:otherwise>
|
3176
3223
|
</xsl:choose>
|
@@ -3189,8 +3236,44 @@
|
|
3189
3236
|
|
3190
3237
|
</fo:bookmark-tree>
|
3191
3238
|
</xsl:if>
|
3239
|
+
</xsl:template><xsl:template name="insertFigureBookmarks">
|
3240
|
+
<xsl:param name="contents"/>
|
3241
|
+
<xsl:if test="xalan:nodeset($contents)/figure">
|
3242
|
+
<fo:bookmark internal-destination="{xalan:nodeset($contents)/figure[1]/@id}" starting-state="hide">
|
3243
|
+
<fo:bookmark-title>Figures</fo:bookmark-title>
|
3244
|
+
<xsl:for-each select="xalan:nodeset($contents)/figure">
|
3245
|
+
<fo:bookmark internal-destination="{@id}">
|
3246
|
+
<fo:bookmark-title>
|
3247
|
+
<xsl:value-of select="normalize-space(title)"/>
|
3248
|
+
</fo:bookmark-title>
|
3249
|
+
</fo:bookmark>
|
3250
|
+
</xsl:for-each>
|
3251
|
+
</fo:bookmark>
|
3252
|
+
</xsl:if>
|
3253
|
+
</xsl:template><xsl:template name="insertTableBookmarks">
|
3254
|
+
<xsl:param name="contents"/>
|
3255
|
+
<xsl:param name="lang"/>
|
3256
|
+
<xsl:if test="xalan:nodeset($contents)/table">
|
3257
|
+
<fo:bookmark internal-destination="{xalan:nodeset($contents)/table[1]/@id}" starting-state="hide">
|
3258
|
+
<fo:bookmark-title>
|
3259
|
+
<xsl:choose>
|
3260
|
+
<xsl:when test="$lang = 'fr'">Tableaux</xsl:when>
|
3261
|
+
<xsl:otherwise>Tables</xsl:otherwise>
|
3262
|
+
</xsl:choose>
|
3263
|
+
</fo:bookmark-title>
|
3264
|
+
<xsl:for-each select="xalan:nodeset($contents)/table">
|
3265
|
+
<fo:bookmark internal-destination="{@id}">
|
3266
|
+
<fo:bookmark-title>
|
3267
|
+
<xsl:value-of select="normalize-space(title)"/>
|
3268
|
+
</fo:bookmark-title>
|
3269
|
+
</fo:bookmark>
|
3270
|
+
</xsl:for-each>
|
3271
|
+
</fo:bookmark>
|
3272
|
+
</xsl:if>
|
3192
3273
|
</xsl:template><xsl:template name="getLangVersion">
|
3193
3274
|
<xsl:param name="lang"/>
|
3275
|
+
<xsl:param name="doctype" select="''"/>
|
3276
|
+
<xsl:param name="title" select="''"/>
|
3194
3277
|
<xsl:choose>
|
3195
3278
|
<xsl:when test="$lang = 'en'">
|
3196
3279
|
|
@@ -3682,7 +3765,8 @@
|
|
3682
3765
|
<fo:block-container margin-left="0mm">
|
3683
3766
|
|
3684
3767
|
<fo:block xsl:use-attribute-sets="quote-style">
|
3685
|
-
<xsl:apply-templates select=".//*[local-name() = 'p']"/>
|
3768
|
+
<!-- <xsl:apply-templates select=".//*[local-name() = 'p']"/> -->
|
3769
|
+
<xsl:apply-templates select="./*[not(local-name() = 'author') and not(local-name() = 'source')]"/> <!-- process all nested nodes, except author and source -->
|
3686
3770
|
</fo:block>
|
3687
3771
|
<xsl:if test="*[local-name() = 'author'] or *[local-name() = 'source']">
|
3688
3772
|
<fo:block xsl:use-attribute-sets="quote-source-style">
|
@@ -1138,6 +1138,7 @@
|
|
1138
1138
|
|
1139
1139
|
</xsl:attribute-set><xsl:attribute-set name="termnote-name-style">
|
1140
1140
|
|
1141
|
+
|
1141
1142
|
</xsl:attribute-set><xsl:attribute-set name="quote-style">
|
1142
1143
|
|
1143
1144
|
|
@@ -2147,7 +2148,9 @@
|
|
2147
2148
|
</xsl:template><xsl:template match="*[local-name()='dl']">
|
2148
2149
|
<fo:block-container>
|
2149
2150
|
|
2150
|
-
<xsl:
|
2151
|
+
<xsl:if test="not(ancestor::*[local-name() = 'quote'])">
|
2152
|
+
<xsl:attribute name="margin-left">0mm</xsl:attribute>
|
2153
|
+
</xsl:if>
|
2151
2154
|
|
2152
2155
|
|
2153
2156
|
<xsl:if test="parent::*[local-name() = 'note']">
|
@@ -2162,6 +2165,7 @@
|
|
2162
2165
|
<fo:block-container>
|
2163
2166
|
|
2164
2167
|
<xsl:attribute name="margin-left">0mm</xsl:attribute>
|
2168
|
+
<xsl:attribute name="margin-right">0mm</xsl:attribute>
|
2165
2169
|
|
2166
2170
|
|
2167
2171
|
<xsl:variable name="parent" select="local-name(..)"/>
|
@@ -2345,12 +2349,32 @@
|
|
2345
2349
|
</xsl:otherwise>
|
2346
2350
|
</xsl:choose>
|
2347
2351
|
</xsl:template><xsl:template name="getMaxLength_dt">
|
2348
|
-
<xsl:
|
2349
|
-
<xsl:
|
2350
|
-
|
2351
|
-
<xsl:
|
2352
|
-
|
2353
|
-
|
2352
|
+
<xsl:variable name="lengths">
|
2353
|
+
<xsl:for-each select="*[local-name()='dt']">
|
2354
|
+
<xsl:variable name="maintext_length" select="string-length(normalize-space(.))"/>
|
2355
|
+
<xsl:variable name="attributes">
|
2356
|
+
<xsl:for-each select=".//@open"><xsl:value-of select="."/></xsl:for-each>
|
2357
|
+
<xsl:for-each select=".//@close"><xsl:value-of select="."/></xsl:for-each>
|
2358
|
+
</xsl:variable>
|
2359
|
+
<length><xsl:value-of select="string-length(normalize-space(.)) + string-length($attributes)"/></length>
|
2360
|
+
</xsl:for-each>
|
2361
|
+
</xsl:variable>
|
2362
|
+
<xsl:variable name="maxLength">
|
2363
|
+
<!-- <xsl:for-each select="*[local-name()='dt']">
|
2364
|
+
<xsl:sort select="string-length(normalize-space(.))" data-type="number" order="descending"/>
|
2365
|
+
<xsl:if test="position() = 1">
|
2366
|
+
<xsl:value-of select="string-length(normalize-space(.))"/>
|
2367
|
+
</xsl:if>
|
2368
|
+
</xsl:for-each> -->
|
2369
|
+
<xsl:for-each select="xalan:nodeset($lengths)/length">
|
2370
|
+
<xsl:sort select="." data-type="number" order="descending"/>
|
2371
|
+
<xsl:if test="position() = 1">
|
2372
|
+
<xsl:value-of select="."/>
|
2373
|
+
</xsl:if>
|
2374
|
+
</xsl:for-each>
|
2375
|
+
</xsl:variable>
|
2376
|
+
<!-- <xsl:message>DEBUG:<xsl:value-of select="$maxLength"/></xsl:message> -->
|
2377
|
+
<xsl:value-of select="$maxLength"/>
|
2354
2378
|
</xsl:template><xsl:template match="*[local-name()='dl']/*[local-name()='note']" priority="2">
|
2355
2379
|
<xsl:param name="key_iso"/>
|
2356
2380
|
|
@@ -3147,6 +3171,8 @@
|
|
3147
3171
|
<xsl:variable name="bookmark-title_">
|
3148
3172
|
<xsl:call-template name="getLangVersion">
|
3149
3173
|
<xsl:with-param name="lang" select="@lang"/>
|
3174
|
+
<xsl:with-param name="doctype" select="@doctype"/>
|
3175
|
+
<xsl:with-param name="title" select="@title-part"/>
|
3150
3176
|
</xsl:call-template>
|
3151
3177
|
</xsl:variable>
|
3152
3178
|
<xsl:choose>
|
@@ -3164,13 +3190,34 @@
|
|
3164
3190
|
</xsl:choose>
|
3165
3191
|
</fo:bookmark-title>
|
3166
3192
|
<xsl:apply-templates select="contents/item" mode="bookmark"/>
|
3193
|
+
|
3194
|
+
<xsl:call-template name="insertFigureBookmarks">
|
3195
|
+
<xsl:with-param name="contents" select="contents"/>
|
3196
|
+
</xsl:call-template>
|
3197
|
+
|
3198
|
+
<xsl:call-template name="insertTableBookmarks">
|
3199
|
+
<xsl:with-param name="contents" select="contents"/>
|
3200
|
+
<xsl:with-param name="lang" select="@lang"/>
|
3201
|
+
</xsl:call-template>
|
3202
|
+
|
3167
3203
|
</fo:bookmark>
|
3168
3204
|
|
3169
3205
|
</xsl:for-each>
|
3170
3206
|
</xsl:when>
|
3171
3207
|
<xsl:otherwise>
|
3172
3208
|
<xsl:for-each select="xalan:nodeset($contents)/doc">
|
3209
|
+
|
3173
3210
|
<xsl:apply-templates select="contents/item" mode="bookmark"/>
|
3211
|
+
|
3212
|
+
<xsl:call-template name="insertFigureBookmarks">
|
3213
|
+
<xsl:with-param name="contents" select="contents"/>
|
3214
|
+
</xsl:call-template>
|
3215
|
+
|
3216
|
+
<xsl:call-template name="insertTableBookmarks">
|
3217
|
+
<xsl:with-param name="contents" select="contents"/>
|
3218
|
+
<xsl:with-param name="lang" select="@lang"/>
|
3219
|
+
</xsl:call-template>
|
3220
|
+
|
3174
3221
|
</xsl:for-each>
|
3175
3222
|
</xsl:otherwise>
|
3176
3223
|
</xsl:choose>
|
@@ -3189,8 +3236,44 @@
|
|
3189
3236
|
|
3190
3237
|
</fo:bookmark-tree>
|
3191
3238
|
</xsl:if>
|
3239
|
+
</xsl:template><xsl:template name="insertFigureBookmarks">
|
3240
|
+
<xsl:param name="contents"/>
|
3241
|
+
<xsl:if test="xalan:nodeset($contents)/figure">
|
3242
|
+
<fo:bookmark internal-destination="{xalan:nodeset($contents)/figure[1]/@id}" starting-state="hide">
|
3243
|
+
<fo:bookmark-title>Figures</fo:bookmark-title>
|
3244
|
+
<xsl:for-each select="xalan:nodeset($contents)/figure">
|
3245
|
+
<fo:bookmark internal-destination="{@id}">
|
3246
|
+
<fo:bookmark-title>
|
3247
|
+
<xsl:value-of select="normalize-space(title)"/>
|
3248
|
+
</fo:bookmark-title>
|
3249
|
+
</fo:bookmark>
|
3250
|
+
</xsl:for-each>
|
3251
|
+
</fo:bookmark>
|
3252
|
+
</xsl:if>
|
3253
|
+
</xsl:template><xsl:template name="insertTableBookmarks">
|
3254
|
+
<xsl:param name="contents"/>
|
3255
|
+
<xsl:param name="lang"/>
|
3256
|
+
<xsl:if test="xalan:nodeset($contents)/table">
|
3257
|
+
<fo:bookmark internal-destination="{xalan:nodeset($contents)/table[1]/@id}" starting-state="hide">
|
3258
|
+
<fo:bookmark-title>
|
3259
|
+
<xsl:choose>
|
3260
|
+
<xsl:when test="$lang = 'fr'">Tableaux</xsl:when>
|
3261
|
+
<xsl:otherwise>Tables</xsl:otherwise>
|
3262
|
+
</xsl:choose>
|
3263
|
+
</fo:bookmark-title>
|
3264
|
+
<xsl:for-each select="xalan:nodeset($contents)/table">
|
3265
|
+
<fo:bookmark internal-destination="{@id}">
|
3266
|
+
<fo:bookmark-title>
|
3267
|
+
<xsl:value-of select="normalize-space(title)"/>
|
3268
|
+
</fo:bookmark-title>
|
3269
|
+
</fo:bookmark>
|
3270
|
+
</xsl:for-each>
|
3271
|
+
</fo:bookmark>
|
3272
|
+
</xsl:if>
|
3192
3273
|
</xsl:template><xsl:template name="getLangVersion">
|
3193
3274
|
<xsl:param name="lang"/>
|
3275
|
+
<xsl:param name="doctype" select="''"/>
|
3276
|
+
<xsl:param name="title" select="''"/>
|
3194
3277
|
<xsl:choose>
|
3195
3278
|
<xsl:when test="$lang = 'en'">
|
3196
3279
|
|
@@ -3682,7 +3765,8 @@
|
|
3682
3765
|
<fo:block-container margin-left="0mm">
|
3683
3766
|
|
3684
3767
|
<fo:block xsl:use-attribute-sets="quote-style">
|
3685
|
-
<xsl:apply-templates select=".//*[local-name() = 'p']"/>
|
3768
|
+
<!-- <xsl:apply-templates select=".//*[local-name() = 'p']"/> -->
|
3769
|
+
<xsl:apply-templates select="./*[not(local-name() = 'author') and not(local-name() = 'source')]"/> <!-- process all nested nodes, except author and source -->
|
3686
3770
|
</fo:block>
|
3687
3771
|
<xsl:if test="*[local-name() = 'author'] or *[local-name() = 'source']">
|
3688
3772
|
<fo:block xsl:use-attribute-sets="quote-source-style">
|
@@ -1138,6 +1138,7 @@
|
|
1138
1138
|
|
1139
1139
|
</xsl:attribute-set><xsl:attribute-set name="termnote-name-style">
|
1140
1140
|
|
1141
|
+
|
1141
1142
|
</xsl:attribute-set><xsl:attribute-set name="quote-style">
|
1142
1143
|
|
1143
1144
|
|
@@ -2147,7 +2148,9 @@
|
|
2147
2148
|
</xsl:template><xsl:template match="*[local-name()='dl']">
|
2148
2149
|
<fo:block-container>
|
2149
2150
|
|
2150
|
-
<xsl:
|
2151
|
+
<xsl:if test="not(ancestor::*[local-name() = 'quote'])">
|
2152
|
+
<xsl:attribute name="margin-left">0mm</xsl:attribute>
|
2153
|
+
</xsl:if>
|
2151
2154
|
|
2152
2155
|
|
2153
2156
|
<xsl:if test="parent::*[local-name() = 'note']">
|
@@ -2162,6 +2165,7 @@
|
|
2162
2165
|
<fo:block-container>
|
2163
2166
|
|
2164
2167
|
<xsl:attribute name="margin-left">0mm</xsl:attribute>
|
2168
|
+
<xsl:attribute name="margin-right">0mm</xsl:attribute>
|
2165
2169
|
|
2166
2170
|
|
2167
2171
|
<xsl:variable name="parent" select="local-name(..)"/>
|
@@ -2345,12 +2349,32 @@
|
|
2345
2349
|
</xsl:otherwise>
|
2346
2350
|
</xsl:choose>
|
2347
2351
|
</xsl:template><xsl:template name="getMaxLength_dt">
|
2348
|
-
<xsl:
|
2349
|
-
<xsl:
|
2350
|
-
|
2351
|
-
<xsl:
|
2352
|
-
|
2353
|
-
|
2352
|
+
<xsl:variable name="lengths">
|
2353
|
+
<xsl:for-each select="*[local-name()='dt']">
|
2354
|
+
<xsl:variable name="maintext_length" select="string-length(normalize-space(.))"/>
|
2355
|
+
<xsl:variable name="attributes">
|
2356
|
+
<xsl:for-each select=".//@open"><xsl:value-of select="."/></xsl:for-each>
|
2357
|
+
<xsl:for-each select=".//@close"><xsl:value-of select="."/></xsl:for-each>
|
2358
|
+
</xsl:variable>
|
2359
|
+
<length><xsl:value-of select="string-length(normalize-space(.)) + string-length($attributes)"/></length>
|
2360
|
+
</xsl:for-each>
|
2361
|
+
</xsl:variable>
|
2362
|
+
<xsl:variable name="maxLength">
|
2363
|
+
<!-- <xsl:for-each select="*[local-name()='dt']">
|
2364
|
+
<xsl:sort select="string-length(normalize-space(.))" data-type="number" order="descending"/>
|
2365
|
+
<xsl:if test="position() = 1">
|
2366
|
+
<xsl:value-of select="string-length(normalize-space(.))"/>
|
2367
|
+
</xsl:if>
|
2368
|
+
</xsl:for-each> -->
|
2369
|
+
<xsl:for-each select="xalan:nodeset($lengths)/length">
|
2370
|
+
<xsl:sort select="." data-type="number" order="descending"/>
|
2371
|
+
<xsl:if test="position() = 1">
|
2372
|
+
<xsl:value-of select="."/>
|
2373
|
+
</xsl:if>
|
2374
|
+
</xsl:for-each>
|
2375
|
+
</xsl:variable>
|
2376
|
+
<!-- <xsl:message>DEBUG:<xsl:value-of select="$maxLength"/></xsl:message> -->
|
2377
|
+
<xsl:value-of select="$maxLength"/>
|
2354
2378
|
</xsl:template><xsl:template match="*[local-name()='dl']/*[local-name()='note']" priority="2">
|
2355
2379
|
<xsl:param name="key_iso"/>
|
2356
2380
|
|
@@ -3147,6 +3171,8 @@
|
|
3147
3171
|
<xsl:variable name="bookmark-title_">
|
3148
3172
|
<xsl:call-template name="getLangVersion">
|
3149
3173
|
<xsl:with-param name="lang" select="@lang"/>
|
3174
|
+
<xsl:with-param name="doctype" select="@doctype"/>
|
3175
|
+
<xsl:with-param name="title" select="@title-part"/>
|
3150
3176
|
</xsl:call-template>
|
3151
3177
|
</xsl:variable>
|
3152
3178
|
<xsl:choose>
|
@@ -3164,13 +3190,34 @@
|
|
3164
3190
|
</xsl:choose>
|
3165
3191
|
</fo:bookmark-title>
|
3166
3192
|
<xsl:apply-templates select="contents/item" mode="bookmark"/>
|
3193
|
+
|
3194
|
+
<xsl:call-template name="insertFigureBookmarks">
|
3195
|
+
<xsl:with-param name="contents" select="contents"/>
|
3196
|
+
</xsl:call-template>
|
3197
|
+
|
3198
|
+
<xsl:call-template name="insertTableBookmarks">
|
3199
|
+
<xsl:with-param name="contents" select="contents"/>
|
3200
|
+
<xsl:with-param name="lang" select="@lang"/>
|
3201
|
+
</xsl:call-template>
|
3202
|
+
|
3167
3203
|
</fo:bookmark>
|
3168
3204
|
|
3169
3205
|
</xsl:for-each>
|
3170
3206
|
</xsl:when>
|
3171
3207
|
<xsl:otherwise>
|
3172
3208
|
<xsl:for-each select="xalan:nodeset($contents)/doc">
|
3209
|
+
|
3173
3210
|
<xsl:apply-templates select="contents/item" mode="bookmark"/>
|
3211
|
+
|
3212
|
+
<xsl:call-template name="insertFigureBookmarks">
|
3213
|
+
<xsl:with-param name="contents" select="contents"/>
|
3214
|
+
</xsl:call-template>
|
3215
|
+
|
3216
|
+
<xsl:call-template name="insertTableBookmarks">
|
3217
|
+
<xsl:with-param name="contents" select="contents"/>
|
3218
|
+
<xsl:with-param name="lang" select="@lang"/>
|
3219
|
+
</xsl:call-template>
|
3220
|
+
|
3174
3221
|
</xsl:for-each>
|
3175
3222
|
</xsl:otherwise>
|
3176
3223
|
</xsl:choose>
|
@@ -3189,8 +3236,44 @@
|
|
3189
3236
|
|
3190
3237
|
</fo:bookmark-tree>
|
3191
3238
|
</xsl:if>
|
3239
|
+
</xsl:template><xsl:template name="insertFigureBookmarks">
|
3240
|
+
<xsl:param name="contents"/>
|
3241
|
+
<xsl:if test="xalan:nodeset($contents)/figure">
|
3242
|
+
<fo:bookmark internal-destination="{xalan:nodeset($contents)/figure[1]/@id}" starting-state="hide">
|
3243
|
+
<fo:bookmark-title>Figures</fo:bookmark-title>
|
3244
|
+
<xsl:for-each select="xalan:nodeset($contents)/figure">
|
3245
|
+
<fo:bookmark internal-destination="{@id}">
|
3246
|
+
<fo:bookmark-title>
|
3247
|
+
<xsl:value-of select="normalize-space(title)"/>
|
3248
|
+
</fo:bookmark-title>
|
3249
|
+
</fo:bookmark>
|
3250
|
+
</xsl:for-each>
|
3251
|
+
</fo:bookmark>
|
3252
|
+
</xsl:if>
|
3253
|
+
</xsl:template><xsl:template name="insertTableBookmarks">
|
3254
|
+
<xsl:param name="contents"/>
|
3255
|
+
<xsl:param name="lang"/>
|
3256
|
+
<xsl:if test="xalan:nodeset($contents)/table">
|
3257
|
+
<fo:bookmark internal-destination="{xalan:nodeset($contents)/table[1]/@id}" starting-state="hide">
|
3258
|
+
<fo:bookmark-title>
|
3259
|
+
<xsl:choose>
|
3260
|
+
<xsl:when test="$lang = 'fr'">Tableaux</xsl:when>
|
3261
|
+
<xsl:otherwise>Tables</xsl:otherwise>
|
3262
|
+
</xsl:choose>
|
3263
|
+
</fo:bookmark-title>
|
3264
|
+
<xsl:for-each select="xalan:nodeset($contents)/table">
|
3265
|
+
<fo:bookmark internal-destination="{@id}">
|
3266
|
+
<fo:bookmark-title>
|
3267
|
+
<xsl:value-of select="normalize-space(title)"/>
|
3268
|
+
</fo:bookmark-title>
|
3269
|
+
</fo:bookmark>
|
3270
|
+
</xsl:for-each>
|
3271
|
+
</fo:bookmark>
|
3272
|
+
</xsl:if>
|
3192
3273
|
</xsl:template><xsl:template name="getLangVersion">
|
3193
3274
|
<xsl:param name="lang"/>
|
3275
|
+
<xsl:param name="doctype" select="''"/>
|
3276
|
+
<xsl:param name="title" select="''"/>
|
3194
3277
|
<xsl:choose>
|
3195
3278
|
<xsl:when test="$lang = 'en'">
|
3196
3279
|
|
@@ -3682,7 +3765,8 @@
|
|
3682
3765
|
<fo:block-container margin-left="0mm">
|
3683
3766
|
|
3684
3767
|
<fo:block xsl:use-attribute-sets="quote-style">
|
3685
|
-
<xsl:apply-templates select=".//*[local-name() = 'p']"/>
|
3768
|
+
<!-- <xsl:apply-templates select=".//*[local-name() = 'p']"/> -->
|
3769
|
+
<xsl:apply-templates select="./*[not(local-name() = 'author') and not(local-name() = 'source')]"/> <!-- process all nested nodes, except author and source -->
|
3686
3770
|
</fo:block>
|
3687
3771
|
<xsl:if test="*[local-name() = 'author'] or *[local-name() = 'source']">
|
3688
3772
|
<fo:block xsl:use-attribute-sets="quote-source-style">
|
@@ -1138,6 +1138,7 @@
|
|
1138
1138
|
|
1139
1139
|
</xsl:attribute-set><xsl:attribute-set name="termnote-name-style">
|
1140
1140
|
|
1141
|
+
|
1141
1142
|
</xsl:attribute-set><xsl:attribute-set name="quote-style">
|
1142
1143
|
|
1143
1144
|
|
@@ -2147,7 +2148,9 @@
|
|
2147
2148
|
</xsl:template><xsl:template match="*[local-name()='dl']">
|
2148
2149
|
<fo:block-container>
|
2149
2150
|
|
2150
|
-
<xsl:
|
2151
|
+
<xsl:if test="not(ancestor::*[local-name() = 'quote'])">
|
2152
|
+
<xsl:attribute name="margin-left">0mm</xsl:attribute>
|
2153
|
+
</xsl:if>
|
2151
2154
|
|
2152
2155
|
|
2153
2156
|
<xsl:if test="parent::*[local-name() = 'note']">
|
@@ -2162,6 +2165,7 @@
|
|
2162
2165
|
<fo:block-container>
|
2163
2166
|
|
2164
2167
|
<xsl:attribute name="margin-left">0mm</xsl:attribute>
|
2168
|
+
<xsl:attribute name="margin-right">0mm</xsl:attribute>
|
2165
2169
|
|
2166
2170
|
|
2167
2171
|
<xsl:variable name="parent" select="local-name(..)"/>
|
@@ -2345,12 +2349,32 @@
|
|
2345
2349
|
</xsl:otherwise>
|
2346
2350
|
</xsl:choose>
|
2347
2351
|
</xsl:template><xsl:template name="getMaxLength_dt">
|
2348
|
-
<xsl:
|
2349
|
-
<xsl:
|
2350
|
-
|
2351
|
-
<xsl:
|
2352
|
-
|
2353
|
-
|
2352
|
+
<xsl:variable name="lengths">
|
2353
|
+
<xsl:for-each select="*[local-name()='dt']">
|
2354
|
+
<xsl:variable name="maintext_length" select="string-length(normalize-space(.))"/>
|
2355
|
+
<xsl:variable name="attributes">
|
2356
|
+
<xsl:for-each select=".//@open"><xsl:value-of select="."/></xsl:for-each>
|
2357
|
+
<xsl:for-each select=".//@close"><xsl:value-of select="."/></xsl:for-each>
|
2358
|
+
</xsl:variable>
|
2359
|
+
<length><xsl:value-of select="string-length(normalize-space(.)) + string-length($attributes)"/></length>
|
2360
|
+
</xsl:for-each>
|
2361
|
+
</xsl:variable>
|
2362
|
+
<xsl:variable name="maxLength">
|
2363
|
+
<!-- <xsl:for-each select="*[local-name()='dt']">
|
2364
|
+
<xsl:sort select="string-length(normalize-space(.))" data-type="number" order="descending"/>
|
2365
|
+
<xsl:if test="position() = 1">
|
2366
|
+
<xsl:value-of select="string-length(normalize-space(.))"/>
|
2367
|
+
</xsl:if>
|
2368
|
+
</xsl:for-each> -->
|
2369
|
+
<xsl:for-each select="xalan:nodeset($lengths)/length">
|
2370
|
+
<xsl:sort select="." data-type="number" order="descending"/>
|
2371
|
+
<xsl:if test="position() = 1">
|
2372
|
+
<xsl:value-of select="."/>
|
2373
|
+
</xsl:if>
|
2374
|
+
</xsl:for-each>
|
2375
|
+
</xsl:variable>
|
2376
|
+
<!-- <xsl:message>DEBUG:<xsl:value-of select="$maxLength"/></xsl:message> -->
|
2377
|
+
<xsl:value-of select="$maxLength"/>
|
2354
2378
|
</xsl:template><xsl:template match="*[local-name()='dl']/*[local-name()='note']" priority="2">
|
2355
2379
|
<xsl:param name="key_iso"/>
|
2356
2380
|
|
@@ -3147,6 +3171,8 @@
|
|
3147
3171
|
<xsl:variable name="bookmark-title_">
|
3148
3172
|
<xsl:call-template name="getLangVersion">
|
3149
3173
|
<xsl:with-param name="lang" select="@lang"/>
|
3174
|
+
<xsl:with-param name="doctype" select="@doctype"/>
|
3175
|
+
<xsl:with-param name="title" select="@title-part"/>
|
3150
3176
|
</xsl:call-template>
|
3151
3177
|
</xsl:variable>
|
3152
3178
|
<xsl:choose>
|
@@ -3164,13 +3190,34 @@
|
|
3164
3190
|
</xsl:choose>
|
3165
3191
|
</fo:bookmark-title>
|
3166
3192
|
<xsl:apply-templates select="contents/item" mode="bookmark"/>
|
3193
|
+
|
3194
|
+
<xsl:call-template name="insertFigureBookmarks">
|
3195
|
+
<xsl:with-param name="contents" select="contents"/>
|
3196
|
+
</xsl:call-template>
|
3197
|
+
|
3198
|
+
<xsl:call-template name="insertTableBookmarks">
|
3199
|
+
<xsl:with-param name="contents" select="contents"/>
|
3200
|
+
<xsl:with-param name="lang" select="@lang"/>
|
3201
|
+
</xsl:call-template>
|
3202
|
+
|
3167
3203
|
</fo:bookmark>
|
3168
3204
|
|
3169
3205
|
</xsl:for-each>
|
3170
3206
|
</xsl:when>
|
3171
3207
|
<xsl:otherwise>
|
3172
3208
|
<xsl:for-each select="xalan:nodeset($contents)/doc">
|
3209
|
+
|
3173
3210
|
<xsl:apply-templates select="contents/item" mode="bookmark"/>
|
3211
|
+
|
3212
|
+
<xsl:call-template name="insertFigureBookmarks">
|
3213
|
+
<xsl:with-param name="contents" select="contents"/>
|
3214
|
+
</xsl:call-template>
|
3215
|
+
|
3216
|
+
<xsl:call-template name="insertTableBookmarks">
|
3217
|
+
<xsl:with-param name="contents" select="contents"/>
|
3218
|
+
<xsl:with-param name="lang" select="@lang"/>
|
3219
|
+
</xsl:call-template>
|
3220
|
+
|
3174
3221
|
</xsl:for-each>
|
3175
3222
|
</xsl:otherwise>
|
3176
3223
|
</xsl:choose>
|
@@ -3189,8 +3236,44 @@
|
|
3189
3236
|
|
3190
3237
|
</fo:bookmark-tree>
|
3191
3238
|
</xsl:if>
|
3239
|
+
</xsl:template><xsl:template name="insertFigureBookmarks">
|
3240
|
+
<xsl:param name="contents"/>
|
3241
|
+
<xsl:if test="xalan:nodeset($contents)/figure">
|
3242
|
+
<fo:bookmark internal-destination="{xalan:nodeset($contents)/figure[1]/@id}" starting-state="hide">
|
3243
|
+
<fo:bookmark-title>Figures</fo:bookmark-title>
|
3244
|
+
<xsl:for-each select="xalan:nodeset($contents)/figure">
|
3245
|
+
<fo:bookmark internal-destination="{@id}">
|
3246
|
+
<fo:bookmark-title>
|
3247
|
+
<xsl:value-of select="normalize-space(title)"/>
|
3248
|
+
</fo:bookmark-title>
|
3249
|
+
</fo:bookmark>
|
3250
|
+
</xsl:for-each>
|
3251
|
+
</fo:bookmark>
|
3252
|
+
</xsl:if>
|
3253
|
+
</xsl:template><xsl:template name="insertTableBookmarks">
|
3254
|
+
<xsl:param name="contents"/>
|
3255
|
+
<xsl:param name="lang"/>
|
3256
|
+
<xsl:if test="xalan:nodeset($contents)/table">
|
3257
|
+
<fo:bookmark internal-destination="{xalan:nodeset($contents)/table[1]/@id}" starting-state="hide">
|
3258
|
+
<fo:bookmark-title>
|
3259
|
+
<xsl:choose>
|
3260
|
+
<xsl:when test="$lang = 'fr'">Tableaux</xsl:when>
|
3261
|
+
<xsl:otherwise>Tables</xsl:otherwise>
|
3262
|
+
</xsl:choose>
|
3263
|
+
</fo:bookmark-title>
|
3264
|
+
<xsl:for-each select="xalan:nodeset($contents)/table">
|
3265
|
+
<fo:bookmark internal-destination="{@id}">
|
3266
|
+
<fo:bookmark-title>
|
3267
|
+
<xsl:value-of select="normalize-space(title)"/>
|
3268
|
+
</fo:bookmark-title>
|
3269
|
+
</fo:bookmark>
|
3270
|
+
</xsl:for-each>
|
3271
|
+
</fo:bookmark>
|
3272
|
+
</xsl:if>
|
3192
3273
|
</xsl:template><xsl:template name="getLangVersion">
|
3193
3274
|
<xsl:param name="lang"/>
|
3275
|
+
<xsl:param name="doctype" select="''"/>
|
3276
|
+
<xsl:param name="title" select="''"/>
|
3194
3277
|
<xsl:choose>
|
3195
3278
|
<xsl:when test="$lang = 'en'">
|
3196
3279
|
|
@@ -3682,7 +3765,8 @@
|
|
3682
3765
|
<fo:block-container margin-left="0mm">
|
3683
3766
|
|
3684
3767
|
<fo:block xsl:use-attribute-sets="quote-style">
|
3685
|
-
<xsl:apply-templates select=".//*[local-name() = 'p']"/>
|
3768
|
+
<!-- <xsl:apply-templates select=".//*[local-name() = 'p']"/> -->
|
3769
|
+
<xsl:apply-templates select="./*[not(local-name() = 'author') and not(local-name() = 'source')]"/> <!-- process all nested nodes, except author and source -->
|
3686
3770
|
</fo:block>
|
3687
3771
|
<xsl:if test="*[local-name() = 'author'] or *[local-name() = 'source']">
|
3688
3772
|
<fo:block xsl:use-attribute-sets="quote-source-style">
|
data/metanorma-mpfd.gemspec
CHANGED
@@ -29,8 +29,8 @@ Gem::Specification.new do |spec|
|
|
29
29
|
spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
|
30
30
|
|
31
31
|
spec.add_dependency "htmlentities", "~> 4.3.4"
|
32
|
-
spec.add_dependency "metanorma-standoc", "~> 1.
|
33
|
-
spec.add_dependency "isodoc", "~> 1.
|
32
|
+
spec.add_dependency "metanorma-standoc", "~> 1.7.0"
|
33
|
+
spec.add_dependency "isodoc", "~> 1.4.0"
|
34
34
|
spec.add_dependency "twitter_cldr"
|
35
35
|
|
36
36
|
spec.add_development_dependency "byebug", "~> 9.1"
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: metanorma-mpfa
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.5.
|
4
|
+
version: 0.5.10
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Ribose Inc.
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2020-12-
|
11
|
+
date: 2020-12-28 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: htmlentities
|
@@ -30,28 +30,28 @@ dependencies:
|
|
30
30
|
requirements:
|
31
31
|
- - "~>"
|
32
32
|
- !ruby/object:Gem::Version
|
33
|
-
version: 1.
|
33
|
+
version: 1.7.0
|
34
34
|
type: :runtime
|
35
35
|
prerelease: false
|
36
36
|
version_requirements: !ruby/object:Gem::Requirement
|
37
37
|
requirements:
|
38
38
|
- - "~>"
|
39
39
|
- !ruby/object:Gem::Version
|
40
|
-
version: 1.
|
40
|
+
version: 1.7.0
|
41
41
|
- !ruby/object:Gem::Dependency
|
42
42
|
name: isodoc
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|
44
44
|
requirements:
|
45
45
|
- - "~>"
|
46
46
|
- !ruby/object:Gem::Version
|
47
|
-
version: 1.
|
47
|
+
version: 1.4.0
|
48
48
|
type: :runtime
|
49
49
|
prerelease: false
|
50
50
|
version_requirements: !ruby/object:Gem::Requirement
|
51
51
|
requirements:
|
52
52
|
- - "~>"
|
53
53
|
- !ruby/object:Gem::Version
|
54
|
-
version: 1.
|
54
|
+
version: 1.4.0
|
55
55
|
- !ruby/object:Gem::Dependency
|
56
56
|
name: twitter_cldr
|
57
57
|
requirement: !ruby/object:Gem::Requirement
|