metanorma-iso 2.1.0 → 2.1.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (24) hide show
  1. checksums.yaml +4 -4
  2. data/lib/isodoc/iso/base_convert.rb +1 -1
  3. data/lib/isodoc/iso/html/isodoc-dis.css +108 -86
  4. data/lib/isodoc/iso/html/isodoc-dis.scss +186 -104
  5. data/lib/isodoc/iso/html/word_iso_titlepage-dis.html +2 -2
  6. data/lib/isodoc/iso/html/word_iso_titlepage.html +4 -4
  7. data/lib/isodoc/iso/html/wordstyle-dis.css +12 -62
  8. data/lib/isodoc/iso/html/wordstyle-dis.scss +7 -56
  9. data/lib/isodoc/iso/html_convert.rb +2 -2
  10. data/lib/isodoc/iso/iso.amendment.xsl +1046 -116
  11. data/lib/isodoc/iso/iso.international-standard.xsl +1046 -116
  12. data/lib/isodoc/iso/metadata.rb +8 -8
  13. data/lib/isodoc/iso/presentation_inline.rb +2 -2
  14. data/lib/isodoc/iso/presentation_xml_convert.rb +2 -2
  15. data/lib/isodoc/iso/presentation_xref.rb +2 -2
  16. data/lib/isodoc/iso/sections.rb +2 -2
  17. data/lib/isodoc/iso/word_convert.rb +2 -2
  18. data/lib/isodoc/iso/word_dis_convert.rb +12 -3
  19. data/lib/metanorma/iso/version.rb +1 -1
  20. data/spec/isodoc/amd_spec.rb +16 -16
  21. data/spec/isodoc/metadata_spec.rb +17 -17
  22. data/spec/isodoc/postproc_spec.rb +3 -3
  23. data/spec/spec_helper.rb +7 -0
  24. metadata +2 -2
data/lib/isodoc/iso/html/word_iso_titlepage-dis.html CHANGED
@@ -25,7 +25,7 @@
25
25
  {% endif %}
26
26
 
27
27
  <p class="zzCover">
28
- <span lang="EN-GB">{{ doctitleintro }}{% if doctitleintro and doctitlemain %} &mdash; {% endif %}{{ doctitlemain }}{% if doctitlemain and doctitlepart %} &mdash; {% endif %}{% if doctitlepart %}{% if doctitlepartlabel %}{{ doctitlepartlabel }}: {% endif %}{{ doctitlepart }}</span>{% endif %}
28
+ <span lang="EN-GB">{{ doctitleintro }}{% if doctitleintro and doctitlemain %} &#x2014; {% endif %}{{ doctitlemain }}{% if doctitlemain and doctitlepart %} &#x2014; {% endif %}{% if doctitlepart %}{% if doctitlepartlabel %}{{ doctitlepartlabel }}: {% endif %}{{ doctitlepart }}</span>{% endif %}
29
29
  </p>
30
30
  {% if doctitleamdlabel %}
31
31
  <p class="zzCover">{{ doctitleamdlabel }}{% if doctitleamd %}: {{ doctitleamd }}{% endif %}</p>
@@ -34,7 +34,7 @@
34
34
  <p class="zzCover">{{ doctitlecorrlabel }}</p>
35
35
  {% endif %}
36
36
 
37
- <p class="zzCover">{{ docsubtitleintro }}{% if docsubtitleintro and docsubtitlemain %} &mdash; {% endif %}{{ docsubtitlemain }}{% if docsubtitlemain and docsubtitlepart %} &mdash; {% endif %}{% if docsubtitlepart %}{% if docsubtitlepartlabel %}{{ docsubtitlepartlabel }}: {% endif %}{{ docsubtitlepart }}{% endif %}
37
+ <p class="zzCover">{{ docsubtitleintro }}{% if docsubtitleintro and docsubtitlemain %} &#x2014; {% endif %}{{ docsubtitlemain }}{% if docsubtitlemain and docsubtitlepart %} &#x2014; {% endif %}{% if docsubtitlepart %}{% if docsubtitlepartlabel %}{{ docsubtitlepartlabel }}: {% endif %}{{ docsubtitlepart }}{% endif %}
38
38
  </p>
39
39
  {% if docsubtitleamdlabel %}
40
40
  <p class="zzCover">{{ docsubtitleamdlabel }}{% if docsubtitleamd %}: {{ docsubtitleamd }}{% endif %}</p>
data/lib/isodoc/iso/html/word_iso_titlepage.html CHANGED
@@ -38,7 +38,7 @@ style='mso-no-proof:yes'>{{ agency }}&#xa0;{{ editorialgroup | join: "/" }}</spa
38
38
  {% endif %}
39
39
 
40
40
  <p class="MsoNormal" align="left" style='text-align:left;line-height:18.0pt;margin-top:100.0pt;margin-bottom:0.0pt;font-size:16.0pt'>
41
- <span class="title"><b>{{ doctitleintro }}{% if doctitleintro and doctitlemain %} &mdash; {% endif %}</b></span><b><span class="subtitle">{{ doctitlemain }}{% if doctitlemain and doctitlepart %} &mdash;{% endif %}</b></span>
41
+ <span class="title"><b>{{ doctitleintro }}{% if doctitleintro and doctitlemain %} &#x2014; {% endif %}</b></span><b><span class="subtitle">{{ doctitlemain }}{% if doctitlemain and doctitlepart %} &#x2014;{% endif %}</b></span>
42
42
  {% if doctitlepart %}
43
43
  {% if doctitlepartlabel %}<span class="partlabel">{{ doctitlepartlabel }}: </span><br/>{% endif %}
44
44
  <span class="part"><b>{{ doctitlepart }}</b></span>
@@ -55,7 +55,7 @@ style='mso-no-proof:yes'>{{ agency }}&#xa0;{{ editorialgroup | join: "/" }}</spa
55
55
  {% else %}
56
56
  <br/>
57
57
  <p class="MsoNormal" align="left" style='text-align:left;line-height:18.0pt;margin-bottom:0.0pt;font-size:16.0pt'>
58
- <span class="title">{{ docsubtitleintro }}{% if docsubtitleintro and docsubtitlemain %} &mdash; {% endif %}</span><span class="subtitle">{{ docsubtitlemain }}{% if docsubtitlemain and docsubtitlepart %} &mdash;{% endif %}</span>
58
+ <span class="title">{{ docsubtitleintro }}{% if docsubtitleintro and docsubtitlemain %} &#x2014; {% endif %}</span><span class="subtitle">{{ docsubtitlemain }}{% if docsubtitlemain and docsubtitlepart %} &#x2014;{% endif %}</span>
59
59
  {% if docsubtitlepart %}
60
60
  {% if docsubtitlepartlabel %}<span class="partlabel">{{ docsubtitlepartlabel }}: </span><br/>{% endif %}
61
61
  <span class="part">{{ docsubtitlepart }}</span>
@@ -71,7 +71,7 @@ style='mso-no-proof:yes'>{{ agency }}&#xa0;{{ editorialgroup | join: "/" }}</spa
71
71
 
72
72
 
73
73
 
74
- <p class="MsoNormal" style='margin-top:100.0pt'><span lang="EN-GB"><o:p>&nbsp;</o:p></span></p>
74
+ <p class="MsoNormal" style='margin-top:100.0pt'><span lang="EN-GB"><o:p>&#xa0;</o:p></span></p>
75
75
 
76
76
  <div style='mso-element:para-border-div;border:solid windowtext 1.0pt;
77
77
  mso-border-alt:solid windowtext .5pt;padding:1.0pt 4.0pt 1.0pt 4.0pt;
@@ -83,7 +83,7 @@ lang="EN-GB" style='font-size:40.0pt'>{% if unpublished %}{{ stageabbr }} stage{
83
83
 
84
84
  </div>
85
85
 
86
- <p class="MsoNormal" style='margin-bottom:6.0pt'><span lang="EN-GB"><o:p>&nbsp;</o:p></span></p>
86
+ <p class="MsoNormal" style='margin-bottom:6.0pt'><span lang="EN-GB"><o:p>&#xa0;</o:p></span></p>
87
87
 
88
88
  {% if unpublished %}
89
89
  <!--
data/lib/isodoc/iso/html/wordstyle-dis.css CHANGED
@@ -296,6 +296,7 @@ h1, .h1 {
296
296
  mso-style-name: "Heading 1";
297
297
  mso-style-link: "Heading 1 Char";
298
298
  mso-style-next: Normal;
299
+ mso-outline-level: 1;
299
300
  margin-top: 13.5pt;
300
301
  margin-right: 0cm;
301
302
  margin-bottom: 12.0pt;
@@ -318,7 +319,6 @@ h1, .h1 {
318
319
  mso-bidi-font-weight: normal; }
319
320
 
320
321
  h1 {
321
- mso-outline-level: 1;
322
322
  mso-list: l1 level1 lfo6; }
323
323
 
324
324
  h1.ForewordTitle {
@@ -326,54 +326,6 @@ h1.ForewordTitle {
326
326
  font-style: normal;
327
327
  font-weight: bold; }
328
328
 
329
- p.ForewordTitle, li.ForewordTitle, div.ForewordTitle {
330
- mso-style-name: "Foreword Title";
331
- mso-style-unhide: no;
332
- mso-style-parent: Base_Heading;
333
- margin-top: 15.5pt;
334
- margin-right: 0cm;
335
- margin-bottom: 15.5pt;
336
- margin-left: 0cm;
337
- line-height: 15.5pt;
338
- page-break-before: always;
339
- mso-pagination: widow-orphan;
340
- page-break-after: avoid;
341
- mso-outline-level: 1;
342
- mso-hyphenate: none;
343
- font-size: 14.0pt;
344
- mso-bidi-font-size: 11.0pt;
345
- font-family: {{headerfont}};
346
- mso-fareast-font-family: Calibri;
347
- mso-bidi-font-family: "Times New Roman";
348
- mso-ansi-language: EN-GB;
349
- mso-fareast-language: EN-US;
350
- font-weight: bold;
351
- mso-bidi-font-weight: normal; }
352
-
353
- p.IntroTitle, li.IntroTitle, div.IntroTitle {
354
- mso-style-name: "Intro Title";
355
- mso-style-unhide: no;
356
- mso-style-parent: "Foreword Title";
357
- margin-top: 15.5pt;
358
- margin-right: 0cm;
359
- margin-bottom: 15.5pt;
360
- margin-left: 0cm;
361
- line-height: 15.5pt;
362
- page-break-before: always;
363
- mso-pagination: widow-orphan;
364
- page-break-after: avoid;
365
- mso-outline-level: 1;
366
- mso-hyphenate: none;
367
- font-size: 14.0pt;
368
- mso-bidi-font-size: 11.0pt;
369
- font-family: {{headerfont}};
370
- mso-fareast-font-family: Calibri;
371
- mso-bidi-font-family: "Times New Roman";
372
- mso-ansi-language: EN-GB;
373
- mso-fareast-language: EN-US;
374
- font-weight: bold;
375
- mso-bidi-font-weight: normal; }
376
-
377
329
  h1.Annex {
378
330
  mso-style-priority: 1;
379
331
  mso-style-unhide: no;
@@ -390,7 +342,6 @@ h1.Annex {
390
342
  mso-pagination: widow-orphan;
391
343
  page-break-after: avoid;
392
344
  font-weight: normal;
393
- mso-outline-level: 1;
394
345
  mso-list: l1 level1 lfo6;
395
346
  mso-hyphenate: none;
396
347
  tab-stops: 20.0pt list 21.6pt left 28.0pt;
@@ -439,6 +390,7 @@ h2, .h2 {
439
390
  mso-style-parent: "Heading 1";
440
391
  mso-style-link: "Heading 2 Char";
441
392
  mso-style-next: Normal;
393
+ mso-outline-level: 2;
442
394
  margin-top: 3.0pt;
443
395
  margin-right: 0cm;
444
396
  margin-bottom: 12.0pt;
@@ -460,8 +412,7 @@ h2, .h2 {
460
412
  mso-bidi-font-weight: normal; }
461
413
 
462
414
  h2 {
463
- mso-list: l1 level2 lfo6;
464
- mso-outline-level: 2; }
415
+ mso-list: l1 level2 lfo6; }
465
416
 
466
417
  .h3Annex {
467
418
  mso-style-priority: 3;
@@ -520,8 +471,7 @@ h3, .h3 {
520
471
  mso-bidi-font-weight: normal; }
521
472
 
522
473
  h3 {
523
- mso-list: l1 level3 lfo6;
524
- mso-outline-level: 3; }
474
+ mso-list: l1 level3 lfo6; }
525
475
 
526
476
  .h4Annex {
527
477
  mso-style-priority: 4;
@@ -558,6 +508,7 @@ h4, .h4 {
558
508
  mso-style-parent: "Heading 3";
559
509
  mso-style-link: "Heading 4 Char";
560
510
  mso-style-next: Normal;
511
+ mso-outline-level: 4;
561
512
  margin-top: 3.0pt;
562
513
  margin-right: 0cm;
563
514
  margin-bottom: 12.0pt;
@@ -578,8 +529,7 @@ h4, .h4 {
578
529
  mso-bidi-font-weight: normal; }
579
530
 
580
531
  h4 {
581
- mso-list: l1 level4 lfo6;
582
- mso-outline-level: 4; }
532
+ mso-list: l1 level4 lfo6; }
583
533
 
584
534
  .h5Annex {
585
535
  mso-style-priority: 5;
@@ -616,6 +566,7 @@ h5, .h5 {
616
566
  mso-style-parent: "Heading 4";
617
567
  mso-style-link: "Heading 5 Char";
618
568
  mso-style-next: Normal;
569
+ mso-outline-level: 5;
619
570
  margin-top: 3.0pt;
620
571
  margin-right: 0cm;
621
572
  margin-bottom: 6.0pt;
@@ -636,8 +587,7 @@ h5, .h5 {
636
587
  mso-bidi-font-weight: normal; }
637
588
 
638
589
  h5 {
639
- mso-list: l1 level5 lfo6;
640
- mso-outline-level: 5; }
590
+ mso-list: l1 level5 lfo6; }
641
591
 
642
592
  h6, .h6 {
643
593
  mso-style-priority: 6;
@@ -647,6 +597,7 @@ h6, .h6 {
647
597
  mso-style-parent: "Heading 5";
648
598
  mso-style-link: "Heading 6 Char";
649
599
  mso-style-next: Normal;
600
+ mso-outline-level: 6;
650
601
  margin-top: 3.0pt;
651
602
  margin-right: 0cm;
652
603
  margin-bottom: 12.0pt;
@@ -667,8 +618,7 @@ h6, .h6 {
667
618
  mso-bidi-font-weight: normal; }
668
619
 
669
620
  h6 {
670
- mso-list: l1 level6 lfo6;
671
- mso-outline-level: 6; }
621
+ mso-list: l1 level6 lfo6; }
672
622
 
673
623
  p.a2, li.a2, div.a2 {
674
624
  mso-style-name: a2;
@@ -884,7 +834,7 @@ p.MsoHeader, li.MsoHeader, div.MsoHeader {
884
834
  font-weight: bold;
885
835
  mso-bidi-font-weight: normal; }
886
836
 
887
- p.MsoHeaderLandscape, li.MsoHeaderLandscape, div.MsoHeaderLandscape, p.msoheaderlandscape, li.msoheaderlandscape, div.msoheaderlandscape {
837
+ p.MsoHeaderLandscape, li.MsoHeaderLandscape, div.MsoHeaderLandscape {
888
838
  mso-style-name: msoheaderlandscape;
889
839
  mso-style-noshow: yes;
890
840
  mso-style-priority: 99;
@@ -927,7 +877,7 @@ p.MsoFooter, li.MsoFooter, div.MsoFooter {
927
877
  mso-bidi-font-family: {{headerfont}};
928
878
  mso-ansi-language: EN-GB; }
929
879
 
930
- p.MsoFooterLandscape, li.MsoFooterLandscape, div.MsoFooterLandscape, p.msofooterlandscape, li.msofooterlandscape, div.msofooterlandscape {
880
+ p.MsoFooterLandscape, li.MsoFooterLandscape, div.MsoFooterLandscape {
931
881
  mso-style-name: msofooterlandscape;
932
882
  mso-style-noshow: yes;
933
883
  mso-style-priority: 99;
data/lib/isodoc/iso/html/wordstyle-dis.scss CHANGED
@@ -276,6 +276,7 @@ h1, .h1
276
276
  mso-style-name:"Heading 1";
277
277
  mso-style-link:"Heading 1 Char";
278
278
  mso-style-next:Normal;
279
+ mso-outline-level:1;
279
280
  margin-top:13.5pt;
280
281
  margin-right:0cm;
281
282
  margin-bottom:12.0pt;
@@ -297,7 +298,6 @@ h1, .h1
297
298
  mso-fareast-language:JA;
298
299
  mso-bidi-font-weight:normal;}
299
300
  h1 {
300
- mso-outline-level:1;
301
301
  mso-list:l1 level1 lfo6;
302
302
  }
303
303
  h1.ForewordTitle {
@@ -305,53 +305,6 @@ h1.ForewordTitle {
305
305
  font-style: normal ;
306
306
  font-weight: bold;
307
307
  }
308
- p.ForewordTitle, li.ForewordTitle, div.ForewordTitle
309
- {mso-style-name:"Foreword Title";
310
- mso-style-unhide:no;
311
- mso-style-parent:Base_Heading;
312
- margin-top:15.5pt;
313
- margin-right:0cm;
314
- margin-bottom:15.5pt;
315
- margin-left:0cm;
316
- line-height:15.5pt;
317
- page-break-before:always;
318
- mso-pagination:widow-orphan;
319
- page-break-after:avoid;
320
- mso-outline-level:1;
321
- mso-hyphenate:none;
322
- font-size:14.0pt;
323
- mso-bidi-font-size:11.0pt;
324
- font-family:$headerfont;
325
- mso-fareast-font-family:Calibri;
326
- mso-bidi-font-family:"Times New Roman";
327
- mso-ansi-language:EN-GB;
328
- mso-fareast-language:EN-US;
329
- font-weight:bold;
330
- mso-bidi-font-weight:normal;}
331
- p.IntroTitle, li.IntroTitle, div.IntroTitle
332
- {mso-style-name:"Intro Title";
333
- mso-style-unhide:no;
334
- mso-style-parent:"Foreword Title";
335
- margin-top:15.5pt;
336
- margin-right:0cm;
337
- margin-bottom:15.5pt;
338
- margin-left:0cm;
339
- line-height:15.5pt;
340
- page-break-before:always;
341
- mso-pagination:widow-orphan;
342
- page-break-after:avoid;
343
- mso-outline-level:1;
344
- mso-hyphenate:none;
345
- font-size:14.0pt;
346
- mso-bidi-font-size:11.0pt;
347
- font-family:$headerfont;
348
- mso-fareast-font-family:Calibri;
349
- mso-bidi-font-family:"Times New Roman";
350
- mso-ansi-language:EN-GB;
351
- mso-fareast-language:EN-US;
352
- font-weight:bold;
353
- mso-bidi-font-weight:normal;}
354
-
355
308
  h1.Annex
356
309
  {mso-style-priority:1;
357
310
  mso-style-unhide:no;
@@ -368,7 +321,6 @@ h1.Annex
368
321
  mso-pagination:widow-orphan;
369
322
  page-break-after:avoid;
370
323
  font-weight:normal;
371
- mso-outline-level:1;
372
324
  mso-list:l1 level1 lfo6;
373
325
  mso-hyphenate:none;
374
326
  tab-stops:20.0pt list 21.6pt left 28.0pt;
@@ -415,6 +367,7 @@ h2, .h2
415
367
  mso-style-parent:"Heading 1";
416
368
  mso-style-link:"Heading 2 Char";
417
369
  mso-style-next:Normal;
370
+ mso-outline-level:2;
418
371
  margin-top:3.0pt;
419
372
  margin-right:0cm;
420
373
  margin-bottom:12.0pt;
@@ -436,7 +389,6 @@ h2, .h2
436
389
  mso-bidi-font-weight:normal;}
437
390
  h2
438
391
  { mso-list:l1 level2 lfo6;
439
- mso-outline-level:2;
440
392
  }
441
393
  .h3Annex
442
394
  {mso-style-priority:3;
@@ -493,7 +445,6 @@ h3, .h3
493
445
  mso-fareast-language:JA;
494
446
  mso-bidi-font-weight:normal;}
495
447
  h3 {mso-list:l1 level3 lfo6;
496
- mso-outline-level:3;
497
448
  }
498
449
  .h4Annex
499
450
  {mso-style-priority:4;
@@ -529,6 +480,7 @@ h4, .h4
529
480
  mso-style-parent:"Heading 3";
530
481
  mso-style-link:"Heading 4 Char";
531
482
  mso-style-next:Normal;
483
+ mso-outline-level:4;
532
484
  margin-top:3.0pt;
533
485
  margin-right:0cm;
534
486
  margin-bottom:12.0pt;
@@ -548,7 +500,6 @@ h4, .h4
548
500
  mso-fareast-language:JA;
549
501
  mso-bidi-font-weight:normal;}
550
502
  h4 {mso-list:l1 level4 lfo6;
551
- mso-outline-level:4;
552
503
  }
553
504
  .h5Annex
554
505
  {mso-style-priority:5;
@@ -584,6 +535,7 @@ h5, .h5
584
535
  mso-style-parent:"Heading 4";
585
536
  mso-style-link:"Heading 5 Char";
586
537
  mso-style-next:Normal;
538
+ mso-outline-level:5;
587
539
  margin-top:3.0pt;
588
540
  margin-right:0cm;
589
541
  margin-bottom:6.0pt;
@@ -603,7 +555,6 @@ h5, .h5
603
555
  mso-fareast-language:JA;
604
556
  mso-bidi-font-weight:normal;}
605
557
  h5 {mso-list:l1 level5 lfo6;
606
- mso-outline-level:5;
607
558
  }
608
559
  h6, .h6
609
560
  {mso-style-priority:6;
@@ -613,6 +564,7 @@ h6, .h6
613
564
  mso-style-parent:"Heading 5";
614
565
  mso-style-link:"Heading 6 Char";
615
566
  mso-style-next:Normal;
567
+ mso-outline-level:6;
616
568
  margin-top:3.0pt;
617
569
  margin-right:0cm;
618
570
  margin-bottom:12.0pt;
@@ -632,7 +584,6 @@ h6, .h6
632
584
  mso-fareast-language:JA;
633
585
  mso-bidi-font-weight:normal;}
634
586
  h6 {mso-list:l1 level6 lfo6;
635
- mso-outline-level:6;
636
587
  }
637
588
  p.a2, li.a2, div.a2
638
589
  {mso-style-name:a2;
@@ -839,7 +790,7 @@ p.MsoHeader, li.MsoHeader, div.MsoHeader
839
790
  mso-ansi-language:EN-GB;
840
791
  font-weight:bold;
841
792
  mso-bidi-font-weight:normal;}
842
- p.MsoHeaderLandscape, li.MsoHeaderLandscape, div.MsoHeaderLandscape, p.msoheaderlandscape, li.msoheaderlandscape, div.msoheaderlandscape
793
+ p.MsoHeaderLandscape, li.MsoHeaderLandscape, div.MsoHeaderLandscape
843
794
  {mso-style-name:msoheaderlandscape;
844
795
  mso-style-noshow:yes;
845
796
  mso-style-priority:99;
@@ -880,7 +831,7 @@ p.MsoFooter, li.MsoFooter, div.MsoFooter
880
831
  mso-fareast-font-family:"SimHei",serif;
881
832
  mso-bidi-font-family:$headerfont;
882
833
  mso-ansi-language:EN-GB;}
883
- p.MsoFooterLandscape, li.MsoFooterLandscape, div.MsoFooterLandscape, p.msofooterlandscape, li.msofooterlandscape, div.msofooterlandscape
834
+ p.MsoFooterLandscape, li.MsoFooterLandscape, div.MsoFooterLandscape
884
835
  {mso-style-name:msofooterlandscape;
885
836
  mso-style-noshow:yes;
886
837
  mso-style-priority:99;
data/lib/isodoc/iso/html_convert.rb CHANGED
@@ -63,8 +63,8 @@ module IsoDoc
63
63
  if level == "h1" &&
64
64
  header.parent.at(".//h2#{toc_exclude_class}")
65
65
  <<~HDR
66
- <li class="#{level}"><div class="collapse-group"><a href="##{header['id']}">#{header_strip(content)}</a></li>
67
- <div class="collapse-button"></div></div>
66
+ <li class="#{level}"><div class="collapse-group"><a href="##{header['id']}">#{header_strip(content)}</a>
67
+ <div class="collapse-button"></div></div></li>
68
68
  HDR
69
69
  else
70
70
  %(<li class="#{level}"><a href="##{header['id']}">\