metanorma-bipm 1.1.1 → 1.1.5
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 +12 -11
- data/.gitignore +4 -1
- data/.hound.yml +5 -0
- data/.rubocop.yml +4 -8
- data/Gemfile +2 -2
- data/Rakefile +2 -2
- data/lib/asciidoctor/bipm/biblio.rng +1 -0
- data/lib/asciidoctor/bipm/bipm.rng +3 -0
- data/lib/asciidoctor/bipm/converter.rb +9 -1
- data/lib/asciidoctor/bipm/isodoc.rng +240 -10
- data/lib/isodoc/bipm/base_convert.rb +25 -11
- data/lib/isodoc/bipm/bipm.brochure.xsl +842 -118
- data/lib/isodoc/bipm/bipm.guide.xsl +842 -118
- data/lib/isodoc/bipm/bipm.mise-en-pratique.xsl +842 -118
- data/lib/isodoc/bipm/bipm.rapport.xsl +842 -118
- data/lib/isodoc/bipm/i18n-en.yaml +2 -0
- data/lib/isodoc/bipm/i18n-fr.yaml +2 -0
- data/lib/isodoc/bipm/index.rb +20 -16
- data/lib/isodoc/bipm/init.rb +1 -2
- data/lib/isodoc/bipm/jcgm.standard.xsl +714 -178
- data/lib/isodoc/bipm/presentation_xml_convert.rb +93 -34
- data/lib/isodoc/bipm/xref.rb +30 -7
- data/lib/metanorma-bipm.rb +4 -4
- data/lib/metanorma/bipm/version.rb +1 -1
- data/metanorma-bipm.gemspec +2 -2
- metadata +6 -5
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: ce04d9fdc61d348dfd6047b1ea0ceb1baa3e19ce43234eba3e4e34cd4b919e25
|
|
4
|
+
data.tar.gz: 4a17c9886bb369033e5abed5f4d1b287d3aca8e7bb18e1b3f2b489ee5806b14f
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 5ae9001cd216cf9b16e3561e41707424027a8844a250d5af55ba4f1c1197877f947091877db0d6363932583cd9ea3f7361996facc3124d077dacc5470cd44ea0
|
|
7
|
+
data.tar.gz: 5f3057a4a8666527a916251a659d2f49cd43ebd2d45a9f2e1b280eded7af3c94d2ea9fae8aeed358f4ae0cda4d64f5dcc9e58b6c46444ed6f97283f27cd3f1a8
|
data/.github/workflows/rake.yml
CHANGED
|
@@ -16,19 +16,9 @@ jobs:
|
|
|
16
16
|
strategy:
|
|
17
17
|
fail-fast: false
|
|
18
18
|
matrix:
|
|
19
|
-
ruby: [ '
|
|
19
|
+
ruby: [ '3.0', '2.7', '2.6', '2.5' ]
|
|
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
|
steps:
|
|
33
23
|
- uses: actions/checkout@v2
|
|
34
24
|
with:
|
|
@@ -40,3 +30,14 @@ jobs:
|
|
|
40
30
|
bundler-cache: true
|
|
41
31
|
|
|
42
32
|
- run: bundle exec rake
|
|
33
|
+
|
|
34
|
+
tests-passed:
|
|
35
|
+
needs: rake
|
|
36
|
+
runs-on: ubuntu-latest
|
|
37
|
+
steps:
|
|
38
|
+
- uses: peter-evans/repository-dispatch@v1
|
|
39
|
+
with:
|
|
40
|
+
token: ${{ secrets.METANORMA_CI_PAT_TOKEN || secrets.GITHUB_TOKEN }}
|
|
41
|
+
repository: ${{ github.repository }}
|
|
42
|
+
event-type: tests-passed
|
|
43
|
+
client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}"}'
|
data/.gitignore
CHANGED
data/.hound.yml
ADDED
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
|
data/Gemfile
CHANGED
|
@@ -6,6 +6,6 @@ git_source(:github) { |repo| "https://github.com/#{repo}" }
|
|
|
6
6
|
|
|
7
7
|
gemspec
|
|
8
8
|
|
|
9
|
-
if File.exist?
|
|
10
|
-
eval File.read(
|
|
9
|
+
if File.exist? "Gemfile.devel"
|
|
10
|
+
eval File.read("Gemfile.devel"), nil, "Gemfile.devel" # rubocop:disable Security/Eval
|
|
11
11
|
end
|
data/Rakefile
CHANGED
|
@@ -138,6 +138,13 @@ module Asciidoctor
|
|
|
138
138
|
end
|
|
139
139
|
end
|
|
140
140
|
|
|
141
|
+
def sectiontype(node, level = true)
|
|
142
|
+
ret = sectiontype1(node)
|
|
143
|
+
return ret if ret == "terms and definitions"
|
|
144
|
+
|
|
145
|
+
super
|
|
146
|
+
end
|
|
147
|
+
|
|
141
148
|
def inline_anchor_xref_attrs(node)
|
|
142
149
|
flags = %w(pagenumber nosee nopage).each_with_object({}) do |w, m|
|
|
143
150
|
if /#{w}%/.match?(node.text)
|
|
@@ -191,7 +198,8 @@ module Asciidoctor
|
|
|
191
198
|
end
|
|
192
199
|
|
|
193
200
|
def jcgm_untitled_sections_cleanup(xml)
|
|
194
|
-
xml.xpath("//clause//clause | //annex//clause")
|
|
201
|
+
xml.xpath("//clause//clause | //annex//clause | //introduction/clause")
|
|
202
|
+
.each do |c|
|
|
195
203
|
next if !c&.at("./title")&.text&.empty?
|
|
196
204
|
|
|
197
205
|
c["inline-header"] = true
|
|
@@ -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>
|
|
@@ -199,6 +204,18 @@
|
|
|
199
204
|
</zeroOrMore>
|
|
200
205
|
</element>
|
|
201
206
|
</define>
|
|
207
|
+
<define name="dt">
|
|
208
|
+
<element name="dt">
|
|
209
|
+
<optional>
|
|
210
|
+
<attribute name="id">
|
|
211
|
+
<data type="ID"/>
|
|
212
|
+
</attribute>
|
|
213
|
+
</optional>
|
|
214
|
+
<zeroOrMore>
|
|
215
|
+
<ref name="TextElement"/>
|
|
216
|
+
</zeroOrMore>
|
|
217
|
+
</element>
|
|
218
|
+
</define>
|
|
202
219
|
<define name="example">
|
|
203
220
|
<element name="example">
|
|
204
221
|
<attribute name="id">
|
|
@@ -543,6 +560,9 @@
|
|
|
543
560
|
</define>
|
|
544
561
|
<define name="BibDataExtensionType">
|
|
545
562
|
<ref name="doctype"/>
|
|
563
|
+
<optional>
|
|
564
|
+
<ref name="docsubtype"/>
|
|
565
|
+
</optional>
|
|
546
566
|
<optional>
|
|
547
567
|
<ref name="editorialgroup"/>
|
|
548
568
|
</optional>
|
|
@@ -876,8 +896,28 @@
|
|
|
876
896
|
</zeroOrMore>
|
|
877
897
|
</element>
|
|
878
898
|
</define>
|
|
899
|
+
<define name="pagebreak">
|
|
900
|
+
<element name="pagebreak">
|
|
901
|
+
<optional>
|
|
902
|
+
<attribute name="orientation">
|
|
903
|
+
<choice>
|
|
904
|
+
<value>landscape</value>
|
|
905
|
+
<value>portrait</value>
|
|
906
|
+
</choice>
|
|
907
|
+
</attribute>
|
|
908
|
+
</optional>
|
|
909
|
+
</element>
|
|
910
|
+
</define>
|
|
879
911
|
</include>
|
|
880
912
|
<!-- end overrides -->
|
|
913
|
+
<define name="docsubtype">
|
|
914
|
+
<element name="subdoctype">
|
|
915
|
+
<ref name="DocumentSubtype"/>
|
|
916
|
+
</element>
|
|
917
|
+
</define>
|
|
918
|
+
<define name="DocumentSubtype">
|
|
919
|
+
<text/>
|
|
920
|
+
</define>
|
|
881
921
|
<define name="colgroup">
|
|
882
922
|
<element name="colgroup">
|
|
883
923
|
<oneOrMore>
|
|
@@ -927,7 +967,34 @@
|
|
|
927
967
|
<define name="concept">
|
|
928
968
|
<element name="concept">
|
|
929
969
|
<optional>
|
|
930
|
-
<attribute name="
|
|
970
|
+
<attribute name="ital">
|
|
971
|
+
<data type="boolean"/>
|
|
972
|
+
</attribute>
|
|
973
|
+
</optional>
|
|
974
|
+
<optional>
|
|
975
|
+
<attribute name="ref">
|
|
976
|
+
<data type="boolean"/>
|
|
977
|
+
</attribute>
|
|
978
|
+
</optional>
|
|
979
|
+
<optional>
|
|
980
|
+
<element name="refterm">
|
|
981
|
+
<zeroOrMore>
|
|
982
|
+
<choice>
|
|
983
|
+
<ref name="PureTextElement"/>
|
|
984
|
+
<ref name="stem"/>
|
|
985
|
+
</choice>
|
|
986
|
+
</zeroOrMore>
|
|
987
|
+
</element>
|
|
988
|
+
</optional>
|
|
989
|
+
<optional>
|
|
990
|
+
<element name="renderterm">
|
|
991
|
+
<zeroOrMore>
|
|
992
|
+
<choice>
|
|
993
|
+
<ref name="PureTextElement"/>
|
|
994
|
+
<ref name="stem"/>
|
|
995
|
+
</choice>
|
|
996
|
+
</zeroOrMore>
|
|
997
|
+
</element>
|
|
931
998
|
</optional>
|
|
932
999
|
<choice>
|
|
933
1000
|
<ref name="eref"/>
|
|
@@ -943,8 +1010,173 @@
|
|
|
943
1010
|
<ref name="permission"/>
|
|
944
1011
|
<ref name="imagemap"/>
|
|
945
1012
|
<ref name="svgmap"/>
|
|
1013
|
+
<ref name="inputform"/>
|
|
1014
|
+
</choice>
|
|
1015
|
+
</define>
|
|
1016
|
+
<define name="inputform">
|
|
1017
|
+
<element name="form">
|
|
1018
|
+
<attribute name="id">
|
|
1019
|
+
<data type="ID"/>
|
|
1020
|
+
</attribute>
|
|
1021
|
+
<attribute name="name"/>
|
|
1022
|
+
<attribute name="action"/>
|
|
1023
|
+
<optional>
|
|
1024
|
+
<attribute name="class"/>
|
|
1025
|
+
</optional>
|
|
1026
|
+
<zeroOrMore>
|
|
1027
|
+
<choice>
|
|
1028
|
+
<ref name="TextElement"/>
|
|
1029
|
+
<ref name="FormInput"/>
|
|
1030
|
+
</choice>
|
|
1031
|
+
</zeroOrMore>
|
|
1032
|
+
</element>
|
|
1033
|
+
</define>
|
|
1034
|
+
<define name="FormInput">
|
|
1035
|
+
<choice>
|
|
1036
|
+
<ref name="input"/>
|
|
1037
|
+
<ref name="formlabel"/>
|
|
1038
|
+
<ref name="select"/>
|
|
1039
|
+
<ref name="textarea"/>
|
|
1040
|
+
</choice>
|
|
1041
|
+
</define>
|
|
1042
|
+
<define name="InputType">
|
|
1043
|
+
<choice>
|
|
1044
|
+
<value>button</value>
|
|
1045
|
+
<value>checkbox</value>
|
|
1046
|
+
<value>date</value>
|
|
1047
|
+
<value>file</value>
|
|
1048
|
+
<value>password</value>
|
|
1049
|
+
<value>radio</value>
|
|
1050
|
+
<value>submit</value>
|
|
1051
|
+
<value>text</value>
|
|
946
1052
|
</choice>
|
|
947
1053
|
</define>
|
|
1054
|
+
<define name="input">
|
|
1055
|
+
<element name="input">
|
|
1056
|
+
<attribute name="type">
|
|
1057
|
+
<ref name="InputType"/>
|
|
1058
|
+
</attribute>
|
|
1059
|
+
<optional>
|
|
1060
|
+
<attribute name="checked">
|
|
1061
|
+
<data type="boolean"/>
|
|
1062
|
+
</attribute>
|
|
1063
|
+
</optional>
|
|
1064
|
+
<optional>
|
|
1065
|
+
<attribute name="disabled">
|
|
1066
|
+
<data type="boolean"/>
|
|
1067
|
+
</attribute>
|
|
1068
|
+
</optional>
|
|
1069
|
+
<optional>
|
|
1070
|
+
<attribute name="readonly">
|
|
1071
|
+
<data type="boolean"/>
|
|
1072
|
+
</attribute>
|
|
1073
|
+
</optional>
|
|
1074
|
+
<optional>
|
|
1075
|
+
<attribute name="maxlength">
|
|
1076
|
+
<data type="int"/>
|
|
1077
|
+
</attribute>
|
|
1078
|
+
</optional>
|
|
1079
|
+
<optional>
|
|
1080
|
+
<attribute name="minlength">
|
|
1081
|
+
<data type="int"/>
|
|
1082
|
+
</attribute>
|
|
1083
|
+
</optional>
|
|
1084
|
+
<optional>
|
|
1085
|
+
<attribute name="name"/>
|
|
1086
|
+
</optional>
|
|
1087
|
+
<optional>
|
|
1088
|
+
<attribute name="value"/>
|
|
1089
|
+
</optional>
|
|
1090
|
+
<optional>
|
|
1091
|
+
<attribute name="id">
|
|
1092
|
+
<data type="ID"/>
|
|
1093
|
+
</attribute>
|
|
1094
|
+
</optional>
|
|
1095
|
+
</element>
|
|
1096
|
+
</define>
|
|
1097
|
+
<define name="formlabel">
|
|
1098
|
+
<element name="label">
|
|
1099
|
+
<attribute name="for">
|
|
1100
|
+
<data type="IDREF"/>
|
|
1101
|
+
</attribute>
|
|
1102
|
+
<zeroOrMore>
|
|
1103
|
+
<ref name="PureTextElement"/>
|
|
1104
|
+
</zeroOrMore>
|
|
1105
|
+
</element>
|
|
1106
|
+
</define>
|
|
1107
|
+
<define name="select">
|
|
1108
|
+
<element name="select">
|
|
1109
|
+
<optional>
|
|
1110
|
+
<attribute name="name"/>
|
|
1111
|
+
</optional>
|
|
1112
|
+
<optional>
|
|
1113
|
+
<attribute name="value"/>
|
|
1114
|
+
</optional>
|
|
1115
|
+
<optional>
|
|
1116
|
+
<attribute name="id">
|
|
1117
|
+
<data type="ID"/>
|
|
1118
|
+
</attribute>
|
|
1119
|
+
</optional>
|
|
1120
|
+
<optional>
|
|
1121
|
+
<attribute name="disabled">
|
|
1122
|
+
<data type="boolean"/>
|
|
1123
|
+
</attribute>
|
|
1124
|
+
</optional>
|
|
1125
|
+
<optional>
|
|
1126
|
+
<attribute name="multiple">
|
|
1127
|
+
<data type="boolean"/>
|
|
1128
|
+
</attribute>
|
|
1129
|
+
</optional>
|
|
1130
|
+
<optional>
|
|
1131
|
+
<attribute name="size">
|
|
1132
|
+
<data type="int"/>
|
|
1133
|
+
</attribute>
|
|
1134
|
+
</optional>
|
|
1135
|
+
<oneOrMore>
|
|
1136
|
+
<ref name="option"/>
|
|
1137
|
+
</oneOrMore>
|
|
1138
|
+
</element>
|
|
1139
|
+
</define>
|
|
1140
|
+
<define name="option">
|
|
1141
|
+
<element name="option">
|
|
1142
|
+
<optional>
|
|
1143
|
+
<attribute name="disabled">
|
|
1144
|
+
<data type="boolean"/>
|
|
1145
|
+
</attribute>
|
|
1146
|
+
</optional>
|
|
1147
|
+
<optional>
|
|
1148
|
+
<attribute name="value"/>
|
|
1149
|
+
</optional>
|
|
1150
|
+
<zeroOrMore>
|
|
1151
|
+
<ref name="PureTextElement"/>
|
|
1152
|
+
</zeroOrMore>
|
|
1153
|
+
</element>
|
|
1154
|
+
</define>
|
|
1155
|
+
<define name="textarea">
|
|
1156
|
+
<element name="textarea">
|
|
1157
|
+
<optional>
|
|
1158
|
+
<attribute name="name"/>
|
|
1159
|
+
</optional>
|
|
1160
|
+
<optional>
|
|
1161
|
+
<attribute name="value"/>
|
|
1162
|
+
</optional>
|
|
1163
|
+
<optional>
|
|
1164
|
+
<attribute name="id">
|
|
1165
|
+
<data type="ID"/>
|
|
1166
|
+
</attribute>
|
|
1167
|
+
</optional>
|
|
1168
|
+
<optional>
|
|
1169
|
+
<attribute name="rows">
|
|
1170
|
+
<data type="int"/>
|
|
1171
|
+
</attribute>
|
|
1172
|
+
</optional>
|
|
1173
|
+
<optional>
|
|
1174
|
+
<attribute name="cols">
|
|
1175
|
+
<data type="int"/>
|
|
1176
|
+
</attribute>
|
|
1177
|
+
</optional>
|
|
1178
|
+
</element>
|
|
1179
|
+
</define>
|
|
948
1180
|
<define name="bibliography">
|
|
949
1181
|
<element name="bibliography">
|
|
950
1182
|
<oneOrMore>
|
|
@@ -1017,9 +1249,7 @@
|
|
|
1017
1249
|
</define>
|
|
1018
1250
|
<define name="IsoWorkgroup">
|
|
1019
1251
|
<optional>
|
|
1020
|
-
<attribute name="number"
|
|
1021
|
-
<data type="int"/>
|
|
1022
|
-
</attribute>
|
|
1252
|
+
<attribute name="number"/>
|
|
1023
1253
|
</optional>
|
|
1024
1254
|
<optional>
|
|
1025
1255
|
<attribute name="type"/>
|
|
@@ -1285,26 +1515,26 @@
|
|
|
1285
1515
|
<optional>
|
|
1286
1516
|
<ref name="section-title"/>
|
|
1287
1517
|
</optional>
|
|
1288
|
-
<
|
|
1518
|
+
<choice>
|
|
1289
1519
|
<choice>
|
|
1290
1520
|
<group>
|
|
1291
|
-
<
|
|
1521
|
+
<oneOrMore>
|
|
1292
1522
|
<ref name="BasicBlock"/>
|
|
1293
|
-
</
|
|
1523
|
+
</oneOrMore>
|
|
1294
1524
|
<zeroOrMore>
|
|
1295
1525
|
<ref name="note"/>
|
|
1296
1526
|
</zeroOrMore>
|
|
1297
1527
|
</group>
|
|
1298
1528
|
<ref name="amend"/>
|
|
1299
1529
|
</choice>
|
|
1300
|
-
<
|
|
1530
|
+
<oneOrMore>
|
|
1301
1531
|
<choice>
|
|
1302
1532
|
<ref name="clause-subsection"/>
|
|
1303
1533
|
<ref name="terms"/>
|
|
1304
1534
|
<ref name="definitions"/>
|
|
1305
1535
|
</choice>
|
|
1306
|
-
</
|
|
1307
|
-
</
|
|
1536
|
+
</oneOrMore>
|
|
1537
|
+
</choice>
|
|
1308
1538
|
</define>
|
|
1309
1539
|
<define name="Annex-Section">
|
|
1310
1540
|
<optional>
|