metanorma-cc 2.4.6 → 2.4.7

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/lib/isodoc/cc/cc.standard.xsl +129 -30
  3. data/lib/metanorma/cc/biblio.rng +22 -23
  4. data/lib/metanorma/cc/isodoc.rng +37 -116
  5. data/lib/metanorma/cc/version.rb +1 -1
  6. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 8ef050243a3a0899b2e8c49e156320fa698b24accdbcb338e24f699c02315003
4
- data.tar.gz: c534fe646b808872dd71f9bebec16aa6107c649fa5fd56e6633915c9e0183625
3
+ metadata.gz: f3299d13c9781aa276adaba8c490d0f81cf57d691280b83c9d754d5029a97501
4
+ data.tar.gz: 346f32194088ee3bc07a275803ac878a45449084955983d6e8fc5d9bb54843be
5
5
  SHA512:
6
- metadata.gz: 33e79e69d60d689509211a7899250bc46065677f9585377bd90ef5f0a4194badb3a1b7937b4945b2a8261a3de51d8567d61937dba806ed80e155815cbc2eeac7
7
- data.tar.gz: 808f2f3e374606facb56c1d5cd19f0e81414a0a7fc05e1a971d396871fdbc58e65c11ef1732436e353ac1b26d23206bef0030093b2eaed8f95db762d8ed5355b
6
+ metadata.gz: d76759258e9b62a23052e485ae7115c274c716e0690b18bb0d844e4782301cbfd9c712e5207b40ae9e9dc194bd7a9c3ac3f082270fc8a914628cb71dc3dbc5ae
7
+ data.tar.gz: 299fb3687a979801b95f2afbc9db66bc4be280c561bb7cc4e9318bb4655b089c49b13a94a5594af7d10d96282388caca0167519b821e6430f99c28e30a58c2fd
data/lib/isodoc/cc/cc.standard.xsl CHANGED
@@ -6726,10 +6726,11 @@
6726
6726
  </xsl:template>
6727
6727
 
6728
6728
  <xsl:template match="*[local-name() = 'image']">
6729
+ <xsl:param name="indent">0</xsl:param>
6729
6730
  <xsl:variable name="isAdded" select="../@added"/>
6730
6731
  <xsl:variable name="isDeleted" select="../@deleted"/>
6731
6732
  <xsl:choose>
6732
- <xsl:when test="ancestor::*[local-name() = 'title'] or not(parent::*[local-name() = 'figure']) or parent::*[local-name() = 'p']">
6733
+ <xsl:when test="ancestor::*[local-name() = 'title'] or not(parent::*[local-name() = 'figure']) or parent::*[local-name() = 'p']"> <!-- inline image ( 'image:path' in adoc, with one colon after image) -->
6733
6734
  <fo:inline padding-left="1mm" padding-right="1mm">
6734
6735
  <xsl:if test="not(parent::*[local-name() = 'figure']) or parent::*[local-name() = 'p']">
6735
6736
  <xsl:attribute name="padding-left">0mm</xsl:attribute>
@@ -6738,7 +6739,43 @@
6738
6739
  <xsl:variable name="src">
6739
6740
  <xsl:call-template name="image_src"/>
6740
6741
  </xsl:variable>
6741
- <fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" vertical-align="middle"/>
6742
+
6743
+ <xsl:variable name="scale">
6744
+ <xsl:call-template name="getImageScale">
6745
+ <xsl:with-param name="indent" select="$indent"/>
6746
+ </xsl:call-template>
6747
+ </xsl:variable>
6748
+
6749
+ <!-- debug scale='<xsl:value-of select="$scale"/>', indent='<xsl:value-of select="$indent"/>' -->
6750
+
6751
+ <!-- <fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" vertical-align="middle"/> -->
6752
+ <fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" vertical-align="middle">
6753
+
6754
+ <xsl:variable name="width">
6755
+ <xsl:call-template name="setImageWidth"/>
6756
+ </xsl:variable>
6757
+ <xsl:if test="$width != ''">
6758
+ <xsl:attribute name="width"><xsl:value-of select="$width"/></xsl:attribute>
6759
+ </xsl:if>
6760
+ <xsl:variable name="height">
6761
+ <xsl:call-template name="setImageHeight"/>
6762
+ </xsl:variable>
6763
+ <xsl:if test="$height != ''">
6764
+ <xsl:attribute name="height"><xsl:value-of select="$height"/></xsl:attribute>
6765
+ </xsl:if>
6766
+
6767
+ <xsl:if test="$width = '' and $height = ''">
6768
+ <xsl:if test="number($scale) &lt; 100">
6769
+ <xsl:attribute name="content-width"><xsl:value-of select="number($scale)"/>%</xsl:attribute>
6770
+ <!-- <xsl:attribute name="content-width">scale-to-fit</xsl:attribute>
6771
+ <xsl:attribute name="content-height">100%</xsl:attribute>
6772
+ <xsl:attribute name="width">100%</xsl:attribute>
6773
+ <xsl:attribute name="scaling">uniform</xsl:attribute> -->
6774
+ </xsl:if>
6775
+ </xsl:if>
6776
+
6777
+ </fo:external-graphic>
6778
+
6742
6779
  </fo:inline>
6743
6780
  </xsl:when>
6744
6781
  <xsl:otherwise>
@@ -6759,25 +6796,23 @@
6759
6796
  <xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
6760
6797
  <xsl:attribute name="scaling">uniform</xsl:attribute>
6761
6798
 
6762
- <xsl:apply-templates select="." mode="cross_image"/>
6799
+ <xsl:apply-templates select="." mode="cross_image"/>
6763
6800
 
6764
6801
  </fo:instream-foreign-object>
6765
6802
  </xsl:when>
6766
6803
  <xsl:otherwise>
6804
+ <!-- <fo:block>debug block image:
6805
+ <xsl:variable name="scale">
6806
+ <xsl:call-template name="getImageScale">
6807
+ <xsl:with-param name="indent" select="$indent"/>
6808
+ </xsl:call-template>
6809
+ </xsl:variable>
6810
+ <xsl:value-of select="concat('scale=', $scale,', indent=', $indent)"/>
6811
+ </fo:block> -->
6767
6812
  <fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style">
6768
6813
  <xsl:if test="not(@mimetype = 'image/svg+xml') and (../*[local-name() = 'name'] or parent::*[local-name() = 'figure'][@unnumbered = 'true']) and not(ancestor::*[local-name() = 'table'])">
6769
6814
 
6770
- <xsl:if test="@width != '' and @width != 'auto' and @width != 'text-width' and @width != 'full-page-width' and @width != 'narrow'">
6771
- <xsl:attribute name="width">
6772
- <xsl:value-of select="@width"/>
6773
- </xsl:attribute>
6774
- </xsl:if>
6775
-
6776
- <xsl:if test="@height != '' and @height != 'auto'">
6777
- <xsl:attribute name="height">
6778
- <xsl:value-of select="@height"/>
6779
- </xsl:attribute>
6780
- </xsl:if>
6815
+ <xsl:call-template name="setImageWidthHeight"/>
6781
6816
 
6782
6817
  <xsl:choose>
6783
6818
  <xsl:when test="@width != '' and @width != 'auto' and @height != '' and @height != 'auto'">
@@ -6785,24 +6820,18 @@
6785
6820
  </xsl:when>
6786
6821
  <xsl:otherwise>
6787
6822
 
6788
- <xsl:variable name="img_src">
6789
- <xsl:choose>
6790
- <xsl:when test="not(starts-with(@src, 'data:'))"><xsl:value-of select="concat($basepath, @src)"/></xsl:when>
6791
- <xsl:otherwise><xsl:value-of select="@src"/></xsl:otherwise>
6792
- </xsl:choose>
6823
+ <xsl:variable name="scale">
6824
+ <xsl:call-template name="getImageScale">
6825
+ <xsl:with-param name="indent" select="$indent"/>
6826
+ </xsl:call-template>
6793
6827
  </xsl:variable>
6794
6828
 
6795
- <xsl:variable name="image_width_effective">
6796
-
6797
- <xsl:value-of select="$width_effective"/>
6798
-
6829
+ <xsl:variable name="scaleRatio">
6830
+ 1
6799
6831
  </xsl:variable>
6800
6832
 
6801
- <xsl:variable name="scale" select="java:org.metanorma.fop.Util.getImageScale($img_src, $image_width_effective, $height_effective)"/>
6802
6833
  <xsl:if test="number($scale) &lt; 100">
6803
-
6804
- <xsl:attribute name="content-width"><xsl:value-of select="$scale"/>%</xsl:attribute>
6805
-
6834
+ <xsl:attribute name="content-width"><xsl:value-of select="number($scale) * number($scaleRatio)"/>%</xsl:attribute>
6806
6835
  </xsl:if>
6807
6836
  </xsl:otherwise>
6808
6837
  </xsl:choose>
@@ -6818,6 +6847,62 @@
6818
6847
  </xsl:choose>
6819
6848
  </xsl:template>
6820
6849
 
6850
+ <xsl:template name="setImageWidth">
6851
+ <xsl:if test="@width != '' and @width != 'auto' and @width != 'text-width' and @width != 'full-page-width' and @width != 'narrow'">
6852
+ <xsl:value-of select="@width"/>
6853
+ </xsl:if>
6854
+ </xsl:template>
6855
+ <xsl:template name="setImageHeight">
6856
+ <xsl:if test="@height != '' and @height != 'auto'">
6857
+ <xsl:value-of select="@height"/>
6858
+ </xsl:if>
6859
+ </xsl:template>
6860
+ <xsl:template name="setImageWidthHeight">
6861
+ <xsl:variable name="width">
6862
+ <xsl:call-template name="setImageWidth"/>
6863
+ </xsl:variable>
6864
+ <xsl:if test="$width != ''">
6865
+ <xsl:attribute name="width">
6866
+ <xsl:value-of select="$width"/>
6867
+ </xsl:attribute>
6868
+ </xsl:if>
6869
+ <xsl:variable name="height">
6870
+ <xsl:call-template name="setImageHeight"/>
6871
+ </xsl:variable>
6872
+ <xsl:if test="$height != ''">
6873
+ <xsl:attribute name="height">
6874
+ <xsl:value-of select="$height"/>
6875
+ </xsl:attribute>
6876
+ </xsl:if>
6877
+ </xsl:template>
6878
+
6879
+ <xsl:template name="getImageScale">
6880
+ <xsl:param name="indent"/>
6881
+ <xsl:variable name="indent_left">
6882
+ <xsl:choose>
6883
+ <xsl:when test="$indent != ''"><xsl:value-of select="$indent"/></xsl:when>
6884
+ <xsl:otherwise>0</xsl:otherwise>
6885
+ </xsl:choose>
6886
+ </xsl:variable>
6887
+ <xsl:variable name="img_src">
6888
+ <xsl:choose>
6889
+ <xsl:when test="not(starts-with(@src, 'data:'))"><xsl:value-of select="concat($basepath, @src)"/></xsl:when>
6890
+ <xsl:otherwise><xsl:value-of select="@src"/></xsl:otherwise>
6891
+ </xsl:choose>
6892
+ </xsl:variable>
6893
+
6894
+ <xsl:variable name="image_width_effective">
6895
+
6896
+ <xsl:value-of select="$width_effective - number($indent_left)"/>
6897
+
6898
+ </xsl:variable>
6899
+ <!-- <xsl:message>width_effective=<xsl:value-of select="$width_effective"/></xsl:message>
6900
+ <xsl:message>indent_left=<xsl:value-of select="$indent_left"/></xsl:message>
6901
+ <xsl:message>image_width_effective=<xsl:value-of select="$image_width_effective"/> for <xsl:value-of select="ancestor::ogc:p[1]/@id"/></xsl:message> -->
6902
+ <xsl:variable name="scale" select="java:org.metanorma.fop.Util.getImageScale($img_src, $image_width_effective, $height_effective)"/>
6903
+ <xsl:value-of select="$scale"/>
6904
+ </xsl:template>
6905
+
6821
6906
  <xsl:template name="image_src">
6822
6907
  <xsl:choose>
6823
6908
  <xsl:when test="@mimetype = 'image/svg+xml' and $images/images/image[@id = current()/@id]">
@@ -9502,6 +9587,7 @@
9502
9587
  </xsl:template>
9503
9588
 
9504
9589
  <xsl:template match="*[local-name() = 'ul'] | *[local-name() = 'ol']">
9590
+ <xsl:param name="indent">0</xsl:param>
9505
9591
  <xsl:choose>
9506
9592
  <xsl:when test="parent::*[local-name() = 'note'] or parent::*[local-name() = 'termnote']">
9507
9593
  <fo:block-container role="SKIP">
@@ -9516,7 +9602,9 @@
9516
9602
 
9517
9603
  <fo:block-container margin-left="0mm" role="SKIP">
9518
9604
  <fo:block>
9519
- <xsl:apply-templates select="." mode="list"/>
9605
+ <xsl:apply-templates select="." mode="list">
9606
+ <xsl:with-param name="indent" select="$indent"/>
9607
+ </xsl:apply-templates>
9520
9608
  </fo:block>
9521
9609
  </fo:block-container>
9522
9610
  </fo:block-container>
@@ -9524,7 +9612,9 @@
9524
9612
  <xsl:otherwise>
9525
9613
 
9526
9614
  <fo:block role="SKIP">
9527
- <xsl:apply-templates select="." mode="list"/>
9615
+ <xsl:apply-templates select="." mode="list">
9616
+ <xsl:with-param name="indent" select="$indent"/>
9617
+ </xsl:apply-templates>
9528
9618
  </fo:block>
9529
9619
 
9530
9620
  </xsl:otherwise>
@@ -9609,6 +9699,13 @@
9609
9699
  </xsl:template>
9610
9700
 
9611
9701
  <xsl:template match="*[local-name()='li']">
9702
+ <xsl:param name="indent">0</xsl:param>
9703
+ <!-- <fo:list-item xsl:use-attribute-sets="list-item-style">
9704
+ <fo:list-item-label end-indent="label-end()"><fo:block>x</fo:block></fo:list-item-label>
9705
+ <fo:list-item-body start-indent="body-start()" xsl:use-attribute-sets="list-item-body-style">
9706
+ <fo:block>debug li indent=<xsl:value-of select="$indent"/></fo:block>
9707
+ </fo:list-item-body>
9708
+ </fo:list-item> -->
9612
9709
  <fo:list-item xsl:use-attribute-sets="list-item-style">
9613
9710
  <xsl:copy-of select="@id"/>
9614
9711
 
@@ -9633,7 +9730,9 @@
9633
9730
 
9634
9731
  <xsl:call-template name="refine_list-item-body-style"/>
9635
9732
 
9636
- <xsl:apply-templates/>
9733
+ <xsl:apply-templates>
9734
+ <xsl:with-param name="indent" select="$indent"/>
9735
+ </xsl:apply-templates>
9637
9736
 
9638
9737
  <!-- <xsl:apply-templates select="node()[not(local-name() = 'note')]" />
9639
9738
 
data/lib/metanorma/cc/biblio.rng CHANGED
@@ -95,7 +95,7 @@
95
95
  <text/>
96
96
  </element>
97
97
  </define>
98
- <define name="LocalizedString1">
98
+ <define name="LocalizedStringAttrs">
99
99
  <optional>
100
100
  <!-- multiple languages and scripts possible: comma delimit them if so -->
101
101
  <attribute name="language"/>
@@ -106,6 +106,10 @@
106
106
  <optional>
107
107
  <attribute name="script"/>
108
108
  </optional>
109
+ </define>
110
+ <define name="LocalizedString1">
111
+ <!-- multiple languages and scripts possible: comma delimit them if so -->
112
+ <ref name="LocalizedStringAttrs"/>
109
113
  <text/>
110
114
  </define>
111
115
  <define name="LocalizedString">
@@ -142,16 +146,8 @@
142
146
  <ref name="LocalizedStringOrXsAny"/>
143
147
  </define>
144
148
  <define name="LocalizedStringOrXsAny1">
145
- <optional>
146
- <!-- multiple languages and scripts possible: comma delimit them if so -->
147
- <attribute name="language"/>
148
- </optional>
149
- <optional>
150
- <attribute name="locale"/>
151
- </optional>
152
- <optional>
153
- <attribute name="script"/>
154
- </optional>
149
+ <!-- multiple languages and scripts possible: comma delimit them if so -->
150
+ <ref name="LocalizedStringAttrs"/>
155
151
  <oneOrMore>
156
152
  <choice>
157
153
  <text/>
@@ -208,6 +204,7 @@
208
204
  </define>
209
205
  <define name="roledescription">
210
206
  <element name="description">
207
+ <ref name="LocalizedStringAttrs"/>
211
208
  <oneOrMore>
212
209
  <ref name="TextElement"/>
213
210
  </oneOrMore>
@@ -335,6 +332,7 @@
335
332
  </define>
336
333
  <define name="affiliationdescription">
337
334
  <element name="description">
335
+ <ref name="LocalizedStringAttrs"/>
338
336
  <oneOrMore>
339
337
  <ref name="TextElement"/>
340
338
  </oneOrMore>
@@ -948,6 +946,7 @@
948
946
  <optional>
949
947
  <attribute name="type"/>
950
948
  </optional>
949
+ <ref name="LocalizedStringAttrs"/>
951
950
  <zeroOrMore>
952
951
  <ref name="TextElement"/>
953
952
  </zeroOrMore>
@@ -1041,15 +1040,7 @@
1041
1040
  <data type="boolean"/>
1042
1041
  </attribute>
1043
1042
  </optional>
1044
- <optional>
1045
- <attribute name="language"/>
1046
- </optional>
1047
- <optional>
1048
- <attribute name="locale"/>
1049
- </optional>
1050
- <optional>
1051
- <attribute name="script"/>
1052
- </optional>
1043
+ <ref name="LocalizedStringAttrs"/>
1053
1044
  <oneOrMore>
1054
1045
  <ref name="TextElement"/>
1055
1046
  </oneOrMore>
@@ -1277,6 +1268,7 @@
1277
1268
  <optional>
1278
1269
  <attribute name="type"/>
1279
1270
  </optional>
1271
+ <ref name="LocalizedStringAttrs"/>
1280
1272
  <oneOrMore>
1281
1273
  <ref name="TextElement"/>
1282
1274
  </oneOrMore>
@@ -1284,9 +1276,15 @@
1284
1276
  </define>
1285
1277
  <define name="bibabstract">
1286
1278
  <element name="abstract">
1287
- <oneOrMore>
1288
- <ref name="TextElement"/>
1289
- </oneOrMore>
1279
+ <ref name="LocalizedStringAttrs"/>
1280
+ <choice>
1281
+ <oneOrMore>
1282
+ <ref name="BasicBlock"/>
1283
+ </oneOrMore>
1284
+ <oneOrMore>
1285
+ <ref name="TextElement"/>
1286
+ </oneOrMore>
1287
+ </choice>
1290
1288
  </element>
1291
1289
  </define>
1292
1290
  <define name="copyright">
@@ -1391,6 +1389,7 @@
1391
1389
  </attribute>
1392
1390
  <optional>
1393
1391
  <element name="description">
1392
+ <ref name="LocalizedStringAttrs"/>
1394
1393
  <oneOrMore>
1395
1394
  <ref name="TextElement"/>
1396
1395
  </oneOrMore>
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.3.0 -->
20
+ <!-- VERSION v1.3.1 -->
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">
@@ -1346,38 +1346,41 @@
1346
1346
  </oneOrMore>
1347
1347
  </element>
1348
1348
  </define>
1349
+ <define name="Section-Attributes">
1350
+ <optional>
1351
+ <attribute name="id">
1352
+ <data type="ID"/>
1353
+ </attribute>
1354
+ </optional>
1355
+ <optional>
1356
+ <attribute name="language"/>
1357
+ </optional>
1358
+ <optional>
1359
+ <attribute name="script"/>
1360
+ </optional>
1361
+ <optional>
1362
+ <attribute name="inline-header">
1363
+ <data type="boolean"/>
1364
+ </attribute>
1365
+ </optional>
1366
+ <optional>
1367
+ <attribute name="number"/>
1368
+ </optional>
1369
+ <optional>
1370
+ <attribute name="branch-number"/>
1371
+ </optional>
1372
+ <optional>
1373
+ <attribute name="obligation">
1374
+ <choice>
1375
+ <value>normative</value>
1376
+ <value>informative</value>
1377
+ </choice>
1378
+ </attribute>
1379
+ </optional>
1380
+ </define>
1349
1381
  <define name="reference-clause">
1350
1382
  <element name="clause">
1351
- <optional>
1352
- <attribute name="id">
1353
- <data type="ID"/>
1354
- </attribute>
1355
- </optional>
1356
- <optional>
1357
- <attribute name="language"/>
1358
- </optional>
1359
- <optional>
1360
- <attribute name="script"/>
1361
- </optional>
1362
- <optional>
1363
- <attribute name="inline-header">
1364
- <data type="boolean"/>
1365
- </attribute>
1366
- </optional>
1367
- <optional>
1368
- <attribute name="number"/>
1369
- </optional>
1370
- <optional>
1371
- <attribute name="branch-number"/>
1372
- </optional>
1373
- <optional>
1374
- <attribute name="obligation">
1375
- <choice>
1376
- <value>normative</value>
1377
- <value>informative</value>
1378
- </choice>
1379
- </attribute>
1380
- </optional>
1383
+ <ref name="Section-Attributes"/>
1381
1384
  <optional>
1382
1385
  <ref name="section-title"/>
1383
1386
  </optional>
@@ -1566,36 +1569,7 @@
1566
1569
  </element>
1567
1570
  </define>
1568
1571
  <define name="Content-Section">
1569
- <optional>
1570
- <attribute name="id">
1571
- <data type="ID"/>
1572
- </attribute>
1573
- </optional>
1574
- <optional>
1575
- <attribute name="language"/>
1576
- </optional>
1577
- <optional>
1578
- <attribute name="script"/>
1579
- </optional>
1580
- <optional>
1581
- <attribute name="inline-header">
1582
- <data type="boolean"/>
1583
- </attribute>
1584
- </optional>
1585
- <optional>
1586
- <attribute name="obligation">
1587
- <choice>
1588
- <value>normative</value>
1589
- <value>informative</value>
1590
- </choice>
1591
- </attribute>
1592
- </optional>
1593
- <optional>
1594
- <attribute name="number"/>
1595
- </optional>
1596
- <optional>
1597
- <attribute name="branch-number"/>
1598
- </optional>
1572
+ <ref name="Section-Attributes"/>
1599
1573
  <optional>
1600
1574
  <attribute name="type"/>
1601
1575
  </optional>
@@ -1617,39 +1591,10 @@
1617
1591
  </element>
1618
1592
  </define>
1619
1593
  <define name="Clause-Section">
1620
- <optional>
1621
- <attribute name="id">
1622
- <data type="ID"/>
1623
- </attribute>
1624
- </optional>
1625
- <optional>
1626
- <attribute name="language"/>
1627
- </optional>
1628
- <optional>
1629
- <attribute name="script"/>
1630
- </optional>
1631
- <optional>
1632
- <attribute name="inline-header">
1633
- <data type="boolean"/>
1634
- </attribute>
1635
- </optional>
1636
- <optional>
1637
- <attribute name="obligation">
1638
- <choice>
1639
- <value>normative</value>
1640
- <value>informative</value>
1641
- </choice>
1642
- </attribute>
1643
- </optional>
1594
+ <ref name="Section-Attributes"/>
1644
1595
  <optional>
1645
1596
  <attribute name="type"/>
1646
1597
  </optional>
1647
- <optional>
1648
- <attribute name="number"/>
1649
- </optional>
1650
- <optional>
1651
- <attribute name="branch-number"/>
1652
- </optional>
1653
1598
  <optional>
1654
1599
  <ref name="section-title"/>
1655
1600
  </optional>
@@ -1730,34 +1675,10 @@
1730
1675
  </define>
1731
1676
  <define name="terms">
1732
1677
  <element name="terms">
1733
- <optional>
1734
- <attribute name="id">
1735
- <data type="ID"/>
1736
- </attribute>
1737
- </optional>
1738
- <optional>
1739
- <attribute name="language"/>
1740
- </optional>
1741
- <optional>
1742
- <attribute name="script"/>
1743
- </optional>
1678
+ <ref name="Section-Attributes"/>
1744
1679
  <optional>
1745
1680
  <attribute name="type"/>
1746
1681
  </optional>
1747
- <optional>
1748
- <attribute name="number"/>
1749
- </optional>
1750
- <optional>
1751
- <attribute name="branch-number"/>
1752
- </optional>
1753
- <optional>
1754
- <attribute name="obligation">
1755
- <choice>
1756
- <value>normative</value>
1757
- <value>informative</value>
1758
- </choice>
1759
- </attribute>
1760
- </optional>
1761
1682
  <optional>
1762
1683
  <ref name="section-title"/>
1763
1684
  </optional>
data/lib/metanorma/cc/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module CC
3
- VERSION = "2.4.6".freeze
3
+ VERSION = "2.4.7".freeze
4
4
  end
5
5
  end
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.6
4
+ version: 2.4.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2024-04-08 00:00:00.000000000 Z
11
+ date: 2024-04-22 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: metanorma-generic