metanorma-iso 1.3.20 → 1.3.25

Sign up to get free protection for your applications and to get access to all the features.
Files changed (60) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/macos.yml +10 -10
  3. data/.github/workflows/ubuntu.yml +11 -11
  4. data/.github/workflows/windows.yml +11 -12
  5. data/Gemfile +2 -0
  6. data/README.adoc +3 -2
  7. data/lib/asciidoctor/iso/base.rb +17 -1
  8. data/lib/asciidoctor/iso/biblio.rng +131 -46
  9. data/lib/asciidoctor/iso/cleanup.rb +19 -2
  10. data/lib/asciidoctor/iso/front.rb +116 -17
  11. data/lib/asciidoctor/iso/isodoc.rng +32 -4
  12. data/lib/asciidoctor/iso/isostandard-amd.rng +98 -0
  13. data/lib/asciidoctor/iso/isostandard.rng +10 -0
  14. data/lib/asciidoctor/iso/macros.rb +21 -0
  15. data/lib/asciidoctor/iso/section.rb +18 -32
  16. data/lib/asciidoctor/iso/term_lookup_cleanup.rb +90 -0
  17. data/lib/asciidoctor/iso/validate.rb +41 -21
  18. data/lib/asciidoctor/iso/validate_section.rb +2 -2
  19. data/lib/asciidoctor/iso/validate_style.rb +1 -1
  20. data/lib/isodoc/iso/base_convert.rb +57 -41
  21. data/lib/isodoc/iso/html/header.html +5 -5
  22. data/lib/isodoc/iso/html/html_iso_titlepage.html +18 -18
  23. data/lib/isodoc/iso/html/isodoc.scss +28 -28
  24. data/lib/isodoc/iso/html/scripts.html +23 -21
  25. data/lib/isodoc/iso/html/style-human.scss +259 -423
  26. data/lib/isodoc/iso/html/style-iso.scss +151 -382
  27. data/lib/isodoc/iso/html/word_iso_titlepage.html +23 -2
  28. data/lib/isodoc/iso/html/wordstyle.scss +66 -39
  29. data/lib/isodoc/iso/html_convert.rb +7 -9
  30. data/lib/isodoc/iso/iso.international-standard.xsl +4386 -0
  31. data/lib/isodoc/iso/metadata.rb +48 -22
  32. data/lib/isodoc/iso/pdf_convert.rb +32 -0
  33. data/lib/metanorma-iso.rb +1 -0
  34. data/lib/metanorma/iso/processor.rb +13 -1
  35. data/lib/metanorma/iso/version.rb +1 -1
  36. data/spec/asciidoctor-iso/amd_spec.rb +318 -0
  37. data/spec/asciidoctor-iso/base_spec.rb +37 -17
  38. data/spec/asciidoctor-iso/blocks_spec.rb +21 -9
  39. data/spec/asciidoctor-iso/cleanup_spec.rb +203 -175
  40. data/spec/asciidoctor-iso/inline_spec.rb +2 -1
  41. data/spec/asciidoctor-iso/macros_spec.rb +273 -0
  42. data/spec/asciidoctor-iso/refs_spec.rb +7 -4
  43. data/spec/asciidoctor-iso/section_spec.rb +8 -8
  44. data/spec/asciidoctor-iso/validate_spec.rb +1 -1
  45. data/spec/assets/iso.xml +64 -1
  46. data/spec/isodoc/blocks_spec.rb +115 -0
  47. data/spec/isodoc/i18n_spec.rb +12 -20
  48. data/spec/isodoc/inline_spec.rb +2 -2
  49. data/spec/isodoc/iso_spec.rb +1 -1
  50. data/spec/isodoc/metadata_spec.rb +13 -4
  51. data/spec/isodoc/postproc_spec.rb +13 -112
  52. data/spec/isodoc/ref_spec.rb +4 -4
  53. data/spec/isodoc/section_spec.rb +8 -12
  54. data/spec/isodoc/table_spec.rb +24 -24
  55. data/spec/isodoc/terms_spec.rb +2 -2
  56. data/spec/isodoc/xref_spec.rb +19 -19
  57. data/spec/metanorma/processor_spec.rb +2 -2
  58. data/spec/spec_helper.rb +13 -1
  59. metadata +9 -3
  60. data/asciidoctor-iso.gemspec.old +0 -50
data/lib/isodoc/iso/html/header.html CHANGED
@@ -66,7 +66,7 @@ normal'>                            
99
99
 
100
100
  <div style='mso-element:header' id=eh2>
101
101
  <p class=MsoHeader align=left style='text-align:left;line-height:12.0pt;
102
- mso-line-height-rule:exactly'><span lang=EN-GB>{{ docnumber }}:{{ docyear }}(E){{ draftinfo }}</span></p>
102
+ mso-line-height-rule:exactly'><span lang=EN-GB>{{ docnumber_reference }}{{ draftinfo }}</span></p>
103
103
  </div>
104
104
 
105
105
  <div style='mso-element:header' id=eh2l>
106
106
  <p class=MsoHeaderLandscape align=left style='text-align:left;line-height:12.0pt;
107
- mso-line-height-rule:exactly'><span lang=EN-GB>{{ docnumber }}:{{ docyear }}(E){{ draftinfo }}</span></p>
107
+ mso-line-height-rule:exactly'><span lang=EN-GB>{{ docnumber_reference }}{{ draftinfo }}</span></p>
108
108
  </div>
109
109
 
110
110
  <div style='mso-element:header' id=h2>
111
111
  <p class=MsoHeader align=right style='text-align:right;line-height:12.0pt;
112
- mso-line-height-rule:exactly'><span lang=EN-GB>{{ docnumber }}:{{ docyear }}(E){{ draftinfo }}</span></p>
112
+ mso-line-height-rule:exactly'><span lang=EN-GB>{{ docnumber_reference }}{{ draftinfo }}</span></p>
113
113
  </div>
114
114
 
115
115
  <div style='mso-element:header' id=h2l>
116
116
  <p class=MsoHeaderLandscape align=right style='text-align:right;line-height:12.0pt;
117
- mso-line-height-rule:exactly'><span lang=EN-GB>{{ docnumber }}:{{ docyear }}(E){{ draftinfo }}</span></p>
117
+ mso-line-height-rule:exactly'><span lang=EN-GB>{{ docnumber_reference }}{{ draftinfo }}</span></p>
118
118
  </div>
119
119
 
120
120
  <div style='mso-element:footer' id=ef2>
data/lib/isodoc/iso/html/html_iso_titlepage.html CHANGED
@@ -4,7 +4,7 @@
4
4
  <p class="coverpage_docnumber">{{ num }}</p>
5
5
  {% endfor %}
6
6
  {% else %}
7
- <p class="coverpage_docnumber">{{ docnumber }}(E) {{ draftinfo }}</p>
7
+ <p class="coverpage_docnumber">{{ docnumber_lang }} {{ draftinfo }}</p>
8
8
  {% endif %}
9
9
 
10
10
  {% if revdate %}
@@ -12,7 +12,7 @@
12
12
  {% endif %}
13
13
 
14
14
  {% if tc_docnumber.size > 0 %}
15
- <p class="coverpage_docnumber">{{ docnumber }}(E) {{ draftinfo }}</p>
15
+ <p class="coverpage_docnumber">{{ docnumber_lang }} {{ draftinfo }}</p>
16
16
  {% endif %}
17
17
 
18
18
  <p class="coverpage_techcommittee">{{ agency }}/{{ editorialgroup | join: "/" }}</p>
@@ -26,7 +26,14 @@ name="CVP_Secretariat_Loca">Secretariat: {{ secretariat }}
26
26
  {% if doctitlepartlabel %}<span class="partlabel">{{ doctitlepartlabel }}: </span>{% endif %}
27
27
  <span class="part">{{ doctitlepart }}</span>
28
28
  {% endif %}
29
- </div></div>
29
+ </div>
30
+ {% if doctitleamdlabel %}
31
+ <div class="doctitle-part">{{ doctitleamdlabel }}{% if doctitleamd %}: {{ doctitleamd }}{% endif %}</div>
32
+ {% endif %}
33
+ {% if doctitlecorrlabel %}
34
+ <div class="doctitle-part">{{ doctitlecorrlabel }}</div>
35
+ {% endif %}
36
+ </div>
30
37
 
31
38
  <div class="doctitle-fr"><div><span class="title">{{ docsubtitleintro }}{% if docsubtitleintro and docsubtitlemain %} &mdash; {% endif %}</span><span class="subtitle">{{ docsubtitlemain }}{% if docsubtitlemain and docsubtitlepart %} &mdash;{% endif %}</span>
32
39
  {% if docsubtitlepart %}
@@ -34,7 +41,14 @@ name="CVP_Secretariat_Loca">Secretariat: {{ secretariat }}
34
41
  {% if docsubtitlepartlabel %}<span class="partlabel">{{ docsubtitlepartlabel }}: </span>{% endif %}
35
42
  <span class="part">{{ docsubtitlepart }}</span>
36
43
  {% endif %}
37
- </div></div>
44
+ </div>
45
+ {% if docsubtitleamdlabel %}
46
+ <div>{{ docsubtitleamdlabel }}{% if docsubtitleamd %}: {{ docsubtitleamd }}{% endif %}</div>
47
+ {% endif %}
48
+ {% if docsubtitlecorrlabel %}
49
+ <div>{{ docsubtitlecorrlabel }}</div>
50
+ {% endif %}
51
+ </div>
38
52
 
39
53
  <div class="coverpage_docstage">
40
54
  {% if unpublished %}
@@ -45,19 +59,5 @@ name="CVP_Secretariat_Loca">Secretariat: {{ secretariat }}
45
59
  {% if unpublished %}
46
60
  <div class="coverpage_warning">
47
61
  <div id="boilerplate-license-destination"/>
48
- <!--
49
- <p>Warning for WDs
50
- and CDs</p>
51
-
52
- <p>This
53
- document is not an ISO International Standard. It is distributed for review and
54
- comment. It is subject to change without notice and may not be referred to as
55
- an International Standard.</p>
56
-
57
- <p>Recipients
58
- of this draft are invited to submit, with their comments, notification of any
59
- relevant patent rights of which they are aware and to provide supporting
60
- documentation.</p>
61
- -->
62
62
  </div>
63
63
  {% endif %}
data/lib/isodoc/iso/html/isodoc.scss CHANGED
@@ -12,7 +12,7 @@ p.Sourcecode, li.Sourcecode, div.Sourcecode, pre.Sourcecode
12
12
  tab-stops:20.15pt;
13
13
  font-size:9.0pt;
14
14
  font-family:$monospacefont;
15
- mso-fareast-font-family:Calibri;
15
+ mso-fareast-font-family:"SimSun",serif;
16
16
  mso-bidi-font-family:"Courier New";
17
17
  mso-ansi-language:EN-GB;}
18
18
  p.pseudocode, li.pseudocode, div.pseudocode
@@ -29,7 +29,7 @@ p.pseudocode, li.pseudocode, div.pseudocode
29
29
  tab-stops:20.15pt;
30
30
  font-size:10.0pt;
31
31
  font-family:$bodyfont;
32
- mso-fareast-font-family:Calibri;
32
+ mso-fareast-font-family:"SimSun",serif;
33
33
  mso-bidi-font-family:"Courier New";
34
34
  mso-ansi-language:EN-GB;}
35
35
  p.Biblio, li.Biblio, div.Biblio
@@ -46,7 +46,7 @@ p.Biblio, li.Biblio, div.Biblio
46
46
  mso-pagination:widow-orphan;
47
47
  font-size:11.0pt;
48
48
  font-family:$bodyfont;
49
- mso-fareast-font-family:$bodyfont;
49
+ mso-fareast-font-family:"SimSun",serif;
50
50
  mso-bidi-font-family:$bodyfont;
51
51
  mso-ansi-language:EN-GB;}
52
52
  p.NormRef, li.NormRef, div.NormRef
@@ -63,7 +63,7 @@ p.NormRef, li.NormRef, div.NormRef
63
63
  mso-pagination:widow-orphan;
64
64
  font-size:11.0pt;
65
65
  font-family:$bodyfont;
66
- mso-fareast-font-family:$bodyfont;
66
+ mso-fareast-font-family:"SimSun",serif;
67
67
  mso-bidi-font-family:$bodyfont;
68
68
  mso-ansi-language:EN-GB;}
69
69
  p.FigureTitle
@@ -82,7 +82,7 @@ p.FigureTitle
82
82
  font-size:11.0pt;
83
83
  font-family:$bodyfont;
84
84
  font-weight:bold;
85
- mso-fareast-font-family:$bodyfont;
85
+ mso-fareast-font-family:"SimSun",serif;
86
86
  mso-bidi-font-family:$bodyfont;
87
87
  mso-ansi-language:EN-GB;}
88
88
  p.AdmonitionTitle, p.RecommendationTitle
@@ -101,7 +101,7 @@ p.AdmonitionTitle, p.RecommendationTitle
101
101
  font-size:11.0pt;
102
102
  font-family:$bodyfont;
103
103
  font-weight:bold;
104
- mso-fareast-font-family:$bodyfont;
104
+ mso-fareast-font-family:"SimSun",serif;
105
105
  mso-bidi-font-family:$bodyfont;
106
106
  mso-ansi-language:EN-GB;}
107
107
  p.SourceTitle
@@ -120,7 +120,7 @@ p.SourceTitle
120
120
  font-size:11.0pt;
121
121
  font-family:$bodyfont;
122
122
  font-weight:bold;
123
- mso-fareast-font-family:$bodyfont;
123
+ mso-fareast-font-family:"SimSun",serif;
124
124
  mso-bidi-font-family:$bodyfont;
125
125
  mso-ansi-language:EN-GB;}
126
126
  p.TableTitle
@@ -139,7 +139,7 @@ p.TableTitle
139
139
  font-size:11.0pt;
140
140
  font-weight:bold;
141
141
  font-family:$bodyfont;
142
- mso-fareast-font-family:$bodyfont;
142
+ mso-fareast-font-family:"SimSun",serif;
143
143
  mso-bidi-font-family:$bodyfont;
144
144
  mso-ansi-language:EN-GB;}
145
145
  p.Note, div.Note, li.Note, p.TableFootnote, div.TableFootnote, li.TableFootnote
@@ -157,7 +157,7 @@ p.Note, div.Note, li.Note, p.TableFootnote, div.TableFootnote, li.TableFootnote
157
157
  font-size:10.0pt;
158
158
  mso-bidi-font-size:11.0pt;
159
159
  font-family:$bodyfont;
160
- mso-fareast-font-family:$bodyfont;
160
+ mso-fareast-font-family:"SimSun",serif;
161
161
  mso-bidi-font-family:$bodyfont;
162
162
  mso-ansi-language:EN-GB;}
163
163
  /* may need to be revised */
@@ -183,7 +183,7 @@ p.ANNEX, li.ANNEX, div.ANNEX
183
183
  font-size:14.0pt;
184
184
  mso-bidi-font-size:11.0pt;
185
185
  font-family:$headerfont;
186
- mso-fareast-font-family:$headerfont;
186
+ mso-fareast-font-family:"SimHei",serif;
187
187
  mso-bidi-font-family:$headerfont;
188
188
  mso-ansi-language:EN-GB;
189
189
  mso-fareast-language:JA;
@@ -205,7 +205,7 @@ p.BiblioTitle, li.BiblioTitle, div.BiblioTitle
205
205
  font-size:14.0pt;
206
206
  mso-bidi-font-size:11.0pt;
207
207
  font-family:$headerfont;
208
- mso-fareast-font-family:$headerfont;
208
+ mso-fareast-font-family:"SimHei",serif;
209
209
  mso-bidi-font-family:$headerfont;
210
210
  mso-ansi-language:EN-GB;
211
211
  font-weight:bold;
@@ -224,7 +224,7 @@ p.Definition, li.Definition, div.Definition
224
224
  tab-stops:20.15pt;
225
225
  font-size:11.0pt;
226
226
  font-family:$bodyfont;
227
- mso-fareast-font-family:$bodyfont;
227
+ mso-fareast-font-family:"SimSun",serif;
228
228
  mso-bidi-font-family:$bodyfont;
229
229
  mso-ansi-language:EN-GB;}
230
230
  p.ForewordTitle, li.ForewordTitle, div.ForewordTitle
@@ -246,7 +246,7 @@ p.ForewordTitle, li.ForewordTitle, div.ForewordTitle
246
246
  font-size:14.0pt;
247
247
  mso-bidi-font-size:11.0pt;
248
248
  font-family:$headerfont;
249
- mso-fareast-font-family:$headerfont;
249
+ mso-fareast-font-family:"SimHei",serif;
250
250
  mso-bidi-font-family:$headerfont;
251
251
  mso-ansi-language:EN-GB;
252
252
  font-weight:bold;
@@ -270,7 +270,7 @@ p.IntroTitle, li.IntroTitle, div.IntroTitle
270
270
  font-size:14.0pt;
271
271
  mso-bidi-font-size:11.0pt;
272
272
  font-family:$headerfont;
273
- mso-fareast-font-family:$headerfont;
273
+ mso-fareast-font-family:"SimHei",serif;
274
274
  mso-bidi-font-family:$headerfont;
275
275
  mso-ansi-language:EN-GB;
276
276
  font-weight:bold;
@@ -293,7 +293,7 @@ p.TitlePageSubhead, li.TitlePageSubhead, div.TitlePageSubhead {
293
293
  font-size:14.0pt;
294
294
  mso-bidi-font-size:11.0pt;
295
295
  font-family:$headerfont;
296
- mso-fareast-font-family:$headerfont;
296
+ mso-fareast-font-family:"SimHei",serif;
297
297
  mso-bidi-font-family:$headerfont;
298
298
  mso-ansi-language:EN-GB;
299
299
  font-weight:bold;
@@ -313,7 +313,7 @@ p.Terms, li.Terms, div.Terms
313
313
  tab-stops:20.15pt;
314
314
  font-size:11.0pt;
315
315
  font-family:$headerfont;
316
- mso-fareast-font-family:$headerfont;
316
+ mso-fareast-font-family:"SimHei",serif;
317
317
  mso-bidi-font-family:$headerfont;
318
318
  mso-ansi-language:EN-GB;
319
319
  font-weight:bold;
@@ -332,7 +332,7 @@ p.AltTerms, li.AltTerms, div.AltTerms
332
332
  tab-stops:20.15pt;
333
333
  font-size:11.0pt;
334
334
  font-family:$bodyfont;
335
- mso-fareast-font-family:$bodyfont;
335
+ mso-fareast-font-family:"SimSun",serif;
336
336
  mso-bidi-font-family:$bodyfont;
337
337
  mso-ansi-language:EN-GB;
338
338
  mso-bidi-font-weight:normal;}
@@ -350,7 +350,7 @@ p.DeprecatedTerms, li.DeprecatedTerms, div.DeprecatedTerms
350
350
  tab-stops:20.15pt;
351
351
  font-size:11.0pt;
352
352
  font-family:$bodyfont;
353
- mso-fareast-font-family:$bodyfont;
353
+ mso-fareast-font-family:"SimSun",serif;
354
354
  mso-bidi-font-family:$bodyfont;
355
355
  mso-ansi-language:EN-GB;
356
356
  mso-bidi-font-weight:normal;}
@@ -367,7 +367,7 @@ p.TermNum, li.TermNum, div.TermNum
367
367
  tab-stops:20.15pt;
368
368
  font-size:11.0pt;
369
369
  font-family:$headerfont;
370
- mso-fareast-font-family:$headerfont;
370
+ mso-fareast-font-family:"SimHei",serif;
371
371
  mso-bidi-font-family:$headerfont;
372
372
  mso-ansi-language:EN-GB;
373
373
  font-weight:bold;
@@ -391,7 +391,7 @@ p.zzContents, li.zzContents, div.zzContents
391
391
  font-size:14.0pt;
392
392
  mso-bidi-font-size:11.0pt;
393
393
  font-family:$headerfont;
394
- mso-fareast-font-family:$headerfont;
394
+ mso-fareast-font-family:"SimHei",serif;
395
395
  mso-bidi-font-family:$headerfont;
396
396
  mso-ansi-language:EN-GB;
397
397
  font-weight:bold;
@@ -412,7 +412,7 @@ p.zzCopyright, li.zzCopyright, div.zzCopyright
412
412
  mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt;
413
413
  font-size:10.0pt;
414
414
  font-family:$bodyfont;
415
- mso-fareast-font-family:$bodyfont;
415
+ mso-fareast-font-family:"SimSun",serif;
416
416
  mso-bidi-font-family:$bodyfont;
417
417
  mso-ansi-language:EN-GB;}
418
418
  p.zzCopyright1
@@ -431,7 +431,7 @@ p.zzCopyright1
431
431
  mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt;
432
432
  font-size:10.0pt;
433
433
  font-family:$bodyfont;
434
- mso-fareast-font-family:$bodyfont;
434
+ mso-fareast-font-family:"SimSun",serif;
435
435
  mso-bidi-font-family:$bodyfont;
436
436
  mso-ansi-language:EN-GB;}
437
437
  p.zzAddress {
@@ -483,7 +483,7 @@ p.zzSTDTitle, li.zzSTDTitle, div.zzSTDTitle
483
483
  font-size:16.0pt;
484
484
  mso-bidi-font-size:11.0pt;
485
485
  font-family:$headerfont;
486
- mso-fareast-font-family:$headerfont;
486
+ mso-fareast-font-family:"SimHei",serif;
487
487
  mso-bidi-font-family:$headerfont;
488
488
  mso-ansi-language:EN-GB;
489
489
  font-weight:bold;
@@ -505,7 +505,7 @@ p.zzSTDTitle1, li.zzSTDTitle1, div.zzSTDTitle1
505
505
  font-size:16.0pt;
506
506
  mso-bidi-font-size:11.0pt;
507
507
  font-family:$headerfont;
508
- mso-fareast-font-family:$headerfont;
508
+ mso-fareast-font-family:"SimHei",serif;
509
509
  mso-bidi-font-family:$headerfont;
510
510
  mso-ansi-language:EN-GB;
511
511
  font-weight:bold;
@@ -522,7 +522,7 @@ p.Quote, li.Quote, div.Quote
522
522
  tab-stops:20.15pt;
523
523
  font-size:11.0pt;
524
524
  font-family:$bodyfont;
525
- mso-fareast-font-family:$bodyfont;
525
+ mso-fareast-font-family:"SimSun",serif;
526
526
  mso-bidi-font-family:$bodyfont;
527
527
  mso-ansi-language:EN-GB;}
528
528
  p.QuoteAttribution
@@ -536,7 +536,7 @@ p.Admonition, li.Admonition, div.Admonition
536
536
  font-family:$bodyfont;
537
537
  mso-ascii-font-family:$bodyfont;
538
538
  mso-ascii-theme-font:minor-latin;
539
- mso-fareast-font-family:$bodyfont;
539
+ mso-fareast-font-family:"SimSun",serif;
540
540
  mso-fareast-theme-font:minor-fareast;
541
541
  mso-hansi-font-family:$bodyfont;
542
542
  mso-hansi-theme-font:minor-latin;
@@ -557,7 +557,7 @@ p.Code, li.Code, div.Code
557
557
  font-size:9.0pt;
558
558
  mso-bidi-font-size:11.0pt;
559
559
  font-family:$monospacefont;
560
- mso-fareast-font-family:Calibri;
560
+ mso-fareast-font-family:"SimSun",serif;
561
561
  mso-bidi-font-family:"Cambria";
562
562
  mso-ansi-language:EN-GB;}
563
563
  p.Formula, li.Formula, div.Formula
@@ -573,7 +573,7 @@ p.Formula, li.Formula, div.Formula
573
573
  tab-stops:right 487.45pt;
574
574
  font-size:11.0pt;
575
575
  font-family:$bodyfont;
576
- mso-fareast-font-family:$bodyfont;
576
+ mso-fareast-font-family:"SimSun",serif;
577
577
  mso-bidi-font-family:$bodyfont;
578
578
  mso-ansi-language:EN-GB;}
579
579
  table.dl
data/lib/isodoc/iso/html/scripts.html CHANGED
@@ -1,24 +1,8 @@
1
- <script>
2
- //TOC generation
3
- $('#toc').toc({
4
- //'selectors': 'h1,h2:not(.TermNum)', //elements to use as headings
5
- 'selectors': toclevel(), //elements to use as headings
6
- 'container': 'main', //element to find all selectors in
7
- 'smoothScrolling': true, //enable or disable smooth scrolling on click
8
- 'prefix': 'toc', //prefix for anchor tags and class names
9
- 'onHighlight': function(el) {}, //called when a new section is highlighted
10
- 'highlightOnScroll': true, //add class to heading that is currently in focus
11
- 'highlightOffset': 100, //offset to trigger the next headline
12
- 'anchorName': function(i, heading, prefix) { //custom function for anchor name
13
- return prefix+i;
14
- },
15
- 'headerText': function(i, heading, $heading) { //custom function building the header-item text
16
- return $heading.text();
17
- },
18
- 'itemClass': function(i, heading, $heading, prefix) { // custom function for item class
19
- return $heading[0].tagName.toLowerCase();
20
- }
21
- });
1
+ <script>
2
+ $("#toc").on('click', 'li', function(e) {
3
+ $(this).parent().find('li.toc-active').removeClass('toc-active');
4
+ $(this).addClass('toc-active');
5
+ });
22
6
  </script>
23
7
 
24
8
  <script>
@@ -174,3 +158,21 @@ $('#toggle').on('click', function(){
174
158
  $("[rel=footnote]").inlineFootnote();
175
159
  });
176
160
  </script>
161
+ <script>
162
+ // @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&dn=expat.txt Expat
163
+ //
164
+ // AnchorJS - v4.2.2 - 2020-04-20
165
+ // https://www.bryanbraun.com/anchorjs/
166
+ // Copyright (c) 2020 Bryan Braun; Licensed MIT
167
+ //
168
+ // @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&dn=expat.txt Expat
169
+ !function(A,e){"use strict";"function"==typeof define&&define.amd?define([],e):"object"==typeof module&&module.exports?module.exports=e():(A.AnchorJS=e(),A.anchors=new A.AnchorJS)}(this,function(){"use strict";return function(A){function f(A){A.icon=A.hasOwnProperty("icon")?A.icon:"",A.visible=A.hasOwnProperty("visible")?A.visible:"hover",A.placement=A.hasOwnProperty("placement")?A.placement:"right",A.ariaLabel=A.hasOwnProperty("ariaLabel")?A.ariaLabel:"Anchor",A.class=A.hasOwnProperty("class")?A.class:"",A.base=A.hasOwnProperty("base")?A.base:"",A.truncate=A.hasOwnProperty("truncate")?Math.floor(A.truncate):64,A.titleText=A.hasOwnProperty("titleText")?A.titleText:""}function p(A){var e;if("string"==typeof A||A instanceof String)e=[].slice.call(document.querySelectorAll(A));else{if(!(Array.isArray(A)||A instanceof NodeList))throw new Error("The selector provided to AnchorJS was invalid.");e=[].slice.call(A)}return e}this.options=A||{},this.elements=[],f(this.options),this.isTouchDevice=function(){return!!("ontouchstart"in window||window.DocumentTouch&&document instanceof DocumentTouch)},this.add=function(A){var e,t,i,n,o,s,a,r,c,h,l,u,d=[];if(f(this.options),"touch"===(l=this.options.visible)&&(l=this.isTouchDevice()?"always":"hover"),0===(e=p(A=A||"h2, h3, h4, h5, h6")).length)return this;for(!function(){if(null!==document.head.querySelector("style.anchorjs"))return;var A,e=document.createElement("style");e.className="anchorjs",e.appendChild(document.createTextNode("")),void 0===(A=document.head.querySelector('[rel="stylesheet"],style'))?document.head.appendChild(e):document.head.insertBefore(e,A);e.sheet.insertRule(".anchorjs-link{opacity:0;text-decoration:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}",e.sheet.cssRules.length),e.sheet.insertRule(":hover>.anchorjs-link,.anchorjs-link:focus{opacity:1}",e.sheet.cssRules.length),e.sheet.insertRule("[data-anchorjs-icon]::after{content:attr(data-anchorjs-icon)}",e.sheet.cssRules.length),e.sheet.insertRule('@font-face{font-family:anchorjs-icons;src:url(data:n/a;base64,AAEAAAALAIAAAwAwT1MvMg8yG2cAAAE4AAAAYGNtYXDp3gC3AAABpAAAAExnYXNwAAAAEAAAA9wAAAAIZ2x5ZlQCcfwAAAH4AAABCGhlYWQHFvHyAAAAvAAAADZoaGVhBnACFwAAAPQAAAAkaG10eASAADEAAAGYAAAADGxvY2EACACEAAAB8AAAAAhtYXhwAAYAVwAAARgAAAAgbmFtZQGOH9cAAAMAAAAAunBvc3QAAwAAAAADvAAAACAAAQAAAAEAAHzE2p9fDzz1AAkEAAAAAADRecUWAAAAANQA6R8AAAAAAoACwAAAAAgAAgAAAAAAAAABAAADwP/AAAACgAAA/9MCrQABAAAAAAAAAAAAAAAAAAAAAwABAAAAAwBVAAIAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAMCQAGQAAUAAAKZAswAAACPApkCzAAAAesAMwEJAAAAAAAAAAAAAAAAAAAAARAAAAAAAAAAAAAAAAAAAAAAQAAg//0DwP/AAEADwABAAAAAAQAAAAAAAAAAAAAAIAAAAAAAAAIAAAACgAAxAAAAAwAAAAMAAAAcAAEAAwAAABwAAwABAAAAHAAEADAAAAAIAAgAAgAAACDpy//9//8AAAAg6cv//f///+EWNwADAAEAAAAAAAAAAAAAAAAACACEAAEAAAAAAAAAAAAAAAAxAAACAAQARAKAAsAAKwBUAAABIiYnJjQ3NzY2MzIWFxYUBwcGIicmNDc3NjQnJiYjIgYHBwYUFxYUBwYGIwciJicmNDc3NjIXFhQHBwYUFxYWMzI2Nzc2NCcmNDc2MhcWFAcHBgYjARQGDAUtLXoWOR8fORYtLTgKGwoKCjgaGg0gEhIgDXoaGgkJBQwHdR85Fi0tOAobCgoKOBoaDSASEiANehoaCQkKGwotLXoWOR8BMwUFLYEuehYXFxYugC44CQkKGwo4GkoaDQ0NDXoaShoKGwoFBe8XFi6ALjgJCQobCjgaShoNDQ0NehpKGgobCgoKLYEuehYXAAAADACWAAEAAAAAAAEACAAAAAEAAAAAAAIAAwAIAAEAAAAAAAMACAAAAAEAAAAAAAQACAAAAAEAAAAAAAUAAQALAAEAAAAAAAYACAAAAAMAAQQJAAEAEAAMAAMAAQQJAAIABgAcAAMAAQQJAAMAEAAMAAMAAQQJAAQAEAAMAAMAAQQJAAUAAgAiAAMAAQQJAAYAEAAMYW5jaG9yanM0MDBAAGEAbgBjAGgAbwByAGoAcwA0ADAAMABAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAH//wAP) format("truetype")}',e.sheet.cssRules.length)}(),t=document.querySelectorAll("[id]"),i=[].map.call(t,function(A){return A.id}),o=0;o<e.length;o++)if(this.hasAnchorJSLink(e[o]))d.push(o);else{if(e[o].hasAttribute("id"))n=e[o].getAttribute("id");else if(e[o].hasAttribute("data-anchor-id"))n=e[o].getAttribute("data-anchor-id");else{for(c=r=this.urlify(e[o].textContent),a=0;void 0!==s&&(c=r+"-"+a),a+=1,-1!==(s=i.indexOf(c)););s=void 0,i.push(c),e[o].setAttribute("id",c),n=c}(h=document.createElement("a")).className="anchorjs-link "+this.options.class,h.setAttribute("aria-label",this.options.ariaLabel),h.setAttribute("data-anchorjs-icon",this.options.icon),this.options.titleText&&(h.title=this.options.titleText),u=document.querySelector("base")?window.location.pathname+window.location.search:"",u=this.options.base||u,h.href=u+"#"+n,"always"===l&&(h.style.opacity="1"),""===this.options.icon&&(h.style.font="1em/1 anchorjs-icons","left"===this.options.placement&&(h.style.lineHeight="inherit")),"left"===this.options.placement?(h.style.position="absolute",h.style.marginLeft="-1em",h.style.paddingRight="0.5em",e[o].insertBefore(h,e[o].firstChild)):(h.style.paddingLeft="0.375em",e[o].appendChild(h))}for(o=0;o<d.length;o++)e.splice(d[o]-o,1);return this.elements=this.elements.concat(e),this},this.remove=function(A){for(var e,t,i=p(A),n=0;n<i.length;n++)(t=i[n].querySelector(".anchorjs-link"))&&(-1!==(e=this.elements.indexOf(i[n]))&&this.elements.splice(e,1),i[n].removeChild(t));return this},this.removeAll=function(){this.remove(this.elements)},this.urlify=function(A){return this.options.truncate||f(this.options),A.trim().replace(/\'/gi,"").replace(/[& +$,:;=?@"#{}|^~[`%!'<>\]\.\/\(\)\*\\\n\t\b\v]/g,"-").replace(/-{2,}/g,"-").substring(0,this.options.truncate).replace(/^-+|-+$/gm,"").toLowerCase()},this.hasAnchorJSLink=function(A){var e=A.firstChild&&-1<(" "+A.firstChild.className+" ").indexOf(" anchorjs-link "),t=A.lastChild&&-1<(" "+A.lastChild.className+" ").indexOf(" anchorjs-link ");return e||t||!1}}});
170
+ // @license-end
171
+ </script>
172
+ <script>
173
+ anchors.options = {
174
+ placement: 'left'
175
+ };
176
+ anchors.add('h1, h2, h3, h4');
177
+ </script>
178
+
data/lib/isodoc/iso/html/style-human.scss CHANGED
@@ -7,123 +7,43 @@
7
7
  License: none (public domain)
8
8
  */
9
9
 
10
- html, body, div, span, applet, object, iframe,
11
- h1, h2, h3, h4, h5, h6, p, blockquote, pre,
12
- a, abbr, acronym, address, big, cite, code,
13
- del, dfn, em, img, ins, kbd, q, s, samp,
14
- small, strike, strong, sub, sup, tt, var,
15
- b, u, i, center,
16
- ol, ul, li,
17
- fieldset, form, label, legend,
18
- table, caption, tbody, tfoot, thead, tr, th, td,
19
- article, aside, canvas, details, embed,
20
- figure, figcaption, footer, header, hgroup,
21
- menu, nav, output, ruby, section, summary,
22
- time, mark, audio, video {
23
- margin: 0;
24
- padding: 0;
25
- }
26
-
27
- html, body, div, span, applet, object, iframe,
28
- h1, h2, h3, h4, h5, h6, p, blockquote, pre,
29
- a, abbr, acronym, address, big, cite, code,
30
- del, dfn, em, img, ins, kbd, q, s, samp,
31
- small, strike, strong, sub, sup, tt, var,
32
- b, u, i, center,
33
- dl, dt, dd, ol, ul, li,
34
- fieldset, form, label, legend,
35
- table, caption, tbody, tfoot, thead, tr, th, td,
36
- article, aside, canvas, details, embed,
37
- figure, figcaption, footer, header, hgroup,
38
- menu, nav, output, ruby, section, summary,
39
- time, mark, audio, video {
40
- border: 0;
41
- font-size: 100%;
42
- }
43
-
44
- html, body, div, span, applet, object, iframe,
45
- h1, h2, h3, h4, h5, h6, p, blockquote, pre,
46
- a, abbr, acronym, address, big, cite, code,
47
- del, dfn, em, img, ins, kbd, q, s, samp,
48
- small, strike, strong, tt, var,
49
- b, u, i, center,
50
- dl, dd, ol, ul, li,
51
- fieldset, form, label, legend,
52
- table, caption, tbody, tfoot, thead, tr, th, td,
53
- article, aside, canvas, details, embed,
54
- figure, figcaption, footer, header, hgroup,
55
- menu, nav, output, ruby, section, summary,
56
- time, mark, audio, video {
57
- vertical-align: baseline;
58
- }
59
-
60
-
61
- html, body, div, span, applet, object, iframe,
62
- p, blockquote,
63
- a, abbr, acronym, address, big, cite,
64
- del, dfn, em, img, ins, q, s,
65
- small, strike, strong, sub, sup, var,
66
- b, u, i, center,
67
- dl, dt, dd, ol, ul, li,
68
- fieldset, form, label, legend,
69
- table, caption, tbody, tfoot, thead, tr, th, td,
70
- article, aside, canvas, details, embed,
71
- figure, figcaption, footer, header, hgroup,
72
- menu, nav, output, ruby, section, summary,
73
- time, mark, audio, video {
74
- font-family: $bodyfont;
75
- }
76
-
77
- code, pre, tt, kbd, samp {
78
- font-family: $monospacefont;
79
- font-variant-ligatures: none;
80
- }
81
-
82
- code *, pre *, tt *, kbd *, samp * {
83
- font-family: $monospacefont !important;
84
- font-variant-ligatures: none;
85
- }
86
-
87
- h1, h2, h3, h4, h5, h6, .h2Annex {
88
- font-family: $headerfont;
89
- }
90
-
91
- dl {
92
- display: grid;
93
- grid-template-columns: max-content auto;
94
- }
95
-
96
- dt {
97
- grid-column-start: 1;
98
- }
99
-
100
- dd {
101
- grid-column-start: 2;
102
- }
103
-
104
- dd p, dt p {
105
- margin-top: 0px;
106
- }
107
10
 
108
- /* HTML5 display-role reset for older browsers */
109
- article, aside, details, figcaption, figure,
110
- footer, header, hgroup, menu, nav, section {
111
- display: block;
112
- }
11
+ @import 'base_style/all';
12
+
113
13
  body {
114
- line-height: 1.3;
14
+ @include bodyStyle1(null, 1.3, -internal-root-color, #ffffff, 300);
15
+
16
+ main {
17
+ margin: 0;
18
+ }
115
19
  }
116
- blockquote, q {
117
- quotes: none;
20
+
21
+ /* HTML5 display-role reset for older browsers */
22
+ article,
23
+ aside,
24
+ details,
25
+ figcaption,
26
+ figure,
27
+ footer,
28
+ header,
29
+ hgroup,
30
+ menu,
31
+ nav,
32
+ section {
33
+ display: block;
118
34
  }
119
- blockquote:before, blockquote:after,
120
- q:before, q:after {
121
- content: '';
122
- content: none;
35
+
36
+ blockquote,
37
+ q {
38
+ quotes: none;
123
39
  }
124
- table {
125
- border-collapse: collapse;
126
- border-spacing: 0;
40
+
41
+ blockquote:before,
42
+ blockquote:after,
43
+ q:before,
44
+ q:after {
45
+ content: '';
46
+ content: none;
127
47
  }
128
48
 
129
49
  /* New CSS */
@@ -138,7 +58,8 @@ main {
138
58
  padding-right: 2em;
139
59
  }
140
60
 
141
- .title-section, .prefatory-section {
61
+ .title-section,
62
+ .prefatory-section {
142
63
  padding-left: 4em;
143
64
  padding-top: 2em;
144
65
  }
@@ -147,7 +68,8 @@ main {
147
68
  margin-bottom: 5em;
148
69
  }
149
70
 
150
- .doctitle-en, .doctitle-fr {
71
+ .doctitle-en,
72
+ .doctitle-fr {
151
73
  margin-top: 2em;
152
74
  text-align: left;
153
75
  }
@@ -158,7 +80,7 @@ main {
158
80
  margin-left: -3em;
159
81
  padding-top: 2em;
160
82
  padding-bottom: 2em;
161
-
83
+
162
84
  }
163
85
 
164
86
  .doctitle-en span {
@@ -169,7 +91,6 @@ main {
169
91
  color: white;
170
92
  }
171
93
 
172
-
173
94
  .doctitle-fr span {
174
95
  font-size: 1.2em;
175
96
  line-height: 1.2em;
@@ -198,7 +119,8 @@ span.title {
198
119
  padding-bottom: 1em;
199
120
  }
200
121
 
201
- .coverpage_docnumber, .coverpage_techcommittee {
122
+ .coverpage_docnumber,
123
+ .coverpage_techcommittee {
202
124
  text-align: right;
203
125
  font-size: 0.9em;
204
126
  line-height: 0.5em;
@@ -222,7 +144,11 @@ h1 {
222
144
  font-weight: 900;
223
145
  }
224
146
 
225
- h2, h3, h4, h5, h6 {
147
+ h2,
148
+ h3,
149
+ h4,
150
+ h5,
151
+ h6 {
226
152
  font-weight: 700;
227
153
  }
228
154
 
@@ -240,10 +166,30 @@ h2 {
240
166
  margin-bottom: 1em;
241
167
  }
242
168
 
243
- h1, h2, h3, h4, h5, h6 {
169
+ h1,
170
+ h2,
171
+ h3,
172
+ h4,
173
+ h5,
174
+ h6 {
244
175
  line-height: 1.2;
245
176
  }
246
177
 
178
+ /* override for amendments */
179
+
180
+ {% if doctype == "amendment" or doctype == "technical-corrigendum" %}
181
+
182
+ h1, h2, h3, h4, h5, h6 {
183
+ font-weight: normal;
184
+ font-size: initial;
185
+ font-style: italic;
186
+ line-height: 2em;
187
+ margin-top: 2em;
188
+ margin-bottom: 1em;
189
+ }
190
+
191
+ {% endif %}
192
+
247
193
  h2 p {
248
194
  display: inline;
249
195
  }
@@ -268,16 +214,37 @@ a {
268
214
  text-decoration-color: black;
269
215
  }
270
216
 
271
- nav a {
272
- color: black;
273
- text-decoration: none;
274
- line-height: 1.2em;
217
+ h2 p {
218
+ display: inline;
219
+ }
220
+
221
+ ul>li {
222
+ list-style: none;
223
+ }
224
+
225
+ ul>li>p:first-child:before {
226
+ content: "\2014";
227
+ display: inline-block;
228
+ width: 1em;
229
+ margin-left: -1.5em;
230
+ margin-right: 0.5em;
231
+ }
232
+
233
+ li p {
234
+ /* display: inline-block; */
235
+ margin-bottom: 0.6em;
236
+ line-height: 1.2;
237
+ }
238
+
239
+ #toc li:before {
240
+ content: " ";
241
+ display: none;
275
242
  }
276
243
 
277
244
  p.AltTerms {
245
+ margin-bottom: 0;
278
246
  font-style: italic;
279
247
  margin-left: 2em;
280
- margin-bottom: 0em;
281
248
  }
282
249
 
283
250
  p.Terms {
@@ -285,47 +252,36 @@ p.Terms {
285
252
  margin-top: 0em;
286
253
  }
287
254
 
288
- /* already added to isodoc/base */
289
- strong, b {
290
- font-weight: bold;
291
- }
292
-
293
255
  /* Navigation*/
294
256
 
295
- @media screen and (min-width: 768px) {
296
- nav {
297
- position: fixed;
298
- top: 0;
299
- bottom: 0;
300
- left: 0;
301
- width: 278px;
302
- font-size: 0.9em;
303
- overflow: auto;
304
- padding: 0 0 0 20px;
305
- background-color:#f7f7f7;
306
- }
257
+ #toc {
258
+ @include toc(null, #1d1d1d, white);
259
+ @include sidebarToc();
307
260
 
308
- #toggle {
309
- position: fixed;
310
- height: 100%;
311
- width: 30px;
312
- background-color:black;
313
- color: white!important;
314
- cursor: pointer;
315
- margin-left: -4em;
316
- margin-top: -2em;
317
- }
261
+ // .toc-active,
262
+ // li:hover {
263
+ // background: #1d1d1d;
264
+ // box-shadow: inset -5px 0px 10px -5px #1d1d1d !important;
265
+ // }
318
266
 
319
- #toggle span {
320
- text-align: center;
321
- width: 100%;
322
- position: absolute;
323
- top: 50%;
324
- transform: translate(0, -50%);
325
-
267
+ li:before {
268
+ content: " ";
269
+ display: none;
326
270
  }
271
+ }
272
+
273
+ nav {
274
+ @include sidebarNav(#f7f7f7, 278px, 20px);
275
+ line-height: 1.2em;
276
+ }
327
277
 
278
+ #toggle {
279
+ @include sidebarNavToggle(white, black);
280
+ margin-left: -4em;
281
+ margin-top: -2em;
282
+ }
328
283
 
284
+ @media screen and (min-width: 768px) {
329
285
  .container {
330
286
  padding-left: 360px;
331
287
  }
@@ -339,23 +295,12 @@ strong, b {
339
295
  }
340
296
 
341
297
  ul#toc-list {
342
- padding:0;
343
- margin:0;
298
+ padding: 0;
299
+ margin: 0;
344
300
  }
345
301
  }
346
302
 
347
303
  @media screen and (max-width: 768px) {
348
- #toc {
349
- padding: 0 1.5em 0 1.5em;
350
- overflow: visible;
351
- }
352
-
353
- #toggle {
354
- display: none;
355
- margin-left: -4em;
356
- margin-top: -2em;
357
- }
358
-
359
304
  body {
360
305
  margin-left: 2em;
361
306
  }
@@ -364,152 +309,54 @@ strong, b {
364
309
  padding: 0;
365
310
  }
366
311
 
367
- .title-section, .prefatory-section {
312
+ .title-section,
313
+ .prefatory-section {
368
314
  padding-left: 0;
369
315
  padding-top: 0;
370
316
  width: 100%;
371
317
  }
372
318
  }
373
-
374
- div.figure > img {
375
- margin-left: auto;
376
- margin-right: auto;
377
- display: block;
378
- max-width: 100%;
379
- height: auto;
380
- }
381
-
382
-
383
- #toc ul {
384
- margin: 0;
385
- padding: 0;
386
- list-style: none;
387
- }
388
-
389
- #toc li a {
390
- padding: 5px 10px;
391
- }
392
-
393
- #toc a {
394
- text-decoration: none;
395
- display: block;
396
- }
397
-
398
- #toc a:hover {
399
- box-shadow: none;
400
- color: white;
401
- }
402
-
403
- #toc .h2 {
404
- padding-left: 30px;
405
- }
406
-
407
- #toc .h3 {
408
- padding-left: 50px;
409
- }
410
-
411
- #toc .toc-active a {
412
- color: white;
413
- }
414
-
415
- #toc .toc-active, #toc li:hover {
416
- background: #1d1d1d;
417
- box-shadow: inset -5px 0px 10px -5px #1d1d1d!important;
418
319
 
320
+ .figure,
321
+ pre,
322
+ .pseudocode {
323
+ @include pseudocodeBlock(#f7f7f7);
324
+ font-size: 1em;
419
325
  }
420
326
 
421
- #toc li:hover a {
422
- color: white;
327
+ div.figure {
328
+ @include figureBlock();
423
329
  }
424
330
 
425
- ul > li {
426
- list-style: none;
427
- }
428
-
429
- ul > li > p:first-child:before {
430
- content: "\2014";
431
- display: inline-block;
432
- width: 1em;
433
- margin-left: -1.5em;
434
- margin-right: 0.5em;
435
- }
436
-
437
- li p {
438
- /* display: inline-block; */
439
- margin-bottom: 0.6em;
440
- line-height: 1.2;
441
- }
442
-
443
- #toc li:before {
444
- content: " ";
445
- display: none;
446
- }
447
-
448
331
  /*
449
332
  Document types + stages
450
333
  */
451
334
 
452
335
  .document-type-band {
453
- left:0;
454
- top:180px;
455
- height: 100%;
456
- position: fixed;
457
- display: block;
458
- z-index: 99;
459
- /*box-shadow: -5px 0px 10px #1d1d1d*/
336
+ @include docBand($order: 2, $offset: 180px);
460
337
 
338
+ .document-type {
339
+ top: 20px;
340
+ }
461
341
  }
462
342
 
463
343
  .document-stage-band {
464
- left:0;
465
- top:0;
466
- height: 100%;
467
- position: fixed;
468
- display: block;
469
- z-index: 98;
470
- box-shadow: -5px 0px 10px #1d1d1d
471
- }
472
-
473
- .document-type {
474
- position: relative;
475
- width: 25px;
476
- }
477
-
478
- .document-stage {
479
- position: relative;
480
- width: 25px;
344
+ @include docBand(1, 100%);
481
345
  }
482
346
 
483
- p.document-type, p.document-stage {
484
- color: white;
485
- text-transform: uppercase;
486
- font-size: 0.9em;
487
- font-weight: 400;
488
- letter-spacing: 0.05em;
489
- margin:0;
490
- margin-left: 6px;
491
- writing-mode:vertical-rl;
492
- -webkit-transform:rotate(180deg);
493
- -moz-transform:rotate(180deg);
494
- -o-transform: rotate(180deg);
495
- white-space:nowrap;
496
- display:block;
497
- bottom:0;
498
- }
499
-
500
- p.document-type {
501
- font-weight: 400;
502
- height: 210px;
347
+ p.document-stage {
348
+ @include docBandTitle(210px);
349
+ writing-mode: vertical-rl;
503
350
  }
504
351
 
505
352
  #governance-band p.document-type {
506
353
  font-weight: 400;
507
- height: 230px!important;
354
+ height: 230px !important;
508
355
  }
509
356
 
510
357
  p.document-stage {
511
358
  font-weight: 300;
512
- height:160px;
359
+ height: 160px;
513
360
  }
514
361
 
515
362
  #standard-band {
@@ -542,7 +389,7 @@ p.document-stage {
542
389
  font-size: 1em;
543
390
  margin: 0 0 2em 0;
544
391
  text-transform: uppercase;
545
- }
392
+ }
546
393
 
547
394
  #working-draft {
548
395
  border-bottom: solid 3px #fda706;
@@ -587,72 +434,90 @@ p.document-stage {
587
434
 
588
435
  /* 3 Other styles */
589
436
 
437
+ /*
438
+ 3.2 Links
439
+ */
440
+ a {
441
+ color: black;
442
+ text-decoration-color: black;
443
+ }
444
+
590
445
  /*
591
446
  3.3 Lists
592
447
  */
593
-
594
- ul, ol {margin-left: 2em;}
595
-
596
- #toc-list ul {margin-bottom: 0.25em;}
597
-
598
- #toc-list ul li {list-style-type: none;}
448
+
449
+ ul,
450
+ ol {
451
+ margin-left: 2em;
452
+ }
453
+
454
+ #toc-list ul {
455
+ margin-bottom: 0.25em;
456
+ }
457
+
458
+ #toc-list ol li {
459
+ list-style-type: none;
460
+ }
599
461
 
600
462
  /*
601
463
  3.4 Rules
602
464
  */
603
465
 
604
466
  .rule {
605
- width: 100%;
606
- height: 1px;
607
- background-color: #0e1a85;
608
- margin: 2em 0;
609
- }
467
+ @include rule(1px, #0e1a85)
468
+ }
610
469
 
611
470
  /*
612
471
  3.5 Bibliograhy
613
472
  */
614
473
 
615
- p.Biblio, p.NormRef {
616
- margin-top: 1em;
617
- margin-left: 2em;
474
+ p.Biblio,
475
+ p.NormRef {
476
+ margin-top: 1em;
477
+ margin-left: 2em;
618
478
  }
619
479
 
620
480
  /*
621
481
  3.6 Source Code + figures
622
482
  */
623
483
 
624
- pre {
625
- font-family: $monospacefont;
626
- font-variant-ligatures: none;
484
+ .figure,
485
+ pre,
486
+ .pseudocode {
487
+ @include pseudocodeBlock(#f7f7f7);
488
+ font-size: 1em;
627
489
  }
628
490
 
629
- .figure, pre, .pseudocode {
630
- background-color: #f7f7f7;
631
- line-height: 1.6em;
632
- padding: 1.5em;
633
- margin: 2em 0 1em 0;
634
- overflow: auto;
491
+ pre {
492
+ @include monospaceBlockStyle()
635
493
  }
636
494
 
637
- .figure-title, .FigureTitle, .SourceTitle, .AdmonitionTitle, .RecommendationTitle {
638
- font-weight: 700;
639
- font-size: 1em;
640
- text-align: center;
495
+ @include admonitionBlock();
496
+ @include recommendationBlock();
497
+
498
+ .figure-title,
499
+ .FigureTitle,
500
+ .SourceTitle,
501
+ .AdmonitionTitle,
502
+ .RecommendationTitle {
503
+ @include blockTitle()
641
504
  }
642
505
 
643
506
  /*
644
507
  3.7 Notes
645
508
  */
646
509
 
647
- .Note, .note {
510
+ .Note,
511
+ .note {
648
512
  background-color: #fff495;
649
513
  color: #47430c;
650
514
  padding: 0.5em;
651
515
  margin: 1.5em 0 1.5em 0;
652
516
  text-align: left;
653
517
  }
654
-
655
- .Note p, .note p {
518
+
519
+ .Note p,
520
+ .note p {
656
521
  margin: 0;
657
522
  }
658
523
 
@@ -674,27 +539,19 @@ text-align: center;
674
539
  */
675
540
 
676
541
  .example {
677
- background-color: #e1eef1;
678
- padding: 0.5em;
679
- margin: 2em 0 1em 0;
680
- text-align: left;
681
- padding-left: 2em;
682
- }
683
-
684
- .example p {
685
- margin: 0;
686
- }
542
+ @include exampleBlock(#e1eef1, black, 0.5em);
543
+ color: black;
687
544
 
688
- .example .example-title {
689
- font-weight: 700;
690
- text-transform: uppercase;
691
- margin-top:0;
692
- margin-left:-1.5em;
693
- }
545
+ padding-left: 2em;
694
546
 
547
+ .example-title {
548
+ margin-left: -1.5em;
549
+ }
695
550
 
696
- .example pre, .example .pseudocode {
697
- background: none;
551
+ pre,
552
+ .pseudocode {
553
+ background: none;
554
+ }
698
555
  }
699
556
 
700
557
  /*
@@ -702,58 +559,47 @@ margin-left:-1.5em;
702
559
  */
703
560
 
704
561
  table {
705
- border-collapse: collapse;
706
- width: 100%;
707
- font-weight: 300;
708
- margin: 1em 0 2em 0;
709
- margin-left: auto;
710
- margin-right: auto;
711
- padding-right: 2em;
712
- text-align: center;
713
- }
714
-
715
- table, th, td {
716
- border: 1px solid black;
717
- font-size: 0.95em;
718
- }
719
-
720
- td, th {
721
- padding: 1em!important;
562
+ @include table(1px solid black);
563
+ text-align: center;
722
564
  }
723
565
 
724
- td.header {
725
- font-weight: 400;
566
+ td,
567
+ th {
568
+ padding: 1em !important;
726
569
  }
727
570
 
728
571
  p.TableTitle {
729
- text-align: center;
730
- margin-top: 2.5em;
731
- font-weight: 800;
732
- font-size: 1.1em;
572
+ text-align: center;
573
+ margin-top: 2.5em;
574
+ font-weight: 800;
575
+ font-size: 1.1em;
733
576
  }
734
577
 
735
578
  .TableFootnote {
736
- text-align: left!important;
579
+ text-align: left !important;
737
580
  }
738
581
 
739
582
  /*
740
583
  3.10 Footnotes
741
584
  */
742
585
 
743
- a.footnote-number, a.TableFootnoteRef, span.TableFootnoteRef {
744
- vertical-align: super;
745
- font-size: 0.8em;
586
+ a.footnote-number,
587
+ a.TableFootnoteRef,
588
+ span.TableFootnoteRef {
589
+ vertical-align: super;
590
+ font-size: 0.8em;
746
591
  }
747
592
 
748
593
  .footnote {
749
- font-size: 0.9em;
594
+ font-size: 0.9em;
750
595
  }
751
596
 
752
- sup a {
753
- vertical-align: super;
597
+ sup a {
598
+ vertical-align: super;
754
599
  font-size: 0.8em;
755
- }
756
- #footnote_box {
600
+ }
601
+
602
+ #footnote_box {
757
603
  font-size: 14px;
758
604
  background: white;
759
605
  padding: 0 10px;
@@ -762,69 +608,61 @@ sup a {
762
608
  -moz-box-shadow: 0px 0px 5px #888;
763
609
  -webkit-box-shadow: 0px 0px 5px #888;
764
610
  box-shadow: 0px 0px 5px #888;
765
- }
766
-
767
- ol.footnotes-list, aside.footnote {
768
- margin-left: 1em;
769
-
770
- }
771
-
772
- ol.footnotes-list li, aside.footnote {
773
- font-size: 0.9em;
774
- vertical-align: top;
775
- list-style:decimal;
776
- margin-bottom: 1em;
777
- }
778
-
779
- ol.footnotes-list:first-child {
780
- margin-top: 2em;
781
- }
782
-
783
- ol.footnotes-list p, aside.footnote {
784
- display: inline;
785
- }
786
-
787
- ol > li > p:before {
788
- content: "";
789
- display: none;
790
- }
791
-
611
+ }
612
+
613
+ ol.footnotes-list,
614
+ aside.footnote {
615
+ margin-left: 1em;
616
+
617
+ }
618
+
619
+ ol.footnotes-list li,
620
+ aside.footnote {
621
+ font-size: 0.9em;
622
+ vertical-align: top;
623
+ list-style: decimal;
624
+ margin-bottom: 1em;
625
+ }
626
+
627
+ ol.footnotes-list:first-child {
628
+ margin-top: 2em;
629
+ }
630
+
631
+ ol.footnotes-list p,
632
+ aside.footnote {
633
+ display: inline;
634
+ }
635
+
636
+ ol>li>p:before {
637
+ content: "";
638
+ display: none;
639
+ }
792
640
 
793
641
 
794
642
  /*
795
643
  3.11 Blockquotes
796
644
  */
797
645
 
798
- .blockquote, .Quote {
799
- background-color: #f7f7f7;
800
- font-style: italic;
801
- width: 80%;
802
- padding: 1.5em;
803
- margin-top: 2em;
804
- margin-left: auto;
805
- margin-right: auto;
646
+ .Quote {
647
+ @include blockquoteBlock(#f7f7f7);
806
648
  }
807
649
 
808
-
809
650
  /*
810
651
  3.12 Formulas
811
652
  */
812
653
 
813
654
  .formula {
814
- background-color: #f7f7f7;
815
- padding: 1.5em;
816
- margin-top: 2em;
817
- text-align: center;
818
- margin-left: 20%;
819
- margin-right: 20%;
820
- font-size: 0.9em;
655
+ @include formulaBlock(#f7f7f7);
656
+ margin-left: 20%;
657
+ margin-right: 20%;
658
+ font-size: 0.9em;
821
659
  }
822
660
 
823
661
  dl.formula_dl {
824
- background-color: #f7f7f7;
825
- margin-left: 20%;
826
- margin-right: 20%;
827
- font-size: 0.9em;
662
+ background-color: #f7f7f7;
663
+ margin-left: 20%;
664
+ margin-right: 20%;
665
+ font-size: 0.9em;
828
666
  }
829
667
 
830
668
  /*
@@ -832,11 +670,11 @@ Keywords
832
670
  */
833
671
 
834
672
  span.keyword {
835
- font-weight: 600;
673
+ font-weight: 600;
836
674
  }
837
675
 
838
-
839
- .Admonition, .admonition {
676
+ .Admonition,
677
+ .admonition {
840
678
  background-color: #ffb3b3;
841
679
  /* color: #47430c;*/
842
680
  padding: 0.5em;
@@ -844,9 +682,7 @@ font-weight: 600;
844
682
  text-align: left;
845
683
  }
846
684
 
847
- .Admonition p, .admonition p {
685
+ .Admonition p,
686
+ .admonition p {
848
687
  margin: 0;
849
688
  }
850
-
851
-
852
-