metanorma-ietf 3.3.5 → 3.3.6
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/ietf/blocks.rb +12 -2
- data/lib/metanorma/ietf/biblio.rng +22 -23
- data/lib/metanorma/ietf/isodoc.rng +37 -116
- data/lib/metanorma/ietf/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: 799a04f42524eb595c4f7d89379b6759f08305f85f408ca8790fb1c57c09ac5b
|
|
4
|
+
data.tar.gz: fd6b66c1c4204ee29219f57c522df5b1437dec5f8fa8df0d39bda8813c1d72cb
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 1f2a8ed8fb08fb1d04839b4b599a4cd5b30f30a9e7b04929bae9ab6e39703ddb717934001a38e15d289f576decd9535e19da4d5dac16892cc8dcf17c3b19df42
|
|
7
|
+
data.tar.gz: 49f10a1650c06b6614afaa53c95f23d643c5a2dd7d27592dad722d4b814792d9c8f19622db86f76669daa5b3fca5b57e44b2f080e5326e9ad2bbcbe501535dc2
|
data/lib/isodoc/ietf/blocks.rb
CHANGED
|
@@ -21,7 +21,7 @@ module IsoDoc
|
|
|
21
21
|
|
|
22
22
|
def ul_attrs(node)
|
|
23
23
|
{ anchor: node["id"], empty: node["nobullet"],
|
|
24
|
-
indent: node["indent"], bare: node["bare"],
|
|
24
|
+
indent: node["indent"], bare: node["bare"],
|
|
25
25
|
spacing: node["spacing"] }
|
|
26
26
|
end
|
|
27
27
|
|
|
@@ -61,6 +61,16 @@ module IsoDoc
|
|
|
61
61
|
indent: node["indent"], spacing: node["spacing"])
|
|
62
62
|
end
|
|
63
63
|
|
|
64
|
+
def dl_parse(node, out)
|
|
65
|
+
list_title_parse(node, out)
|
|
66
|
+
out.dl **dl_attrs(node) do |v|
|
|
67
|
+
node.elements.select { |n| dt_dd? n }.each_slice(2) do |dt, dd|
|
|
68
|
+
dl_parse1(v, dt, dd)
|
|
69
|
+
end
|
|
70
|
+
end
|
|
71
|
+
dl_parse_notes(node, out)
|
|
72
|
+
end
|
|
73
|
+
|
|
64
74
|
def dt_parse(dterm, term)
|
|
65
75
|
if dterm.elements.empty? then term << dterm.text
|
|
66
76
|
else dterm.children.each { |n| parse(n, term) }
|
|
@@ -232,7 +242,7 @@ module IsoDoc
|
|
|
232
242
|
|
|
233
243
|
def figure_parse(node, out)
|
|
234
244
|
node["class"] == "pseudocode" || node["type"] == "pseudocode" and
|
|
235
|
-
|
|
245
|
+
return pseudocode_parse(node, out)
|
|
236
246
|
@in_figure = true
|
|
237
247
|
out.figure **attr_code(anchor: node["id"]) do |div|
|
|
238
248
|
figure_name_parse(node, div, node.at(ns("./name")))
|
|
@@ -95,7 +95,7 @@
|
|
|
95
95
|
<text/>
|
|
96
96
|
</element>
|
|
97
97
|
</define>
|
|
98
|
-
<define name="
|
|
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
|
-
|
|
146
|
-
|
|
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
|
-
<
|
|
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
|
-
<
|
|
1288
|
-
|
|
1289
|
-
|
|
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>
|
|
@@ -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.
|
|
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
|
-
<
|
|
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
|
-
<
|
|
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
|
-
<
|
|
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
|
-
<
|
|
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>
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: metanorma-ietf
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 3.3.
|
|
4
|
+
version: 3.3.6
|
|
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-
|
|
11
|
+
date: 2024-05-06 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: metanorma-ietf-data
|
|
@@ -299,7 +299,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
299
299
|
- !ruby/object:Gem::Version
|
|
300
300
|
version: '0'
|
|
301
301
|
requirements: []
|
|
302
|
-
rubygems_version: 3.3.
|
|
302
|
+
rubygems_version: 3.3.27
|
|
303
303
|
signing_key:
|
|
304
304
|
specification_version: 4
|
|
305
305
|
summary: metanorma-ietf lets you write IETF documents, such as Internet-Drafts and
|