metanorma-cc 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/cc/cc.standard.xsl +137 -41
- data/lib/metanorma/cc/basicdoc.rng +6 -6
- data/lib/metanorma/cc/isodoc.rng +8 -60
- data/lib/metanorma/cc/version.rb +1 -1
- data/metanorma-cc.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: e86f9bdaf8091862c174fe2573fea6c9e672e8ea9e58d788a4182cd042ca4847
|
4
|
+
data.tar.gz: b870f5fa3f6ca466b98fc07c4fd16c0827bbb596d82a4de6e9e6165cf6cefc3a
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 1d9886496fad670947129c1f248931034dd736982f732132dbb4eab3e4bcee0e81865fe22f78666d2ef634e95e8c916575f462ec85c9e2eb81379d8d08a011c3
|
7
|
+
data.tar.gz: 928d950dadeff470914dd19576fd85f4f1bdb04b75e9472238874b36b801e1d579620501f577395a3f00d9242b937b2556b74db241ae44e387cfb0a43ad9a078
|
data/README.adoc
CHANGED
@@ -2,7 +2,7 @@
|
|
2
2
|
|
3
3
|
image:https://img.shields.io/gem/v/metanorma-cc.svg["Gem Version", link="https://rubygems.org/gems/metanorma-cc"]
|
4
4
|
image:https://github.com/metanorma/metanorma-cc/workflows/rake/badge.svg["Build Status", link="https://github.com/metanorma/metanorma-cc/actions?workflow=rake"]
|
5
|
-
image:https://codeclimate.com/github/metanorma/metanorma-cc/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/metanorma/metanorma-cc"]
|
5
|
+
// image:https://codeclimate.com/github/metanorma/metanorma-cc/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/metanorma/metanorma-cc"]
|
6
6
|
image:https://img.shields.io/github/issues-pr-raw/metanorma/metanorma-cc.svg["Pull Requests", link="https://github.com/metanorma/metanorma-cc/pulls"]
|
7
7
|
image:https://img.shields.io/github/commits-since/metanorma/metanorma-cc/latest.svg["Commits since latest",link="https://github.com/metanorma/metanorma-cc/releases"]
|
8
8
|
|
@@ -301,6 +301,8 @@
|
|
301
301
|
<xsl:value-of select="/mn:metanorma/mn:bibdata/mn:copyright/mn:owner/mn:organization/mn:name"/>
|
302
302
|
<xsl:text> TC </xsl:text>
|
303
303
|
<xsl:value-of select="/mn:metanorma/mn:bibdata/mn:ext/mn:editorialgroup/mn:technical-committee"/>
|
304
|
+
<!-- <xsl:text> </xsl:text>
|
305
|
+
<xsl:value-of select="//mn:metanorma/mn:bibdata/mn:contributor[mn:role[@type = 'author' and mn:description[normalize-space(@language) = ''] = 'Technical committee']]/mn:organization/mn:subdivision[@type = 'Technical committee']/mn:identifier"/> -->
|
304
306
|
<xsl:text> </xsl:text>
|
305
307
|
</fo:block>
|
306
308
|
</fo:block>
|
@@ -345,27 +347,27 @@
|
|
345
347
|
|
346
348
|
<xsl:template name="insertListOf_Title">
|
347
349
|
<xsl:param name="title"/>
|
348
|
-
<fo:block
|
350
|
+
<fo:block xsl:use-attribute-sets="toc-listof-title-style">
|
349
351
|
<xsl:value-of select="$title"/>
|
350
352
|
</fo:block>
|
351
353
|
</xsl:template>
|
352
354
|
|
353
355
|
<xsl:template name="insertListOf_Item">
|
354
356
|
<fo:block role="TOCI">
|
355
|
-
<fo:list-block
|
357
|
+
<fo:list-block xsl:use-attribute-sets="toc-listof-item-block-style">
|
356
358
|
<fo:list-item role="SKIP">
|
357
359
|
<fo:list-item-label end-indent="label-end()" role="SKIP">
|
358
360
|
<fo:block/>
|
359
361
|
</fo:list-item-label>
|
360
362
|
<fo:list-item-body start-indent="body-start()" role="SKIP">
|
361
|
-
<fo:block
|
363
|
+
<fo:block xsl:use-attribute-sets="toc-listof-item-style">
|
362
364
|
<fo:basic-link internal-destination="{@id}">
|
363
365
|
<xsl:call-template name="setAltText">
|
364
366
|
<xsl:with-param name="value" select="@alt-text"/>
|
365
367
|
</xsl:call-template>
|
366
368
|
<xsl:apply-templates select="." mode="contents"/>
|
367
369
|
<fo:inline keep-together.within-line="always" role="SKIP">
|
368
|
-
<fo:leader
|
370
|
+
<fo:leader xsl:use-attribute-sets="toc-leader-style"/>
|
369
371
|
<fo:inline role="SKIP"><fo:wrapper role="artifact"><fo:page-number-citation ref-id="{@id}"/></fo:wrapper></fo:inline>
|
370
372
|
</fo:inline>
|
371
373
|
</fo:basic-link>
|
@@ -376,8 +378,8 @@
|
|
376
378
|
</fo:block>
|
377
379
|
</xsl:template>
|
378
380
|
|
379
|
-
<xsl:template match="mn:preface//mn:clause[@type = 'toc']" priority="3">
|
380
|
-
<fo:block-container
|
381
|
+
<xsl:template match="mn:preface//mn:clause[@type = 'toc']" name="toc" priority="3">
|
382
|
+
<fo:block-container xsl:use-attribute-sets="toc-style">
|
381
383
|
<!-- render 'Contents' outside if role="TOC" -->
|
382
384
|
<xsl:apply-templates select="mn:fmt-title"/>
|
383
385
|
<fo:block role="TOC">
|
@@ -388,10 +390,9 @@
|
|
388
390
|
|
389
391
|
<xsl:for-each select="$contents//mnx:item[@display = 'true']"><!-- [not(@level = 2 and starts-with(@section, '0'))] skip clause from preface -->
|
390
392
|
|
391
|
-
<fo:block
|
392
|
-
|
393
|
-
|
394
|
-
</xsl:if>
|
393
|
+
<fo:block xsl:use-attribute-sets="toc-item-style">
|
394
|
+
|
395
|
+
<xsl:call-template name="refine_toc-item-style"/>
|
395
396
|
|
396
397
|
<fo:basic-link internal-destination="{@id}" fox:alt-text="{@section} {mnx:title}"> <!-- link at this level needs for PDF structure tags -->
|
397
398
|
<fo:list-block role="SKIP">
|
@@ -413,7 +414,7 @@
|
|
413
414
|
<fo:basic-link internal-destination="{@id}" fox:alt-text="{mnx:title}" role="SKIP">
|
414
415
|
<xsl:apply-templates select="mnx:title"/>
|
415
416
|
<fo:inline keep-together.within-line="always" role="SKIP">
|
416
|
-
<fo:leader
|
417
|
+
<fo:leader xsl:use-attribute-sets="toc-leader-style"/>
|
417
418
|
<fo:inline role="SKIP"><fo:wrapper role="artifact"><fo:page-number-citation ref-id="{@id}"/></fo:wrapper></fo:inline>
|
418
419
|
</fo:inline>
|
419
420
|
</fo:basic-link>
|
@@ -426,37 +427,31 @@
|
|
426
427
|
</xsl:for-each>
|
427
428
|
|
428
429
|
<!-- List of Tables -->
|
429
|
-
<xsl:
|
430
|
-
<xsl:
|
431
|
-
<xsl:
|
432
|
-
|
433
|
-
|
434
|
-
|
435
|
-
|
436
|
-
</xsl:
|
430
|
+
<xsl:for-each select="$contents//mnx:tables/mnx:table">
|
431
|
+
<xsl:if test="position() = 1">
|
432
|
+
<xsl:call-template name="insertListOf_Title">
|
433
|
+
<xsl:with-param name="title" select="$title-list-tables"/>
|
434
|
+
</xsl:call-template>
|
435
|
+
</xsl:if>
|
436
|
+
<xsl:call-template name="insertListOf_Item"/>
|
437
|
+
</xsl:for-each>
|
437
438
|
|
438
439
|
<!-- List of Figures -->
|
439
|
-
<xsl:
|
440
|
-
<xsl:
|
441
|
-
<xsl:
|
442
|
-
|
443
|
-
|
444
|
-
|
445
|
-
|
446
|
-
</xsl:
|
440
|
+
<xsl:for-each select="$contents//mnx:figures/mnx:figure">
|
441
|
+
<xsl:if test="position() = 1">
|
442
|
+
<xsl:call-template name="insertListOf_Title">
|
443
|
+
<xsl:with-param name="title" select="$title-list-figures"/>
|
444
|
+
</xsl:call-template>
|
445
|
+
</xsl:if>
|
446
|
+
<xsl:call-template name="insertListOf_Item"/>
|
447
|
+
</xsl:for-each>
|
447
448
|
</xsl:if>
|
448
449
|
</fo:block>
|
449
450
|
</fo:block-container>
|
450
451
|
</xsl:template>
|
451
452
|
|
452
453
|
<xsl:template match="mn:preface//mn:clause[@type = 'toc']/mn:fmt-title" priority="3">
|
453
|
-
|
454
|
-
<xsl:call-template name="getTitle">
|
455
|
-
<xsl:with-param name="name" select="'title-toc'"/>
|
456
|
-
</xsl:call-template>
|
457
|
-
</xsl:variable> -->
|
458
|
-
<fo:block font-size="14pt" margin-bottom="15.5pt" role="H1">
|
459
|
-
<!-- <xsl:value-of select="$title-toc"/> -->
|
454
|
+
<fo:block xsl:use-attribute-sets="toc-title-style">
|
460
455
|
<xsl:apply-templates/>
|
461
456
|
</fo:block>
|
462
457
|
</xsl:template>
|
@@ -5640,6 +5635,16 @@
|
|
5640
5635
|
</xsl:variable>
|
5641
5636
|
<xsl:variable name="quot">"</xsl:variable>
|
5642
5637
|
<xsl:variable name="styles_">
|
5638
|
+
<!-- PDF: Borderless tables https://github.com/metanorma/metanorma-jis/issues/344 -->
|
5639
|
+
<xsl:if test="@plain = 'true' or ancestor::mn:table/@plain = 'true'">
|
5640
|
+
<style name="border-top">none</style>
|
5641
|
+
<style name="border-right">none</style>
|
5642
|
+
<style name="border-left">none</style>
|
5643
|
+
<style name="border-bottom">none</style>
|
5644
|
+
<style name="color">inherit</style>
|
5645
|
+
<style name="background-color">transparent</style>
|
5646
|
+
</xsl:if>
|
5647
|
+
|
5643
5648
|
<xsl:for-each select="xalan:nodeset($styles__)/mnx:item">
|
5644
5649
|
<xsl:variable name="key" select="normalize-space(substring-before(., ':'))"/>
|
5645
5650
|
<xsl:variable name="value" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
|
@@ -7635,7 +7640,10 @@
|
|
7635
7640
|
|
7636
7641
|
<xsl:call-template name="setNamedDestination"/>
|
7637
7642
|
|
7638
|
-
<fo:block-container
|
7643
|
+
<fo:block-container xsl:use-attribute-sets="note-style" role="SKIP">
|
7644
|
+
<xsl:if test="not(parent::mn:references)">
|
7645
|
+
<xsl:copy-of select="@id"/>
|
7646
|
+
</xsl:if>
|
7639
7647
|
|
7640
7648
|
<xsl:call-template name="setBlockSpanAll"/>
|
7641
7649
|
|
@@ -10076,7 +10084,7 @@
|
|
10076
10084
|
|
10077
10085
|
<xsl:template name="insertFootnoteSeparatorCommon">
|
10078
10086
|
<xsl:param name="leader_length">30%</xsl:param>
|
10079
|
-
<fo:static-content flow-name="xsl-footnote-separator">
|
10087
|
+
<fo:static-content flow-name="xsl-footnote-separator" role="artifact">
|
10080
10088
|
<fo:block>
|
10081
10089
|
<fo:leader leader-pattern="rule" leader-length="{$leader_length}"/>
|
10082
10090
|
</fo:block>
|
@@ -10303,8 +10311,8 @@
|
|
10303
10311
|
</xsl:template> <!-- bibitem -->
|
10304
10312
|
|
10305
10313
|
<!-- Bibliography (non-normative references) -->
|
10306
|
-
<xsl:template match="mn:references[not(@normative='true')]/mn:bibitem" name="bibitem_non_normative" priority="2">
|
10307
|
-
<xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][self::mn:bibitem] and 1 = 1)"/> <!-- current bibiitem is non-first --> <!-- $namespace = 'csd' or $namespace = 'gb' or $namespace = 'iec' or $namespace = 'ieee' or $namespace = 'iso' or $namespace = 'jcgm' or $namespace = 'm3d' or
|
10314
|
+
<xsl:template match="mn:references[not(@normative='true')]/mn:bibitem | mn:references[not(@normative='true')]/mn:note" name="bibitem_non_normative" priority="2">
|
10315
|
+
<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 --> <!-- $namespace = 'csd' or $namespace = 'gb' or $namespace = 'iec' or $namespace = 'ieee' or $namespace = 'iso' or $namespace = 'jcgm' or $namespace = 'm3d' or
|
10308
10316
|
$namespace = 'mpfd' or $namespace = 'ogc' or $namespace = 'ogc-white-paper' -->
|
10309
10317
|
<!-- Example: [1] ISO 9:1995, Information and documentation – Transliteration of Cyrillic characters into Latin characters – Slavic and non-Slavic languages -->
|
10310
10318
|
<xsl:call-template name="setNamedDestination"/>
|
@@ -10356,7 +10364,7 @@
|
|
10356
10364
|
</fo:list-item>
|
10357
10365
|
</xsl:otherwise>
|
10358
10366
|
</xsl:choose>
|
10359
|
-
<xsl:apply-templates select="following-sibling::*[1][self::mn:bibitem]
|
10367
|
+
<xsl:apply-templates select="following-sibling::*[1]"> <!-- [self::mn:bibitem] -->
|
10360
10368
|
<xsl:with-param name="skip">false</xsl:with-param>
|
10361
10369
|
</xsl:apply-templates>
|
10362
10370
|
</xsl:template>
|
@@ -10373,8 +10381,26 @@
|
|
10373
10381
|
</xsl:apply-templates>
|
10374
10382
|
<xsl:apply-templates select="mn:formattedref"/>
|
10375
10383
|
<!-- end bibitem processing -->
|
10384
|
+
|
10385
|
+
<xsl:call-template name="processBibliographyNote"/>
|
10376
10386
|
</xsl:template> <!-- processBibitem (bibitem) -->
|
10377
10387
|
|
10388
|
+
<xsl:template name="processBibliographyNote">
|
10389
|
+
<xsl:if test="self::mn:note">
|
10390
|
+
<xsl:variable name="note_node">
|
10391
|
+
<xsl:element name="{local-name(..)}" namespace="{$namespace_full}"> <!-- save parent context node for determining styles -->
|
10392
|
+
<xsl:copy> <!-- skip @id -->
|
10393
|
+
<xsl:copy-of select="node()"/>
|
10394
|
+
</xsl:copy>
|
10395
|
+
</xsl:element>
|
10396
|
+
</xsl:variable>
|
10397
|
+
<!-- <xsl:for-each select="xalan:nodeset($note_node)//mn:note">
|
10398
|
+
<xsl:call-template name="note"/>
|
10399
|
+
</xsl:for-each> -->
|
10400
|
+
<xsl:call-template name="note"/>
|
10401
|
+
</xsl:if>
|
10402
|
+
</xsl:template>
|
10403
|
+
|
10378
10404
|
<xsl:template match="mn:title" mode="title">
|
10379
10405
|
<fo:inline><xsl:apply-templates/></fo:inline>
|
10380
10406
|
</xsl:template>
|
@@ -10920,6 +10946,76 @@
|
|
10920
10946
|
<!-- End Form's elements processing -->
|
10921
10947
|
<!-- =================== -->
|
10922
10948
|
|
10949
|
+
<xsl:attribute-set name="toc-style">
|
10950
|
+
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
10951
|
+
<xsl:attribute name="line-height">115%</xsl:attribute>
|
10952
|
+
<xsl:attribute name="role">SKIP</xsl:attribute>
|
10953
|
+
</xsl:attribute-set>
|
10954
|
+
|
10955
|
+
<xsl:template name="refine_toc-style">
|
10956
|
+
</xsl:template>
|
10957
|
+
|
10958
|
+
<xsl:attribute-set name="toc-title-style">
|
10959
|
+
<xsl:attribute name="font-size">14pt</xsl:attribute>
|
10960
|
+
<xsl:attribute name="margin-bottom">15.5pt</xsl:attribute>
|
10961
|
+
<xsl:attribute name="role">H1</xsl:attribute>
|
10962
|
+
</xsl:attribute-set>
|
10963
|
+
|
10964
|
+
<xsl:template name="refine_toc-title-style">
|
10965
|
+
</xsl:template>
|
10966
|
+
|
10967
|
+
<xsl:attribute-set name="toc-title-page-style">
|
10968
|
+
</xsl:attribute-set> <!-- toc-title-page-style -->
|
10969
|
+
|
10970
|
+
<xsl:template name="refine_toc-title-page-style">
|
10971
|
+
</xsl:template>
|
10972
|
+
|
10973
|
+
<xsl:attribute-set name="toc-item-block-style">
|
10974
|
+
</xsl:attribute-set>
|
10975
|
+
|
10976
|
+
<xsl:template name="refine_toc-item-block-style">
|
10977
|
+
</xsl:template>
|
10978
|
+
|
10979
|
+
<xsl:attribute-set name="toc-item-style">
|
10980
|
+
<xsl:attribute name="role">TOCI</xsl:attribute>
|
10981
|
+
</xsl:attribute-set> <!-- END: toc-item-style -->
|
10982
|
+
|
10983
|
+
<xsl:template name="refine_toc-item-style">
|
10984
|
+
<xsl:if test="@level = 1">
|
10985
|
+
<xsl:attribute name="margin-top">6pt</xsl:attribute>
|
10986
|
+
</xsl:if>
|
10987
|
+
</xsl:template> <!-- END: refine_toc-item-style -->
|
10988
|
+
|
10989
|
+
<xsl:attribute-set name="toc-leader-style">
|
10990
|
+
<xsl:attribute name="leader-pattern">dots</xsl:attribute>
|
10991
|
+
</xsl:attribute-set> <!-- END: toc-leader-style -->
|
10992
|
+
|
10993
|
+
<xsl:attribute-set name="toc-pagenumber-style">
|
10994
|
+
</xsl:attribute-set>
|
10995
|
+
|
10996
|
+
<!-- List of Figures, Tables -->
|
10997
|
+
<xsl:attribute-set name="toc-listof-title-style">
|
10998
|
+
<xsl:attribute name="role">TOCI</xsl:attribute>
|
10999
|
+
<xsl:attribute name="margin-top">6pt</xsl:attribute>
|
11000
|
+
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
11001
|
+
</xsl:attribute-set>
|
11002
|
+
|
11003
|
+
<xsl:template name="refine_toc-listof-title-style">
|
11004
|
+
</xsl:template>
|
11005
|
+
|
11006
|
+
<xsl:attribute-set name="toc-listof-item-block-style">
|
11007
|
+
<xsl:attribute name="provisional-distance-between-starts">8mm</xsl:attribute>
|
11008
|
+
<xsl:attribute name="role">SKIP</xsl:attribute>
|
11009
|
+
</xsl:attribute-set>
|
11010
|
+
|
11011
|
+
<xsl:attribute-set name="toc-listof-item-style">
|
11012
|
+
<xsl:attribute name="role">TOCI</xsl:attribute>
|
11013
|
+
<xsl:attribute name="text-align-last">justify</xsl:attribute>
|
11014
|
+
<xsl:attribute name="margin-left">12mm</xsl:attribute>
|
11015
|
+
<xsl:attribute name="text-indent">-12mm</xsl:attribute>
|
11016
|
+
<xsl:attribute name="role">SKIP</xsl:attribute>
|
11017
|
+
</xsl:attribute-set>
|
11018
|
+
|
10923
11019
|
<xsl:template name="processPrefaceSectionsDefault_Contents">
|
10924
11020
|
<xsl:variable name="nodes_preface_">
|
10925
11021
|
<xsl:for-each select="/*/mn:preface/*[not(self::mn:note or self::mn:admonition or @type = 'toc')]">
|
@@ -11257,7 +11353,7 @@
|
|
11257
11353
|
</xsl:if>
|
11258
11354
|
|
11259
11355
|
<xsl:for-each select="$contents_nodes/mnx:doc">
|
11260
|
-
<fo:bookmark internal-destination="{contents/mnx:item[@display = 'true'][1]/@id}" starting-state="hide">
|
11356
|
+
<fo:bookmark internal-destination="{mnx:contents/mnx:item[@display = 'true'][1]/@id}" starting-state="hide">
|
11261
11357
|
<xsl:if test="@bundle = 'true'">
|
11262
11358
|
<xsl:attribute name="internal-destination"><xsl:value-of select="@firstpage_id"/></xsl:attribute>
|
11263
11359
|
</xsl:if>
|
@@ -11291,7 +11387,7 @@
|
|
11291
11387
|
</xsl:choose>
|
11292
11388
|
</fo:bookmark-title>
|
11293
11389
|
|
11294
|
-
<xsl:apply-templates select="contents/mnx:item" mode="bookmark"/>
|
11390
|
+
<xsl:apply-templates select="mnx:contents/mnx:item" mode="bookmark"/>
|
11295
11391
|
|
11296
11392
|
<xsl:call-template name="insertFigureBookmarks">
|
11297
11393
|
<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"/>
|
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.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/lib/metanorma/cc/version.rb
CHANGED
data/metanorma-cc.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-cc
|
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
|
- - ">="
|