metanorma-iso 3.0.6 → 3.0.8
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/iso/base_convert.rb +2 -2
- data/lib/isodoc/iso/html/html_iso_titlepage.html +8 -2
- data/lib/isodoc/iso/html/isodoc.css +1 -0
- data/lib/isodoc/iso/html/isodoc.scss +1 -0
- data/lib/isodoc/iso/html/style-human.css +0 -2
- data/lib/isodoc/iso/html/style-iso.css +0 -2
- data/lib/isodoc/iso/html/word_iso_titlepage-dis.html +2 -2
- data/lib/isodoc/iso/html/word_iso_titlepage-prf.html +2 -2
- data/lib/isodoc/iso/html/word_iso_titlepage.html +8 -2
- data/lib/isodoc/iso/iso.amendment.xsl +121 -63
- data/lib/isodoc/iso/iso.international-standard.xsl +121 -63
- data/lib/isodoc/iso/metadata.rb +16 -19
- data/lib/isodoc/iso/presentation_section.rb +5 -2
- data/lib/isodoc/iso/presentation_terms.rb +2 -2
- data/lib/isodoc/iso/word_convert.rb +1 -1
- data/lib/metanorma/iso/base.rb +2 -3
- data/lib/metanorma/iso/basicdoc.rng +9 -5
- data/lib/metanorma/iso/cleanup.rb +1 -1
- data/lib/metanorma/iso/front.rb +34 -13
- data/lib/metanorma/iso/isodoc.rng +145 -5
- data/lib/metanorma/iso/validate.rb +38 -12
- data/lib/metanorma/iso/validate_section.rb +8 -12
- data/lib/metanorma/iso/validate_style.rb +3 -3
- data/lib/metanorma/iso/validate_title.rb +1 -1
- data/lib/metanorma/iso/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: 996d73648eec987f61a80725d6af5bc2320c6b896c976dd9730c4c6fb992193a
|
|
4
|
+
data.tar.gz: 8f9b233c72f5fac3d7b97b7bf9276036d2c63f83201f586479dbac90074fe403
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: a95a4a1e04e16920f58c899dcaedf8acd7f99a1d39797017e4daeea29dad3c38e97866fc7dd46d79cb404f630404429492bd4d5b72d1a8e7ce787dcb1e6856ae
|
|
7
|
+
data.tar.gz: 26553c23aa8ec45a4b9cc15f390b76e00d7b9e4b8a085cada4f2020757396a9535dab428c634348ae6dfb41d0f1bca0b3b1fd581dd5a0d77d76b0089063120ed
|
|
@@ -117,7 +117,7 @@ module IsoDoc
|
|
|
117
117
|
num = num + 1
|
|
118
118
|
clause_name(clause, clause&.at(ns("./fmt-title")), div, nil)
|
|
119
119
|
clause.elements.each do |e|
|
|
120
|
-
parse(e, div) unless %w{fmt-title source}.include? e.name
|
|
120
|
+
parse(e, div) unless %w{fmt-title fmt-source}.include? e.name
|
|
121
121
|
end
|
|
122
122
|
end
|
|
123
123
|
end
|
|
@@ -139,7 +139,7 @@ module IsoDoc
|
|
|
139
139
|
|
|
140
140
|
def table_parse_tail(node, out)
|
|
141
141
|
(dl = node.at(ns("./dl"))) && parse(dl, out)
|
|
142
|
-
node.xpath(ns("./source")).each { |n| parse(n, out) }
|
|
142
|
+
node.xpath(ns("./fmt-source")).each { |n| parse(n, out) }
|
|
143
143
|
node.xpath(ns("./note[not(@type = 'units')]")).each do |n|
|
|
144
144
|
parse(n, out)
|
|
145
145
|
end
|
|
@@ -30,12 +30,15 @@
|
|
|
30
30
|
name="CVP_Secretariat_Loca">{{ labels["secretariat"] }}</a>: {{ secretariat }}</p>
|
|
31
31
|
{% endif %}
|
|
32
32
|
|
|
33
|
-
<div class="doctitle-en"><div><span class="title">{{ doctitleintro }}{% if doctitleintro and doctitlemain %} — {% endif %}</span><span class="subtitle">{{ doctitlemain }}{% if doctitlemain and doctitlepart %} —{% endif %}</span>
|
|
33
|
+
<div class="doctitle-en"><div><span class="title">{{ doctitleintro }}{% if doctitleintro and doctitlemain %} — {% endif %}</span><span class="subtitle">{{ doctitlemain }}{% if doctitlemain and (doctitlepart or doctitlecomplementary) %} —{% endif %}</span>
|
|
34
34
|
{% if doctitlepart %}
|
|
35
35
|
</div><div class="doctitle-part">
|
|
36
36
|
{% if doctitlepartlabel %}<span class="partlabel">{{ doctitlepartlabel }}: </span>{% endif %}
|
|
37
37
|
<span class="part">{{ doctitlepart }}</span>
|
|
38
38
|
{% endif %}
|
|
39
|
+
{% if doctitlecomplementary %}
|
|
40
|
+
<span class="part">{{ doctitlecomplementary }}</span>
|
|
41
|
+
{% endif %}
|
|
39
42
|
</div>
|
|
40
43
|
{% if doctitleamdlabel %}
|
|
41
44
|
<div class="doctitle-part">{{ doctitleamdlabel }}{% if doctitleamd %}: {{ doctitleamd }}{% endif %}</div>
|
|
@@ -48,12 +51,15 @@
|
|
|
48
51
|
{% endif %}
|
|
49
52
|
</div>
|
|
50
53
|
|
|
51
|
-
<div class="doctitle-fr"><div><span class="title">{{ docsubtitleintro }}{% if docsubtitleintro and docsubtitlemain %} — {% endif %}</span><span class="subtitle">{{ docsubtitlemain }}{% if docsubtitlemain and docsubtitlepart %} —{% endif %}</span>
|
|
54
|
+
<div class="doctitle-fr"><div><span class="title">{{ docsubtitleintro }}{% if docsubtitleintro and docsubtitlemain %} — {% endif %}</span><span class="subtitle">{{ docsubtitlemain }}{% if docsubtitlemain and (docsubtitlepart or docsubtitlecomplementary) %} —{% endif %}</span>
|
|
52
55
|
{% if docsubtitlepart %}
|
|
53
56
|
</div><div>
|
|
54
57
|
{% if docsubtitlepartlabel %}<span class="partlabel">{{ docsubtitlepartlabel }}: </span>{% endif %}
|
|
55
58
|
<span class="part">{{ docsubtitlepart }}</span>
|
|
56
59
|
{% endif %}
|
|
60
|
+
{% if docsubtitlecomplementary %}
|
|
61
|
+
<span class="part">{{ docsubtitlecomplementary }}</span>
|
|
62
|
+
{% endif %}
|
|
57
63
|
</div>
|
|
58
64
|
{% if docsubtitleamdlabel %}
|
|
59
65
|
<div>{{ docsubtitleamdlabel }}{% if docsubtitleamd %}: {{ docsubtitleamd }}{% endif %}</div>
|
|
@@ -44,7 +44,7 @@
|
|
|
44
44
|
{% endif %}
|
|
45
45
|
|
|
46
46
|
<p class="zzCover">
|
|
47
|
-
<span lang="EN-GB"><b>{{ doctitleintro }}{% if doctitleintro and doctitlemain %} — {% endif %}{{ doctitlemain }}{% if doctitlemain and doctitlepart %} — {% endif %}{% if doctitlepart %}{% if doctitlepartlabel %}{{ doctitlepartlabel }}: {% endif %}{{ doctitlepart }}{% endif %}</b></span></p>
|
|
47
|
+
<span lang="EN-GB"><b>{{ doctitleintro }}{% if doctitleintro and doctitlemain %} — {% endif %}{{ doctitlemain }}{% if doctitlemain and (doctitlepart or doctitlecomplementary) %} — {% endif %}{% if doctitlecomplementary %}{{ doctitlecomplementary }}{% endif %}{% if doctitlepart %}{% if doctitlepartlabel %}{{ doctitlepartlabel }}: {% endif %}{{ doctitlepart }}{% endif %}</b></span></p>
|
|
48
48
|
|
|
49
49
|
{% if doctitleamdlabel %}
|
|
50
50
|
<p class="zzCover"><b>{{ doctitleamdlabel }}{% if doctitleamd %}: {{ doctitleamd }}{% endif %}</b></p>
|
|
@@ -56,7 +56,7 @@
|
|
|
56
56
|
<p class="zzCover"><b>{{ doctitlecorrlabel }}</b></p>
|
|
57
57
|
{% endif %}
|
|
58
58
|
|
|
59
|
-
<p class="zzCover" style='font-weight:normal;'><i>{{ docsubtitleintro }}{% if docsubtitleintro and docsubtitlemain %} — {% endif %}{{ docsubtitlemain }}{% if docsubtitlemain and docsubtitlepart %} — {% endif %}{% if docsubtitlepart %}{% if docsubtitlepartlabel %}{{ docsubtitlepartlabel }}: {% endif %}{{ docsubtitlepart }}{% endif %}</i></p>
|
|
59
|
+
<p class="zzCover" style='font-weight:normal;'><i>{{ docsubtitleintro }}{% if docsubtitleintro and docsubtitlemain %} — {% endif %}{{ docsubtitlemain }}{% if docsubtitlemain and (docsubtitlepart or docsubtitlecomplementary) %} — {% endif %}{% if docsubtitlecomplementary %}{{ docsubtitlecomplementary }}{% endif %}{% if docsubtitlepart %}{% if docsubtitlepartlabel %}{{ docsubtitlepartlabel }}: {% endif %}{{ docsubtitlepart }}{% endif %}</i></p>
|
|
60
60
|
{% if docsubtitleamdlabel %}
|
|
61
61
|
<p class="zzCover" style='font-weight:normal;'><i>{{ docsubtitleamdlabel }}{% if docsubtitleamd %}: {{ docsubtitleamd }}{% endif %}</i></p>
|
|
62
62
|
{% endif %}
|
|
@@ -38,7 +38,7 @@
|
|
|
38
38
|
{% endif %}
|
|
39
39
|
|
|
40
40
|
<p class="zzCover">
|
|
41
|
-
<span lang="EN-GB"><b>{{ doctitleintro }}{% if doctitleintro and doctitlemain %} — {% endif %}{{ doctitlemain }}{% if doctitlemain and doctitlepart %} — {% endif %}{% if doctitlepart %}{% if doctitlepartlabel %}{{ doctitlepartlabel }}: {% endif %}{{ doctitlepart }}</span>{% endif %}</b>
|
|
41
|
+
<span lang="EN-GB"><b>{{ doctitleintro }}{% if doctitleintro and doctitlemain %} — {% endif %}{{ doctitlemain }}{% if doctitlemain and (doctitlepart or doctitlecomplementary) %} — {% endif %}{% if doctitlecomplementary %}{{ doctitlecomplementary }}{% endif %}{% if doctitlepart %}{% if doctitlepartlabel %}{{ doctitlepartlabel }}: {% endif %}{{ doctitlepart }}</span>{% endif %}</b>
|
|
42
42
|
</p>
|
|
43
43
|
{% if doctitleamdlabel %}
|
|
44
44
|
<p class="zzCover"><b>{{ doctitleamdlabel }}{% if doctitleamd %}: {{ doctitleamd }}{% endif %}</b></p>
|
|
@@ -50,7 +50,7 @@
|
|
|
50
50
|
<p class="zzCover"><b>{{ doctitlecorrlabel }}</b></p>
|
|
51
51
|
{% endif %}
|
|
52
52
|
|
|
53
|
-
<p class="zzCover" style='font-weight:normal;'><i>{{ docsubtitleintro }}{% if docsubtitleintro and docsubtitlemain %} — {% endif %}{{ docsubtitlemain }}{% if docsubtitlemain and docsubtitlepart %} — {% endif %}{% if docsubtitlepart %}{% if docsubtitlepartlabel %}{{ docsubtitlepartlabel }}: {% endif %}{{ docsubtitlepart }}{% endif %}</i>
|
|
53
|
+
<p class="zzCover" style='font-weight:normal;'><i>{{ docsubtitleintro }}{% if docsubtitleintro and docsubtitlemain %} — {% endif %}{{ docsubtitlemain }}{% if docsubtitlemain and (docsubtitlepart or docsubtitlecomplementary) %} — {% endif %}{% if docsubtitlecomplementary %}{{ docsubtitlecomplementary }}{% endif %}{% if docsubtitlepart %}{% if docsubtitlepartlabel %}{{ docsubtitlepartlabel }}: {% endif %}{{ docsubtitlepart }}{% endif %}</i>
|
|
54
54
|
</p>
|
|
55
55
|
{% if docsubtitleamdlabel %}
|
|
56
56
|
<p class="zzCover" style='font-weight:normal;'><i>{{ docsubtitleamdlabel }}{% if docsubtitleamd %}: {{ docsubtitleamd }}{% endif %}</i></p>
|
|
@@ -46,7 +46,10 @@ style='mso-no-proof:yes'>{{ editorialgroup }}</span></p>
|
|
|
46
46
|
{% endif %}
|
|
47
47
|
|
|
48
48
|
<p class="MsoNormal" align="left" style='text-align:left;line-height:18.0pt;margin-top:100.0pt;margin-bottom:0.0pt;font-size:16.0pt'>
|
|
49
|
-
<span class="title"><b>{{ doctitleintro }}{% if doctitleintro and doctitlemain %} — {% endif %}</b></span><b><span class="subtitle">{{ doctitlemain }}{% if doctitlemain and doctitlepart %} —{% endif %}</b></span>
|
|
49
|
+
<span class="title"><b>{{ doctitleintro }}{% if doctitleintro and doctitlemain %} — {% endif %}</b></span><b><span class="subtitle">{{ doctitlemain }}{% if doctitlemain and (doctitlepart or doctitlecomplementary) %} —{% endif %}</b></span>
|
|
50
|
+
{% if doctitlecomplementary %}
|
|
51
|
+
<span class="part"><b>{{ doctitlecomplementary }}</b></span>
|
|
52
|
+
{% endif %}
|
|
50
53
|
{% if doctitlepart %}
|
|
51
54
|
{% if doctitlepartlabel %}<span class="partlabel">{{ doctitlepartlabel }}: </span><br/>{% endif %}
|
|
52
55
|
<span class="part"><b>{{ doctitlepart }}</b></span>
|
|
@@ -66,10 +69,13 @@ style='mso-no-proof:yes'>{{ editorialgroup }}</span></p>
|
|
|
66
69
|
{% else %}
|
|
67
70
|
<br/>
|
|
68
71
|
<p class="MsoNormal" align="left" style='text-align:left;line-height:18.0pt;margin-bottom:0.0pt;font-size:16.0pt'>
|
|
69
|
-
<span class="title">{{ docsubtitleintro }}{% if docsubtitleintro and docsubtitlemain %} — {% endif %}</span><span class="subtitle">{{ docsubtitlemain }}{% if docsubtitlemain and docsubtitlepart %} —{% endif %}</span>
|
|
72
|
+
<span class="title">{{ docsubtitleintro }}{% if docsubtitleintro and docsubtitlemain %} — {% endif %}</span><span class="subtitle">{{ docsubtitlemain }}{% if docsubtitlemain and (docsubtitlepart or docsubtitlecomplementary) %} —{% endif %}</span>
|
|
70
73
|
{% if docsubtitlepart %}
|
|
71
74
|
{% if docsubtitlepartlabel %}<span class="partlabel">{{ docsubtitlepartlabel }}: </span><br/>{% endif %}
|
|
72
75
|
<span class="part">{{ docsubtitlepart }}</span>
|
|
76
|
+
{% endif %}
|
|
77
|
+
{% if docsubtitlecomplementary %}
|
|
78
|
+
<span class="part">{{ docsubtitlecomplementary }}</span>
|
|
73
79
|
{% endif %}
|
|
74
80
|
</p>
|
|
75
81
|
{% if docsubtitleamdlabel %}
|
|
@@ -153,6 +153,8 @@
|
|
|
153
153
|
|
|
154
154
|
<xsl:variable name="doctype_uppercased" select="java:toUpperCase(java:java.lang.String.new($doctype_localized))"/>
|
|
155
155
|
|
|
156
|
+
<xsl:variable name="doctype_customized" select="normalize-space(/iso:metanorma/iso:metanorma-extension/iso:presentation-metadata/iso:doctype-customized)"/>
|
|
157
|
+
|
|
156
158
|
<xsl:variable name="stage" select="number(/iso:metanorma/iso:bibdata/iso:status/iso:stage)"/>
|
|
157
159
|
<xsl:variable name="substage" select="number(/iso:metanorma/iso:bibdata/iso:status/iso:substage)"/>
|
|
158
160
|
<xsl:variable name="stagename" select="normalize-space(/iso:metanorma/iso:bibdata/iso:ext/iso:stagename)"/>
|
|
@@ -413,6 +415,13 @@
|
|
|
413
415
|
<xsl:variable name="layoutVersion" select="normalize-space($layoutVersion_)"/>
|
|
414
416
|
<xsl:variable name="cover_page_border">0.5pt solid black</xsl:variable>
|
|
415
417
|
<xsl:variable name="color_red">rgb(237, 28, 36)</xsl:variable>
|
|
418
|
+
<xsl:variable name="color_secondary_value" select="normalize-space(/iso:metanorma/iso:metanorma-extension/iso:presentation-metadata/iso:color-secondary)"/>
|
|
419
|
+
<xsl:variable name="color_secondary">
|
|
420
|
+
<xsl:choose>
|
|
421
|
+
<xsl:when test="$color_secondary_value != ''"><xsl:value-of select="$color_secondary_value"/></xsl:when>
|
|
422
|
+
<xsl:otherwise><xsl:value-of select="$color_red"/></xsl:otherwise>
|
|
423
|
+
</xsl:choose>
|
|
424
|
+
</xsl:variable>
|
|
416
425
|
|
|
417
426
|
<xsl:variable name="XML" select="/"/>
|
|
418
427
|
|
|
@@ -1585,6 +1594,7 @@
|
|
|
1585
1594
|
|
|
1586
1595
|
<xsl:apply-templates select="/iso:metanorma/iso:bibdata/iso:title[@language = $lang and @type = 'title-intro']"/>
|
|
1587
1596
|
<xsl:apply-templates select="/iso:metanorma/iso:bibdata/iso:title[@language = $lang and @type = 'title-main']"/>
|
|
1597
|
+
<xsl:apply-templates select="/iso:metanorma/iso:bibdata/iso:title[@language = $lang and @type = 'title-complementary']"/>
|
|
1588
1598
|
<fo:block font-size="11pt" text-transform="uppercase" margin-top="2mm">
|
|
1589
1599
|
<xsl:apply-templates select="/iso:metanorma/iso:bibdata/iso:title[@language = $lang and @type = 'title-part']/node()"/>
|
|
1590
1600
|
</fo:block>
|
|
@@ -1744,7 +1754,7 @@
|
|
|
1744
1754
|
|
|
1745
1755
|
<fo:block margin-top="6mm" font-weight="bold">
|
|
1746
1756
|
<xsl:call-template name="printEdition"/>
|
|
1747
|
-
<xsl:
|
|
1757
|
+
<xsl:value-of select="$nonbreak_space_em_dash_space"/>
|
|
1748
1758
|
<xsl:value-of select="/iso:metanorma/iso:bibdata/iso:version/iso:revision-date"/>
|
|
1749
1759
|
</fo:block>
|
|
1750
1760
|
|
|
@@ -1874,6 +1884,7 @@
|
|
|
1874
1884
|
</xsl:variable>
|
|
1875
1885
|
|
|
1876
1886
|
<xsl:choose>
|
|
1887
|
+
<xsl:when test="$doctype_customized != ''"><xsl:value-of select="$doctype_customized"/></xsl:when>
|
|
1877
1888
|
<xsl:when test="$stage-abbreviation = 'DIS'"> <!-- or $stage-abbreviation = 'DAMD' or $stage-abbreviation = 'DAM' -->
|
|
1878
1889
|
<xsl:choose>
|
|
1879
1890
|
<xsl:when test="normalize-space($stagename_localized_coverpage) != ''">
|
|
@@ -1930,7 +1941,7 @@
|
|
|
1930
1941
|
<fo:table-cell number-columns-spanned="2" display-align="after" padding-left="6mm">
|
|
1931
1942
|
<fo:block font-size="19pt" font-weight="bold" line-height="1">
|
|
1932
1943
|
<xsl:if test="$stage >=60 and $substage != 0">
|
|
1933
|
-
<xsl:attribute name="color"><xsl:value-of select="$
|
|
1944
|
+
<xsl:attribute name="color"><xsl:value-of select="$color_secondary"/></xsl:attribute>
|
|
1934
1945
|
</xsl:if>
|
|
1935
1946
|
<xsl:choose>
|
|
1936
1947
|
<xsl:when test="contains($docidentifierISO, ' ')">
|
|
@@ -3009,6 +3020,7 @@
|
|
|
3009
3020
|
<xsl:template name="insertTitlesLangMain">
|
|
3010
3021
|
<xsl:apply-templates select="/iso:metanorma/iso:bibdata/iso:title[@language = $lang and @type = 'title-intro']"/>
|
|
3011
3022
|
<xsl:apply-templates select="/iso:metanorma/iso:bibdata/iso:title[@language = $lang and @type = 'title-main']"/>
|
|
3023
|
+
<xsl:apply-templates select="/iso:metanorma/iso:bibdata/iso:title[@language = $lang and @type = 'title-complementary']"/>
|
|
3012
3024
|
<xsl:apply-templates select="/iso:metanorma/iso:bibdata/iso:title[@language = $lang and @type = 'title-part']">
|
|
3013
3025
|
<xsl:with-param name="isMainLang">true</xsl:with-param>
|
|
3014
3026
|
</xsl:apply-templates>
|
|
@@ -3021,6 +3033,7 @@
|
|
|
3021
3033
|
<xsl:param name="lang_other"/>
|
|
3022
3034
|
<xsl:apply-templates select="$XML/iso:metanorma/iso:bibdata/iso:title[@language = $lang_other and @type = 'title-intro']"/>
|
|
3023
3035
|
<xsl:apply-templates select="$XML/iso:metanorma/iso:bibdata/iso:title[@language = $lang_other and @type = 'title-main']"/>
|
|
3036
|
+
<xsl:apply-templates select="$XML/iso:metanorma/iso:bibdata/iso:title[@language = $lang_other and @type = 'title-complementary']"/>
|
|
3024
3037
|
<xsl:apply-templates select="$XML/iso:metanorma/iso:bibdata/iso:title[@language = $lang_other and @type = 'title-part']">
|
|
3025
3038
|
<xsl:with-param name="curr_lang" select="$lang_other"/>
|
|
3026
3039
|
</xsl:apply-templates>
|
|
@@ -3463,10 +3476,10 @@
|
|
|
3463
3476
|
<xsl:choose>
|
|
3464
3477
|
<xsl:when test="$layoutVersion = '1951'">
|
|
3465
3478
|
<fo:block text-transform="uppercase"><xsl:apply-templates/></fo:block>
|
|
3466
|
-
|
|
3479
|
+
</xsl:when>
|
|
3467
3480
|
<xsl:otherwise>
|
|
3468
3481
|
<xsl:apply-templates/>
|
|
3469
|
-
<xsl:
|
|
3482
|
+
<xsl:value-of select="$nonbreak_space_em_dash_space"/>
|
|
3470
3483
|
</xsl:otherwise>
|
|
3471
3484
|
</xsl:choose>
|
|
3472
3485
|
</xsl:template>
|
|
@@ -3494,64 +3507,78 @@
|
|
|
3494
3507
|
</xsl:choose>
|
|
3495
3508
|
</xsl:template>
|
|
3496
3509
|
|
|
3510
|
+
<xsl:template match="iso:bibdata/iso:title[@type = 'title-complementary']">
|
|
3511
|
+
<xsl:param name="body">false</xsl:param>
|
|
3512
|
+
<xsl:value-of select="$nonbreak_space_em_dash_space"/>
|
|
3513
|
+
<xsl:apply-templates/>
|
|
3514
|
+
</xsl:template>
|
|
3515
|
+
|
|
3497
3516
|
<xsl:template match="iso:bibdata/iso:title[@type = 'title-part']">
|
|
3498
3517
|
<xsl:param name="curr_lang" select="$lang"/>
|
|
3499
3518
|
<xsl:param name="isMainLang">false</xsl:param>
|
|
3500
|
-
<xsl:
|
|
3501
|
-
|
|
3502
|
-
|
|
3503
|
-
<xsl:when test="$layoutVersion = '1951'"/>
|
|
3504
|
-
<xsl:otherwise><xsl:text> — </xsl:text></xsl:otherwise>
|
|
3505
|
-
</xsl:choose>
|
|
3506
|
-
<xsl:variable name="part-word">
|
|
3519
|
+
<xsl:choose>
|
|
3520
|
+
<xsl:when test="$part != ''">
|
|
3521
|
+
<!-- <xsl:text> — </xsl:text> -->
|
|
3507
3522
|
<xsl:choose>
|
|
3508
|
-
<xsl:when test="$
|
|
3509
|
-
|
|
3510
|
-
</xsl:when>
|
|
3511
|
-
<xsl:otherwise>
|
|
3512
|
-
<xsl:value-of select="java:replaceAll(java:java.lang.String.new($titles/title-part[@lang=$curr_lang]),'#',$part)"/>
|
|
3513
|
-
</xsl:otherwise>
|
|
3523
|
+
<xsl:when test="$layoutVersion = '1951'"/>
|
|
3524
|
+
<xsl:otherwise><xsl:value-of select="$nonbreak_space_em_dash_space"/></xsl:otherwise>
|
|
3514
3525
|
</xsl:choose>
|
|
3515
|
-
|
|
3516
|
-
<xsl:choose>
|
|
3517
|
-
<xsl:when test="$isMainLang = 'true'">
|
|
3526
|
+
<xsl:variable name="part-word">
|
|
3518
3527
|
<xsl:choose>
|
|
3519
|
-
<xsl:when test="$
|
|
3520
|
-
<xsl:value-of select="$part
|
|
3521
|
-
<xsl:apply-templates/>
|
|
3528
|
+
<xsl:when test="$isMainLang = 'true'">
|
|
3529
|
+
<xsl:value-of select="concat($i18n_locality_part, ' ', $part, ':')"/>
|
|
3522
3530
|
</xsl:when>
|
|
3523
|
-
<xsl:
|
|
3524
|
-
<
|
|
3531
|
+
<xsl:otherwise>
|
|
3532
|
+
<xsl:value-of select="java:replaceAll(java:java.lang.String.new($titles/title-part[@lang=$curr_lang]),'#',$part)"/>
|
|
3533
|
+
</xsl:otherwise>
|
|
3534
|
+
</xsl:choose>
|
|
3535
|
+
</xsl:variable>
|
|
3536
|
+
<xsl:choose>
|
|
3537
|
+
<xsl:when test="$isMainLang = 'true'">
|
|
3538
|
+
<xsl:choose>
|
|
3539
|
+
<xsl:when test="$layoutVersion = '1951'">
|
|
3525
3540
|
<xsl:value-of select="$part-word"/>
|
|
3526
|
-
<xsl:text> </xsl:text>
|
|
3527
3541
|
<xsl:apply-templates/>
|
|
3528
|
-
</
|
|
3529
|
-
|
|
3530
|
-
|
|
3531
|
-
|
|
3542
|
+
</xsl:when>
|
|
3543
|
+
<xsl:when test="$layoutVersion = '1972' or $layoutVersion = '1979'">
|
|
3544
|
+
<fo:block font-weight="bold" role="SKIP">
|
|
3545
|
+
<xsl:value-of select="$part-word"/>
|
|
3546
|
+
<xsl:text> </xsl:text>
|
|
3547
|
+
<xsl:apply-templates/>
|
|
3548
|
+
</fo:block>
|
|
3549
|
+
</xsl:when>
|
|
3550
|
+
<xsl:when test="$layoutVersion = '1987'">
|
|
3551
|
+
<fo:block font-weight="bold" margin-top="12pt" role="SKIP">
|
|
3552
|
+
<xsl:value-of select="$part-word"/>
|
|
3553
|
+
</fo:block>
|
|
3554
|
+
</xsl:when>
|
|
3555
|
+
<xsl:otherwise>
|
|
3556
|
+
<fo:block font-weight="normal" margin-top="6pt" role="SKIP">
|
|
3532
3557
|
<xsl:value-of select="$part-word"/>
|
|
3533
3558
|
</fo:block>
|
|
3534
|
-
|
|
3535
|
-
|
|
3536
|
-
|
|
3537
|
-
|
|
3538
|
-
|
|
3539
|
-
|
|
3540
|
-
|
|
3541
|
-
|
|
3542
|
-
|
|
3543
|
-
|
|
3544
|
-
|
|
3545
|
-
<xsl:
|
|
3546
|
-
<xsl:
|
|
3547
|
-
|
|
3548
|
-
|
|
3549
|
-
|
|
3550
|
-
|
|
3551
|
-
|
|
3552
|
-
|
|
3553
|
-
|
|
3554
|
-
|
|
3559
|
+
</xsl:otherwise>
|
|
3560
|
+
</xsl:choose>
|
|
3561
|
+
</xsl:when>
|
|
3562
|
+
<xsl:otherwise>
|
|
3563
|
+
<!-- <xsl:value-of select="$linebreak"/> -->
|
|
3564
|
+
<xsl:choose>
|
|
3565
|
+
<xsl:when test="$layoutVersion = '1972' or $layoutVersion = '1979'"/>
|
|
3566
|
+
<xsl:otherwise>
|
|
3567
|
+
<fo:block font-size="1pt" margin-top="5pt" role="SKIP"> </fo:block>
|
|
3568
|
+
</xsl:otherwise>
|
|
3569
|
+
</xsl:choose>
|
|
3570
|
+
<xsl:value-of select="$part-word"/>
|
|
3571
|
+
<xsl:text> </xsl:text>
|
|
3572
|
+
</xsl:otherwise>
|
|
3573
|
+
</xsl:choose>
|
|
3574
|
+
</xsl:when>
|
|
3575
|
+
<xsl:otherwise> <!-- $part = '' -->
|
|
3576
|
+
<xsl:choose>
|
|
3577
|
+
<xsl:when test="$layoutVersion = '1951'"/>
|
|
3578
|
+
<xsl:otherwise><xsl:value-of select="$nonbreak_space_em_dash_space"/></xsl:otherwise>
|
|
3579
|
+
</xsl:choose>
|
|
3580
|
+
</xsl:otherwise>
|
|
3581
|
+
</xsl:choose>
|
|
3555
3582
|
<xsl:choose>
|
|
3556
3583
|
<xsl:when test="$layoutVersion = '1951'"><fo:inline font-weight="normal"><xsl:apply-templates/></fo:inline></xsl:when>
|
|
3557
3584
|
<xsl:when test="($layoutVersion = '1972' or $layoutVersion = '1979') and $isMainLang = 'true'"/>
|
|
@@ -3617,6 +3644,7 @@
|
|
|
3617
3644
|
<xsl:when test="$revision_date_num >= 19680101">
|
|
3618
3645
|
<fo:block font-weight="normal"><xsl:apply-templates select="/iso:metanorma/iso:bibdata/iso:title[@language = $lang and @type = 'title-intro']"/></fo:block>
|
|
3619
3646
|
<fo:block space-before="24pt"><xsl:apply-templates select="/iso:metanorma/iso:bibdata/iso:title[@language = $lang and @type = 'title-main']"/></fo:block>
|
|
3647
|
+
<fo:block space-before="24pt"><xsl:apply-templates select="/iso:metanorma/iso:bibdata/iso:title[@language = $lang and @type = 'title-complementary']"/></fo:block>
|
|
3620
3648
|
</xsl:when>
|
|
3621
3649
|
<xsl:otherwise>
|
|
3622
3650
|
|
|
@@ -3624,6 +3652,7 @@
|
|
|
3624
3652
|
<xsl:apply-templates select="/iso:metanorma/iso:bibdata/iso:title[@language = $lang and @type = 'title-main']">
|
|
3625
3653
|
<xsl:with-param name="body">true</xsl:with-param>
|
|
3626
3654
|
</xsl:apply-templates>
|
|
3655
|
+
<xsl:apply-templates select="/iso:metanorma/iso:bibdata/iso:title[@language = $lang and @type = 'title-complementary']"/>
|
|
3627
3656
|
<fo:block font-size="11pt" text-transform="uppercase" margin-top="2mm">
|
|
3628
3657
|
<xsl:apply-templates select="/iso:metanorma/iso:bibdata/iso:title[@language = $lang and @type = 'title-part']/node()"/>
|
|
3629
3658
|
</fo:block>
|
|
@@ -3915,9 +3944,9 @@
|
|
|
3915
3944
|
<fo:block>
|
|
3916
3945
|
<xsl:if test="following-sibling::iso:p">
|
|
3917
3946
|
<xsl:attribute name="margin-bottom">3pt</xsl:attribute>
|
|
3918
|
-
<xsl:attribute name="margin-left">0.5mm</xsl:attribute>
|
|
3919
|
-
<xsl:attribute name="margin-right">0.5mm</xsl:attribute>
|
|
3920
3947
|
</xsl:if>
|
|
3948
|
+
<xsl:attribute name="margin-left">0.5mm</xsl:attribute>
|
|
3949
|
+
<xsl:attribute name="margin-right">0.5mm</xsl:attribute>
|
|
3921
3950
|
<xsl:if test="contains(@id, 'address') or contains(normalize-space(), 'Tel:') or contains(normalize-space(), 'Phone:')">
|
|
3922
3951
|
<xsl:attribute name="margin-left">4.5mm</xsl:attribute>
|
|
3923
3952
|
</xsl:if>
|
|
@@ -4907,6 +4936,7 @@
|
|
|
4907
4936
|
<fo:table-cell>
|
|
4908
4937
|
<fo:block>
|
|
4909
4938
|
<xsl:choose>
|
|
4939
|
+
<xsl:when test="$doctype_customized != ''"><xsl:value-of select="$doctype_customized"/></xsl:when>
|
|
4910
4940
|
<xsl:when test="$layoutVersion = '2024'">
|
|
4911
4941
|
<xsl:choose>
|
|
4912
4942
|
<xsl:when test="$doctype = 'committee-document'"><xsl:value-of select="$doctype_localized"/></xsl:when>
|
|
@@ -5472,13 +5502,23 @@
|
|
|
5472
5502
|
<fo:block margin-top="18pt" margin-bottom="-1mm" line-height="1.1"><xsl:value-of select="$copyrightTextLastPage2024"/></fo:block>
|
|
5473
5503
|
</fo:block>
|
|
5474
5504
|
</fo:table-cell>
|
|
5475
|
-
<fo:table-cell number-columns-spanned="2"
|
|
5476
|
-
<
|
|
5477
|
-
<xsl:
|
|
5478
|
-
<
|
|
5479
|
-
|
|
5480
|
-
|
|
5481
|
-
|
|
5505
|
+
<fo:table-cell number-columns-spanned="2" display-align="after">
|
|
5506
|
+
<xsl:choose>
|
|
5507
|
+
<xsl:when test="/iso:metanorma/iso:boilerplate/iso:feedback-statement">
|
|
5508
|
+
<fo:block font-size="16pt" margin-bottom="1mm" margin-right="1.5mm">
|
|
5509
|
+
<xsl:apply-templates select="/iso:metanorma/iso:boilerplate/iso:feedback-statement"/>
|
|
5510
|
+
</fo:block>
|
|
5511
|
+
</xsl:when>
|
|
5512
|
+
<xsl:otherwise>
|
|
5513
|
+
<xsl:attribute name="text-align">right</xsl:attribute>
|
|
5514
|
+
<fo:block font-size="16pt" font-weight="bold" margin-bottom="1mm" margin-right="1.5mm">
|
|
5515
|
+
<xsl:if test="$stage >=60 and $substage != 0">
|
|
5516
|
+
<xsl:attribute name="color"><xsl:value-of select="$color_red"/></xsl:attribute>
|
|
5517
|
+
</xsl:if>
|
|
5518
|
+
<xsl:text>iso.org</xsl:text>
|
|
5519
|
+
</fo:block>
|
|
5520
|
+
</xsl:otherwise>
|
|
5521
|
+
</xsl:choose>
|
|
5482
5522
|
</fo:table-cell>
|
|
5483
5523
|
</fo:table-row>
|
|
5484
5524
|
</fo:table-body>
|
|
@@ -5992,6 +6032,7 @@
|
|
|
5992
6032
|
<xsl:variable name="hair_space"> </xsl:variable>
|
|
5993
6033
|
<xsl:variable name="en_dash">–</xsl:variable>
|
|
5994
6034
|
<xsl:variable name="em_dash">—</xsl:variable>
|
|
6035
|
+
<xsl:variable name="nonbreak_space_em_dash_space"> — </xsl:variable>
|
|
5995
6036
|
<xsl:variable name="cr"> </xsl:variable>
|
|
5996
6037
|
<xsl:variable name="lf">
|
|
5997
6038
|
</xsl:variable>
|
|
@@ -14502,11 +14543,11 @@
|
|
|
14502
14543
|
</xsl:template>
|
|
14503
14544
|
|
|
14504
14545
|
<!-- figure/fn -->
|
|
14505
|
-
<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'fn']" priority="2"/>
|
|
14546
|
+
<xsl:template match="*[local-name() = 'figure'][not(@class = 'pseudocode')]/*[local-name() = 'fn']" priority="2"/>
|
|
14506
14547
|
<!-- figure/note -->
|
|
14507
|
-
<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'note']" priority="2"/>
|
|
14548
|
+
<xsl:template match="*[local-name() = 'figure'][not(@class = 'pseudocode')]/*[local-name() = 'note']" priority="2"/>
|
|
14508
14549
|
<!-- figure/example -->
|
|
14509
|
-
<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'example']" priority="2"/>
|
|
14550
|
+
<xsl:template match="*[local-name() = 'figure'][not(@class = 'pseudocode')]/*[local-name() = 'example']" priority="2"/>
|
|
14510
14551
|
|
|
14511
14552
|
<!-- figure/note[@type = 'units'] -->
|
|
14512
14553
|
<!-- image/note[@type = 'units'] -->
|
|
@@ -18077,6 +18118,9 @@
|
|
|
18077
18118
|
<xsl:template match="*[local-name() = 'quote']/*[local-name() = 'author']" mode="update_xml_pres"/>
|
|
18078
18119
|
<xsl:template match="*[local-name() = 'amend']" mode="update_xml_step1"/>
|
|
18079
18120
|
<xsl:template match="*[local-name() = 'amend']" mode="update_xml_pres"/>
|
|
18121
|
+
<!-- https://github.com/metanorma/isodoc/issues/687 -->
|
|
18122
|
+
<xsl:template match="*[local-name() = 'source']" mode="update_xml_step1"/>
|
|
18123
|
+
<xsl:template match="*[local-name() = 'source']" mode="update_xml_pres"/>
|
|
18080
18124
|
|
|
18081
18125
|
<xsl:template match="*[local-name() = 'metanorma-extension']/*[local-name() = 'attachment']" mode="update_xml_step1">
|
|
18082
18126
|
<xsl:copy>
|
|
@@ -18394,6 +18438,20 @@
|
|
|
18394
18438
|
</xsl:element>
|
|
18395
18439
|
</xsl:template>
|
|
18396
18440
|
|
|
18441
|
+
<xsl:template match="*[local-name() = 'fmt-source']"/>
|
|
18442
|
+
<xsl:template match="*[local-name() = 'fmt-source']" mode="update_xml_step1">
|
|
18443
|
+
<xsl:element name="source" namespace="{$namespace_full}">
|
|
18444
|
+
<xsl:copy-of select="@*"/>
|
|
18445
|
+
<xsl:apply-templates mode="update_xml_step1"/>
|
|
18446
|
+
</xsl:element>
|
|
18447
|
+
</xsl:template>
|
|
18448
|
+
<xsl:template match="*[local-name() = 'fmt-source']" mode="update_xml_pres">
|
|
18449
|
+
<xsl:element name="source" namespace="{$namespace_full}">
|
|
18450
|
+
<xsl:copy-of select="@*"/>
|
|
18451
|
+
<xsl:apply-templates mode="update_xml_pres"/>
|
|
18452
|
+
</xsl:element>
|
|
18453
|
+
</xsl:template>
|
|
18454
|
+
|
|
18397
18455
|
<xsl:template match="*[local-name() = 'span'][ @class = 'fmt-caption-label' or @class = 'fmt-element-name' or @class = 'fmt-caption-delim' or @class = 'fmt-autonum-delim']" mode="update_xml_step1" priority="3">
|
|
18398
18456
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
18399
18457
|
</xsl:template>
|