metanorma-itu 2.8.0 → 2.8.1
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/isodoc/itu/itu.implementers-guide.xsl +50 -56
- data/lib/isodoc/itu/itu.in-force.xsl +50 -56
- data/lib/isodoc/itu/itu.recommendation-annex.xsl +50 -56
- data/lib/isodoc/itu/itu.recommendation-supplement.xsl +50 -56
- data/lib/isodoc/itu/itu.recommendation.xsl +50 -56
- data/lib/isodoc/itu/itu.resolution.xsl +50 -56
- data/lib/isodoc/itu/itu.service-publication.xsl +50 -56
- data/lib/isodoc/itu/itu.technical-paper.xsl +50 -56
- data/lib/isodoc/itu/itu.technical-report.xsl +50 -56
- data/lib/metanorma/itu/biblio.rng +4 -4
- data/lib/metanorma/itu/converter.rb +4 -2
- data/lib/metanorma/itu/front.rb +38 -23
- data/lib/metanorma/itu/front_id.rb +39 -22
- data/lib/metanorma/itu/isodoc.rng +27 -10
- data/lib/metanorma/itu/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: f1402829d7e0f49a58918916fc6ad297d79f632db0ebde6aee28ec47c2b5130e
|
|
4
|
+
data.tar.gz: 7e4aae4d979a12e9b3f326fb7ae815f3a5e35f6961bc4a7cf23d30a4eb847f33
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: f7ab111d06070bde10d4637ec5426b4ee7f9bf66bcd39f4439c3022f817ae00d74ace8edd1f2387ddc7b062af05f6345056ea9ee1179f41af98db26323db6e00
|
|
7
|
+
data.tar.gz: 1bf49b8b2a4a92f570942c936cd8d554ff99ba9c0bf6efcf57f4b2b64479deb06d1ecc43278f84e367a9769ef126b1e934ee9610d3c5bf7e2e63cac7a8eca0dd
|
|
@@ -2116,29 +2116,6 @@
|
|
|
2116
2116
|
</xsl:if>
|
|
2117
2117
|
<xsl:apply-templates/>
|
|
2118
2118
|
</xsl:template>
|
|
2119
|
-
|
|
2120
|
-
<xsl:template match="mn:preface//mn:fmt-title" priority="3">
|
|
2121
|
-
<!-- <xsl:if test="$doctype = 'service-publication'">
|
|
2122
|
-
<fo:block> </fo:block>
|
|
2123
|
-
<fo:block> </fo:block>
|
|
2124
|
-
</xsl:if> -->
|
|
2125
|
-
<xsl:variable name="level">
|
|
2126
|
-
<xsl:call-template name="getLevel"/>
|
|
2127
|
-
</xsl:variable>
|
|
2128
|
-
<xsl:variable name="doctype" select="ancestor::mn:metanorma/mn:bibdata/mn:ext/mn:doctype[not(@language) or @language = '']"/>
|
|
2129
|
-
<fo:block font-weight="bold" margin-top="18pt" margin-bottom="18pt" keep-with-next="always" role="H{$level}">
|
|
2130
|
-
<xsl:if test="$doctype = 'service-publication'">
|
|
2131
|
-
<xsl:attribute name="margin-top">24pt</xsl:attribute>
|
|
2132
|
-
<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
|
|
2133
|
-
<xsl:attribute name="font-size">12pt</xsl:attribute>
|
|
2134
|
-
</xsl:if>
|
|
2135
|
-
<xsl:apply-templates/>
|
|
2136
|
-
<xsl:apply-templates select="following-sibling::*[1][self::mn:variant-title][@type = 'sub']" mode="subtitle"/>
|
|
2137
|
-
</fo:block>
|
|
2138
|
-
<!-- <xsl:if test="$doctype = 'service-publication'">
|
|
2139
|
-
<fo:block keep-with-next="always"> </fo:block>
|
|
2140
|
-
</xsl:if> -->
|
|
2141
|
-
</xsl:template>
|
|
2142
2119
|
<!-- ============================= -->
|
|
2143
2120
|
<!-- ============================= -->
|
|
2144
2121
|
|
|
@@ -2209,42 +2186,11 @@
|
|
|
2209
2186
|
<!-- ====== -->
|
|
2210
2187
|
<!-- title -->
|
|
2211
2188
|
<!-- ====== -->
|
|
2212
|
-
<xsl:template match="mn:annex/mn:fmt-title">
|
|
2213
|
-
<xsl:variable name="doctype" select="ancestor::mn:metanorma/mn:bibdata/mn:ext/mn:doctype[not(@language) or @language = '']"/>
|
|
2214
|
-
<fo:block xsl:use-attribute-sets="annex-title-style">
|
|
2215
|
-
<xsl:call-template name="refine_annex-title-style"/>
|
|
2216
|
-
<fo:block>
|
|
2217
|
-
<xsl:apply-templates/>
|
|
2218
|
-
<xsl:apply-templates select="following-sibling::*[1][self::mn:variant-title][@type = 'sub']" mode="subtitle"/>
|
|
2219
|
-
</fo:block>
|
|
2220
|
-
<xsl:if test="$doctype != 'resolution'">
|
|
2221
|
-
<fo:block font-size="12pt" font-weight="normal" margin-top="6pt">
|
|
2222
|
-
<!-- <xsl:choose>
|
|
2223
|
-
<xsl:when test="parent::*[@obligation = 'informative']">
|
|
2224
|
-
<xsl:text>(This appendix does not form an integral part of this Recommendation.)</xsl:text>
|
|
2225
|
-
</xsl:when>
|
|
2226
|
-
<xsl:otherwise>
|
|
2227
|
-
<xsl:text>(This annex forms an integral part of this Recommendation.)</xsl:text>
|
|
2228
|
-
</xsl:otherwise>
|
|
2229
|
-
</xsl:choose> -->
|
|
2230
|
-
<!-- Added for https://github.com/metanorma/isodoc/issues/614 -->
|
|
2231
|
-
<xsl:apply-templates select="following-sibling::mn:p[not(preceding-sibling::mn:clause)][starts-with(normalize-space(), '(')]/node()"/>
|
|
2232
|
-
</fo:block>
|
|
2233
|
-
</xsl:if>
|
|
2234
|
-
</fo:block>
|
|
2235
|
-
</xsl:template>
|
|
2236
2189
|
|
|
2237
2190
|
<!-- Added for https://github.com/metanorma/isodoc/issues/614 -->
|
|
2238
2191
|
<!-- renders in the annex/title template -->
|
|
2239
2192
|
<xsl:template match="mn:annex/mn:p[preceding-sibling::*[1][self::mn:fmt-title or self::mn:variant-title]][starts-with(normalize-space(), '(')]" priority="3"/>
|
|
2240
2193
|
|
|
2241
|
-
<!-- Bibliography -->
|
|
2242
|
-
<xsl:template match="mn:references[not(@normative='true')]/mn:fmt-title">
|
|
2243
|
-
<fo:block xsl:use-attribute-sets="references-non-normative-title-style">
|
|
2244
|
-
<xsl:apply-templates/>
|
|
2245
|
-
</fo:block>
|
|
2246
|
-
</xsl:template>
|
|
2247
|
-
|
|
2248
2194
|
<xsl:template match="mn:fmt-title" name="title">
|
|
2249
2195
|
|
|
2250
2196
|
<xsl:variable name="element-name">
|
|
@@ -2263,6 +2209,24 @@
|
|
|
2263
2209
|
|
|
2264
2210
|
<xsl:apply-templates/>
|
|
2265
2211
|
<xsl:apply-templates select="following-sibling::*[1][self::mn:variant-title][@type = 'sub']" mode="subtitle"/>
|
|
2212
|
+
|
|
2213
|
+
<xsl:if test="parent::mn:annex"><!-- Annex title -->
|
|
2214
|
+
<xsl:variable name="doctype" select="ancestor::mn:metanorma/mn:bibdata/mn:ext/mn:doctype[not(@language) or @language = '']"/>
|
|
2215
|
+
<xsl:if test="$doctype != 'resolution'">
|
|
2216
|
+
<fo:block font-size="12pt" font-weight="normal" margin-top="6pt">
|
|
2217
|
+
<!-- <xsl:choose>
|
|
2218
|
+
<xsl:when test="parent::*[@obligation = 'informative']">
|
|
2219
|
+
<xsl:text>(This appendix does not form an integral part of this Recommendation.)</xsl:text>
|
|
2220
|
+
</xsl:when>
|
|
2221
|
+
<xsl:otherwise>
|
|
2222
|
+
<xsl:text>(This annex forms an integral part of this Recommendation.)</xsl:text>
|
|
2223
|
+
</xsl:otherwise>
|
|
2224
|
+
</xsl:choose> -->
|
|
2225
|
+
<!-- Added for https://github.com/metanorma/isodoc/issues/614 -->
|
|
2226
|
+
<xsl:apply-templates select="following-sibling::mn:p[not(preceding-sibling::mn:clause)][starts-with(normalize-space(), '(')]/node()"/>
|
|
2227
|
+
</fo:block>
|
|
2228
|
+
</xsl:if>
|
|
2229
|
+
</xsl:if>
|
|
2266
2230
|
</xsl:element>
|
|
2267
2231
|
|
|
2268
2232
|
<xsl:if test="$element-name = 'fo:inline' and not(following-sibling::mn:p)">
|
|
@@ -13066,15 +13030,16 @@
|
|
|
13066
13030
|
<!-- END Admonition -->
|
|
13067
13031
|
<!-- ================ -->
|
|
13068
13032
|
|
|
13069
|
-
<xsl:attribute-set name="
|
|
13033
|
+
<xsl:attribute-set name="bibliography-title-style">
|
|
13070
13034
|
<xsl:attribute name="font-size">14pt</xsl:attribute>
|
|
13071
13035
|
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
|
13072
13036
|
<xsl:attribute name="text-align">center</xsl:attribute>
|
|
13037
|
+
<xsl:attribute name="space-before">0pt</xsl:attribute>
|
|
13073
13038
|
<xsl:attribute name="margin-bottom">18pt</xsl:attribute>
|
|
13074
13039
|
<xsl:attribute name="role">H1</xsl:attribute>
|
|
13075
13040
|
</xsl:attribute-set>
|
|
13076
13041
|
|
|
13077
|
-
<xsl:template name="
|
|
13042
|
+
<xsl:template name="refine_bibliography-title-style">
|
|
13078
13043
|
<xsl:variable name="doctype" select="ancestor::mn:metanorma/mn:bibdata/mn:ext/mn:doctype[not(@language) or @language = '']"/>
|
|
13079
13044
|
<xsl:if test="$doctype = 'implementers-guide'">
|
|
13080
13045
|
<xsl:attribute name="text-align">left</xsl:attribute>
|
|
@@ -15196,9 +15161,11 @@
|
|
|
15196
15161
|
<!-- ===================================== -->
|
|
15197
15162
|
|
|
15198
15163
|
<xsl:attribute-set name="annex-title-style">
|
|
15164
|
+
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
|
15199
15165
|
<xsl:attribute name="font-size">14pt</xsl:attribute>
|
|
15200
15166
|
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
|
15201
15167
|
<xsl:attribute name="text-align">center</xsl:attribute>
|
|
15168
|
+
<xsl:attribute name="space-before">0pt</xsl:attribute>
|
|
15202
15169
|
<xsl:attribute name="margin-bottom">18pt</xsl:attribute>
|
|
15203
15170
|
<xsl:attribute name="role">H1</xsl:attribute>
|
|
15204
15171
|
</xsl:attribute-set> <!-- annex-title-style -->
|
|
@@ -15303,6 +15270,33 @@
|
|
|
15303
15270
|
<xsl:attribute name="text-align">start</xsl:attribute>
|
|
15304
15271
|
</xsl:if>
|
|
15305
15272
|
|
|
15273
|
+
<xsl:if test="ancestor::mn:preface">
|
|
15274
|
+
<xsl:attribute name="font-size">inherit</xsl:attribute>
|
|
15275
|
+
<xsl:attribute name="margin-top">18pt</xsl:attribute>
|
|
15276
|
+
<xsl:attribute name="margin-bottom">18pt</xsl:attribute>
|
|
15277
|
+
<xsl:attribute name="space-before">0pt</xsl:attribute>
|
|
15278
|
+
<xsl:attribute name="space-after">0pt</xsl:attribute>
|
|
15279
|
+
<xsl:if test="$doctype = 'service-publication'">
|
|
15280
|
+
<xsl:attribute name="margin-top">24pt</xsl:attribute>
|
|
15281
|
+
<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
|
|
15282
|
+
<xsl:attribute name="font-size">12pt</xsl:attribute>
|
|
15283
|
+
</xsl:if>
|
|
15284
|
+
</xsl:if>
|
|
15285
|
+
|
|
15286
|
+
<xsl:if test="parent::mn:annex"><!-- Annex title -->
|
|
15287
|
+
<xsl:variable name="annex_title_styles">
|
|
15288
|
+
<styles xsl:use-attribute-sets="annex-title-style"><xsl:call-template name="refine_annex-title-style"/></styles>
|
|
15289
|
+
</xsl:variable>
|
|
15290
|
+
<xsl:copy-of select="xalan:nodeset($annex_title_styles)/styles/@*"/>
|
|
15291
|
+
</xsl:if>
|
|
15292
|
+
|
|
15293
|
+
<xsl:if test="parent::mn:references[not(@normative='true')]"><!-- Bibliography section title -->
|
|
15294
|
+
<xsl:variable name="bibliography_title_styles">
|
|
15295
|
+
<styles xsl:use-attribute-sets="bibliography-title-style"><xsl:call-template name="refine_bibliography-title-style"/></styles>
|
|
15296
|
+
</xsl:variable>
|
|
15297
|
+
<xsl:copy-of select="xalan:nodeset($bibliography_title_styles)/styles/@*"/>
|
|
15298
|
+
</xsl:if>
|
|
15299
|
+
|
|
15306
15300
|
<xsl:if test="$element-name = 'fo:inline'">
|
|
15307
15301
|
<xsl:attribute name="padding-right">
|
|
15308
15302
|
<xsl:choose>
|
|
@@ -2116,29 +2116,6 @@
|
|
|
2116
2116
|
</xsl:if>
|
|
2117
2117
|
<xsl:apply-templates/>
|
|
2118
2118
|
</xsl:template>
|
|
2119
|
-
|
|
2120
|
-
<xsl:template match="mn:preface//mn:fmt-title" priority="3">
|
|
2121
|
-
<!-- <xsl:if test="$doctype = 'service-publication'">
|
|
2122
|
-
<fo:block> </fo:block>
|
|
2123
|
-
<fo:block> </fo:block>
|
|
2124
|
-
</xsl:if> -->
|
|
2125
|
-
<xsl:variable name="level">
|
|
2126
|
-
<xsl:call-template name="getLevel"/>
|
|
2127
|
-
</xsl:variable>
|
|
2128
|
-
<xsl:variable name="doctype" select="ancestor::mn:metanorma/mn:bibdata/mn:ext/mn:doctype[not(@language) or @language = '']"/>
|
|
2129
|
-
<fo:block font-weight="bold" margin-top="18pt" margin-bottom="18pt" keep-with-next="always" role="H{$level}">
|
|
2130
|
-
<xsl:if test="$doctype = 'service-publication'">
|
|
2131
|
-
<xsl:attribute name="margin-top">24pt</xsl:attribute>
|
|
2132
|
-
<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
|
|
2133
|
-
<xsl:attribute name="font-size">12pt</xsl:attribute>
|
|
2134
|
-
</xsl:if>
|
|
2135
|
-
<xsl:apply-templates/>
|
|
2136
|
-
<xsl:apply-templates select="following-sibling::*[1][self::mn:variant-title][@type = 'sub']" mode="subtitle"/>
|
|
2137
|
-
</fo:block>
|
|
2138
|
-
<!-- <xsl:if test="$doctype = 'service-publication'">
|
|
2139
|
-
<fo:block keep-with-next="always"> </fo:block>
|
|
2140
|
-
</xsl:if> -->
|
|
2141
|
-
</xsl:template>
|
|
2142
2119
|
<!-- ============================= -->
|
|
2143
2120
|
<!-- ============================= -->
|
|
2144
2121
|
|
|
@@ -2209,42 +2186,11 @@
|
|
|
2209
2186
|
<!-- ====== -->
|
|
2210
2187
|
<!-- title -->
|
|
2211
2188
|
<!-- ====== -->
|
|
2212
|
-
<xsl:template match="mn:annex/mn:fmt-title">
|
|
2213
|
-
<xsl:variable name="doctype" select="ancestor::mn:metanorma/mn:bibdata/mn:ext/mn:doctype[not(@language) or @language = '']"/>
|
|
2214
|
-
<fo:block xsl:use-attribute-sets="annex-title-style">
|
|
2215
|
-
<xsl:call-template name="refine_annex-title-style"/>
|
|
2216
|
-
<fo:block>
|
|
2217
|
-
<xsl:apply-templates/>
|
|
2218
|
-
<xsl:apply-templates select="following-sibling::*[1][self::mn:variant-title][@type = 'sub']" mode="subtitle"/>
|
|
2219
|
-
</fo:block>
|
|
2220
|
-
<xsl:if test="$doctype != 'resolution'">
|
|
2221
|
-
<fo:block font-size="12pt" font-weight="normal" margin-top="6pt">
|
|
2222
|
-
<!-- <xsl:choose>
|
|
2223
|
-
<xsl:when test="parent::*[@obligation = 'informative']">
|
|
2224
|
-
<xsl:text>(This appendix does not form an integral part of this Recommendation.)</xsl:text>
|
|
2225
|
-
</xsl:when>
|
|
2226
|
-
<xsl:otherwise>
|
|
2227
|
-
<xsl:text>(This annex forms an integral part of this Recommendation.)</xsl:text>
|
|
2228
|
-
</xsl:otherwise>
|
|
2229
|
-
</xsl:choose> -->
|
|
2230
|
-
<!-- Added for https://github.com/metanorma/isodoc/issues/614 -->
|
|
2231
|
-
<xsl:apply-templates select="following-sibling::mn:p[not(preceding-sibling::mn:clause)][starts-with(normalize-space(), '(')]/node()"/>
|
|
2232
|
-
</fo:block>
|
|
2233
|
-
</xsl:if>
|
|
2234
|
-
</fo:block>
|
|
2235
|
-
</xsl:template>
|
|
2236
2189
|
|
|
2237
2190
|
<!-- Added for https://github.com/metanorma/isodoc/issues/614 -->
|
|
2238
2191
|
<!-- renders in the annex/title template -->
|
|
2239
2192
|
<xsl:template match="mn:annex/mn:p[preceding-sibling::*[1][self::mn:fmt-title or self::mn:variant-title]][starts-with(normalize-space(), '(')]" priority="3"/>
|
|
2240
2193
|
|
|
2241
|
-
<!-- Bibliography -->
|
|
2242
|
-
<xsl:template match="mn:references[not(@normative='true')]/mn:fmt-title">
|
|
2243
|
-
<fo:block xsl:use-attribute-sets="references-non-normative-title-style">
|
|
2244
|
-
<xsl:apply-templates/>
|
|
2245
|
-
</fo:block>
|
|
2246
|
-
</xsl:template>
|
|
2247
|
-
|
|
2248
2194
|
<xsl:template match="mn:fmt-title" name="title">
|
|
2249
2195
|
|
|
2250
2196
|
<xsl:variable name="element-name">
|
|
@@ -2263,6 +2209,24 @@
|
|
|
2263
2209
|
|
|
2264
2210
|
<xsl:apply-templates/>
|
|
2265
2211
|
<xsl:apply-templates select="following-sibling::*[1][self::mn:variant-title][@type = 'sub']" mode="subtitle"/>
|
|
2212
|
+
|
|
2213
|
+
<xsl:if test="parent::mn:annex"><!-- Annex title -->
|
|
2214
|
+
<xsl:variable name="doctype" select="ancestor::mn:metanorma/mn:bibdata/mn:ext/mn:doctype[not(@language) or @language = '']"/>
|
|
2215
|
+
<xsl:if test="$doctype != 'resolution'">
|
|
2216
|
+
<fo:block font-size="12pt" font-weight="normal" margin-top="6pt">
|
|
2217
|
+
<!-- <xsl:choose>
|
|
2218
|
+
<xsl:when test="parent::*[@obligation = 'informative']">
|
|
2219
|
+
<xsl:text>(This appendix does not form an integral part of this Recommendation.)</xsl:text>
|
|
2220
|
+
</xsl:when>
|
|
2221
|
+
<xsl:otherwise>
|
|
2222
|
+
<xsl:text>(This annex forms an integral part of this Recommendation.)</xsl:text>
|
|
2223
|
+
</xsl:otherwise>
|
|
2224
|
+
</xsl:choose> -->
|
|
2225
|
+
<!-- Added for https://github.com/metanorma/isodoc/issues/614 -->
|
|
2226
|
+
<xsl:apply-templates select="following-sibling::mn:p[not(preceding-sibling::mn:clause)][starts-with(normalize-space(), '(')]/node()"/>
|
|
2227
|
+
</fo:block>
|
|
2228
|
+
</xsl:if>
|
|
2229
|
+
</xsl:if>
|
|
2266
2230
|
</xsl:element>
|
|
2267
2231
|
|
|
2268
2232
|
<xsl:if test="$element-name = 'fo:inline' and not(following-sibling::mn:p)">
|
|
@@ -13066,15 +13030,16 @@
|
|
|
13066
13030
|
<!-- END Admonition -->
|
|
13067
13031
|
<!-- ================ -->
|
|
13068
13032
|
|
|
13069
|
-
<xsl:attribute-set name="
|
|
13033
|
+
<xsl:attribute-set name="bibliography-title-style">
|
|
13070
13034
|
<xsl:attribute name="font-size">14pt</xsl:attribute>
|
|
13071
13035
|
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
|
13072
13036
|
<xsl:attribute name="text-align">center</xsl:attribute>
|
|
13037
|
+
<xsl:attribute name="space-before">0pt</xsl:attribute>
|
|
13073
13038
|
<xsl:attribute name="margin-bottom">18pt</xsl:attribute>
|
|
13074
13039
|
<xsl:attribute name="role">H1</xsl:attribute>
|
|
13075
13040
|
</xsl:attribute-set>
|
|
13076
13041
|
|
|
13077
|
-
<xsl:template name="
|
|
13042
|
+
<xsl:template name="refine_bibliography-title-style">
|
|
13078
13043
|
<xsl:variable name="doctype" select="ancestor::mn:metanorma/mn:bibdata/mn:ext/mn:doctype[not(@language) or @language = '']"/>
|
|
13079
13044
|
<xsl:if test="$doctype = 'implementers-guide'">
|
|
13080
13045
|
<xsl:attribute name="text-align">left</xsl:attribute>
|
|
@@ -15196,9 +15161,11 @@
|
|
|
15196
15161
|
<!-- ===================================== -->
|
|
15197
15162
|
|
|
15198
15163
|
<xsl:attribute-set name="annex-title-style">
|
|
15164
|
+
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
|
15199
15165
|
<xsl:attribute name="font-size">14pt</xsl:attribute>
|
|
15200
15166
|
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
|
15201
15167
|
<xsl:attribute name="text-align">center</xsl:attribute>
|
|
15168
|
+
<xsl:attribute name="space-before">0pt</xsl:attribute>
|
|
15202
15169
|
<xsl:attribute name="margin-bottom">18pt</xsl:attribute>
|
|
15203
15170
|
<xsl:attribute name="role">H1</xsl:attribute>
|
|
15204
15171
|
</xsl:attribute-set> <!-- annex-title-style -->
|
|
@@ -15303,6 +15270,33 @@
|
|
|
15303
15270
|
<xsl:attribute name="text-align">start</xsl:attribute>
|
|
15304
15271
|
</xsl:if>
|
|
15305
15272
|
|
|
15273
|
+
<xsl:if test="ancestor::mn:preface">
|
|
15274
|
+
<xsl:attribute name="font-size">inherit</xsl:attribute>
|
|
15275
|
+
<xsl:attribute name="margin-top">18pt</xsl:attribute>
|
|
15276
|
+
<xsl:attribute name="margin-bottom">18pt</xsl:attribute>
|
|
15277
|
+
<xsl:attribute name="space-before">0pt</xsl:attribute>
|
|
15278
|
+
<xsl:attribute name="space-after">0pt</xsl:attribute>
|
|
15279
|
+
<xsl:if test="$doctype = 'service-publication'">
|
|
15280
|
+
<xsl:attribute name="margin-top">24pt</xsl:attribute>
|
|
15281
|
+
<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
|
|
15282
|
+
<xsl:attribute name="font-size">12pt</xsl:attribute>
|
|
15283
|
+
</xsl:if>
|
|
15284
|
+
</xsl:if>
|
|
15285
|
+
|
|
15286
|
+
<xsl:if test="parent::mn:annex"><!-- Annex title -->
|
|
15287
|
+
<xsl:variable name="annex_title_styles">
|
|
15288
|
+
<styles xsl:use-attribute-sets="annex-title-style"><xsl:call-template name="refine_annex-title-style"/></styles>
|
|
15289
|
+
</xsl:variable>
|
|
15290
|
+
<xsl:copy-of select="xalan:nodeset($annex_title_styles)/styles/@*"/>
|
|
15291
|
+
</xsl:if>
|
|
15292
|
+
|
|
15293
|
+
<xsl:if test="parent::mn:references[not(@normative='true')]"><!-- Bibliography section title -->
|
|
15294
|
+
<xsl:variable name="bibliography_title_styles">
|
|
15295
|
+
<styles xsl:use-attribute-sets="bibliography-title-style"><xsl:call-template name="refine_bibliography-title-style"/></styles>
|
|
15296
|
+
</xsl:variable>
|
|
15297
|
+
<xsl:copy-of select="xalan:nodeset($bibliography_title_styles)/styles/@*"/>
|
|
15298
|
+
</xsl:if>
|
|
15299
|
+
|
|
15306
15300
|
<xsl:if test="$element-name = 'fo:inline'">
|
|
15307
15301
|
<xsl:attribute name="padding-right">
|
|
15308
15302
|
<xsl:choose>
|
|
@@ -2116,29 +2116,6 @@
|
|
|
2116
2116
|
</xsl:if>
|
|
2117
2117
|
<xsl:apply-templates/>
|
|
2118
2118
|
</xsl:template>
|
|
2119
|
-
|
|
2120
|
-
<xsl:template match="mn:preface//mn:fmt-title" priority="3">
|
|
2121
|
-
<!-- <xsl:if test="$doctype = 'service-publication'">
|
|
2122
|
-
<fo:block> </fo:block>
|
|
2123
|
-
<fo:block> </fo:block>
|
|
2124
|
-
</xsl:if> -->
|
|
2125
|
-
<xsl:variable name="level">
|
|
2126
|
-
<xsl:call-template name="getLevel"/>
|
|
2127
|
-
</xsl:variable>
|
|
2128
|
-
<xsl:variable name="doctype" select="ancestor::mn:metanorma/mn:bibdata/mn:ext/mn:doctype[not(@language) or @language = '']"/>
|
|
2129
|
-
<fo:block font-weight="bold" margin-top="18pt" margin-bottom="18pt" keep-with-next="always" role="H{$level}">
|
|
2130
|
-
<xsl:if test="$doctype = 'service-publication'">
|
|
2131
|
-
<xsl:attribute name="margin-top">24pt</xsl:attribute>
|
|
2132
|
-
<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
|
|
2133
|
-
<xsl:attribute name="font-size">12pt</xsl:attribute>
|
|
2134
|
-
</xsl:if>
|
|
2135
|
-
<xsl:apply-templates/>
|
|
2136
|
-
<xsl:apply-templates select="following-sibling::*[1][self::mn:variant-title][@type = 'sub']" mode="subtitle"/>
|
|
2137
|
-
</fo:block>
|
|
2138
|
-
<!-- <xsl:if test="$doctype = 'service-publication'">
|
|
2139
|
-
<fo:block keep-with-next="always"> </fo:block>
|
|
2140
|
-
</xsl:if> -->
|
|
2141
|
-
</xsl:template>
|
|
2142
2119
|
<!-- ============================= -->
|
|
2143
2120
|
<!-- ============================= -->
|
|
2144
2121
|
|
|
@@ -2209,42 +2186,11 @@
|
|
|
2209
2186
|
<!-- ====== -->
|
|
2210
2187
|
<!-- title -->
|
|
2211
2188
|
<!-- ====== -->
|
|
2212
|
-
<xsl:template match="mn:annex/mn:fmt-title">
|
|
2213
|
-
<xsl:variable name="doctype" select="ancestor::mn:metanorma/mn:bibdata/mn:ext/mn:doctype[not(@language) or @language = '']"/>
|
|
2214
|
-
<fo:block xsl:use-attribute-sets="annex-title-style">
|
|
2215
|
-
<xsl:call-template name="refine_annex-title-style"/>
|
|
2216
|
-
<fo:block>
|
|
2217
|
-
<xsl:apply-templates/>
|
|
2218
|
-
<xsl:apply-templates select="following-sibling::*[1][self::mn:variant-title][@type = 'sub']" mode="subtitle"/>
|
|
2219
|
-
</fo:block>
|
|
2220
|
-
<xsl:if test="$doctype != 'resolution'">
|
|
2221
|
-
<fo:block font-size="12pt" font-weight="normal" margin-top="6pt">
|
|
2222
|
-
<!-- <xsl:choose>
|
|
2223
|
-
<xsl:when test="parent::*[@obligation = 'informative']">
|
|
2224
|
-
<xsl:text>(This appendix does not form an integral part of this Recommendation.)</xsl:text>
|
|
2225
|
-
</xsl:when>
|
|
2226
|
-
<xsl:otherwise>
|
|
2227
|
-
<xsl:text>(This annex forms an integral part of this Recommendation.)</xsl:text>
|
|
2228
|
-
</xsl:otherwise>
|
|
2229
|
-
</xsl:choose> -->
|
|
2230
|
-
<!-- Added for https://github.com/metanorma/isodoc/issues/614 -->
|
|
2231
|
-
<xsl:apply-templates select="following-sibling::mn:p[not(preceding-sibling::mn:clause)][starts-with(normalize-space(), '(')]/node()"/>
|
|
2232
|
-
</fo:block>
|
|
2233
|
-
</xsl:if>
|
|
2234
|
-
</fo:block>
|
|
2235
|
-
</xsl:template>
|
|
2236
2189
|
|
|
2237
2190
|
<!-- Added for https://github.com/metanorma/isodoc/issues/614 -->
|
|
2238
2191
|
<!-- renders in the annex/title template -->
|
|
2239
2192
|
<xsl:template match="mn:annex/mn:p[preceding-sibling::*[1][self::mn:fmt-title or self::mn:variant-title]][starts-with(normalize-space(), '(')]" priority="3"/>
|
|
2240
2193
|
|
|
2241
|
-
<!-- Bibliography -->
|
|
2242
|
-
<xsl:template match="mn:references[not(@normative='true')]/mn:fmt-title">
|
|
2243
|
-
<fo:block xsl:use-attribute-sets="references-non-normative-title-style">
|
|
2244
|
-
<xsl:apply-templates/>
|
|
2245
|
-
</fo:block>
|
|
2246
|
-
</xsl:template>
|
|
2247
|
-
|
|
2248
2194
|
<xsl:template match="mn:fmt-title" name="title">
|
|
2249
2195
|
|
|
2250
2196
|
<xsl:variable name="element-name">
|
|
@@ -2263,6 +2209,24 @@
|
|
|
2263
2209
|
|
|
2264
2210
|
<xsl:apply-templates/>
|
|
2265
2211
|
<xsl:apply-templates select="following-sibling::*[1][self::mn:variant-title][@type = 'sub']" mode="subtitle"/>
|
|
2212
|
+
|
|
2213
|
+
<xsl:if test="parent::mn:annex"><!-- Annex title -->
|
|
2214
|
+
<xsl:variable name="doctype" select="ancestor::mn:metanorma/mn:bibdata/mn:ext/mn:doctype[not(@language) or @language = '']"/>
|
|
2215
|
+
<xsl:if test="$doctype != 'resolution'">
|
|
2216
|
+
<fo:block font-size="12pt" font-weight="normal" margin-top="6pt">
|
|
2217
|
+
<!-- <xsl:choose>
|
|
2218
|
+
<xsl:when test="parent::*[@obligation = 'informative']">
|
|
2219
|
+
<xsl:text>(This appendix does not form an integral part of this Recommendation.)</xsl:text>
|
|
2220
|
+
</xsl:when>
|
|
2221
|
+
<xsl:otherwise>
|
|
2222
|
+
<xsl:text>(This annex forms an integral part of this Recommendation.)</xsl:text>
|
|
2223
|
+
</xsl:otherwise>
|
|
2224
|
+
</xsl:choose> -->
|
|
2225
|
+
<!-- Added for https://github.com/metanorma/isodoc/issues/614 -->
|
|
2226
|
+
<xsl:apply-templates select="following-sibling::mn:p[not(preceding-sibling::mn:clause)][starts-with(normalize-space(), '(')]/node()"/>
|
|
2227
|
+
</fo:block>
|
|
2228
|
+
</xsl:if>
|
|
2229
|
+
</xsl:if>
|
|
2266
2230
|
</xsl:element>
|
|
2267
2231
|
|
|
2268
2232
|
<xsl:if test="$element-name = 'fo:inline' and not(following-sibling::mn:p)">
|
|
@@ -13066,15 +13030,16 @@
|
|
|
13066
13030
|
<!-- END Admonition -->
|
|
13067
13031
|
<!-- ================ -->
|
|
13068
13032
|
|
|
13069
|
-
<xsl:attribute-set name="
|
|
13033
|
+
<xsl:attribute-set name="bibliography-title-style">
|
|
13070
13034
|
<xsl:attribute name="font-size">14pt</xsl:attribute>
|
|
13071
13035
|
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
|
13072
13036
|
<xsl:attribute name="text-align">center</xsl:attribute>
|
|
13037
|
+
<xsl:attribute name="space-before">0pt</xsl:attribute>
|
|
13073
13038
|
<xsl:attribute name="margin-bottom">18pt</xsl:attribute>
|
|
13074
13039
|
<xsl:attribute name="role">H1</xsl:attribute>
|
|
13075
13040
|
</xsl:attribute-set>
|
|
13076
13041
|
|
|
13077
|
-
<xsl:template name="
|
|
13042
|
+
<xsl:template name="refine_bibliography-title-style">
|
|
13078
13043
|
<xsl:variable name="doctype" select="ancestor::mn:metanorma/mn:bibdata/mn:ext/mn:doctype[not(@language) or @language = '']"/>
|
|
13079
13044
|
<xsl:if test="$doctype = 'implementers-guide'">
|
|
13080
13045
|
<xsl:attribute name="text-align">left</xsl:attribute>
|
|
@@ -15196,9 +15161,11 @@
|
|
|
15196
15161
|
<!-- ===================================== -->
|
|
15197
15162
|
|
|
15198
15163
|
<xsl:attribute-set name="annex-title-style">
|
|
15164
|
+
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
|
15199
15165
|
<xsl:attribute name="font-size">14pt</xsl:attribute>
|
|
15200
15166
|
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
|
15201
15167
|
<xsl:attribute name="text-align">center</xsl:attribute>
|
|
15168
|
+
<xsl:attribute name="space-before">0pt</xsl:attribute>
|
|
15202
15169
|
<xsl:attribute name="margin-bottom">18pt</xsl:attribute>
|
|
15203
15170
|
<xsl:attribute name="role">H1</xsl:attribute>
|
|
15204
15171
|
</xsl:attribute-set> <!-- annex-title-style -->
|
|
@@ -15303,6 +15270,33 @@
|
|
|
15303
15270
|
<xsl:attribute name="text-align">start</xsl:attribute>
|
|
15304
15271
|
</xsl:if>
|
|
15305
15272
|
|
|
15273
|
+
<xsl:if test="ancestor::mn:preface">
|
|
15274
|
+
<xsl:attribute name="font-size">inherit</xsl:attribute>
|
|
15275
|
+
<xsl:attribute name="margin-top">18pt</xsl:attribute>
|
|
15276
|
+
<xsl:attribute name="margin-bottom">18pt</xsl:attribute>
|
|
15277
|
+
<xsl:attribute name="space-before">0pt</xsl:attribute>
|
|
15278
|
+
<xsl:attribute name="space-after">0pt</xsl:attribute>
|
|
15279
|
+
<xsl:if test="$doctype = 'service-publication'">
|
|
15280
|
+
<xsl:attribute name="margin-top">24pt</xsl:attribute>
|
|
15281
|
+
<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
|
|
15282
|
+
<xsl:attribute name="font-size">12pt</xsl:attribute>
|
|
15283
|
+
</xsl:if>
|
|
15284
|
+
</xsl:if>
|
|
15285
|
+
|
|
15286
|
+
<xsl:if test="parent::mn:annex"><!-- Annex title -->
|
|
15287
|
+
<xsl:variable name="annex_title_styles">
|
|
15288
|
+
<styles xsl:use-attribute-sets="annex-title-style"><xsl:call-template name="refine_annex-title-style"/></styles>
|
|
15289
|
+
</xsl:variable>
|
|
15290
|
+
<xsl:copy-of select="xalan:nodeset($annex_title_styles)/styles/@*"/>
|
|
15291
|
+
</xsl:if>
|
|
15292
|
+
|
|
15293
|
+
<xsl:if test="parent::mn:references[not(@normative='true')]"><!-- Bibliography section title -->
|
|
15294
|
+
<xsl:variable name="bibliography_title_styles">
|
|
15295
|
+
<styles xsl:use-attribute-sets="bibliography-title-style"><xsl:call-template name="refine_bibliography-title-style"/></styles>
|
|
15296
|
+
</xsl:variable>
|
|
15297
|
+
<xsl:copy-of select="xalan:nodeset($bibliography_title_styles)/styles/@*"/>
|
|
15298
|
+
</xsl:if>
|
|
15299
|
+
|
|
15306
15300
|
<xsl:if test="$element-name = 'fo:inline'">
|
|
15307
15301
|
<xsl:attribute name="padding-right">
|
|
15308
15302
|
<xsl:choose>
|