metanorma-iec 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/iec/iec.international-standard.xsl +129 -30
  3. data/lib/metanorma/iec/biblio.rng +22 -23
  4. data/lib/metanorma/iec/isodoc.rng +37 -116
  5. data/lib/metanorma/iec/version.rb +1 -1
  6. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: f05fbbfe3bd0f60dd7207637f0df64d3ef07bc8b5adac8fb9594f594ff0034b2
4
- data.tar.gz: 38d920ff2f0793ad5f2e5a7da698a41a4f53cf76c0afb71dfe9e850de5335b1a
3
+ metadata.gz: 70160bac723b9ad491e466c34d6086612dcda798b6c338a18fe45c2b5cb7ec26
4
+ data.tar.gz: dc12a6fbbffbb11662bba65596695961f88287f17b3fce75f1eac922b312b1d0
5
5
  SHA512:
6
- metadata.gz: 442d16114c39c832a4ae7afeae6fa53d211eea474a99e80e8861604f6e3cb4185e3b7eee10bcb815fc20a5e7720f9e74afefd94ec27bc15b1ba60c26597de3d8
7
- data.tar.gz: a3d068fd26a0a4207e8bd37c0f59bce555f9afe87aeebec4fc1d5a66a7cb84fefa12c9f38b80590f8559fc9b600950993363833d6b402d15c9963c94044dfa39
6
+ metadata.gz: 5d6837a067d758cd74e56264d65826525ae26d3e73e240135ee1b4f0357306cae164484f82e865676c336a6bf3d9ea442b6e4c33f167d2825004985584419d47
7
+ data.tar.gz: fbe6067f77a5e1460342dc5bd0f99d7faef9b64984d12c923a56b915d51b96ceca3cfab6643277e411c0fa2eda31b1f81ae1676e72323ee0c5ac358f939f5786
data/lib/isodoc/iec/iec.international-standard.xsl CHANGED
@@ -8529,10 +8529,11 @@
8529
8529
  </xsl:template>
8530
8530
 
8531
8531
  <xsl:template match="*[local-name() = 'image']">
8532
+ <xsl:param name="indent">0</xsl:param>
8532
8533
  <xsl:variable name="isAdded" select="../@added"/>
8533
8534
  <xsl:variable name="isDeleted" select="../@deleted"/>
8534
8535
  <xsl:choose>
8535
- <xsl:when test="ancestor::*[local-name() = 'title'] or not(parent::*[local-name() = 'figure']) or parent::*[local-name() = 'p']">
8536
+ <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) -->
8536
8537
  <fo:inline padding-left="1mm" padding-right="1mm">
8537
8538
  <xsl:if test="not(parent::*[local-name() = 'figure']) or parent::*[local-name() = 'p']">
8538
8539
  <xsl:attribute name="padding-left">0mm</xsl:attribute>
@@ -8541,7 +8542,43 @@
8541
8542
  <xsl:variable name="src">
8542
8543
  <xsl:call-template name="image_src"/>
8543
8544
  </xsl:variable>
8544
- <fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" vertical-align="middle"/>
8545
+
8546
+ <xsl:variable name="scale">
8547
+ <xsl:call-template name="getImageScale">
8548
+ <xsl:with-param name="indent" select="$indent"/>
8549
+ </xsl:call-template>
8550
+ </xsl:variable>
8551
+
8552
+ <!-- debug scale='<xsl:value-of select="$scale"/>', indent='<xsl:value-of select="$indent"/>' -->
8553
+
8554
+ <!-- <fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" vertical-align="middle"/> -->
8555
+ <fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" vertical-align="middle">
8556
+
8557
+ <xsl:variable name="width">
8558
+ <xsl:call-template name="setImageWidth"/>
8559
+ </xsl:variable>
8560
+ <xsl:if test="$width != ''">
8561
+ <xsl:attribute name="width"><xsl:value-of select="$width"/></xsl:attribute>
8562
+ </xsl:if>
8563
+ <xsl:variable name="height">
8564
+ <xsl:call-template name="setImageHeight"/>
8565
+ </xsl:variable>
8566
+ <xsl:if test="$height != ''">
8567
+ <xsl:attribute name="height"><xsl:value-of select="$height"/></xsl:attribute>
8568
+ </xsl:if>
8569
+
8570
+ <xsl:if test="$width = '' and $height = ''">
8571
+ <xsl:if test="number($scale) &lt; 100">
8572
+ <xsl:attribute name="content-width"><xsl:value-of select="number($scale)"/>%</xsl:attribute>
8573
+ <!-- <xsl:attribute name="content-width">scale-to-fit</xsl:attribute>
8574
+ <xsl:attribute name="content-height">100%</xsl:attribute>
8575
+ <xsl:attribute name="width">100%</xsl:attribute>
8576
+ <xsl:attribute name="scaling">uniform</xsl:attribute> -->
8577
+ </xsl:if>
8578
+ </xsl:if>
8579
+
8580
+ </fo:external-graphic>
8581
+
8545
8582
  </fo:inline>
8546
8583
  </xsl:when>
8547
8584
  <xsl:otherwise>
@@ -8562,25 +8599,23 @@
8562
8599
  <xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
8563
8600
  <xsl:attribute name="scaling">uniform</xsl:attribute>
8564
8601
 
8565
- <xsl:apply-templates select="." mode="cross_image"/>
8602
+ <xsl:apply-templates select="." mode="cross_image"/>
8566
8603
 
8567
8604
  </fo:instream-foreign-object>
8568
8605
  </xsl:when>
8569
8606
  <xsl:otherwise>
8607
+ <!-- <fo:block>debug block image:
8608
+ <xsl:variable name="scale">
8609
+ <xsl:call-template name="getImageScale">
8610
+ <xsl:with-param name="indent" select="$indent"/>
8611
+ </xsl:call-template>
8612
+ </xsl:variable>
8613
+ <xsl:value-of select="concat('scale=', $scale,', indent=', $indent)"/>
8614
+ </fo:block> -->
8570
8615
  <fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style">
8571
8616
  <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'])">
8572
8617
 
8573
- <xsl:if test="@width != '' and @width != 'auto' and @width != 'text-width' and @width != 'full-page-width' and @width != 'narrow'">
8574
- <xsl:attribute name="width">
8575
- <xsl:value-of select="@width"/>
8576
- </xsl:attribute>
8577
- </xsl:if>
8578
-
8579
- <xsl:if test="@height != '' and @height != 'auto'">
8580
- <xsl:attribute name="height">
8581
- <xsl:value-of select="@height"/>
8582
- </xsl:attribute>
8583
- </xsl:if>
8618
+ <xsl:call-template name="setImageWidthHeight"/>
8584
8619
 
8585
8620
  <xsl:choose>
8586
8621
  <xsl:when test="@width != '' and @width != 'auto' and @height != '' and @height != 'auto'">
@@ -8588,24 +8623,18 @@
8588
8623
  </xsl:when>
8589
8624
  <xsl:otherwise>
8590
8625
 
8591
- <xsl:variable name="img_src">
8592
- <xsl:choose>
8593
- <xsl:when test="not(starts-with(@src, 'data:'))"><xsl:value-of select="concat($basepath, @src)"/></xsl:when>
8594
- <xsl:otherwise><xsl:value-of select="@src"/></xsl:otherwise>
8595
- </xsl:choose>
8626
+ <xsl:variable name="scale">
8627
+ <xsl:call-template name="getImageScale">
8628
+ <xsl:with-param name="indent" select="$indent"/>
8629
+ </xsl:call-template>
8596
8630
  </xsl:variable>
8597
8631
 
8598
- <xsl:variable name="image_width_effective">
8599
-
8600
- <xsl:value-of select="$width_effective"/>
8601
-
8632
+ <xsl:variable name="scaleRatio">
8633
+ 1
8602
8634
  </xsl:variable>
8603
8635
 
8604
- <xsl:variable name="scale" select="java:org.metanorma.fop.Util.getImageScale($img_src, $image_width_effective, $height_effective)"/>
8605
8636
  <xsl:if test="number($scale) &lt; 100">
8606
-
8607
- <xsl:attribute name="content-width"><xsl:value-of select="$scale"/>%</xsl:attribute>
8608
-
8637
+ <xsl:attribute name="content-width"><xsl:value-of select="number($scale) * number($scaleRatio)"/>%</xsl:attribute>
8609
8638
  </xsl:if>
8610
8639
  </xsl:otherwise>
8611
8640
  </xsl:choose>
@@ -8621,6 +8650,62 @@
8621
8650
  </xsl:choose>
8622
8651
  </xsl:template>
8623
8652
 
8653
+ <xsl:template name="setImageWidth">
8654
+ <xsl:if test="@width != '' and @width != 'auto' and @width != 'text-width' and @width != 'full-page-width' and @width != 'narrow'">
8655
+ <xsl:value-of select="@width"/>
8656
+ </xsl:if>
8657
+ </xsl:template>
8658
+ <xsl:template name="setImageHeight">
8659
+ <xsl:if test="@height != '' and @height != 'auto'">
8660
+ <xsl:value-of select="@height"/>
8661
+ </xsl:if>
8662
+ </xsl:template>
8663
+ <xsl:template name="setImageWidthHeight">
8664
+ <xsl:variable name="width">
8665
+ <xsl:call-template name="setImageWidth"/>
8666
+ </xsl:variable>
8667
+ <xsl:if test="$width != ''">
8668
+ <xsl:attribute name="width">
8669
+ <xsl:value-of select="$width"/>
8670
+ </xsl:attribute>
8671
+ </xsl:if>
8672
+ <xsl:variable name="height">
8673
+ <xsl:call-template name="setImageHeight"/>
8674
+ </xsl:variable>
8675
+ <xsl:if test="$height != ''">
8676
+ <xsl:attribute name="height">
8677
+ <xsl:value-of select="$height"/>
8678
+ </xsl:attribute>
8679
+ </xsl:if>
8680
+ </xsl:template>
8681
+
8682
+ <xsl:template name="getImageScale">
8683
+ <xsl:param name="indent"/>
8684
+ <xsl:variable name="indent_left">
8685
+ <xsl:choose>
8686
+ <xsl:when test="$indent != ''"><xsl:value-of select="$indent"/></xsl:when>
8687
+ <xsl:otherwise>0</xsl:otherwise>
8688
+ </xsl:choose>
8689
+ </xsl:variable>
8690
+ <xsl:variable name="img_src">
8691
+ <xsl:choose>
8692
+ <xsl:when test="not(starts-with(@src, 'data:'))"><xsl:value-of select="concat($basepath, @src)"/></xsl:when>
8693
+ <xsl:otherwise><xsl:value-of select="@src"/></xsl:otherwise>
8694
+ </xsl:choose>
8695
+ </xsl:variable>
8696
+
8697
+ <xsl:variable name="image_width_effective">
8698
+
8699
+ <xsl:value-of select="$width_effective - number($indent_left)"/>
8700
+
8701
+ </xsl:variable>
8702
+ <!-- <xsl:message>width_effective=<xsl:value-of select="$width_effective"/></xsl:message>
8703
+ <xsl:message>indent_left=<xsl:value-of select="$indent_left"/></xsl:message>
8704
+ <xsl:message>image_width_effective=<xsl:value-of select="$image_width_effective"/> for <xsl:value-of select="ancestor::ogc:p[1]/@id"/></xsl:message> -->
8705
+ <xsl:variable name="scale" select="java:org.metanorma.fop.Util.getImageScale($img_src, $image_width_effective, $height_effective)"/>
8706
+ <xsl:value-of select="$scale"/>
8707
+ </xsl:template>
8708
+
8624
8709
  <xsl:template name="image_src">
8625
8710
  <xsl:choose>
8626
8711
  <xsl:when test="@mimetype = 'image/svg+xml' and $images/images/image[@id = current()/@id]">
@@ -11315,6 +11400,7 @@
11315
11400
  </xsl:template>
11316
11401
 
11317
11402
  <xsl:template match="*[local-name() = 'ul'] | *[local-name() = 'ol']">
11403
+ <xsl:param name="indent">0</xsl:param>
11318
11404
  <xsl:choose>
11319
11405
  <xsl:when test="parent::*[local-name() = 'note'] or parent::*[local-name() = 'termnote']">
11320
11406
  <fo:block-container role="SKIP">
@@ -11329,7 +11415,9 @@
11329
11415
 
11330
11416
  <fo:block-container margin-left="0mm" role="SKIP">
11331
11417
  <fo:block>
11332
- <xsl:apply-templates select="." mode="list"/>
11418
+ <xsl:apply-templates select="." mode="list">
11419
+ <xsl:with-param name="indent" select="$indent"/>
11420
+ </xsl:apply-templates>
11333
11421
  </fo:block>
11334
11422
  </fo:block-container>
11335
11423
  </fo:block-container>
@@ -11337,7 +11425,9 @@
11337
11425
  <xsl:otherwise>
11338
11426
 
11339
11427
  <fo:block role="SKIP">
11340
- <xsl:apply-templates select="." mode="list"/>
11428
+ <xsl:apply-templates select="." mode="list">
11429
+ <xsl:with-param name="indent" select="$indent"/>
11430
+ </xsl:apply-templates>
11341
11431
  </fo:block>
11342
11432
 
11343
11433
  </xsl:otherwise>
@@ -11426,6 +11516,13 @@
11426
11516
  </xsl:template>
11427
11517
 
11428
11518
  <xsl:template match="*[local-name()='li']">
11519
+ <xsl:param name="indent">0</xsl:param>
11520
+ <!-- <fo:list-item xsl:use-attribute-sets="list-item-style">
11521
+ <fo:list-item-label end-indent="label-end()"><fo:block>x</fo:block></fo:list-item-label>
11522
+ <fo:list-item-body start-indent="body-start()" xsl:use-attribute-sets="list-item-body-style">
11523
+ <fo:block>debug li indent=<xsl:value-of select="$indent"/></fo:block>
11524
+ </fo:list-item-body>
11525
+ </fo:list-item> -->
11429
11526
  <fo:list-item xsl:use-attribute-sets="list-item-style">
11430
11527
  <xsl:copy-of select="@id"/>
11431
11528
 
@@ -11450,7 +11547,9 @@
11450
11547
 
11451
11548
  <xsl:call-template name="refine_list-item-body-style"/>
11452
11549
 
11453
- <xsl:apply-templates/>
11550
+ <xsl:apply-templates>
11551
+ <xsl:with-param name="indent" select="$indent"/>
11552
+ </xsl:apply-templates>
11454
11553
 
11455
11554
  <!-- <xsl:apply-templates select="node()[not(local-name() = 'note')]" />
11456
11555
 
data/lib/metanorma/iec/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/iec/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/iec/version.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  module Metanorma
2
2
  module Iec
3
- VERSION = "2.4.6".freeze
3
+ VERSION = "2.4.7".freeze
4
4
  end
5
5
  end
6
6
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-iec
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: bin
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-iso