metanorma-ietf 3.1.3 → 3.1.5
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/isodoc/ietf/blocks.rb +27 -12
- data/lib/isodoc/ietf/table.rb +7 -2
- data/lib/metanorma/ietf/isodoc.rng +75 -303
- data/lib/metanorma/ietf/version.rb +1 -1
- data/metanorma-ietf.gemspec +1 -1
- metadata +4 -4
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: b1de8bb90257472a5f374f7fd19856322e1f69e0510eedafde925e2f935883f8
|
|
4
|
+
data.tar.gz: d6b838f193f84b6c78df8ccad0e4d15f2ba46f1cd81a58d05751287561a96bfd
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: d75bd0f7b1c507efaae0514a050fa41ab81b14e4cd10677dbeed3f194a609c325a12931ff015c1bcac305a921c9d798d4153ebb87ff5db4ba321d04db32b7d64
|
|
7
|
+
data.tar.gz: dd62ea88a5a93d0b22f189ed4c9268b9d9bfcae0d2fa3b8c59d2e41fdab7d5d8a3e6eabe48b0fa454ce927c6e85947eca3b0bae9534a3e52e5f043fc1bc3d758
|
data/lib/isodoc/ietf/blocks.rb
CHANGED
|
@@ -87,8 +87,8 @@ module IsoDoc
|
|
|
87
87
|
p << note_label(node)
|
|
88
88
|
first.name == "p" and first.children.each { |n| parse(n, p) }
|
|
89
89
|
end
|
|
90
|
-
first.name == "p" and
|
|
91
|
-
node.elements.drop(1).each { |n| parse(n, out) } or
|
|
90
|
+
(first.name == "p" and
|
|
91
|
+
node.elements.drop(1).each { |n| parse(n, out) }) or
|
|
92
92
|
node.children.each { |n| parse(n, out) }
|
|
93
93
|
end
|
|
94
94
|
end
|
|
@@ -112,13 +112,21 @@ module IsoDoc
|
|
|
112
112
|
end
|
|
113
113
|
end
|
|
114
114
|
|
|
115
|
+
def source_parse(node, out)
|
|
116
|
+
termref_parse(node, out)
|
|
117
|
+
end
|
|
118
|
+
|
|
115
119
|
def sourcecode_parse(node, out)
|
|
116
120
|
out.sourcecode **attr_code(
|
|
117
121
|
anchor: node["id"], type: node["lang"], name: node["filename"],
|
|
118
122
|
markers: node["markers"], src: node["src"]
|
|
119
123
|
) do |s|
|
|
120
|
-
node.children.each
|
|
124
|
+
node.children.each do |x|
|
|
125
|
+
%w(name dl).include?(x.name) and next
|
|
126
|
+
parse(x, s)
|
|
127
|
+
end
|
|
121
128
|
end
|
|
129
|
+
annotation_parse(node, out)
|
|
122
130
|
end
|
|
123
131
|
|
|
124
132
|
def pre_parse(node, out)
|
|
@@ -130,13 +138,20 @@ module IsoDoc
|
|
|
130
138
|
|
|
131
139
|
def annotation_parse(node, out)
|
|
132
140
|
@sourcecode = false
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
141
|
+
node.at(ns("./annotation")) or return
|
|
142
|
+
out.t { |p| p << @i18n.key }
|
|
143
|
+
out.dl do |dl|
|
|
144
|
+
node.xpath(ns("./annotation")).each do |a|
|
|
145
|
+
annotation_parse1(a, dl)
|
|
146
|
+
end
|
|
147
|
+
end
|
|
148
|
+
end
|
|
149
|
+
|
|
150
|
+
def annotation_parse1(ann, dlist)
|
|
151
|
+
dlist.dt ann.at(ns("//callout[@target='#{ann['id']}']")).text
|
|
152
|
+
dlist.dd do |dd|
|
|
153
|
+
ann.children.each { |n| parse(n, dd) }
|
|
154
|
+
end
|
|
140
155
|
end
|
|
141
156
|
|
|
142
157
|
def formula_where(dlist, out)
|
|
@@ -189,7 +204,7 @@ module IsoDoc
|
|
|
189
204
|
end
|
|
190
205
|
|
|
191
206
|
def admonition_name_parse(_node, div, name)
|
|
192
|
-
div.t
|
|
207
|
+
div.t keepWithNext: "true" do |p|
|
|
193
208
|
name.children.each { |n| parse(n, p) }
|
|
194
209
|
end
|
|
195
210
|
end
|
|
@@ -197,7 +212,7 @@ module IsoDoc
|
|
|
197
212
|
def admonition_parse(node, out)
|
|
198
213
|
type = node["type"]
|
|
199
214
|
name = admonition_name(node, type)
|
|
200
|
-
out.aside
|
|
215
|
+
out.aside anchor: node["id"] do |t|
|
|
201
216
|
admonition_name_parse(node, t, name) if name
|
|
202
217
|
node.children.each { |n| parse(n, t) unless n.name == "name" }
|
|
203
218
|
end
|
data/lib/isodoc/ietf/table.rb
CHANGED
|
@@ -8,14 +8,19 @@ module IsoDoc
|
|
|
8
8
|
def table_parse(node, out)
|
|
9
9
|
@in_table = true
|
|
10
10
|
out.table **table_attrs(node) do |t|
|
|
11
|
-
table_title_parse(node,
|
|
11
|
+
table_title_parse(node, t)
|
|
12
12
|
thead_parse(node, t)
|
|
13
13
|
tbody_parse(node, t)
|
|
14
14
|
tfoot_parse(node, t)
|
|
15
15
|
end
|
|
16
|
+
table_parse_tail(node, out)
|
|
17
|
+
@in_table = false
|
|
18
|
+
end
|
|
19
|
+
|
|
20
|
+
def table_parse_tail(node, out)
|
|
16
21
|
(dl = node.at(ns("./dl"))) && parse(dl, out)
|
|
22
|
+
node.xpath(ns("./source")).each { |n| parse(n, out) }
|
|
17
23
|
node.xpath(ns("./note")).each { |n| parse(n, out) }
|
|
18
|
-
@in_table = false
|
|
19
24
|
end
|
|
20
25
|
|
|
21
26
|
def table_title_parse(node, out)
|
|
@@ -220,24 +220,7 @@
|
|
|
220
220
|
<attribute name="id">
|
|
221
221
|
<data type="ID"/>
|
|
222
222
|
</attribute>
|
|
223
|
-
<
|
|
224
|
-
<attribute name="keep-with-next">
|
|
225
|
-
<data type="boolean"/>
|
|
226
|
-
</attribute>
|
|
227
|
-
</optional>
|
|
228
|
-
<optional>
|
|
229
|
-
<attribute name="keep-lines-together">
|
|
230
|
-
<data type="boolean"/>
|
|
231
|
-
</attribute>
|
|
232
|
-
</optional>
|
|
233
|
-
<optional>
|
|
234
|
-
<attribute name="tag"/>
|
|
235
|
-
</optional>
|
|
236
|
-
<optional>
|
|
237
|
-
<attribute name="multilingual-rendering">
|
|
238
|
-
<ref name="MultilingualRenderingType"/>
|
|
239
|
-
</attribute>
|
|
240
|
-
</optional>
|
|
223
|
+
<ref name="BlockAttributes"/>
|
|
241
224
|
<optional>
|
|
242
225
|
<ref name="tname"/>
|
|
243
226
|
</optional>
|
|
@@ -254,24 +237,7 @@
|
|
|
254
237
|
<attribute name="id">
|
|
255
238
|
<data type="ID"/>
|
|
256
239
|
</attribute>
|
|
257
|
-
<
|
|
258
|
-
<attribute name="keep-with-next">
|
|
259
|
-
<data type="boolean"/>
|
|
260
|
-
</attribute>
|
|
261
|
-
</optional>
|
|
262
|
-
<optional>
|
|
263
|
-
<attribute name="keep-lines-together">
|
|
264
|
-
<data type="boolean"/>
|
|
265
|
-
</attribute>
|
|
266
|
-
</optional>
|
|
267
|
-
<optional>
|
|
268
|
-
<attribute name="tag"/>
|
|
269
|
-
</optional>
|
|
270
|
-
<optional>
|
|
271
|
-
<attribute name="multilingual-rendering">
|
|
272
|
-
<ref name="MultilingualRenderingType"/>
|
|
273
|
-
</attribute>
|
|
274
|
-
</optional>
|
|
240
|
+
<ref name="BlockAttributes"/>
|
|
275
241
|
<optional>
|
|
276
242
|
<attribute name="type">
|
|
277
243
|
<choice>
|
|
@@ -299,29 +265,12 @@
|
|
|
299
265
|
<attribute name="id">
|
|
300
266
|
<data type="ID"/>
|
|
301
267
|
</attribute>
|
|
302
|
-
<
|
|
303
|
-
<attribute name="keep-with-next">
|
|
304
|
-
<data type="boolean"/>
|
|
305
|
-
</attribute>
|
|
306
|
-
</optional>
|
|
307
|
-
<optional>
|
|
308
|
-
<attribute name="keep-lines-together">
|
|
309
|
-
<data type="boolean"/>
|
|
310
|
-
</attribute>
|
|
311
|
-
</optional>
|
|
268
|
+
<ref name="BlockAttributes"/>
|
|
312
269
|
<optional>
|
|
313
270
|
<attribute name="key">
|
|
314
271
|
<data type="boolean"/>
|
|
315
272
|
</attribute>
|
|
316
273
|
</optional>
|
|
317
|
-
<optional>
|
|
318
|
-
<attribute name="tag"/>
|
|
319
|
-
</optional>
|
|
320
|
-
<optional>
|
|
321
|
-
<attribute name="multilingual-rendering">
|
|
322
|
-
<ref name="MultilingualRenderingType"/>
|
|
323
|
-
</attribute>
|
|
324
|
-
</optional>
|
|
325
274
|
<optional>
|
|
326
275
|
<ref name="tname"/>
|
|
327
276
|
</optional>
|
|
@@ -362,24 +311,7 @@
|
|
|
362
311
|
<optional>
|
|
363
312
|
<attribute name="number"/>
|
|
364
313
|
</optional>
|
|
365
|
-
<
|
|
366
|
-
<attribute name="keep-with-next">
|
|
367
|
-
<data type="boolean"/>
|
|
368
|
-
</attribute>
|
|
369
|
-
</optional>
|
|
370
|
-
<optional>
|
|
371
|
-
<attribute name="keep-lines-together">
|
|
372
|
-
<data type="boolean"/>
|
|
373
|
-
</attribute>
|
|
374
|
-
</optional>
|
|
375
|
-
<optional>
|
|
376
|
-
<attribute name="tag"/>
|
|
377
|
-
</optional>
|
|
378
|
-
<optional>
|
|
379
|
-
<attribute name="multilingual-rendering">
|
|
380
|
-
<ref name="MultilingualRenderingType"/>
|
|
381
|
-
</attribute>
|
|
382
|
-
</optional>
|
|
314
|
+
<ref name="BlockAttributes"/>
|
|
383
315
|
<optional>
|
|
384
316
|
<ref name="tname"/>
|
|
385
317
|
</optional>
|
|
@@ -427,27 +359,10 @@
|
|
|
427
359
|
<data type="anyURI"/>
|
|
428
360
|
</attribute>
|
|
429
361
|
</optional>
|
|
430
|
-
<optional>
|
|
431
|
-
<attribute name="keep-with-next">
|
|
432
|
-
<data type="boolean"/>
|
|
433
|
-
</attribute>
|
|
434
|
-
</optional>
|
|
435
|
-
<optional>
|
|
436
|
-
<attribute name="keep-lines-together">
|
|
437
|
-
<data type="boolean"/>
|
|
438
|
-
</attribute>
|
|
439
|
-
</optional>
|
|
440
362
|
<optional>
|
|
441
363
|
<attribute name="width"/>
|
|
442
364
|
</optional>
|
|
443
|
-
<
|
|
444
|
-
<attribute name="tag"/>
|
|
445
|
-
</optional>
|
|
446
|
-
<optional>
|
|
447
|
-
<attribute name="multilingual-rendering">
|
|
448
|
-
<ref name="MultilingualRenderingType"/>
|
|
449
|
-
</attribute>
|
|
450
|
-
</optional>
|
|
365
|
+
<ref name="BlockAttributes"/>
|
|
451
366
|
<optional>
|
|
452
367
|
<ref name="colgroup"/>
|
|
453
368
|
</optional>
|
|
@@ -467,6 +382,9 @@
|
|
|
467
382
|
<optional>
|
|
468
383
|
<ref name="dl"/>
|
|
469
384
|
</optional>
|
|
385
|
+
<optional>
|
|
386
|
+
<ref name="source"/>
|
|
387
|
+
</optional>
|
|
470
388
|
</element>
|
|
471
389
|
</define>
|
|
472
390
|
<define name="figure">
|
|
@@ -485,30 +403,10 @@
|
|
|
485
403
|
<optional>
|
|
486
404
|
<attribute name="subsequence"/>
|
|
487
405
|
</optional>
|
|
488
|
-
<optional>
|
|
489
|
-
<attribute name="keep-with-next">
|
|
490
|
-
<data type="boolean"/>
|
|
491
|
-
</attribute>
|
|
492
|
-
</optional>
|
|
493
|
-
<optional>
|
|
494
|
-
<attribute name="keep-lines-together">
|
|
495
|
-
<data type="boolean"/>
|
|
496
|
-
</attribute>
|
|
497
|
-
</optional>
|
|
498
406
|
<optional>
|
|
499
407
|
<attribute name="class"/>
|
|
500
408
|
</optional>
|
|
501
|
-
<
|
|
502
|
-
<attribute name="tag"/>
|
|
503
|
-
</optional>
|
|
504
|
-
<optional>
|
|
505
|
-
<attribute name="multilingual-rendering">
|
|
506
|
-
<ref name="MultilingualRenderingType"/>
|
|
507
|
-
</attribute>
|
|
508
|
-
</optional>
|
|
509
|
-
<optional>
|
|
510
|
-
<ref name="source"/>
|
|
511
|
-
</optional>
|
|
409
|
+
<ref name="BlockAttributes"/>
|
|
512
410
|
<optional>
|
|
513
411
|
<ref name="tname"/>
|
|
514
412
|
</optional>
|
|
@@ -533,6 +431,20 @@
|
|
|
533
431
|
<zeroOrMore>
|
|
534
432
|
<ref name="note"/>
|
|
535
433
|
</zeroOrMore>
|
|
434
|
+
<optional>
|
|
435
|
+
<ref name="source"/>
|
|
436
|
+
</optional>
|
|
437
|
+
</element>
|
|
438
|
+
</define>
|
|
439
|
+
<define name="source">
|
|
440
|
+
<element name="source">
|
|
441
|
+
<attribute name="status">
|
|
442
|
+
<ref name="SourceStatusType"/>
|
|
443
|
+
</attribute>
|
|
444
|
+
<ref name="origin"/>
|
|
445
|
+
<optional>
|
|
446
|
+
<ref name="modification"/>
|
|
447
|
+
</optional>
|
|
536
448
|
</element>
|
|
537
449
|
</define>
|
|
538
450
|
<define name="sourcecode">
|
|
@@ -551,27 +463,10 @@
|
|
|
551
463
|
<optional>
|
|
552
464
|
<attribute name="subsequence"/>
|
|
553
465
|
</optional>
|
|
554
|
-
<optional>
|
|
555
|
-
<attribute name="keep-with-next">
|
|
556
|
-
<data type="boolean"/>
|
|
557
|
-
</attribute>
|
|
558
|
-
</optional>
|
|
559
|
-
<optional>
|
|
560
|
-
<attribute name="keep-lines-together">
|
|
561
|
-
<data type="boolean"/>
|
|
562
|
-
</attribute>
|
|
563
|
-
</optional>
|
|
564
466
|
<optional>
|
|
565
467
|
<attribute name="lang"/>
|
|
566
468
|
</optional>
|
|
567
|
-
<
|
|
568
|
-
<attribute name="tag"/>
|
|
569
|
-
</optional>
|
|
570
|
-
<optional>
|
|
571
|
-
<attribute name="multilingual-rendering">
|
|
572
|
-
<ref name="MultilingualRenderingType"/>
|
|
573
|
-
</attribute>
|
|
574
|
-
</optional>
|
|
469
|
+
<ref name="BlockAttributes"/>
|
|
575
470
|
<optional>
|
|
576
471
|
<attribute name="linenums">
|
|
577
472
|
<data type="boolean"/>
|
|
@@ -610,29 +505,12 @@
|
|
|
610
505
|
<optional>
|
|
611
506
|
<attribute name="subsequence"/>
|
|
612
507
|
</optional>
|
|
613
|
-
<optional>
|
|
614
|
-
<attribute name="keep-with-next">
|
|
615
|
-
<data type="boolean"/>
|
|
616
|
-
</attribute>
|
|
617
|
-
</optional>
|
|
618
|
-
<optional>
|
|
619
|
-
<attribute name="keep-lines-together">
|
|
620
|
-
<data type="boolean"/>
|
|
621
|
-
</attribute>
|
|
622
|
-
</optional>
|
|
623
508
|
<optional>
|
|
624
509
|
<attribute name="inequality">
|
|
625
510
|
<data type="boolean"/>
|
|
626
511
|
</attribute>
|
|
627
512
|
</optional>
|
|
628
|
-
<
|
|
629
|
-
<attribute name="tag"/>
|
|
630
|
-
</optional>
|
|
631
|
-
<optional>
|
|
632
|
-
<attribute name="multilingual-rendering">
|
|
633
|
-
<ref name="MultilingualRenderingType"/>
|
|
634
|
-
</attribute>
|
|
635
|
-
</optional>
|
|
513
|
+
<ref name="BlockAttributes"/>
|
|
636
514
|
<ref name="stem"/>
|
|
637
515
|
<optional>
|
|
638
516
|
<ref name="dl"/>
|
|
@@ -651,27 +529,7 @@
|
|
|
651
529
|
<ref name="Alignments"/>
|
|
652
530
|
</attribute>
|
|
653
531
|
</optional>
|
|
654
|
-
<
|
|
655
|
-
<attribute name="keep-with-next">
|
|
656
|
-
<data type="boolean"/>
|
|
657
|
-
</attribute>
|
|
658
|
-
</optional>
|
|
659
|
-
<optional>
|
|
660
|
-
<attribute name="keep-lines-together">
|
|
661
|
-
<data type="boolean"/>
|
|
662
|
-
</attribute>
|
|
663
|
-
</optional>
|
|
664
|
-
<optional>
|
|
665
|
-
<attribute name="tag"/>
|
|
666
|
-
</optional>
|
|
667
|
-
<optional>
|
|
668
|
-
<attribute name="type"/>
|
|
669
|
-
</optional>
|
|
670
|
-
<optional>
|
|
671
|
-
<attribute name="multilingual-rendering">
|
|
672
|
-
<ref name="MultilingualRenderingType"/>
|
|
673
|
-
</attribute>
|
|
674
|
-
</optional>
|
|
532
|
+
<ref name="BlockAttributes"/>
|
|
675
533
|
<zeroOrMore>
|
|
676
534
|
<ref name="TextElement"/>
|
|
677
535
|
</zeroOrMore>
|
|
@@ -689,27 +547,10 @@
|
|
|
689
547
|
<ref name="Alignments"/>
|
|
690
548
|
</attribute>
|
|
691
549
|
</optional>
|
|
692
|
-
<optional>
|
|
693
|
-
<attribute name="keep-with-next">
|
|
694
|
-
<data type="boolean"/>
|
|
695
|
-
</attribute>
|
|
696
|
-
</optional>
|
|
697
|
-
<optional>
|
|
698
|
-
<attribute name="keep-lines-together">
|
|
699
|
-
<data type="boolean"/>
|
|
700
|
-
</attribute>
|
|
701
|
-
</optional>
|
|
702
|
-
<optional>
|
|
703
|
-
<attribute name="tag"/>
|
|
704
|
-
</optional>
|
|
705
550
|
<optional>
|
|
706
551
|
<attribute name="type"/>
|
|
707
552
|
</optional>
|
|
708
|
-
<
|
|
709
|
-
<attribute name="multilingual-rendering">
|
|
710
|
-
<ref name="MultilingualRenderingType"/>
|
|
711
|
-
</attribute>
|
|
712
|
-
</optional>
|
|
553
|
+
<ref name="BlockAttributes"/>
|
|
713
554
|
<zeroOrMore>
|
|
714
555
|
<choice>
|
|
715
556
|
<ref name="TextElement"/>
|
|
@@ -731,24 +572,7 @@
|
|
|
731
572
|
<ref name="Alignments"/>
|
|
732
573
|
</attribute>
|
|
733
574
|
</optional>
|
|
734
|
-
<
|
|
735
|
-
<attribute name="keep-with-next">
|
|
736
|
-
<data type="boolean"/>
|
|
737
|
-
</attribute>
|
|
738
|
-
</optional>
|
|
739
|
-
<optional>
|
|
740
|
-
<attribute name="keep-lines-together">
|
|
741
|
-
<data type="boolean"/>
|
|
742
|
-
</attribute>
|
|
743
|
-
</optional>
|
|
744
|
-
<optional>
|
|
745
|
-
<attribute name="tag"/>
|
|
746
|
-
</optional>
|
|
747
|
-
<optional>
|
|
748
|
-
<attribute name="multilingual-rendering">
|
|
749
|
-
<ref name="MultilingualRenderingType"/>
|
|
750
|
-
</attribute>
|
|
751
|
-
</optional>
|
|
575
|
+
<ref name="BlockAttributes"/>
|
|
752
576
|
<optional>
|
|
753
577
|
<ref name="quote-source"/>
|
|
754
578
|
</optional>
|
|
@@ -828,27 +652,9 @@
|
|
|
828
652
|
<optional>
|
|
829
653
|
<attribute name="subsequence"/>
|
|
830
654
|
</optional>
|
|
831
|
-
<optional>
|
|
832
|
-
<attribute name="keep-with-next">
|
|
833
|
-
<data type="boolean"/>
|
|
834
|
-
</attribute>
|
|
835
|
-
</optional>
|
|
836
|
-
<optional>
|
|
837
|
-
<attribute name="keep-lines-together">
|
|
838
|
-
<data type="boolean"/>
|
|
839
|
-
</attribute>
|
|
840
|
-
</optional>
|
|
841
655
|
<optional>
|
|
842
656
|
<attribute name="type"/>
|
|
843
657
|
</optional>
|
|
844
|
-
<optional>
|
|
845
|
-
<attribute name="tag"/>
|
|
846
|
-
</optional>
|
|
847
|
-
<optional>
|
|
848
|
-
<attribute name="multilingual-rendering">
|
|
849
|
-
<ref name="MultilingualRenderingType"/>
|
|
850
|
-
</attribute>
|
|
851
|
-
</optional>
|
|
852
658
|
<optional>
|
|
853
659
|
<attribute name="coverpage">
|
|
854
660
|
<data type="boolean"/>
|
|
@@ -859,6 +665,7 @@
|
|
|
859
665
|
<data type="boolean"/>
|
|
860
666
|
</attribute>
|
|
861
667
|
</optional>
|
|
668
|
+
<ref name="BlockAttributes"/>
|
|
862
669
|
<oneOrMore>
|
|
863
670
|
<choice>
|
|
864
671
|
<ref name="paragraph"/>
|
|
@@ -1332,14 +1139,7 @@
|
|
|
1332
1139
|
<optional>
|
|
1333
1140
|
<attribute name="class"/>
|
|
1334
1141
|
</optional>
|
|
1335
|
-
<
|
|
1336
|
-
<attribute name="tag"/>
|
|
1337
|
-
</optional>
|
|
1338
|
-
<optional>
|
|
1339
|
-
<attribute name="multilingual-rendering">
|
|
1340
|
-
<ref name="MultilingualRenderingType"/>
|
|
1341
|
-
</attribute>
|
|
1342
|
-
</optional>
|
|
1142
|
+
<ref name="BlockAttributes"/>
|
|
1343
1143
|
<zeroOrMore>
|
|
1344
1144
|
<choice>
|
|
1345
1145
|
<ref name="TextElement"/>
|
|
@@ -1908,7 +1708,10 @@
|
|
|
1908
1708
|
</zeroOrMore>
|
|
1909
1709
|
<choice>
|
|
1910
1710
|
<oneOrMore>
|
|
1911
|
-
<
|
|
1711
|
+
<choice>
|
|
1712
|
+
<ref name="term"/>
|
|
1713
|
+
<ref name="terms"/>
|
|
1714
|
+
</choice>
|
|
1912
1715
|
</oneOrMore>
|
|
1913
1716
|
<group>
|
|
1914
1717
|
<zeroOrMore>
|
|
@@ -1934,14 +1737,7 @@
|
|
|
1934
1737
|
<optional>
|
|
1935
1738
|
<attribute name="script"/>
|
|
1936
1739
|
</optional>
|
|
1937
|
-
<
|
|
1938
|
-
<attribute name="tag"/>
|
|
1939
|
-
</optional>
|
|
1940
|
-
<optional>
|
|
1941
|
-
<attribute name="multilingual-rendering">
|
|
1942
|
-
<ref name="MultilingualRenderingType"/>
|
|
1943
|
-
</attribute>
|
|
1944
|
-
</optional>
|
|
1740
|
+
<ref name="BlockAttributes"/>
|
|
1945
1741
|
<oneOrMore>
|
|
1946
1742
|
<ref name="preferred"/>
|
|
1947
1743
|
</oneOrMore>
|
|
@@ -2282,24 +2078,7 @@
|
|
|
2282
2078
|
<optional>
|
|
2283
2079
|
<attribute name="subsequence"/>
|
|
2284
2080
|
</optional>
|
|
2285
|
-
<
|
|
2286
|
-
<attribute name="keep-with-next">
|
|
2287
|
-
<data type="boolean"/>
|
|
2288
|
-
</attribute>
|
|
2289
|
-
</optional>
|
|
2290
|
-
<optional>
|
|
2291
|
-
<attribute name="keep-lines-together">
|
|
2292
|
-
<data type="boolean"/>
|
|
2293
|
-
</attribute>
|
|
2294
|
-
</optional>
|
|
2295
|
-
<optional>
|
|
2296
|
-
<attribute name="tag"/>
|
|
2297
|
-
</optional>
|
|
2298
|
-
<optional>
|
|
2299
|
-
<attribute name="multilingual-rendering">
|
|
2300
|
-
<ref name="MultilingualRenderingType"/>
|
|
2301
|
-
</attribute>
|
|
2302
|
-
</optional>
|
|
2081
|
+
<ref name="BlockAttributes"/>
|
|
2303
2082
|
<oneOrMore>
|
|
2304
2083
|
<choice>
|
|
2305
2084
|
<ref name="paragraph"/>
|
|
@@ -2316,24 +2095,7 @@
|
|
|
2316
2095
|
<attribute name="id">
|
|
2317
2096
|
<data type="ID"/>
|
|
2318
2097
|
</attribute>
|
|
2319
|
-
<
|
|
2320
|
-
<attribute name="keep-with-next">
|
|
2321
|
-
<data type="boolean"/>
|
|
2322
|
-
</attribute>
|
|
2323
|
-
</optional>
|
|
2324
|
-
<optional>
|
|
2325
|
-
<attribute name="keep-lines-together">
|
|
2326
|
-
<data type="boolean"/>
|
|
2327
|
-
</attribute>
|
|
2328
|
-
</optional>
|
|
2329
|
-
<optional>
|
|
2330
|
-
<attribute name="tag"/>
|
|
2331
|
-
</optional>
|
|
2332
|
-
<optional>
|
|
2333
|
-
<attribute name="multilingual-rendering">
|
|
2334
|
-
<ref name="MultilingualRenderingType"/>
|
|
2335
|
-
</attribute>
|
|
2336
|
-
</optional>
|
|
2098
|
+
<ref name="BlockAttributes"/>
|
|
2337
2099
|
<oneOrMore>
|
|
2338
2100
|
<choice>
|
|
2339
2101
|
<ref name="formula"/>
|
|
@@ -2351,10 +2113,7 @@
|
|
|
2351
2113
|
<define name="termsource">
|
|
2352
2114
|
<element name="termsource">
|
|
2353
2115
|
<attribute name="status">
|
|
2354
|
-
<
|
|
2355
|
-
<value>identical</value>
|
|
2356
|
-
<value>modified</value>
|
|
2357
|
-
</choice>
|
|
2116
|
+
<ref name="SourceStatusType"/>
|
|
2358
2117
|
</attribute>
|
|
2359
2118
|
<attribute name="type">
|
|
2360
2119
|
<choice>
|
|
@@ -2368,6 +2127,17 @@
|
|
|
2368
2127
|
</optional>
|
|
2369
2128
|
</element>
|
|
2370
2129
|
</define>
|
|
2130
|
+
<define name="SourceStatusType">
|
|
2131
|
+
<choice>
|
|
2132
|
+
<value>identical</value>
|
|
2133
|
+
<value>modified</value>
|
|
2134
|
+
<value>restyled</value>
|
|
2135
|
+
<value>context-added</value>
|
|
2136
|
+
<value>generalisation</value>
|
|
2137
|
+
<value>specialisation</value>
|
|
2138
|
+
<value>unspecified</value>
|
|
2139
|
+
</choice>
|
|
2140
|
+
</define>
|
|
2371
2141
|
<define name="origin">
|
|
2372
2142
|
<element name="origin">
|
|
2373
2143
|
<choice>
|
|
@@ -2460,14 +2230,7 @@
|
|
|
2460
2230
|
<optional>
|
|
2461
2231
|
<attribute name="title"/>
|
|
2462
2232
|
</optional>
|
|
2463
|
-
<
|
|
2464
|
-
<attribute name="tag"/>
|
|
2465
|
-
</optional>
|
|
2466
|
-
<optional>
|
|
2467
|
-
<attribute name="multilingual-rendering">
|
|
2468
|
-
<ref name="MultilingualRenderingType"/>
|
|
2469
|
-
</attribute>
|
|
2470
|
-
</optional>
|
|
2233
|
+
<ref name="BlockAttributes"/>
|
|
2471
2234
|
<optional>
|
|
2472
2235
|
<element name="location">
|
|
2473
2236
|
<zeroOrMore>
|
|
@@ -2527,14 +2290,7 @@
|
|
|
2527
2290
|
</define>
|
|
2528
2291
|
<define name="imagemap">
|
|
2529
2292
|
<element name="imagemap">
|
|
2530
|
-
<
|
|
2531
|
-
<attribute name="tag"/>
|
|
2532
|
-
</optional>
|
|
2533
|
-
<optional>
|
|
2534
|
-
<attribute name="multilingual-rendering">
|
|
2535
|
-
<ref name="MultilingualRenderingType"/>
|
|
2536
|
-
</attribute>
|
|
2537
|
-
</optional>
|
|
2293
|
+
<ref name="BlockAttributes"/>
|
|
2538
2294
|
<ref name="figure"/>
|
|
2539
2295
|
<zeroOrMore>
|
|
2540
2296
|
<element name="area">
|
|
@@ -2580,14 +2336,7 @@
|
|
|
2580
2336
|
</define>
|
|
2581
2337
|
<define name="svgmap">
|
|
2582
2338
|
<element name="svgmap">
|
|
2583
|
-
<
|
|
2584
|
-
<attribute name="tag"/>
|
|
2585
|
-
</optional>
|
|
2586
|
-
<optional>
|
|
2587
|
-
<attribute name="multilingual-rendering">
|
|
2588
|
-
<ref name="MultilingualRenderingType"/>
|
|
2589
|
-
</attribute>
|
|
2590
|
-
</optional>
|
|
2339
|
+
<ref name="BlockAttributes"/>
|
|
2591
2340
|
<ref name="figure"/>
|
|
2592
2341
|
<zeroOrMore>
|
|
2593
2342
|
<element name="target">
|
|
@@ -2694,6 +2443,29 @@
|
|
|
2694
2443
|
</oneOrMore>
|
|
2695
2444
|
</element>
|
|
2696
2445
|
</define>
|
|
2446
|
+
<define name="BlockAttributes">
|
|
2447
|
+
<optional>
|
|
2448
|
+
<attribute name="keep-with-next">
|
|
2449
|
+
<data type="boolean"/>
|
|
2450
|
+
</attribute>
|
|
2451
|
+
</optional>
|
|
2452
|
+
<optional>
|
|
2453
|
+
<attribute name="keep-lines-together">
|
|
2454
|
+
<data type="boolean"/>
|
|
2455
|
+
</attribute>
|
|
2456
|
+
</optional>
|
|
2457
|
+
<optional>
|
|
2458
|
+
<attribute name="tag"/>
|
|
2459
|
+
</optional>
|
|
2460
|
+
<optional>
|
|
2461
|
+
<attribute name="multilingual-rendering">
|
|
2462
|
+
<ref name="MultilingualRenderingType"/>
|
|
2463
|
+
</attribute>
|
|
2464
|
+
</optional>
|
|
2465
|
+
<optional>
|
|
2466
|
+
<attribute name="columns"/>
|
|
2467
|
+
</optional>
|
|
2468
|
+
</define>
|
|
2697
2469
|
<start>
|
|
2698
2470
|
<ref name="standard-document"/>
|
|
2699
2471
|
</start>
|
data/metanorma-ietf.gemspec
CHANGED
|
@@ -38,7 +38,7 @@ Gem::Specification.new do |spec|
|
|
|
38
38
|
|
|
39
39
|
spec.add_dependency "mathml2asciimath"
|
|
40
40
|
spec.add_dependency "metanorma-ietf-data"
|
|
41
|
-
spec.add_dependency "metanorma-standoc", "~> 2.
|
|
41
|
+
spec.add_dependency "metanorma-standoc", "~> 2.4.2"
|
|
42
42
|
|
|
43
43
|
spec.add_development_dependency "debug"
|
|
44
44
|
spec.add_development_dependency "equivalent-xml", "~> 0.6"
|
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.1.
|
|
4
|
+
version: 3.1.5
|
|
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-
|
|
11
|
+
date: 2023-04-10 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: mathml2asciimath
|
|
@@ -44,14 +44,14 @@ dependencies:
|
|
|
44
44
|
requirements:
|
|
45
45
|
- - "~>"
|
|
46
46
|
- !ruby/object:Gem::Version
|
|
47
|
-
version: 2.
|
|
47
|
+
version: 2.4.2
|
|
48
48
|
type: :runtime
|
|
49
49
|
prerelease: false
|
|
50
50
|
version_requirements: !ruby/object:Gem::Requirement
|
|
51
51
|
requirements:
|
|
52
52
|
- - "~>"
|
|
53
53
|
- !ruby/object:Gem::Version
|
|
54
|
-
version: 2.
|
|
54
|
+
version: 2.4.2
|
|
55
55
|
- !ruby/object:Gem::Dependency
|
|
56
56
|
name: debug
|
|
57
57
|
requirement: !ruby/object:Gem::Requirement
|