metanorma-cc 2.2.3 → 2.2.4
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/lib/isodoc/cc/cc.standard.xsl +136 -44
- data/lib/isodoc/cc/html/htmlstyle.css +4 -0
- data/lib/isodoc/cc/html/htmlstyle.scss +6 -0
- data/lib/metanorma/cc/basicdoc.rng +0 -1
- data/lib/metanorma/cc/biblio.rng +11 -1
- data/lib/metanorma/cc/isodoc.rng +11 -0
- data/lib/metanorma/cc/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: e8bc0f7fc89706fda4659178578d0dc36df860bf39cfa922833b56b6cc5a3244
|
|
4
|
+
data.tar.gz: '008c0041602511aa48595895c034f657e9550811630016f09bafb0a6a03f7694'
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 1015ad2790e861ecc8c5a987e7d9d94fb84527ba5d7fa1bf6963fe1d2282a3d0dec75add166a26a5fcbf1f7d9fed85af3ce4488953057926d4c5d06257759e43
|
|
7
|
+
data.tar.gz: 2292e0873343ea9800cc3955c3a9c9efea5533bceff1c4ecbca9536d3c82d4017c4db9777610d5d9e9f30a6e70ab2b0fb4e2130451399d46742e4b8d755d89f8
|
|
@@ -2314,7 +2314,7 @@
|
|
|
2314
2314
|
<xsl:variable name="isDeleted" select="@deleted"/>
|
|
2315
2315
|
|
|
2316
2316
|
<xsl:choose>
|
|
2317
|
-
<xsl:when test="@width">
|
|
2317
|
+
<xsl:when test="@width and @width != 'full-page-width' and @width != 'text-width'">
|
|
2318
2318
|
|
|
2319
2319
|
<!-- centered table when table name is centered (see table-name-style) -->
|
|
2320
2320
|
|
|
@@ -2639,6 +2639,7 @@
|
|
|
2639
2639
|
This makes columns with large differences between minimum and maximum widths wider than columns with smaller differences. -->
|
|
2640
2640
|
<xsl:when test="(@width_max > $page_width and @width_min < $page_width) or (@width_min >= $page_width)">
|
|
2641
2641
|
<!-- difference between the available space and the minimum table width -->
|
|
2642
|
+
<_width_min><xsl:value-of select="@width_min"/></_width_min>
|
|
2642
2643
|
<xsl:variable name="W" select="$page_width - @width_min"/>
|
|
2643
2644
|
<W><xsl:value-of select="$W"/></W>
|
|
2644
2645
|
<!-- difference between maximum and minimum width of the table -->
|
|
@@ -3256,17 +3257,20 @@
|
|
|
3256
3257
|
<xsl:for-each select="xalan:nodeset($references)//fn">
|
|
3257
3258
|
<xsl:variable name="reference" select="@reference"/>
|
|
3258
3259
|
<xsl:if test="not(preceding-sibling::*[@reference = $reference])"> <!-- only unique reference puts in note-->
|
|
3259
|
-
<fo:block xsl:use-attribute-sets="table-fn-style">
|
|
3260
3260
|
|
|
3261
|
-
|
|
3261
|
+
<fo:block xsl:use-attribute-sets="table-fn-style">
|
|
3262
3262
|
|
|
3263
|
-
|
|
3263
|
+
<fo:inline id="{@id}" xsl:use-attribute-sets="table-fn-number-style">
|
|
3264
|
+
|
|
3265
|
+
<xsl:value-of select="@reference"/>
|
|
3266
|
+
|
|
3267
|
+
</fo:inline>
|
|
3268
|
+
<fo:inline xsl:use-attribute-sets="table-fn-body-style">
|
|
3269
|
+
<xsl:copy-of select="./node()"/>
|
|
3270
|
+
</fo:inline>
|
|
3271
|
+
|
|
3272
|
+
</fo:block>
|
|
3264
3273
|
|
|
3265
|
-
</fo:inline>
|
|
3266
|
-
<fo:inline xsl:use-attribute-sets="table-fn-body-style">
|
|
3267
|
-
<xsl:copy-of select="./node()"/>
|
|
3268
|
-
</fo:inline>
|
|
3269
|
-
</fo:block>
|
|
3270
3274
|
</xsl:if>
|
|
3271
3275
|
</xsl:for-each>
|
|
3272
3276
|
</xsl:template>
|
|
@@ -4205,12 +4209,12 @@
|
|
|
4205
4209
|
<xsl:param name="value"/>
|
|
4206
4210
|
<xsl:variable name="add_width" select="string-length($value) * 20"/>
|
|
4207
4211
|
<xsl:variable name="maxwidth" select="60 + $add_width"/>
|
|
4208
|
-
<fo:instream-foreign-object fox:alt-text="OpeningTag" baseline-shift="-
|
|
4209
|
-
<xsl:attribute name="height">5mm</xsl:attribute>
|
|
4212
|
+
<fo:instream-foreign-object fox:alt-text="OpeningTag" baseline-shift="-10%"><!-- alignment-baseline="middle" -->
|
|
4213
|
+
<xsl:attribute name="height">3.5mm</xsl:attribute> <!-- 5mm -->
|
|
4210
4214
|
<xsl:attribute name="content-width">100%</xsl:attribute>
|
|
4211
4215
|
<xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
|
|
4212
4216
|
<xsl:attribute name="scaling">uniform</xsl:attribute>
|
|
4213
|
-
<svg xmlns="http://www.w3.org/2000/svg" width="{$maxwidth + 32}" height="80">
|
|
4217
|
+
<!-- <svg xmlns="http://www.w3.org/2000/svg" width="{$maxwidth + 32}" height="80">
|
|
4214
4218
|
<g>
|
|
4215
4219
|
<xsl:if test="$type = 'closing' or $type = 'end'">
|
|
4216
4220
|
<xsl:attribute name="transform">scale(-1 1) translate(-<xsl:value-of select="$maxwidth + 32"/>,0)</xsl:attribute>
|
|
@@ -4224,6 +4228,27 @@
|
|
|
4224
4228
|
</xsl:if>
|
|
4225
4229
|
<xsl:value-of select="$kind"/><tspan dy="10" font-size="30pt"><xsl:value-of select="$value"/></tspan>
|
|
4226
4230
|
</text>
|
|
4231
|
+
</svg> -->
|
|
4232
|
+
<svg xmlns="http://www.w3.org/2000/svg" width="{$maxwidth + 32}" height="80">
|
|
4233
|
+
<g>
|
|
4234
|
+
<xsl:if test="$type = 'closing' or $type = 'end'">
|
|
4235
|
+
<xsl:attribute name="transform">scale(-1 1) translate(-<xsl:value-of select="$maxwidth + 32"/>,0)</xsl:attribute>
|
|
4236
|
+
</xsl:if>
|
|
4237
|
+
<polyline points="0,2.5 {$maxwidth},2.5 {$maxwidth + 20},40 {$maxwidth},77.5 0,77.5" stroke="black" stroke-width="5" fill="white"/>
|
|
4238
|
+
<line x1="9.5" y1="0" x2="9.5" y2="80" stroke="black" stroke-width="19"/>
|
|
4239
|
+
</g>
|
|
4240
|
+
<xsl:variable name="text_x">
|
|
4241
|
+
<xsl:choose>
|
|
4242
|
+
<xsl:when test="$type = 'closing' or $type = 'end'">28</xsl:when>
|
|
4243
|
+
<xsl:otherwise>22</xsl:otherwise>
|
|
4244
|
+
</xsl:choose>
|
|
4245
|
+
</xsl:variable>
|
|
4246
|
+
<text font-family="Arial" x="{$text_x}" y="50" font-size="40pt">
|
|
4247
|
+
<xsl:value-of select="$kind"/>
|
|
4248
|
+
</text>
|
|
4249
|
+
<text font-family="Arial" x="{$text_x + 33}" y="65" font-size="38pt">
|
|
4250
|
+
<xsl:value-of select="$value"/>
|
|
4251
|
+
</text>
|
|
4227
4252
|
</svg>
|
|
4228
4253
|
</fo:instream-foreign-object>
|
|
4229
4254
|
</xsl:template>
|
|
@@ -4478,18 +4503,23 @@
|
|
|
4478
4503
|
|
|
4479
4504
|
<xsl:template name="add-zero-spaces-java">
|
|
4480
4505
|
<xsl:param name="text" select="."/>
|
|
4481
|
-
|
|
4482
|
-
|
|
4506
|
+
|
|
4507
|
+
<!-- add zero-width space (#x200B) after dot with next non-digit -->
|
|
4508
|
+
<xsl:variable name="text1" select="java:replaceAll(java:java.lang.String.new($text),'(\.)([^\d\s])','$1$2')"/>
|
|
4509
|
+
<!-- add zero-width space (#x200B) after characters: dash, equal, underscore, em dash, thin space, arrow right -->
|
|
4510
|
+
<xsl:variable name="text2" select="java:replaceAll(java:java.lang.String.new($text1),'(-|=|_|—| |→)','$1')"/>
|
|
4511
|
+
<!-- add zero-width space (#x200B) after characters: colon, if there aren't digits after -->
|
|
4512
|
+
<xsl:variable name="text3" select="java:replaceAll(java:java.lang.String.new($text2),'(:)(\D)','$1$2')"/>
|
|
4483
4513
|
<!-- add zero-width space (#x200B) after characters: 'great than' -->
|
|
4484
|
-
<xsl:variable name="
|
|
4514
|
+
<xsl:variable name="text4" select="java:replaceAll(java:java.lang.String.new($text3), '(\u003e)(?!\u003e)', '$1')"/><!-- negative lookahead: 'great than' not followed by 'great than' -->
|
|
4485
4515
|
<!-- add zero-width space (#x200B) before characters: 'less than' -->
|
|
4486
|
-
<xsl:variable name="
|
|
4516
|
+
<xsl:variable name="text5" select="java:replaceAll(java:java.lang.String.new($text4), '(?<!\u003c)(\u003c)', '$1')"/> <!-- (?<!\u003c)(\u003c) --> <!-- negative lookbehind: 'less than' not preceeded by 'less than' -->
|
|
4487
4517
|
<!-- add zero-width space (#x200B) before character: { -->
|
|
4488
|
-
<xsl:variable name="
|
|
4518
|
+
<xsl:variable name="text6" select="java:replaceAll(java:java.lang.String.new($text5), '(?<!\W)(\{)', '$1')"/> <!-- negative lookbehind: '{' not preceeded by 'punctuation char' -->
|
|
4489
4519
|
<!-- add zero-width space (#x200B) after character: , -->
|
|
4490
|
-
<xsl:variable name="
|
|
4520
|
+
<xsl:variable name="text7" select="java:replaceAll(java:java.lang.String.new($text6), '(\,)(?!\d)', '$1')"/> <!-- negative lookahead: ',' not followed by digit -->
|
|
4491
4521
|
|
|
4492
|
-
<xsl:value-of select="$
|
|
4522
|
+
<xsl:value-of select="$text7"/>
|
|
4493
4523
|
</xsl:template>
|
|
4494
4524
|
|
|
4495
4525
|
<xsl:template name="add-zero-spaces-link-java">
|
|
@@ -4498,7 +4528,9 @@
|
|
|
4498
4528
|
<xsl:value-of select="java:replaceAll(java:java.lang.String.new($text), $regex_url_start, '$1')"/> <!-- http://. https:// or www. -->
|
|
4499
4529
|
<xsl:variable name="url_continue" select="java:replaceAll(java:java.lang.String.new($text), $regex_url_start, '$2')"/>
|
|
4500
4530
|
<!-- add zero-width space (#x200B) after characters: dash, dot, colon, equal, underscore, em dash, thin space -->
|
|
4501
|
-
<xsl:
|
|
4531
|
+
<xsl:variable name="url" select="java:replaceAll(java:java.lang.String.new($url_continue),'(-|\.|:|=|_|—| |,|/)','$1')"/>
|
|
4532
|
+
<!-- remove zero-width space at the end -->
|
|
4533
|
+
<xsl:value-of select="java:replaceAll(java:java.lang.String.new($url), '$', '')"/>
|
|
4502
4534
|
</xsl:template>
|
|
4503
4535
|
|
|
4504
4536
|
<!-- add zero space after dash character (for table's entries) -->
|
|
@@ -4635,7 +4667,7 @@
|
|
|
4635
4667
|
</xsl:copy>
|
|
4636
4668
|
</xsl:template>
|
|
4637
4669
|
|
|
4638
|
-
<xsl:template match="*[local-name()='th' or local-name() = 'td'][not(*[local-name()='br']) and not(*[local-name()='p']) and not(*[local-name()='sourcecode'])]" mode="table-without-br">
|
|
4670
|
+
<xsl:template match="*[local-name()='th' or local-name() = 'td'][not(*[local-name()='br']) and not(*[local-name()='p']) and not(*[local-name()='sourcecode']) and not(*[local-name()='ul']) and not(*[local-name()='ol'])]" mode="table-without-br">
|
|
4639
4671
|
<xsl:copy>
|
|
4640
4672
|
<xsl:copy-of select="@*"/>
|
|
4641
4673
|
<p>
|
|
@@ -4711,6 +4743,14 @@
|
|
|
4711
4743
|
<xsl:value-of select="java:replaceAll(java:java.lang.String.new($text),' {2,}',' ')"/>
|
|
4712
4744
|
</xsl:template>
|
|
4713
4745
|
|
|
4746
|
+
<xsl:template match="*[local-name()='th' or local-name()='td']//*[local-name() = 'ol' or local-name() = 'ul']" mode="table-without-br">
|
|
4747
|
+
<xsl:apply-templates mode="table-without-br"/>
|
|
4748
|
+
</xsl:template>
|
|
4749
|
+
|
|
4750
|
+
<xsl:template match="*[local-name()='th' or local-name()='td']//*[local-name() = 'li']" mode="table-without-br">
|
|
4751
|
+
<xsl:apply-templates mode="table-without-br"/>
|
|
4752
|
+
</xsl:template>
|
|
4753
|
+
|
|
4714
4754
|
<!-- mode="table-without-br" -->
|
|
4715
4755
|
<!-- ================================== -->
|
|
4716
4756
|
<!-- END: Step 0. replace <br/> to <p>...</p> -->
|
|
@@ -5524,7 +5564,7 @@
|
|
|
5524
5564
|
|
|
5525
5565
|
<fo:block-container id="{@id}" xsl:use-attribute-sets="note-style">
|
|
5526
5566
|
|
|
5527
|
-
<fo:block-container margin-left="0mm">
|
|
5567
|
+
<fo:block-container margin-left="0mm" margin-right="0mm">
|
|
5528
5568
|
|
|
5529
5569
|
<fo:block>
|
|
5530
5570
|
|
|
@@ -5698,11 +5738,14 @@
|
|
|
5698
5738
|
<xsl:with-param name="isDeleted" select="$isDeleted"/>
|
|
5699
5739
|
</xsl:call-template>
|
|
5700
5740
|
|
|
5741
|
+
<!-- Example: Dimensions in millimeters -->
|
|
5742
|
+
<xsl:apply-templates select="*[local-name() = 'note'][@type = 'units']"/>
|
|
5743
|
+
|
|
5701
5744
|
<fo:block xsl:use-attribute-sets="figure-style">
|
|
5702
|
-
<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
|
|
5745
|
+
<xsl:apply-templates select="node()[not(local-name() = 'name') and not(local-name() = 'note' and @type = 'units')]"/>
|
|
5703
5746
|
</fo:block>
|
|
5704
5747
|
<xsl:call-template name="fn_display_figure"/>
|
|
5705
|
-
<xsl:for-each select="*[local-name() = 'note']">
|
|
5748
|
+
<xsl:for-each select="*[local-name() = 'note'][not(@type = 'units')]">
|
|
5706
5749
|
<xsl:call-template name="note"/>
|
|
5707
5750
|
</xsl:for-each>
|
|
5708
5751
|
|
|
@@ -5959,24 +6002,47 @@
|
|
|
5959
6002
|
|
|
5960
6003
|
</xsl:when>
|
|
5961
6004
|
<xsl:otherwise>
|
|
5962
|
-
|
|
5963
|
-
|
|
5964
|
-
|
|
5965
|
-
<xsl:
|
|
5966
|
-
|
|
5967
|
-
|
|
5968
|
-
<xsl:
|
|
5969
|
-
|
|
5970
|
-
|
|
5971
|
-
|
|
5972
|
-
|
|
5973
|
-
|
|
5974
|
-
|
|
5975
|
-
|
|
5976
|
-
|
|
5977
|
-
|
|
5978
|
-
|
|
5979
|
-
|
|
6005
|
+
|
|
6006
|
+
<xsl:variable name="element">
|
|
6007
|
+
<xsl:choose>
|
|
6008
|
+
<xsl:when test="ancestor::*[local-name() = 'tr'] and $isGenerateTableIF = 'true'">
|
|
6009
|
+
<fo:inline xsl:use-attribute-sets="image-style" text-align="left"/>
|
|
6010
|
+
</xsl:when>
|
|
6011
|
+
<xsl:otherwise>
|
|
6012
|
+
<fo:block xsl:use-attribute-sets="image-style">
|
|
6013
|
+
<xsl:if test="ancestor::*[local-name() = 'dt']">
|
|
6014
|
+
<xsl:attribute name="text-align">left</xsl:attribute>
|
|
6015
|
+
</xsl:if>
|
|
6016
|
+
</fo:block>
|
|
6017
|
+
</xsl:otherwise>
|
|
6018
|
+
</xsl:choose>
|
|
6019
|
+
</xsl:variable>
|
|
6020
|
+
|
|
6021
|
+
<xsl:for-each select="xalan:nodeset($element)/*">
|
|
6022
|
+
<xsl:copy>
|
|
6023
|
+
<xsl:copy-of select="@*"/>
|
|
6024
|
+
<!-- <fo:block xsl:use-attribute-sets="image-style"> -->
|
|
6025
|
+
<fo:instream-foreign-object fox:alt-text="{$alt-text}">
|
|
6026
|
+
<xsl:if test="$isGenerateTableIF = 'false'">
|
|
6027
|
+
<xsl:attribute name="width">100%</xsl:attribute>
|
|
6028
|
+
</xsl:if>
|
|
6029
|
+
<xsl:attribute name="content-height">100%</xsl:attribute>
|
|
6030
|
+
<xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
|
|
6031
|
+
<xsl:variable name="svg_width" select="xalan:nodeset($svg_content)/*/@width"/>
|
|
6032
|
+
<xsl:variable name="svg_height" select="xalan:nodeset($svg_content)/*/@height"/>
|
|
6033
|
+
<!-- effective height 297 - 27.4 - 13 = 256.6 -->
|
|
6034
|
+
<!-- effective width 210 - 12.5 - 25 = 172.5 -->
|
|
6035
|
+
<!-- effective height / width = 1.48, 1.4 - with title -->
|
|
6036
|
+
<xsl:if test="$svg_height > ($svg_width * 1.4)"> <!-- for images with big height -->
|
|
6037
|
+
<xsl:variable name="width" select="(($svg_width * 1.4) div $svg_height) * 100"/>
|
|
6038
|
+
<xsl:attribute name="width"><xsl:value-of select="$width"/>%</xsl:attribute>
|
|
6039
|
+
</xsl:if>
|
|
6040
|
+
<xsl:attribute name="scaling">uniform</xsl:attribute>
|
|
6041
|
+
<xsl:copy-of select="$svg_content"/>
|
|
6042
|
+
</fo:instream-foreign-object>
|
|
6043
|
+
<!-- </fo:block> -->
|
|
6044
|
+
</xsl:copy>
|
|
6045
|
+
</xsl:for-each>
|
|
5980
6046
|
</xsl:otherwise>
|
|
5981
6047
|
</xsl:choose>
|
|
5982
6048
|
</xsl:template>
|
|
@@ -6068,6 +6134,13 @@
|
|
|
6068
6134
|
</xsl:for-each>
|
|
6069
6135
|
</xsl:template>
|
|
6070
6136
|
|
|
6137
|
+
<!-- For the structures like: <dt><image src="" mimetype="image/svg+xml" height="" width=""><svg xmlns="http://www.w3.org/2000/svg" ... -->
|
|
6138
|
+
<xsl:template match="*[local-name() != 'figure']/*[local-name() = 'image'][*[local-name() = 'svg']]" priority="3">
|
|
6139
|
+
<xsl:for-each select="*[local-name() = 'svg']">
|
|
6140
|
+
<xsl:call-template name="image_svg"/>
|
|
6141
|
+
</xsl:for-each>
|
|
6142
|
+
</xsl:template>
|
|
6143
|
+
|
|
6071
6144
|
<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'image'][@mimetype = 'image/svg+xml' and @src[not(starts-with(., 'data:image/'))]]" priority="2">
|
|
6072
6145
|
<xsl:variable name="svg_content" select="document(@src)"/>
|
|
6073
6146
|
<xsl:variable name="name" select="ancestor::*[local-name() = 'figure']/*[local-name() = 'name']"/>
|
|
@@ -6206,6 +6279,8 @@
|
|
|
6206
6279
|
<xsl:value-of select="."/>
|
|
6207
6280
|
</xsl:template>
|
|
6208
6281
|
|
|
6282
|
+
<xsl:template match="*[local-name() = 'add'][starts-with(., $ace_tag)]/text()" mode="bookmarks" priority="3"/>
|
|
6283
|
+
|
|
6209
6284
|
<xsl:template match="node()" mode="contents">
|
|
6210
6285
|
<xsl:apply-templates mode="contents"/>
|
|
6211
6286
|
</xsl:template>
|
|
@@ -6513,7 +6588,15 @@
|
|
|
6513
6588
|
<xsl:value-of select="@section"/>
|
|
6514
6589
|
<xsl:text> </xsl:text>
|
|
6515
6590
|
</xsl:if>
|
|
6516
|
-
<xsl:
|
|
6591
|
+
<xsl:variable name="title">
|
|
6592
|
+
<xsl:for-each select="title/node()">
|
|
6593
|
+
<xsl:choose>
|
|
6594
|
+
<xsl:when test="local-name() = 'add' and starts-with(., $ace_tag)"><!-- skip --></xsl:when>
|
|
6595
|
+
<xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
|
|
6596
|
+
</xsl:choose>
|
|
6597
|
+
</xsl:for-each>
|
|
6598
|
+
</xsl:variable>
|
|
6599
|
+
<xsl:value-of select="normalize-space($title)"/>
|
|
6517
6600
|
</fo:bookmark-title>
|
|
6518
6601
|
<xsl:apply-templates mode="bookmark"/>
|
|
6519
6602
|
</fo:bookmark>
|
|
@@ -6539,6 +6622,12 @@
|
|
|
6539
6622
|
<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'fn']" priority="2"/>
|
|
6540
6623
|
<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'note']"/>
|
|
6541
6624
|
|
|
6625
|
+
<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'note'][@type = 'units'] | *[local-name() = 'image']/*[local-name() = 'note'][@type = 'units']" priority="2">
|
|
6626
|
+
<fo:block text-align="right" keep-with-next="always">
|
|
6627
|
+
<xsl:apply-templates/>
|
|
6628
|
+
</fo:block>
|
|
6629
|
+
</xsl:template>
|
|
6630
|
+
|
|
6542
6631
|
<!-- ====== -->
|
|
6543
6632
|
<!-- ====== -->
|
|
6544
6633
|
<xsl:template match="*[local-name() = 'title']" mode="contents_item">
|
|
@@ -6688,6 +6777,10 @@
|
|
|
6688
6777
|
</xsl:for-each>
|
|
6689
6778
|
</xsl:template>
|
|
6690
6779
|
|
|
6780
|
+
<xsl:template match="*[local-name() = 'add'][starts-with(., $ace_tag)]/text()" mode="contents_item" priority="2">
|
|
6781
|
+
<xsl:value-of select="."/>
|
|
6782
|
+
</xsl:template>
|
|
6783
|
+
|
|
6691
6784
|
<!-- Note: to enable the addition of character span markup with semantic styling for DIS Word output -->
|
|
6692
6785
|
<xsl:template match="*[local-name() = 'span']" mode="contents_item">
|
|
6693
6786
|
<xsl:apply-templates mode="contents_item"/>
|
|
@@ -8916,7 +9009,6 @@
|
|
|
8916
9009
|
<xsl:if test="@type = 'editorial'">
|
|
8917
9010
|
<xsl:attribute name="color">green</xsl:attribute>
|
|
8918
9011
|
<xsl:attribute name="font-weight">normal</xsl:attribute>
|
|
8919
|
-
|
|
8920
9012
|
<!-- <xsl:variable name="note-style">
|
|
8921
9013
|
<style xsl:use-attribute-sets="note-style"></style>
|
|
8922
9014
|
</xsl:variable>
|
data/lib/metanorma/cc/biblio.rng
CHANGED
|
@@ -216,6 +216,9 @@
|
|
|
216
216
|
<optional>
|
|
217
217
|
<ref name="fullname"/>
|
|
218
218
|
</optional>
|
|
219
|
+
<zeroOrMore>
|
|
220
|
+
<ref name="credential"/>
|
|
221
|
+
</zeroOrMore>
|
|
219
222
|
<zeroOrMore>
|
|
220
223
|
<ref name="affiliation"/>
|
|
221
224
|
</zeroOrMore>
|
|
@@ -232,6 +235,11 @@
|
|
|
232
235
|
<ref name="FullNameType"/>
|
|
233
236
|
</element>
|
|
234
237
|
</define>
|
|
238
|
+
<define name="credential">
|
|
239
|
+
<element name="credential">
|
|
240
|
+
<text/>
|
|
241
|
+
</element>
|
|
242
|
+
</define>
|
|
235
243
|
<define name="FullNameType">
|
|
236
244
|
<choice>
|
|
237
245
|
<group>
|
|
@@ -305,7 +313,9 @@
|
|
|
305
313
|
<zeroOrMore>
|
|
306
314
|
<ref name="affiliationdescription"/>
|
|
307
315
|
</zeroOrMore>
|
|
308
|
-
<
|
|
316
|
+
<optional>
|
|
317
|
+
<ref name="organization"/>
|
|
318
|
+
</optional>
|
|
309
319
|
</element>
|
|
310
320
|
</define>
|
|
311
321
|
<define name="affiliationname">
|
data/lib/metanorma/cc/isodoc.rng
CHANGED
|
@@ -66,6 +66,7 @@
|
|
|
66
66
|
<value>caution</value>
|
|
67
67
|
<value>statement</value>
|
|
68
68
|
<value>editorial</value>
|
|
69
|
+
<value>box</value>
|
|
69
70
|
</choice>
|
|
70
71
|
</define>
|
|
71
72
|
<define name="index">
|
|
@@ -1577,6 +1578,9 @@
|
|
|
1577
1578
|
<zeroOrMore>
|
|
1578
1579
|
<ref name="indexsect"/>
|
|
1579
1580
|
</zeroOrMore>
|
|
1581
|
+
<optional>
|
|
1582
|
+
<ref name="colophon"/>
|
|
1583
|
+
</optional>
|
|
1580
1584
|
</element>
|
|
1581
1585
|
</define>
|
|
1582
1586
|
<define name="misccontainer">
|
|
@@ -1599,6 +1603,13 @@
|
|
|
1599
1603
|
</oneOrMore>
|
|
1600
1604
|
</element>
|
|
1601
1605
|
</define>
|
|
1606
|
+
<define name="colophon">
|
|
1607
|
+
<element name="colophon">
|
|
1608
|
+
<oneOrMore>
|
|
1609
|
+
<ref name="content"/>
|
|
1610
|
+
</oneOrMore>
|
|
1611
|
+
</element>
|
|
1612
|
+
</define>
|
|
1602
1613
|
<define name="foreword">
|
|
1603
1614
|
<element name="foreword">
|
|
1604
1615
|
<ref name="Content-Section"/>
|
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.2.
|
|
4
|
+
version: 2.2.4
|
|
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-02-27 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: metanorma-generic
|