metanorma-ietf 3.3.4 → 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 CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 31d8e42be51ec47f80027b7e16b93b2991d082250b7a4e4b26adea124cdb9007
4
- data.tar.gz: 248e9076ba1a755f1439bac879035e6ef917c4ec0f414b612c0ee2bb2465dcc9
3
+ metadata.gz: 799a04f42524eb595c4f7d89379b6759f08305f85f408ca8790fb1c57c09ac5b
4
+ data.tar.gz: fd6b66c1c4204ee29219f57c522df5b1437dec5f8fa8df0d39bda8813c1d72cb
5
5
  SHA512:
6
- metadata.gz: aee2b7a6f408086016b8d6da78587a9e70aeff99e31c07da722e064987b5d6346ef61de5c2196e2d9cb24a2d39382f0c07e8b227662f37e32c73e9b1dbb2ee0a
7
- data.tar.gz: 6fe3c4365fad2521b94a94f0f851b67313e647114353451ac9d2c40950185a1184cbc2f1c8c0d363521a3a812e1b3de6b798b4461fd5d3107fb0b9a0d6c240b2
6
+ metadata.gz: 1f2a8ed8fb08fb1d04839b4b599a4cd5b30f30a9e7b04929bae9ab6e39703ddb717934001a38e15d289f576decd9535e19da4d5dac16892cc8dcf17c3b19df42
7
+ data.tar.gz: 49f10a1650c06b6614afaa53c95f23d643c5a2dd7d27592dad722d4b814792d9c8f19622db86f76669daa5b3fca5b57e44b2f080e5326e9ad2bbcbe501535dc2
@@ -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
- return pseudocode_parse(node, out)
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")))
@@ -68,7 +68,7 @@ module IsoDoc
68
68
 
69
69
  def termsource_add_modification_text(mod)
70
70
  mod or return
71
- mod.text.strip.empty? or mod.previous = " &#x2013; "
71
+ mod.text.strip.empty? or mod.previous = " &#x2014; "
72
72
  mod.elements.size == 1 and
73
73
  mod.elements[0].replace(mod.elements[0].children)
74
74
  mod.replace(mod.children)
@@ -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,7 +204,10 @@
208
204
  </define>
209
205
  <define name="roledescription">
210
206
  <element name="description">
211
- <ref name="FormattedString"/>
207
+ <ref name="LocalizedStringAttrs"/>
208
+ <oneOrMore>
209
+ <ref name="TextElement"/>
210
+ </oneOrMore>
212
211
  </element>
213
212
  </define>
214
213
  <define name="person">
@@ -333,7 +332,10 @@
333
332
  </define>
334
333
  <define name="affiliationdescription">
335
334
  <element name="description">
336
- <ref name="FormattedString"/>
335
+ <ref name="LocalizedStringAttrs"/>
336
+ <oneOrMore>
337
+ <ref name="TextElement"/>
338
+ </oneOrMore>
337
339
  </element>
338
340
  </define>
339
341
  <define name="organization">
@@ -897,7 +899,9 @@
897
899
  </define>
898
900
  <define name="formattedref">
899
901
  <element name="formattedref">
900
- <ref name="FormattedString"/>
902
+ <oneOrMore>
903
+ <ref name="TextElement"/>
904
+ </oneOrMore>
901
905
  </element>
902
906
  </define>
903
907
  <define name="license">
@@ -942,7 +946,10 @@
942
946
  <optional>
943
947
  <attribute name="type"/>
944
948
  </optional>
945
- <ref name="FormattedString"/>
949
+ <ref name="LocalizedStringAttrs"/>
950
+ <zeroOrMore>
951
+ <ref name="TextElement"/>
952
+ </zeroOrMore>
946
953
  </define>
947
954
  <!-- TitleType = ( "alternative" | "original" | "unofficial" | "subtitle" | "main" ) -->
948
955
  <define name="TypedUri">
@@ -1033,16 +1040,10 @@
1033
1040
  <data type="boolean"/>
1034
1041
  </attribute>
1035
1042
  </optional>
1036
- <optional>
1037
- <attribute name="language"/>
1038
- </optional>
1039
- <optional>
1040
- <attribute name="locale"/>
1041
- </optional>
1042
- <optional>
1043
- <attribute name="script"/>
1044
- </optional>
1045
- <text/>
1043
+ <ref name="LocalizedStringAttrs"/>
1044
+ <oneOrMore>
1045
+ <ref name="TextElement"/>
1046
+ </oneOrMore>
1046
1047
  </element>
1047
1048
  </define>
1048
1049
  <define name="docnumber">
@@ -1267,12 +1268,23 @@
1267
1268
  <optional>
1268
1269
  <attribute name="type"/>
1269
1270
  </optional>
1270
- <ref name="FormattedString"/>
1271
+ <ref name="LocalizedStringAttrs"/>
1272
+ <oneOrMore>
1273
+ <ref name="TextElement"/>
1274
+ </oneOrMore>
1271
1275
  </element>
1272
1276
  </define>
1273
1277
  <define name="bibabstract">
1274
1278
  <element name="abstract">
1275
- <ref name="FormattedString"/>
1279
+ <ref name="LocalizedStringAttrs"/>
1280
+ <choice>
1281
+ <oneOrMore>
1282
+ <ref name="BasicBlock"/>
1283
+ </oneOrMore>
1284
+ <oneOrMore>
1285
+ <ref name="TextElement"/>
1286
+ </oneOrMore>
1287
+ </choice>
1276
1288
  </element>
1277
1289
  </define>
1278
1290
  <define name="copyright">
@@ -1377,7 +1389,10 @@
1377
1389
  </attribute>
1378
1390
  <optional>
1379
1391
  <element name="description">
1380
- <ref name="FormattedString"/>
1392
+ <ref name="LocalizedStringAttrs"/>
1393
+ <oneOrMore>
1394
+ <ref name="TextElement"/>
1395
+ </oneOrMore>
1381
1396
  </element>
1382
1397
  </optional>
1383
1398
  <element name="bibitem">
@@ -373,6 +373,9 @@
373
373
  <optional>
374
374
  <attribute name="align"/>
375
375
  </optional>
376
+ <optional>
377
+ <attribute name="width"/>
378
+ </optional>
376
379
  <optional>
377
380
  <ref name="tname"/>
378
381
  </optional>
@@ -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">
@@ -156,44 +156,7 @@
156
156
  </define>
157
157
  <define name="xref">
158
158
  <element name="xref">
159
- <attribute name="target">
160
- <data type="string">
161
- <param name="pattern">\i\c*|\c+#\c+</param>
162
- </data>
163
- </attribute>
164
- <optional>
165
- <attribute name="to">
166
- <data type="string">
167
- <param name="pattern">\i\c*|\c+#\c+</param>
168
- </data>
169
- </attribute>
170
- </optional>
171
- <optional>
172
- <attribute name="type">
173
- <ref name="ReferenceFormat"/>
174
- </attribute>
175
- </optional>
176
- <optional>
177
- <attribute name="alt"/>
178
- </optional>
179
- <optional>
180
- <attribute name="case">
181
- <choice>
182
- <value>capital</value>
183
- <value>lowercase</value>
184
- </choice>
185
- </attribute>
186
- </optional>
187
- <optional>
188
- <attribute name="droploc">
189
- <data type="boolean"/>
190
- </attribute>
191
- </optional>
192
- <optional>
193
- <attribute name="style">
194
- <ref name="XrefStyleType"/>
195
- </attribute>
196
- </optional>
159
+ <ref name="XrefAttributes"/>
197
160
  <ref name="XrefBody"/>
198
161
  </element>
199
162
  </define>
@@ -407,23 +370,7 @@
407
370
  </define>
408
371
  <define name="figure">
409
372
  <element name="figure">
410
- <attribute name="id">
411
- <data type="ID"/>
412
- </attribute>
413
- <optional>
414
- <attribute name="unnumbered">
415
- <data type="boolean"/>
416
- </attribute>
417
- </optional>
418
- <optional>
419
- <attribute name="number"/>
420
- </optional>
421
- <optional>
422
- <attribute name="subsequence"/>
423
- </optional>
424
- <optional>
425
- <attribute name="class"/>
426
- </optional>
373
+ <ref name="FigureAttributes"/>
427
374
  <ref name="BlockAttributes"/>
428
375
  <optional>
429
376
  <ref name="tname"/>
@@ -1399,38 +1346,41 @@
1399
1346
  </oneOrMore>
1400
1347
  </element>
1401
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>
1402
1381
  <define name="reference-clause">
1403
1382
  <element name="clause">
1404
- <optional>
1405
- <attribute name="id">
1406
- <data type="ID"/>
1407
- </attribute>
1408
- </optional>
1409
- <optional>
1410
- <attribute name="language"/>
1411
- </optional>
1412
- <optional>
1413
- <attribute name="script"/>
1414
- </optional>
1415
- <optional>
1416
- <attribute name="inline-header">
1417
- <data type="boolean"/>
1418
- </attribute>
1419
- </optional>
1420
- <optional>
1421
- <attribute name="number"/>
1422
- </optional>
1423
- <optional>
1424
- <attribute name="branch-number"/>
1425
- </optional>
1426
- <optional>
1427
- <attribute name="obligation">
1428
- <choice>
1429
- <value>normative</value>
1430
- <value>informative</value>
1431
- </choice>
1432
- </attribute>
1433
- </optional>
1383
+ <ref name="Section-Attributes"/>
1434
1384
  <optional>
1435
1385
  <ref name="section-title"/>
1436
1386
  </optional>
@@ -1619,36 +1569,7 @@
1619
1569
  </element>
1620
1570
  </define>
1621
1571
  <define name="Content-Section">
1622
- <optional>
1623
- <attribute name="id">
1624
- <data type="ID"/>
1625
- </attribute>
1626
- </optional>
1627
- <optional>
1628
- <attribute name="language"/>
1629
- </optional>
1630
- <optional>
1631
- <attribute name="script"/>
1632
- </optional>
1633
- <optional>
1634
- <attribute name="inline-header">
1635
- <data type="boolean"/>
1636
- </attribute>
1637
- </optional>
1638
- <optional>
1639
- <attribute name="obligation">
1640
- <choice>
1641
- <value>normative</value>
1642
- <value>informative</value>
1643
- </choice>
1644
- </attribute>
1645
- </optional>
1646
- <optional>
1647
- <attribute name="number"/>
1648
- </optional>
1649
- <optional>
1650
- <attribute name="branch-number"/>
1651
- </optional>
1572
+ <ref name="Section-Attributes"/>
1652
1573
  <optional>
1653
1574
  <attribute name="type"/>
1654
1575
  </optional>
@@ -1670,39 +1591,10 @@
1670
1591
  </element>
1671
1592
  </define>
1672
1593
  <define name="Clause-Section">
1673
- <optional>
1674
- <attribute name="id">
1675
- <data type="ID"/>
1676
- </attribute>
1677
- </optional>
1678
- <optional>
1679
- <attribute name="language"/>
1680
- </optional>
1681
- <optional>
1682
- <attribute name="script"/>
1683
- </optional>
1684
- <optional>
1685
- <attribute name="inline-header">
1686
- <data type="boolean"/>
1687
- </attribute>
1688
- </optional>
1689
- <optional>
1690
- <attribute name="obligation">
1691
- <choice>
1692
- <value>normative</value>
1693
- <value>informative</value>
1694
- </choice>
1695
- </attribute>
1696
- </optional>
1594
+ <ref name="Section-Attributes"/>
1697
1595
  <optional>
1698
1596
  <attribute name="type"/>
1699
1597
  </optional>
1700
- <optional>
1701
- <attribute name="number"/>
1702
- </optional>
1703
- <optional>
1704
- <attribute name="branch-number"/>
1705
- </optional>
1706
1598
  <optional>
1707
1599
  <ref name="section-title"/>
1708
1600
  </optional>
@@ -1783,34 +1675,10 @@
1783
1675
  </define>
1784
1676
  <define name="terms">
1785
1677
  <element name="terms">
1786
- <optional>
1787
- <attribute name="id">
1788
- <data type="ID"/>
1789
- </attribute>
1790
- </optional>
1791
- <optional>
1792
- <attribute name="language"/>
1793
- </optional>
1794
- <optional>
1795
- <attribute name="script"/>
1796
- </optional>
1678
+ <ref name="Section-Attributes"/>
1797
1679
  <optional>
1798
1680
  <attribute name="type"/>
1799
1681
  </optional>
1800
- <optional>
1801
- <attribute name="number"/>
1802
- </optional>
1803
- <optional>
1804
- <attribute name="branch-number"/>
1805
- </optional>
1806
- <optional>
1807
- <attribute name="obligation">
1808
- <choice>
1809
- <value>normative</value>
1810
- <value>informative</value>
1811
- </choice>
1812
- </attribute>
1813
- </optional>
1814
1682
  <optional>
1815
1683
  <ref name="section-title"/>
1816
1684
  </optional>
@@ -2450,6 +2318,49 @@
2450
2318
  </zeroOrMore>
2451
2319
  </element>
2452
2320
  </define>
2321
+ <define name="XrefAttributes">
2322
+ <attribute name="target">
2323
+ <data type="string">
2324
+ <param name="pattern">\i\c*|\c+#\c+</param>
2325
+ </data>
2326
+ </attribute>
2327
+ <optional>
2328
+ <attribute name="to">
2329
+ <data type="string">
2330
+ <param name="pattern">\i\c*|\c+#\c+</param>
2331
+ </data>
2332
+ </attribute>
2333
+ </optional>
2334
+ <optional>
2335
+ <attribute name="type">
2336
+ <ref name="ReferenceFormat"/>
2337
+ </attribute>
2338
+ </optional>
2339
+ <optional>
2340
+ <attribute name="alt"/>
2341
+ </optional>
2342
+ <optional>
2343
+ <attribute name="case">
2344
+ <choice>
2345
+ <value>capital</value>
2346
+ <value>lowercase</value>
2347
+ </choice>
2348
+ </attribute>
2349
+ </optional>
2350
+ <optional>
2351
+ <attribute name="droploc">
2352
+ <data type="boolean"/>
2353
+ </attribute>
2354
+ </optional>
2355
+ <optional>
2356
+ <attribute name="style">
2357
+ <ref name="XrefStyleType"/>
2358
+ </attribute>
2359
+ </optional>
2360
+ <optional>
2361
+ <attribute name="label"/>
2362
+ </optional>
2363
+ </define>
2453
2364
  <define name="XrefBody">
2454
2365
  <zeroOrMore>
2455
2366
  <ref name="XrefTarget"/>
@@ -2528,6 +2439,28 @@
2528
2439
  <attribute name="columns"/>
2529
2440
  </optional>
2530
2441
  </define>
2442
+ <define name="FigureAttributes">
2443
+ <attribute name="id">
2444
+ <data type="ID"/>
2445
+ </attribute>
2446
+ <optional>
2447
+ <attribute name="unnumbered">
2448
+ <data type="boolean"/>
2449
+ </attribute>
2450
+ </optional>
2451
+ <optional>
2452
+ <attribute name="number"/>
2453
+ </optional>
2454
+ <optional>
2455
+ <attribute name="subsequence"/>
2456
+ </optional>
2457
+ <optional>
2458
+ <attribute name="class"/>
2459
+ </optional>
2460
+ <optional>
2461
+ <attribute name="width"/>
2462
+ </optional>
2463
+ </define>
2531
2464
  <start>
2532
2465
  <ref name="standard-document"/>
2533
2466
  </start>
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module Ietf
3
- VERSION = "3.3.4".freeze
3
+ VERSION = "3.3.6".freeze
4
4
  end
5
5
  end
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
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-03-10 00:00:00.000000000 Z
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.26
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