metanorma-cc 2.2.12 → 2.3.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/isodoc/cc/cc.standard.xsl +88 -55
- data/lib/isodoc/cc/html/_coverpage.css +7 -3
- data/lib/isodoc/cc/html/htmlstyle.css +17 -9
- data/lib/isodoc/cc/html/htmlstyle.scss +3 -3
- data/lib/isodoc/cc/i18n-en.yaml +1 -1
- data/lib/metanorma/cc/isodoc.rng +26 -4
- data/lib/metanorma/cc/version.rb +1 -1
- data/metanorma-cc.gemspec +1 -1
- metadata +4 -4
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 5f8ad26a5deaf46f319994968f9150f06b15a6d6fc03d847b10e5e376fffcb47
|
4
|
+
data.tar.gz: 8d32091a45db359d3bcfff5ff3b59a84fa37ce317ab35b61f6d9caf8d556c024
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 8dd4a4c9fe1ebf0058c7ce921f4052a82b9dde91d62f605ecae66b6d7202a1356f056e5e8dd73aa4cb046937676e856a8d848d170ca3d62c03808df8354178ea
|
7
|
+
data.tar.gz: 2028f123827546b2e5ec2090896253fe716df15888f93e33d16d2a6913b24f6d718b955b57208103bef083c88c1a7204a3310f03739307fe0a39a1ddabf7a228
|
@@ -234,9 +234,9 @@
|
|
234
234
|
</fo:static-content>
|
235
235
|
<xsl:call-template name="insertHeaderFooter"/>
|
236
236
|
<fo:flow flow-name="xsl-region-body">
|
237
|
-
<fo:block font-size="16pt" font-weight="bold" margin-bottom="17pt" role="H1">
|
237
|
+
<!-- <fo:block font-size="16pt" font-weight="bold" margin-bottom="17pt" role="H1">
|
238
238
|
<xsl:value-of select="/csd:csd-standard/csd:bibdata/csd:title[@language = 'en']"/>
|
239
|
-
</fo:block>
|
239
|
+
</fo:block> -->
|
240
240
|
<fo:block>
|
241
241
|
<xsl:call-template name="processMainSectionsDefault"/>
|
242
242
|
</fo:block>
|
@@ -417,6 +417,12 @@
|
|
417
417
|
<!-- ============================= -->
|
418
418
|
<!-- ============================= -->
|
419
419
|
|
420
|
+
<xsl:template match="csd:sections/csd:p[@class = 'zzSTDTitle1']" priority="4">
|
421
|
+
<fo:block font-size="16pt" font-weight="bold" margin-bottom="17pt" role="H1">
|
422
|
+
<xsl:apply-templates/>
|
423
|
+
</fo:block>
|
424
|
+
</xsl:template>
|
425
|
+
|
420
426
|
<xsl:template match="csd:title" name="title">
|
421
427
|
|
422
428
|
<xsl:variable name="level">
|
@@ -713,21 +719,32 @@
|
|
713
719
|
<xsl:variable name="titles_">
|
714
720
|
|
715
721
|
<!-- These titles of Table of contents renders different than determined in localized-strings -->
|
716
|
-
<title-toc lang="en">
|
717
|
-
|
722
|
+
<!-- <title-toc lang="en">
|
723
|
+
<xsl:if test="$namespace = 'csd' or $namespace = 'ieee' or $namespace = 'iho' or $namespace = 'mpfd' or $namespace = 'ogc' or $namespace = 'unece-rec'">
|
718
724
|
<xsl:text>Contents</xsl:text>
|
719
|
-
|
720
|
-
|
721
|
-
|
725
|
+
</xsl:if>
|
726
|
+
<xsl:if test="$namespace = 'csa' or $namespace = 'm3d' or $namespace = 'nist-sp' or $namespace = 'ogc-white-paper'">
|
727
|
+
<xsl:text>Table of Contents</xsl:text>
|
728
|
+
</xsl:if>
|
729
|
+
<xsl:if test="$namespace = 'gb'">
|
730
|
+
<xsl:text>Table of contents</xsl:text>
|
731
|
+
</xsl:if>
|
732
|
+
</title-toc> -->
|
733
|
+
<title-toc lang="en">Table of contents</title-toc>
|
734
|
+
<!-- <title-toc lang="fr">
|
722
735
|
<xsl:text>Sommaire</xsl:text>
|
723
|
-
</title-toc>
|
724
|
-
<title-toc lang="zh">
|
725
|
-
|
736
|
+
</title-toc> -->
|
737
|
+
<!-- <title-toc lang="zh">
|
738
|
+
<xsl:choose>
|
739
|
+
<xsl:when test="$namespace = 'gb'">
|
740
|
+
<xsl:text>目次</xsl:text>
|
741
|
+
</xsl:when>
|
742
|
+
<xsl:otherwise>
|
726
743
|
<xsl:text>Contents</xsl:text>
|
727
|
-
|
728
|
-
|
729
|
-
|
730
|
-
<title-
|
744
|
+
</xsl:otherwise>
|
745
|
+
</xsl:choose>
|
746
|
+
</title-toc> -->
|
747
|
+
<title-toc lang="zh">目次</title-toc>
|
731
748
|
|
732
749
|
<title-part lang="en">
|
733
750
|
|
@@ -743,20 +760,6 @@
|
|
743
760
|
<title-subpart lang="en">Sub-part #</title-subpart>
|
744
761
|
<title-subpart lang="fr">Partie de sub #</title-subpart>
|
745
762
|
|
746
|
-
<title-list-tables lang="en">List of Tables</title-list-tables>
|
747
|
-
|
748
|
-
<title-list-figures lang="en">List of Figures</title-list-figures>
|
749
|
-
|
750
|
-
<title-table-figures lang="en">Table of Figures</title-table-figures>
|
751
|
-
|
752
|
-
<title-list-recommendations lang="en">List of Recommendations</title-list-recommendations>
|
753
|
-
|
754
|
-
<title-summary lang="en">Summary</title-summary>
|
755
|
-
|
756
|
-
<title-continued lang="ru">(продолжение)</title-continued>
|
757
|
-
<title-continued lang="en">(continued)</title-continued>
|
758
|
-
<title-continued lang="fr">(continué)</title-continued>
|
759
|
-
|
760
763
|
</xsl:variable>
|
761
764
|
<xsl:variable name="titles" select="xalan:nodeset($titles_)"/>
|
762
765
|
|
@@ -764,8 +767,8 @@
|
|
764
767
|
<xsl:variable name="toc_table_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'toc'][@type='table']/*[local-name() = 'title']"/>
|
765
768
|
<xsl:value-of select="$toc_table_title"/>
|
766
769
|
<xsl:if test="normalize-space($toc_table_title) = ''">
|
767
|
-
<xsl:call-template name="
|
768
|
-
<xsl:with-param name="
|
770
|
+
<xsl:call-template name="getLocalizedString">
|
771
|
+
<xsl:with-param name="key">toc_tables</xsl:with-param>
|
769
772
|
</xsl:call-template>
|
770
773
|
</xsl:if>
|
771
774
|
</xsl:variable>
|
@@ -774,8 +777,8 @@
|
|
774
777
|
<xsl:variable name="toc_figure_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'toc'][@type='figure']/*[local-name() = 'title']"/>
|
775
778
|
<xsl:value-of select="$toc_figure_title"/>
|
776
779
|
<xsl:if test="normalize-space($toc_figure_title) = ''">
|
777
|
-
<xsl:call-template name="
|
778
|
-
<xsl:with-param name="
|
780
|
+
<xsl:call-template name="getLocalizedString">
|
781
|
+
<xsl:with-param name="key">toc_figures</xsl:with-param>
|
779
782
|
</xsl:call-template>
|
780
783
|
</xsl:if>
|
781
784
|
</xsl:variable>
|
@@ -784,8 +787,8 @@
|
|
784
787
|
<xsl:variable name="toc_requirement_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'toc'][@type='requirement']/*[local-name() = 'title']"/>
|
785
788
|
<xsl:value-of select="$toc_requirement_title"/>
|
786
789
|
<xsl:if test="normalize-space($toc_requirement_title) = ''">
|
787
|
-
<xsl:call-template name="
|
788
|
-
<xsl:with-param name="
|
790
|
+
<xsl:call-template name="getLocalizedString">
|
791
|
+
<xsl:with-param name="key">toc_recommendations</xsl:with-param>
|
789
792
|
</xsl:call-template>
|
790
793
|
</xsl:if>
|
791
794
|
</xsl:variable>
|
@@ -4442,6 +4445,9 @@
|
|
4442
4445
|
<!-- END Definition List -->
|
4443
4446
|
<!-- ===================== -->
|
4444
4447
|
|
4448
|
+
<!-- default: ignore title in sections/p -->
|
4449
|
+
<xsl:template match="*[local-name() = 'sections']/*[local-name() = 'p'][starts-with(@class, 'zzSTDTitle')]" priority="3"/>
|
4450
|
+
|
4445
4451
|
<!-- ========================= -->
|
4446
4452
|
<!-- Rich text formatting -->
|
4447
4453
|
<!-- ========================= -->
|
@@ -4520,7 +4526,7 @@
|
|
4520
4526
|
<xsl:variable name="regex_url_start">^(http://|https://|www\.)?(.*)</xsl:variable>
|
4521
4527
|
<xsl:template match="*[local-name()='tt']/text()" priority="2">
|
4522
4528
|
<xsl:choose>
|
4523
|
-
<xsl:when test="java:replaceAll(java:java.lang.String.new(.),
|
4529
|
+
<xsl:when test="java:replaceAll(java:java.lang.String.new(.), $regex_url_start, '$2') != ''">
|
4524
4530
|
<!-- url -->
|
4525
4531
|
<xsl:call-template name="add-zero-spaces-link-java"/>
|
4526
4532
|
</xsl:when>
|
@@ -4982,10 +4988,13 @@
|
|
4982
4988
|
</xsl:choose>
|
4983
4989
|
</xsl:variable>
|
4984
4990
|
|
4991
|
+
<!-- replace sequence #x200B to one ​ -->
|
4992
|
+
<xsl:variable name="text10" select="java:replaceAll(java:java.lang.String.new($text9), '\u200b{2,}', '')"/>
|
4993
|
+
|
4985
4994
|
<!-- replace sequence #x200B and space TO space -->
|
4986
|
-
<xsl:variable name="
|
4995
|
+
<xsl:variable name="text11" select="java:replaceAll(java:java.lang.String.new($text10), '\u200b ', ' ')"/>
|
4987
4996
|
|
4988
|
-
<xsl:value-of select="$
|
4997
|
+
<xsl:value-of select="$text11"/>
|
4989
4998
|
</xsl:template>
|
4990
4999
|
|
4991
5000
|
<xsl:template name="add-zero-spaces-link-java">
|
@@ -4995,8 +5004,12 @@
|
|
4995
5004
|
<xsl:variable name="url_continue" select="java:replaceAll(java:java.lang.String.new($text), $regex_url_start, '$2')"/>
|
4996
5005
|
<!-- add zero-width space (#x200B) after characters: dash, dot, colon, equal, underscore, em dash, thin space, comma, slash, @ -->
|
4997
5006
|
<xsl:variable name="url" select="java:replaceAll(java:java.lang.String.new($url_continue),'(-|\.|:|=|_|—| |,|/|@)','$1')"/>
|
5007
|
+
|
5008
|
+
<!-- replace sequence #x200B to one ​ -->
|
5009
|
+
<xsl:variable name="url2" select="java:replaceAll(java:java.lang.String.new($url), '\u200b{2,}', '')"/>
|
5010
|
+
|
4998
5011
|
<!-- remove zero-width space at the end -->
|
4999
|
-
<xsl:value-of select="java:replaceAll(java:java.lang.String.new($
|
5012
|
+
<xsl:value-of select="java:replaceAll(java:java.lang.String.new($url2), '$', '')"/>
|
5000
5013
|
</xsl:template>
|
5001
5014
|
|
5002
5015
|
<!-- add zero space after dash character (for table's entries) -->
|
@@ -6259,7 +6272,7 @@
|
|
6259
6272
|
|
6260
6273
|
<xsl:call-template name="refine_note_block_style"/>
|
6261
6274
|
|
6262
|
-
<fo:inline xsl:use-attribute-sets="note-name-style">
|
6275
|
+
<fo:inline xsl:use-attribute-sets="note-name-style" role="SKIP">
|
6263
6276
|
|
6264
6277
|
<xsl:call-template name="refine_note-name-style"/>
|
6265
6278
|
|
@@ -6296,12 +6309,12 @@
|
|
6296
6309
|
<xsl:variable name="num"><xsl:number/></xsl:variable>
|
6297
6310
|
<xsl:choose>
|
6298
6311
|
<xsl:when test="$num = 1"> <!-- display first NOTE's paragraph in the same line with label NOTE -->
|
6299
|
-
<fo:inline xsl:use-attribute-sets="note-p-style">
|
6312
|
+
<fo:inline xsl:use-attribute-sets="note-p-style" role="SKIP">
|
6300
6313
|
<xsl:apply-templates/>
|
6301
6314
|
</fo:inline>
|
6302
6315
|
</xsl:when>
|
6303
6316
|
<xsl:otherwise>
|
6304
|
-
<fo:block xsl:use-attribute-sets="note-p-style">
|
6317
|
+
<fo:block xsl:use-attribute-sets="note-p-style" role="SKIP">
|
6305
6318
|
<xsl:apply-templates/>
|
6306
6319
|
</fo:block>
|
6307
6320
|
</xsl:otherwise>
|
@@ -6516,25 +6529,45 @@
|
|
6516
6529
|
<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style">
|
6517
6530
|
<xsl:if test="not(@mimetype = 'image/svg+xml') and ../*[local-name() = 'name'] and not(ancestor::*[local-name() = 'table'])">
|
6518
6531
|
|
6519
|
-
<xsl:
|
6520
|
-
<xsl:
|
6521
|
-
<xsl:
|
6522
|
-
|
6523
|
-
|
6524
|
-
|
6532
|
+
<xsl:if test="@width != '' and @width != 'auto'">
|
6533
|
+
<xsl:attribute name="width">
|
6534
|
+
<xsl:value-of select="@width"/>
|
6535
|
+
</xsl:attribute>
|
6536
|
+
</xsl:if>
|
6537
|
+
|
6538
|
+
<xsl:if test="@height != '' and @height != 'auto'">
|
6539
|
+
<xsl:attribute name="height">
|
6540
|
+
<xsl:value-of select="@height"/>
|
6541
|
+
</xsl:attribute>
|
6542
|
+
</xsl:if>
|
6525
6543
|
|
6526
|
-
<xsl:
|
6544
|
+
<xsl:choose>
|
6545
|
+
<xsl:when test="@width != '' and @width != 'auto' and @height != '' and @height != 'auto'">
|
6546
|
+
<xsl:attribute name="scaling">non-uniform</xsl:attribute>
|
6547
|
+
</xsl:when>
|
6548
|
+
<xsl:otherwise>
|
6527
6549
|
|
6528
|
-
|
6550
|
+
<xsl:variable name="img_src">
|
6551
|
+
<xsl:choose>
|
6552
|
+
<xsl:when test="not(starts-with(@src, 'data:'))"><xsl:value-of select="concat($basepath, @src)"/></xsl:when>
|
6553
|
+
<xsl:otherwise><xsl:value-of select="@src"/></xsl:otherwise>
|
6554
|
+
</xsl:choose>
|
6555
|
+
</xsl:variable>
|
6529
6556
|
|
6530
|
-
|
6557
|
+
<xsl:variable name="image_width_effective">
|
6531
6558
|
|
6532
|
-
|
6533
|
-
<xsl:if test="number($scale) < 100">
|
6559
|
+
<xsl:value-of select="$width_effective"/>
|
6534
6560
|
|
6535
|
-
|
6561
|
+
</xsl:variable>
|
6536
6562
|
|
6537
|
-
|
6563
|
+
<xsl:variable name="scale" select="java:org.metanorma.fop.Util.getImageScale($img_src, $image_width_effective, $height_effective)"/>
|
6564
|
+
<xsl:if test="number($scale) < 100">
|
6565
|
+
|
6566
|
+
<xsl:attribute name="content-width"><xsl:value-of select="$scale"/>%</xsl:attribute>
|
6567
|
+
|
6568
|
+
</xsl:if>
|
6569
|
+
</xsl:otherwise>
|
6570
|
+
</xsl:choose>
|
6538
6571
|
|
6539
6572
|
</xsl:if>
|
6540
6573
|
|
@@ -10197,7 +10230,7 @@
|
|
10197
10230
|
<xsl:template match="*[local-name() = 'span']" mode="update_xml_step1">
|
10198
10231
|
<xsl:apply-templates mode="update_xml_step1"/>
|
10199
10232
|
</xsl:template>
|
10200
|
-
<xsl:template match="*[local-name() = 'sourcecode']//*[local-name() = 'span'][@class]" mode="update_xml_step1" priority="2">
|
10233
|
+
<xsl:template match="*[local-name() = 'sections']/*[local-name() = 'p'][starts-with(@class, 'zzSTDTitle')]/*[local-name() = 'span'][@class] | *[local-name() = 'sourcecode']//*[local-name() = 'span'][@class]" mode="update_xml_step1" priority="2">
|
10201
10234
|
<xsl:copy>
|
10202
10235
|
<xsl:copy-of select="@*"/>
|
10203
10236
|
<xsl:apply-templates mode="update_xml_step1"/>
|
@@ -90,7 +90,7 @@ h1, h2, h3, h4, h5, h6 {
|
|
90
90
|
|
91
91
|
blockquote, q {
|
92
92
|
quotes: none; }
|
93
|
-
blockquote
|
93
|
+
blockquote::before, blockquote::after, q::before, q::after {
|
94
94
|
content: '';
|
95
95
|
content: none; }
|
96
96
|
|
@@ -113,14 +113,18 @@ b, strong {
|
|
113
113
|
div.document-stage-band, div.document-type-band {
|
114
114
|
background-color: #333333; }
|
115
115
|
|
116
|
-
a.FootnoteRef + a.FootnoteRef
|
116
|
+
a.FootnoteRef + a.FootnoteRef::before {
|
117
117
|
content: ", ";
|
118
118
|
vertical-align: super; }
|
119
119
|
|
120
|
-
a.TableFootnoteRef + a.TableFootnoteRef
|
120
|
+
a.TableFootnoteRef + a.TableFootnoteRef::before {
|
121
121
|
content: ", ";
|
122
122
|
vertical-align: super; }
|
123
123
|
|
124
|
+
a.TableFootnoteRef, span.TableFootnoteRef,
|
125
|
+
a.FootnoteRef, span.FootnoteRef {
|
126
|
+
vertical-align: super; }
|
127
|
+
|
124
128
|
.addition {
|
125
129
|
color: blue; }
|
126
130
|
|
@@ -90,7 +90,7 @@ h1, h2, h3, h4, h5, h6 {
|
|
90
90
|
|
91
91
|
blockquote, q {
|
92
92
|
quotes: none; }
|
93
|
-
blockquote
|
93
|
+
blockquote::before, blockquote::after, q::before, q::after {
|
94
94
|
content: '';
|
95
95
|
content: none; }
|
96
96
|
|
@@ -113,14 +113,18 @@ b, strong {
|
|
113
113
|
div.document-stage-band, div.document-type-band {
|
114
114
|
background-color: #333333; }
|
115
115
|
|
116
|
-
a.FootnoteRef + a.FootnoteRef
|
116
|
+
a.FootnoteRef + a.FootnoteRef::before {
|
117
117
|
content: ", ";
|
118
118
|
vertical-align: super; }
|
119
119
|
|
120
|
-
a.TableFootnoteRef + a.TableFootnoteRef
|
120
|
+
a.TableFootnoteRef + a.TableFootnoteRef::before {
|
121
121
|
content: ", ";
|
122
122
|
vertical-align: super; }
|
123
123
|
|
124
|
+
a.TableFootnoteRef, span.TableFootnoteRef,
|
125
|
+
a.FootnoteRef, span.FootnoteRef {
|
126
|
+
vertical-align: super; }
|
127
|
+
|
124
128
|
.addition {
|
125
129
|
color: blue; }
|
126
130
|
|
@@ -351,7 +355,7 @@ h1, h2, h3, h4, h5, h6 {
|
|
351
355
|
|
352
356
|
blockquote, q {
|
353
357
|
quotes: none; }
|
354
|
-
blockquote
|
358
|
+
blockquote::before, blockquote::after, q::before, q::after {
|
355
359
|
content: '';
|
356
360
|
content: none; }
|
357
361
|
|
@@ -374,14 +378,18 @@ b, strong {
|
|
374
378
|
div.document-stage-band, div.document-type-band {
|
375
379
|
background-color: #333333; }
|
376
380
|
|
377
|
-
a.FootnoteRef + a.FootnoteRef
|
381
|
+
a.FootnoteRef + a.FootnoteRef::before {
|
378
382
|
content: ", ";
|
379
383
|
vertical-align: super; }
|
380
384
|
|
381
|
-
a.TableFootnoteRef + a.TableFootnoteRef
|
385
|
+
a.TableFootnoteRef + a.TableFootnoteRef::before {
|
382
386
|
content: ", ";
|
383
387
|
vertical-align: super; }
|
384
388
|
|
389
|
+
a.TableFootnoteRef, span.TableFootnoteRef,
|
390
|
+
a.FootnoteRef, span.FootnoteRef {
|
391
|
+
vertical-align: super; }
|
392
|
+
|
385
393
|
.addition {
|
386
394
|
color: blue; }
|
387
395
|
|
@@ -742,7 +750,7 @@ nav #toc {
|
|
742
750
|
|
743
751
|
#toc li, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) li {
|
744
752
|
list-style-type: none; }
|
745
|
-
#toc li
|
753
|
+
#toc li::before, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) li::before {
|
746
754
|
content: " " !important;
|
747
755
|
display: none; }
|
748
756
|
|
@@ -894,7 +902,7 @@ ul {
|
|
894
902
|
list-style: none;
|
895
903
|
padding-left: 1.2em; }
|
896
904
|
|
897
|
-
ul > li
|
905
|
+
ul > li::before {
|
898
906
|
content: "\2014";
|
899
907
|
position: absolute;
|
900
908
|
left: 0; }
|
@@ -907,7 +915,7 @@ main li {
|
|
907
915
|
p.Biblio, p.NormRef {
|
908
916
|
margin-top: 1em; }
|
909
917
|
|
910
|
-
p.Biblio
|
918
|
+
p.Biblio::before, p.NormRef::before {
|
911
919
|
content: "\2014";
|
912
920
|
padding-right: 1em; }
|
913
921
|
|
@@ -66,7 +66,7 @@ nav {
|
|
66
66
|
li {
|
67
67
|
list-style-type: none;
|
68
68
|
|
69
|
-
|
69
|
+
&::before {
|
70
70
|
content: " " !important;
|
71
71
|
display: none;
|
72
72
|
}
|
@@ -184,7 +184,7 @@ ul {
|
|
184
184
|
padding-left: 1.2em;
|
185
185
|
}
|
186
186
|
|
187
|
-
ul > li
|
187
|
+
ul > li::before {
|
188
188
|
content: "\2014";
|
189
189
|
position: absolute;
|
190
190
|
left: 0;
|
@@ -202,7 +202,7 @@ p.Biblio, p.NormRef {
|
|
202
202
|
margin-top: 1em;
|
203
203
|
}
|
204
204
|
|
205
|
-
p.Biblio
|
205
|
+
p.Biblio::before, p.NormRef::before {
|
206
206
|
content: "\2014";
|
207
207
|
padding-right: 1em;
|
208
208
|
}
|
data/lib/isodoc/cc/i18n-en.yaml
CHANGED
@@ -1,2 +1,2 @@
|
|
1
1
|
annex: Appendix
|
2
|
-
|
2
|
+
table_of_contents: Contents
|
data/lib/metanorma/cc/isodoc.rng
CHANGED
@@ -17,7 +17,7 @@
|
|
17
17
|
these elements; we just want one namespace for any child grammars
|
18
18
|
of this.
|
19
19
|
-->
|
20
|
-
<!-- VERSION v1.2.
|
20
|
+
<!-- VERSION v1.2.3 -->
|
21
21
|
<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">
|
22
22
|
<include href="reqt.rng"/>
|
23
23
|
<include href="basicdoc.rng">
|
@@ -192,9 +192,11 @@
|
|
192
192
|
</attribute>
|
193
193
|
</optional>
|
194
194
|
<attribute name="citeas"/>
|
195
|
-
<
|
196
|
-
<
|
197
|
-
|
195
|
+
<optional>
|
196
|
+
<attribute name="type">
|
197
|
+
<ref name="ReferenceFormat"/>
|
198
|
+
</attribute>
|
199
|
+
</optional>
|
198
200
|
<optional>
|
199
201
|
<attribute name="alt"/>
|
200
202
|
</optional>
|
@@ -836,6 +838,26 @@
|
|
836
838
|
<ref name="paragraph"/>
|
837
839
|
</element>
|
838
840
|
</define>
|
841
|
+
<define name="stem">
|
842
|
+
<element name="stem">
|
843
|
+
<attribute name="type">
|
844
|
+
<choice>
|
845
|
+
<value>MathML</value>
|
846
|
+
<value>AsciiMath</value>
|
847
|
+
<value>LatexMath</value>
|
848
|
+
</choice>
|
849
|
+
</attribute>
|
850
|
+
<attribute name="block">
|
851
|
+
<data type="boolean"/>
|
852
|
+
</attribute>
|
853
|
+
<oneOrMore>
|
854
|
+
<choice>
|
855
|
+
<text/>
|
856
|
+
<ref name="AnyElement"/>
|
857
|
+
</choice>
|
858
|
+
</oneOrMore>
|
859
|
+
</element>
|
860
|
+
</define>
|
839
861
|
<define name="em">
|
840
862
|
<element name="em">
|
841
863
|
<zeroOrMore>
|
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(">= 2.7.0")
|
31
31
|
|
32
|
-
spec.add_dependency "metanorma-generic", "~> 2.
|
32
|
+
spec.add_dependency "metanorma-generic", "~> 2.5.0"
|
33
33
|
|
34
34
|
spec.add_development_dependency "debug"
|
35
35
|
spec.add_development_dependency "equivalent-xml", "~> 0.6"
|
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.3.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Ribose Inc.
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2023-
|
11
|
+
date: 2023-08-07 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: 2.
|
19
|
+
version: 2.5.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: 2.
|
26
|
+
version: 2.5.0
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: debug
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|