metanorma-ietf 2.0.8 → 2.0.9
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/workflows/macos.yml +1 -1
- data/.github/workflows/ubuntu.yml +1 -1
- data/.github/workflows/windows.yml +2 -2
- data/lib/asciidoctor/ietf/biblio.rng +53 -26
- data/lib/asciidoctor/ietf/front.rb +3 -2
- data/lib/asciidoctor/ietf/isodoc.rng +28 -1
- data/lib/metanorma/ietf/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 92a8d58a02cc6332c80b36992ae11a45d2e02dfcb91e0860bdb32b9c8e6dbee6
|
|
4
|
+
data.tar.gz: d28dd2d10743ffa9ae288233baaefd67177949d42cb0f2e0c7e1acfd661d67c8
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: ec16d52d328daf9f8d25850d38e27f49660bf75e6e120227dc8f23f3bf97e0aea962640a95fa2a99f994460298d32dabbe54845e49e30b37a2fa4788a22e225e
|
|
7
|
+
data.tar.gz: d726f6e9828215b0ad1b6a22b7d9b663995f875d6210077fa4f86140b9e7e26000f031eba5f61cf029e99cb4df01417825904f3f5dce17c689bd7c28fa39fd4f
|
data/.github/workflows/macos.yml
CHANGED
|
@@ -37,11 +37,11 @@ jobs:
|
|
|
37
37
|
- name: Use Python
|
|
38
38
|
uses: actions/setup-python@v1
|
|
39
39
|
with:
|
|
40
|
-
ruby-version: '
|
|
40
|
+
ruby-version: '3.6'
|
|
41
41
|
architecture: 'x64'
|
|
42
42
|
- name: Install xml2rfc
|
|
43
43
|
run: |
|
|
44
44
|
pip install xml2rfc
|
|
45
45
|
- name: Run specs
|
|
46
46
|
run: |
|
|
47
|
-
bundle exec rake
|
|
47
|
+
bundle exec rake
|
|
@@ -767,6 +767,8 @@
|
|
|
767
767
|
<value>unchanged</value>
|
|
768
768
|
<value>circulated</value>
|
|
769
769
|
<value>adapted</value>
|
|
770
|
+
<value>vote-started</value>
|
|
771
|
+
<value>vote-ended</value>
|
|
770
772
|
</choice>
|
|
771
773
|
</define>
|
|
772
774
|
<define name="bdate">
|
|
@@ -1019,38 +1021,63 @@
|
|
|
1019
1021
|
</define>
|
|
1020
1022
|
<define name="DocRelationType">
|
|
1021
1023
|
<choice>
|
|
1022
|
-
<value>obsoletes</value>
|
|
1023
|
-
<value>obsoletedBy</value>
|
|
1024
|
-
<value>supersedes</value>
|
|
1025
|
-
<value>supersededBy</value>
|
|
1026
|
-
<value>updates</value>
|
|
1027
|
-
<value>updatedBy</value>
|
|
1028
|
-
<value>complements</value>
|
|
1029
|
-
<value>derivedFrom</value>
|
|
1030
|
-
<value>translatedFrom</value>
|
|
1031
|
-
<value>hasTranslation</value>
|
|
1032
|
-
<value>adoptedFrom</value>
|
|
1033
|
-
<value>equivalent</value>
|
|
1034
|
-
<value>identical</value>
|
|
1035
|
-
<value>nonequivalent</value>
|
|
1036
|
-
<value>includedIn</value>
|
|
1037
1024
|
<value>includes</value>
|
|
1038
|
-
<value>
|
|
1039
|
-
<value>instanceOf</value>
|
|
1040
|
-
<value>partOf</value>
|
|
1025
|
+
<value>includedIn</value>
|
|
1041
1026
|
<value>hasPart</value>
|
|
1042
|
-
<value>
|
|
1043
|
-
<value>draftOf</value>
|
|
1027
|
+
<value>partOf</value>
|
|
1044
1028
|
<value>merges</value>
|
|
1029
|
+
<value>mergedInto</value>
|
|
1045
1030
|
<value>splits</value>
|
|
1046
|
-
<value>
|
|
1047
|
-
<value>
|
|
1048
|
-
<value>
|
|
1049
|
-
<value>
|
|
1050
|
-
<value>
|
|
1051
|
-
<value>
|
|
1031
|
+
<value>splitInto</value>
|
|
1032
|
+
<value>instance</value>
|
|
1033
|
+
<value>hasInstance</value>
|
|
1034
|
+
<value>exemplarOf</value>
|
|
1035
|
+
<value>hasExemplar</value>
|
|
1036
|
+
<value>manifestationOf</value>
|
|
1037
|
+
<value>hasManifestation</value>
|
|
1038
|
+
<value>reproductionOf</value>
|
|
1039
|
+
<value>hasReproduction</value>
|
|
1040
|
+
<value>reprintOf</value>
|
|
1041
|
+
<value>hasReprint</value>
|
|
1042
|
+
<value>expressionOf</value>
|
|
1043
|
+
<value>hasExpression</value>
|
|
1044
|
+
<value>translatedFrom</value>
|
|
1045
|
+
<value>hasTranslation</value>
|
|
1046
|
+
<value>arrangementOf</value>
|
|
1047
|
+
<value>hasArrangement</value>
|
|
1048
|
+
<value>abridgementOf</value>
|
|
1049
|
+
<value>hasAbridgement</value>
|
|
1050
|
+
<value>annotationOf</value>
|
|
1051
|
+
<value>hasAnnotation</value>
|
|
1052
|
+
<value>draftOf</value>
|
|
1053
|
+
<value>hasDraft</value>
|
|
1054
|
+
<value>editionOf</value>
|
|
1055
|
+
<value>hasEdition</value>
|
|
1056
|
+
<value>updates</value>
|
|
1057
|
+
<value>updatedBy</value>
|
|
1058
|
+
<value>derivedFrom</value>
|
|
1059
|
+
<value>derives</value>
|
|
1052
1060
|
<value>describes</value>
|
|
1053
1061
|
<value>describedBy</value>
|
|
1062
|
+
<value>catalogues</value>
|
|
1063
|
+
<value>cataloguedBy</value>
|
|
1064
|
+
<value>hasSuccessor</value>
|
|
1065
|
+
<value>successorOf</value>
|
|
1066
|
+
<value>adaptedFrom</value>
|
|
1067
|
+
<value>hasAdaptation</value>
|
|
1068
|
+
<value>adoptedFrom</value>
|
|
1069
|
+
<value>adoptedAs</value>
|
|
1070
|
+
<value>reviewOf</value>
|
|
1071
|
+
<value>hasReview</value>
|
|
1072
|
+
<value>commentaryOf</value>
|
|
1073
|
+
<value>hasCommentary</value>
|
|
1074
|
+
<value>related</value>
|
|
1075
|
+
<value>complements</value>
|
|
1076
|
+
<value>complementOf</value>
|
|
1077
|
+
<value>obsoletes</value>
|
|
1078
|
+
<value>obsoletedBy</value>
|
|
1079
|
+
<value>cited</value>
|
|
1080
|
+
<value>isCitedIn</value>
|
|
1054
1081
|
</choice>
|
|
1055
1082
|
</define>
|
|
1056
1083
|
<define name="docrelation">
|
|
@@ -57,8 +57,9 @@ module Asciidoctor
|
|
|
57
57
|
["en"].each do |lang|
|
|
58
58
|
at = { language: lang, format: "text/plain" }
|
|
59
59
|
xml.title **attr_code(at.merge(type: "main")) do |t|
|
|
60
|
-
t << ::Asciidoctor::Standoc::Utils::asciidoc_sub(
|
|
61
|
-
|
|
60
|
+
t << (::Asciidoctor::Standoc::Utils::asciidoc_sub(node.attr("title")) ||
|
|
61
|
+
::Asciidoctor::Standoc::Utils::asciidoc_sub(node.attr("title-en")) ||
|
|
62
|
+
node.title)
|
|
62
63
|
end
|
|
63
64
|
a = node.attr("abbrev") and
|
|
64
65
|
xml.title a, **attr_code(at.merge(type: "abbrev"))
|
|
@@ -303,8 +303,23 @@
|
|
|
303
303
|
<ref name="paragraph"/>
|
|
304
304
|
</element>
|
|
305
305
|
</define>
|
|
306
|
+
<define name="TextElement" combine="choice">
|
|
307
|
+
<ref name="concept"/>
|
|
308
|
+
</define>
|
|
306
309
|
</include>
|
|
307
310
|
<!-- end overrides -->
|
|
311
|
+
<define name="concept">
|
|
312
|
+
<element name="concept">
|
|
313
|
+
<optional>
|
|
314
|
+
<attribute name="term"/>
|
|
315
|
+
</optional>
|
|
316
|
+
<choice>
|
|
317
|
+
<ref name="eref"/>
|
|
318
|
+
<ref name="xref"/>
|
|
319
|
+
<ref name="termref"/>
|
|
320
|
+
</choice>
|
|
321
|
+
</element>
|
|
322
|
+
</define>
|
|
308
323
|
<define name="BasicBlock" combine="choice">
|
|
309
324
|
<choice>
|
|
310
325
|
<ref name="requirement"/>
|
|
@@ -911,7 +926,10 @@
|
|
|
911
926
|
</define>
|
|
912
927
|
<define name="origin">
|
|
913
928
|
<element name="origin">
|
|
914
|
-
<
|
|
929
|
+
<choice>
|
|
930
|
+
<ref name="erefType"/>
|
|
931
|
+
<ref name="termref"/>
|
|
932
|
+
</choice>
|
|
915
933
|
</element>
|
|
916
934
|
</define>
|
|
917
935
|
<define name="modification">
|
|
@@ -919,6 +937,15 @@
|
|
|
919
937
|
<ref name="paragraph"/>
|
|
920
938
|
</element>
|
|
921
939
|
</define>
|
|
940
|
+
<define name="termref">
|
|
941
|
+
<element name="termref">
|
|
942
|
+
<attribute name="base"/>
|
|
943
|
+
<attribute name="target"/>
|
|
944
|
+
<optional>
|
|
945
|
+
<text/>
|
|
946
|
+
</optional>
|
|
947
|
+
</element>
|
|
948
|
+
</define>
|
|
922
949
|
<define name="structuredidentifier">
|
|
923
950
|
<element name="structuredidentifier">
|
|
924
951
|
<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: 2.0.
|
|
4
|
+
version: 2.0.9
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Ribose Inc.
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: exe
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2020-
|
|
11
|
+
date: 2020-05-01 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: metanorma-standoc
|