metanorma-ogc 2.5.0 → 2.5.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/isodoc/ogc/html/htmlstyle.css +12 -0
- data/lib/isodoc/ogc/html/htmlstyle.scss +2 -0
- data/lib/isodoc/ogc/html/scripts.html +3 -2
- data/lib/isodoc/ogc/html_convert.rb +52 -5
- data/lib/isodoc/ogc/metadata.rb +4 -2
- data/lib/isodoc/ogc/ogc.abstract-specification-topic.xsl +156 -25
- data/lib/isodoc/ogc/ogc.best-practice.xsl +156 -25
- data/lib/isodoc/ogc/ogc.change-request-supporting-document.xsl +156 -25
- data/lib/isodoc/ogc/ogc.community-practice.xsl +156 -25
- data/lib/isodoc/ogc/ogc.community-standard.xsl +156 -25
- data/lib/isodoc/ogc/ogc.discussion-paper.xsl +156 -25
- data/lib/isodoc/ogc/ogc.draft-standard.xsl +156 -25
- data/lib/isodoc/ogc/ogc.engineering-report.xsl +156 -25
- data/lib/isodoc/ogc/ogc.other.xsl +156 -25
- data/lib/isodoc/ogc/ogc.policy.xsl +156 -25
- data/lib/isodoc/ogc/ogc.reference-model.xsl +156 -25
- data/lib/isodoc/ogc/ogc.release-notes.xsl +156 -25
- data/lib/isodoc/ogc/ogc.standard.xsl +156 -25
- data/lib/isodoc/ogc/ogc.test-suite.xsl +156 -25
- data/lib/isodoc/ogc/ogc.user-guide.xsl +156 -25
- data/lib/isodoc/ogc/ogc.white-paper.xsl +103 -16
- data/lib/metanorma/ogc/basicdoc.rng +3 -0
- data/lib/metanorma/ogc/boilerplate.adoc +29 -1
- data/lib/metanorma/ogc/front.rb +3 -4
- data/lib/metanorma/ogc/isodoc.rng +4 -1
- data/lib/metanorma/ogc/version.rb +1 -1
- data/metanorma-ogc.gemspec +1 -1
- metadata +4 -4
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: ed52d084ad8d9bcd783e6cc8c8e5564a1eeae09d007ab43177681331be41d366
|
|
4
|
+
data.tar.gz: 8619fdaf6d0d8b7de450ba16383dd1ed1d2ece1fd903f80034d138873067b5a4
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 22bc6e3c49034f83122b1407d35010fd8ba4a6aae483206c2c169568cde528d37fa8514afe387b7e1a83ae2124edd17ba18bee22fdbf390b8929fe5e881ad12f
|
|
7
|
+
data.tar.gz: 930ee5cc2220a4c492ac73a7355b7c5684aa9be9b33ccc8a0721ddabbcfa22073dc4cfdf0131460a8998ede9749c9bde90e13ef8648f6ff9a2e6840d111ae81f
|
|
@@ -337,6 +337,18 @@ table.rouge-line-table pre {
|
|
|
337
337
|
#retired {
|
|
338
338
|
border-bottom: solid 3px #7e0d13; }
|
|
339
339
|
|
|
340
|
+
#legacy-band {
|
|
341
|
+
background-color: #7e0d13; }
|
|
342
|
+
|
|
343
|
+
#legacy {
|
|
344
|
+
border-bottom: solid 3px #7e0d13; }
|
|
345
|
+
|
|
346
|
+
#rescinded-band {
|
|
347
|
+
background-color: #7e0d13; }
|
|
348
|
+
|
|
349
|
+
#rescinded {
|
|
350
|
+
border-bottom: solid 3px #7e0d13; }
|
|
351
|
+
|
|
340
352
|
.coverpage-maturity, .coverpage-stage {
|
|
341
353
|
font-family: {{headerfont}};
|
|
342
354
|
font-weight: 400;
|
|
@@ -5,18 +5,19 @@
|
|
|
5
5
|
});
|
|
6
6
|
</script>
|
|
7
7
|
|
|
8
|
-
<script>
|
|
8
|
+
<script>
|
|
9
9
|
//TOC toggle animation
|
|
10
10
|
$('#toggle').on('click', function(){
|
|
11
11
|
if( $('nav').is(':visible') ) {
|
|
12
12
|
$('nav').animate({ 'left': '-353px' }, 'slow', function(){
|
|
13
13
|
$('nav').hide();
|
|
14
14
|
});
|
|
15
|
-
$('
|
|
15
|
+
$('body').animate({ 'margin-left': '-333px' }, 'slow');
|
|
16
16
|
}
|
|
17
17
|
else {
|
|
18
18
|
$('nav').show();
|
|
19
19
|
$('nav').animate({ 'left': '0px' }, 'slow');
|
|
20
|
+
$('body').animate({ 'margin-left': '0' }, 'slow');
|
|
20
21
|
}
|
|
21
22
|
});
|
|
22
23
|
</script>
|
|
@@ -69,14 +69,61 @@ module IsoDoc
|
|
|
69
69
|
|
|
70
70
|
def html_head
|
|
71
71
|
ret = super
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
72
|
+
ret += html_head_kw
|
|
73
|
+
ret += html_head_abstract
|
|
74
|
+
ret += html_head_creator
|
|
75
|
+
ret += html_head_date
|
|
76
|
+
ret += html_head_title
|
|
77
|
+
ret += html_head_dc
|
|
77
78
|
ret
|
|
78
79
|
end
|
|
79
80
|
|
|
81
|
+
def html_head_abstract
|
|
82
|
+
k = @meta.get[:abstract] and k = @c.encode(k)&.gsub("'", "'")
|
|
83
|
+
(k.nil? || k.empty?) and return ""
|
|
84
|
+
"<meta name='description' content='#{k}'/>\n" \
|
|
85
|
+
"<meta name='DC.description' lang='#{@lang}' content='#{k}' />"
|
|
86
|
+
end
|
|
87
|
+
|
|
88
|
+
def html_head_kw
|
|
89
|
+
k = @meta.get[:keywords].join(", ") and
|
|
90
|
+
k = @c.encode(k).gsub("'", "'")
|
|
91
|
+
k.empty? and return ""
|
|
92
|
+
"<meta name='keywords' content='#{k}'/>" \
|
|
93
|
+
"<meta name='DC.subject' lang='#{@lang}' content='#{k}' />"
|
|
94
|
+
end
|
|
95
|
+
|
|
96
|
+
def html_head_dc
|
|
97
|
+
<<~HTML
|
|
98
|
+
<link rel="profile" href="http://dublincore.org/documents/2008/08/04/dc-html/" />
|
|
99
|
+
<link rel="schema.DC" href="http://purl.org/dc/elements/1.1/" />
|
|
100
|
+
<meta name="DC.language" content="#{@lang}" />
|
|
101
|
+
<meta name="DC.rights" lang="#{@lang}" content="CC-BY-4.0"/>
|
|
102
|
+
<link rel="schema.DCTERMS" href="http://purl.org/dc/terms/" />
|
|
103
|
+
<link rel="DCTERMS.license" href="https://www.ogc.org/license" />
|
|
104
|
+
HTML
|
|
105
|
+
end
|
|
106
|
+
|
|
107
|
+
def html_head_creator
|
|
108
|
+
k = @meta.get[:authors] and
|
|
109
|
+
k = @c.encode(k.join(", ")).gsub("'", "'")
|
|
110
|
+
(k.nil? || k.empty?) and return ""
|
|
111
|
+
"<meta name='DC.creator' lang='#{@lang}' content='#{k}' />"
|
|
112
|
+
end
|
|
113
|
+
|
|
114
|
+
def html_head_date
|
|
115
|
+
k = @meta.get[:revdate] || @meta.get[:ipublisheddate] and
|
|
116
|
+
k = @c.encode(k)&.gsub("'", "'")
|
|
117
|
+
(k.nil? || k.empty?) and return ""
|
|
118
|
+
"<meta name='DC.date' content='#{k}' />"
|
|
119
|
+
end
|
|
120
|
+
|
|
121
|
+
def html_head_title
|
|
122
|
+
k = @meta.get[:doctitle] and k = @c.encode(k)&.gsub("'", "'")
|
|
123
|
+
(k.nil? || k.empty?) and return ""
|
|
124
|
+
"<meta name='DC.title' lang='#{@lang}' content='#{k}' />"
|
|
125
|
+
end
|
|
126
|
+
|
|
80
127
|
include BaseConvert
|
|
81
128
|
include Init
|
|
82
129
|
end
|
data/lib/isodoc/ogc/metadata.rb
CHANGED
|
@@ -47,9 +47,11 @@ module IsoDoc
|
|
|
47
47
|
end
|
|
48
48
|
|
|
49
49
|
def title(isoxml, _out)
|
|
50
|
-
main = isoxml.at(ns("//bibdata/title[@language='en']"))
|
|
50
|
+
main = isoxml.at(ns("//bibdata/title[@language='en']"))
|
|
51
|
+
&.children&.to_xml
|
|
51
52
|
set(:doctitle, main)
|
|
52
|
-
main = isoxml.at(ns("//bibdata/abstract"))
|
|
53
|
+
main = isoxml.at(ns("//bibdata/abstract"))
|
|
54
|
+
&.text&.strip&.gsub(/\s+/, " ")
|
|
53
55
|
set(:abstract, main)
|
|
54
56
|
end
|
|
55
57
|
|
|
@@ -49,6 +49,7 @@
|
|
|
49
49
|
<xsl:variable name="color_dl_dt">rgb(215,243,255)</xsl:variable>
|
|
50
50
|
<xsl:variable name="color_dl_dd">rgb(242,251,255)</xsl:variable>
|
|
51
51
|
<xsl:variable name="color_blue">rgb(33, 55, 92)</xsl:variable>
|
|
52
|
+
<xsl:variable name="color_background_blue">rgb(33,60,107)</xsl:variable>
|
|
52
53
|
|
|
53
54
|
<xsl:variable name="toc_recommendations_">
|
|
54
55
|
<xsl:for-each select="//ogc:table[.//ogc:p[@class = 'RecommendationTitle']]">
|
|
@@ -192,6 +193,10 @@
|
|
|
192
193
|
|
|
193
194
|
<fo:flow flow-name="xsl-region-body" color="white">
|
|
194
195
|
|
|
196
|
+
<xsl:variable name="curr_lang" select="/ogc:ogc-standard/ogc:bibdata/ogc:language[@current = 'true']"/>
|
|
197
|
+
<xsl:variable name="stage" select="/ogc:ogc-standard/ogc:bibdata/ogc:status/ogc:stage[@language = $curr_lang] | /ogc:ogc-standard/ogc:bibdata/ogc:status/ogc:stage[not(@language)]"/>
|
|
198
|
+
<xsl:variable name="isLegacy" select="normalize-space($stage = 'deprecated' or $stage = 'legacy' or $stage = 'retired' or $stage = 'rescinded')"/>
|
|
199
|
+
|
|
195
200
|
<!-- background image -->
|
|
196
201
|
<fo:block-container absolute-position="fixed" left="0mm" top="0mm" font-size="0">
|
|
197
202
|
<fo:block>
|
|
@@ -267,7 +272,7 @@
|
|
|
267
272
|
<fo:block margin-top="4pt"> </fo:block>
|
|
268
273
|
</fo:block-container>
|
|
269
274
|
<fo:block color="{$color_design}">
|
|
270
|
-
<fo:block font-size="17pt"
|
|
275
|
+
<fo:block font-size="17pt">
|
|
271
276
|
<xsl:call-template name="addLetterSpacing">
|
|
272
277
|
<xsl:with-param name="text" select="java:toUpperCase(java:java.lang.String.new($doctype))"/>
|
|
273
278
|
</xsl:call-template>
|
|
@@ -291,13 +296,31 @@
|
|
|
291
296
|
<xsl:with-param name="letter-spacing" select="0.25"/>
|
|
292
297
|
</xsl:call-template>
|
|
293
298
|
</fo:block>
|
|
294
|
-
<
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
<xsl:
|
|
298
|
-
<
|
|
299
|
-
|
|
300
|
-
|
|
299
|
+
<xsl:variable name="stage_uc" select="java:toUpperCase(java:java.lang.String.new($stage))"/>
|
|
300
|
+
|
|
301
|
+
<xsl:choose>
|
|
302
|
+
<xsl:when test="$isLegacy = 'true'">
|
|
303
|
+
<fo:block-container font-size="17pt" background-color="{$color_background_blue}" margin-left="-2.5mm" height="11.5mm" width="56mm" display-align="center" margin-top="0.5mm">
|
|
304
|
+
<fo:block-container margin-left="2.5mm">
|
|
305
|
+
<fo:block-container margin-left="0mm">
|
|
306
|
+
<fo:block margin-top="1mm">
|
|
307
|
+
<xsl:call-template name="addLetterSpacing">
|
|
308
|
+
<xsl:with-param name="text" select="$stage_uc"/>
|
|
309
|
+
</xsl:call-template>
|
|
310
|
+
</fo:block>
|
|
311
|
+
</fo:block-container>
|
|
312
|
+
</fo:block-container>
|
|
313
|
+
</fo:block-container>
|
|
314
|
+
</xsl:when>
|
|
315
|
+
<xsl:otherwise>
|
|
316
|
+
<fo:block font-size="12pt" font-weight="bold" margin-top="14pt">
|
|
317
|
+
<xsl:call-template name="addLetterSpacing">
|
|
318
|
+
<xsl:with-param name="text" select="$stage_uc"/>
|
|
319
|
+
</xsl:call-template>
|
|
320
|
+
</fo:block>
|
|
321
|
+
</xsl:otherwise>
|
|
322
|
+
</xsl:choose>
|
|
323
|
+
|
|
301
324
|
</fo:block>
|
|
302
325
|
</fo:block-container>
|
|
303
326
|
</fo:block-container>
|
|
@@ -389,7 +412,24 @@
|
|
|
389
412
|
</fo:block>
|
|
390
413
|
</fo:block>
|
|
391
414
|
|
|
392
|
-
<xsl:
|
|
415
|
+
<xsl:choose>
|
|
416
|
+
<xsl:when test="$isLegacy = 'true'">
|
|
417
|
+
<fo:block-container margin-left="-7mm" color="{$color_design}" background-color="{$color_background_blue}" width="202mm">
|
|
418
|
+
<fo:block-container margin-left="2.5mm" margin-right="1mm" padding-top="0.5mm" padding-bottom="0.5mm">
|
|
419
|
+
<fo:block-container margin-left="0mm" margin-right="0mm">
|
|
420
|
+
<fo:block>
|
|
421
|
+
<xsl:apply-templates select="/ogc:ogc-standard/ogc:boilerplate/ogc:legal-statement">
|
|
422
|
+
<xsl:with-param name="isLegacy" select="$isLegacy"/>
|
|
423
|
+
</xsl:apply-templates>
|
|
424
|
+
</fo:block>
|
|
425
|
+
</fo:block-container>
|
|
426
|
+
</fo:block-container>
|
|
427
|
+
</fo:block-container>
|
|
428
|
+
</xsl:when>
|
|
429
|
+
<xsl:otherwise>
|
|
430
|
+
<xsl:apply-templates select="/ogc:ogc-standard/ogc:boilerplate/ogc:legal-statement"/>
|
|
431
|
+
</xsl:otherwise>
|
|
432
|
+
</xsl:choose>
|
|
393
433
|
|
|
394
434
|
</fo:block-container>
|
|
395
435
|
|
|
@@ -2112,6 +2152,10 @@
|
|
|
2112
2152
|
|
|
2113
2153
|
</xsl:attribute-set>
|
|
2114
2154
|
|
|
2155
|
+
<xsl:template name="refine_termexample-style">
|
|
2156
|
+
|
|
2157
|
+
</xsl:template>
|
|
2158
|
+
|
|
2115
2159
|
<xsl:attribute-set name="example-style">
|
|
2116
2160
|
|
|
2117
2161
|
<xsl:attribute name="margin-top">10pt</xsl:attribute>
|
|
@@ -3291,6 +3335,36 @@
|
|
|
3291
3335
|
</xsl:for-each>
|
|
3292
3336
|
</xsl:template>
|
|
3293
3337
|
|
|
3338
|
+
<xsl:template name="processMainSectionsDefault_flatxml">
|
|
3339
|
+
<xsl:for-each select="/*/*[local-name()='sections']/* | /*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']">
|
|
3340
|
+
<xsl:sort select="@displayorder" data-type="number"/>
|
|
3341
|
+
<xsl:variable name="flatxml">
|
|
3342
|
+
<xsl:apply-templates select="." mode="flatxml"/>
|
|
3343
|
+
</xsl:variable>
|
|
3344
|
+
<!-- debug_flatxml='<xsl:copy-of select="$flatxml"/>' -->
|
|
3345
|
+
<xsl:apply-templates select="xalan:nodeset($flatxml)/*"/>
|
|
3346
|
+
|
|
3347
|
+
</xsl:for-each>
|
|
3348
|
+
|
|
3349
|
+
<xsl:for-each select="/*/*[local-name()='annex']">
|
|
3350
|
+
<xsl:sort select="@displayorder" data-type="number"/>
|
|
3351
|
+
<xsl:variable name="flatxml">
|
|
3352
|
+
<xsl:apply-templates select="." mode="flatxml"/>
|
|
3353
|
+
</xsl:variable>
|
|
3354
|
+
<!-- debug_flatxml='<xsl:copy-of select="$flatxml"/>' -->
|
|
3355
|
+
<xsl:apply-templates select="xalan:nodeset($flatxml)/*"/>
|
|
3356
|
+
</xsl:for-each>
|
|
3357
|
+
|
|
3358
|
+
<xsl:for-each select="/*/*[local-name()='bibliography']/*[not(@normative='true')] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]]">
|
|
3359
|
+
<xsl:sort select="@displayorder" data-type="number"/>
|
|
3360
|
+
<xsl:variable name="flatxml">
|
|
3361
|
+
<xsl:apply-templates select="." mode="flatxml"/>
|
|
3362
|
+
</xsl:variable>
|
|
3363
|
+
<!-- debug_flatxml='<xsl:copy-of select="$flatxml"/>' -->
|
|
3364
|
+
<xsl:apply-templates select="xalan:nodeset($flatxml)/*"/>
|
|
3365
|
+
</xsl:for-each>
|
|
3366
|
+
</xsl:template>
|
|
3367
|
+
|
|
3294
3368
|
<xsl:variable name="regex_standard_reference">([A-Z]{2,}(/[A-Z]{2,})* \d+(-\d+)*(:\d{4})?)</xsl:variable>
|
|
3295
3369
|
<xsl:variable name="tag_fo_inline_keep-together_within-line_open">###fo:inline keep-together_within-line###</xsl:variable>
|
|
3296
3370
|
<xsl:variable name="tag_fo_inline_keep-together_within-line_close">###/fo:inline keep-together_within-line###</xsl:variable>
|
|
@@ -3429,7 +3503,13 @@
|
|
|
3429
3503
|
</xsl:template> <!-- license-statement/p -->
|
|
3430
3504
|
|
|
3431
3505
|
<xsl:template match="*[local-name()='legal-statement']">
|
|
3506
|
+
<xsl:param name="isLegacy">false</xsl:param>
|
|
3432
3507
|
<fo:block xsl:use-attribute-sets="legal-statement-style">
|
|
3508
|
+
|
|
3509
|
+
<xsl:if test="$isLegacy = 'true'">
|
|
3510
|
+
<xsl:attribute name="font-size">9pt</xsl:attribute>
|
|
3511
|
+
</xsl:if>
|
|
3512
|
+
|
|
3433
3513
|
<xsl:apply-templates/>
|
|
3434
3514
|
</fo:block>
|
|
3435
3515
|
</xsl:template> <!-- legal-statement -->
|
|
@@ -5391,13 +5471,13 @@
|
|
|
5391
5471
|
<tr>
|
|
5392
5472
|
<td>
|
|
5393
5473
|
<xsl:attribute name="id">
|
|
5394
|
-
<xsl:value-of select="concat($id,'
|
|
5474
|
+
<xsl:value-of select="concat($id,'@',$row_number,'_1')"/>
|
|
5395
5475
|
</xsl:attribute>
|
|
5396
5476
|
<xsl:apply-templates/>
|
|
5397
5477
|
</td>
|
|
5398
5478
|
<td>
|
|
5399
5479
|
<xsl:attribute name="id">
|
|
5400
|
-
<xsl:value-of select="concat($id,'
|
|
5480
|
+
<xsl:value-of select="concat($id,'@',$row_number,'_2')"/>
|
|
5401
5481
|
</xsl:attribute>
|
|
5402
5482
|
|
|
5403
5483
|
<xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]">
|
|
@@ -5718,13 +5798,14 @@
|
|
|
5718
5798
|
<!-- ================= -->
|
|
5719
5799
|
<!-- Added,deleted text -->
|
|
5720
5800
|
<!-- ================= -->
|
|
5721
|
-
<xsl:template match="*[local-name()='add']" name="tag_add">
|
|
5801
|
+
<xsl:template match="*[local-name()='add'] | *[local-name() = 'change-open-tag'] | *[local-name() = 'change-close-tag']" name="tag_add">
|
|
5722
5802
|
<xsl:param name="skip">true</xsl:param>
|
|
5723
5803
|
<xsl:param name="block">false</xsl:param>
|
|
5724
5804
|
<xsl:param name="type"/>
|
|
5725
5805
|
<xsl:param name="text-align"/>
|
|
5726
5806
|
<xsl:choose>
|
|
5727
|
-
<xsl:when test="starts-with(., $ace_tag)"> <!-- examples: ace-tag_A1_start, ace-tag_A2_end, C1_start, AC_start
|
|
5807
|
+
<xsl:when test="starts-with(., $ace_tag) or local-name() = 'change-open-tag' or local-name() = 'change-close-tag'"> <!-- examples: ace-tag_A1_start, ace-tag_A2_end, C1_start, AC_start, or
|
|
5808
|
+
<change-open-tag>A<sub>1</sub></change-open-tag>, <change-close-tag>A<sub>1</sub></change-close-tag> -->
|
|
5728
5809
|
<xsl:choose>
|
|
5729
5810
|
<xsl:when test="$skip = 'true' and ((local-name(../..) = 'note' and not(preceding-sibling::node())) or (local-name(..) = 'title' and preceding-sibling::node()[1][local-name() = 'tab']) or local-name(..) = 'formattedref' and not(preceding-sibling::node())) and ../node()[last()][local-name() = 'add'][starts-with(text(), $ace_tag)]"><!-- start tag displayed in template name="note" and title --></xsl:when>
|
|
5730
5811
|
<xsl:otherwise>
|
|
@@ -5732,12 +5813,32 @@
|
|
|
5732
5813
|
<xsl:call-template name="insertTag">
|
|
5733
5814
|
<xsl:with-param name="type">
|
|
5734
5815
|
<xsl:choose>
|
|
5816
|
+
<xsl:when test="local-name() = 'change-open-tag'">start</xsl:when>
|
|
5817
|
+
<xsl:when test="local-name() = 'change-close-tag'">end</xsl:when>
|
|
5735
5818
|
<xsl:when test="$type = ''"><xsl:value-of select="substring-after(substring-after(., $ace_tag), '_')"/> <!-- start or end --></xsl:when>
|
|
5736
5819
|
<xsl:otherwise><xsl:value-of select="$type"/></xsl:otherwise>
|
|
5737
5820
|
</xsl:choose>
|
|
5738
5821
|
</xsl:with-param>
|
|
5739
|
-
<xsl:with-param name="kind"
|
|
5740
|
-
|
|
5822
|
+
<xsl:with-param name="kind">
|
|
5823
|
+
<xsl:choose>
|
|
5824
|
+
<xsl:when test="local-name() = 'change-open-tag' or local-name() = 'change-close-tag'">
|
|
5825
|
+
<xsl:value-of select="text()"/>
|
|
5826
|
+
</xsl:when>
|
|
5827
|
+
<xsl:otherwise>
|
|
5828
|
+
<xsl:value-of select="substring(substring-before(substring-after(., $ace_tag), '_'), 1, 1)"/> <!-- A or C -->
|
|
5829
|
+
</xsl:otherwise>
|
|
5830
|
+
</xsl:choose>
|
|
5831
|
+
</xsl:with-param>
|
|
5832
|
+
<xsl:with-param name="value">
|
|
5833
|
+
<xsl:choose>
|
|
5834
|
+
<xsl:when test="local-name() = 'change-open-tag' or local-name() = 'change-close-tag'">
|
|
5835
|
+
<xsl:value-of select="*[local-name() = 'sub']"/>
|
|
5836
|
+
</xsl:when>
|
|
5837
|
+
<xsl:otherwise>
|
|
5838
|
+
<xsl:value-of select="substring(substring-before(substring-after(., $ace_tag), '_'), 2)"/> <!-- 1, 2, C -->
|
|
5839
|
+
</xsl:otherwise>
|
|
5840
|
+
</xsl:choose>
|
|
5841
|
+
</xsl:with-param>
|
|
5741
5842
|
</xsl:call-template>
|
|
5742
5843
|
</xsl:variable>
|
|
5743
5844
|
<xsl:choose>
|
|
@@ -5997,6 +6098,10 @@
|
|
|
5997
6098
|
<fo:inline keep-with-next.within-line="always"><xsl:value-of select="."/></fo:inline>
|
|
5998
6099
|
</xsl:template>
|
|
5999
6100
|
|
|
6101
|
+
<xsl:template match="*[local-name() = 'span'][contains(@style, 'text-transform:none')]//text()" priority="5">
|
|
6102
|
+
<xsl:value-of select="."/>
|
|
6103
|
+
</xsl:template>
|
|
6104
|
+
|
|
6000
6105
|
<!-- ========================= -->
|
|
6001
6106
|
<!-- END Rich text formatting -->
|
|
6002
6107
|
<!-- ========================= -->
|
|
@@ -6627,7 +6732,7 @@
|
|
|
6627
6732
|
</xsl:choose>
|
|
6628
6733
|
</xsl:variable>
|
|
6629
6734
|
<xsl:attribute name="id">
|
|
6630
|
-
<xsl:value-of select="concat($id,'
|
|
6735
|
+
<xsl:value-of select="concat($id,'@',$row_number,'_',$col_number,'_',$divide)"/>
|
|
6631
6736
|
</xsl:attribute>
|
|
6632
6737
|
|
|
6633
6738
|
<xsl:for-each select="*[local-name() = 'p']">
|
|
@@ -6635,7 +6740,7 @@
|
|
|
6635
6740
|
<xsl:copy-of select="@*"/>
|
|
6636
6741
|
<xsl:variable name="p_num" select="count(preceding-sibling::*[local-name() = 'p']) + 1"/>
|
|
6637
6742
|
<xsl:attribute name="id">
|
|
6638
|
-
<xsl:value-of select="concat($id,'
|
|
6743
|
+
<xsl:value-of select="concat($id,'@',$row_number,'_',$col_number,'_p_',$p_num,'_',$divide)"/>
|
|
6639
6744
|
</xsl:attribute>
|
|
6640
6745
|
|
|
6641
6746
|
<!-- <xsl:copy-of select="node()" /> -->
|
|
@@ -6699,7 +6804,7 @@
|
|
|
6699
6804
|
<xsl:variable name="num" select="count(preceding-sibling::word) + 1"/>
|
|
6700
6805
|
<xsl:copy>
|
|
6701
6806
|
<xsl:attribute name="id">
|
|
6702
|
-
<xsl:value-of select="concat($id,'
|
|
6807
|
+
<xsl:value-of select="concat($id,'@',$row_number,'_',$col_number,'_word_',$num,'_',$divide)"/>
|
|
6703
6808
|
</xsl:attribute>
|
|
6704
6809
|
<xsl:copy-of select="node()"/>
|
|
6705
6810
|
</xsl:copy>
|
|
@@ -7949,11 +8054,17 @@
|
|
|
7949
8054
|
</xsl:when>
|
|
7950
8055
|
<xsl:otherwise>
|
|
7951
8056
|
|
|
8057
|
+
<xsl:variable name="image_class" select="ancestor::*[local-name() = 'image']/@class"/>
|
|
8058
|
+
<xsl:variable name="ancestor_table_cell" select="normalize-space(ancestor::*[local-name() = 'td'] or ancestor::*[local-name() = 'th'])"/>
|
|
8059
|
+
|
|
7952
8060
|
<xsl:variable name="element">
|
|
7953
8061
|
<xsl:choose>
|
|
7954
8062
|
<xsl:when test="ancestor::*[local-name() = 'tr'] and $isGenerateTableIF = 'true'">
|
|
7955
8063
|
<fo:inline xsl:use-attribute-sets="image-style" text-align="left"/>
|
|
7956
8064
|
</xsl:when>
|
|
8065
|
+
<xsl:when test="not(ancestor::*[local-name() = 'figure'])">
|
|
8066
|
+
<fo:inline xsl:use-attribute-sets="image-style" text-align="left"/>
|
|
8067
|
+
</xsl:when>
|
|
7957
8068
|
<xsl:otherwise>
|
|
7958
8069
|
<fo:block xsl:use-attribute-sets="image-style">
|
|
7959
8070
|
<xsl:if test="ancestor::*[local-name() = 'dt']">
|
|
@@ -7969,10 +8080,24 @@
|
|
|
7969
8080
|
<xsl:copy-of select="@*"/>
|
|
7970
8081
|
<!-- <fo:block xsl:use-attribute-sets="image-style"> -->
|
|
7971
8082
|
<fo:instream-foreign-object fox:alt-text="{$alt-text}">
|
|
7972
|
-
|
|
7973
|
-
|
|
7974
|
-
|
|
7975
|
-
|
|
8083
|
+
|
|
8084
|
+
<xsl:choose>
|
|
8085
|
+
<xsl:when test="$image_class = 'corrigenda-tag'">
|
|
8086
|
+
<xsl:attribute name="fox:alt-text">CorrigendaTag</xsl:attribute>
|
|
8087
|
+
<xsl:attribute name="baseline-shift">-10%</xsl:attribute>
|
|
8088
|
+
<xsl:if test="$ancestor_table_cell = 'true'">
|
|
8089
|
+
<xsl:attribute name="baseline-shift">-25%</xsl:attribute>
|
|
8090
|
+
</xsl:if>
|
|
8091
|
+
<xsl:attribute name="height">3.5mm</xsl:attribute>
|
|
8092
|
+
</xsl:when>
|
|
8093
|
+
<xsl:otherwise>
|
|
8094
|
+
<xsl:if test="$isGenerateTableIF = 'false'">
|
|
8095
|
+
<xsl:attribute name="width">100%</xsl:attribute>
|
|
8096
|
+
</xsl:if>
|
|
8097
|
+
<xsl:attribute name="content-height">100%</xsl:attribute>
|
|
8098
|
+
</xsl:otherwise>
|
|
8099
|
+
</xsl:choose>
|
|
8100
|
+
|
|
7976
8101
|
<xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
|
|
7977
8102
|
<xsl:variable name="svg_width" select="xalan:nodeset($svg_content)/*/@width"/>
|
|
7978
8103
|
<xsl:variable name="svg_height" select="xalan:nodeset($svg_content)/*/@height"/>
|
|
@@ -9539,7 +9664,7 @@
|
|
|
9539
9664
|
<!-- ====== -->
|
|
9540
9665
|
<xsl:template match="*[local-name() = 'termexample']">
|
|
9541
9666
|
<fo:block id="{@id}" xsl:use-attribute-sets="termexample-style">
|
|
9542
|
-
|
|
9667
|
+
<xsl:call-template name="refine_termexample-style"/>
|
|
9543
9668
|
<xsl:call-template name="setBlockSpanAll"/>
|
|
9544
9669
|
|
|
9545
9670
|
<xsl:apply-templates select="*[local-name()='name']"/>
|
|
@@ -10226,13 +10351,19 @@
|
|
|
10226
10351
|
<fo:block id="{@id}" font-size="1pt"><xsl:value-of select="$hair_space"/></fo:block>
|
|
10227
10352
|
</xsl:when>
|
|
10228
10353
|
<!-- if there isn't element with id 'from', then create 'bookmark' here -->
|
|
10229
|
-
<xsl:when test="not(ancestor::*[contains(local-name(), '-standard')]//*[@id = $id_from])">
|
|
10354
|
+
<xsl:when test="ancestor::*[contains(local-name(), '-standard')] and not(ancestor::*[contains(local-name(), '-standard')]//*[@id = $id_from])">
|
|
10355
|
+
<fo:block id="{@from}" font-size="1pt"><xsl:value-of select="$hair_space"/></fo:block>
|
|
10356
|
+
</xsl:when>
|
|
10357
|
+
<xsl:when test="not(//*[@id = $id_from]) and not(preceding-sibling::*[@id = $id_from])">
|
|
10230
10358
|
<fo:block id="{@from}" font-size="1pt"><xsl:value-of select="$hair_space"/></fo:block>
|
|
10231
10359
|
</xsl:when>
|
|
10232
10360
|
</xsl:choose>
|
|
10233
10361
|
|
|
10234
10362
|
</xsl:template>
|
|
10235
10363
|
|
|
10364
|
+
<!-- https://github.com/metanorma/mn-samples-bsi/issues/312 -->
|
|
10365
|
+
<xsl:template match="*[local-name() = 'review'][@type = 'other']"/>
|
|
10366
|
+
|
|
10236
10367
|
<xsl:template match="*[local-name() = 'name']/text()">
|
|
10237
10368
|
<!-- 0xA0 to space replacement -->
|
|
10238
10369
|
<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),' ',' ')"/>
|
|
@@ -11835,7 +11966,7 @@
|
|
|
11835
11966
|
|
|
11836
11967
|
<xsl:template name="printEdition">
|
|
11837
11968
|
<xsl:variable name="edition_i18n" select="normalize-space((//*[contains(local-name(), '-standard')])[1]/*[local-name() = 'bibdata']/*[local-name() = 'edition'][normalize-space(@language) != ''])"/>
|
|
11838
|
-
|
|
11969
|
+
|
|
11839
11970
|
<xsl:choose>
|
|
11840
11971
|
<xsl:when test="$edition_i18n != ''">
|
|
11841
11972
|
<!-- Example: <edition language="fr">deuxième édition</edition> -->
|