metanorma-iso 2.1.0 → 2.1.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (72) hide show
  1. checksums.yaml +4 -4
  2. data/lib/html2doc/lists.rb +145 -10
  3. data/lib/isodoc/iso/base_convert.rb +11 -1
  4. data/lib/isodoc/iso/html/html_iso_titlepage.html +2 -0
  5. data/lib/isodoc/iso/html/isodoc-dis.css +216 -278
  6. data/lib/isodoc/iso/html/isodoc-dis.scss +294 -288
  7. data/lib/isodoc/iso/html/isodoc.css +38 -13
  8. data/lib/isodoc/iso/html/isodoc.scss +38 -12
  9. data/lib/isodoc/iso/html/style-human.css +14 -1
  10. data/lib/isodoc/iso/html/style-human.scss +10 -1
  11. data/lib/isodoc/iso/html/style-iso.css +35 -23
  12. data/lib/isodoc/iso/html/style-iso.scss +31 -23
  13. data/lib/isodoc/iso/html/word_iso_intro-dis.html +1 -6
  14. data/lib/isodoc/iso/html/word_iso_titlepage-dis.html +24 -13
  15. data/lib/isodoc/iso/html/word_iso_titlepage-prf.html +58 -0
  16. data/lib/isodoc/iso/html/word_iso_titlepage.html +10 -6
  17. data/lib/isodoc/iso/html/wordstyle-dis.css +12 -62
  18. data/lib/isodoc/iso/html/wordstyle-dis.scss +7 -56
  19. data/lib/isodoc/iso/html_convert.rb +7 -2
  20. data/lib/isodoc/iso/i18n-en.yaml +32 -4
  21. data/lib/isodoc/iso/i18n-fr.yaml +29 -3
  22. data/lib/isodoc/iso/i18n-ru.yaml +32 -4
  23. data/lib/isodoc/iso/i18n-zh-Hans.yaml +32 -3
  24. data/lib/isodoc/iso/i18n.rb +1 -1
  25. data/lib/isodoc/iso/iso.amendment.xsl +1570 -246
  26. data/lib/isodoc/iso/iso.international-standard.xsl +1570 -246
  27. data/lib/isodoc/iso/metadata.rb +67 -67
  28. data/lib/isodoc/iso/presentation_bibdata.rb +74 -0
  29. data/lib/isodoc/iso/presentation_xml_convert.rb +16 -5
  30. data/lib/isodoc/iso/presentation_xref.rb +10 -4
  31. data/lib/isodoc/iso/sections.rb +3 -3
  32. data/lib/isodoc/iso/word_cleanup.rb +3 -0
  33. data/lib/isodoc/iso/word_convert.rb +8 -5
  34. data/lib/isodoc/iso/word_dis_cleanup.rb +235 -0
  35. data/lib/isodoc/iso/word_dis_convert.rb +48 -100
  36. data/lib/isodoc/iso/xref.rb +34 -6
  37. data/lib/metanorma/iso/base.rb +20 -1
  38. data/lib/metanorma/iso/biblio.rng +134 -39
  39. data/lib/metanorma/iso/boilerplate-fr.xml +3 -0
  40. data/lib/metanorma/iso/boilerplate-ru.xml +3 -0
  41. data/lib/metanorma/iso/boilerplate.xml +3 -0
  42. data/lib/metanorma/iso/cleanup.rb +49 -11
  43. data/lib/metanorma/iso/front.rb +38 -6
  44. data/lib/metanorma/iso/front_id.rb +2 -0
  45. data/lib/metanorma/iso/isodoc.rng +16 -0
  46. data/lib/metanorma/iso/isostandard.rng +30 -12
  47. data/lib/metanorma/iso/macros.rb +29 -0
  48. data/lib/metanorma/iso/validate_section.rb +0 -12
  49. data/lib/metanorma/iso/version.rb +1 -1
  50. data/spec/isodoc/amd_spec.rb +20 -46
  51. data/spec/isodoc/blocks_spec.rb +499 -2
  52. data/spec/isodoc/i18n_spec.rb +145 -80
  53. data/spec/isodoc/iso_spec.rb +50 -169
  54. data/spec/isodoc/metadata_spec.rb +240 -99
  55. data/spec/isodoc/postproc_spec.rb +43 -7
  56. data/spec/isodoc/section_spec.rb +9 -9
  57. data/spec/isodoc/word_dis_spec.rb +1332 -146
  58. data/spec/isodoc/xref_spec.rb +87 -13
  59. data/spec/metanorma/amd_spec.rb +39 -23
  60. data/spec/metanorma/base_spec.rb +174 -44
  61. data/spec/metanorma/blocks_spec.rb +54 -0
  62. data/spec/metanorma/lists_spec.rb +2 -2
  63. data/spec/metanorma/section_spec.rb +2 -2
  64. data/spec/metanorma/validate_spec.rb +8 -19
  65. data/spec/spec_helper.rb +17 -7
  66. data/spec/vcr_cassettes/withdrawn_iso.yml +30 -30
  67. metadata +7 -8
  68. data/docs/asciiiso-syntax.adoc +0 -307
  69. data/docs/guidance.adoc +0 -487
  70. data/docs/navigation.adoc +0 -23
  71. data/docs/quickstart.adoc +0 -179
  72. data/lib/isodoc/iso/presentation_inline.rb +0 -90
@@ -375,7 +375,7 @@ p.SourceTitle {
375
375
  mso-bidi-font-family: {{bodyfont}};
376
376
  mso-ansi-language: EN-GB; }
377
377
 
378
- p.Tabletitle, li.Tabletitle, div.Tabletitle {
378
+ p.Tabletitle, li.Tabletitle, div.Tabletitle, p.ListTitle {
379
379
  mso-style-unhide: no;
380
380
  mso-style-qformat: yes;
381
381
  mso-style-parent: "";
@@ -520,13 +520,15 @@ p.Note, div.Note, li.Note, p.TableFootnote, div.TableFootnote, li.TableFootnote
520
520
  line-height: 12.0pt;
521
521
  mso-pagination: widow-orphan;
522
522
  tab-stops: 20.15pt;
523
- font-size: {{smallerfontsize}};
524
523
  mso-bidi-font-size: {{normalfontsize}};
525
- font-family: {{bodyfont}};
526
524
  mso-fareast-font-family: "SimSun",serif;
527
525
  mso-bidi-font-family: {{bodyfont}};
528
526
  mso-ansi-language: EN-GB; }
529
527
 
528
+ p.Note, li.Note, p.TableFootnote, div.TableFootnote, li.TableFootnote {
529
+ font-size: {{smallerfontsize}};
530
+ font-family: {{bodyfont}}; }
531
+
530
532
  /* may need to be revised */
531
533
  p.ANNEX, li.ANNEX, div.ANNEX {
532
534
  mso-style-name: ANNEX;
@@ -747,6 +749,25 @@ p.TermNum, li.TermNum, div.TermNum {
747
749
  font-weight: bold;
748
750
  mso-bidi-font-weight: normal; }
749
751
 
752
+ p.zzHelp, li.zzHelp, div.zzHelp {
753
+ mso-style-name: zzHelp;
754
+ mso-style-unhide: no;
755
+ margin-top: 0cm;
756
+ margin-right: 0cm;
757
+ margin-bottom: 12.0pt;
758
+ margin-left: 0cm;
759
+ text-align: justify;
760
+ line-height: 12.0pt;
761
+ mso-pagination: widow-orphan;
762
+ font-size: {{normalfontsize}};
763
+ mso-bidi-font-size: 10.0pt;
764
+ font-family: {{bodyfont}};
765
+ mso-fareast-font-family: "MS Mincho";
766
+ mso-bidi-font-family: "Times New Roman";
767
+ color: green;
768
+ mso-ansi-language: EN-GB;
769
+ mso-fareast-language: JA; }
770
+
750
771
  p.zzContents, li.zzContents, div.zzContents {
751
772
  mso-style-name: zzContents;
752
773
  mso-style-noshow: yes;
@@ -926,12 +947,14 @@ p.Quote, li.Quote, div.Quote {
926
947
  line-height: 12.0pt;
927
948
  mso-pagination: widow-orphan;
928
949
  tab-stops: 20.15pt;
929
- font-size: {{normalfontsize}};
930
- font-family: {{bodyfont}};
931
950
  mso-fareast-font-family: "SimSun",serif;
932
951
  mso-bidi-font-family: {{bodyfont}};
933
952
  mso-ansi-language: EN-GB; }
934
953
 
954
+ p.Quote, li.Quote {
955
+ font-size: {{normalfontsize}};
956
+ font-family: {{bodyfont}}; }
957
+
935
958
  p.QuoteAttribution {
936
959
  text-align: right; }
937
960
 
@@ -940,8 +963,6 @@ p.Admonition, li.Admonition, div.Admonition {
940
963
  mso-pagination: widow-orphan;
941
964
  border: none;
942
965
  padding: 0cm;
943
- font-size: 12.0pt;
944
- font-family: {{bodyfont}};
945
966
  mso-ascii-font-family: {{bodyfont}};
946
967
  mso-ascii-theme-font: minor-latin;
947
968
  mso-fareast-font-family: "SimSun",serif;
@@ -950,9 +971,13 @@ p.Admonition, li.Admonition, div.Admonition {
950
971
  mso-hansi-theme-font: minor-latin;
951
972
  mso-bidi-font-family: {{bodyfont}};
952
973
  mso-bidi-theme-font: minor-bidi;
953
- font-weight: bold;
954
974
  mso-ansi-language: EN-AU; }
955
975
 
976
+ p.Admonition, li.Admonition {
977
+ font-size: 12.0pt;
978
+ font-family: {{bodyfont}};
979
+ font-weight: bold; }
980
+
956
981
  p.Code, li.Code, div.Code {
957
982
  mso-style-name: Code;
958
983
  mso-style-priority: 16;
@@ -1268,7 +1293,11 @@ div.example {
1268
1293
  }
1269
1294
  */
1270
1295
  p.Example, li.Example, div.Example, td.Example {
1271
- tab-stops: 70.9pt;
1296
+ tab-stops: 70.9pt; }
1297
+
1298
+ p.Example, li.Example, td.Example {
1299
+ mso-style-name: Example;
1300
+ mso-style-link: "Example Char";
1272
1301
  font-size: {{smallerfontsize}};
1273
1302
  font-family: {{bodyfont}}; }
1274
1303
 
@@ -1283,10 +1312,8 @@ div.Example p.MsoListParagraph {
1283
1312
  font-size: {{smallerfontsize}}; }
1284
1313
 
1285
1314
  p.Example, li.Example, div.Example {
1286
- mso-style-name: Example;
1287
1315
  mso-style-unhide: no;
1288
1316
  mso-style-qformat: yes;
1289
- mso-style-link: "Example Char";
1290
1317
  margin-top: 0cm;
1291
1318
  margin-right: 0cm;
1292
1319
  margin-bottom: 6.0pt;
@@ -1295,8 +1322,6 @@ p.Example, li.Example, div.Example {
1295
1322
  line-height: 12.0pt;
1296
1323
  mso-pagination: widow-orphan;
1297
1324
  /* tab-stops:20.15pt; */
1298
- font-size: {{smallerfontsize}};
1299
- font-family: {{bodyfont}};
1300
1325
  mso-fareast-font-family: Calibri;
1301
1326
  mso-bidi-font-family: "Times New Roman";
1302
1327
  mso-ansi-language: EN-GB;
@@ -357,7 +357,7 @@ p.SourceTitle
357
357
  mso-fareast-font-family:"SimSun",serif;
358
358
  mso-bidi-font-family:$bodyfont;
359
359
  mso-ansi-language:EN-GB;}
360
- p.Tabletitle, li.Tabletitle, div.Tabletitle
360
+ p.Tabletitle, li.Tabletitle, div.Tabletitle, p.ListTitle
361
361
  {mso-style-unhide:no;
362
362
  mso-style-qformat:yes;
363
363
  mso-style-parent:"";
@@ -495,12 +495,14 @@ p.Note, div.Note, li.Note, p.TableFootnote, div.TableFootnote, li.TableFootnote
495
495
  line-height:12.0pt;
496
496
  mso-pagination:widow-orphan;
497
497
  tab-stops:20.15pt;
498
- font-size:$smallerfontsize;
499
498
  mso-bidi-font-size:$normalfontsize;
500
- font-family:$bodyfont;
501
499
  mso-fareast-font-family:"SimSun",serif;
502
500
  mso-bidi-font-family:$bodyfont;
503
501
  mso-ansi-language:EN-GB;}
502
+ p.Note, li.Note, p.TableFootnote, div.TableFootnote, li.TableFootnote {
503
+ font-size:$smallerfontsize;
504
+ font-family:$bodyfont;
505
+ }
504
506
  /* may need to be revised */
505
507
  p.ANNEX, li.ANNEX, div.ANNEX
506
508
  {mso-style-name:ANNEX;
@@ -712,6 +714,24 @@ p.TermNum, li.TermNum, div.TermNum
712
714
  mso-ansi-language:EN-GB;
713
715
  font-weight:bold;
714
716
  mso-bidi-font-weight:normal;}
717
+ p.zzHelp, li.zzHelp, div.zzHelp
718
+ {mso-style-name:zzHelp;
719
+ mso-style-unhide:no;
720
+ margin-top:0cm;
721
+ margin-right:0cm;
722
+ margin-bottom:12.0pt;
723
+ margin-left:0cm;
724
+ text-align:justify;
725
+ line-height:12.0pt;
726
+ mso-pagination:widow-orphan;
727
+ font-size:$normalfontsize;
728
+ mso-bidi-font-size:10.0pt;
729
+ font-family:$bodyfont;
730
+ mso-fareast-font-family:"MS Mincho";
731
+ mso-bidi-font-family:"Times New Roman";
732
+ color:green;
733
+ mso-ansi-language:EN-GB;
734
+ mso-fareast-language:JA;}
715
735
  p.zzContents, li.zzContents, div.zzContents
716
736
  {mso-style-name:zzContents;
717
737
  mso-style-noshow:yes;
@@ -885,11 +905,13 @@ p.Quote, li.Quote, div.Quote
885
905
  line-height:12.0pt;
886
906
  mso-pagination:widow-orphan;
887
907
  tab-stops:20.15pt;
888
- font-size:$normalfontsize;
889
- font-family:$bodyfont;
890
908
  mso-fareast-font-family:"SimSun",serif;
891
909
  mso-bidi-font-family:$bodyfont;
892
910
  mso-ansi-language:EN-GB;}
911
+ p.Quote, li.Quote {
912
+ font-size:$normalfontsize;
913
+ font-family:$bodyfont;
914
+ }
893
915
  p.QuoteAttribution
894
916
  {text-align:right;}
895
917
  p.Admonition, li.Admonition, div.Admonition
@@ -897,8 +919,6 @@ p.Admonition, li.Admonition, div.Admonition
897
919
  mso-pagination:widow-orphan;
898
920
  border:none;
899
921
  padding:0cm;
900
- font-size:12.0pt;
901
- font-family:$bodyfont;
902
922
  mso-ascii-font-family:$bodyfont;
903
923
  mso-ascii-theme-font:minor-latin;
904
924
  mso-fareast-font-family:"SimSun",serif;
@@ -907,8 +927,12 @@ p.Admonition, li.Admonition, div.Admonition
907
927
  mso-hansi-theme-font:minor-latin;
908
928
  mso-bidi-font-family:$bodyfont;
909
929
  mso-bidi-theme-font:minor-bidi;
910
- font-weight:bold;
911
930
  mso-ansi-language:EN-AU;}
931
+ p.Admonition, li.Admonition {
932
+ font-size:12.0pt;
933
+ font-family:$bodyfont;
934
+ font-weight:bold;
935
+ }
912
936
  p.Code, li.Code, div.Code
913
937
  {mso-style-name:Code;
914
938
  mso-style-priority:16;
@@ -1230,6 +1254,11 @@ div.example {
1230
1254
  p.Example, li.Example, div.Example, td.Example
1231
1255
  {
1232
1256
  tab-stops:70.9pt;
1257
+ }
1258
+
1259
+ p.Example, li.Example, td.Example {
1260
+ mso-style-name:Example;
1261
+ mso-style-link:"Example Char";
1233
1262
  font-size:$smallerfontsize;
1234
1263
  font-family:$bodyfont;}
1235
1264
 
@@ -1247,10 +1276,9 @@ div.Example p.MsoListParagraph {
1247
1276
  }
1248
1277
 
1249
1278
  p.Example, li.Example, div.Example
1250
- {mso-style-name:Example;
1279
+ {
1251
1280
  mso-style-unhide:no;
1252
1281
  mso-style-qformat:yes;
1253
- mso-style-link:"Example Char";
1254
1282
  margin-top:0cm;
1255
1283
  margin-right:0cm;
1256
1284
  margin-bottom:6.0pt;
@@ -1259,8 +1287,6 @@ p.Example, li.Example, div.Example
1259
1287
  line-height:12.0pt;
1260
1288
  mso-pagination:widow-orphan;
1261
1289
  /* tab-stops:20.15pt; */
1262
- font-size:$smallerfontsize;
1263
- font-family:$bodyfont;
1264
1290
  mso-fareast-font-family:Calibri;
1265
1291
  mso-bidi-font-family:"Times New Roman";
1266
1292
  mso-ansi-language:EN-GB;
@@ -806,6 +806,12 @@ pre {
806
806
  font-size: 1em;
807
807
  text-align: center; }
808
808
 
809
+ .ListTitle {
810
+ font-weight: 700;
811
+ font-size: 1em;
812
+ text-align: center;
813
+ text-align: left; }
814
+
809
815
  .figure-title,
810
816
  .FigureTitle,
811
817
  .SourceTitle,
@@ -989,9 +995,16 @@ span.keyword {
989
995
  text-align: left; }
990
996
 
991
997
  .Admonition p,
992
- .admonition p {
998
+ .admonition p,
999
+ .zzHelp p {
993
1000
  margin: 0; }
994
1001
 
1002
+ div.zzHelp {
1003
+ color: green;
1004
+ padding: 0.5em;
1005
+ margin: 1.5em 0 1.5em 0;
1006
+ text-align: left; }
1007
+
995
1008
  /* Collapse TOC */
996
1009
  .collapse-group {
997
1010
  display: flex;
@@ -504,6 +504,7 @@ pre {
504
504
 
505
505
  @include admonitionBlock();
506
506
  @include recommendationBlock();
507
+ @include listBlock();
507
508
 
508
509
  .figure-title,
509
510
  .FigureTitle,
@@ -696,10 +697,18 @@ span.keyword {
696
697
  }
697
698
 
698
699
  .Admonition p,
699
- .admonition p {
700
+ .admonition p,
701
+ .zzHelp p {
700
702
  margin: 0;
701
703
  }
702
704
 
705
+ div.zzHelp {
706
+ color: green;
707
+ padding: 0.5em;
708
+ margin: 1.5em 0 1.5em 0;
709
+ text-align: left;
710
+ }
711
+
703
712
  /* Collapse TOC */
704
713
 
705
714
  .collapse-group {
@@ -707,34 +707,34 @@ ul, ol {
707
707
  list-style-type: none; }
708
708
 
709
709
  /* https://github.com/metanorma/metanorma-iso/issues/319 : force a) parentheses for ordered lists */
710
- ol[type="alphabet"] {
710
+ ol[class="alphabet"] {
711
711
  counter-reset: alphabet; }
712
712
 
713
- ol[type="arabic"] {
713
+ ol[class="arabic"] {
714
714
  counter-reset: arabic; }
715
715
 
716
- ol[type="roman"] {
716
+ ol[class="roman"] {
717
717
  counter-reset: roman; }
718
718
 
719
- ol[type="alphabet_upper"] {
719
+ ol[class="alphabet_upper"] {
720
720
  counter-reset: alphabet_upper; }
721
721
 
722
- ol[type="roman_upper"] {
722
+ ol[class="roman_upper"] {
723
723
  counter-reset: roman_upper; }
724
724
 
725
- ol[type="alphabet"] ol[type="alphabet"] {
725
+ ol[class="alphabet"] ol[class="alphabet"] {
726
726
  counter-reset: alphabet2; }
727
727
 
728
- ol[type="arabic"] ol[type="arabic"] {
728
+ ol[class="arabic"] ol[class="arabic"] {
729
729
  counter-reset: arabic2; }
730
730
 
731
- ol[type="roman"] ol[type="roman"] {
731
+ ol[class="roman"] ol[class="roman"] {
732
732
  counter-reset: roman2; }
733
733
 
734
- ol[type="alphabet_upper"] ol[type="alphabet_upper"] {
734
+ ol[class="alphabet_upper"] ol[class="alphabet_upper"] {
735
735
  counter-reset: alphabet_upper2; }
736
736
 
737
- ol[type="roman_upper"] ol[type="roman_upper"] {
737
+ ol[class="roman_upper"] ol[class="roman_upper"] {
738
738
  counter-reset: roman_upper2; }
739
739
 
740
740
  ol {
@@ -748,29 +748,29 @@ ol > li:before {
748
748
  position: absolute;
749
749
  left: -1.4em; }
750
750
 
751
- ol[type="roman"] > li:before {
751
+ ol[class="roman"] > li:before {
752
752
  left: -2.0em; }
753
753
 
754
- ol[type="roman_upper"] > li:before {
754
+ ol[class="roman_upper"] > li:before {
755
755
  left: -2.3em; }
756
756
 
757
- ol[type="alphabet"] > li:before {
757
+ ol[class="alphabet"] > li:before {
758
758
  counter-increment: alphabet;
759
759
  content: counter(alphabet, lower-alpha) ") "; }
760
760
 
761
- ol[type="arabic"] > li:before {
761
+ ol[class="arabic"] > li:before {
762
762
  counter-increment: arabic;
763
763
  content: counter(arabic, decimal) ") "; }
764
764
 
765
- ol[type="roman"] > li:before {
765
+ ol[class="roman"] > li:before {
766
766
  counter-increment: roman;
767
767
  content: counter(roman, lower-roman) ") "; }
768
768
 
769
- ol[type="alphabet_upper"] > li:before {
769
+ ol[class="alphabet_upper"] > li:before {
770
770
  counter-increment: alphabet_upper;
771
771
  content: counter(alphabet_upper, upper-alpha) ") "; }
772
772
 
773
- ol[type="roman_upper"] > li:before {
773
+ ol[class="roman_upper"] > li:before {
774
774
  counter-increment: roman_upper;
775
775
  content: counter(roman_upper, upper-roman) ") "; }
776
776
 
@@ -778,23 +778,23 @@ ol > li:before {
778
778
  counter-increment: alphabet;
779
779
  content: counter(alphabet, lower-alpha) ") "; }
780
780
 
781
- ol[type="alphabet"] ol[type="alphabet"] > li:before {
781
+ ol[class="alphabet"] ol[class="alphabet"] > li:before {
782
782
  counter-increment: alphabet2;
783
783
  content: counter(alphabet2, lower-alpha) ") "; }
784
784
 
785
- ol[type="arabic"] ol[type="arabic"] > li:before {
785
+ ol[class="arabic"] ol[class="arabic"] > li:before {
786
786
  counter-increment: arabic2;
787
787
  content: counter(arabic2, decimal) ") "; }
788
788
 
789
- ol[type="roman"] ol[type="roman"] > li:before {
789
+ ol[class="roman"] ol[class="roman"] > li:before {
790
790
  counter-increment: roman2;
791
791
  content: counter(roman2, lower-roman) ") "; }
792
792
 
793
- ol[type="alphabet_upper"] ol[type="alphabet_upper"] > li:before {
793
+ ol[class="alphabet_upper"] ol[class="alphabet_upper"] > li:before {
794
794
  counter-increment: alphabet_upper2;
795
795
  content: counter(alphabet_upper2, upper-alpha) ") "; }
796
796
 
797
- ol[type="roman_upper"] ol[type="roman_upper"] > li:before {
797
+ ol[class="roman_upper"] ol[class="roman_upper"] > li:before {
798
798
  counter-increment: roman_upper2;
799
799
  content: counter(roman_upper2, upper-roman) ") "; }
800
800
 
@@ -848,6 +848,12 @@ pre {
848
848
  font-size: 1em;
849
849
  text-align: center; }
850
850
 
851
+ .ListTitle {
852
+ font-weight: 700;
853
+ font-size: 1em;
854
+ text-align: center;
855
+ text-align: left; }
856
+
851
857
  .figure-title, .FigureTitle, .SourceTitle, .AdmonitionTitle, .RecommendationTitle {
852
858
  font-weight: 700;
853
859
  font-size: 1em;
@@ -873,9 +879,15 @@ pre {
873
879
  margin: 1.5em 0 1.5em 0;
874
880
  text-align: left; }
875
881
 
876
- .Admonition p {
882
+ .Admonition p, .zzHelp p {
877
883
  margin: 0; }
878
884
 
885
+ div.zzHelp {
886
+ color: green;
887
+ padding: 0.5em;
888
+ margin: 1.5em 0 1.5em 0;
889
+ text-align: left; }
890
+
879
891
  /*
880
892
  3.8 Examples
881
893
  */
@@ -410,34 +410,34 @@ ul, ol {
410
410
 
411
411
  /* https://github.com/metanorma/metanorma-iso/issues/319 : force a) parentheses for ordered lists */
412
412
 
413
- ol[type="alphabet"] {
413
+ ol[class="alphabet"] {
414
414
  counter-reset: alphabet;
415
415
  }
416
- ol[type="arabic"] {
416
+ ol[class="arabic"] {
417
417
  counter-reset: arabic;
418
418
  }
419
- ol[type="roman"] {
419
+ ol[class="roman"] {
420
420
  counter-reset: roman;
421
421
  }
422
- ol[type="alphabet_upper"] {
422
+ ol[class="alphabet_upper"] {
423
423
  counter-reset: alphabet_upper;
424
424
  }
425
- ol[type="roman_upper"] {
425
+ ol[class="roman_upper"] {
426
426
  counter-reset: roman_upper;
427
427
  }
428
- ol[type="alphabet"] ol[type="alphabet"] {
428
+ ol[class="alphabet"] ol[class="alphabet"] {
429
429
  counter-reset: alphabet2;
430
430
  }
431
- ol[type="arabic"] ol[type="arabic"] {
431
+ ol[class="arabic"] ol[class="arabic"] {
432
432
  counter-reset: arabic2;
433
433
  }
434
- ol[type="roman"] ol[type="roman"] {
434
+ ol[class="roman"] ol[class="roman"] {
435
435
  counter-reset: roman2;
436
436
  }
437
- ol[type="alphabet_upper"] ol[type="alphabet_upper"] {
437
+ ol[class="alphabet_upper"] ol[class="alphabet_upper"] {
438
438
  counter-reset: alphabet_upper2;
439
439
  }
440
- ol[type="roman_upper"] ol[type="roman_upper"] {
440
+ ol[class="roman_upper"] ol[class="roman_upper"] {
441
441
  counter-reset: roman_upper2;
442
442
  }
443
443
  ol {
@@ -452,29 +452,29 @@ ol > li:before {
452
452
  position: absolute;
453
453
  left: -1.4em;
454
454
  }
455
- ol[type="roman"] > li:before {
455
+ ol[class="roman"] > li:before {
456
456
  left: -2.0em;
457
457
  }
458
- ol[type="roman_upper"] > li:before {
458
+ ol[class="roman_upper"] > li:before {
459
459
  left: -2.3em;
460
460
  }
461
- ol[type="alphabet"] > li:before {
461
+ ol[class="alphabet"] > li:before {
462
462
  counter-increment: alphabet;
463
463
  content: counter(alphabet, lower-alpha)") "
464
464
  }
465
- ol[type="arabic"] > li:before {
465
+ ol[class="arabic"] > li:before {
466
466
  counter-increment: arabic;
467
467
  content: counter(arabic, decimal)") "
468
468
  }
469
- ol[type="roman"] > li:before {
469
+ ol[class="roman"] > li:before {
470
470
  counter-increment: roman;
471
471
  content: counter(roman, lower-roman)") "
472
472
  }
473
- ol[type="alphabet_upper"] > li:before {
473
+ ol[class="alphabet_upper"] > li:before {
474
474
  counter-increment: alphabet_upper;
475
475
  content: counter(alphabet_upper, upper-alpha)") "
476
476
  }
477
- ol[type="roman_upper"] > li:before {
477
+ ol[class="roman_upper"] > li:before {
478
478
  counter-increment: roman_upper;
479
479
  content: counter(roman_upper, upper-roman)") "
480
480
  }
@@ -482,23 +482,23 @@ ol > li:before {
482
482
  counter-increment: alphabet;
483
483
  content: counter(alphabet, lower-alpha)") "
484
484
  }
485
- ol[type="alphabet"] ol[type="alphabet"] > li:before {
485
+ ol[class="alphabet"] ol[class="alphabet"] > li:before {
486
486
  counter-increment: alphabet2;
487
487
  content: counter(alphabet2, lower-alpha)") "
488
488
  }
489
- ol[type="arabic"] ol[type="arabic"] > li:before {
489
+ ol[class="arabic"] ol[class="arabic"] > li:before {
490
490
  counter-increment: arabic2;
491
491
  content: counter(arabic2, decimal)") "
492
492
  }
493
- ol[type="roman"] ol[type="roman"] > li:before {
493
+ ol[class="roman"] ol[class="roman"] > li:before {
494
494
  counter-increment: roman2;
495
495
  content: counter(roman2, lower-roman)") "
496
496
  }
497
- ol[type="alphabet_upper"] ol[type="alphabet_upper"] > li:before {
497
+ ol[class="alphabet_upper"] ol[class="alphabet_upper"] > li:before {
498
498
  counter-increment: alphabet_upper2;
499
499
  content: counter(alphabet_upper2, upper-alpha)") "
500
500
  }
501
- ol[type="roman_upper"] ol[type="roman_upper"] > li:before {
501
+ ol[class="roman_upper"] ol[class="roman_upper"] > li:before {
502
502
  counter-increment: roman_upper2;
503
503
  content: counter(roman_upper2, upper-roman)") "
504
504
  }
@@ -537,6 +537,7 @@ pre {
537
537
 
538
538
  @include admonitionBlock();
539
539
  @include recommendationBlock();
540
+ @include listBlock();
540
541
 
541
542
  .figure-title, .FigureTitle, .SourceTitle, .AdmonitionTitle, .RecommendationTitle {
542
543
  @include blockTitle()
@@ -569,10 +570,17 @@ pre {
569
570
  text-align: left;
570
571
  }
571
572
 
572
- .Admonition p {
573
+ .Admonition p, .zzHelp p {
573
574
  margin: 0;
574
575
  }
575
576
 
577
+ div.zzHelp {
578
+ color: green;
579
+ padding: 0.5em;
580
+ margin: 1.5em 0 1.5em 0;
581
+ text-align: left;
582
+ }
583
+
576
584
 
577
585
  /*
578
586
  3.8 Examples
@@ -1,14 +1,9 @@
1
1
  {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
2
2
  {% else %}
3
3
 
4
- <div style='mso-element:para-border-div;border:solid windowtext 1.0pt;
5
- border-bottom-alt:solid windowtext .5pt;mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:
6
- solid windowtext .5pt;mso-border-right-alt:solid windowtext .5pt;padding:1.0pt 4.0pt 0cm 4.0pt;
7
- margin-left:5.1pt;margin-right:5.1pt'>
8
4
  <div id="boilerplate-copyright-destination"/>
9
- </div>
10
5
 
11
- <p class="zzContents" style='margin-top:0cm'><span lang="EN-GB">{{ labels["table_of_contents"] }}</span></p>
6
+ <p class="zzContents"><span lang="EN-GB">{{ labels["table_of_contents"] }}</span></p>
12
7
 
13
8
  WORDTOC
14
9
  {% endif %}
@@ -1,17 +1,28 @@
1
1
  {% if tc_docnumber.size > 0 %}
2
2
  {% for num in tc_docnumber %}
3
- <p class="zzCover"><span lang="EN-GB">Reference number of working document: {{agency}}/{{tc}} {{ num }}</span><span lang="EN-GB"><o:p></o:p></span></p>
3
+ <p class="zzCover"><span lang="EN-GB">Reference number of working document: {{ num }}</span><span lang="EN-GB"><o:p></o:p></span></p>
4
4
  {% endfor %}
5
5
  {% endif %}
6
6
 
7
7
  {% if revdate %}
8
- <p class="MsoNormal" align="right" style='text-align:right'><span lang="EN-GB">Date: <span style='mso-no-proof:yes'>{{ revdate }}</span></span></p>
8
+ {% assign doc_date = revdate %}
9
+ {% elsif publisheddate %}
10
+ {% assign doc_date = publisheddate %}
11
+ {% elsif issueddate %}
12
+ {% assign doc_date = issueddate %}
13
+ {% elsif createddate %}
14
+ {% assign doc_date = createddate %}
9
15
  {% endif %}
10
16
 
11
- <p class="zzCover"><span lang="EN-GB">Reference number of project: {{ docnumber_undated }} {{ draftinfo }}</span></p>
17
+ {% if doc_date %}
18
+ <p class="zzCover" align="right" style='text-align:right;font-weight:normal;'><span lang="EN-GB">Date: <span style='mso-no-proof:yes'>{{ doc_date }}</span></span></p>
19
+ {% endif %}
20
+
21
+ <p class="zzCover" style='font-weight:normal;'><span lang="EN-GB">Reference number of project: {{ docnumber_undated }}{% if draftinfo %} {{ draftinfo }}{% endif %}</span></p>
12
22
 
13
- <p class="zzCover"><span lang="EN-GB">Committee identification: {{agency}}/{{ editorialgroup | join: "/" }}</span></p>
23
+ <p class="zzCover" style='font-weight:normal;'><span lang="EN-GB">Committee identification: {{ agency }}/{{ approvalgroup | join: "/" }}</span></p>
14
24
 
25
+ <!--
15
26
  {% if doctitleamdlabel %}
16
27
  <p class="zzCover"><b>{{ doctitleamdlabel }}</b></p>
17
28
  {% endif %}
@@ -19,28 +30,28 @@
19
30
  {% if doctitlecorrlabel %}
20
31
  <p class="zzCover"><b>{{ doctitlecorrlabel }}</b></p>
21
32
  {% endif %}
33
+ -->
22
34
 
23
35
  {% if secretariat %}
24
- <p class="zzCover"><span lang="EN-GB">Secretariat: <span>{{ secretariat }}</span></span></p>
36
+ <p class="zzCover" style='font-weight:normal;'><span lang="EN-GB">{{ labels["secretariat"] }}: <span>{{ secretariat }}</span></span></p>
25
37
  {% endif %}
26
38
 
27
39
  <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 %}
29
- </p>
40
+ <span lang="EN-GB"><b>{{ doctitleintro }}{% if doctitleintro and doctitlemain %} &#x2014; {% endif %}{{ doctitlemain }}{% if doctitlemain and doctitlepart %} &#x2014; {% endif %}{% if doctitlepart %}{% if doctitlepartlabel %}{{ doctitlepartlabel }}: {% endif %}{{ doctitlepart }}{% endif %}</b></span></p>
41
+
30
42
  {% if doctitleamdlabel %}
31
- <p class="zzCover">{{ doctitleamdlabel }}{% if doctitleamd %}: {{ doctitleamd }}{% endif %}</p>
43
+ <p class="zzCover"><b>{{ doctitleamdlabel }}{% if doctitleamd %}: {{ doctitleamd }}{% endif %}</b></p>
32
44
  {% endif %}
33
45
  {% if doctitlecorrlabel %}
34
- <p class="zzCover">{{ doctitlecorrlabel }}</p>
46
+ <p class="zzCover"><b>{{ doctitlecorrlabel }}</b></p>
35
47
  {% endif %}
36
48
 
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 %}
38
- </p>
49
+ <p class="zzCover" style='font-weight:normal;'><i>{{ docsubtitleintro }}{% if docsubtitleintro and docsubtitlemain %} &#x2014; {% endif %}{{ docsubtitlemain }}{% if docsubtitlemain and docsubtitlepart %} &#x2014; {% endif %}{% if docsubtitlepart %}{% if docsubtitlepartlabel %}{{ docsubtitlepartlabel }}: {% endif %}{{ docsubtitlepart }}{% endif %}</i></p>
39
50
  {% if docsubtitleamdlabel %}
40
- <p class="zzCover">{{ docsubtitleamdlabel }}{% if docsubtitleamd %}: {{ docsubtitleamd }}{% endif %}</p>
51
+ <p class="zzCover" style='font-weight:normal;'><i>{{ docsubtitleamdlabel }}{% if docsubtitleamd %}: {{ docsubtitleamd }}{% endif %}</i></p>
41
52
  {% endif %}
42
53
  {% if docsubtitlecorrlabel %}
43
- <p class="zzCover">{{ docsubtitlecorrlabel }}</p>
54
+ <p class="zzCover" style='font-weight:normal;'><i>{{ docsubtitlecorrlabel }}</i></p>
44
55
  {% endif %}
45
56
 
46
57
  <div class="coverpage-warning" id="coverpage-note-destination"/>