metanorma-cc 2.7.3 → 2.7.5
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/cc/cc.standard.xsl +123 -86
- data/lib/isodoc/cc/html/_coverpage.css +0 -10
- data/lib/isodoc/cc/html/htmlstyle.css +13 -23
- data/lib/metanorma/cc/isodoc.rng +26 -19
- data/lib/metanorma/cc/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: 4ac3b3a75965dbdafd86766d5f51ade18833186845b3ae5933722adea6101811
|
4
|
+
data.tar.gz: 1009119a627b80d955dfad8852d32000bf8bb3bff6e404cb5afc379955ffd508
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 4dfc2b6a15dc3ce85ee5a40d214a7fa6bbc99ebb044884c11d780b3b2e527b4e954509728553f280a6553e21b59e3220f58184df28efa9be7d71fe5a96c3a6e4
|
7
|
+
data.tar.gz: febc6660d5f8cdfb58e84e9352ee83ae381bd29f45eea0b5708e150df2d749793e7e3fe98a2129eb22521d2dd70e0d0d7d8fd0aaede8e626febaa3428335ddf2
|
@@ -175,13 +175,34 @@
|
|
175
175
|
<xsl:call-template name="updateXML"/>
|
176
176
|
</xsl:variable>
|
177
177
|
|
178
|
+
<xsl:if test="$debug = 'true'">
|
179
|
+
<redirect:write file="updated_xml.xml">
|
180
|
+
<xsl:copy-of select="$updated_xml"/>
|
181
|
+
</redirect:write>
|
182
|
+
</xsl:if>
|
183
|
+
|
178
184
|
<xsl:for-each select="xalan:nodeset($updated_xml)/*">
|
179
185
|
|
180
186
|
<xsl:variable name="updated_xml_with_pages">
|
181
187
|
<xsl:call-template name="processPrefaceAndMainSectionsDefault_items"/>
|
182
188
|
</xsl:variable>
|
183
189
|
|
190
|
+
<xsl:if test="$debug = 'true'">
|
191
|
+
<redirect:write file="updated_xml_with_pages.xml">
|
192
|
+
<xsl:copy-of select="$updated_xml_with_pages"/>
|
193
|
+
</redirect:write>
|
194
|
+
</xsl:if>
|
195
|
+
|
196
|
+
<xsl:if test="$debug = 'true'">
|
197
|
+
<redirect:write file="contents_.xml"> <!-- {java:getTime(java:java.util.Date.new())} -->
|
198
|
+
<xsl:copy-of select="$contents"/>
|
199
|
+
</redirect:write>
|
200
|
+
</xsl:if>
|
201
|
+
|
184
202
|
<xsl:for-each select="xalan:nodeset($updated_xml_with_pages)"> <!-- set context to preface/sections -->
|
203
|
+
|
204
|
+
<xsl:call-template name="inner-cover-page"/>
|
205
|
+
|
185
206
|
<xsl:for-each select=".//mn:page_sequence[parent::mn:preface][normalize-space() != '' or .//mn:image or .//*[local-name() = 'svg']]">
|
186
207
|
|
187
208
|
<!-- Copyright, Content, Foreword, etc. pages -->
|
@@ -192,9 +213,6 @@
|
|
192
213
|
<xsl:call-template name="getPageSequenceOrientation"/>
|
193
214
|
</xsl:attribute>
|
194
215
|
|
195
|
-
<xsl:if test="position() = 1">
|
196
|
-
<xsl:attribute name="initial-page-number">2</xsl:attribute>
|
197
|
-
</xsl:if>
|
198
216
|
<xsl:if test="position() = last()">
|
199
217
|
<xsl:attribute name="force-page-count">end-on-even</xsl:attribute>
|
200
218
|
</xsl:if>
|
@@ -203,35 +221,6 @@
|
|
203
221
|
<xsl:call-template name="insertHeaderFooter"/>
|
204
222
|
<fo:flow flow-name="xsl-region-body">
|
205
223
|
|
206
|
-
<xsl:if test="$debug = 'true'">
|
207
|
-
<redirect:write file="contents_.xml"> <!-- {java:getTime(java:java.util.Date.new())} -->
|
208
|
-
<xsl:copy-of select="$contents"/>
|
209
|
-
</redirect:write>
|
210
|
-
</xsl:if>
|
211
|
-
|
212
|
-
<xsl:if test="position() = 1">
|
213
|
-
<fo:block margin-bottom="15pt"> </fo:block>
|
214
|
-
<fo:block margin-bottom="14pt">
|
215
|
-
<xsl:text>© </xsl:text>
|
216
|
-
<xsl:value-of select="/mn:metanorma/mn:bibdata/mn:copyright/mn:from"/>
|
217
|
-
<xsl:text> </xsl:text>
|
218
|
-
<fo:inline>
|
219
|
-
<xsl:apply-templates select="/mn:metanorma/mn:boilerplate/mn:feedback-statement/mn:clause/mn:p[@id = 'boilerplate-name']"/>
|
220
|
-
</fo:inline>
|
221
|
-
</fo:block>
|
222
|
-
<fo:block margin-bottom="12pt">
|
223
|
-
<xsl:apply-templates select="/mn:metanorma/mn:boilerplate/mn:legal-statement"/>
|
224
|
-
</fo:block>
|
225
|
-
<fo:block margin-bottom="12pt">
|
226
|
-
<xsl:apply-templates select="/mn:metanorma/mn:boilerplate/mn:feedback-statement/mn:clause/mn:p[@id = 'boilerplate-name']"/>
|
227
|
-
</fo:block>
|
228
|
-
<fo:block>
|
229
|
-
<xsl:apply-templates select="/mn:metanorma/mn:boilerplate/mn:feedback-statement/mn:clause/mn:p[@id = 'boilerplate-address']"/>
|
230
|
-
</fo:block>
|
231
|
-
|
232
|
-
<fo:block break-after="page"/>
|
233
|
-
</xsl:if> <!-- for 1st page_sequence only -->
|
234
|
-
|
235
224
|
<!-- Table of contents, Foreword, Introduction -->
|
236
225
|
<!-- <xsl:call-template name="processPrefaceSectionsDefault"/> -->
|
237
226
|
<xsl:apply-templates/>
|
@@ -274,6 +263,8 @@
|
|
274
263
|
|
275
264
|
</xsl:for-each>
|
276
265
|
|
266
|
+
<xsl:call-template name="back-page"/>
|
267
|
+
|
277
268
|
</fo:root>
|
278
269
|
</xsl:template>
|
279
270
|
|
@@ -344,6 +335,36 @@
|
|
344
335
|
</fo:page-sequence>
|
345
336
|
</xsl:template> <!-- END: cover-page -->
|
346
337
|
|
338
|
+
<xsl:template name="inner-cover-page">
|
339
|
+
<fo:page-sequence master-reference="preface" format="i" initial-page-number="2">
|
340
|
+
<xsl:call-template name="insertFootnoteSeparatorCommon"/>
|
341
|
+
<xsl:call-template name="insertHeaderFooter"/>
|
342
|
+
<fo:flow flow-name="xsl-region-body">
|
343
|
+
<fo:block margin-bottom="15pt"> </fo:block>
|
344
|
+
<fo:block margin-bottom="14pt">
|
345
|
+
<xsl:text>© </xsl:text>
|
346
|
+
<xsl:value-of select="/mn:metanorma/mn:bibdata/mn:copyright/mn:from"/>
|
347
|
+
<xsl:text> </xsl:text>
|
348
|
+
<fo:inline>
|
349
|
+
<xsl:apply-templates select="/mn:metanorma/mn:boilerplate/mn:feedback-statement/mn:clause/mn:p[@id = 'boilerplate-name']"/>
|
350
|
+
</fo:inline>
|
351
|
+
</fo:block>
|
352
|
+
<fo:block margin-bottom="12pt">
|
353
|
+
<xsl:apply-templates select="/mn:metanorma/mn:boilerplate/mn:legal-statement"/>
|
354
|
+
</fo:block>
|
355
|
+
<fo:block margin-bottom="12pt">
|
356
|
+
<xsl:apply-templates select="/mn:metanorma/mn:boilerplate/mn:feedback-statement/mn:clause/mn:p[@id = 'boilerplate-name']"/>
|
357
|
+
</fo:block>
|
358
|
+
<fo:block>
|
359
|
+
<xsl:apply-templates select="/mn:metanorma/mn:boilerplate/mn:feedback-statement/mn:clause/mn:p[@id = 'boilerplate-address']"/>
|
360
|
+
</fo:block>
|
361
|
+
</fo:flow>
|
362
|
+
</fo:page-sequence>
|
363
|
+
</xsl:template> <!-- inner-cover-page -->
|
364
|
+
|
365
|
+
<xsl:template name="back-page">
|
366
|
+
</xsl:template>
|
367
|
+
|
347
368
|
<xsl:template name="insertListOf_Title">
|
348
369
|
<xsl:param name="title"/>
|
349
370
|
<fo:block xsl:use-attribute-sets="toc-listof-title-style">
|
@@ -879,6 +900,7 @@
|
|
879
900
|
<xsl:variable name="en_dash">–</xsl:variable>
|
880
901
|
<xsl:variable name="em_dash">—</xsl:variable>
|
881
902
|
<xsl:variable name="nonbreak_space_em_dash_space"> — </xsl:variable>
|
903
|
+
<xsl:variable name="nonbreak_space_em_dash"> —</xsl:variable>
|
882
904
|
<xsl:variable name="cr"> </xsl:variable>
|
883
905
|
<xsl:variable name="lf">
|
884
906
|
</xsl:variable>
|
@@ -1421,6 +1443,7 @@
|
|
1421
1443
|
<xsl:template match="mn:title[following-sibling::*[1][self::mn:fmt-title]]" mode="update_xml_step1"/>
|
1422
1444
|
<xsl:template match="mn:name[following-sibling::*[1][self::mn:fmt-name]]" mode="update_xml_step1"/>
|
1423
1445
|
<xsl:template match="mn:section-title[following-sibling::*[1][self::mn:p][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_step1"/>
|
1446
|
+
<xsl:template match="mn:floating-title[following-sibling::*[1][self::mn:p][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_step1"/>
|
1424
1447
|
<!-- <xsl:template match="mn:preferred[following-sibling::*[not(local-name() = 'preferred')][1][local-name() = 'fmt-preferred']]" mode="update_xml_step1"/> -->
|
1425
1448
|
<xsl:template match="mn:preferred" mode="update_xml_step1"/>
|
1426
1449
|
<!-- <xsl:template match="mn:admitted[following-sibling::*[not(local-name() = 'admitted')][1][local-name() = 'fmt-admitted']]" mode="update_xml_step1"/> -->
|
@@ -1435,10 +1458,10 @@
|
|
1435
1458
|
|
1436
1459
|
<xsl:template match="mn:term[@unnumbered = 'true'][not(.//*[starts-with(local-name(), 'fmt-')])]" mode="update_xml_step1"/>
|
1437
1460
|
|
1438
|
-
<xsl:template match="mn:p[@type = 'section-title' or @type = 'floating-title'][preceding-sibling::*[1][self::mn:section-title]]" mode="update_xml_step1">
|
1461
|
+
<xsl:template match="mn:p[@type = 'section-title' or @type = 'floating-title'][preceding-sibling::*[1][self::mn:section-title or self::mn:floating-title]]" mode="update_xml_step1">
|
1439
1462
|
<xsl:copy>
|
1440
1463
|
<xsl:apply-templates select="@*" mode="update_xml_step1"/>
|
1441
|
-
<xsl:copy-of select="preceding-sibling::*[1][self::mn:section-title]/@depth"/>
|
1464
|
+
<xsl:copy-of select="preceding-sibling::*[1][self::mn:section-title or self::mn:floating-title]/@depth"/>
|
1442
1465
|
<xsl:apply-templates select="node()" mode="update_xml_step1"/>
|
1443
1466
|
</xsl:copy>
|
1444
1467
|
</xsl:template>
|
@@ -2280,7 +2303,6 @@
|
|
2280
2303
|
</xsl:attribute-set> <!-- feedback-statement-title-style -->
|
2281
2304
|
|
2282
2305
|
<xsl:template name="refine_feedback-statement-title-style">
|
2283
|
-
|
2284
2306
|
</xsl:template>
|
2285
2307
|
|
2286
2308
|
<xsl:attribute-set name="feedback-statement-p-style">
|
@@ -2535,6 +2557,12 @@
|
|
2535
2557
|
<xsl:template name="refine_sourcecode-style">
|
2536
2558
|
</xsl:template> <!-- refine_sourcecode-style -->
|
2537
2559
|
|
2560
|
+
<xsl:attribute-set name="sourcecode-number-style">
|
2561
|
+
</xsl:attribute-set>
|
2562
|
+
|
2563
|
+
<xsl:template name="refine_sourcecode-number-style">
|
2564
|
+
</xsl:template>
|
2565
|
+
|
2538
2566
|
<xsl:attribute-set name="sourcecode-name-style">
|
2539
2567
|
<xsl:attribute name="font-size">11pt</xsl:attribute>
|
2540
2568
|
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
@@ -3921,6 +3949,12 @@
|
|
3921
3949
|
<xsl:template name="refine_term-name-style">
|
3922
3950
|
</xsl:template>
|
3923
3951
|
|
3952
|
+
<xsl:attribute-set name="preferred-style">
|
3953
|
+
</xsl:attribute-set> <!-- preferred-style -->
|
3954
|
+
|
3955
|
+
<xsl:template name="refine_preferred-style">
|
3956
|
+
</xsl:template>
|
3957
|
+
|
3924
3958
|
<xsl:attribute-set name="preferred-block-style">
|
3925
3959
|
<xsl:attribute name="line-height">1.1</xsl:attribute>
|
3926
3960
|
</xsl:attribute-set> <!-- preferred-block-style -->
|
@@ -4563,6 +4597,12 @@
|
|
4563
4597
|
<xsl:call-template name="setBordersTableArray"/>
|
4564
4598
|
</xsl:template> <!-- refine_table-style -->
|
4565
4599
|
|
4600
|
+
<xsl:attribute-set name="table-number-style">
|
4601
|
+
</xsl:attribute-set>
|
4602
|
+
|
4603
|
+
<xsl:template name="refine_table-number-style">
|
4604
|
+
</xsl:template>
|
4605
|
+
|
4566
4606
|
<xsl:attribute-set name="table-name-style">
|
4567
4607
|
<xsl:attribute name="role">Caption</xsl:attribute>
|
4568
4608
|
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
@@ -5002,7 +5042,7 @@
|
|
5002
5042
|
|
5003
5043
|
</fo:block>
|
5004
5044
|
|
5005
|
-
<!-- <xsl:if test="$namespace = 'bsi' or $namespace = 'iec' or $namespace = 'iso'"> -->
|
5045
|
+
<!-- <xsl:if test="$namespace = 'bsi' or $namespace = 'pas' or $namespace = 'iec' or $namespace = 'iso'"> -->
|
5006
5046
|
<xsl:if test="$continued = 'true'">
|
5007
5047
|
|
5008
5048
|
<!-- to prevent the error 'THead element may contain only TR elements' -->
|
@@ -8034,15 +8074,22 @@
|
|
8034
8074
|
</xsl:attribute-set> <!-- quote-style -->
|
8035
8075
|
|
8036
8076
|
<xsl:template name="refine_quote-style">
|
8037
|
-
</xsl:template>
|
8077
|
+
</xsl:template> <!-- refine_quote-style -->
|
8038
8078
|
|
8039
8079
|
<xsl:attribute-set name="quote-source-style">
|
8040
8080
|
<xsl:attribute name="text-align">right</xsl:attribute>
|
8041
|
-
</xsl:attribute-set>
|
8081
|
+
</xsl:attribute-set> <!-- quote-source-style -->
|
8042
8082
|
|
8043
8083
|
<xsl:template name="refine_quote-source-style">
|
8044
8084
|
</xsl:template>
|
8045
8085
|
|
8086
|
+
<xsl:attribute-set name="source-style">
|
8087
|
+
</xsl:attribute-set> <!-- source-style -->
|
8088
|
+
|
8089
|
+
<xsl:template name="refine_source-style">
|
8090
|
+
|
8091
|
+
</xsl:template> <!-- refine_source-style -->
|
8092
|
+
|
8046
8093
|
<!-- ====== -->
|
8047
8094
|
<!-- quote -->
|
8048
8095
|
<!-- source -->
|
@@ -8090,7 +8137,9 @@
|
|
8090
8137
|
</xsl:if>
|
8091
8138
|
<xsl:choose>
|
8092
8139
|
<xsl:when test="not(parent::quote)">
|
8093
|
-
<fo:block>
|
8140
|
+
<fo:block xsl:use-attribute-sets="source-style">
|
8141
|
+
<xsl:call-template name="refine_source-style"/>
|
8142
|
+
|
8094
8143
|
<xsl:call-template name="insert_basic_link">
|
8095
8144
|
<xsl:with-param name="element">
|
8096
8145
|
<fo:basic-link internal-destination="{@bibitemid}" fox:alt-text="{@citeas}">
|
@@ -8137,6 +8186,12 @@
|
|
8137
8186
|
<xsl:template name="refine_figure-style">
|
8138
8187
|
</xsl:template>
|
8139
8188
|
|
8189
|
+
<xsl:attribute-set name="figure-number-style">
|
8190
|
+
</xsl:attribute-set>
|
8191
|
+
|
8192
|
+
<xsl:template name="refine_figure-number-style">
|
8193
|
+
</xsl:template>
|
8194
|
+
|
8140
8195
|
<xsl:attribute-set name="figure-name-style">
|
8141
8196
|
<xsl:attribute name="role">Caption</xsl:attribute>
|
8142
8197
|
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
@@ -10177,7 +10232,7 @@
|
|
10177
10232
|
|
10178
10233
|
<xsl:template name="refine_fn-reference-style">
|
10179
10234
|
<!-- https://github.com/metanorma/metanorma-ieee/issues/595 -->
|
10180
|
-
<xsl:if test="preceding-sibling::node()[normalize-space() != ''][1][self::mn:fn]"
|
10235
|
+
<xsl:if test="preceding-sibling::node()[normalize-space() != ''][1][self::mn:fn]">, </xsl:if><!-- <xsl:if test="$namespace = 'bsi' or $namespace = 'pas'"></xsl:if> -->
|
10181
10236
|
</xsl:template> <!-- refine_fn-reference-style -->
|
10182
10237
|
|
10183
10238
|
<xsl:attribute-set name="fn-style">
|
@@ -10188,6 +10243,7 @@
|
|
10188
10243
|
</xsl:template>
|
10189
10244
|
|
10190
10245
|
<xsl:attribute-set name="fn-num-style">
|
10246
|
+
<xsl:attribute name="role">Reference</xsl:attribute>
|
10191
10247
|
<xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
|
10192
10248
|
<xsl:attribute name="font-size">65%</xsl:attribute>
|
10193
10249
|
<xsl:attribute name="vertical-align">super</xsl:attribute>
|
@@ -10261,33 +10317,16 @@
|
|
10261
10317
|
<xsl:variable name="ref_id" select="@target"/>
|
10262
10318
|
|
10263
10319
|
<xsl:variable name="footnote_inline">
|
10264
|
-
<fo:inline
|
10265
|
-
|
10266
|
-
<xsl:variable name="fn_styles">
|
10267
|
-
<xsl:choose>
|
10268
|
-
<xsl:when test="ancestor::mn:bibitem">
|
10269
|
-
<fn_styles xsl:use-attribute-sets="bibitem-note-fn-style">
|
10270
|
-
<xsl:call-template name="refine_bibitem-note-fn-style"/>
|
10271
|
-
</fn_styles>
|
10272
|
-
</xsl:when>
|
10273
|
-
<xsl:otherwise>
|
10274
|
-
<fn_styles xsl:use-attribute-sets="fn-num-style">
|
10275
|
-
<xsl:call-template name="refine_fn-num-style"/>
|
10276
|
-
</fn_styles>
|
10277
|
-
</xsl:otherwise>
|
10278
|
-
</xsl:choose>
|
10279
|
-
</xsl:variable>
|
10320
|
+
<fo:inline xsl:use-attribute-sets="fn-num-style">
|
10280
10321
|
|
10281
|
-
<xsl:
|
10282
|
-
<xsl:copy-of select="."/>
|
10283
|
-
</xsl:for-each>
|
10322
|
+
<xsl:call-template name="refine_fn-num-style"/>
|
10284
10323
|
|
10285
10324
|
<!-- https://github.com/metanorma/metanorma-ieee/issues/595 -->
|
10286
10325
|
<!-- <xsl:if test="following-sibling::node()[normalize-space() != ''][1][self::mn:fn]">
|
10287
10326
|
<xsl:attribute name="padding-right">0.5mm</xsl:attribute>
|
10288
10327
|
</xsl:if> -->
|
10289
10328
|
|
10290
|
-
<xsl:if test="preceding-sibling::node()[normalize-space() != ''][1][self::mn:fn]"
|
10329
|
+
<xsl:if test="preceding-sibling::node()[normalize-space() != ''][1][self::mn:fn]">, </xsl:if>
|
10291
10330
|
|
10292
10331
|
<xsl:call-template name="insert_basic_link">
|
10293
10332
|
<xsl:with-param name="element">
|
@@ -10584,30 +10623,6 @@
|
|
10584
10623
|
<xsl:template name="refine_bibitem-non-normative-list-body-style">
|
10585
10624
|
</xsl:template>
|
10586
10625
|
|
10587
|
-
<!-- footnote reference number for bibitem, in the text -->
|
10588
|
-
<xsl:attribute-set name="bibitem-note-fn-style">
|
10589
|
-
<xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
|
10590
|
-
<xsl:attribute name="font-size">65%</xsl:attribute>
|
10591
|
-
<xsl:attribute name="vertical-align">super</xsl:attribute>
|
10592
|
-
</xsl:attribute-set> <!-- bibitem-note-fn-style -->
|
10593
|
-
|
10594
|
-
<xsl:template name="refine_bibitem-note-fn-style">
|
10595
|
-
</xsl:template>
|
10596
|
-
|
10597
|
-
<!-- footnote number on the page bottom -->
|
10598
|
-
<xsl:attribute-set name="bibitem-note-fn-number-style">
|
10599
|
-
<xsl:attribute name="keep-with-next.within-line">always</xsl:attribute>
|
10600
|
-
<xsl:attribute name="font-size">60%</xsl:attribute>
|
10601
|
-
<xsl:attribute name="vertical-align">super</xsl:attribute>
|
10602
|
-
</xsl:attribute-set> <!-- bibitem-note-fn-number-style -->
|
10603
|
-
|
10604
|
-
<!-- footnote body (text) on the page bottom -->
|
10605
|
-
<xsl:attribute-set name="bibitem-note-fn-body-style">
|
10606
|
-
<xsl:attribute name="font-size">10pt</xsl:attribute>
|
10607
|
-
<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
|
10608
|
-
<xsl:attribute name="start-indent">0pt</xsl:attribute>
|
10609
|
-
</xsl:attribute-set> <!-- bibitem-note-fn-body-style -->
|
10610
|
-
|
10611
10626
|
<xsl:attribute-set name="references-non-normative-style">
|
10612
10627
|
</xsl:attribute-set> <!-- references-non-normative-style -->
|
10613
10628
|
|
@@ -10687,7 +10702,7 @@
|
|
10687
10702
|
|
10688
10703
|
<fo:list-item>
|
10689
10704
|
<fo:list-item-label end-indent="label-end()">
|
10690
|
-
<fo:block role="SKIP">
|
10705
|
+
<fo:block role="SKIP" id="__internal_layout__bibitem_{@id}_{generate-id()}">
|
10691
10706
|
<fo:inline role="SKIP">
|
10692
10707
|
<xsl:apply-templates select="mn:biblio-tag">
|
10693
10708
|
<xsl:with-param name="biblio_tag_part">first</xsl:with-param>
|
@@ -12965,10 +12980,28 @@
|
|
12965
12980
|
</xsl:choose>
|
12966
12981
|
</xsl:template>
|
12967
12982
|
|
12983
|
+
<xsl:attribute-set name="clause-style">
|
12984
|
+
|
12985
|
+
</xsl:attribute-set>
|
12986
|
+
|
12987
|
+
<xsl:template name="refine_clause-style">
|
12988
|
+
<!-- commented for https://github.com/metanorma/metanorma-ribose/issues/421 -->
|
12989
|
+
<!-- <xsl:if test="$namespace = 'rsd'">
|
12990
|
+
<xsl:variable name="level">
|
12991
|
+
<xsl:call-template name="getLevel">
|
12992
|
+
<xsl:with-param name="depth" select="mn:fmt-title/@depth"/>
|
12993
|
+
</xsl:call-template>
|
12994
|
+
</xsl:variable>
|
12995
|
+
<xsl:if test="$level >= 4">
|
12996
|
+
<xsl:attribute name="margin-left">13mm</xsl:attribute>
|
12997
|
+
</xsl:if>
|
12998
|
+
</xsl:if> -->
|
12999
|
+
</xsl:template>
|
13000
|
+
|
12968
13001
|
<!-- main sections -->
|
12969
13002
|
<xsl:template match="/*/mn:sections/*" name="sections_node" priority="2">
|
12970
13003
|
<xsl:call-template name="setNamedDestination"/>
|
12971
|
-
<fo:block>
|
13004
|
+
<fo:block role="Sect">
|
12972
13005
|
<xsl:call-template name="setId"/>
|
12973
13006
|
|
12974
13007
|
<xsl:call-template name="sections_element_style"/>
|
@@ -13096,6 +13129,10 @@
|
|
13096
13129
|
<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),' ',' ')"/>
|
13097
13130
|
</xsl:template>
|
13098
13131
|
|
13132
|
+
<!-- for case when update_xml_step1 (common.updatexml.xsl) doesn't apply when $table_if = 'true' -->
|
13133
|
+
<xsl:template match="mn:title[following-sibling::*[1][self::mn:fmt-title]]"/>
|
13134
|
+
<xsl:template match="mn:name[following-sibling::*[1][self::mn:fmt-name]]"/>
|
13135
|
+
|
13099
13136
|
<!-- insert fo:basic-link, if external-destination or internal-destination is non-empty, otherwise insert fo:inline -->
|
13100
13137
|
<xsl:template name="insert_basic_link">
|
13101
13138
|
<xsl:param name="element"/>
|
@@ -138,16 +138,6 @@ div.document-stage-band, div.document-type-band {
|
|
138
138
|
background-color: #333333;
|
139
139
|
}
|
140
140
|
|
141
|
-
a.FootnoteRef + a.FootnoteRef::before {
|
142
|
-
content: ", ";
|
143
|
-
vertical-align: super;
|
144
|
-
}
|
145
|
-
|
146
|
-
a.TableFootnoteRef + a.TableFootnoteRef::before {
|
147
|
-
content: ", ";
|
148
|
-
vertical-align: super;
|
149
|
-
}
|
150
|
-
|
151
141
|
a.TableFootnoteRef, span.TableFootnoteRef,
|
152
142
|
a.FootnoteRef, span.FootnoteRef {
|
153
143
|
vertical-align: super;
|
@@ -138,16 +138,6 @@ div.document-stage-band, div.document-type-band {
|
|
138
138
|
background-color: #333333;
|
139
139
|
}
|
140
140
|
|
141
|
-
a.FootnoteRef + a.FootnoteRef::before {
|
142
|
-
content: ", ";
|
143
|
-
vertical-align: super;
|
144
|
-
}
|
145
|
-
|
146
|
-
a.TableFootnoteRef + a.TableFootnoteRef::before {
|
147
|
-
content: ", ";
|
148
|
-
vertical-align: super;
|
149
|
-
}
|
150
|
-
|
151
141
|
a.TableFootnoteRef, span.TableFootnoteRef,
|
152
142
|
a.FootnoteRef, span.FootnoteRef {
|
153
143
|
vertical-align: super;
|
@@ -931,14 +921,6 @@ p.Biblio::before, p.NormRef::before {
|
|
931
921
|
}
|
932
922
|
|
933
923
|
/* Blocks */
|
934
|
-
.figure {
|
935
|
-
line-height: 1.6em;
|
936
|
-
padding: 1.5em;
|
937
|
-
margin: 2em 0 1em 0;
|
938
|
-
overflow: auto;
|
939
|
-
font-family: {{monospacefont}};
|
940
|
-
font-variant-ligatures: none;
|
941
|
-
}
|
942
924
|
.figure .FigureTitle, .figure .figure-title {
|
943
925
|
font-weight: 700;
|
944
926
|
font-size: 1em;
|
@@ -951,6 +933,14 @@ p.Biblio::before, p.NormRef::before {
|
|
951
933
|
max-width: 100%;
|
952
934
|
height: auto;
|
953
935
|
}
|
936
|
+
.figure {
|
937
|
+
line-height: 1.6em;
|
938
|
+
padding: 1.5em;
|
939
|
+
margin: 2em 0 1em 0;
|
940
|
+
overflow: auto;
|
941
|
+
font-family: {{monospacefont}};
|
942
|
+
font-variant-ligatures: none;
|
943
|
+
}
|
954
944
|
|
955
945
|
table div.figure {
|
956
946
|
padding: 0;
|
@@ -978,6 +968,11 @@ pre {
|
|
978
968
|
background: none;
|
979
969
|
}
|
980
970
|
|
971
|
+
.pseudocode .SourceTitle {
|
972
|
+
font-weight: 700;
|
973
|
+
font-size: 1em;
|
974
|
+
text-align: center;
|
975
|
+
}
|
981
976
|
.pseudocode {
|
982
977
|
background-color: #f7f7f7;
|
983
978
|
font-size: {{monospacefontsize}};
|
@@ -986,11 +981,6 @@ pre {
|
|
986
981
|
margin: 2em 0 1em 0;
|
987
982
|
overflow: auto;
|
988
983
|
}
|
989
|
-
.pseudocode .SourceTitle {
|
990
|
-
font-weight: 700;
|
991
|
-
font-size: 1em;
|
992
|
-
text-align: center;
|
993
|
-
}
|
994
984
|
.example .pseudocode {
|
995
985
|
background: none;
|
996
986
|
}
|
data/lib/metanorma/cc/isodoc.rng
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
<?xml version="1.0" encoding="UTF-8"?>
|
2
2
|
<grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
|
3
|
-
<!-- VERSION v2.1.
|
3
|
+
<!-- VERSION v2.1.3 -->
|
4
4
|
|
5
5
|
<!--
|
6
6
|
ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437
|
@@ -455,14 +455,7 @@ normative or informative references, some split references into sections organiz
|
|
455
455
|
</ref>
|
456
456
|
</zeroOrMore>
|
457
457
|
<zeroOrMore>
|
458
|
-
<ref name="
|
459
|
-
<a:documentation>Bibliographic item cited in the document</a:documentation>
|
460
|
-
</ref>
|
461
|
-
<zeroOrMore>
|
462
|
-
<ref name="note">
|
463
|
-
<a:documentation>Annotation of the bibliographic item</a:documentation>
|
464
|
-
</ref>
|
465
|
-
</zeroOrMore>
|
458
|
+
<ref name="ReferenceEntry"/>
|
466
459
|
</zeroOrMore>
|
467
460
|
<zeroOrMore>
|
468
461
|
<ref name="references">
|
@@ -604,18 +597,21 @@ gives an explicit page orientation</a:documentation>
|
|
604
597
|
</element>
|
605
598
|
</optional>
|
606
599
|
</define>
|
607
|
-
|
608
|
-
|
609
|
-
|
610
|
-
|
611
|
-
|
612
|
-
<attribute name="hiddenref">
|
613
|
-
<a:documentation>If true, number the footnote as normal, but suppress display of the footnote reference in the document body.
|
600
|
+
<define name="FnAttributes">
|
601
|
+
<ref name="RequiredId"/>
|
602
|
+
<optional>
|
603
|
+
<attribute name="hiddenref">
|
604
|
+
<a:documentation>If true, number the footnote as normal, but suppress display of the footnote reference in the document body.
|
614
605
|
This is done if the footnote reference is already presented in some other form, e.g. within a figure image.</a:documentation>
|
615
|
-
|
606
|
+
<data type="boolean"/>
|
607
|
+
</attribute>
|
608
|
+
</optional>
|
609
|
+
<attribute name="reference">
|
610
|
+
<a:documentation>The number of the footnote, used to identify it visually</a:documentation>
|
616
611
|
</attribute>
|
617
|
-
</
|
618
|
-
</
|
612
|
+
</define>
|
613
|
+
</include>
|
614
|
+
<!-- end overrides -->
|
619
615
|
<define name="TdAttributes" combine="interleave">
|
620
616
|
<ref name="RequiredId"/>
|
621
617
|
<optional>
|
@@ -853,6 +849,17 @@ titlecase, or lowercase</a:documentation>
|
|
853
849
|
<value>informative</value>
|
854
850
|
</choice>
|
855
851
|
</define>
|
852
|
+
<define name="ReferenceEntry">
|
853
|
+
<a:documentation>Entry in bibliography</a:documentation>
|
854
|
+
<ref name="doc_bibitem">
|
855
|
+
<a:documentation>Bibliographic item cited in the document</a:documentation>
|
856
|
+
</ref>
|
857
|
+
<zeroOrMore>
|
858
|
+
<ref name="note">
|
859
|
+
<a:documentation>Annotation of the bibliographic item</a:documentation>
|
860
|
+
</ref>
|
861
|
+
</zeroOrMore>
|
862
|
+
</define>
|
856
863
|
<define name="doc_bibitem">
|
857
864
|
<a:documentation>Standardisation document representation of bibliographic entry</a:documentation>
|
858
865
|
<element name="bibitem">
|
data/lib/metanorma/cc/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: metanorma-cc
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.7.
|
4
|
+
version: 2.7.5
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Ribose Inc.
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2025-09-
|
11
|
+
date: 2025-09-29 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: metanorma-generic
|