metanorma-ietf 2.4.2 → 2.5.0.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/asciidoctor/ietf/basicdoc.rng +21 -4
- data/lib/asciidoctor/ietf/cleanup.rb +6 -1
- data/lib/asciidoctor/ietf/ietf.rng +9 -24
- data/lib/asciidoctor/ietf/isodoc.rng +410 -77
- data/lib/asciidoctor/ietf/reqt.rng +23 -2
- data/lib/isodoc/ietf/blocks.rb +3 -2
- data/lib/isodoc/ietf/cleanup.rb +148 -203
- data/lib/isodoc/ietf/cleanup_inline.rb +76 -0
- data/lib/isodoc/ietf/reqt.rb +63 -59
- data/lib/isodoc/ietf/rfc_convert.rb +2 -0
- data/lib/isodoc/ietf/terms.rb +52 -45
- data/lib/metanorma/ietf/version.rb +1 -1
- data/metanorma-ietf.gemspec +1 -3
- metadata +6 -33
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 745b59cafcbd1e2123463f0d74ac53132d289cff1ef328a8a35dc42cb7cfec84
|
|
4
|
+
data.tar.gz: 5c6302b7ca5b642be7c24af9659d7d52b4d5190a8943523560d2d9e629ede78f
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 50cba96f5084b53fcaa244669753342fbe891be9462dc028002bbef70762259a47ecc15ae0175c691ed4e6f71dab00c0aca096e3f7401a1de3c6b9e1d0e67861
|
|
7
|
+
data.tar.gz: 51ba50fc4e19843be44bdea52fa1afd65e20a6161b952b3c3a8253bf1ffc11a254dfded0acf77a6c381b4b675fa70ad72cdc11cd7c806244a5b9d4fef1b808e3
|
|
@@ -624,6 +624,9 @@
|
|
|
624
624
|
<choice>
|
|
625
625
|
<ref name="PureTextElement"/>
|
|
626
626
|
<ref name="stem"/>
|
|
627
|
+
<ref name="eref"/>
|
|
628
|
+
<ref name="xref"/>
|
|
629
|
+
<ref name="hyperlink"/>
|
|
627
630
|
</choice>
|
|
628
631
|
</zeroOrMore>
|
|
629
632
|
</element>
|
|
@@ -634,6 +637,9 @@
|
|
|
634
637
|
<choice>
|
|
635
638
|
<ref name="PureTextElement"/>
|
|
636
639
|
<ref name="stem"/>
|
|
640
|
+
<ref name="eref"/>
|
|
641
|
+
<ref name="xref"/>
|
|
642
|
+
<ref name="hyperlink"/>
|
|
637
643
|
</choice>
|
|
638
644
|
</zeroOrMore>
|
|
639
645
|
</element>
|
|
@@ -641,7 +647,12 @@
|
|
|
641
647
|
<define name="tt">
|
|
642
648
|
<element name="tt">
|
|
643
649
|
<zeroOrMore>
|
|
644
|
-
<
|
|
650
|
+
<choice>
|
|
651
|
+
<ref name="PureTextElement"/>
|
|
652
|
+
<ref name="eref"/>
|
|
653
|
+
<ref name="xref"/>
|
|
654
|
+
<ref name="hyperlink"/>
|
|
655
|
+
</choice>
|
|
645
656
|
</zeroOrMore>
|
|
646
657
|
</element>
|
|
647
658
|
</define>
|
|
@@ -822,7 +833,9 @@
|
|
|
822
833
|
<attribute name="alt"/>
|
|
823
834
|
</optional>
|
|
824
835
|
<ref name="CitationType"/>
|
|
825
|
-
<
|
|
836
|
+
<oneOrMore>
|
|
837
|
+
<ref name="PureTextElement"/>
|
|
838
|
+
</oneOrMore>
|
|
826
839
|
</define>
|
|
827
840
|
<define name="hyperlink">
|
|
828
841
|
<element name="link">
|
|
@@ -835,7 +848,9 @@
|
|
|
835
848
|
<optional>
|
|
836
849
|
<attribute name="alt"/>
|
|
837
850
|
</optional>
|
|
838
|
-
<
|
|
851
|
+
<oneOrMore>
|
|
852
|
+
<ref name="PureTextElement"/>
|
|
853
|
+
</oneOrMore>
|
|
839
854
|
</element>
|
|
840
855
|
</define>
|
|
841
856
|
<define name="xref">
|
|
@@ -849,7 +864,9 @@
|
|
|
849
864
|
<optional>
|
|
850
865
|
<attribute name="alt"/>
|
|
851
866
|
</optional>
|
|
852
|
-
<
|
|
867
|
+
<oneOrMore>
|
|
868
|
+
<ref name="PureTextElement"/>
|
|
869
|
+
</oneOrMore>
|
|
853
870
|
</element>
|
|
854
871
|
</define>
|
|
855
872
|
<define name="fn">
|
|
@@ -63,7 +63,12 @@ module Asciidoctor
|
|
|
63
63
|
|
|
64
64
|
n.replace(HTMLEntities.new.encode(
|
|
65
65
|
n.text.gsub(/\u2019|\u2018|\u201a|\u201b/, "'")
|
|
66
|
-
.gsub(/\u201c|\u201d|\u201e|\u201f/, '"')
|
|
66
|
+
.gsub(/\u201c|\u201d|\u201e|\u201f/, '"')
|
|
67
|
+
.gsub(/[\u2010-\u2015]/, "-")
|
|
68
|
+
.gsub(/\u2026/, "...")
|
|
69
|
+
.gsub(/[\u200b-\u200c]/, "")
|
|
70
|
+
.gsub(/[\u2000-\u200a]|\u202f|\u205f/, " "),
|
|
71
|
+
:basic,
|
|
67
72
|
))
|
|
68
73
|
end
|
|
69
74
|
xmldoc
|
|
@@ -459,14 +459,9 @@
|
|
|
459
459
|
<ref name="section-title"/>
|
|
460
460
|
</optional>
|
|
461
461
|
<group>
|
|
462
|
-
<
|
|
463
|
-
<
|
|
464
|
-
|
|
465
|
-
</zeroOrMore>
|
|
466
|
-
<zeroOrMore>
|
|
467
|
-
<ref name="note"/>
|
|
468
|
-
</zeroOrMore>
|
|
469
|
-
</group>
|
|
462
|
+
<zeroOrMore>
|
|
463
|
+
<ref name="BasicBlock"/>
|
|
464
|
+
</zeroOrMore>
|
|
470
465
|
<zeroOrMore>
|
|
471
466
|
<choice>
|
|
472
467
|
<ref name="clause-subsection"/>
|
|
@@ -508,14 +503,9 @@
|
|
|
508
503
|
<ref name="section-title"/>
|
|
509
504
|
</optional>
|
|
510
505
|
<group>
|
|
511
|
-
<
|
|
512
|
-
<
|
|
513
|
-
|
|
514
|
-
</zeroOrMore>
|
|
515
|
-
<zeroOrMore>
|
|
516
|
-
<ref name="note"/>
|
|
517
|
-
</zeroOrMore>
|
|
518
|
-
</group>
|
|
506
|
+
<zeroOrMore>
|
|
507
|
+
<ref name="BasicBlock"/>
|
|
508
|
+
</zeroOrMore>
|
|
519
509
|
<zeroOrMore>
|
|
520
510
|
<ref name="clause-subsection"/>
|
|
521
511
|
</zeroOrMore>
|
|
@@ -547,14 +537,9 @@
|
|
|
547
537
|
<ref name="section-title"/>
|
|
548
538
|
</optional>
|
|
549
539
|
<group>
|
|
550
|
-
<
|
|
551
|
-
<
|
|
552
|
-
|
|
553
|
-
</zeroOrMore>
|
|
554
|
-
<zeroOrMore>
|
|
555
|
-
<ref name="note"/>
|
|
556
|
-
</zeroOrMore>
|
|
557
|
-
</group>
|
|
540
|
+
<zeroOrMore>
|
|
541
|
+
<ref name="BasicBlock"/>
|
|
542
|
+
</zeroOrMore>
|
|
558
543
|
<zeroOrMore>
|
|
559
544
|
<ref name="content-subsection"/>
|
|
560
545
|
</zeroOrMore>
|