metanorma-cc 2.2.9 → 2.2.10
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 +29 -11
- data/lib/metanorma/cc/isodoc.rng +18 -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: e2345ec4dbc1ab943a10ee5e8e31bbe3954a8eae2cf04dd81261fa9ba25de3dd
|
4
|
+
data.tar.gz: e4c1f3835841f7d7d84a267035fce13813096ecf8c05b5ae22b02b1a41b1c7b8
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: d0f02cb1692979d862995a97b6e161d4305f74b0e1485590f3a7b60c840ae978f78db65974cdff1d3fd8fdc81ac57a727f3fd797023e2656f8e4a17a32fc2383
|
7
|
+
data.tar.gz: 5ac5120427e9f47a04404aa9c92f084e448646ff7e76d40bc21409a9549a8499948275c5b431d2613d0fa2de6ccdf6e486481a5f475ad379cf3619678434d605
|
@@ -2444,7 +2444,7 @@
|
|
2444
2444
|
</xsl:attribute>
|
2445
2445
|
</xsl:for-each>
|
2446
2446
|
|
2447
|
-
<xsl:variable name="isNoteOrFnExist" select="./*[local-name()='note'] or .//*[local-name()='fn'][local-name(..) != 'name'] or ./*[local-name()='source']"/>
|
2447
|
+
<xsl:variable name="isNoteOrFnExist" select="./*[local-name()='note'] or ./*[local-name()='example'] or .//*[local-name()='fn'][local-name(..) != 'name'] or ./*[local-name()='source']"/>
|
2448
2448
|
<xsl:if test="$isNoteOrFnExist = 'true'">
|
2449
2449
|
<xsl:attribute name="border-bottom">0pt solid black</xsl:attribute> <!-- set 0pt border, because there is a separete table below for footer -->
|
2450
2450
|
</xsl:if>
|
@@ -2488,7 +2488,7 @@
|
|
2488
2488
|
<xsl:apply-templates select="*[local-name()='thead']" mode="process_tbody"/>
|
2489
2489
|
</xsl:when>
|
2490
2490
|
<xsl:otherwise>
|
2491
|
-
<xsl:apply-templates select="node()[not(local-name() = 'name') and not(local-name() = 'note') and not(local-name() = 'dl') and not(local-name() = 'source') and not(local-name() = 'p') and not(local-name() = 'thead') and not(local-name() = 'tfoot')]"/> <!-- process all table' elements, except name, header, footer, note, source and dl which render separaterely -->
|
2491
|
+
<xsl:apply-templates select="node()[not(local-name() = 'name') and not(local-name() = 'note') and not(local-name() = 'example') and not(local-name() = 'dl') and not(local-name() = 'source') and not(local-name() = 'p') and not(local-name() = 'thead') and not(local-name() = 'tfoot')]"/> <!-- process all table' elements, except name, header, footer, note, source and dl which render separaterely -->
|
2492
2492
|
</xsl:otherwise>
|
2493
2493
|
</xsl:choose>
|
2494
2494
|
|
@@ -3006,7 +3006,7 @@
|
|
3006
3006
|
<xsl:param name="colwidths"/>
|
3007
3007
|
<xsl:param name="colgroup"/>
|
3008
3008
|
|
3009
|
-
<xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ../*[local-name()='dl'] or ..//*[local-name()='fn'][local-name(..) != 'name'] or ../*[local-name()='source'] or ../*[local-name()='p']"/>
|
3009
|
+
<xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ../*[local-name()='example'] or ../*[local-name()='dl'] or ..//*[local-name()='fn'][local-name(..) != 'name'] or ../*[local-name()='source'] or ../*[local-name()='p']"/>
|
3010
3010
|
|
3011
3011
|
<xsl:variable name="isNoteOrFnExistShowAfterTable">
|
3012
3012
|
|
@@ -3079,6 +3079,7 @@
|
|
3079
3079
|
<xsl:apply-templates select="../*[local-name()='p']"/>
|
3080
3080
|
<xsl:apply-templates select="../*[local-name()='dl']"/>
|
3081
3081
|
<xsl:apply-templates select="../*[local-name()='note']"/>
|
3082
|
+
<xsl:apply-templates select="../*[local-name()='example']"/>
|
3082
3083
|
<xsl:apply-templates select="../*[local-name()='source']"/>
|
3083
3084
|
|
3084
3085
|
<xsl:variable name="isDisplayRowSeparator">
|
@@ -3087,7 +3088,7 @@
|
|
3087
3088
|
|
3088
3089
|
<!-- horizontal row separator -->
|
3089
3090
|
<xsl:if test="normalize-space($isDisplayRowSeparator) = 'true'">
|
3090
|
-
<xsl:if test="../*[local-name()='note'] and normalize-space($table_fn_block) != ''">
|
3091
|
+
<xsl:if test="(../*[local-name()='note'] or ../*[local-name()='example']) and normalize-space($table_fn_block) != ''">
|
3091
3092
|
<fo:block-container border-top="0.5pt solid black" padding-left="1mm" padding-right="1mm">
|
3092
3093
|
|
3093
3094
|
<xsl:call-template name="setBordersTableArray"/>
|
@@ -3348,13 +3349,13 @@
|
|
3348
3349
|
</fo:table-cell>
|
3349
3350
|
</xsl:template> <!-- td -->
|
3350
3351
|
|
3351
|
-
<xsl:template match="*[local-name()='table']/*[local-name()='note']" priority="2">
|
3352
|
+
<xsl:template match="*[local-name()='table']/*[local-name()='note' or local-name() = 'example']" priority="2">
|
3352
3353
|
|
3353
3354
|
<fo:block xsl:use-attribute-sets="table-note-style">
|
3354
3355
|
|
3355
3356
|
<xsl:call-template name="refine_table-note-style"/>
|
3356
3357
|
|
3357
|
-
<!-- Table's note name (NOTE, for example) -->
|
3358
|
+
<!-- Table's note/example name (NOTE, for example) -->
|
3358
3359
|
<fo:inline xsl:use-attribute-sets="table-note-name-style">
|
3359
3360
|
|
3360
3361
|
<xsl:call-template name="refine_table-note-name-style"/>
|
@@ -3368,7 +3369,7 @@
|
|
3368
3369
|
|
3369
3370
|
</xsl:template> <!-- table/note -->
|
3370
3371
|
|
3371
|
-
<xsl:template match="*[local-name()='table']/*[local-name()='note']/*[local-name()='p']" priority="2">
|
3372
|
+
<xsl:template match="*[local-name()='table']/*[local-name()='note' or local-name()='example']/*[local-name()='p']" priority="2">
|
3372
3373
|
<xsl:apply-templates/>
|
3373
3374
|
</xsl:template>
|
3374
3375
|
|
@@ -4434,10 +4435,15 @@
|
|
4434
4435
|
<!-- ========================= -->
|
4435
4436
|
<xsl:template match="*[local-name()='em']">
|
4436
4437
|
<fo:inline font-style="italic">
|
4438
|
+
<xsl:call-template name="refine_italic_style"/>
|
4437
4439
|
<xsl:apply-templates/>
|
4438
4440
|
</fo:inline>
|
4439
4441
|
</xsl:template>
|
4440
4442
|
|
4443
|
+
<xsl:template name="refine_italic_style">
|
4444
|
+
|
4445
|
+
</xsl:template>
|
4446
|
+
|
4441
4447
|
<xsl:template match="*[local-name()='strong'] | *[local-name()='b']">
|
4442
4448
|
<xsl:param name="split_keep-within-line"/>
|
4443
4449
|
<fo:inline font-weight="bold">
|
@@ -4923,7 +4929,10 @@
|
|
4923
4929
|
</xsl:choose>
|
4924
4930
|
</xsl:variable>
|
4925
4931
|
|
4926
|
-
|
4932
|
+
<!-- replace sequence #x200B and space TO space -->
|
4933
|
+
<xsl:variable name="text10" select="java:replaceAll(java:java.lang.String.new($text9), '\u200b ', ' ')"/>
|
4934
|
+
|
4935
|
+
<xsl:value-of select="$text10"/>
|
4927
4936
|
</xsl:template>
|
4928
4937
|
|
4929
4938
|
<xsl:template name="add-zero-spaces-link-java">
|
@@ -6012,7 +6021,7 @@
|
|
6012
6021
|
<xsl:call-template name="insert_basic_link">
|
6013
6022
|
<xsl:with-param name="element">
|
6014
6023
|
<fo:basic-link internal-destination="{@target}" fox:alt-text="{@target}" xsl:use-attribute-sets="xref-style">
|
6015
|
-
<xsl:if test="string-length(normalize-space()) < 30 and not(contains(normalize-space(), 'http://')) and not(contains(normalize-space(), 'https://'))">
|
6024
|
+
<xsl:if test="string-length(normalize-space()) < 30 and not(contains(normalize-space(), 'http://')) and not(contains(normalize-space(), 'https://')) and not(ancestor::*[local-name() = 'table' or local-name() = 'dl'])">
|
6016
6025
|
<xsl:attribute name="keep-together.within-line">always</xsl:attribute>
|
6017
6026
|
</xsl:if>
|
6018
6027
|
<xsl:if test="parent::*[local-name() = 'add']">
|
@@ -8297,6 +8306,12 @@
|
|
8297
8306
|
|
8298
8307
|
</xsl:template>
|
8299
8308
|
|
8309
|
+
<xsl:template match="*[local-name() = 'table']/*[local-name() = 'example']/*[local-name() = 'name']">
|
8310
|
+
<fo:inline xsl:use-attribute-sets="example-name-style">
|
8311
|
+
<xsl:apply-templates/>
|
8312
|
+
</fo:inline>
|
8313
|
+
</xsl:template>
|
8314
|
+
|
8300
8315
|
<xsl:template match="*[local-name() = 'example']/*[local-name() = 'p']">
|
8301
8316
|
<xsl:param name="fo_element">block</xsl:param>
|
8302
8317
|
|
@@ -8875,6 +8890,9 @@
|
|
8875
8890
|
<xsl:otherwise><xsl:call-template name="setULLabel"/></xsl:otherwise>
|
8876
8891
|
</xsl:choose>
|
8877
8892
|
</xsl:when>
|
8893
|
+
<xsl:when test="local-name(..) = 'ol' and @label"> <!-- for ordered lists 'ol', and if there is @label, for instance label="1.1.2" -->
|
8894
|
+
<xsl:value-of select="@label"/>
|
8895
|
+
</xsl:when>
|
8878
8896
|
<xsl:otherwise> <!-- for ordered lists 'ol' -->
|
8879
8897
|
|
8880
8898
|
<!-- Example: for BSI <?list-start 2?> -->
|
@@ -8932,10 +8950,10 @@
|
|
8932
8950
|
<xsl:when test="$type = 'arabic'">
|
8933
8951
|
1)
|
8934
8952
|
</xsl:when>
|
8935
|
-
<xsl:when test="$type = 'alphabet'">
|
8953
|
+
<xsl:when test="$type = 'alphabet' or $type = 'alphabetic'">
|
8936
8954
|
a)
|
8937
8955
|
</xsl:when>
|
8938
|
-
<xsl:when test="$type = 'alphabet_upper'">
|
8956
|
+
<xsl:when test="$type = 'alphabet_upper' or $type = 'alphabetic_upper'">
|
8939
8957
|
A.
|
8940
8958
|
</xsl:when>
|
8941
8959
|
<xsl:when test="$type = 'roman'">
|
data/lib/metanorma/cc/isodoc.rng
CHANGED
@@ -1012,6 +1012,7 @@
|
|
1012
1012
|
<ref name="del"/>
|
1013
1013
|
<ref name="span"/>
|
1014
1014
|
<ref name="erefstack"/>
|
1015
|
+
<ref name="date_inline"/>
|
1015
1016
|
</choice>
|
1016
1017
|
</define>
|
1017
1018
|
<define name="add">
|
@@ -1053,6 +1054,23 @@
|
|
1053
1054
|
</oneOrMore>
|
1054
1055
|
</element>
|
1055
1056
|
</define>
|
1057
|
+
<define name="date_inline">
|
1058
|
+
<element name="date">
|
1059
|
+
<attribute name="value"/>
|
1060
|
+
<optional>
|
1061
|
+
<attribute name="format"/>
|
1062
|
+
</optional>
|
1063
|
+
<optional>
|
1064
|
+
<attribute name="language"/>
|
1065
|
+
</optional>
|
1066
|
+
<optional>
|
1067
|
+
<attribute name="script"/>
|
1068
|
+
</optional>
|
1069
|
+
<optional>
|
1070
|
+
<attribute name="locale"/>
|
1071
|
+
</optional>
|
1072
|
+
</element>
|
1073
|
+
</define>
|
1056
1074
|
<define name="concept">
|
1057
1075
|
<element name="concept">
|
1058
1076
|
<optional>
|
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.10
|
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-05
|
11
|
+
date: 2023-06-05 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: metanorma-generic
|