metanorma-ribose 2.7.0 → 2.7.2
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/ribose/ribose.standard.xsl +125 -34
- data/lib/metanorma/ribose/basicdoc.rng +1 -1
- data/lib/metanorma/ribose/biblio-standoc.rng +0 -49
- data/lib/metanorma/ribose/biblio.rng +11 -1
- data/lib/metanorma/ribose/isodoc.rng +7 -60
- data/lib/metanorma/ribose/relaton-ribose.rng +0 -18
- data/lib/metanorma/ribose/version.rb +1 -1
- data/metanorma-ribose.gemspec +1 -1
- metadata +3 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 828c938e91fe7fcae5d27663b31d76ff96e9db5b4ea295c25004f5a0407fe5e3
|
4
|
+
data.tar.gz: 8ca578e85bd6fbd5bc24aa2936c4e9e153ac5356ffd03512457e54648c6134ab
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 157776f1f2ba976594289d5b92d97622eb35b82c4cf36741e4bcd86ef93771d2e1a834998f2b3b2738de3e56bcf21dab23692bd271928ecdb4001ab8861258f8
|
7
|
+
data.tar.gz: ad55e604bfee6dfb05ca0e68a77ead2f97f5a0c95f1a03c95ae176563b5009c8856e998c12759edc3ad21e502c51c3dcc5c3f574201e26b7c1861cdc6851dfd6
|
data/README.adoc
CHANGED
@@ -2,7 +2,7 @@
|
|
2
2
|
|
3
3
|
image:https://img.shields.io/gem/v/metanorma-ribose.svg["Gem Version", link="https://rubygems.org/gems/metanorma-ribose"]
|
4
4
|
image:https://github.com/metanorma/metanorma-ribose/workflows/rake/badge.svg["Build Status", link="https://github.com/metanorma/metanorma-ribose/actions?workflow=rake"]
|
5
|
-
image:https://codeclimate.com/github/metanorma/metanorma-ribose/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/metanorma/metanorma-ribose"]
|
5
|
+
// image:https://codeclimate.com/github/metanorma/metanorma-ribose/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/metanorma/metanorma-ribose"]
|
6
6
|
image:https://img.shields.io/github/issues-pr-raw/metanorma/metanorma-ribose.svg["Pull Requests", link="https://github.com/metanorma/metanorma-ribose/pulls"]
|
7
7
|
image:https://img.shields.io/github/commits-since/metanorma/metanorma-ribose/latest.svg["Commits since latest",link="https://github.com/metanorma/metanorma-ribose/releases"]
|
8
8
|
|
@@ -466,7 +466,8 @@
|
|
466
466
|
</xsl:call-template>
|
467
467
|
</fo:block>
|
468
468
|
<fo:block><xsl:value-of select="$docnumber_version"/></fo:block>
|
469
|
-
<xsl:apply-templates select="/mn:metanorma/mn:bibdata/mn:ext/mn:editorialgroup/mn:committee"/>
|
469
|
+
<!-- <xsl:apply-templates select="/mn:metanorma/mn:bibdata/mn:ext/mn:editorialgroup/mn:committee"/> -->
|
470
|
+
<xsl:apply-templates select="/mn:metanorma/mn:bibdata/mn:contributor[mn:role[@type = 'author']/mn:description = 'committee']/mn:organization/mn:subdivision[@type = 'Committee']/mn:name"/>
|
470
471
|
<fo:block>
|
471
472
|
<xsl:text>© </xsl:text>
|
472
473
|
<xsl:value-of select="$copyright_year"/>
|
@@ -678,7 +679,8 @@
|
|
678
679
|
</fo:block>
|
679
680
|
</xsl:template>
|
680
681
|
|
681
|
-
<xsl:template match="mn:bibdata/mn:ext/mn:editorialgroup/mn:committee">
|
682
|
+
<!-- <xsl:template match="mn:bibdata/mn:ext/mn:editorialgroup/mn:committee"> -->
|
683
|
+
<xsl:template match="mn:bibdata/mn:contributor[mn:role[@type = 'author']/mn:description = 'committee']/mn:organization/mn:subdivision[@type = 'Committee']/mn:name">
|
682
684
|
<fo:block><xsl:apply-templates/></fo:block>
|
683
685
|
</xsl:template>
|
684
686
|
|
@@ -2859,13 +2861,23 @@
|
|
2859
2861
|
<xsl:attribute-set name="copyright-statement-style">
|
2860
2862
|
</xsl:attribute-set> <!-- copyright-statement-style -->
|
2861
2863
|
|
2864
|
+
<xsl:template name="refine_copyright-statement-style">
|
2865
|
+
</xsl:template>
|
2866
|
+
|
2862
2867
|
<xsl:attribute-set name="copyright-statement-title-style">
|
2863
2868
|
</xsl:attribute-set> <!-- copyright-statement-title-style -->
|
2864
2869
|
|
2870
|
+
<xsl:template name="refine_copyright-statement-title-style">
|
2871
|
+
</xsl:template>
|
2872
|
+
|
2865
2873
|
<xsl:attribute-set name="copyright-statement-p-style">
|
2866
2874
|
</xsl:attribute-set> <!-- copyright-statement-p-style -->
|
2867
2875
|
|
2868
|
-
|
2876
|
+
<xsl:template name="refine_copyright-statement-p-style">
|
2877
|
+
|
2878
|
+
</xsl:template>
|
2879
|
+
|
2880
|
+
<xsl:attribute-set name="license-statement-style">
|
2869
2881
|
</xsl:attribute-set> <!-- license-statement-style -->
|
2870
2882
|
|
2871
2883
|
<xsl:attribute-set name="license-statement-title-style">
|
@@ -2875,6 +2887,10 @@
|
|
2875
2887
|
<xsl:attribute-set name="license-statement-p-style">
|
2876
2888
|
</xsl:attribute-set> <!-- license-statement-p-style -->
|
2877
2889
|
|
2890
|
+
<xsl:template name="refine_license-statement-p-style">
|
2891
|
+
|
2892
|
+
</xsl:template>
|
2893
|
+
|
2878
2894
|
<xsl:attribute-set name="legal-statement-style">
|
2879
2895
|
</xsl:attribute-set> <!-- legal-statement-style -->
|
2880
2896
|
|
@@ -2905,6 +2921,8 @@
|
|
2905
2921
|
<!-- ================================= -->
|
2906
2922
|
<xsl:template match="mn:copyright-statement">
|
2907
2923
|
<fo:block xsl:use-attribute-sets="copyright-statement-style" role="SKIP">
|
2924
|
+
<xsl:call-template name="refine_copyright-statement-style"/>
|
2925
|
+
|
2908
2926
|
<xsl:apply-templates/>
|
2909
2927
|
</fo:block>
|
2910
2928
|
</xsl:template> <!-- copyright-statement -->
|
@@ -4046,7 +4064,7 @@
|
|
4046
4064
|
</xsl:otherwise>
|
4047
4065
|
</xsl:choose>
|
4048
4066
|
</xsl:variable>
|
4049
|
-
<xsl:if test="$key = 'font-family' or
|
4067
|
+
<xsl:if test="$key = 'font-family' or $key = 'font-size' or $key = 'color' or $key = 'baseline-shift' or $key = 'line-height' ">
|
4050
4068
|
<style name="{$key}"><xsl:value-of select="$value"/></style>
|
4051
4069
|
</xsl:if>
|
4052
4070
|
<xsl:if test="$key = 'text-indent'">
|
@@ -10833,7 +10851,7 @@
|
|
10833
10851
|
|
10834
10852
|
<xsl:template name="insertFootnoteSeparatorCommon">
|
10835
10853
|
<xsl:param name="leader_length">30%</xsl:param>
|
10836
|
-
<fo:static-content flow-name="xsl-footnote-separator">
|
10854
|
+
<fo:static-content flow-name="xsl-footnote-separator" role="artifact">
|
10837
10855
|
<fo:block>
|
10838
10856
|
<fo:leader leader-pattern="rule" leader-length="{$leader_length}"/>
|
10839
10857
|
</fo:block>
|
@@ -11605,13 +11623,31 @@
|
|
11605
11623
|
<!-- skip here, see the template 'fmt-review-start' -->
|
11606
11624
|
</xsl:when>
|
11607
11625
|
<xsl:otherwise>
|
11608
|
-
|
11609
|
-
|
11610
|
-
|
11611
|
-
|
11626
|
+
<xsl:choose>
|
11627
|
+
<xsl:when test="parent::mn:example or parent::mn:termexample or parent::mn:note or parent::mn:termnote">
|
11628
|
+
<fo:block font-size="1pt" line-height="0.1">
|
11629
|
+
<xsl:call-template name="fo_inline_bookmark">
|
11630
|
+
<xsl:with-param name="bookmark_id" select="$bookmark_id"/>
|
11631
|
+
</xsl:call-template>
|
11632
|
+
</fo:block>
|
11633
|
+
</xsl:when>
|
11634
|
+
<xsl:otherwise>
|
11635
|
+
<xsl:call-template name="fo_inline_bookmark">
|
11636
|
+
<xsl:with-param name="bookmark_id" select="$bookmark_id"/>
|
11637
|
+
</xsl:call-template>
|
11638
|
+
</xsl:otherwise>
|
11639
|
+
</xsl:choose>
|
11612
11640
|
</xsl:otherwise>
|
11613
11641
|
</xsl:choose>
|
11614
11642
|
</xsl:template>
|
11643
|
+
|
11644
|
+
<xsl:template name="fo_inline_bookmark">
|
11645
|
+
<xsl:param name="bookmark_id"/>
|
11646
|
+
<!-- <fo:inline id="{@id}" font-size="1pt"/> -->
|
11647
|
+
<fo:inline id="{@id}" font-size="1pt"><xsl:if test="preceding-sibling::node()[self::mn:fmt-annotation-start][@source = $bookmark_id] and following-sibling::node()[self::mn:fmt-annotation-end][@source = $bookmark_id]"><xsl:attribute name="line-height">0.1</xsl:attribute></xsl:if><xsl:value-of select="$hair_space"/></fo:inline>
|
11648
|
+
<!-- we need to add zero-width space, otherwise this fo:inline is missing in IF xml -->
|
11649
|
+
<xsl:if test="not(following-sibling::node()[normalize-space() != ''])"><fo:inline font-size="1pt"> </fo:inline></xsl:if>
|
11650
|
+
</xsl:template>
|
11615
11651
|
<!-- =================== -->
|
11616
11652
|
<!-- End of Index processing -->
|
11617
11653
|
<!-- =================== -->
|
@@ -11722,9 +11758,15 @@
|
|
11722
11758
|
<xsl:attribute name="margin-bottom">13mm</xsl:attribute>
|
11723
11759
|
</xsl:attribute-set>
|
11724
11760
|
|
11761
|
+
<xsl:template name="refine_toc-title-style">
|
11762
|
+
</xsl:template>
|
11763
|
+
|
11725
11764
|
<xsl:attribute-set name="toc-title-page-style">
|
11726
11765
|
</xsl:attribute-set> <!-- toc-title-page-style -->
|
11727
11766
|
|
11767
|
+
<xsl:template name="refine_toc-title-page-style">
|
11768
|
+
</xsl:template>
|
11769
|
+
|
11728
11770
|
<xsl:attribute-set name="toc-item-block-style">
|
11729
11771
|
</xsl:attribute-set>
|
11730
11772
|
|
@@ -11772,6 +11814,9 @@
|
|
11772
11814
|
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
11773
11815
|
</xsl:attribute-set>
|
11774
11816
|
|
11817
|
+
<xsl:template name="refine_toc-listof-title-style">
|
11818
|
+
</xsl:template>
|
11819
|
+
|
11775
11820
|
<xsl:attribute-set name="toc-listof-item-block-style">
|
11776
11821
|
</xsl:attribute-set>
|
11777
11822
|
|
@@ -12119,7 +12164,7 @@
|
|
12119
12164
|
</xsl:if>
|
12120
12165
|
|
12121
12166
|
<xsl:for-each select="$contents_nodes/mnx:doc">
|
12122
|
-
<fo:bookmark internal-destination="{contents/mnx:item[@display = 'true'][1]/@id}" starting-state="hide">
|
12167
|
+
<fo:bookmark internal-destination="{mnx:contents/mnx:item[@display = 'true'][1]/@id}" starting-state="hide">
|
12123
12168
|
<xsl:if test="@bundle = 'true'">
|
12124
12169
|
<xsl:attribute name="internal-destination"><xsl:value-of select="@firstpage_id"/></xsl:attribute>
|
12125
12170
|
</xsl:if>
|
@@ -12153,7 +12198,7 @@
|
|
12153
12198
|
</xsl:choose>
|
12154
12199
|
</fo:bookmark-title>
|
12155
12200
|
|
12156
|
-
<xsl:apply-templates select="contents/mnx:item" mode="bookmark"/>
|
12201
|
+
<xsl:apply-templates select="mnx:contents/mnx:item" mode="bookmark"/>
|
12157
12202
|
|
12158
12203
|
<xsl:call-template name="insertFigureBookmarks">
|
12159
12204
|
<xsl:with-param name="contents" select="mnx:contents"/>
|
@@ -13501,11 +13546,35 @@
|
|
13501
13546
|
|
13502
13547
|
<xsl:template match="mn:svgmap"/>
|
13503
13548
|
|
13549
|
+
<xsl:template match="mn:name[following-sibling::*[1][self::mn:fmt-name]]"/>
|
13550
|
+
|
13504
13551
|
<!-- for correct rendering combining chars, added in mode="update_xml_step2" -->
|
13505
13552
|
<xsl:template match="*[local-name() = 'lang_none']">
|
13506
13553
|
<fo:inline xml:lang="none"><xsl:value-of select="."/></fo:inline>
|
13507
13554
|
</xsl:template>
|
13508
13555
|
|
13556
|
+
<xsl:template name="addTagElementT">
|
13557
|
+
<xsl:variable name="title_">
|
13558
|
+
<xsl:apply-templates select="mn:fmt-title"/>
|
13559
|
+
</xsl:variable>
|
13560
|
+
<xsl:variable name="title__">
|
13561
|
+
<xsl:for-each select="xalan:nodeset($title_)/*/node()">
|
13562
|
+
<xsl:choose>
|
13563
|
+
<xsl:when test="self::text()"><xsl:text> </xsl:text><xsl:value-of select="."/><xsl:text> </xsl:text></xsl:when>
|
13564
|
+
<xsl:otherwise><xsl:text> </xsl:text><xsl:copy-of select="."/><xsl:text> </xsl:text></xsl:otherwise>
|
13565
|
+
</xsl:choose>
|
13566
|
+
</xsl:for-each>
|
13567
|
+
</xsl:variable>
|
13568
|
+
<xsl:variable name="title" select="normalize-space($title__)"/>
|
13569
|
+
<xsl:if test="$title != ''">
|
13570
|
+
<xsl:attribute name="fox:title">
|
13571
|
+
<xsl:if test="ancestor::mn:sections">
|
13572
|
+
<xsl:text>Section </xsl:text>
|
13573
|
+
</xsl:if>
|
13574
|
+
<xsl:value-of select="$title"/></xsl:attribute>
|
13575
|
+
</xsl:if>
|
13576
|
+
</xsl:template>
|
13577
|
+
|
13509
13578
|
<xsl:template name="replaceChar">
|
13510
13579
|
<xsl:param name="text"/>
|
13511
13580
|
<xsl:param name="replace"/>
|
@@ -14272,6 +14341,13 @@
|
|
14272
14341
|
<xsl:with-param name="default" select="$text_align_default"/>
|
14273
14342
|
</xsl:call-template>
|
14274
14343
|
<xsl:call-template name="setKeepAttributes"/>
|
14344
|
+
<xsl:if test="node()[1][self::mn:span][contains(@style, 'line-height')]">
|
14345
|
+
<xsl:variable name="styles">
|
14346
|
+
<xsl:apply-templates select="*[1]"/>
|
14347
|
+
</xsl:variable>
|
14348
|
+
<!-- move attribute line-height from inline to block -->
|
14349
|
+
<xsl:attribute name="line-height"><xsl:value-of select="xalan:nodeset($styles)//*/@line-height"/></xsl:attribute>
|
14350
|
+
</xsl:if>
|
14275
14351
|
</xsl:template>
|
14276
14352
|
|
14277
14353
|
<xsl:template name="setKeepAttributes">
|
@@ -14297,34 +14373,41 @@
|
|
14297
14373
|
<fo:block-container absolute-position="fixed" left="0mm" top="0mm" font-size="0" id="__internal_layout__coverpage{$suffix}_{$name}_{$number}_{generate-id()}">
|
14298
14374
|
<fo:block>
|
14299
14375
|
<xsl:for-each select="/mn:metanorma/mn:metanorma-extension/mn:presentation-metadata[mn:name = $name][1]/mn:value/mn:image[$num]">
|
14300
|
-
|
14301
|
-
|
14302
|
-
|
14303
|
-
<xsl:attribute name="content-height"><xsl:value-of select="$pageHeight"/>mm</xsl:attribute>
|
14304
|
-
<xsl:call-template name="getSVG"/>
|
14305
|
-
</fo:instream-foreign-object>
|
14306
|
-
</xsl:when>
|
14307
|
-
<xsl:when test="starts-with(@src, 'data:application/pdf;base64')">
|
14308
|
-
<fo:external-graphic src="{@src}" fox:alt-text="Image Front"/>
|
14309
|
-
</xsl:when>
|
14310
|
-
<xsl:otherwise> <!-- bitmap image -->
|
14311
|
-
<xsl:variable name="coverimage_src" select="normalize-space(@src)"/>
|
14312
|
-
<xsl:if test="$coverimage_src != ''">
|
14313
|
-
<xsl:variable name="coverpage">
|
14314
|
-
<xsl:call-template name="getImageURL">
|
14315
|
-
<xsl:with-param name="src" select="$coverimage_src"/>
|
14316
|
-
</xsl:call-template>
|
14317
|
-
</xsl:variable>
|
14318
|
-
<!-- <xsl:variable name="coverpage" select="concat('url(file:',$basepath, 'coverpage1.png', ')')"/> --> <!-- for DEBUG -->
|
14319
|
-
<fo:external-graphic src="{$coverpage}" width="{$pageWidth}mm" content-height="scale-to-fit" scaling="uniform" fox:alt-text="Image Front"/>
|
14320
|
-
</xsl:if>
|
14321
|
-
</xsl:otherwise>
|
14322
|
-
</xsl:choose>
|
14376
|
+
|
14377
|
+
<xsl:call-template name="insertPageImage"/>
|
14378
|
+
|
14323
14379
|
</xsl:for-each>
|
14324
14380
|
</fo:block>
|
14325
14381
|
</fo:block-container>
|
14326
14382
|
</xsl:template>
|
14327
14383
|
|
14384
|
+
<xsl:template name="insertPageImage">
|
14385
|
+
<xsl:param name="svg_content_height" select="$pageHeight"/>
|
14386
|
+
<xsl:param name="bitmap_width" select="$pageWidth"/>
|
14387
|
+
<xsl:choose>
|
14388
|
+
<xsl:when test="*[local-name() = 'svg'] or java:endsWith(java:java.lang.String.new(@src), '.svg')">
|
14389
|
+
<fo:instream-foreign-object fox:alt-text="Image Front">
|
14390
|
+
<xsl:attribute name="content-height"><xsl:value-of select="$svg_content_height"/>mm</xsl:attribute>
|
14391
|
+
<xsl:call-template name="getSVG"/>
|
14392
|
+
</fo:instream-foreign-object>
|
14393
|
+
</xsl:when>
|
14394
|
+
<xsl:when test="starts-with(@src, 'data:application/pdf;base64')">
|
14395
|
+
<fo:external-graphic src="{@src}" fox:alt-text="Image Front"/>
|
14396
|
+
</xsl:when>
|
14397
|
+
<xsl:otherwise> <!-- bitmap image -->
|
14398
|
+
<xsl:variable name="coverimage_src" select="normalize-space(@src)"/>
|
14399
|
+
<xsl:if test="$coverimage_src != ''">
|
14400
|
+
<xsl:variable name="coverpage">
|
14401
|
+
<xsl:call-template name="getImageURL">
|
14402
|
+
<xsl:with-param name="src" select="$coverimage_src"/>
|
14403
|
+
</xsl:call-template>
|
14404
|
+
</xsl:variable>
|
14405
|
+
<fo:external-graphic src="{$coverpage}" width="{$bitmap_width}mm" content-height="scale-to-fit" scaling="uniform" fox:alt-text="Image Front"/>
|
14406
|
+
</xsl:if>
|
14407
|
+
</xsl:otherwise>
|
14408
|
+
</xsl:choose>
|
14409
|
+
</xsl:template>
|
14410
|
+
|
14328
14411
|
<xsl:template name="getImageURL">
|
14329
14412
|
<xsl:param name="src"/>
|
14330
14413
|
<xsl:choose>
|
@@ -14752,6 +14835,14 @@
|
|
14752
14835
|
</xsl:attribute>
|
14753
14836
|
</xsl:template>
|
14754
14837
|
|
14838
|
+
<xsl:template name="getCharByCodePoint">
|
14839
|
+
<xsl:param name="codepoint"/>
|
14840
|
+
<xsl:param name="radix">16</xsl:param>
|
14841
|
+
<xsl:variable name="codepointInt" select="java:java.lang.Integer.parseInt($codepoint,$radix)"/>
|
14842
|
+
<xsl:variable name="chars" select="java:java.lang.Character.toChars($codepointInt)"/>
|
14843
|
+
<xsl:value-of select="java:java.lang.String.new($chars)"/>
|
14844
|
+
</xsl:template>
|
14845
|
+
|
14755
14846
|
<xsl:template name="substring-after-last">
|
14756
14847
|
<xsl:param name="value"/>
|
14757
14848
|
<xsl:param name="delimiter"/>
|
@@ -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"/>
|
@@ -76,12 +76,6 @@ from other documents in the same doctype</a:documentation>
|
|
76
76
|
<ref name="flavor">
|
77
77
|
<a:documentation>Flavour of Metanorma used to process this document</a:documentation>
|
78
78
|
</ref>
|
79
|
-
<optional>
|
80
|
-
<ref name="editorialgroup">
|
81
|
-
<a:documentation>Groups associated with the production of the standards document, typically within
|
82
|
-
a standards definition organization</a:documentation>
|
83
|
-
</ref>
|
84
|
-
</optional>
|
85
79
|
<zeroOrMore>
|
86
80
|
<ref name="ics">
|
87
81
|
<a:documentation>Classification of the document contents taken from the International Classification of Standards</a:documentation>
|
@@ -130,49 +124,6 @@ a standards definition organization</a:documentation>
|
|
130
124
|
However we prefer not to hardcode it, given ongoing extension.</a:documentation>
|
131
125
|
<text/>
|
132
126
|
</define>
|
133
|
-
<define name="editorialgroup">
|
134
|
-
<a:documentation>A group associated with the production of the standards document, typically within
|
135
|
-
a standards definition organization</a:documentation>
|
136
|
-
<element name="editorialgroup">
|
137
|
-
<oneOrMore>
|
138
|
-
<ref name="technical-committee">
|
139
|
-
<a:documentation>A technical committee associated with the production of the standards document</a:documentation>
|
140
|
-
</ref>
|
141
|
-
</oneOrMore>
|
142
|
-
</element>
|
143
|
-
</define>
|
144
|
-
<define name="technical-committee">
|
145
|
-
<a:documentation>Technical committee associated with the production of a standards document</a:documentation>
|
146
|
-
<element name="technical-committee">
|
147
|
-
<ref name="IsoWorkgroup"/>
|
148
|
-
</element>
|
149
|
-
</define>
|
150
|
-
<define name="IsoWorkgroup">
|
151
|
-
<optional>
|
152
|
-
<attribute name="number">
|
153
|
-
<a:documentation>Numeric identifier of the technical committee</a:documentation>
|
154
|
-
</attribute>
|
155
|
-
</optional>
|
156
|
-
<optional>
|
157
|
-
<attribute name="type">
|
158
|
-
<a:documentation>Type of the technical committee, used in identifying the technical committee</a:documentation>
|
159
|
-
</attribute>
|
160
|
-
</optional>
|
161
|
-
<optional>
|
162
|
-
<attribute name="identifier">
|
163
|
-
<a:documentation>Non-numeric, complete identifier of the technical committee</a:documentation>
|
164
|
-
</attribute>
|
165
|
-
</optional>
|
166
|
-
<optional>
|
167
|
-
<attribute name="prefix">
|
168
|
-
<a:documentation>Disambiguating prefix added to number to form the identifier of the technical committee,
|
169
|
-
typically indicating its type</a:documentation>
|
170
|
-
</attribute>
|
171
|
-
</optional>
|
172
|
-
<text>
|
173
|
-
<a:documentation>Name of the technical committee</a:documentation>
|
174
|
-
</text>
|
175
|
-
</define>
|
176
127
|
<define name="ics">
|
177
128
|
<a:documentation>Classification taken from the International Classification of Standards.
|
178
129
|
ICS is defined by ISO here -- https://www.iso.org/publication/PUB100033.html</a:documentation>
|
@@ -242,6 +242,8 @@ Detailed in https://www.relaton.org/model/creator/</a:documentation>
|
|
242
242
|
</choice>
|
243
243
|
</define>
|
244
244
|
<define name="roledescription">
|
245
|
+
<a:documentation>A more detailed description of the role of the contributor
|
246
|
+
Some descriptions are reserved words; in particular, the editorial committee of a standard has the role description "committee"</a:documentation>
|
245
247
|
<element name="description">
|
246
248
|
<ref name="LocalizedMarkedUpString"/>
|
247
249
|
</element>
|
@@ -443,7 +445,10 @@ real names (if the person is named with a pseudonym or user name); previous lega
|
|
443
445
|
</oneOrMore>
|
444
446
|
<zeroOrMore>
|
445
447
|
<ref name="subdivision">
|
446
|
-
<a:documentation>The subdivision of the organization directly involved with the production of the bibliographic item
|
448
|
+
<a:documentation>The subdivision of the organization directly involved with the production of the bibliographic item.
|
449
|
+
Multiple subdivisions can be specified for an organization, with no implication of hierarchical
|
450
|
+
relation between them
|
451
|
+
Editorial and advisory groups are represented as consecutive subdivisions of the SDO</a:documentation>
|
447
452
|
</ref>
|
448
453
|
</zeroOrMore>
|
449
454
|
<optional>
|
@@ -485,6 +490,11 @@ real names (if the person is named with a pseudonym or user name); previous lega
|
|
485
490
|
<a:documentation>The type of subdivision</a:documentation>
|
486
491
|
</attribute>
|
487
492
|
</optional>
|
493
|
+
<optional>
|
494
|
+
<attribute name="subtype">
|
495
|
+
<a:documentation>The subtype of subdivision; e.g. different types of technical committee</a:documentation>
|
496
|
+
</attribute>
|
497
|
+
</optional>
|
488
498
|
<ref name="OrganizationType">
|
489
499
|
<a:documentation>The subdivision, modelled recursively as an organization</a:documentation>
|
490
500
|
</ref>
|
@@ -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.1 -->
|
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">
|
@@ -1094,7 +1042,6 @@ That concept may be defined as a term within the current document, or it may be
|
|
1094
1042
|
<zeroOrMore>
|
1095
1043
|
<choice>
|
1096
1044
|
<ref name="PureTextElement"/>
|
1097
|
-
<ref name="stem"/>
|
1098
1045
|
<ref name="index"/>
|
1099
1046
|
<ref name="index-xref"/>
|
1100
1047
|
</choice>
|
@@ -1107,7 +1054,6 @@ That concept may be defined as a term within the current document, or it may be
|
|
1107
1054
|
<zeroOrMore>
|
1108
1055
|
<choice>
|
1109
1056
|
<ref name="PureTextElement"/>
|
1110
|
-
<ref name="stem"/>
|
1111
1057
|
<ref name="index"/>
|
1112
1058
|
<ref name="index-xref"/>
|
1113
1059
|
</choice>
|
@@ -2025,10 +1971,7 @@ used in document amendments</a:documentation>
|
|
2025
1971
|
<element name="name">
|
2026
1972
|
<a:documentation>The symbolic form of the designation</a:documentation>
|
2027
1973
|
<oneOrMore>
|
2028
|
-
<
|
2029
|
-
<ref name="PureTextElement"/>
|
2030
|
-
<ref name="stem"/>
|
2031
|
-
</choice>
|
1974
|
+
<ref name="PureTextElement"/>
|
2032
1975
|
</oneOrMore>
|
2033
1976
|
</element>
|
2034
1977
|
</element>
|
@@ -2081,7 +2024,6 @@ used in document amendments</a:documentation>
|
|
2081
2024
|
<zeroOrMore>
|
2082
2025
|
<choice>
|
2083
2026
|
<ref name="PureTextElement"/>
|
2084
|
-
<ref name="stem"/>
|
2085
2027
|
<ref name="index"/>
|
2086
2028
|
<ref name="index-xref"/>
|
2087
2029
|
</choice>
|
@@ -2291,6 +2233,11 @@ used in document amendments</a:documentation>
|
|
2291
2233
|
<ref name="RequiredId"/>
|
2292
2234
|
<ref name="NumberingAttributes"/>
|
2293
2235
|
<ref name="BlockAttributes"/>
|
2236
|
+
<optional>
|
2237
|
+
<attribute name="type">
|
2238
|
+
<a:documentation>Semantic classification of note</a:documentation>
|
2239
|
+
</attribute>
|
2240
|
+
</optional>
|
2294
2241
|
<oneOrMore>
|
2295
2242
|
<choice>
|
2296
2243
|
<a:documentation>Content of the term note</a:documentation>
|
@@ -13,13 +13,6 @@
|
|
13
13
|
<value>standard</value>
|
14
14
|
</choice>
|
15
15
|
</define>
|
16
|
-
<define name="editorialgroup">
|
17
|
-
<element name="editorialgroup">
|
18
|
-
<oneOrMore>
|
19
|
-
<ref name="committee"/>
|
20
|
-
</oneOrMore>
|
21
|
-
</element>
|
22
|
-
</define>
|
23
16
|
</include>
|
24
17
|
<define name="BibDataExtensionType" combine="interleave">
|
25
18
|
<optional>
|
@@ -28,17 +21,6 @@
|
|
28
21
|
</ref>
|
29
22
|
</optional>
|
30
23
|
</define>
|
31
|
-
<define name="committee">
|
32
|
-
<element name="committee">
|
33
|
-
<attribute name="type">
|
34
|
-
<choice>
|
35
|
-
<value>technical</value>
|
36
|
-
<value>provisional</value>
|
37
|
-
</choice>
|
38
|
-
</attribute>
|
39
|
-
<text/>
|
40
|
-
</element>
|
41
|
-
</define>
|
42
24
|
<define name="security">
|
43
25
|
<element name="security">
|
44
26
|
<text/>
|
data/metanorma-ribose.gemspec
CHANGED
@@ -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-ribose
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.7.
|
4
|
+
version: 2.7.2
|
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-18 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: metanorma-generic
|
@@ -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
|
- - ">="
|