metanorma-iso 2.1.2 → 2.1.5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (38) hide show
  1. checksums.yaml +4 -4
  2. data/lib/html2doc/lists.rb +7 -4
  3. data/lib/isodoc/iso/html/isodoc-dis.css +4 -15
  4. data/lib/isodoc/iso/html/isodoc-dis.scss +4 -17
  5. data/lib/isodoc/iso/html/isodoc.css +4 -11
  6. data/lib/isodoc/iso/html/isodoc.scss +5 -15
  7. data/lib/isodoc/iso/i18n-en.yaml +1 -1
  8. data/lib/isodoc/iso/iso.amendment.xsl +429 -121
  9. data/lib/isodoc/iso/iso.international-standard.xsl +429 -121
  10. data/lib/isodoc/iso/metadata.rb +1 -1
  11. data/lib/isodoc/iso/presentation_xml_convert.rb +5 -1
  12. data/lib/isodoc/iso/word_cleanup.rb +40 -6
  13. data/lib/isodoc/iso/word_dis_cleanup.rb +10 -14
  14. data/lib/metanorma/iso/base.rb +0 -6
  15. data/lib/metanorma/iso/biblio.rng +102 -5
  16. data/lib/metanorma/iso/cleanup.rb +33 -20
  17. data/lib/metanorma/iso/front.rb +13 -6
  18. data/lib/metanorma/iso/isodoc.rng +33 -0
  19. data/lib/metanorma/iso/isostandard.rng +3 -1
  20. data/lib/metanorma/iso/validate_section.rb +0 -12
  21. data/lib/metanorma/iso/version.rb +1 -1
  22. data/spec/isodoc/blocks_spec.rb +3 -3
  23. data/spec/isodoc/metadata_spec.rb +1 -2
  24. data/spec/isodoc/postproc_spec.rb +2 -62
  25. data/spec/isodoc/section_spec.rb +2 -8
  26. data/spec/isodoc/terms_spec.rb +62 -0
  27. data/spec/isodoc/word_dis_spec.rb +185 -3
  28. data/spec/metanorma/amd_spec.rb +4 -40
  29. data/spec/metanorma/base_spec.rb +61 -103
  30. data/spec/metanorma/blocks_spec.rb +0 -33
  31. data/spec/metanorma/cleanup_spec.rb +201 -201
  32. data/spec/metanorma/refs_spec.rb +5 -3
  33. data/spec/metanorma/section_spec.rb +6 -6
  34. data/spec/metanorma/validate_spec.rb +8 -19
  35. data/spec/spec_helper.rb +1 -7
  36. data/spec/vcr_cassettes/withdrawn_iso.yml +28 -28
  37. metadata +3 -4
  38. data/lib/metanorma/iso/macros.rb +0 -29
@@ -1023,202 +1023,202 @@ RSpec.describe Metanorma::ISO do
1023
1023
  INPUT
1024
1024
  output = <<~OUTPUT
1025
1025
  #{BLANK_HDR}
1026
- <sections>
1027
- <clause id="_" inline-header="false" obligation="normative">
1028
- <title>Clause 1</title>
1029
- <p id="_">
1030
- <eref bibitemid="ref1" citeas="ISO 123" type="inline"/>
1031
- <eref bibitemid="ref1a" citeas="ISO 123-100" type="inline"/>
1032
- <eref bibitemid="ref1b" citeas="ISO/TS 123-1" type="inline"/>
1033
- <eref bibitemid="ref2" citeas="ISO/IEC 123" type="inline"/>
1034
- <eref bibitemid="ref3" citeas="IEC 123" type="inline"/>
1035
- <eref bibitemid="ref4" citeas="GB 123" type="inline"/>
1036
- <eref bibitemid="ref5" citeas="[6]" type="inline"/>
1037
- <eref bibitemid="ref6" citeas="[B]" type="inline"/>
1038
- <eref bibitemid="ref7" citeas="[A]" type="inline"/>
1039
- <xref target="ref8"/>
1040
- <xref target="ref9"/>
1041
- <eref bibitemid="ref10" citeas="ISO/IEC 123" type="inline"/>
1042
- </p>
1043
- </clause>
1044
- </sections>
1045
- <bibliography>
1046
- <clause id="_" obligation="informative">
1047
- <title>Bibliography</title>
1048
- <references id="_" normative="false" obligation="informative">
1049
- <title>Clause 1</title>
1050
- <bibitem id="ref1" type="standard">
1051
- <title format="text/plain">Standard ISO 123</title>
1052
- <docidentifier>ISO 123</docidentifier>
1053
- <docnumber>123</docnumber>
1054
- <contributor>
1055
- <role type="publisher"/>
1056
- <organization>
1057
- <name>International Organization for Standardization</name>
1058
- <abbreviation>ISO</abbreviation>
1059
- </organization>
1060
- </contributor>
1061
- </bibitem>
1062
- <bibitem id="ref2" type="standard">
1063
- <title format="text/plain">Standard ISO/IEC 123</title>
1064
- <docidentifier>ISO/IEC 123</docidentifier>
1065
- <docnumber>123</docnumber>
1066
- <contributor>
1067
- <role type="publisher"/>
1068
- <organization>
1069
- <name>International Organization for Standardization</name>
1070
- <abbreviation>ISO</abbreviation>
1071
- </organization>
1072
- </contributor>
1073
- <contributor>
1074
- <role type="publisher"/>
1075
- <organization>
1076
- <name>International Electrotechnical Commission</name>
1077
- <abbreviation>IEC</abbreviation>
1078
- </organization>
1079
- </contributor>
1080
- </bibitem>
1081
- <bibitem id="ref1b" type="standard">
1082
- <title format="text/plain">Standard ISO 123</title>
1083
- <docidentifier>ISO/TS 123-1</docidentifier>
1084
- <docnumber>123-1</docnumber>
1085
- <contributor>
1086
- <role type="publisher"/>
1087
- <organization>
1088
- <name>International Organization for Standardization</name>
1089
- <abbreviation>ISO</abbreviation>
1090
- </organization>
1091
- </contributor>
1092
- <contributor>
1093
- <role type="publisher"/>
1094
- <organization>
1095
- <name>TS</name>
1096
- </organization>
1097
- </contributor>
1098
- </bibitem>
1099
- <bibitem id="ref1a" type="standard">
1100
- <title format="text/plain">Standard ISO 123</title>
1101
- <docidentifier>ISO 123-100</docidentifier>
1102
- <docnumber>123-100</docnumber>
1103
- <contributor>
1104
- <role type="publisher"/>
1105
- <organization>
1106
- <name>International Organization for Standardization</name>
1107
- <abbreviation>ISO</abbreviation>
1108
- </organization>
1109
- </contributor>
1110
- </bibitem>
1111
- <bibitem id="ref3" type="standard">
1112
- <title format="text/plain">Standard IEC 123</title>
1113
- <docidentifier>IEC 123</docidentifier>
1114
- <docnumber>123</docnumber>
1115
- <contributor>
1116
- <role type="publisher"/>
1117
- <organization>
1118
- <name>International Electrotechnical Commission</name>
1119
- <abbreviation>IEC</abbreviation>
1120
- </organization>
1121
- </contributor>
1122
- </bibitem>
1123
- <bibitem id="ref5">
1124
- <formattedref format="application/x-isodoc+xml">
1125
- <em>Standard 10</em>
1126
- </formattedref>
1127
- <docidentifier type="metanorma">[6]</docidentifier>
1128
- </bibitem>
1129
- <bibitem id="ref6">
1130
- <formattedref format="application/x-isodoc+xml">
1131
- <em>Standard 20</em>
1132
- </formattedref>
1133
- <docidentifier type="metanorma">[B]</docidentifier>
1134
- </bibitem>
1135
- <bibitem id="ref7">
1136
- <formattedref format="application/x-isodoc+xml">
1137
- <em>Standard 30</em>
1138
- </formattedref>
1139
- <docidentifier type="metanorma">[A]</docidentifier>
1140
- </bibitem>
1141
- <bibitem id="ref4">
1142
- <formattedref format="application/x-isodoc+xml">
1143
- <em>Standard GB 123</em>
1144
- </formattedref>
1145
- <docidentifier>GB 123</docidentifier>
1146
- <docnumber>123</docnumber>
1147
- </bibitem>
1148
- </references>
1149
- <references id="_" normative="false" obligation="informative">
1150
- <bibitem id="ref11" type="standard">
1151
- <title format="text/plain">Standard ISO 123</title>
1152
- <docidentifier>ISO 123</docidentifier>
1153
- <docnumber>123</docnumber>
1154
- <contributor>
1155
- <role type="publisher"/>
1156
- <organization>
1157
- <name>International Organization for Standardization</name>
1158
- <abbreviation>ISO</abbreviation>
1159
- </organization>
1160
- </contributor>
1161
- </bibitem>
1162
- <bibitem id="ref10" type="standard">
1163
- <title format="text/plain">Standard ISO/IEC 123</title>
1164
- <docidentifier>ISO/IEC 123</docidentifier>
1165
- <docnumber>123</docnumber>
1166
- <contributor>
1167
- <role type="publisher"/>
1168
- <organization>
1169
- <name>International Organization for Standardization</name>
1170
- <abbreviation>ISO</abbreviation>
1171
- </organization>
1172
- </contributor>
1173
- <contributor>
1174
- <role type="publisher"/>
1175
- <organization>
1176
- <name>International Electrotechnical Commission</name>
1177
- <abbreviation>IEC</abbreviation>
1178
- </organization>
1179
- </contributor>
1180
- </bibitem>
1181
- <bibitem id="ref13" type="standard">
1182
- <title format="text/plain">Standard IEC 123</title>
1183
- <docidentifier>IEC 123</docidentifier>
1184
- <docnumber>123</docnumber>
1185
- <contributor>
1186
- <role type="publisher"/>
1187
- <organization>
1188
- <name>International Electrotechnical Commission</name>
1189
- <abbreviation>IEC</abbreviation>
1190
- </organization>
1191
- </contributor>
1192
- </bibitem>
1193
- <bibitem id="ref15">
1194
- <formattedref format="application/x-isodoc+xml">
1195
- <em>Standard 10</em>
1196
- </formattedref>
1197
- <docidentifier type="metanorma">[13]</docidentifier>
1198
- </bibitem>
1199
- <bibitem id="ref16">
1200
- <formattedref format="application/x-isodoc+xml">
1201
- <em>Standard 20</em>
1202
- </formattedref>
1203
- <docidentifier type="metanorma">[B]</docidentifier>
1204
- </bibitem>
1205
- <bibitem id="ref17">
1206
- <formattedref format="application/x-isodoc+xml">
1207
- <em>Standard 30</em>
1208
- </formattedref>
1209
- <docidentifier type="metanorma">[A]</docidentifier>
1210
- </bibitem>
1211
- <bibitem id="ref14">
1212
- <formattedref format="application/x-isodoc+xml">
1213
- <em>Standard GB 123</em>
1214
- </formattedref>
1215
- <docidentifier>GB 123</docidentifier>
1216
- <docnumber>123</docnumber>
1217
- </bibitem>
1218
- </references>
1219
- </clause>
1220
- </bibliography>
1221
- </iso-standard>
1026
+ <sections>
1027
+ <clause id='_' inline-header='false' obligation='normative'>
1028
+ <title>Clause 1</title>
1029
+ <p id='_'>
1030
+ <eref type='inline' bibitemid='ref1' citeas='ISO 123'/>
1031
+ <eref type='inline' bibitemid='ref1a' citeas='ISO 123-100'/>
1032
+ <eref type='inline' bibitemid='ref1b' citeas='ISO/TS 123-1'/>
1033
+ <eref type='inline' bibitemid='ref2' citeas='ISO/IEC 123'/>
1034
+ <eref type='inline' bibitemid='ref3' citeas='IEC 123'/>
1035
+ <eref type='inline' bibitemid='ref4' citeas='GB 123'/>
1036
+ <eref type='inline' bibitemid='ref5' citeas='[7]'/>
1037
+ <eref type='inline' bibitemid='ref6' citeas='[B]'/>
1038
+ <eref type='inline' bibitemid='ref7' citeas='[A]'/>
1039
+ <xref target='ref8'/>
1040
+ <xref target='ref9'/>
1041
+ <eref type='inline' bibitemid='ref10' citeas='ISO/IEC 123'/>
1042
+ </p>
1043
+ </clause>
1044
+ </sections>
1045
+ <bibliography>
1046
+ <clause id='_' obligation='informative'>
1047
+ <title>Bibliography</title>
1048
+ <references id='_' normative='false' obligation='informative'>
1049
+ <title>Clause 1</title>
1050
+ <bibitem id='ref1' type='standard'>
1051
+ <title format='text/plain'>Standard ISO 123</title>
1052
+ <docidentifier>ISO 123</docidentifier>
1053
+ <docnumber>123</docnumber>
1054
+ <contributor>
1055
+ <role type='publisher'/>
1056
+ <organization>
1057
+ <name>International Organization for Standardization</name>
1058
+ <abbreviation>ISO</abbreviation>
1059
+ </organization>
1060
+ </contributor>
1061
+ </bibitem>
1062
+ <bibitem id='ref2' type='standard'>
1063
+ <title format='text/plain'>Standard ISO/IEC 123</title>
1064
+ <docidentifier>ISO/IEC 123</docidentifier>
1065
+ <docnumber>123</docnumber>
1066
+ <contributor>
1067
+ <role type='publisher'/>
1068
+ <organization>
1069
+ <name>International Organization for Standardization</name>
1070
+ <abbreviation>ISO</abbreviation>
1071
+ </organization>
1072
+ </contributor>
1073
+ <contributor>
1074
+ <role type='publisher'/>
1075
+ <organization>
1076
+ <name>International Electrotechnical Commission</name>
1077
+ <abbreviation>IEC</abbreviation>
1078
+ </organization>
1079
+ </contributor>
1080
+ </bibitem>
1081
+ <bibitem id='ref1b' type='standard'>
1082
+ <title format='text/plain'>Standard ISO 123</title>
1083
+ <docidentifier>ISO/TS 123-1</docidentifier>
1084
+ <docnumber>123-1</docnumber>
1085
+ <contributor>
1086
+ <role type='publisher'/>
1087
+ <organization>
1088
+ <name>International Organization for Standardization</name>
1089
+ <abbreviation>ISO</abbreviation>
1090
+ </organization>
1091
+ </contributor>
1092
+ <contributor>
1093
+ <role type='publisher'/>
1094
+ <organization>
1095
+ <name>TS</name>
1096
+ </organization>
1097
+ </contributor>
1098
+ </bibitem>
1099
+ <bibitem id='ref1a' type='standard'>
1100
+ <title format='text/plain'>Standard ISO 123</title>
1101
+ <docidentifier>ISO 123-100</docidentifier>
1102
+ <docnumber>123-100</docnumber>
1103
+ <contributor>
1104
+ <role type='publisher'/>
1105
+ <organization>
1106
+ <name>International Organization for Standardization</name>
1107
+ <abbreviation>ISO</abbreviation>
1108
+ </organization>
1109
+ </contributor>
1110
+ </bibitem>
1111
+ <bibitem id='ref3' type='standard'>
1112
+ <title format='text/plain'>Standard IEC 123</title>
1113
+ <docidentifier>IEC 123</docidentifier>
1114
+ <docnumber>123</docnumber>
1115
+ <contributor>
1116
+ <role type='publisher'/>
1117
+ <organization>
1118
+ <name>International Electrotechnical Commission</name>
1119
+ <abbreviation>IEC</abbreviation>
1120
+ </organization>
1121
+ </contributor>
1122
+ </bibitem>
1123
+ <bibitem id='ref4'>
1124
+ <formattedref format='application/x-isodoc+xml'>
1125
+ <em>Standard GB 123</em>
1126
+ </formattedref>
1127
+ <docidentifier>GB 123</docidentifier>
1128
+ <docnumber>123</docnumber>
1129
+ </bibitem>
1130
+ <bibitem id='ref5'>
1131
+ <formattedref format='application/x-isodoc+xml'>
1132
+ <em>Standard 10</em>
1133
+ </formattedref>
1134
+ <docidentifier type='metanorma'>[7]</docidentifier>
1135
+ </bibitem>
1136
+ <bibitem id='ref7'>
1137
+ <formattedref format='application/x-isodoc+xml'>
1138
+ <em>Standard 30</em>
1139
+ </formattedref>
1140
+ <docidentifier type='metanorma'>[A]</docidentifier>
1141
+ </bibitem>
1142
+ <bibitem id='ref6'>
1143
+ <formattedref format='application/x-isodoc+xml'>
1144
+ <em>Standard 20</em>
1145
+ </formattedref>
1146
+ <docidentifier type='metanorma'>[B]</docidentifier>
1147
+ </bibitem>
1148
+ </references>
1149
+ <references id='_' normative='false' obligation='informative'>
1150
+ <bibitem id='ref11' type='standard'>
1151
+ <title format='text/plain'>Standard ISO 123</title>
1152
+ <docidentifier>ISO 123</docidentifier>
1153
+ <docnumber>123</docnumber>
1154
+ <contributor>
1155
+ <role type='publisher'/>
1156
+ <organization>
1157
+ <name>International Organization for Standardization</name>
1158
+ <abbreviation>ISO</abbreviation>
1159
+ </organization>
1160
+ </contributor>
1161
+ </bibitem>
1162
+ <bibitem id='ref10' type='standard'>
1163
+ <title format='text/plain'>Standard ISO/IEC 123</title>
1164
+ <docidentifier>ISO/IEC 123</docidentifier>
1165
+ <docnumber>123</docnumber>
1166
+ <contributor>
1167
+ <role type='publisher'/>
1168
+ <organization>
1169
+ <name>International Organization for Standardization</name>
1170
+ <abbreviation>ISO</abbreviation>
1171
+ </organization>
1172
+ </contributor>
1173
+ <contributor>
1174
+ <role type='publisher'/>
1175
+ <organization>
1176
+ <name>International Electrotechnical Commission</name>
1177
+ <abbreviation>IEC</abbreviation>
1178
+ </organization>
1179
+ </contributor>
1180
+ </bibitem>
1181
+ <bibitem id='ref13' type='standard'>
1182
+ <title format='text/plain'>Standard IEC 123</title>
1183
+ <docidentifier>IEC 123</docidentifier>
1184
+ <docnumber>123</docnumber>
1185
+ <contributor>
1186
+ <role type='publisher'/>
1187
+ <organization>
1188
+ <name>International Electrotechnical Commission</name>
1189
+ <abbreviation>IEC</abbreviation>
1190
+ </organization>
1191
+ </contributor>
1192
+ </bibitem>
1193
+ <bibitem id='ref14'>
1194
+ <formattedref format='application/x-isodoc+xml'>
1195
+ <em>Standard GB 123</em>
1196
+ </formattedref>
1197
+ <docidentifier>GB 123</docidentifier>
1198
+ <docnumber>123</docnumber>
1199
+ </bibitem>
1200
+ <bibitem id='ref15'>
1201
+ <formattedref format='application/x-isodoc+xml'>
1202
+ <em>Standard 10</em>
1203
+ </formattedref>
1204
+ <docidentifier type='metanorma'>[14]</docidentifier>
1205
+ </bibitem>
1206
+ <bibitem id='ref17'>
1207
+ <formattedref format='application/x-isodoc+xml'>
1208
+ <em>Standard 30</em>
1209
+ </formattedref>
1210
+ <docidentifier type='metanorma'>[A]</docidentifier>
1211
+ </bibitem>
1212
+ <bibitem id='ref16'>
1213
+ <formattedref format='application/x-isodoc+xml'>
1214
+ <em>Standard 20</em>
1215
+ </formattedref>
1216
+ <docidentifier type='metanorma'>[B]</docidentifier>
1217
+ </bibitem>
1218
+ </references>
1219
+ </clause>
1220
+ </bibliography>
1221
+ </iso-standard>
1222
1222
  OUTPUT
1223
1223
  expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
1224
1224
  .to be_equivalent_to xmlpp(output)
@@ -1240,7 +1240,7 @@ RSpec.describe Metanorma::ISO do
1240
1240
  <title>Terms and definitions</title>
1241
1241
  <p id='_'>For the purposes of this document, the following terms and definitions apply.</p>
1242
1242
  <p id='_'>
1243
- ISO and IEC maintain terminological databases for use in standardization
1243
+ ISO and IEC maintain terminology databases for use in standardization
1244
1244
  at the following addresses:
1245
1245
  </p>
1246
1246
  <ul id='_'>
@@ -1289,7 +1289,7 @@ RSpec.describe Metanorma::ISO do
1289
1289
  <title>Terms and definitions</title>
1290
1290
  <p id='_'>For the purposes of this document, the following terms and definitions apply.</p>
1291
1291
  <p id='_'>
1292
- ISO and IEC maintain terminological databases for use in standardization
1292
+ ISO and IEC maintain terminology databases for use in standardization
1293
1293
  at the following addresses:
1294
1294
  </p>
1295
1295
  <ul id='_'>
@@ -1353,7 +1353,7 @@ RSpec.describe Metanorma::ISO do
1353
1353
  <title>Terms and definitions</title>
1354
1354
  <p id='_'>For the purposes of this document, the following terms and definitions apply.</p>
1355
1355
  <p id='_'>
1356
- ISO and IEC maintain terminological databases for use in
1356
+ ISO and IEC maintain terminology databases for use in
1357
1357
  standardization at the following addresses:
1358
1358
  </p>
1359
1359
  <ul id='_'>
@@ -1420,7 +1420,7 @@ RSpec.describe Metanorma::ISO do
1420
1420
  <title>Terms and definitions</title>
1421
1421
  <p id='_'>For the purposes of this document, the following terms and definitions apply.</p>
1422
1422
  <p id='_'>
1423
- ISO and IEC maintain terminological databases for use in
1423
+ ISO and IEC maintain terminology databases for use in
1424
1424
  standardization at the following addresses:
1425
1425
  </p>
1426
1426
  <ul id='_'>
@@ -1478,7 +1478,7 @@ RSpec.describe Metanorma::ISO do
1478
1478
  <terms id='_' obligation='normative'>
1479
1479
  <title>Terms and definitions</title>
1480
1480
  <p id='_'>
1481
- ISO and IEC maintain terminological databases for use in standardization
1481
+ ISO and IEC maintain terminology databases for use in standardization
1482
1482
  at the following addresses:
1483
1483
  </p>
1484
1484
  <ul id='_'>
@@ -410,7 +410,7 @@ RSpec.describe Metanorma::ISO do
410
410
  <uri type='src'>https://www.iso.org/standard/2405.html</uri>
411
411
  <uri type='rss'>https://www.iso.org/contents/data/standard/00/24/2405.detail.rss</uri>
412
412
  <docidentifier type='ISO' primary='true'>ISO 31-0</docidentifier>
413
- <docidentifier type='URN'>urn:iso:std:iso:31:-0:stage-95.99:ed-1:en</docidentifier>
413
+ <docidentifier type='URN'>urn:iso:std:iso:31:-0:stage-95.99:ed-1</docidentifier>
414
414
  <docnumber>31</docnumber>
415
415
  <contributor>
416
416
  <role type='publisher'/>
@@ -447,7 +447,7 @@ RSpec.describe Metanorma::ISO do
447
447
  <uri type='src'>https://www.iso.org/standard/2405.html</uri>
448
448
  <uri type='rss'>https://www.iso.org/contents/data/standard/00/24/2405.detail.rss</uri>
449
449
  <docidentifier type='ISO' primary='true'>ISO 31-0:1974</docidentifier>
450
- <docidentifier type='URN'>urn:iso:std:iso:31:-0:stage-95.99:ed-1:en</docidentifier>
450
+ <docidentifier type='URN'>urn:iso:std:iso:31:-0:stage-95.99:ed-1</docidentifier>
451
451
  <docnumber>31</docnumber>
452
452
  <date type='published'>
453
453
  <on>1974-01</on>
@@ -494,7 +494,7 @@ RSpec.describe Metanorma::ISO do
494
494
  <uri type='src'>https://www.iso.org/standard/76389.html</uri>
495
495
  <uri type='rss'>https://www.iso.org/contents/data/standard/07/63/76389.detail.rss</uri>
496
496
  <docidentifier type='ISO' primary='true'>ISO 683-3:2019</docidentifier>
497
- <docidentifier type='URN'>urn:iso:std:iso:683:-3:stage-95.99:ed-3:en</docidentifier>
497
+ <docidentifier type='URN'>urn:iso:std:iso:683:-3:stage-95.99:ed-3</docidentifier>
498
498
  <docnumber>683</docnumber>
499
499
  <date type='published'>
500
500
  <on>2019-01</on>
@@ -551,11 +551,13 @@ RSpec.describe Metanorma::ISO do
551
551
  <relation type='obsoletes'>
552
552
  <bibitem type='standard'>
553
553
  <formattedref format='text/plain'>ISO 683-3:2016</formattedref>
554
+ <docidentifier type='ISO' primary='true'>ISO 683-3:2016</docidentifier>
554
555
  </bibitem>
555
556
  </relation>
556
557
  <relation type='updates'>
557
558
  <bibitem type='standard'>
558
559
  <formattedref format='text/plain'>ISO 683-3:2022</formattedref>
560
+ <docidentifier type='ISO' primary='true'>ISO 683-3:2022</docidentifier>
559
561
  <date type='circulated'>
560
562
  <on>2022-01-21</on>
561
563
  </date>
@@ -81,7 +81,7 @@ RSpec.describe Metanorma::ISO do
81
81
  <terms id="_" obligation="normative">
82
82
  <title>Terms and definitions</title>
83
83
  <p id="_">For the purposes of this document, the following terms and definitions apply.</p>
84
- <p id="_">ISO and IEC maintain terminological databases for use in standardization at the following addresses:</p>
84
+ <p id="_">ISO and IEC maintain terminology databases for use in standardization at the following addresses:</p>
85
85
  <ul id="_">
86
86
  <li>
87
87
  <p id="_">ISO Online browsing platform: available at
@@ -275,7 +275,7 @@ RSpec.describe Metanorma::ISO do
275
275
  given in <eref bibitemid="iso1234"/>
276
276
  and <eref bibitemid="iso5678"/>
277
277
  and the following apply.</p>
278
- <p id="_">ISO and IEC maintain terminological databases for use in
278
+ <p id="_">ISO and IEC maintain terminology databases for use in
279
279
  standardization at the following addresses:</p>
280
280
  <ul id="_">
281
281
  <li>
@@ -321,7 +321,7 @@ RSpec.describe Metanorma::ISO do
321
321
  <title>Terms and definitions</title>
322
322
  <p id='_'>No terms and definitions are listed in this document.</p>
323
323
  <p id='_'>
324
- ISO and IEC maintain terminological databases for use in standardization
324
+ ISO and IEC maintain terminology databases for use in standardization
325
325
  at the following addresses:
326
326
  </p>
327
327
  <ul id='_'>
@@ -373,7 +373,7 @@ RSpec.describe Metanorma::ISO do
373
373
  and <eref bibitemid="iso5678"/>
374
374
  apply.
375
375
  </p>
376
- <p id="_">ISO and IEC maintain terminological databases for use in standardization at the following addresses:</p>
376
+ <p id="_">ISO and IEC maintain terminology databases for use in standardization at the following addresses:</p>
377
377
  <ul id="_">
378
378
  <li>
379
379
  <p id="_">ISO Online browsing platform: available at
@@ -411,7 +411,7 @@ RSpec.describe Metanorma::ISO do
411
411
  <title>Terms and definitions</title>
412
412
  <p id='_'>No terms and definitions are listed in this document.</p>
413
413
  <p id='_'>
414
- ISO and IEC maintain terminological databases for use in standardization
414
+ ISO and IEC maintain terminology databases for use in standardization
415
415
  at the following addresses:
416
416
  </p>
417
417
  <ul id='_'>
@@ -461,7 +461,7 @@ RSpec.describe Metanorma::ISO do
461
461
  <terms id='_' obligation='normative'>
462
462
  <title>Terms and Definitions</title>
463
463
  <p id='_'>No terms and definitions are listed in this document.</p>
464
- <p id='_'>ISO and IEC maintain terminological databases for use in standardization
464
+ <p id='_'>ISO and IEC maintain terminology databases for use in standardization
465
465
  at the following addresses:
466
466
  </p>
467
467
  <ul id='_'>
@@ -150,7 +150,7 @@ RSpec.describe Metanorma::ISO do
150
150
  expect(File.read("test.err")).to include "Scope clause missing"
151
151
  end
152
152
 
153
- it "Scope clause not missing 1" do
153
+ it "Scope clause not missing if supplied" do
154
154
  Asciidoctor.convert(<<~"INPUT", *OPTIONS)
155
155
  = Document title
156
156
  Author
@@ -164,7 +164,7 @@ RSpec.describe Metanorma::ISO do
164
164
  expect(File.read("test.err")).not_to include "Scope clause missing"
165
165
  end
166
166
 
167
- it "Scope clause not missing 2" do
167
+ it "Scope clause not missing in amendments" do
168
168
  FileUtils.rm_f "test.err"
169
169
  Asciidoctor.convert(<<~"INPUT", *OPTIONS)
170
170
  = Document title
@@ -196,7 +196,7 @@ RSpec.describe Metanorma::ISO do
196
196
  expect(File.read("test.err")).to include "Normative references missing"
197
197
  end
198
198
 
199
- it "Normative references not missing 1" do
199
+ it "Normative references not missing if supplied" do
200
200
  Asciidoctor.convert(<<~"INPUT", *OPTIONS)
201
201
  = Document title
202
202
  Author
@@ -212,7 +212,7 @@ RSpec.describe Metanorma::ISO do
212
212
  .not_to include "Normative references missing"
213
213
  end
214
214
 
215
- it "Normative references not missing 2" do
215
+ it "Normative references not missing in amendments" do
216
216
  Asciidoctor.convert(<<~"INPUT", *OPTIONS)
217
217
  = Document title
218
218
  Author
@@ -243,7 +243,7 @@ RSpec.describe Metanorma::ISO do
243
243
  expect(File.read("test.err")).to include "Terms & definitions missing"
244
244
  end
245
245
 
246
- it "Terms & definitions not missing 1" do
246
+ it "Terms & definitions not missing if supplied" do
247
247
  Asciidoctor.convert(<<~"INPUT", *OPTIONS)
248
248
  = Document title
249
249
  Author
@@ -258,7 +258,7 @@ RSpec.describe Metanorma::ISO do
258
258
  expect(File.read("test.err")).not_to include "Terms & definitions missing"
259
259
  end
260
260
 
261
- it "Terms & definitions not missing 2" do
261
+ it "Terms & definitions not missing in amendment" do
262
262
  Asciidoctor.convert(<<~"INPUT", *OPTIONS)
263
263
  = Document title
264
264
  Author
@@ -1699,6 +1699,7 @@ RSpec.describe Metanorma::ISO do
1699
1699
  :docfile: test.adoc
1700
1700
  :nodoc:
1701
1701
  :technical-committee-type: X
1702
+ :technical-committee-number: X
1702
1703
  :no-isobib:
1703
1704
 
1704
1705
  INPUT
@@ -1712,19 +1713,7 @@ RSpec.describe Metanorma::ISO do
1712
1713
  :docfile: test.adoc
1713
1714
  :nodoc:
1714
1715
  :subcommittee-type: X
1715
- :no-isobib:
1716
-
1717
- INPUT
1718
- expect(File.read("test.err")).to include "invalid subcommittee type"
1719
- end
1720
-
1721
- it "Warning if invalid subcommittee type" do
1722
- Asciidoctor.convert(<<~"INPUT", *OPTIONS)
1723
- = Document title
1724
- Author
1725
- :docfile: test.adoc
1726
- :nodoc:
1727
- :subcommittee-type: X
1716
+ :subcommittee-number: X
1728
1717
  :no-isobib:
1729
1718
 
1730
1719
  INPUT