metanorma-cc 2.0.5 → 2.0.8
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 +172 -32
- data/lib/metanorma/cc/biblio.rng +25 -2
- data/lib/metanorma/cc/version.rb +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: f4e32f9f56124c2b505b0c200b08218fe707fdfcf6a5a90eb2cb8be3c303ab6e
|
4
|
+
data.tar.gz: a0c8c48ff1a1150c8a4ec42c7db5f22bdef611269b2ae4977eed54ce0b5181fc
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 7ffa0ec8f2ae42a01735fec0ec2b9b528aa7a530ebe219b371a56d48c85893a373d7473ed46f95950b312bca2d76bdf89400833cfcc79f35e6cf5f07ffc14538
|
7
|
+
data.tar.gz: 7500c23346c84d5de86c11fecbc8888b0b52c1cdab2f66cd7b12322ea3cf4e574e339e6d293a52d421d023e8462c617cf7b933a2c1805c6146dde15243b155d0
|
@@ -32,7 +32,13 @@
|
|
32
32
|
|
33
33
|
<xsl:template match="/">
|
34
34
|
<xsl:call-template name="namespaceCheck"/>
|
35
|
-
<fo:root
|
35
|
+
<fo:root xml:lang="{$lang}">
|
36
|
+
<xsl:variable name="root-style">
|
37
|
+
<root-style xsl:use-attribute-sets="root-style"/>
|
38
|
+
</xsl:variable>
|
39
|
+
<xsl:call-template name="insertRootStyle">
|
40
|
+
<xsl:with-param name="root-style" select="$root-style"/>
|
41
|
+
</xsl:call-template>
|
36
42
|
<fo:layout-master-set>
|
37
43
|
<!-- Cover page -->
|
38
44
|
<fo:simple-page-master master-name="cover-page" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
@@ -560,7 +566,7 @@
|
|
560
566
|
</xsl:template>
|
561
567
|
|
562
568
|
|
563
|
-
<xsl:param name="svg_images"/><xsl:variable name="images" select="document($svg_images)"/><xsl:param name="basepath"/><xsl:param name="external_index"/><xsl:param name="syntax-highlight">false</xsl:param><xsl:
|
569
|
+
<xsl:param name="svg_images"/><xsl:variable name="images" select="document($svg_images)"/><xsl:param name="basepath"/><xsl:param name="external_index"/><xsl:param name="syntax-highlight">false</xsl:param><xsl:variable name="lang">
|
564
570
|
<xsl:call-template name="getLang"/>
|
565
571
|
</xsl:variable><xsl:variable name="pageWidth_">
|
566
572
|
210
|
@@ -712,7 +718,30 @@
|
|
712
718
|
|
713
719
|
|
714
720
|
|
715
|
-
</xsl:attribute-set><xsl:
|
721
|
+
</xsl:attribute-set><xsl:template name="insertRootStyle">
|
722
|
+
<xsl:param name="root-style"/>
|
723
|
+
<xsl:variable name="root-style_" select="xalan:nodeset($root-style)"/>
|
724
|
+
|
725
|
+
<xsl:variable name="additional_fonts_">
|
726
|
+
<xsl:for-each select="//*[local-name() = 'misc-container'][1]/*[local-name() = 'presentation-metadata'][*[local-name() = 'name'] = 'fonts']/*[local-name() = 'value']">
|
727
|
+
<xsl:value-of select="."/><xsl:if test="position() != last()">, </xsl:if>
|
728
|
+
</xsl:for-each>
|
729
|
+
</xsl:variable>
|
730
|
+
<xsl:variable name="additional_fonts" select="normalize-space($additional_fonts_)"/>
|
731
|
+
|
732
|
+
<xsl:for-each select="$root-style_/root-style/@*">
|
733
|
+
<xsl:choose>
|
734
|
+
<xsl:when test="local-name() = 'font-family' and $additional_fonts != ''">
|
735
|
+
<xsl:attribute name="{local-name()}">
|
736
|
+
<xsl:value-of select="."/>, <xsl:value-of select="$additional_fonts"/>
|
737
|
+
</xsl:attribute>
|
738
|
+
</xsl:when>
|
739
|
+
<xsl:otherwise>
|
740
|
+
<xsl:copy-of select="."/>
|
741
|
+
</xsl:otherwise>
|
742
|
+
</xsl:choose>
|
743
|
+
</xsl:for-each>
|
744
|
+
</xsl:template><xsl:attribute-set name="copyright-statement-style">
|
716
745
|
|
717
746
|
</xsl:attribute-set><xsl:attribute-set name="copyright-statement-title-style">
|
718
747
|
|
@@ -1225,7 +1254,7 @@
|
|
1225
1254
|
|
1226
1255
|
|
1227
1256
|
|
1228
|
-
</xsl:attribute-set><xsl:attribute-set name="termnote-name-style">
|
1257
|
+
</xsl:attribute-set><xsl:attribute-set name="termnote-name-style">
|
1229
1258
|
|
1230
1259
|
|
1231
1260
|
|
@@ -1915,8 +1944,27 @@
|
|
1915
1944
|
<xsl:sort select="@displayorder" data-type="number"/>
|
1916
1945
|
<xsl:apply-templates select="."/>
|
1917
1946
|
</xsl:for-each>
|
1918
|
-
</xsl:template><xsl:template match="text()">
|
1919
|
-
<xsl:
|
1947
|
+
</xsl:template><xsl:variable name="tag_open">###fo:inline###</xsl:variable><xsl:variable name="tag_close">###/fo:inline###</xsl:variable><xsl:template match="text()" name="text">
|
1948
|
+
<xsl:variable name="regex_standard_reference">([A-Z]{2,}(/[A-Z]{2,})* \d+(-\d+)*(:\d{4})?)</xsl:variable>
|
1949
|
+
<xsl:variable name="text" select="java:replaceAll(java:java.lang.String.new(.),$regex_standard_reference,concat($tag_open,'$1',$tag_close))"/>
|
1950
|
+
<xsl:call-template name="replace_fo_inline">
|
1951
|
+
<xsl:with-param name="text" select="$text"/>
|
1952
|
+
</xsl:call-template>
|
1953
|
+
</xsl:template><xsl:template name="replace_fo_inline">
|
1954
|
+
<xsl:param name="text"/>
|
1955
|
+
<xsl:choose>
|
1956
|
+
<xsl:when test="contains($text, $tag_open)">
|
1957
|
+
<xsl:value-of select="substring-before($text, $tag_open)"/>
|
1958
|
+
<xsl:text disable-output-escaping="yes"><fo:inline keep-together.within-line="always"></xsl:text>
|
1959
|
+
<xsl:variable name="text_after" select="substring-after($text, $tag_open)"/>
|
1960
|
+
<xsl:value-of select="substring-before($text_after, $tag_close)"/>
|
1961
|
+
<xsl:text disable-output-escaping="yes"></fo:inline></xsl:text>
|
1962
|
+
<xsl:call-template name="replace_fo_inline">
|
1963
|
+
<xsl:with-param name="text" select="substring-after($text_after, $tag_close)"/>
|
1964
|
+
</xsl:call-template>
|
1965
|
+
</xsl:when>
|
1966
|
+
<xsl:otherwise><xsl:value-of select="$text"/></xsl:otherwise>
|
1967
|
+
</xsl:choose>
|
1920
1968
|
</xsl:template><xsl:template match="*[local-name()='br']">
|
1921
1969
|
<xsl:value-of select="$linebreak"/>
|
1922
1970
|
</xsl:template><xsl:template match="*[local-name()='copyright-statement']">
|
@@ -3562,24 +3610,28 @@
|
|
3562
3610
|
</xsl:template><xsl:template name="add-zero-spaces-equal">
|
3563
3611
|
<xsl:param name="text" select="."/>
|
3564
3612
|
<xsl:variable name="zero-space-after-equals">==========</xsl:variable>
|
3613
|
+
<xsl:variable name="regex_zero-space-after-equals">(==========)</xsl:variable>
|
3565
3614
|
<xsl:variable name="zero-space-after-equal">=</xsl:variable>
|
3615
|
+
<xsl:variable name="regex_zero-space-after-equal">(=)</xsl:variable>
|
3566
3616
|
<xsl:variable name="zero-space"></xsl:variable>
|
3567
3617
|
<xsl:choose>
|
3568
3618
|
<xsl:when test="contains($text, $zero-space-after-equals)">
|
3569
|
-
<xsl:value-of select="substring-before($text, $zero-space-after-equals)"/>
|
3619
|
+
<!-- <xsl:value-of select="substring-before($text, $zero-space-after-equals)"/>
|
3570
3620
|
<xsl:value-of select="$zero-space-after-equals"/>
|
3571
3621
|
<xsl:value-of select="$zero-space"/>
|
3572
3622
|
<xsl:call-template name="add-zero-spaces-equal">
|
3573
3623
|
<xsl:with-param name="text" select="substring-after($text, $zero-space-after-equals)"/>
|
3574
|
-
</xsl:call-template>
|
3624
|
+
</xsl:call-template> -->
|
3625
|
+
<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),$regex_zero-space-after-equals,concat('$1',$zero_width_space))"/>
|
3575
3626
|
</xsl:when>
|
3576
3627
|
<xsl:when test="contains($text, $zero-space-after-equal)">
|
3577
|
-
<xsl:value-of select="substring-before($text, $zero-space-after-equal)"/>
|
3628
|
+
<!-- <xsl:value-of select="substring-before($text, $zero-space-after-equal)"/>
|
3578
3629
|
<xsl:value-of select="$zero-space-after-equal"/>
|
3579
3630
|
<xsl:value-of select="$zero-space"/>
|
3580
3631
|
<xsl:call-template name="add-zero-spaces-equal">
|
3581
3632
|
<xsl:with-param name="text" select="substring-after($text, $zero-space-after-equal)"/>
|
3582
|
-
</xsl:call-template>
|
3633
|
+
</xsl:call-template> -->
|
3634
|
+
<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),$regex_zero-space-after-equal,concat('$1',$zero_width_space))"/>
|
3583
3635
|
</xsl:when>
|
3584
3636
|
<xsl:otherwise>
|
3585
3637
|
<xsl:value-of select="$text"/>
|
@@ -4055,7 +4107,12 @@
|
|
4055
4107
|
|
4056
4108
|
<fo:inline xsl:use-attribute-sets="termnote-name-style">
|
4057
4109
|
|
4110
|
+
<xsl:if test="not(*[local-name() = 'name']/following-sibling::node()[1][self::text()][normalize-space()=''])">
|
4111
|
+
<xsl:attribute name="padding-right">1mm</xsl:attribute>
|
4112
|
+
</xsl:if>
|
4113
|
+
|
4058
4114
|
|
4115
|
+
|
4059
4116
|
|
4060
4117
|
<!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
|
4061
4118
|
<!-- <xsl:if test="*[not(local-name()='name')][1][node()[normalize-space() != ''][1][local-name() = 'add'] and node()[normalize-space() != ''][last()][local-name() = 'add']]"> -->
|
@@ -5025,7 +5082,73 @@
|
|
5025
5082
|
<xsl:with-param name="text" select="$text_step1"/>
|
5026
5083
|
</xsl:call-template>
|
5027
5084
|
</xsl:variable>
|
5028
|
-
|
5085
|
+
|
5086
|
+
<!-- <xsl:value-of select="$text_step2"/> -->
|
5087
|
+
|
5088
|
+
<!-- add zero-width space after space -->
|
5089
|
+
<xsl:variable name="text_step3" select="java:replaceAll(java:java.lang.String.new($text_step2),' ',' ')"/>
|
5090
|
+
|
5091
|
+
<!-- split text by zero-width space -->
|
5092
|
+
<xsl:variable name="text_step4">
|
5093
|
+
<xsl:call-template name="split_for_interspers">
|
5094
|
+
<xsl:with-param name="pText" select="$text_step3"/>
|
5095
|
+
<xsl:with-param name="sep" select="$zero_width_space"/>
|
5096
|
+
</xsl:call-template>
|
5097
|
+
</xsl:variable>
|
5098
|
+
|
5099
|
+
<xsl:for-each select="xalan:nodeset($text_step4)/node()">
|
5100
|
+
<xsl:choose>
|
5101
|
+
<xsl:when test="local-name() = 'interspers'"> <!-- word with length more than 30 will be interspersed with zero-width space -->
|
5102
|
+
<xsl:call-template name="interspers">
|
5103
|
+
<xsl:with-param name="str" select="."/>
|
5104
|
+
</xsl:call-template>
|
5105
|
+
</xsl:when>
|
5106
|
+
<xsl:otherwise>
|
5107
|
+
<xsl:value-of select="."/>
|
5108
|
+
</xsl:otherwise>
|
5109
|
+
</xsl:choose>
|
5110
|
+
</xsl:for-each>
|
5111
|
+
|
5112
|
+
</xsl:template><xsl:variable name="interspers_tag_open">###interspers123###</xsl:variable><xsl:variable name="interspers_tag_close">###/interspers123###</xsl:variable><xsl:template name="split_for_interspers">
|
5113
|
+
<xsl:param name="pText" select="."/>
|
5114
|
+
<xsl:param name="sep" select="','"/>
|
5115
|
+
<!-- word with length more than 30 will be interspersed with zero-width space -->
|
5116
|
+
<xsl:variable name="regex" select="concat('([^', $zero_width_space, ']{31,})')"/> <!-- sequence of characters (more 31), that doesn't contains zero-width space -->
|
5117
|
+
<xsl:variable name="text" select="java:replaceAll(java:java.lang.String.new($pText),$regex,concat($interspers_tag_open,'$1',$interspers_tag_close))"/>
|
5118
|
+
<xsl:call-template name="replace_tag_interspers">
|
5119
|
+
<xsl:with-param name="text" select="$text"/>
|
5120
|
+
</xsl:call-template>
|
5121
|
+
</xsl:template><xsl:template name="replace_tag_interspers">
|
5122
|
+
<xsl:param name="text"/>
|
5123
|
+
<xsl:choose>
|
5124
|
+
<xsl:when test="contains($text, $interspers_tag_open)">
|
5125
|
+
<xsl:value-of select="substring-before($text, $interspers_tag_open)"/>
|
5126
|
+
<xsl:variable name="text_after" select="substring-after($text, $interspers_tag_open)"/>
|
5127
|
+
<interspers>
|
5128
|
+
<xsl:value-of select="substring-before($text_after, $interspers_tag_close)"/>
|
5129
|
+
</interspers>
|
5130
|
+
<xsl:call-template name="replace_tag_interspers">
|
5131
|
+
<xsl:with-param name="text" select="substring-after($text_after, $interspers_tag_close)"/>
|
5132
|
+
</xsl:call-template>
|
5133
|
+
</xsl:when>
|
5134
|
+
<xsl:otherwise><xsl:value-of select="$text"/></xsl:otherwise>
|
5135
|
+
</xsl:choose>
|
5136
|
+
</xsl:template><xsl:template name="interspers">
|
5137
|
+
<xsl:param name="str"/>
|
5138
|
+
<xsl:param name="char" select="$zero_width_space"/>
|
5139
|
+
<xsl:if test="$str != ''">
|
5140
|
+
<xsl:value-of select="substring($str, 1, 1)"/>
|
5141
|
+
|
5142
|
+
<xsl:variable name="next_char" select="substring($str, 2, 1)"/>
|
5143
|
+
<xsl:if test="not(contains(concat(' -.:=_— ', $char), $next_char))">
|
5144
|
+
<xsl:value-of select="$char"/>
|
5145
|
+
</xsl:if>
|
5146
|
+
|
5147
|
+
<xsl:call-template name="interspers">
|
5148
|
+
<xsl:with-param name="str" select="substring($str, 2)"/>
|
5149
|
+
<xsl:with-param name="char" select="$char"/>
|
5150
|
+
</xsl:call-template>
|
5151
|
+
</xsl:if>
|
5029
5152
|
</xsl:template><xsl:template match="*" mode="syntax_highlight">
|
5030
5153
|
<xsl:apply-templates mode="syntax_highlight"/>
|
5031
5154
|
</xsl:template><xsl:variable name="syntax_highlight_styles_">
|
@@ -5457,7 +5580,7 @@
|
|
5457
5580
|
</xsl:otherwise>
|
5458
5581
|
</xsl:choose> -->
|
5459
5582
|
</fo:block>
|
5460
|
-
</xsl:template><xsl:template match="*[local-name() = 'termsource']/text()[starts-with(., '[SOURCE: Adapted from: ')]" priority="2">
|
5583
|
+
</xsl:template><xsl:template match="*[local-name() = 'termsource']/text()[starts-with(., '[SOURCE: Adapted from: ') or starts-with(., '[SOURCE: Quoted from: ') or starts-with(., '[SOURCE: Modified from: ')]" priority="2">
|
5461
5584
|
<xsl:text>[</xsl:text><xsl:value-of select="substring-after(., '[SOURCE: ')"/>
|
5462
5585
|
</xsl:template><xsl:template match="*[local-name() = 'termsource']/text()">
|
5463
5586
|
<xsl:if test="normalize-space() != ''">
|
@@ -5493,7 +5616,8 @@
|
|
5493
5616
|
<fo:inline><xsl:apply-templates/></fo:inline>
|
5494
5617
|
</xsl:template><xsl:template match="*[local-name() = 'modification']/text()">
|
5495
5618
|
<xsl:if test="normalize-space() != ''">
|
5496
|
-
<xsl:value-of select="."/>
|
5619
|
+
<!-- <xsl:value-of select="."/> -->
|
5620
|
+
<xsl:call-template name="text"/>
|
5497
5621
|
</xsl:if>
|
5498
5622
|
</xsl:template><xsl:template match="*[local-name() = 'quote']">
|
5499
5623
|
<fo:block-container margin-left="0mm">
|
@@ -5533,11 +5657,24 @@
|
|
5533
5657
|
</xsl:template><xsl:template match="*[local-name() = 'author']">
|
5534
5658
|
<xsl:text>— </xsl:text>
|
5535
5659
|
<xsl:apply-templates/>
|
5536
|
-
</xsl:template><xsl:
|
5660
|
+
</xsl:template><xsl:variable name="bibitems_">
|
5661
|
+
<xsl:for-each select="//*[local-name() = 'bibitem']">
|
5662
|
+
<xsl:copy-of select="."/>
|
5663
|
+
</xsl:for-each>
|
5664
|
+
</xsl:variable><xsl:variable name="bibitems" select="xalan:nodeset($bibitems_)"/><xsl:variable name="bibitems_hidden_">
|
5665
|
+
<xsl:for-each select="//*[local-name() = 'bibitem'][@hidden='true']">
|
5666
|
+
<xsl:copy-of select="."/>
|
5667
|
+
</xsl:for-each>
|
5668
|
+
<xsl:for-each select="//*[local-name() = 'references'][@hidden='true']//*[local-name() = 'bibitem']">
|
5669
|
+
<xsl:copy-of select="."/>
|
5670
|
+
</xsl:for-each>
|
5671
|
+
</xsl:variable><xsl:variable name="bibitems_hidden" select="xalan:nodeset($bibitems_hidden_)"/><xsl:template match="*[local-name() = 'eref']">
|
5537
5672
|
<xsl:variable name="current_bibitemid" select="@bibitemid"/>
|
5538
|
-
<xsl:variable name="external-destination" select="normalize-space(key('bibitems', $current_bibitemid)/*[local-name() = 'uri'][@type = 'citation'])"/>
|
5673
|
+
<!-- <xsl:variable name="external-destination" select="normalize-space(key('bibitems', $current_bibitemid)/*[local-name() = 'uri'][@type = 'citation'])"/> -->
|
5674
|
+
<xsl:variable name="external-destination" select="normalize-space($bibitems/*[local-name() ='bibitem'][@id = $current_bibitemid]/*[local-name() = 'uri'][@type = 'citation'])"/>
|
5539
5675
|
<xsl:choose>
|
5540
|
-
<xsl:when test="$external-destination != '' or not(key('bibitems_hidden', $current_bibitemid))"> <!-- if in the bibliography there is the item with @bibitemid (and not hidden), then create link (internal to the bibitem or external) -->
|
5676
|
+
<!-- <xsl:when test="$external-destination != '' or not(key('bibitems_hidden', $current_bibitemid))"> --> <!-- if in the bibliography there is the item with @bibitemid (and not hidden), then create link (internal to the bibitem or external) -->
|
5677
|
+
<xsl:when test="$external-destination != '' or not($bibitems_hidden/*[local-name() ='bibitem'][@id = $current_bibitemid])"> <!-- if in the bibliography there is the item with @bibitemid (and not hidden), then create link (internal to the bibitem or external) -->
|
5541
5678
|
<fo:inline xsl:use-attribute-sets="eref-style">
|
5542
5679
|
<xsl:if test="@type = 'footnote'">
|
5543
5680
|
<xsl:attribute name="keep-together.within-line">always</xsl:attribute>
|
@@ -6667,7 +6804,7 @@
|
|
6667
6804
|
<xsl:copy>
|
6668
6805
|
<xsl:copy-of select="@*"/>
|
6669
6806
|
<!-- copy all elements from bibliography except 'Normative references' (moved to 'sections') -->
|
6670
|
-
<xsl:for-each select="*[not(@normative='true') and not(*[
|
6807
|
+
<xsl:for-each select="*[not(@normative='true') and not(*[@normative='true'])]">
|
6671
6808
|
<xsl:sort select="@displayorder" data-type="number"/>
|
6672
6809
|
<xsl:apply-templates select="." mode="update_xml_step1"/>
|
6673
6810
|
</xsl:for-each>
|
@@ -6916,22 +7053,25 @@
|
|
6916
7053
|
<xsl:param name="pText" select="."/>
|
6917
7054
|
<xsl:param name="sep" select="','"/>
|
6918
7055
|
<xsl:param name="normalize-space" select="'true'"/>
|
7056
|
+
<xsl:param name="keep_sep" select="'false'"/>
|
6919
7057
|
<xsl:if test="string-length($pText) >0">
|
6920
|
-
|
6921
|
-
|
6922
|
-
|
6923
|
-
|
6924
|
-
|
6925
|
-
|
6926
|
-
|
6927
|
-
|
6928
|
-
|
6929
|
-
|
6930
|
-
|
6931
|
-
<xsl:
|
6932
|
-
|
6933
|
-
|
6934
|
-
|
7058
|
+
<item>
|
7059
|
+
<xsl:choose>
|
7060
|
+
<xsl:when test="$normalize-space = 'true'">
|
7061
|
+
<xsl:value-of select="normalize-space(substring-before(concat($pText, $sep), $sep))"/>
|
7062
|
+
</xsl:when>
|
7063
|
+
<xsl:otherwise>
|
7064
|
+
<xsl:value-of select="substring-before(concat($pText, $sep), $sep)"/>
|
7065
|
+
</xsl:otherwise>
|
7066
|
+
</xsl:choose>
|
7067
|
+
</item>
|
7068
|
+
<xsl:if test="$keep_sep = 'true' and contains($pText, $sep)"><item><xsl:value-of select="$sep"/></item></xsl:if>
|
7069
|
+
<xsl:call-template name="split">
|
7070
|
+
<xsl:with-param name="pText" select="substring-after($pText, $sep)"/>
|
7071
|
+
<xsl:with-param name="sep" select="$sep"/>
|
7072
|
+
<xsl:with-param name="normalize-space" select="$normalize-space"/>
|
7073
|
+
<xsl:with-param name="keep_sep" select="$keep_sep"/>
|
7074
|
+
</xsl:call-template>
|
6935
7075
|
</xsl:if>
|
6936
7076
|
</xsl:template><xsl:template name="getDocumentId">
|
6937
7077
|
<xsl:call-template name="getLang"/><xsl:value-of select="//*[local-name() = 'p'][1]/@id"/>
|
data/lib/metanorma/cc/biblio.rng
CHANGED
@@ -527,7 +527,7 @@
|
|
527
527
|
</define>
|
528
528
|
<define name="LocalityType">
|
529
529
|
<data type="string">
|
530
|
-
<param name="pattern">section|clause|part|paragraph|chapter|page|whole|table|annex|figure|note|list|example|volume|issue|time|anchor|locality:[a-zA-Z0-9_]+</param>
|
530
|
+
<param name="pattern">section|clause|part|paragraph|chapter|page|title|line|whole|table|annex|figure|note|list|example|volume|issue|time|anchor|locality:[a-zA-Z0-9_]+</param>
|
531
531
|
</data>
|
532
532
|
</define>
|
533
533
|
<define name="referenceFrom">
|
@@ -677,6 +677,9 @@
|
|
677
677
|
<zeroOrMore>
|
678
678
|
<ref name="extent"/>
|
679
679
|
</zeroOrMore>
|
680
|
+
<optional>
|
681
|
+
<ref name="bibliographic_size"/>
|
682
|
+
</optional>
|
680
683
|
<zeroOrMore>
|
681
684
|
<ref name="accesslocation"/>
|
682
685
|
</zeroOrMore>
|
@@ -922,9 +925,29 @@
|
|
922
925
|
<text/>
|
923
926
|
</element>
|
924
927
|
</define>
|
928
|
+
<define name="sizevalue">
|
929
|
+
<element name="value">
|
930
|
+
<attribute name="type"/>
|
931
|
+
<text/>
|
932
|
+
</element>
|
933
|
+
</define>
|
934
|
+
<define name="bibliographic_size">
|
935
|
+
<element name="size">
|
936
|
+
<oneOrMore>
|
937
|
+
<ref name="sizevalue"/>
|
938
|
+
</oneOrMore>
|
939
|
+
</element>
|
940
|
+
</define>
|
925
941
|
<define name="extent">
|
926
942
|
<element name="extent">
|
927
|
-
<
|
943
|
+
<choice>
|
944
|
+
<zeroOrMore>
|
945
|
+
<ref name="locality"/>
|
946
|
+
</zeroOrMore>
|
947
|
+
<zeroOrMore>
|
948
|
+
<ref name="localityStack"/>
|
949
|
+
</zeroOrMore>
|
950
|
+
</choice>
|
928
951
|
</element>
|
929
952
|
</define>
|
930
953
|
<define name="series">
|
data/lib/metanorma/cc/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: metanorma-cc
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.0.
|
4
|
+
version: 2.0.8
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Ribose Inc.
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2022-
|
11
|
+
date: 2022-04-18 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: metanorma-generic
|
@@ -250,7 +250,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
250
250
|
- !ruby/object:Gem::Version
|
251
251
|
version: '0'
|
252
252
|
requirements: []
|
253
|
-
rubygems_version: 3.
|
253
|
+
rubygems_version: 3.3.9
|
254
254
|
signing_key:
|
255
255
|
specification_version: 4
|
256
256
|
summary: metanorma-cc lets you write CalConnect standards in AsciiDoc.
|