metanorma-un 0.5.14 → 0.6.2
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 +9 -32
- data/.gitignore +2 -0
- data/.rubocop.yml +6 -4
- data/lib/asciidoctor/un/biblio.rng +4 -6
- data/lib/asciidoctor/un/isodoc.rng +327 -2
- data/lib/isodoc/un/html/htmlstyle.css +7 -0
- data/lib/isodoc/un/html_convert.rb +0 -1
- data/lib/isodoc/un/un.plenary-attachment.xsl +653 -127
- data/lib/isodoc/un/un.plenary.xsl +653 -127
- data/lib/isodoc/un/un.recommendation.xsl +656 -130
- data/lib/metanorma/un/version.rb +1 -1
- data/metanorma-unece.gemspec +7 -7
- metadata +29 -29
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: ac07ef36025bf48f602b707379d4b10aff6d5acee7e2cb8fb3f22229c123aaeb
|
|
4
|
+
data.tar.gz: 15e6019bbc953ff7dcfc98199f006c79b06f222986a0cc86081ab0b2226d9168
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: cdadfe44c99f83c5f209fa56e1d65e92d1a36368e019eb50273ee0cde17df9276165152e9f470c38af6e18c3fee52e46354fd4589f8e2f37f19edd0c1497eb7d
|
|
7
|
+
data.tar.gz: '09730915844ff8c66f922138c6fa4c551f5351313551180a29181690ea73ecdac94b889948bdd30b7d4e31f3ecb79c41fb4174ccd6eb0d35969bbfe1a6fa0462'
|
data/.github/workflows/rake.yml
CHANGED
|
@@ -4,7 +4,7 @@ name: rake
|
|
|
4
4
|
|
|
5
5
|
on:
|
|
6
6
|
push:
|
|
7
|
-
branches: [ master, main
|
|
7
|
+
branches: [ master, main ]
|
|
8
8
|
tags: [ v* ]
|
|
9
9
|
pull_request:
|
|
10
10
|
|
|
@@ -16,50 +16,27 @@ jobs:
|
|
|
16
16
|
strategy:
|
|
17
17
|
fail-fast: false
|
|
18
18
|
matrix:
|
|
19
|
-
ruby: [ '2.6', '2.5', '2.4' ]
|
|
19
|
+
ruby: [ '2.7', '2.6', '2.5', '2.4' ]
|
|
20
20
|
os: [ ubuntu-latest, windows-latest, macos-latest ]
|
|
21
21
|
experimental: [ false ]
|
|
22
22
|
include:
|
|
23
|
-
- ruby: '
|
|
23
|
+
- ruby: '3.0'
|
|
24
24
|
os: 'ubuntu-latest'
|
|
25
25
|
experimental: true
|
|
26
|
-
- ruby: '
|
|
26
|
+
- ruby: '3.0'
|
|
27
27
|
os: 'windows-latest'
|
|
28
28
|
experimental: true
|
|
29
|
-
- ruby: '
|
|
29
|
+
- ruby: '3.0'
|
|
30
30
|
os: 'macos-latest'
|
|
31
31
|
experimental: true
|
|
32
32
|
steps:
|
|
33
|
-
- uses: actions/checkout@
|
|
33
|
+
- uses: actions/checkout@v2
|
|
34
|
+
with:
|
|
35
|
+
submodules: true
|
|
34
36
|
|
|
35
37
|
- uses: ruby/setup-ruby@v1
|
|
36
38
|
with:
|
|
37
39
|
ruby-version: ${{ matrix.ruby }}
|
|
38
|
-
|
|
39
|
-
- if: matrix.os == 'macos-latest'
|
|
40
|
-
run: brew install autoconf automake libtool
|
|
41
|
-
|
|
42
|
-
- uses: actions/cache@v2
|
|
43
|
-
with:
|
|
44
|
-
path: vendor/bundle
|
|
45
|
-
key: bundle-${{ matrix.os }}-${{ matrix.ruby }}-${{ hashFiles('**/*.gemspec') }}
|
|
46
|
-
restore-keys: bundle-${{ matrix.os }}-${{ matrix.ruby }}
|
|
47
|
-
|
|
48
|
-
- run: bundle config set path 'vendor/bundle'
|
|
49
|
-
|
|
50
|
-
- run: bundle install --jobs 4 --retry 3
|
|
40
|
+
bundler-cache: true
|
|
51
41
|
|
|
52
42
|
- run: bundle exec rake
|
|
53
|
-
|
|
54
|
-
tests-passed:
|
|
55
|
-
needs: rake
|
|
56
|
-
runs-on: ubuntu-latest
|
|
57
|
-
steps:
|
|
58
|
-
- name: Trigger tests passed event
|
|
59
|
-
uses: Sibz/github-status-action@v1
|
|
60
|
-
with:
|
|
61
|
-
authToken: ${{ secrets.METANORMA_CI_PAT_TOKEN || secrets.GITHUB_TOKEN }}
|
|
62
|
-
context: 'tests-passed-successfully'
|
|
63
|
-
description: 'Tests passed successfully'
|
|
64
|
-
state: 'success'
|
|
65
|
-
sha: ${{ github.event.pull_request.head.sha || github.sha }}
|
data/.gitignore
CHANGED
data/.rubocop.yml
CHANGED
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
# This project follows the Ribose OSS style guide.
|
|
2
2
|
# https://github.com/riboseinc/oss-guides
|
|
3
3
|
# All project-specific additions and overrides should be specified in this file.
|
|
4
|
-
|
|
5
4
|
inherit_from:
|
|
6
5
|
- https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
|
|
6
|
+
|
|
7
|
+
# local repo-specific modifications
|
|
8
|
+
|
|
7
9
|
AllCops:
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
10
|
+
DisplayCopNames: false
|
|
11
|
+
StyleGuideCopsOnly: false
|
|
12
|
+
TargetRubyVersion: 2.4
|
|
@@ -124,7 +124,7 @@
|
|
|
124
124
|
<value>application/tei+xml</value>
|
|
125
125
|
<value>text/x-asciidoc</value>
|
|
126
126
|
<value>text/markdown</value>
|
|
127
|
-
<value>application/x-
|
|
127
|
+
<value>application/x-metanorma+xml</value>
|
|
128
128
|
<text/>
|
|
129
129
|
</choice>
|
|
130
130
|
</attribute>
|
|
@@ -452,6 +452,7 @@
|
|
|
452
452
|
<attribute name="type">
|
|
453
453
|
<choice>
|
|
454
454
|
<value>isni</value>
|
|
455
|
+
<value>orcid</value>
|
|
455
456
|
<value>uri</value>
|
|
456
457
|
</choice>
|
|
457
458
|
</attribute>
|
|
@@ -461,10 +462,7 @@
|
|
|
461
462
|
<define name="org-identifier">
|
|
462
463
|
<element name="identifier">
|
|
463
464
|
<attribute name="type">
|
|
464
|
-
<
|
|
465
|
-
<value>orcid</value>
|
|
466
|
-
<value>uri</value>
|
|
467
|
-
</choice>
|
|
465
|
+
<data type="string" datatypeLibrary=""/>
|
|
468
466
|
</attribute>
|
|
469
467
|
<text/>
|
|
470
468
|
</element>
|
|
@@ -1106,7 +1104,7 @@
|
|
|
1106
1104
|
<value>complementOf</value>
|
|
1107
1105
|
<value>obsoletes</value>
|
|
1108
1106
|
<value>obsoletedBy</value>
|
|
1109
|
-
<value>
|
|
1107
|
+
<value>cites</value>
|
|
1110
1108
|
<value>isCitedIn</value>
|
|
1111
1109
|
</choice>
|
|
1112
1110
|
</define>
|
|
@@ -86,6 +86,35 @@
|
|
|
86
86
|
<text/>
|
|
87
87
|
</element>
|
|
88
88
|
</define>
|
|
89
|
+
<define name="erefType">
|
|
90
|
+
<optional>
|
|
91
|
+
<attribute name="normative">
|
|
92
|
+
<data type="boolean"/>
|
|
93
|
+
</attribute>
|
|
94
|
+
</optional>
|
|
95
|
+
<attribute name="citeas"/>
|
|
96
|
+
<attribute name="type">
|
|
97
|
+
<ref name="ReferenceFormat"/>
|
|
98
|
+
</attribute>
|
|
99
|
+
<optional>
|
|
100
|
+
<attribute name="alt"/>
|
|
101
|
+
</optional>
|
|
102
|
+
<optional>
|
|
103
|
+
<attribute name="case">
|
|
104
|
+
<choice>
|
|
105
|
+
<value>capital</value>
|
|
106
|
+
<value>lowercase</value>
|
|
107
|
+
</choice>
|
|
108
|
+
</attribute>
|
|
109
|
+
</optional>
|
|
110
|
+
<optional>
|
|
111
|
+
<attribute name="droploc">
|
|
112
|
+
<data type="boolean"/>
|
|
113
|
+
</attribute>
|
|
114
|
+
</optional>
|
|
115
|
+
<ref name="CitationType"/>
|
|
116
|
+
<text/>
|
|
117
|
+
</define>
|
|
89
118
|
<define name="ul">
|
|
90
119
|
<element name="ul">
|
|
91
120
|
<attribute name="id">
|
|
@@ -102,7 +131,7 @@
|
|
|
102
131
|
</attribute>
|
|
103
132
|
</optional>
|
|
104
133
|
<oneOrMore>
|
|
105
|
-
<ref name="
|
|
134
|
+
<ref name="ul_li"/>
|
|
106
135
|
</oneOrMore>
|
|
107
136
|
<zeroOrMore>
|
|
108
137
|
<ref name="note"/>
|
|
@@ -775,6 +804,90 @@
|
|
|
775
804
|
<ref name="paragraph"/>
|
|
776
805
|
</element>
|
|
777
806
|
</define>
|
|
807
|
+
<define name="em">
|
|
808
|
+
<element name="em">
|
|
809
|
+
<zeroOrMore>
|
|
810
|
+
<choice>
|
|
811
|
+
<ref name="PureTextElement"/>
|
|
812
|
+
<ref name="stem"/>
|
|
813
|
+
<ref name="index"/>
|
|
814
|
+
</choice>
|
|
815
|
+
</zeroOrMore>
|
|
816
|
+
</element>
|
|
817
|
+
</define>
|
|
818
|
+
<define name="strong">
|
|
819
|
+
<element name="strong">
|
|
820
|
+
<zeroOrMore>
|
|
821
|
+
<choice>
|
|
822
|
+
<ref name="PureTextElement"/>
|
|
823
|
+
<ref name="stem"/>
|
|
824
|
+
<ref name="index"/>
|
|
825
|
+
</choice>
|
|
826
|
+
</zeroOrMore>
|
|
827
|
+
</element>
|
|
828
|
+
</define>
|
|
829
|
+
<define name="tt">
|
|
830
|
+
<element name="tt">
|
|
831
|
+
<zeroOrMore>
|
|
832
|
+
<choice>
|
|
833
|
+
<ref name="PureTextElement"/>
|
|
834
|
+
<ref name="index"/>
|
|
835
|
+
</choice>
|
|
836
|
+
</zeroOrMore>
|
|
837
|
+
</element>
|
|
838
|
+
</define>
|
|
839
|
+
<define name="keyword">
|
|
840
|
+
<element name="keyword">
|
|
841
|
+
<zeroOrMore>
|
|
842
|
+
<choice>
|
|
843
|
+
<ref name="PureTextElement"/>
|
|
844
|
+
<ref name="index"/>
|
|
845
|
+
</choice>
|
|
846
|
+
</zeroOrMore>
|
|
847
|
+
</element>
|
|
848
|
+
</define>
|
|
849
|
+
<define name="strike">
|
|
850
|
+
<element name="strike">
|
|
851
|
+
<zeroOrMore>
|
|
852
|
+
<choice>
|
|
853
|
+
<ref name="PureTextElement"/>
|
|
854
|
+
<ref name="index"/>
|
|
855
|
+
</choice>
|
|
856
|
+
</zeroOrMore>
|
|
857
|
+
</element>
|
|
858
|
+
</define>
|
|
859
|
+
<define name="underline">
|
|
860
|
+
<element name="underline">
|
|
861
|
+
<zeroOrMore>
|
|
862
|
+
<choice>
|
|
863
|
+
<ref name="PureTextElement"/>
|
|
864
|
+
<ref name="index"/>
|
|
865
|
+
</choice>
|
|
866
|
+
</zeroOrMore>
|
|
867
|
+
</element>
|
|
868
|
+
</define>
|
|
869
|
+
<define name="smallcap">
|
|
870
|
+
<element name="smallcap">
|
|
871
|
+
<zeroOrMore>
|
|
872
|
+
<choice>
|
|
873
|
+
<ref name="PureTextElement"/>
|
|
874
|
+
<ref name="index"/>
|
|
875
|
+
</choice>
|
|
876
|
+
</zeroOrMore>
|
|
877
|
+
</element>
|
|
878
|
+
</define>
|
|
879
|
+
<define name="pagebreak">
|
|
880
|
+
<element name="pagebreak">
|
|
881
|
+
<optional>
|
|
882
|
+
<attribute name="orientation">
|
|
883
|
+
<choice>
|
|
884
|
+
<value>landscape</value>
|
|
885
|
+
<value>portrait</value>
|
|
886
|
+
</choice>
|
|
887
|
+
</attribute>
|
|
888
|
+
</optional>
|
|
889
|
+
</element>
|
|
890
|
+
</define>
|
|
778
891
|
</include>
|
|
779
892
|
<!-- end overrides -->
|
|
780
893
|
<define name="colgroup">
|
|
@@ -793,7 +906,35 @@
|
|
|
793
906
|
<value>internal</value>
|
|
794
907
|
</define>
|
|
795
908
|
<define name="TextElement" combine="choice">
|
|
796
|
-
<
|
|
909
|
+
<choice>
|
|
910
|
+
<ref name="concept"/>
|
|
911
|
+
<ref name="add"/>
|
|
912
|
+
<ref name="del"/>
|
|
913
|
+
</choice>
|
|
914
|
+
</define>
|
|
915
|
+
<define name="add">
|
|
916
|
+
<element name="add">
|
|
917
|
+
<choice>
|
|
918
|
+
<ref name="PureTextElement"/>
|
|
919
|
+
<ref name="eref"/>
|
|
920
|
+
<ref name="stem"/>
|
|
921
|
+
<ref name="keyword"/>
|
|
922
|
+
<ref name="xref"/>
|
|
923
|
+
<ref name="hyperlink"/>
|
|
924
|
+
</choice>
|
|
925
|
+
</element>
|
|
926
|
+
</define>
|
|
927
|
+
<define name="del">
|
|
928
|
+
<element name="del">
|
|
929
|
+
<choice>
|
|
930
|
+
<ref name="PureTextElement"/>
|
|
931
|
+
<ref name="eref"/>
|
|
932
|
+
<ref name="stem"/>
|
|
933
|
+
<ref name="keyword"/>
|
|
934
|
+
<ref name="xref"/>
|
|
935
|
+
<ref name="hyperlink"/>
|
|
936
|
+
</choice>
|
|
937
|
+
</element>
|
|
797
938
|
</define>
|
|
798
939
|
<define name="concept">
|
|
799
940
|
<element name="concept">
|
|
@@ -814,8 +955,170 @@
|
|
|
814
955
|
<ref name="permission"/>
|
|
815
956
|
<ref name="imagemap"/>
|
|
816
957
|
<ref name="svgmap"/>
|
|
958
|
+
<ref name="inputform"/>
|
|
959
|
+
</choice>
|
|
960
|
+
</define>
|
|
961
|
+
<define name="inputform">
|
|
962
|
+
<element name="form">
|
|
963
|
+
<attribute name="id">
|
|
964
|
+
<data type="ID"/>
|
|
965
|
+
</attribute>
|
|
966
|
+
<attribute name="name"/>
|
|
967
|
+
<attribute name="action"/>
|
|
968
|
+
<zeroOrMore>
|
|
969
|
+
<choice>
|
|
970
|
+
<ref name="TextElement"/>
|
|
971
|
+
<ref name="FormInput"/>
|
|
972
|
+
</choice>
|
|
973
|
+
</zeroOrMore>
|
|
974
|
+
</element>
|
|
975
|
+
</define>
|
|
976
|
+
<define name="FormInput">
|
|
977
|
+
<choice>
|
|
978
|
+
<ref name="input"/>
|
|
979
|
+
<ref name="formlabel"/>
|
|
980
|
+
<ref name="select"/>
|
|
981
|
+
<ref name="textarea"/>
|
|
982
|
+
</choice>
|
|
983
|
+
</define>
|
|
984
|
+
<define name="InputType">
|
|
985
|
+
<choice>
|
|
986
|
+
<value>button</value>
|
|
987
|
+
<value>checkbox</value>
|
|
988
|
+
<value>date</value>
|
|
989
|
+
<value>file</value>
|
|
990
|
+
<value>password</value>
|
|
991
|
+
<value>radio</value>
|
|
992
|
+
<value>submit</value>
|
|
993
|
+
<value>text</value>
|
|
817
994
|
</choice>
|
|
818
995
|
</define>
|
|
996
|
+
<define name="input">
|
|
997
|
+
<element name="input">
|
|
998
|
+
<attribute name="type">
|
|
999
|
+
<ref name="InputType"/>
|
|
1000
|
+
</attribute>
|
|
1001
|
+
<optional>
|
|
1002
|
+
<attribute name="checked">
|
|
1003
|
+
<data type="boolean"/>
|
|
1004
|
+
</attribute>
|
|
1005
|
+
</optional>
|
|
1006
|
+
<optional>
|
|
1007
|
+
<attribute name="disabled">
|
|
1008
|
+
<data type="boolean"/>
|
|
1009
|
+
</attribute>
|
|
1010
|
+
</optional>
|
|
1011
|
+
<optional>
|
|
1012
|
+
<attribute name="readonly">
|
|
1013
|
+
<data type="boolean"/>
|
|
1014
|
+
</attribute>
|
|
1015
|
+
</optional>
|
|
1016
|
+
<optional>
|
|
1017
|
+
<attribute name="maxlength">
|
|
1018
|
+
<data type="int"/>
|
|
1019
|
+
</attribute>
|
|
1020
|
+
</optional>
|
|
1021
|
+
<optional>
|
|
1022
|
+
<attribute name="minlength">
|
|
1023
|
+
<data type="int"/>
|
|
1024
|
+
</attribute>
|
|
1025
|
+
</optional>
|
|
1026
|
+
<optional>
|
|
1027
|
+
<attribute name="name"/>
|
|
1028
|
+
</optional>
|
|
1029
|
+
<optional>
|
|
1030
|
+
<attribute name="value"/>
|
|
1031
|
+
</optional>
|
|
1032
|
+
<optional>
|
|
1033
|
+
<attribute name="id">
|
|
1034
|
+
<data type="ID"/>
|
|
1035
|
+
</attribute>
|
|
1036
|
+
</optional>
|
|
1037
|
+
</element>
|
|
1038
|
+
</define>
|
|
1039
|
+
<define name="formlabel">
|
|
1040
|
+
<element name="label">
|
|
1041
|
+
<attribute name="for">
|
|
1042
|
+
<data type="IDREF"/>
|
|
1043
|
+
</attribute>
|
|
1044
|
+
<zeroOrMore>
|
|
1045
|
+
<ref name="PureTextElement"/>
|
|
1046
|
+
</zeroOrMore>
|
|
1047
|
+
</element>
|
|
1048
|
+
</define>
|
|
1049
|
+
<define name="select">
|
|
1050
|
+
<element name="select">
|
|
1051
|
+
<optional>
|
|
1052
|
+
<attribute name="name"/>
|
|
1053
|
+
</optional>
|
|
1054
|
+
<optional>
|
|
1055
|
+
<attribute name="value"/>
|
|
1056
|
+
</optional>
|
|
1057
|
+
<optional>
|
|
1058
|
+
<attribute name="id">
|
|
1059
|
+
<data type="ID"/>
|
|
1060
|
+
</attribute>
|
|
1061
|
+
</optional>
|
|
1062
|
+
<optional>
|
|
1063
|
+
<attribute name="disabled">
|
|
1064
|
+
<data type="boolean"/>
|
|
1065
|
+
</attribute>
|
|
1066
|
+
</optional>
|
|
1067
|
+
<optional>
|
|
1068
|
+
<attribute name="multiple">
|
|
1069
|
+
<data type="boolean"/>
|
|
1070
|
+
</attribute>
|
|
1071
|
+
</optional>
|
|
1072
|
+
<optional>
|
|
1073
|
+
<attribute name="size">
|
|
1074
|
+
<data type="int"/>
|
|
1075
|
+
</attribute>
|
|
1076
|
+
</optional>
|
|
1077
|
+
<oneOrMore>
|
|
1078
|
+
<ref name="option"/>
|
|
1079
|
+
</oneOrMore>
|
|
1080
|
+
</element>
|
|
1081
|
+
</define>
|
|
1082
|
+
<define name="option">
|
|
1083
|
+
<element name="option">
|
|
1084
|
+
<optional>
|
|
1085
|
+
<attribute name="disabled">
|
|
1086
|
+
<data type="boolean"/>
|
|
1087
|
+
</attribute>
|
|
1088
|
+
</optional>
|
|
1089
|
+
<optional>
|
|
1090
|
+
<attribute name="value"/>
|
|
1091
|
+
</optional>
|
|
1092
|
+
<zeroOrMore>
|
|
1093
|
+
<ref name="PureTextElement"/>
|
|
1094
|
+
</zeroOrMore>
|
|
1095
|
+
</element>
|
|
1096
|
+
</define>
|
|
1097
|
+
<define name="textarea">
|
|
1098
|
+
<element name="textarea">
|
|
1099
|
+
<optional>
|
|
1100
|
+
<attribute name="name"/>
|
|
1101
|
+
</optional>
|
|
1102
|
+
<optional>
|
|
1103
|
+
<attribute name="value"/>
|
|
1104
|
+
</optional>
|
|
1105
|
+
<optional>
|
|
1106
|
+
<attribute name="id">
|
|
1107
|
+
<data type="ID"/>
|
|
1108
|
+
</attribute>
|
|
1109
|
+
</optional>
|
|
1110
|
+
<optional>
|
|
1111
|
+
<attribute name="rows">
|
|
1112
|
+
<data type="int"/>
|
|
1113
|
+
</attribute>
|
|
1114
|
+
</optional>
|
|
1115
|
+
<optional>
|
|
1116
|
+
<attribute name="cols">
|
|
1117
|
+
<data type="int"/>
|
|
1118
|
+
</attribute>
|
|
1119
|
+
</optional>
|
|
1120
|
+
</element>
|
|
1121
|
+
</define>
|
|
819
1122
|
<define name="bibliography">
|
|
820
1123
|
<element name="bibliography">
|
|
821
1124
|
<oneOrMore>
|
|
@@ -1716,4 +2019,26 @@
|
|
|
1716
2019
|
</zeroOrMore>
|
|
1717
2020
|
</element>
|
|
1718
2021
|
</define>
|
|
2022
|
+
<define name="ul_li">
|
|
2023
|
+
<element name="li">
|
|
2024
|
+
<optional>
|
|
2025
|
+
<attribute name="id">
|
|
2026
|
+
<data type="ID"/>
|
|
2027
|
+
</attribute>
|
|
2028
|
+
</optional>
|
|
2029
|
+
<optional>
|
|
2030
|
+
<attribute name="uncheckedcheckbox">
|
|
2031
|
+
<data type="boolean"/>
|
|
2032
|
+
</attribute>
|
|
2033
|
+
</optional>
|
|
2034
|
+
<optional>
|
|
2035
|
+
<attribute name="checkedcheckbox">
|
|
2036
|
+
<data type="boolean"/>
|
|
2037
|
+
</attribute>
|
|
2038
|
+
</optional>
|
|
2039
|
+
<oneOrMore>
|
|
2040
|
+
<ref name="BasicBlock"/>
|
|
2041
|
+
</oneOrMore>
|
|
2042
|
+
</element>
|
|
2043
|
+
</define>
|
|
1719
2044
|
</grammar>
|