metanorma-iso 2.1.3 → 2.1.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (43) hide show
  1. checksums.yaml +4 -4
  2. data/lib/isodoc/iso/html/isodoc-dis.css +1 -10
  3. data/lib/isodoc/iso/html/isodoc-dis.scss +1 -13
  4. data/lib/isodoc/iso/html/isodoc.css +4 -11
  5. data/lib/isodoc/iso/html/isodoc.scss +5 -15
  6. data/lib/isodoc/iso/html/style-human.css +3 -0
  7. data/lib/isodoc/iso/html/style-human.scss +4 -0
  8. data/lib/isodoc/iso/html/style-iso.css +3 -0
  9. data/lib/isodoc/iso/html/style-iso.scss +4 -0
  10. data/lib/isodoc/iso/i18n-en.yaml +1 -1
  11. data/lib/isodoc/iso/iso.amendment.xsl +3611 -2912
  12. data/lib/isodoc/iso/iso.international-standard.xsl +3611 -2912
  13. data/lib/isodoc/iso/metadata.rb +1 -1
  14. data/lib/isodoc/iso/presentation_xml_convert.rb +4 -0
  15. data/lib/isodoc/iso/word_cleanup.rb +50 -19
  16. data/lib/isodoc/iso/word_dis_cleanup.rb +10 -14
  17. data/lib/isodoc/iso/word_dis_convert.rb +1 -1
  18. data/lib/metanorma/iso/base.rb +0 -6
  19. data/lib/metanorma/iso/boilerplate-fr.xml +1 -1
  20. data/lib/metanorma/iso/boilerplate-ru.xml +1 -1
  21. data/lib/metanorma/iso/boilerplate.xml +1 -1
  22. data/lib/metanorma/iso/cleanup.rb +4 -2
  23. data/lib/metanorma/iso/front_id.rb +28 -0
  24. data/lib/metanorma/iso/isodoc.rng +32 -1
  25. data/lib/metanorma/iso/isostandard.rng +3 -1
  26. data/lib/metanorma/iso/reqt.rng +1 -1
  27. data/lib/metanorma/iso/version.rb +1 -1
  28. data/metanorma-iso.gemspec +2 -1
  29. data/spec/isodoc/blocks_spec.rb +3 -3
  30. data/spec/isodoc/metadata_spec.rb +1 -2
  31. data/spec/isodoc/postproc_spec.rb +8 -75
  32. data/spec/isodoc/terms_spec.rb +62 -0
  33. data/spec/isodoc/word_dis_spec.rb +133 -15
  34. data/spec/metanorma/base_spec.rb +6 -17
  35. data/spec/metanorma/blocks_spec.rb +0 -33
  36. data/spec/metanorma/cleanup_spec.rb +201 -201
  37. data/spec/metanorma/processor_spec.rb +1 -2
  38. data/spec/metanorma/refs_spec.rb +5 -3
  39. data/spec/metanorma/section_spec.rb +6 -6
  40. data/spec/spec_helper.rb +1 -1
  41. data/spec/vcr_cassettes/withdrawn_iso.yml +28 -28
  42. metadata +18 -5
  43. data/lib/metanorma/iso/macros.rb +0 -29
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 5af2d1e84ef187d29c8adb59589006fe83a313db249d03f1b972f2c24f55026e
4
- data.tar.gz: 24e56ffa73fb96734cfb1d9990bd97d404707119714cd4c95541d6b60022e6cb
3
+ metadata.gz: 668dfbc54c97728ebf7e4e0fdd489e79011776a44dddfc15b7ee3d1a6e8ce9e0
4
+ data.tar.gz: 8229dab0adc5a97e1bc133ab8bf4a135824ab7c439e3b484eed901fbf6047b26
5
5
  SHA512:
6
- metadata.gz: 771062f88d67f10235c8d23df932c4ce0e55f75df7d090e411739729b5d28291f51b453efd0e0a16490d1fbf18d83d0d1cfea1e3308cdc36d137c30b80f1a141
7
- data.tar.gz: 7a14ad2b9b71991608d0af4ba011c86f1f89bbde21f00e4ee62b6aa975d60c27a9db2cfcbf9701bedfde08f3aeda9b32072c8e39a2c08d4cc8bac8542cf651dc
6
+ metadata.gz: 168f23d9623a5f71d57625268960dec3295bd5dad520ba0f4ba4e9d3c535f6e471104bb5dd2fb1526afd6854f78151294b0be5764870e30b62dd3e6db7ee3169
7
+ data.tar.gz: 5b8c4eb9a48b88fcc6fc12445084fcc97db58b1a109a74032b69f1dc40bbea6743d4ac37745e3609a8cff7e5d30bfdfb8c9a10445d7113e782c75ff296c8a3e2
data/lib/isodoc/iso/html/isodoc-dis.css CHANGED
@@ -76,7 +76,7 @@ p.NormRef, li.NormRef, div.NormRef {
76
76
  mso-ansi-language: EN-GB; }
77
77
 
78
78
  p.FigureTitle, li.FigureTitle, div.FigureTitle {
79
- mso-style-name: figuretitle;
79
+ mso-style-name: "Figure Title";
80
80
  mso-style-unhide: no;
81
81
  mso-style-qformat: yes;
82
82
  mso-style-parent: "";
@@ -1691,12 +1691,6 @@ div.Example, td.Example {
1691
1691
  margin: 0in;
1692
1692
  margin-bottom: 6.0pt; }
1693
1693
 
1694
- td.Example p.MsoListParagraph {
1695
- font-size: {{smallerfontsize}}; }
1696
-
1697
- div.Example p.MsoListParagraph {
1698
- font-size: {{smallerfontsize}}; }
1699
-
1700
1694
  p.Example, li.Example, div.Example {
1701
1695
  mso-style-unhide: no;
1702
1696
  mso-style-qformat: yes;
@@ -4483,9 +4477,6 @@ span.SpellE {
4483
4477
  mso-style-name: "";
4484
4478
  mso-spl-e: yes; }
4485
4479
 
4486
- div.Note p.MsoListParagraph {
4487
- font-size: {{smallerfontsize}}; }
4488
-
4489
4480
  div.Note span.stem {
4490
4481
  font-size: {{smallerfontsize}}; }
4491
4482
 
data/lib/isodoc/iso/html/isodoc-dis.scss CHANGED
@@ -71,7 +71,7 @@ p.NormRef, li.NormRef, div.NormRef
71
71
  mso-bidi-font-family:$bodyfont;
72
72
  mso-ansi-language:EN-GB;}
73
73
  p.FigureTitle, li.FigureTitle, div.FigureTitle
74
- {mso-style-name:figuretitle;
74
+ {mso-style-name:"Figure Title";
75
75
  mso-style-unhide:no;
76
76
  mso-style-qformat:yes;
77
77
  mso-style-parent:"";
@@ -1626,14 +1626,6 @@ div.Example, td.Example {
1626
1626
  margin-bottom:6.0pt;
1627
1627
  }
1628
1628
 
1629
- td.Example p.MsoListParagraph {
1630
- font-size: $smallerfontsize;
1631
- }
1632
-
1633
- div.Example p.MsoListParagraph {
1634
- font-size: $smallerfontsize;
1635
- }
1636
-
1637
1629
  p.Example, li.Example, div.Example
1638
1630
  {
1639
1631
  mso-style-unhide:no;
@@ -4308,10 +4300,6 @@ span.SpellE
4308
4300
  mso-spl-e:yes;}
4309
4301
 
4310
4302
 
4311
- div.Note p.MsoListParagraph {
4312
- font-size: $smallerfontsize;
4313
- }
4314
-
4315
4303
  div.Note span.stem {
4316
4304
  font-size: $smallerfontsize; }
4317
4305
 
data/lib/isodoc/iso/html/isodoc.css CHANGED
@@ -376,6 +376,7 @@ p.SourceTitle {
376
376
  mso-ansi-language: EN-GB; }
377
377
 
378
378
  p.Tabletitle, li.Tabletitle, div.Tabletitle, p.ListTitle {
379
+ mso-style-name: "Table title";
379
380
  mso-style-unhide: no;
380
381
  mso-style-qformat: yes;
381
382
  mso-style-parent: "";
@@ -510,6 +511,7 @@ span.AnnexFigureTitleChar {
510
511
 
511
512
  p.Note, div.Note, li.Note, p.TableFootnote, div.TableFootnote, li.TableFootnote {
512
513
  mso-style-unhide: no;
514
+ mso-style-name: "Note";
513
515
  mso-style-qformat: yes;
514
516
  mso-style-parent: "";
515
517
  margin-top: 0cm;
@@ -1277,7 +1279,7 @@ aside {
1277
1279
  font-size: {{footnotefontsize}}; }
1278
1280
 
1279
1281
  /*
1280
- div.example {
1282
+ div.Example {
1281
1283
  border:solid black .25pt;
1282
1284
  mso-border-alt:solid black .25pt;
1283
1285
  padding:10pt;
@@ -1287,7 +1289,7 @@ div.example {
1287
1289
  }
1288
1290
  */
1289
1291
  /*
1290
- div.example {
1292
+ div.Example {
1291
1293
  margin-left:70.9pt;
1292
1294
  text-indent:-70.9pt;
1293
1295
  }
@@ -1305,12 +1307,6 @@ div.Example, td.Example {
1305
1307
  margin: 0in;
1306
1308
  margin-bottom: 6.0pt; }
1307
1309
 
1308
- td.Example p.MsoListParagraph {
1309
- font-size: {{smallerfontsize}}; }
1310
-
1311
- div.Example p.MsoListParagraph {
1312
- font-size: {{smallerfontsize}}; }
1313
-
1314
1310
  p.Example, li.Example, div.Example {
1315
1311
  mso-style-unhide: no;
1316
1312
  mso-style-qformat: yes;
@@ -1334,9 +1330,6 @@ span.ExampleChar {
1334
1330
  mso-style-link: Example;
1335
1331
  mso-ansi-language: EN-GB; }
1336
1332
 
1337
- div.Note p.MsoListParagraph {
1338
- font-size: {{smallerfontsize}}; }
1339
-
1340
1333
  div.Note span.stem {
1341
1334
  font-size: {{smallerfontsize}}; }
1342
1335
 
data/lib/isodoc/iso/html/isodoc.scss CHANGED
@@ -358,7 +358,8 @@ p.SourceTitle
358
358
  mso-bidi-font-family:$bodyfont;
359
359
  mso-ansi-language:EN-GB;}
360
360
  p.Tabletitle, li.Tabletitle, div.Tabletitle, p.ListTitle
361
- {mso-style-unhide:no;
361
+ {mso-style-name:"Table title";
362
+ mso-style-unhide:no;
362
363
  mso-style-qformat:yes;
363
364
  mso-style-parent:"";
364
365
  margin-top:0cm;
@@ -485,6 +486,7 @@ span.AnnexFigureTitleChar
485
486
  font-weight:bold;}
486
487
  p.Note, div.Note, li.Note, p.TableFootnote, div.TableFootnote, li.TableFootnote
487
488
  {mso-style-unhide:no;
489
+ mso-style-name:"Note";
488
490
  mso-style-qformat:yes;
489
491
  mso-style-parent:"";
490
492
  margin-top:0cm;
@@ -1234,7 +1236,7 @@ aside {
1234
1236
  }
1235
1237
 
1236
1238
  /*
1237
- div.example {
1239
+ div.Example {
1238
1240
  border:solid black .25pt;
1239
1241
  mso-border-alt:solid black .25pt;
1240
1242
  padding:10pt;
@@ -1246,7 +1248,7 @@ div.example {
1246
1248
 
1247
1249
 
1248
1250
  /*
1249
- div.example {
1251
+ div.Example {
1250
1252
  margin-left:70.9pt;
1251
1253
  text-indent:-70.9pt;
1252
1254
  }
@@ -1267,14 +1269,6 @@ div.Example, td.Example {
1267
1269
  margin-bottom:6.0pt;
1268
1270
  }
1269
1271
 
1270
- td.Example p.MsoListParagraph {
1271
- font-size: $smallerfontsize;
1272
- }
1273
-
1274
- div.Example p.MsoListParagraph {
1275
- font-size: $smallerfontsize;
1276
- }
1277
-
1278
1272
  p.Example, li.Example, div.Example
1279
1273
  {
1280
1274
  mso-style-unhide:no;
@@ -1300,10 +1294,6 @@ span.ExampleChar
1300
1294
 
1301
1295
 
1302
1296
 
1303
- div.Note p.MsoListParagraph {
1304
- font-size: $smallerfontsize;
1305
- }
1306
-
1307
1297
  div.Note span.stem {
1308
1298
  font-size: $smallerfontsize; }
1309
1299
 
data/lib/isodoc/iso/html/style-human.css CHANGED
@@ -370,6 +370,9 @@ h2, .h2 {
370
370
  margin-top: 2em;
371
371
  margin-bottom: 1em; }
372
372
 
373
+ h3, .h3, h4, .h4, h5, .h5, h6, .h6 {
374
+ margin-bottom: 1em; }
375
+
373
376
  h1,
374
377
  h2,
375
378
  h3,
data/lib/isodoc/iso/html/style-human.scss CHANGED
@@ -167,6 +167,10 @@ h2, .h2 {
167
167
  margin-bottom: 1em;
168
168
  }
169
169
 
170
+ h3, .h3, h4, .h4, h5, .h5, h6, .h6 {
171
+ margin-bottom: 1em;
172
+ }
173
+
170
174
  h1,
171
175
  h2,
172
176
  h3,
data/lib/isodoc/iso/html/style-iso.css CHANGED
@@ -336,6 +336,9 @@ h2, .h2 {
336
336
  margin-top: 2em;
337
337
  margin-bottom: 1em; }
338
338
 
339
+ h3, .h3, h4, .h4, h5, .h5, h6, .h6 {
340
+ margin-bottom: 1em; }
341
+
339
342
  h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
340
343
  line-height: 1.2; }
341
344
 
data/lib/isodoc/iso/html/style-iso.scss CHANGED
@@ -126,6 +126,10 @@ h2, .h2 {
126
126
  margin-bottom: 1em;
127
127
  }
128
128
 
129
+ h3, .h3, h4, .h4, h5, .h5, h6, .h6 {
130
+ margin-bottom: 1em;
131
+ }
132
+
129
133
  h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
130
134
  line-height: 1.2;
131
135
  }
data/lib/isodoc/iso/i18n-en.yaml CHANGED
@@ -1,5 +1,5 @@
1
1
  term_def_boilerplate: |
2
- <p>ISO and IEC maintain terminological databases for use in
2
+ <p>ISO and IEC maintain terminology databases for use in
3
3
  standardization at the following addresses:</p>
4
4
 
5
5
  <ul>