metanorma-csa 2.6.10 → 2.7.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/README.adoc +1 -1
- data/lib/isodoc/csa/csa.standard.xsl +139 -39
- data/lib/metanorma/csa/basicdoc.rng +6 -6
- data/lib/metanorma/csa/isodoc.rng +8 -60
- data/lib/metanorma/csa/version.rb +1 -1
- data/metanorma-csa.gemspec +2 -2
- metadata +5 -5
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: f9fbf21e53ed4478f6ec43e593984fd7ba6bf273df34a7b6a8b49c6d89b71e5b
|
4
|
+
data.tar.gz: 8674dcf9228706dba024db8019a39037affca9fd4d41744d13813b2b31c0f516
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: b92d2ec6643339f6b7ccdba7ecf9956bd650ffd772848edb09608947d05f03b8214ce0d2615dc2ceacd5e4817e26756136530dfaac505e06de93f6d9b860009c
|
7
|
+
data.tar.gz: 792f71be791f3403d8f5005f2de8086851aa559475014461149cf6a040d73b9f7a01b8470147e1141f5dfb28da41c8e41f76d08551700f7cf6dfb1582996a06d
|
data/README.adoc
CHANGED
@@ -2,7 +2,7 @@
|
|
2
2
|
|
3
3
|
image:https://img.shields.io/gem/v/metanorma-csa.svg["Gem Version", link="https://rubygems.org/gems/metanorma-csa"]
|
4
4
|
image:https://github.com/metanorma/metanorma-csa/workflows/rake/badge.svg["Build Status", link="https://github.com/metanorma/metanorma-csa/actions?query=workflow=rake"]
|
5
|
-
image:https://codeclimate.com/github/metanorma/metanorma-csand/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/metanorma/metanorma-csand"]
|
5
|
+
// image:https://codeclimate.com/github/metanorma/metanorma-csand/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/metanorma/metanorma-csand"]
|
6
6
|
image:https://img.shields.io/github/issues-pr-raw/metanorma/metanorma-csa.svg["Pull Requests", link="https://github.com/metanorma/metanorma-csa/pulls"]
|
7
7
|
image:https://img.shields.io/github/commits-since/metanorma/metanorma-csa/latest.svg["Commits since latest",link="https://github.com/metanorma/metanorma-csa/releases"]
|
8
8
|
|
@@ -262,7 +262,7 @@
|
|
262
262
|
<xsl:template name="insertListOf_Title">
|
263
263
|
<xsl:param name="title"/>
|
264
264
|
<fo:block role="TOCI" keep-with-next="always">
|
265
|
-
<fo:list-block
|
265
|
+
<fo:list-block xsl:use-attribute-sets="toc-listof-title-style">
|
266
266
|
<fo:list-item>
|
267
267
|
<fo:list-item-label end-indent="label-end()">
|
268
268
|
<fo:block font-size="1pt"> </fo:block>
|
@@ -279,20 +279,20 @@
|
|
279
279
|
|
280
280
|
<xsl:template name="insertListOf_Item">
|
281
281
|
<fo:block role="TOCI">
|
282
|
-
<fo:list-block
|
282
|
+
<fo:list-block xsl:use-attribute-sets="toc-listof-item-block-style">
|
283
283
|
<fo:list-item>
|
284
284
|
<fo:list-item-label end-indent="label-end()">
|
285
285
|
<fo:block font-size="1pt"> </fo:block>
|
286
286
|
</fo:list-item-label>
|
287
287
|
<fo:list-item-body start-indent="body-start()">
|
288
|
-
<fo:block
|
288
|
+
<fo:block xsl:use-attribute-sets="toc-listof-item-style">
|
289
289
|
<fo:basic-link internal-destination="{@id}">
|
290
290
|
<xsl:call-template name="setAltText">
|
291
291
|
<xsl:with-param name="value" select="@alt-text"/>
|
292
292
|
</xsl:call-template>
|
293
293
|
<xsl:apply-templates select="." mode="contents"/>
|
294
294
|
<fo:inline keep-together.within-line="always">
|
295
|
-
<fo:leader
|
295
|
+
<fo:leader xsl:use-attribute-sets="toc-leader-style"/>
|
296
296
|
<fo:inline><fo:page-number-citation ref-id="{@id}"/></fo:inline>
|
297
297
|
</fo:inline>
|
298
298
|
</fo:basic-link>
|
@@ -303,10 +303,10 @@
|
|
303
303
|
</fo:block>
|
304
304
|
</xsl:template>
|
305
305
|
|
306
|
-
<xsl:template match="mn:preface//mn:clause[@type = 'toc']" priority="3">
|
306
|
+
<xsl:template match="mn:preface//mn:clause[@type = 'toc']" name="toc" priority="3">
|
307
307
|
<xsl:param name="process">false</xsl:param>
|
308
308
|
<xsl:if test="$process = 'true'">
|
309
|
-
<fo:block-container
|
309
|
+
<fo:block-container xsl:use-attribute-sets="toc-style">
|
310
310
|
|
311
311
|
<xsl:apply-templates/>
|
312
312
|
|
@@ -314,24 +314,19 @@
|
|
314
314
|
<fo:block margin-left="-3mm" role="TOC">
|
315
315
|
<xsl:for-each select="$contents//mnx:item[@display = 'true']">
|
316
316
|
<fo:block role="TOCI">
|
317
|
-
<fo:list-block>
|
318
|
-
<xsl:
|
319
|
-
<xsl:choose>
|
320
|
-
<xsl:when test="@level >= 2"><xsl:value-of select="(@level - 1) * 10"/>mm</xsl:when>
|
321
|
-
<xsl:otherwise>3mm</xsl:otherwise>
|
322
|
-
</xsl:choose>
|
323
|
-
</xsl:attribute>
|
317
|
+
<fo:list-block xsl:use-attribute-sets="toc-item-block-style">
|
318
|
+
<xsl:call-template name="refine_toc-item-block-style"/>
|
324
319
|
<fo:list-item>
|
325
320
|
<fo:list-item-label end-indent="label-end()">
|
326
321
|
<fo:block font-size="1pt"> </fo:block>
|
327
322
|
</fo:list-item-label>
|
328
323
|
<fo:list-item-body start-indent="body-start()">
|
329
|
-
<fo:block
|
324
|
+
<fo:block xsl:use-attribute-sets="toc-item-style">
|
330
325
|
<fo:basic-link internal-destination="{@id}" fox:alt-text="{mnx:title}">
|
331
326
|
<fo:inline padding-right="2mm"><xsl:value-of select="@section"/></fo:inline>
|
332
327
|
<xsl:apply-templates select="mnx:title"/>
|
333
328
|
<fo:inline keep-together.within-line="always">
|
334
|
-
<fo:leader
|
329
|
+
<fo:leader xsl:use-attribute-sets="toc-leader-style"/>
|
335
330
|
<fo:inline><fo:page-number-citation ref-id="{@id}"/></fo:inline>
|
336
331
|
</fo:inline>
|
337
332
|
</fo:basic-link>
|
@@ -343,24 +338,24 @@
|
|
343
338
|
</xsl:for-each>
|
344
339
|
|
345
340
|
<!-- List of Tables -->
|
346
|
-
<xsl:
|
347
|
-
<xsl:
|
348
|
-
<xsl:
|
349
|
-
|
350
|
-
|
351
|
-
|
352
|
-
|
353
|
-
</xsl:
|
341
|
+
<xsl:for-each select="$contents//mnx:tables/mnx:table">
|
342
|
+
<xsl:if test="position() = 1">
|
343
|
+
<xsl:call-template name="insertListOf_Title">
|
344
|
+
<xsl:with-param name="title" select="$title-list-tables"/>
|
345
|
+
</xsl:call-template>
|
346
|
+
</xsl:if>
|
347
|
+
<xsl:call-template name="insertListOf_Item"/>
|
348
|
+
</xsl:for-each>
|
354
349
|
|
355
350
|
<!-- List of Figures -->
|
356
|
-
<xsl:
|
357
|
-
<xsl:
|
358
|
-
<xsl:
|
359
|
-
|
360
|
-
|
361
|
-
|
362
|
-
|
363
|
-
</xsl:
|
351
|
+
<xsl:for-each select="$contents//mnx:figures/mnx:figure">
|
352
|
+
<xsl:if test="position() = 1">
|
353
|
+
<xsl:call-template name="insertListOf_Title">
|
354
|
+
<xsl:with-param name="title" select="$title-list-figures"/>
|
355
|
+
</xsl:call-template>
|
356
|
+
</xsl:if>
|
357
|
+
<xsl:call-template name="insertListOf_Item"/>
|
358
|
+
</xsl:for-each>
|
364
359
|
|
365
360
|
</fo:block>
|
366
361
|
</xsl:if>
|
@@ -371,7 +366,7 @@
|
|
371
366
|
</xsl:template>
|
372
367
|
|
373
368
|
<xsl:template match="mn:preface//mn:clause[@type = 'toc']/mn:fmt-title" priority="3">
|
374
|
-
<fo:block
|
369
|
+
<fo:block xsl:use-attribute-sets="toc-title-style">
|
375
370
|
<xsl:apply-templates/>
|
376
371
|
</fo:block>
|
377
372
|
</xsl:template>
|
@@ -5629,6 +5624,16 @@
|
|
5629
5624
|
</xsl:variable>
|
5630
5625
|
<xsl:variable name="quot">"</xsl:variable>
|
5631
5626
|
<xsl:variable name="styles_">
|
5627
|
+
<!-- PDF: Borderless tables https://github.com/metanorma/metanorma-jis/issues/344 -->
|
5628
|
+
<xsl:if test="@plain = 'true' or ancestor::mn:table/@plain = 'true'">
|
5629
|
+
<style name="border-top">none</style>
|
5630
|
+
<style name="border-right">none</style>
|
5631
|
+
<style name="border-left">none</style>
|
5632
|
+
<style name="border-bottom">none</style>
|
5633
|
+
<style name="color">inherit</style>
|
5634
|
+
<style name="background-color">transparent</style>
|
5635
|
+
</xsl:if>
|
5636
|
+
|
5632
5637
|
<xsl:for-each select="xalan:nodeset($styles__)/mnx:item">
|
5633
5638
|
<xsl:variable name="key" select="normalize-space(substring-before(., ':'))"/>
|
5634
5639
|
<xsl:variable name="value" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
|
@@ -7617,7 +7622,10 @@
|
|
7617
7622
|
|
7618
7623
|
<xsl:call-template name="setNamedDestination"/>
|
7619
7624
|
|
7620
|
-
<fo:block-container
|
7625
|
+
<fo:block-container xsl:use-attribute-sets="note-style" role="SKIP">
|
7626
|
+
<xsl:if test="not(parent::mn:references)">
|
7627
|
+
<xsl:copy-of select="@id"/>
|
7628
|
+
</xsl:if>
|
7621
7629
|
|
7622
7630
|
<xsl:call-template name="setBlockSpanAll"/>
|
7623
7631
|
|
@@ -10066,7 +10074,7 @@
|
|
10066
10074
|
|
10067
10075
|
<xsl:template name="insertFootnoteSeparatorCommon">
|
10068
10076
|
<xsl:param name="leader_length">30%</xsl:param>
|
10069
|
-
<fo:static-content flow-name="xsl-footnote-separator">
|
10077
|
+
<fo:static-content flow-name="xsl-footnote-separator" role="artifact">
|
10070
10078
|
<fo:block>
|
10071
10079
|
<fo:leader leader-pattern="rule" leader-length="{$leader_length}"/>
|
10072
10080
|
</fo:block>
|
@@ -10301,13 +10309,14 @@
|
|
10301
10309
|
</xsl:template> <!-- bibitem -->
|
10302
10310
|
|
10303
10311
|
<!-- Bibliography (non-normative references) -->
|
10304
|
-
<xsl:template match="mn:references[not(@normative='true')]/mn:bibitem" name="bibitem_non_normative" priority="2">
|
10305
|
-
<xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][self::mn:bibitem] and 1 = 1)"/> <!-- current bibiitem is non-first -->
|
10312
|
+
<xsl:template match="mn:references[not(@normative='true')]/mn:bibitem | mn:references[not(@normative='true')]/mn:note" name="bibitem_non_normative" priority="2">
|
10313
|
+
<xsl:param name="skip" select="normalize-space(preceding-sibling::*[not(self::mn:note)][1][self::mn:bibitem] and 1 = 1)"/> <!-- current bibiitem is non-first -->
|
10306
10314
|
<!-- start CSA bibitem processing -->
|
10307
10315
|
<xsl:call-template name="setNamedDestination"/>
|
10308
10316
|
<fo:block id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-style">
|
10309
10317
|
<xsl:apply-templates select="mn:biblio-tag"/>
|
10310
10318
|
<xsl:apply-templates select="mn:formattedref"/>
|
10319
|
+
<xsl:call-template name="processBibliographyNote"/>
|
10311
10320
|
</fo:block>
|
10312
10321
|
<!-- END CSA bibitem processing -->
|
10313
10322
|
|
@@ -10338,7 +10347,7 @@
|
|
10338
10347
|
</fo:list-item>
|
10339
10348
|
</xsl:otherwise>
|
10340
10349
|
</xsl:choose>
|
10341
|
-
<xsl:apply-templates select="following-sibling::*[1][self::mn:bibitem]
|
10350
|
+
<xsl:apply-templates select="following-sibling::*[1]"> <!-- [self::mn:bibitem] -->
|
10342
10351
|
<xsl:with-param name="skip">false</xsl:with-param>
|
10343
10352
|
</xsl:apply-templates>
|
10344
10353
|
</xsl:template>
|
@@ -10355,8 +10364,26 @@
|
|
10355
10364
|
</xsl:apply-templates>
|
10356
10365
|
<xsl:apply-templates select="mn:formattedref"/>
|
10357
10366
|
<!-- end bibitem processing -->
|
10367
|
+
|
10368
|
+
<xsl:call-template name="processBibliographyNote"/>
|
10358
10369
|
</xsl:template> <!-- processBibitem (bibitem) -->
|
10359
10370
|
|
10371
|
+
<xsl:template name="processBibliographyNote">
|
10372
|
+
<xsl:if test="self::mn:note">
|
10373
|
+
<xsl:variable name="note_node">
|
10374
|
+
<xsl:element name="{local-name(..)}" namespace="{$namespace_full}"> <!-- save parent context node for determining styles -->
|
10375
|
+
<xsl:copy> <!-- skip @id -->
|
10376
|
+
<xsl:copy-of select="node()"/>
|
10377
|
+
</xsl:copy>
|
10378
|
+
</xsl:element>
|
10379
|
+
</xsl:variable>
|
10380
|
+
<!-- <xsl:for-each select="xalan:nodeset($note_node)//mn:note">
|
10381
|
+
<xsl:call-template name="note"/>
|
10382
|
+
</xsl:for-each> -->
|
10383
|
+
<xsl:call-template name="note"/>
|
10384
|
+
</xsl:if>
|
10385
|
+
</xsl:template>
|
10386
|
+
|
10360
10387
|
<xsl:template match="mn:title" mode="title">
|
10361
10388
|
<fo:inline><xsl:apply-templates/></fo:inline>
|
10362
10389
|
</xsl:template>
|
@@ -10902,6 +10929,79 @@
|
|
10902
10929
|
<!-- End Form's elements processing -->
|
10903
10930
|
<!-- =================== -->
|
10904
10931
|
|
10932
|
+
<xsl:attribute-set name="toc-style">
|
10933
|
+
<xsl:attribute name="font-size">12pt</xsl:attribute>
|
10934
|
+
<xsl:attribute name="line-height">170%</xsl:attribute>
|
10935
|
+
<xsl:attribute name="color">rgb(7, 72, 156)</xsl:attribute>
|
10936
|
+
</xsl:attribute-set>
|
10937
|
+
|
10938
|
+
<xsl:template name="refine_toc-style">
|
10939
|
+
</xsl:template>
|
10940
|
+
|
10941
|
+
<xsl:attribute-set name="toc-title-style">
|
10942
|
+
<xsl:attribute name="font-size">26pt</xsl:attribute>
|
10943
|
+
<xsl:attribute name="color">black</xsl:attribute>
|
10944
|
+
<xsl:attribute name="margin-top">2pt</xsl:attribute>
|
10945
|
+
<xsl:attribute name="margin-bottom">30pt</xsl:attribute>
|
10946
|
+
<xsl:attribute name="role">H1</xsl:attribute>
|
10947
|
+
</xsl:attribute-set>
|
10948
|
+
|
10949
|
+
<xsl:template name="refine_toc-title-style">
|
10950
|
+
</xsl:template>
|
10951
|
+
|
10952
|
+
<xsl:attribute-set name="toc-title-page-style">
|
10953
|
+
</xsl:attribute-set> <!-- toc-title-page-style -->
|
10954
|
+
|
10955
|
+
<xsl:template name="refine_toc-title-page-style">
|
10956
|
+
</xsl:template>
|
10957
|
+
|
10958
|
+
<xsl:attribute-set name="toc-item-block-style">
|
10959
|
+
<xsl:attribute name="provisional-distance-between-starts">3mm</xsl:attribute>
|
10960
|
+
</xsl:attribute-set>
|
10961
|
+
|
10962
|
+
<xsl:template name="refine_toc-item-block-style">
|
10963
|
+
<xsl:if test="@level >= 2">
|
10964
|
+
<xsl:attribute name="provisional-distance-between-starts"><xsl:value-of select="(@level - 1) * 10"/>mm</xsl:attribute>
|
10965
|
+
</xsl:if>
|
10966
|
+
</xsl:template>
|
10967
|
+
|
10968
|
+
<xsl:attribute-set name="toc-item-style">
|
10969
|
+
<xsl:attribute name="role">TOCI</xsl:attribute>
|
10970
|
+
<xsl:attribute name="text-align-last">justify</xsl:attribute>
|
10971
|
+
<xsl:attribute name="margin-left">12mm</xsl:attribute>
|
10972
|
+
<xsl:attribute name="text-indent">-12mm</xsl:attribute>
|
10973
|
+
<xsl:attribute name="role">SKIP</xsl:attribute>
|
10974
|
+
</xsl:attribute-set> <!-- END: toc-item-style -->
|
10975
|
+
|
10976
|
+
<xsl:template name="refine_toc-item-style">
|
10977
|
+
</xsl:template> <!-- END: refine_toc-item-style -->
|
10978
|
+
|
10979
|
+
<xsl:attribute-set name="toc-leader-style">
|
10980
|
+
<xsl:attribute name="leader-pattern">dots</xsl:attribute>
|
10981
|
+
</xsl:attribute-set> <!-- END: toc-leader-style -->
|
10982
|
+
|
10983
|
+
<xsl:attribute-set name="toc-pagenumber-style">
|
10984
|
+
</xsl:attribute-set>
|
10985
|
+
|
10986
|
+
<!-- List of Figures, Tables -->
|
10987
|
+
<xsl:attribute-set name="toc-listof-title-style">
|
10988
|
+
<xsl:attribute name="provisional-distance-between-starts">3mm</xsl:attribute>
|
10989
|
+
</xsl:attribute-set>
|
10990
|
+
|
10991
|
+
<xsl:template name="refine_toc-listof-title-style">
|
10992
|
+
</xsl:template>
|
10993
|
+
|
10994
|
+
<xsl:attribute-set name="toc-listof-item-block-style">
|
10995
|
+
<xsl:attribute name="provisional-distance-between-starts">10mm</xsl:attribute>
|
10996
|
+
</xsl:attribute-set>
|
10997
|
+
|
10998
|
+
<xsl:attribute-set name="toc-listof-item-style">
|
10999
|
+
<xsl:attribute name="role">TOCI</xsl:attribute>
|
11000
|
+
<xsl:attribute name="text-align-last">justify</xsl:attribute>
|
11001
|
+
<xsl:attribute name="margin-left">12mm</xsl:attribute>
|
11002
|
+
<xsl:attribute name="text-indent">-12mm</xsl:attribute>
|
11003
|
+
</xsl:attribute-set>
|
11004
|
+
|
10905
11005
|
<xsl:template name="processPrefaceSectionsDefault_Contents">
|
10906
11006
|
<xsl:variable name="nodes_preface_">
|
10907
11007
|
<xsl:for-each select="/*/mn:preface/*[not(self::mn:note or self::mn:admonition or @type = 'toc')]">
|
@@ -11239,7 +11339,7 @@
|
|
11239
11339
|
</xsl:if>
|
11240
11340
|
|
11241
11341
|
<xsl:for-each select="$contents_nodes/mnx:doc">
|
11242
|
-
<fo:bookmark internal-destination="{contents/mnx:item[@display = 'true'][1]/@id}" starting-state="hide">
|
11342
|
+
<fo:bookmark internal-destination="{mnx:contents/mnx:item[@display = 'true'][1]/@id}" starting-state="hide">
|
11243
11343
|
<xsl:if test="@bundle = 'true'">
|
11244
11344
|
<xsl:attribute name="internal-destination"><xsl:value-of select="@firstpage_id"/></xsl:attribute>
|
11245
11345
|
</xsl:if>
|
@@ -11273,7 +11373,7 @@
|
|
11273
11373
|
</xsl:choose>
|
11274
11374
|
</fo:bookmark-title>
|
11275
11375
|
|
11276
|
-
<xsl:apply-templates select="contents/mnx:item" mode="bookmark"/>
|
11376
|
+
<xsl:apply-templates select="mnx:contents/mnx:item" mode="bookmark"/>
|
11277
11377
|
|
11278
11378
|
<xsl:call-template name="insertFigureBookmarks">
|
11279
11379
|
<xsl:with-param name="contents" select="mnx:contents"/>
|
@@ -198,14 +198,14 @@ Applicable to modify and delete</a:documentation>
|
|
198
198
|
</zeroOrMore>
|
199
199
|
</element>
|
200
200
|
</optional>
|
201
|
-
<
|
201
|
+
<zeroOrMore>
|
202
202
|
<element name="description">
|
203
|
-
<a:documentation>Description of the change described in this block</a:documentation>
|
204
|
-
<
|
203
|
+
<a:documentation>Description(s) of the change described in this block</a:documentation>
|
204
|
+
<oneOrMore>
|
205
205
|
<ref name="BasicBlock"/>
|
206
|
-
</
|
206
|
+
</oneOrMore>
|
207
207
|
</element>
|
208
|
-
</
|
208
|
+
</zeroOrMore>
|
209
209
|
<optional>
|
210
210
|
<element name="newcontent">
|
211
211
|
<a:documentation>New content to be added to the document; applicable to add and modify</a:documentation>
|
@@ -1291,13 +1291,13 @@ Restricted recursively to contain only other such inline elements with no identi
|
|
1291
1291
|
<ref name="pure_strike"/>
|
1292
1292
|
<ref name="pure_smallcap"/>
|
1293
1293
|
<ref name="br"/>
|
1294
|
+
<ref name="stem"/>
|
1294
1295
|
</choice>
|
1295
1296
|
</define>
|
1296
1297
|
<define name="NestedTextElement">
|
1297
1298
|
<a:documentation>Contents of TextElement tags: leaves out tags that should occur only at top level of block: bookmark image hr pagebreak</a:documentation>
|
1298
1299
|
<choice>
|
1299
1300
|
<ref name="PureTextElement"/>
|
1300
|
-
<ref name="stem"/>
|
1301
1301
|
<ref name="eref"/>
|
1302
1302
|
<ref name="xref"/>
|
1303
1303
|
<ref name="hyperlink"/>
|
@@ -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.0
|
3
|
+
<!-- VERSION v2.1.0 -->
|
4
4
|
|
5
5
|
<!--
|
6
6
|
ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437
|
@@ -42,36 +42,6 @@ All IdRefType instances point not to `@id` in Semantic XML, which is the Content
|
|
42
42
|
but to `@anchor`, the user-supplied cross-reference</a:documentation>
|
43
43
|
<text/>
|
44
44
|
</define>
|
45
|
-
<define name="index-primary">
|
46
|
-
<element name="primary">
|
47
|
-
<oneOrMore>
|
48
|
-
<choice>
|
49
|
-
<ref name="PureTextElement"/>
|
50
|
-
<ref name="stem"/>
|
51
|
-
</choice>
|
52
|
-
</oneOrMore>
|
53
|
-
</element>
|
54
|
-
</define>
|
55
|
-
<define name="index-secondary">
|
56
|
-
<element name="secondary">
|
57
|
-
<oneOrMore>
|
58
|
-
<choice>
|
59
|
-
<ref name="PureTextElement"/>
|
60
|
-
<ref name="stem"/>
|
61
|
-
</choice>
|
62
|
-
</oneOrMore>
|
63
|
-
</element>
|
64
|
-
</define>
|
65
|
-
<define name="index-tertiary">
|
66
|
-
<element name="tertiary">
|
67
|
-
<oneOrMore>
|
68
|
-
<choice>
|
69
|
-
<ref name="PureTextElement"/>
|
70
|
-
<ref name="stem"/>
|
71
|
-
</choice>
|
72
|
-
</oneOrMore>
|
73
|
-
</element>
|
74
|
-
</define>
|
75
45
|
<define name="review">
|
76
46
|
<a:documentation>Generalise BasicDoc element from just review comments, to general annotations;
|
77
47
|
the type attribute defaults to `review` for reviews</a:documentation>
|
@@ -592,28 +562,6 @@ normative or informative references, some split references into sections organiz
|
|
592
562
|
</oneOrMore>
|
593
563
|
</element>
|
594
564
|
</define>
|
595
|
-
<define name="sub">
|
596
|
-
<a:documentation>Subscript text. Corresponds to HTML `sub</a:documentation>
|
597
|
-
<element name="sub">
|
598
|
-
<zeroOrMore>
|
599
|
-
<choice>
|
600
|
-
<ref name="PureTextElement"/>
|
601
|
-
<ref name="stem"/>
|
602
|
-
</choice>
|
603
|
-
</zeroOrMore>
|
604
|
-
</element>
|
605
|
-
</define>
|
606
|
-
<define name="sup">
|
607
|
-
<a:documentation>Superscript text. Corresponds to HTML `sup`</a:documentation>
|
608
|
-
<element name="sup">
|
609
|
-
<zeroOrMore>
|
610
|
-
<choice>
|
611
|
-
<ref name="PureTextElement"/>
|
612
|
-
<ref name="stem"/>
|
613
|
-
</choice>
|
614
|
-
</zeroOrMore>
|
615
|
-
</element>
|
616
|
-
</define>
|
617
565
|
<define name="pagebreak">
|
618
566
|
<a:documentation>Page break. Only applicable in paged layouts (e.g. PDF, Word), and not flow layouts (e.g. HTML)</a:documentation>
|
619
567
|
<element name="pagebreak">
|
@@ -735,6 +683,12 @@ titlecase, or lowercase</a:documentation>
|
|
735
683
|
<ref name="BlockAttributes"/>
|
736
684
|
</define>
|
737
685
|
<define name="TableAttributes" combine="interleave">
|
686
|
+
<optional>
|
687
|
+
<attribute name="plain">
|
688
|
+
<a:documentation>Render as a plain attribute, with no shading or borders</a:documentation>
|
689
|
+
<data type="boolean"/>
|
690
|
+
</attribute>
|
691
|
+
</optional>
|
738
692
|
<optional>
|
739
693
|
<attribute name="width">
|
740
694
|
<a:documentation>Width of the table block in rendering</a:documentation>
|
@@ -1088,7 +1042,6 @@ That concept may be defined as a term within the current document, or it may be
|
|
1088
1042
|
<zeroOrMore>
|
1089
1043
|
<choice>
|
1090
1044
|
<ref name="PureTextElement"/>
|
1091
|
-
<ref name="stem"/>
|
1092
1045
|
<ref name="index"/>
|
1093
1046
|
<ref name="index-xref"/>
|
1094
1047
|
</choice>
|
@@ -1101,7 +1054,6 @@ That concept may be defined as a term within the current document, or it may be
|
|
1101
1054
|
<zeroOrMore>
|
1102
1055
|
<choice>
|
1103
1056
|
<ref name="PureTextElement"/>
|
1104
|
-
<ref name="stem"/>
|
1105
1057
|
<ref name="index"/>
|
1106
1058
|
<ref name="index-xref"/>
|
1107
1059
|
</choice>
|
@@ -2019,10 +1971,7 @@ used in document amendments</a:documentation>
|
|
2019
1971
|
<element name="name">
|
2020
1972
|
<a:documentation>The symbolic form of the designation</a:documentation>
|
2021
1973
|
<oneOrMore>
|
2022
|
-
<
|
2023
|
-
<ref name="PureTextElement"/>
|
2024
|
-
<ref name="stem"/>
|
2025
|
-
</choice>
|
1974
|
+
<ref name="PureTextElement"/>
|
2026
1975
|
</oneOrMore>
|
2027
1976
|
</element>
|
2028
1977
|
</element>
|
@@ -2075,7 +2024,6 @@ used in document amendments</a:documentation>
|
|
2075
2024
|
<zeroOrMore>
|
2076
2025
|
<choice>
|
2077
2026
|
<ref name="PureTextElement"/>
|
2078
|
-
<ref name="stem"/>
|
2079
2027
|
<ref name="index"/>
|
2080
2028
|
<ref name="index-xref"/>
|
2081
2029
|
</choice>
|
data/metanorma-csa.gemspec
CHANGED
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
|
|
29
29
|
spec.require_paths = ["lib"]
|
30
30
|
spec.required_ruby_version = Gem::Requirement.new(">= 3.1.0")
|
31
31
|
|
32
|
-
spec.add_dependency "metanorma-generic", "~> 3.0
|
32
|
+
spec.add_dependency "metanorma-generic", "~> 3.1.0"
|
33
33
|
|
34
34
|
spec.add_development_dependency "debug"
|
35
35
|
spec.add_development_dependency "equivalent-xml", "~> 0.6"
|
@@ -42,5 +42,5 @@ spec.add_development_dependency "rubocop-performance"
|
|
42
42
|
spec.add_development_dependency "sassc-embedded", "~> 1"
|
43
43
|
spec.add_development_dependency "simplecov", "~> 0.15"
|
44
44
|
spec.add_development_dependency "timecop", "~> 0.9"
|
45
|
-
spec.add_development_dependency "
|
45
|
+
spec.add_development_dependency "canon"
|
46
46
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: metanorma-csa
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.
|
4
|
+
version: 2.7.1
|
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-
|
11
|
+
date: 2025-08-04 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: metanorma-generic
|
@@ -16,14 +16,14 @@ dependencies:
|
|
16
16
|
requirements:
|
17
17
|
- - "~>"
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version: 3.0
|
19
|
+
version: 3.1.0
|
20
20
|
type: :runtime
|
21
21
|
prerelease: false
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
23
23
|
requirements:
|
24
24
|
- - "~>"
|
25
25
|
- !ruby/object:Gem::Version
|
26
|
-
version: 3.0
|
26
|
+
version: 3.1.0
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: debug
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
@@ -179,7 +179,7 @@ dependencies:
|
|
179
179
|
- !ruby/object:Gem::Version
|
180
180
|
version: '0.9'
|
181
181
|
- !ruby/object:Gem::Dependency
|
182
|
-
name:
|
182
|
+
name: canon
|
183
183
|
requirement: !ruby/object:Gem::Requirement
|
184
184
|
requirements:
|
185
185
|
- - ">="
|