metanorma-iso 1.10.4 → 1.10.5

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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: abbf367b7ec988ab0de353fe50309648657bc86b3d7a1495c4ac6722b4653b5b
4
- data.tar.gz: 365546239553eb27bb0dcdc1e4920234922b93dcb235027f42f7f1a682f3fd18
3
+ metadata.gz: 7a8f44a84f1173e2b495a6ccb50683b6b17454ec8408b740a1adb56b3c05e4a2
4
+ data.tar.gz: 6efb198dffa92685545a865310668345cbc20f6b6a08e79d1b63cbda0961aa27
5
5
  SHA512:
6
- metadata.gz: bbbdb1ad0d1b86c34f437af1ad664c2c6d19d706a28fa01a25cb5b677d1fddaec5d2eec0fdc4eb5846e5254777b3ea0d868ae31ee5c9e59c58f40f67bd17b339
7
- data.tar.gz: eb62b3b9ab796aba24059a9c45c8432a7fc5a7ee0a3b30c6893fda63bbce62452270ee13f93c66d3f16b054dd9cf92887cca868a849f42c248b5f8c37efbfdfa
6
+ metadata.gz: c848159c457326d7cd76a3000721b063d16febbd3f7db96a673a666c0fe8abddcc0c0ef6bc330a4d0be85a09b101e22dda9d954e9b7ae4c331cd698168c827a6
7
+ data.tar.gz: d1b9dd77f0e81ec1aa9e0415d83026bab80a59dd205fd0d0cd2349e0e41b5a22078928120f9e373f220391a50d17b10320577d18796a7973792f503f63eca89f
@@ -36,6 +36,6 @@ jobs:
36
36
 
37
37
  - uses: actions/download-artifact@master
38
38
  with:
39
- name: xsd_doc-ubuntu
39
+ name: xsd_doc
40
40
  path: xsd_doc
41
41
 
@@ -146,11 +146,24 @@ module Asciidoctor
146
146
  end
147
147
 
148
148
  def relaton_relations
149
- super + %w(obsoletes)
149
+ super + %w(obsoletes successor-of manifestation-of related annotation-of)
150
150
  end
151
151
 
152
152
  def relaton_relation_descriptions
153
- super.merge("amends" => "updates")
153
+ super.merge(
154
+ "amends" => "updates", "revises" => "updates",
155
+ "replaces" => "obsoletes",
156
+ "supersedes" => "obsoletes",
157
+ "corrects" => "updates",
158
+ "informatively-cited-in" => "isCitedIn",
159
+ "informatively-cites" => "cites",
160
+ "normatively-cited in" => "isCitedIn",
161
+ "normatively-cites" => "cites",
162
+ "identical-adopted-from" => "adoptedFrom",
163
+ "modified-adopted-from" => "adoptedFrom",
164
+ "related-directive" => "related",
165
+ "related-mandate" => "related",
166
+ )
154
167
  end
155
168
  end
156
169
  end
@@ -48,7 +48,7 @@ module Asciidoctor
48
48
  ret
49
49
  end
50
50
 
51
- def stage_name(stage, substage, doctype, iteration = nil)
51
+ def stage_name(stage, substage, _doctype, iteration = nil)
52
52
  return "Proof" if stage == "60" && substage == "00"
53
53
 
54
54
  ret = STAGE_NAMES[stage.to_sym]
@@ -69,7 +69,7 @@ module Asciidoctor
69
69
  end
70
70
 
71
71
  def iso_id(node, xml)
72
- !@amd && node.attr("docnumber") || @amd && node.attr("updates") or
72
+ (!@amd && node.attr("docnumber")) || (@amd && node.attr("updates")) or
73
73
  return
74
74
 
75
75
  dn = iso_id1(node)
@@ -133,28 +133,33 @@ module Asciidoctor
133
133
  end
134
134
 
135
135
  def id_stage_abbr(stage, substage, node, bare = false)
136
- ret = if bare
137
- IsoDoc::Iso::Metadata.new("en", "Latn", @i18n)
138
- .status_abbrev(stage_abbr(stage, substage, doctype(node)),
139
- substage, nil, nil, doctype(node))
140
- else
141
- IsoDoc::Iso::Metadata.new("en", "Latn", @i18n)
142
- .status_abbrev(stage_abbr(stage, substage, doctype(node)),
143
- substage, node.attr("iteration"),
144
- node.attr("draft"), doctype(node))
145
- end
136
+ ret = id_stage_abbr1(stage, substage, node, bare)
146
137
  if %w(amendment technical-corrigendum technical-report
147
- technical-specification).include?(doctype(node))
148
- ret = "#{ret} " unless %w(D FD).include?(ret)
138
+ technical-specification).include?(doctype(node)) &&
139
+ !%w(D FD).include?(ret)
140
+ ret = "#{ret} "
149
141
  end
150
142
  ret
151
143
  end
152
144
 
145
+ def id_stage_abbr1(stage, substage, node, bare)
146
+ if bare
147
+ IsoDoc::Iso::Metadata.new("en", "Latn", @i18n)
148
+ .status_abbrev(stage_abbr(stage, substage, doctype(node)),
149
+ substage, nil, nil, doctype(node))
150
+ else
151
+ IsoDoc::Iso::Metadata.new("en", "Latn", @i18n)
152
+ .status_abbrev(stage_abbr(stage, substage, doctype(node)),
153
+ substage, node.attr("iteration"),
154
+ node.attr("draft"), doctype(node))
155
+ end
156
+ end
157
+
153
158
  def cover_stage_abbr(node)
154
159
  stage = get_stage(node)
155
160
  abbr = id_stage_abbr(get_stage(node), get_substage(node), node, true)
156
161
  typeabbr = get_typeabbr(node, true)
157
- if stage.to_i > 50 || stage.to_i == 60 && get_substage(node).to_i < 60
162
+ if stage.to_i > 50 || (stage.to_i == 60 && get_substage(node).to_i < 60)
158
163
  typeabbr = ""
159
164
  end
160
165
  "#{abbr}#{typeabbr}".strip
@@ -213,8 +218,6 @@ module Asciidoctor
213
218
  when "technical-specification" then "TS "
214
219
  when "amendment" then (amd ? "Amd " : "")
215
220
  when "technical-corrigendum" then (amd ? "Cor " : "")
216
- else
217
- nil
218
221
  end
219
222
  end
220
223
  end
@@ -1973,7 +1973,11 @@
1973
1973
  </optional>
1974
1974
  <element name="name">
1975
1975
  <zeroOrMore>
1976
- <ref name="PureTextElement"/>
1976
+ <choice>
1977
+ <ref name="PureTextElement"/>
1978
+ <ref name="stem"/>
1979
+ <ref name="index"/>
1980
+ </choice>
1977
1981
  </zeroOrMore>
1978
1982
  </element>
1979
1983
  <optional>
@@ -1987,7 +1991,7 @@
1987
1991
  </element>
1988
1992
  </optional>
1989
1993
  <optional>
1990
- <element name="grammar-info">
1994
+ <element name="grammar">
1991
1995
  <ref name="Grammar"/>
1992
1996
  </element>
1993
1997
  </optional>
@@ -31,7 +31,7 @@ module Asciidoctor
31
31
  when "ru" then "_r"
32
32
  when "es" then "_s"
33
33
  when "ar" then "_a"
34
- when "en" then "_e"
34
+ # when "en" then "_e"
35
35
  else
36
36
  "_e"
37
37
  end
@@ -74,29 +74,6 @@ module IsoDoc
74
74
  end
75
75
  end
76
76
 
77
- def insertall_after_here(node, insert, name)
78
- node.children.each do |n|
79
- next unless n.name == name
80
-
81
- insert.next = n.remove
82
- insert = n
83
- end
84
- insert
85
- end
86
-
87
- def termexamples_before_termnotes(node)
88
- return unless node.at(ns("./termnote")) && node.at(ns("./termexample"))
89
- return unless insert = node.at(ns("./definition"))
90
-
91
- insert = insertall_after_here(node, insert, "termexample")
92
- insertall_after_here(node, insert, "termnote")
93
- end
94
-
95
- def termdef_parse(node, out)
96
- termexamples_before_termnotes(node)
97
- super
98
- end
99
-
100
77
  def cleanup(docxml)
101
78
  super
102
79
  table_th_center(docxml)
@@ -177,14 +154,20 @@ module IsoDoc
177
154
 
178
155
  def clause_etc(isoxml, out, num)
179
156
  isoxml.xpath(ns("//sections/clause[not(@type = 'scope')] | "\
180
- "//sections/terms | //sections/definitions")).each do |f|
181
- out.div **attr_code(id: f["id"],
182
- class: f.name == "definitions" ? "Symbols" : nil) do |div|
183
- num = num + 1
184
- clause_name(num, f&.at(ns("./title")), div, nil)
185
- f.elements.each do |e|
186
- parse(e, div) unless %w{title source}.include? e.name
187
- end
157
+ "//sections/terms | //sections/definitions"))
158
+ .each do |f|
159
+ clause_etc1(f, out, num)
160
+ end
161
+ end
162
+
163
+ def clause_etc1(clause, out, num)
164
+ out.div **attr_code(
165
+ id: clause["id"],
166
+ class: clause.name == "definitions" ? "Symbols" : nil) do |div|
167
+ num = num + 1
168
+ clause_name(num, clause&.at(ns("./title")), div, nil)
169
+ clause.elements.each do |e|
170
+ parse(e, div) unless %w{title source}.include? e.name
188
171
  end
189
172
  end
190
173
  end
@@ -75,6 +75,12 @@ code *, pre *, tt *, kbd *, samp * {
75
75
  font-family: {{monospacefont}} !important;
76
76
  font-variant-ligatures: none; }
77
77
 
78
+ p code, dt code, li code, label code, legend code, caption code, th code, td code,
79
+ p tt, dt tt, li tt, label tt, legend tt, caption tt, th tt, td tt,
80
+ p kbd, dt kbd, li kbd, label kbd, legend kbd, caption kbd, th kbd, td kbd,
81
+ p samp, dt samp, li samp, label samp, legend samp, caption samp, th samp, td samp {
82
+ font-size: {{monospacefontsize}}; }
83
+
78
84
  article, aside, details, figcaption, figure,
79
85
  footer, header, hgroup, menu, nav, section {
80
86
  display: block; }
@@ -86,6 +92,9 @@ table {
86
92
  h1, h2, h3, h4, h5, h6 {
87
93
  font-family: {{headerfont}}; }
88
94
 
95
+ .h1, .h2, .h3, .h4, .h5, .h6 {
96
+ font-family: {{headerfont}}; }
97
+
89
98
  blockquote, q {
90
99
  quotes: none; }
91
100
  blockquote:before, blockquote:after, q:before, q:after {
@@ -338,23 +347,24 @@ span.title {
338
347
  font-size: 0.9em; }
339
348
 
340
349
  /* TYPOGRAPHY */
341
- h1 {
350
+ h1, .h1 {
342
351
  font-weight: 900; }
343
352
 
344
353
  h2,
345
354
  h3,
346
355
  h4,
347
356
  h5,
348
- h6 {
357
+ h6,
358
+ .h2, .h3, .h4, .h5, .h6 {
349
359
  font-weight: 700; }
350
360
 
351
- h1 {
361
+ h1, .h1 {
352
362
  font-size: 1.5em;
353
363
  line-height: 2em;
354
364
  margin-top: 2em;
355
365
  margin-bottom: 1em; }
356
366
 
357
- h2 {
367
+ h2, .h2 {
358
368
  font-size: 1.2em;
359
369
  line-height: 1.5em;
360
370
  margin-top: 2em;
@@ -365,12 +375,13 @@ h2,
365
375
  h3,
366
376
  h4,
367
377
  h5,
368
- h6 {
378
+ h6,
379
+ .h1, .h2, .h3, .h4, .h5, .h6 {
369
380
  line-height: 1.2; }
370
381
 
371
382
  /* override for amendments */
372
383
  {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
373
- h1, h2, h3, h4, h5, h6 {
384
+ h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
374
385
  font-weight: normal;
375
386
  font-size: initial;
376
387
  font-style: italic;
@@ -379,7 +390,7 @@ h1, h2, h3, h4, h5, h6 {
379
390
  margin-bottom: 1em; }
380
391
 
381
392
  {% endif %}
382
- h2 p {
393
+ h2 p, .h2 p {
383
394
  display: inline; }
384
395
 
385
396
  p {
@@ -401,7 +412,7 @@ a {
401
412
  color: black;
402
413
  text-decoration-color: black; }
403
414
 
404
- h2 p {
415
+ h2 p, .h2 p {
405
416
  display: inline; }
406
417
 
407
418
  ul > li {
@@ -140,7 +140,7 @@ span.title {
140
140
 
141
141
  /* TYPOGRAPHY */
142
142
 
143
- h1 {
143
+ h1, .h1 {
144
144
  font-weight: 900;
145
145
  }
146
146
 
@@ -148,18 +148,19 @@ h2,
148
148
  h3,
149
149
  h4,
150
150
  h5,
151
- h6 {
151
+ h6,
152
+ .h2, .h3, .h4, .h5, .h6{
152
153
  font-weight: 700;
153
154
  }
154
155
 
155
- h1 {
156
+ h1, .h1 {
156
157
  font-size: 1.5em;
157
158
  line-height: 2em;
158
159
  margin-top: 2em;
159
160
  margin-bottom: 1em;
160
161
  }
161
162
 
162
- h2 {
163
+ h2, .h2 {
163
164
  font-size: 1.2em;
164
165
  line-height: 1.5em;
165
166
  margin-top: 2em;
@@ -171,7 +172,8 @@ h2,
171
172
  h3,
172
173
  h4,
173
174
  h5,
174
- h6 {
175
+ h6,
176
+ .h1, .h2, .h3, .h4, .h5, .h6 {
175
177
  line-height: 1.2;
176
178
  }
177
179
 
@@ -179,7 +181,7 @@ h6 {
179
181
 
180
182
  {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
181
183
 
182
- h1, h2, h3, h4, h5, h6 {
184
+ h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
183
185
  font-weight: normal;
184
186
  font-size: initial;
185
187
  font-style: italic;
@@ -190,7 +192,7 @@ h1, h2, h3, h4, h5, h6 {
190
192
 
191
193
  {% endif %}
192
194
 
193
- h2 p {
195
+ h2 p, .h2 p {
194
196
  display: inline;
195
197
  }
196
198
 
@@ -218,7 +220,7 @@ a {
218
220
  text-decoration-color: black;
219
221
  }
220
222
 
221
- h2 p {
223
+ h2 p, .h2 p {
222
224
  display: inline;
223
225
  }
224
226
 
@@ -75,6 +75,12 @@ code *, pre *, tt *, kbd *, samp * {
75
75
  font-family: {{monospacefont}} !important;
76
76
  font-variant-ligatures: none; }
77
77
 
78
+ p code, dt code, li code, label code, legend code, caption code, th code, td code,
79
+ p tt, dt tt, li tt, label tt, legend tt, caption tt, th tt, td tt,
80
+ p kbd, dt kbd, li kbd, label kbd, legend kbd, caption kbd, th kbd, td kbd,
81
+ p samp, dt samp, li samp, label samp, legend samp, caption samp, th samp, td samp {
82
+ font-size: {{monospacefontsize}}; }
83
+
78
84
  article, aside, details, figcaption, figure,
79
85
  footer, header, hgroup, menu, nav, section {
80
86
  display: block; }
@@ -86,6 +92,9 @@ table {
86
92
  h1, h2, h3, h4, h5, h6 {
87
93
  font-family: {{headerfont}}; }
88
94
 
95
+ .h1, .h2, .h3, .h4, .h5, .h6 {
96
+ font-family: {{headerfont}}; }
97
+
89
98
  blockquote, q {
90
99
  quotes: none; }
91
100
  blockquote:before, blockquote:after, q:before, q:after {
@@ -315,23 +324,23 @@ span.partlabel {
315
324
  font-size: 0.9em; }
316
325
 
317
326
  /* TYPOGRAPHY */
318
- h1 {
327
+ h1, .h1 {
319
328
  font-size: 1.5em;
320
329
  line-height: 2em;
321
330
  margin-top: 2em;
322
331
  margin-bottom: 1em; }
323
332
 
324
- h2 {
333
+ h2, .h2 {
325
334
  font-size: 1.2em;
326
335
  line-height: 1.5em;
327
336
  margin-top: 2em;
328
337
  margin-bottom: 1em; }
329
338
 
330
- h1, h2, h3, h4, h5, h6 {
339
+ h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
331
340
  line-height: 1.2; }
332
341
 
333
342
  {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
334
- h1, h2, h3, h4, h5, h6 {
343
+ h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
335
344
  font-weight: normal;
336
345
  font-size: initial;
337
346
  font-style: italic; }
@@ -355,7 +364,7 @@ a {
355
364
  color: black;
356
365
  text-decoration-color: black; }
357
366
 
358
- h2 p {
367
+ h2 p, .h2 p {
359
368
  display: inline; }
360
369
 
361
370
  ul > li {
@@ -112,27 +112,27 @@ span.partlabel {
112
112
 
113
113
  /* TYPOGRAPHY */
114
114
 
115
- h1 {
115
+ h1, .h1 {
116
116
  font-size: 1.5em;
117
117
  line-height: 2em;
118
118
  margin-top: 2em;
119
119
  margin-bottom: 1em;
120
120
  }
121
121
 
122
- h2 {
122
+ h2, .h2 {
123
123
  font-size: 1.2em;
124
124
  line-height: 1.5em;
125
125
  margin-top: 2em;
126
126
  margin-bottom: 1em;
127
127
  }
128
128
 
129
- h1, h2, h3, h4, h5, h6 {
129
+ h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
130
130
  line-height: 1.2;
131
131
  }
132
132
 
133
133
  {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
134
134
 
135
- h1, h2, h3, h4, h5, h6 {
135
+ h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
136
136
  font-weight: normal;
137
137
  font-size: initial;
138
138
  font-style: italic;
@@ -164,7 +164,7 @@ a {
164
164
  text-decoration-color: black;
165
165
  }
166
166
 
167
- h2 p {
167
+ h2 p, .h2 p {
168
168
  display: inline;
169
169
  }
170
170
 
@@ -289,7 +289,7 @@ p.MsoListParagraphCxSpLast, li.MsoListParagraphCxSpLast, div.MsoListParagraphCxS
289
289
  div.figure, p.figure {
290
290
  text-align: center; }
291
291
 
292
- h1 {
292
+ h1, .h1 {
293
293
  mso-style-priority: 1;
294
294
  mso-style-unhide: no;
295
295
  mso-style-qformat: yes;
@@ -304,8 +304,6 @@ h1 {
304
304
  line-height: 13.5pt;
305
305
  mso-pagination: widow-orphan;
306
306
  page-break-after: avoid;
307
- mso-outline-level: 1;
308
- mso-list: l1 level1 lfo6;
309
307
  mso-hyphenate: none;
310
308
  tab-stops: 20.0pt list 21.6pt left 28.0pt;
311
309
  {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
@@ -324,6 +322,10 @@ h1 {
324
322
  mso-fareast-language: JA;
325
323
  mso-bidi-font-weight: normal; }
326
324
 
325
+ h1 {
326
+ mso-outline-level: 1;
327
+ mso-list: l1 level1 lfo6; }
328
+
327
329
  h1.ForewordTitle {
328
330
  font-size: 13.0pt;
329
331
  font-style: normal;
@@ -358,7 +360,7 @@ h1.Annex {
358
360
  mso-fareast-language: JA;
359
361
  mso-bidi-font-weight: normal; }
360
362
 
361
- .h2Annex, h2 {
363
+ .h2Annex, h2, .h2 {
362
364
  mso-style-priority: 2;
363
365
  mso-style-unhide: no;
364
366
  mso-style-qformat: yes;
@@ -395,7 +397,7 @@ h2 {
395
397
  mso-list: l1 level2 lfo6;
396
398
  mso-outline-level: 2; }
397
399
 
398
- .h3Annex, h3 {
400
+ .h3Annex, h3, .h3 {
399
401
  mso-style-priority: 3;
400
402
  mso-style-unhide: no;
401
403
  mso-style-qformat: yes;
@@ -432,7 +434,7 @@ h3 {
432
434
  mso-list: l1 level3 lfo6;
433
435
  mso-outline-level: 3; }
434
436
 
435
- .h4Annex, h4 {
437
+ .h4Annex, h4, .h4 {
436
438
  mso-style-priority: 4;
437
439
  mso-style-unhide: no;
438
440
  mso-style-qformat: yes;
@@ -467,7 +469,7 @@ h4 {
467
469
  mso-list: l1 level4 lfo6;
468
470
  mso-outline-level: 4; }
469
471
 
470
- .h5Annex, h5 {
472
+ .h5Annex, h5, .h5 {
471
473
  mso-style-priority: 5;
472
474
  mso-style-unhide: no;
473
475
  mso-style-qformat: yes;
@@ -502,7 +504,7 @@ h5 {
502
504
  mso-list: l1 level5 lfo6;
503
505
  mso-outline-level: 5; }
504
506
 
505
- h6 {
507
+ h6, .h6 {
506
508
  mso-style-priority: 6;
507
509
  mso-style-unhide: no;
508
510
  mso-style-qformat: yes;
@@ -269,7 +269,7 @@ p.MsoListParagraphCxSpLast, li.MsoListParagraphCxSpLast, div.MsoListParagraphCxS
269
269
  div.figure, p.figure
270
270
  {text-align: center;}
271
271
 
272
- h1
272
+ h1, .h1
273
273
  {mso-style-priority:1;
274
274
  mso-style-unhide:no;
275
275
  mso-style-qformat:yes;
@@ -284,8 +284,6 @@ h1
284
284
  line-height:13.5pt;
285
285
  mso-pagination:widow-orphan;
286
286
  page-break-after:avoid;
287
- mso-outline-level:1;
288
- mso-list:l1 level1 lfo6;
289
287
  mso-hyphenate:none;
290
288
  tab-stops:20.0pt list 21.6pt left 28.0pt;
291
289
  {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
@@ -303,6 +301,10 @@ h1
303
301
  mso-ansi-language:EN-GB;
304
302
  mso-fareast-language:JA;
305
303
  mso-bidi-font-weight:normal;}
304
+ h1 {
305
+ mso-outline-level:1;
306
+ mso-list:l1 level1 lfo6;
307
+ }
306
308
  h1.ForewordTitle {
307
309
  font-size:13.0pt;
308
310
  font-style: normal ;
@@ -336,7 +338,7 @@ h1.Annex
336
338
  mso-ansi-language:EN-GB;
337
339
  mso-fareast-language:JA;
338
340
  mso-bidi-font-weight:normal;}
339
- .h2Annex, h2
341
+ .h2Annex, h2, .h2
340
342
  {mso-style-priority:2;
341
343
  mso-style-unhide:no;
342
344
  mso-style-qformat:yes;
@@ -372,7 +374,7 @@ h2
372
374
  { mso-list:l1 level2 lfo6;
373
375
  mso-outline-level:2;
374
376
  }
375
- .h3Annex, h3
377
+ .h3Annex, h3, .h3
376
378
  {mso-style-priority:3;
377
379
  mso-style-unhide:no;
378
380
  mso-style-qformat:yes;
@@ -407,7 +409,7 @@ h2
407
409
  h3 {mso-list:l1 level3 lfo6;
408
410
  mso-outline-level:3;
409
411
  }
410
- .h4Annex, h4
412
+ .h4Annex, h4, .h4
411
413
  {mso-style-priority:4;
412
414
  mso-style-unhide:no;
413
415
  mso-style-qformat:yes;
@@ -440,7 +442,7 @@ h3 {mso-list:l1 level3 lfo6;
440
442
  h4 {mso-list:l1 level4 lfo6;
441
443
  mso-outline-level:4;
442
444
  }
443
- .h5Annex, h5
445
+ .h5Annex, h5, .h5
444
446
  {mso-style-priority:5;
445
447
  mso-style-unhide:no;
446
448
  mso-style-qformat:yes;
@@ -473,7 +475,7 @@ h4 {mso-list:l1 level4 lfo6;
473
475
  h5 {mso-list:l1 level5 lfo6;
474
476
  mso-outline-level:5;
475
477
  }
476
- h6
478
+ h6, .h6
477
479
  {mso-style-priority:6;
478
480
  mso-style-unhide:no;
479
481
  mso-style-qformat:yes;