metanorma-ietf 2.2.10 → 2.3.4
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/workflows/rake.yml +3 -13
- data/.hound.yml +3 -1
- data/.rubocop.yml +4 -8
- data/lib/asciidoctor/ietf/biblio.rng +1 -0
- data/lib/asciidoctor/ietf/front.rb +2 -2
- data/lib/asciidoctor/ietf/ietf.rng +3 -0
- data/lib/asciidoctor/ietf/isodoc.rng +321 -4
- data/lib/asciidoctor/ietf/validate.rb +22 -13
- data/lib/isodoc/ietf/blocks.rb +17 -15
- data/lib/isodoc/ietf/cleanup.rb +38 -22
- data/lib/isodoc/ietf/front.rb +57 -46
- data/lib/isodoc/ietf/references.rb +20 -15
- data/lib/isodoc/ietf/section.rb +51 -42
- data/lib/metanorma/ietf/processor.rb +32 -35
- data/lib/metanorma/ietf/version.rb +1 -1
- data/metanorma-ietf.gemspec +6 -5
- metadata +32 -18
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 7a12328cf063937699b9e4713e4f02ecb83baed14af90b6cb8c05e44d68361f0
|
|
4
|
+
data.tar.gz: e89e8c1aa57a7341298ac5a3b01c17ecdab3ed746e9fcb915730dade6a8241db
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 3279c11e5298c25e7fd5d45d441416156bbf051791cd8883675c101a1b153455c01a3b14b62cd341f29fb3c2be0c58b2273eeb501dfa7dd5e1e56d7388941c19
|
|
7
|
+
data.tar.gz: 6662f000dadd312542ba8e57023237bfd9036055df0c53c235fcc0dc7b7ac8b131023139fa4c029d27d5a4d0ea7929f0a2850dd3a1d747f57cd3b50cf2dbcd12
|
data/.github/workflows/rake.yml
CHANGED
|
@@ -16,19 +16,9 @@ jobs:
|
|
|
16
16
|
strategy:
|
|
17
17
|
fail-fast: false
|
|
18
18
|
matrix:
|
|
19
|
-
ruby: [ '2.7', '2.6', '2.5', '2.4' ]
|
|
19
|
+
ruby: [ '3.0', '2.7', '2.6', '2.5', '2.4' ]
|
|
20
20
|
os: [ ubuntu-latest, windows-latest, macos-latest ]
|
|
21
21
|
experimental: [ false ]
|
|
22
|
-
include:
|
|
23
|
-
- ruby: '3.0'
|
|
24
|
-
os: 'ubuntu-latest'
|
|
25
|
-
experimental: true
|
|
26
|
-
- ruby: '3.0'
|
|
27
|
-
os: 'windows-latest'
|
|
28
|
-
experimental: true
|
|
29
|
-
- ruby: '3.0'
|
|
30
|
-
os: 'macos-latest'
|
|
31
|
-
experimental: true
|
|
32
22
|
|
|
33
23
|
steps:
|
|
34
24
|
- uses: actions/checkout@master
|
|
@@ -68,7 +58,7 @@ jobs:
|
|
|
68
58
|
with:
|
|
69
59
|
path: ~/.cache/xml2rfc
|
|
70
60
|
key: xml2rfc
|
|
71
|
-
restore-
|
|
61
|
+
restore-keys: xml2rfc
|
|
72
62
|
|
|
73
63
|
- if: matrix.os == 'macos-latest'
|
|
74
64
|
run: brew install libmagic
|
|
@@ -88,5 +78,5 @@ jobs:
|
|
|
88
78
|
with:
|
|
89
79
|
token: ${{ secrets.METANORMA_CI_PAT_TOKEN || secrets.GITHUB_TOKEN }}
|
|
90
80
|
repository: ${{ github.repository }}
|
|
91
|
-
event-type:
|
|
81
|
+
event-type: tests-passed
|
|
92
82
|
client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}"}'
|
data/.hound.yml
CHANGED
data/.rubocop.yml
CHANGED
|
@@ -1,14 +1,10 @@
|
|
|
1
|
-
#
|
|
2
|
-
# https://github.com/
|
|
3
|
-
# All project-specific additions and overrides should be specified in this file.
|
|
1
|
+
# Auto-generated by Cimas: Do not edit it manually!
|
|
2
|
+
# See https://github.com/metanorma/cimas
|
|
4
3
|
inherit_from:
|
|
5
4
|
- https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
|
|
6
5
|
|
|
7
6
|
# local repo-specific modifications
|
|
7
|
+
# ...
|
|
8
8
|
|
|
9
9
|
AllCops:
|
|
10
|
-
|
|
11
|
-
StyleGuideCopsOnly: false
|
|
12
|
-
TargetRubyVersion: 2.4
|
|
13
|
-
Rails:
|
|
14
|
-
Enabled: true
|
|
10
|
+
TargetRubyVersion: 2.5
|
|
@@ -14,7 +14,7 @@ module Asciidoctor
|
|
|
14
14
|
csv_split(publishers)&.each do |p|
|
|
15
15
|
xml.contributor do |c|
|
|
16
16
|
c.role **{ type: "publisher" }
|
|
17
|
-
c.organization { |a| organization(a, p) }
|
|
17
|
+
c.organization { |a| organization(a, p, true) }
|
|
18
18
|
end
|
|
19
19
|
end
|
|
20
20
|
end
|
|
@@ -25,7 +25,7 @@ module Asciidoctor
|
|
|
25
25
|
xml.copyright do |c|
|
|
26
26
|
c.from (node.attr("copyright-year") || Date.today.year)
|
|
27
27
|
c.owner do |owner|
|
|
28
|
-
owner.organization { |o| organization(o, p) }
|
|
28
|
+
owner.organization { |o| organization(o, p, true) }
|
|
29
29
|
end
|
|
30
30
|
end
|
|
31
31
|
end
|
|
@@ -45,6 +45,11 @@
|
|
|
45
45
|
<optional>
|
|
46
46
|
<attribute name="alt"/>
|
|
47
47
|
</optional>
|
|
48
|
+
<optional>
|
|
49
|
+
<attribute name="updatetype">
|
|
50
|
+
<data type="boolean"/>
|
|
51
|
+
</attribute>
|
|
52
|
+
</optional>
|
|
48
53
|
<text/>
|
|
49
54
|
</element>
|
|
50
55
|
</define>
|
|
@@ -86,6 +91,35 @@
|
|
|
86
91
|
<text/>
|
|
87
92
|
</element>
|
|
88
93
|
</define>
|
|
94
|
+
<define name="erefType">
|
|
95
|
+
<optional>
|
|
96
|
+
<attribute name="normative">
|
|
97
|
+
<data type="boolean"/>
|
|
98
|
+
</attribute>
|
|
99
|
+
</optional>
|
|
100
|
+
<attribute name="citeas"/>
|
|
101
|
+
<attribute name="type">
|
|
102
|
+
<ref name="ReferenceFormat"/>
|
|
103
|
+
</attribute>
|
|
104
|
+
<optional>
|
|
105
|
+
<attribute name="alt"/>
|
|
106
|
+
</optional>
|
|
107
|
+
<optional>
|
|
108
|
+
<attribute name="case">
|
|
109
|
+
<choice>
|
|
110
|
+
<value>capital</value>
|
|
111
|
+
<value>lowercase</value>
|
|
112
|
+
</choice>
|
|
113
|
+
</attribute>
|
|
114
|
+
</optional>
|
|
115
|
+
<optional>
|
|
116
|
+
<attribute name="droploc">
|
|
117
|
+
<data type="boolean"/>
|
|
118
|
+
</attribute>
|
|
119
|
+
</optional>
|
|
120
|
+
<ref name="CitationType"/>
|
|
121
|
+
<text/>
|
|
122
|
+
</define>
|
|
89
123
|
<define name="ul">
|
|
90
124
|
<element name="ul">
|
|
91
125
|
<attribute name="id">
|
|
@@ -514,6 +548,9 @@
|
|
|
514
548
|
</define>
|
|
515
549
|
<define name="BibDataExtensionType">
|
|
516
550
|
<ref name="doctype"/>
|
|
551
|
+
<optional>
|
|
552
|
+
<ref name="docsubtype"/>
|
|
553
|
+
</optional>
|
|
517
554
|
<optional>
|
|
518
555
|
<ref name="editorialgroup"/>
|
|
519
556
|
</optional>
|
|
@@ -775,8 +812,100 @@
|
|
|
775
812
|
<ref name="paragraph"/>
|
|
776
813
|
</element>
|
|
777
814
|
</define>
|
|
815
|
+
<define name="em">
|
|
816
|
+
<element name="em">
|
|
817
|
+
<zeroOrMore>
|
|
818
|
+
<choice>
|
|
819
|
+
<ref name="PureTextElement"/>
|
|
820
|
+
<ref name="stem"/>
|
|
821
|
+
<ref name="index"/>
|
|
822
|
+
</choice>
|
|
823
|
+
</zeroOrMore>
|
|
824
|
+
</element>
|
|
825
|
+
</define>
|
|
826
|
+
<define name="strong">
|
|
827
|
+
<element name="strong">
|
|
828
|
+
<zeroOrMore>
|
|
829
|
+
<choice>
|
|
830
|
+
<ref name="PureTextElement"/>
|
|
831
|
+
<ref name="stem"/>
|
|
832
|
+
<ref name="index"/>
|
|
833
|
+
</choice>
|
|
834
|
+
</zeroOrMore>
|
|
835
|
+
</element>
|
|
836
|
+
</define>
|
|
837
|
+
<define name="tt">
|
|
838
|
+
<element name="tt">
|
|
839
|
+
<zeroOrMore>
|
|
840
|
+
<choice>
|
|
841
|
+
<ref name="PureTextElement"/>
|
|
842
|
+
<ref name="index"/>
|
|
843
|
+
</choice>
|
|
844
|
+
</zeroOrMore>
|
|
845
|
+
</element>
|
|
846
|
+
</define>
|
|
847
|
+
<define name="keyword">
|
|
848
|
+
<element name="keyword">
|
|
849
|
+
<zeroOrMore>
|
|
850
|
+
<choice>
|
|
851
|
+
<ref name="PureTextElement"/>
|
|
852
|
+
<ref name="index"/>
|
|
853
|
+
</choice>
|
|
854
|
+
</zeroOrMore>
|
|
855
|
+
</element>
|
|
856
|
+
</define>
|
|
857
|
+
<define name="strike">
|
|
858
|
+
<element name="strike">
|
|
859
|
+
<zeroOrMore>
|
|
860
|
+
<choice>
|
|
861
|
+
<ref name="PureTextElement"/>
|
|
862
|
+
<ref name="index"/>
|
|
863
|
+
</choice>
|
|
864
|
+
</zeroOrMore>
|
|
865
|
+
</element>
|
|
866
|
+
</define>
|
|
867
|
+
<define name="underline">
|
|
868
|
+
<element name="underline">
|
|
869
|
+
<zeroOrMore>
|
|
870
|
+
<choice>
|
|
871
|
+
<ref name="PureTextElement"/>
|
|
872
|
+
<ref name="index"/>
|
|
873
|
+
</choice>
|
|
874
|
+
</zeroOrMore>
|
|
875
|
+
</element>
|
|
876
|
+
</define>
|
|
877
|
+
<define name="smallcap">
|
|
878
|
+
<element name="smallcap">
|
|
879
|
+
<zeroOrMore>
|
|
880
|
+
<choice>
|
|
881
|
+
<ref name="PureTextElement"/>
|
|
882
|
+
<ref name="index"/>
|
|
883
|
+
</choice>
|
|
884
|
+
</zeroOrMore>
|
|
885
|
+
</element>
|
|
886
|
+
</define>
|
|
887
|
+
<define name="pagebreak">
|
|
888
|
+
<element name="pagebreak">
|
|
889
|
+
<optional>
|
|
890
|
+
<attribute name="orientation">
|
|
891
|
+
<choice>
|
|
892
|
+
<value>landscape</value>
|
|
893
|
+
<value>portrait</value>
|
|
894
|
+
</choice>
|
|
895
|
+
</attribute>
|
|
896
|
+
</optional>
|
|
897
|
+
</element>
|
|
898
|
+
</define>
|
|
778
899
|
</include>
|
|
779
900
|
<!-- end overrides -->
|
|
901
|
+
<define name="docsubtype">
|
|
902
|
+
<element name="docsubtype">
|
|
903
|
+
<ref name="DocumentSubtype"/>
|
|
904
|
+
</element>
|
|
905
|
+
</define>
|
|
906
|
+
<define name="DocumentSubtype">
|
|
907
|
+
<text/>
|
|
908
|
+
</define>
|
|
780
909
|
<define name="colgroup">
|
|
781
910
|
<element name="colgroup">
|
|
782
911
|
<oneOrMore>
|
|
@@ -793,7 +922,35 @@
|
|
|
793
922
|
<value>internal</value>
|
|
794
923
|
</define>
|
|
795
924
|
<define name="TextElement" combine="choice">
|
|
796
|
-
<
|
|
925
|
+
<choice>
|
|
926
|
+
<ref name="concept"/>
|
|
927
|
+
<ref name="add"/>
|
|
928
|
+
<ref name="del"/>
|
|
929
|
+
</choice>
|
|
930
|
+
</define>
|
|
931
|
+
<define name="add">
|
|
932
|
+
<element name="add">
|
|
933
|
+
<choice>
|
|
934
|
+
<ref name="PureTextElement"/>
|
|
935
|
+
<ref name="eref"/>
|
|
936
|
+
<ref name="stem"/>
|
|
937
|
+
<ref name="keyword"/>
|
|
938
|
+
<ref name="xref"/>
|
|
939
|
+
<ref name="hyperlink"/>
|
|
940
|
+
</choice>
|
|
941
|
+
</element>
|
|
942
|
+
</define>
|
|
943
|
+
<define name="del">
|
|
944
|
+
<element name="del">
|
|
945
|
+
<choice>
|
|
946
|
+
<ref name="PureTextElement"/>
|
|
947
|
+
<ref name="eref"/>
|
|
948
|
+
<ref name="stem"/>
|
|
949
|
+
<ref name="keyword"/>
|
|
950
|
+
<ref name="xref"/>
|
|
951
|
+
<ref name="hyperlink"/>
|
|
952
|
+
</choice>
|
|
953
|
+
</element>
|
|
797
954
|
</define>
|
|
798
955
|
<define name="concept">
|
|
799
956
|
<element name="concept">
|
|
@@ -814,8 +971,170 @@
|
|
|
814
971
|
<ref name="permission"/>
|
|
815
972
|
<ref name="imagemap"/>
|
|
816
973
|
<ref name="svgmap"/>
|
|
974
|
+
<ref name="inputform"/>
|
|
975
|
+
</choice>
|
|
976
|
+
</define>
|
|
977
|
+
<define name="inputform">
|
|
978
|
+
<element name="form">
|
|
979
|
+
<attribute name="id">
|
|
980
|
+
<data type="ID"/>
|
|
981
|
+
</attribute>
|
|
982
|
+
<attribute name="name"/>
|
|
983
|
+
<attribute name="action"/>
|
|
984
|
+
<zeroOrMore>
|
|
985
|
+
<choice>
|
|
986
|
+
<ref name="TextElement"/>
|
|
987
|
+
<ref name="FormInput"/>
|
|
988
|
+
</choice>
|
|
989
|
+
</zeroOrMore>
|
|
990
|
+
</element>
|
|
991
|
+
</define>
|
|
992
|
+
<define name="FormInput">
|
|
993
|
+
<choice>
|
|
994
|
+
<ref name="input"/>
|
|
995
|
+
<ref name="formlabel"/>
|
|
996
|
+
<ref name="select"/>
|
|
997
|
+
<ref name="textarea"/>
|
|
998
|
+
</choice>
|
|
999
|
+
</define>
|
|
1000
|
+
<define name="InputType">
|
|
1001
|
+
<choice>
|
|
1002
|
+
<value>button</value>
|
|
1003
|
+
<value>checkbox</value>
|
|
1004
|
+
<value>date</value>
|
|
1005
|
+
<value>file</value>
|
|
1006
|
+
<value>password</value>
|
|
1007
|
+
<value>radio</value>
|
|
1008
|
+
<value>submit</value>
|
|
1009
|
+
<value>text</value>
|
|
817
1010
|
</choice>
|
|
818
1011
|
</define>
|
|
1012
|
+
<define name="input">
|
|
1013
|
+
<element name="input">
|
|
1014
|
+
<attribute name="type">
|
|
1015
|
+
<ref name="InputType"/>
|
|
1016
|
+
</attribute>
|
|
1017
|
+
<optional>
|
|
1018
|
+
<attribute name="checked">
|
|
1019
|
+
<data type="boolean"/>
|
|
1020
|
+
</attribute>
|
|
1021
|
+
</optional>
|
|
1022
|
+
<optional>
|
|
1023
|
+
<attribute name="disabled">
|
|
1024
|
+
<data type="boolean"/>
|
|
1025
|
+
</attribute>
|
|
1026
|
+
</optional>
|
|
1027
|
+
<optional>
|
|
1028
|
+
<attribute name="readonly">
|
|
1029
|
+
<data type="boolean"/>
|
|
1030
|
+
</attribute>
|
|
1031
|
+
</optional>
|
|
1032
|
+
<optional>
|
|
1033
|
+
<attribute name="maxlength">
|
|
1034
|
+
<data type="int"/>
|
|
1035
|
+
</attribute>
|
|
1036
|
+
</optional>
|
|
1037
|
+
<optional>
|
|
1038
|
+
<attribute name="minlength">
|
|
1039
|
+
<data type="int"/>
|
|
1040
|
+
</attribute>
|
|
1041
|
+
</optional>
|
|
1042
|
+
<optional>
|
|
1043
|
+
<attribute name="name"/>
|
|
1044
|
+
</optional>
|
|
1045
|
+
<optional>
|
|
1046
|
+
<attribute name="value"/>
|
|
1047
|
+
</optional>
|
|
1048
|
+
<optional>
|
|
1049
|
+
<attribute name="id">
|
|
1050
|
+
<data type="ID"/>
|
|
1051
|
+
</attribute>
|
|
1052
|
+
</optional>
|
|
1053
|
+
</element>
|
|
1054
|
+
</define>
|
|
1055
|
+
<define name="formlabel">
|
|
1056
|
+
<element name="label">
|
|
1057
|
+
<attribute name="for">
|
|
1058
|
+
<data type="IDREF"/>
|
|
1059
|
+
</attribute>
|
|
1060
|
+
<zeroOrMore>
|
|
1061
|
+
<ref name="PureTextElement"/>
|
|
1062
|
+
</zeroOrMore>
|
|
1063
|
+
</element>
|
|
1064
|
+
</define>
|
|
1065
|
+
<define name="select">
|
|
1066
|
+
<element name="select">
|
|
1067
|
+
<optional>
|
|
1068
|
+
<attribute name="name"/>
|
|
1069
|
+
</optional>
|
|
1070
|
+
<optional>
|
|
1071
|
+
<attribute name="value"/>
|
|
1072
|
+
</optional>
|
|
1073
|
+
<optional>
|
|
1074
|
+
<attribute name="id">
|
|
1075
|
+
<data type="ID"/>
|
|
1076
|
+
</attribute>
|
|
1077
|
+
</optional>
|
|
1078
|
+
<optional>
|
|
1079
|
+
<attribute name="disabled">
|
|
1080
|
+
<data type="boolean"/>
|
|
1081
|
+
</attribute>
|
|
1082
|
+
</optional>
|
|
1083
|
+
<optional>
|
|
1084
|
+
<attribute name="multiple">
|
|
1085
|
+
<data type="boolean"/>
|
|
1086
|
+
</attribute>
|
|
1087
|
+
</optional>
|
|
1088
|
+
<optional>
|
|
1089
|
+
<attribute name="size">
|
|
1090
|
+
<data type="int"/>
|
|
1091
|
+
</attribute>
|
|
1092
|
+
</optional>
|
|
1093
|
+
<oneOrMore>
|
|
1094
|
+
<ref name="option"/>
|
|
1095
|
+
</oneOrMore>
|
|
1096
|
+
</element>
|
|
1097
|
+
</define>
|
|
1098
|
+
<define name="option">
|
|
1099
|
+
<element name="option">
|
|
1100
|
+
<optional>
|
|
1101
|
+
<attribute name="disabled">
|
|
1102
|
+
<data type="boolean"/>
|
|
1103
|
+
</attribute>
|
|
1104
|
+
</optional>
|
|
1105
|
+
<optional>
|
|
1106
|
+
<attribute name="value"/>
|
|
1107
|
+
</optional>
|
|
1108
|
+
<zeroOrMore>
|
|
1109
|
+
<ref name="PureTextElement"/>
|
|
1110
|
+
</zeroOrMore>
|
|
1111
|
+
</element>
|
|
1112
|
+
</define>
|
|
1113
|
+
<define name="textarea">
|
|
1114
|
+
<element name="textarea">
|
|
1115
|
+
<optional>
|
|
1116
|
+
<attribute name="name"/>
|
|
1117
|
+
</optional>
|
|
1118
|
+
<optional>
|
|
1119
|
+
<attribute name="value"/>
|
|
1120
|
+
</optional>
|
|
1121
|
+
<optional>
|
|
1122
|
+
<attribute name="id">
|
|
1123
|
+
<data type="ID"/>
|
|
1124
|
+
</attribute>
|
|
1125
|
+
</optional>
|
|
1126
|
+
<optional>
|
|
1127
|
+
<attribute name="rows">
|
|
1128
|
+
<data type="int"/>
|
|
1129
|
+
</attribute>
|
|
1130
|
+
</optional>
|
|
1131
|
+
<optional>
|
|
1132
|
+
<attribute name="cols">
|
|
1133
|
+
<data type="int"/>
|
|
1134
|
+
</attribute>
|
|
1135
|
+
</optional>
|
|
1136
|
+
</element>
|
|
1137
|
+
</define>
|
|
819
1138
|
<define name="bibliography">
|
|
820
1139
|
<element name="bibliography">
|
|
821
1140
|
<oneOrMore>
|
|
@@ -888,9 +1207,7 @@
|
|
|
888
1207
|
</define>
|
|
889
1208
|
<define name="IsoWorkgroup">
|
|
890
1209
|
<optional>
|
|
891
|
-
<attribute name="number"
|
|
892
|
-
<data type="int"/>
|
|
893
|
-
</attribute>
|
|
1210
|
+
<attribute name="number"/>
|
|
894
1211
|
</optional>
|
|
895
1212
|
<optional>
|
|
896
1213
|
<attribute name="type"/>
|