metanorma-iso 3.3.1 → 3.3.3

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 (38) hide show
  1. checksums.yaml +4 -4
  2. data/lib/isodoc/iso/base_convert.rb +0 -6
  3. data/lib/isodoc/iso/html/style-human.css +33 -7
  4. data/lib/isodoc/iso/html/style-human.scss +29 -7
  5. data/lib/isodoc/iso/html/style-iso.css +33 -6
  6. data/lib/isodoc/iso/html/style-iso.scss +28 -6
  7. data/lib/isodoc/iso/html_convert.rb +8 -1
  8. data/lib/isodoc/iso/iso.amendment.xsl +168 -53
  9. data/lib/isodoc/iso/iso.international-standard.xsl +168 -53
  10. data/lib/isodoc/iso/metadata.rb +0 -1
  11. data/lib/isodoc/iso/presentation_section.rb +8 -0
  12. data/lib/isodoc/iso/presentation_xml_convert.rb +16 -11
  13. data/lib/isodoc/iso/word_convert.rb +8 -10
  14. data/lib/isodoc/iso/word_dis_convert.rb +8 -0
  15. data/lib/metanorma/iso/base.rb +2 -0
  16. data/lib/metanorma/iso/biblio.rng +4 -4
  17. data/lib/metanorma/iso/cleanup_biblio.rb +1 -1
  18. data/lib/metanorma/iso/isodoc.rng +77 -28
  19. data/lib/metanorma/iso/validate.rb +4 -5
  20. data/lib/metanorma/iso/version.rb +1 -1
  21. data/metanorma-iso.gemspec +1 -0
  22. metadata +16 -18
  23. data/lib/asciidoctor/iso/base.rb +0 -2
  24. data/lib/asciidoctor/iso/cleanup.rb +0 -2
  25. data/lib/asciidoctor/iso/converter.rb +0 -2
  26. data/lib/asciidoctor/iso/deprecated.rb +0 -7
  27. data/lib/asciidoctor/iso/front.rb +0 -2
  28. data/lib/asciidoctor/iso/front_id.rb +0 -2
  29. data/lib/asciidoctor/iso/section.rb +0 -2
  30. data/lib/asciidoctor/iso/validate.rb +0 -2
  31. data/lib/asciidoctor/iso/validate_image.rb +0 -2
  32. data/lib/asciidoctor/iso/validate_requirements.rb +0 -2
  33. data/lib/asciidoctor/iso/validate_section.rb +0 -2
  34. data/lib/asciidoctor/iso/validate_style.rb +0 -2
  35. data/lib/asciidoctor/iso/validate_title.rb +0 -2
  36. data/lib/isodoc/iso/html/isodoc-dis.css +0 -4794
  37. data/lib/isodoc/iso/html/wordstyle-dis.css +0 -2565
  38. data/lib/isodoc/iso/html/wordstyle.css +0 -1980
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 3627f1a989c6d2de4b3cdb643cec42761bdc8fae0e2717d760d02abd1b78e195
4
- data.tar.gz: 64820748297125b29676d224abacd67e27cbdf10198241dde7985bceaae263af
3
+ metadata.gz: f3fb4819b20d1155ffd0acf0fd579db499b4fbcc03339da743b1890ae41dfe95
4
+ data.tar.gz: 2b1d15d4c9b4a884727ac31588faee8adc2e902cb3ff84a8cdca8e6e70f7684b
5
5
  SHA512:
6
- metadata.gz: 3b553a3d16a9379f973d03592a38a84955579d5c44b2fe36cefbb350ef350b42312d951c6b75a35882a6ee50d336b145c0be36682c4913f48a89b150b439cad4
7
- data.tar.gz: dfe4f25fa5c06fff908bf343cee16d355488d538df8906759f2c9b14076a574d09d183dfdafe16c2f6f84cb84ffa1257708fcc59d0719daf80358f9c6e93d56f
6
+ metadata.gz: e5b8815b2c3426fa2ba8f804823cb04ae7ec3cc44468f602fa95e68658098c5bb53c1212a339774d9b78acb253e2cc38858f342cbb9d2f87a2a3d0163ca28414
7
+ data.tar.gz: 7f77370059f7c43b52fbc6555e8a49c3574fffa4928bd2e953f0356cda4906b32ddf674d2c04a3716daec6d17d5b054a83dfb73f21ce8e87fed8d5bbe09d5c04
data/lib/isodoc/iso/base_convert.rb CHANGED
@@ -68,12 +68,6 @@ module IsoDoc
68
68
  end
69
69
  end
70
70
 
71
- def admonition_class(node)
72
- if node["type"] == "editorial" then "zzHelp"
73
- else super
74
- end
75
- end
76
-
77
71
  def admonition_p_parse(node, div)
78
72
  admonition_name_in_first_para(node, div)
79
73
  end
data/lib/isodoc/iso/html/style-human.css CHANGED
@@ -319,6 +319,11 @@ svg {
319
319
  display: block; /* ← removes unwanted inline spacing */
320
320
  }
321
321
 
322
+ /* style dfn by override in flavor */
323
+ dfn {
324
+ font-style: inherit;
325
+ }
326
+
322
327
  #standard-band {
323
328
  background-color: #0AC442;
324
329
  }
@@ -633,7 +638,18 @@ h6,
633
638
 
634
639
  /* override for amendments */
635
640
  {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
636
- h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
641
+ h1:not(.AmendNewcontent *),
642
+ h2:not(.AmendNewcontent *),
643
+ h3:not(.AmendNewcontent *),
644
+ h4:not(.AmendNewcontent *),
645
+ h5:not(.AmendNewcontent *),
646
+ h6:not(.AmendNewcontent *),
647
+ .h1:not(.AmendNewcontent *),
648
+ .h2:not(.AmendNewcontent *),
649
+ .h3:not(.AmendNewcontent *),
650
+ .h4:not(.AmendNewcontent *),
651
+ .h5:not(.AmendNewcontent *),
652
+ .h6:not(.AmendNewcontent *) {
637
653
  font-weight: normal;
638
654
  font-size: initial;
639
655
  font-style: italic;
@@ -1402,6 +1418,19 @@ ol > li > p::before {
1402
1418
  margin-right: auto;
1403
1419
  }
1404
1420
 
1421
+ .Quote .Quote {
1422
+ margin-top: 0px;
1423
+ }
1424
+
1425
+ .Quote .h1,
1426
+ .Quote .h2,
1427
+ .Quote .h3,
1428
+ .Quote .h4,
1429
+ .Quote .h5,
1430
+ .Quote .h6 {
1431
+ margin-top: 0px;
1432
+ }
1433
+
1405
1434
  /*
1406
1435
  3.12 Formulas
1407
1436
  */
@@ -1439,16 +1468,13 @@ span.keyword {
1439
1468
  }
1440
1469
 
1441
1470
  .Admonition p,
1442
- .admonition p,
1443
- .zzHelp p {
1471
+ .admonition p {
1444
1472
  margin: 0;
1445
1473
  }
1446
1474
 
1447
- div.zzHelp {
1475
+ div.Admonition.AdmonitionEditorial {
1448
1476
  color: green;
1449
- padding: 0.5em;
1450
- margin: 1.5em 0 1.5em 0;
1451
- text-align: left;
1477
+ background-color: white;
1452
1478
  }
1453
1479
 
1454
1480
  /* Collapse TOC */
data/lib/isodoc/iso/html/style-human.scss CHANGED
@@ -185,7 +185,18 @@ h6,
185
185
 
186
186
  {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
187
187
 
188
- h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
188
+ h1:not(.AmendNewcontent *),
189
+ h2:not(.AmendNewcontent *),
190
+ h3:not(.AmendNewcontent *),
191
+ h4:not(.AmendNewcontent *),
192
+ h5:not(.AmendNewcontent *),
193
+ h6:not(.AmendNewcontent *),
194
+ .h1:not(.AmendNewcontent *),
195
+ .h2:not(.AmendNewcontent *),
196
+ .h3:not(.AmendNewcontent *),
197
+ .h4:not(.AmendNewcontent *),
198
+ .h5:not(.AmendNewcontent *),
199
+ .h6:not(.AmendNewcontent *) {
189
200
  font-weight: normal;
190
201
  font-size: initial;
191
202
  font-style: italic;
@@ -711,6 +722,19 @@ ol>li>p::before {
711
722
  @include blockquoteBlock(#f7f7f7);
712
723
  }
713
724
 
725
+ .Quote .Quote {
726
+ margin-top: 0px;
727
+ }
728
+
729
+ .Quote .h1,
730
+ .Quote .h2,
731
+ .Quote .h3,
732
+ .Quote .h4,
733
+ .Quote .h5,
734
+ .Quote .h6 {
735
+ margin-top: 0px;
736
+ }
737
+
714
738
  /*
715
739
  3.12 Formulas
716
740
  */
@@ -747,16 +771,14 @@ span.keyword {
747
771
  }
748
772
 
749
773
  .Admonition p,
750
- .admonition p,
751
- .zzHelp p {
774
+ .admonition p
775
+ {
752
776
  margin: 0;
753
777
  }
754
778
 
755
- div.zzHelp {
779
+ div.Admonition.AdmonitionEditorial {
756
780
  color: green;
757
- padding: 0.5em;
758
- margin: 1.5em 0 1.5em 0;
759
- text-align: left;
781
+ background-color: white;
760
782
  }
761
783
 
762
784
  /* Collapse TOC */
data/lib/isodoc/iso/html/style-iso.css CHANGED
@@ -319,6 +319,11 @@ svg {
319
319
  display: block; /* ← removes unwanted inline spacing */
320
320
  }
321
321
 
322
+ /* style dfn by override in flavor */
323
+ dfn {
324
+ font-style: inherit;
325
+ }
326
+
322
327
  #standard-band {
323
328
  background-color: #0AC442;
324
329
  }
@@ -590,7 +595,18 @@ h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
590
595
  }
591
596
 
592
597
  {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
593
- h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
598
+ h1:not(.AmendNewcontent *),
599
+ h2:not(.AmendNewcontent *),
600
+ h3:not(.AmendNewcontent *),
601
+ h4:not(.AmendNewcontent *),
602
+ h5:not(.AmendNewcontent *),
603
+ h6:not(.AmendNewcontent *),
604
+ .h1:not(.AmendNewcontent *),
605
+ .h2:not(.AmendNewcontent *),
606
+ .h3:not(.AmendNewcontent *),
607
+ .h4:not(.AmendNewcontent *),
608
+ .h5:not(.AmendNewcontent *),
609
+ .h6:not(.AmendNewcontent *) {
594
610
  font-weight: normal;
595
611
  font-size: initial;
596
612
  font-style: italic;
@@ -1274,15 +1290,13 @@ figcaption, .SourceTitle, .AdmonitionTitle, .RecommendationTitle {
1274
1290
  text-align: left;
1275
1291
  }
1276
1292
 
1277
- .Admonition p, .zzHelp p {
1293
+ .Admonition p {
1278
1294
  margin: 0;
1279
1295
  }
1280
1296
 
1281
- div.zzHelp {
1297
+ div.Admonition.AdmonitionEditorial {
1282
1298
  color: green;
1283
- padding: 0.5em;
1284
- margin: 1.5em 0 1.5em 0;
1285
- text-align: left;
1299
+ background-color: white;
1286
1300
  }
1287
1301
 
1288
1302
  /*
@@ -1464,6 +1478,19 @@ ol > li > p::before {
1464
1478
  margin-right: auto;
1465
1479
  }
1466
1480
 
1481
+ .Quote .Quote {
1482
+ margin-top: 0px;
1483
+ }
1484
+
1485
+ .Quote .h1,
1486
+ .Quote .h2,
1487
+ .Quote .h3,
1488
+ .Quote .h4,
1489
+ .Quote .h5,
1490
+ .Quote .h6 {
1491
+ margin-top: 0px;
1492
+ }
1493
+
1467
1494
  /*
1468
1495
  3.12 Formulas
1469
1496
  */
data/lib/isodoc/iso/html/style-iso.scss CHANGED
@@ -136,7 +136,18 @@ h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
136
136
 
137
137
  {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
138
138
 
139
- h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
139
+ h1:not(.AmendNewcontent *),
140
+ h2:not(.AmendNewcontent *),
141
+ h3:not(.AmendNewcontent *),
142
+ h4:not(.AmendNewcontent *),
143
+ h5:not(.AmendNewcontent *),
144
+ h6:not(.AmendNewcontent *),
145
+ .h1:not(.AmendNewcontent *),
146
+ .h2:not(.AmendNewcontent *),
147
+ .h3:not(.AmendNewcontent *),
148
+ .h4:not(.AmendNewcontent *),
149
+ .h5:not(.AmendNewcontent *),
150
+ .h6:not(.AmendNewcontent *) {
140
151
  font-weight: normal;
141
152
  font-size: initial;
142
153
  font-style: italic;
@@ -584,15 +595,13 @@ figure dl {
584
595
  text-align: left;
585
596
  }
586
597
 
587
- .Admonition p, .zzHelp p {
598
+ .Admonition p {
588
599
  margin: 0;
589
600
  }
590
601
 
591
- div.zzHelp {
602
+ div.Admonition.AdmonitionEditorial {
592
603
  color: green;
593
- padding: 0.5em;
594
- margin: 1.5em 0 1.5em 0;
595
- text-align: left;
604
+ background-color: white;
596
605
  }
597
606
 
598
607
 
@@ -741,6 +750,19 @@ ol > li > p::before {
741
750
  @include blockquoteBlock(#f7f7f7);
742
751
  }
743
752
 
753
+ .Quote .Quote {
754
+ margin-top: 0px;
755
+ }
756
+
757
+ .Quote .h1,
758
+ .Quote .h2,
759
+ .Quote .h3,
760
+ .Quote .h4,
761
+ .Quote .h5,
762
+ .Quote .h6 {
763
+ margin-top: 0px;
764
+ }
765
+
744
766
  /*
745
767
  3.12 Formulas
746
768
  */
data/lib/isodoc/iso/html_convert.rb CHANGED
@@ -115,7 +115,14 @@ module IsoDoc
115
115
 
116
116
  def ol_attrs(node)
117
117
  ret = super
118
- ret.merge(class: OL_STYLE.invert[ret[:type]])
118
+ klass = OL_STYLE.invert[ret[:type]]
119
+ ret = ret.merge(class: klass)
120
+ if (start = node["start"]) && klass
121
+ start_val = start.to_i - 1
122
+ existing_style = ret[:style] ? "#{ret[:style]};" : ""
123
+ ret = ret.merge(style: "#{existing_style}counter-reset: #{klass} #{start_val}")
124
+ end
125
+ ret
119
126
  end
120
127
 
121
128
  include BaseConvert