metanorma-ogc 2.0.8.1 → 2.1.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (43) hide show
  1. checksums.yaml +4 -4
  2. data/lib/isodoc/ogc/biblio.rb +1 -134
  3. data/lib/isodoc/ogc/html/html_ogc_titlepage.html +2 -0
  4. data/lib/isodoc/ogc/html/htmlstyle.css +6 -0
  5. data/lib/isodoc/ogc/html/htmlstyle.scss +2 -0
  6. data/lib/isodoc/ogc/html/ogc.css +18 -12
  7. data/lib/isodoc/ogc/html/ogc.scss +16 -9
  8. data/lib/isodoc/ogc/html/ogc_wp.css +18 -12
  9. data/lib/isodoc/ogc/html/ogc_wp.scss +16 -9
  10. data/lib/isodoc/ogc/html/word_ogc_intro.html +2 -3
  11. data/lib/isodoc/ogc/html/word_ogc_intro_wp.html +1 -2
  12. data/lib/isodoc/ogc/html/word_ogc_titlepage.html +20 -17
  13. data/lib/isodoc/ogc/html/word_ogc_titlepage_wp.html +3 -0
  14. data/lib/isodoc/ogc/i18n.rb +1 -1
  15. data/lib/isodoc/ogc/init.rb +5 -6
  16. data/lib/isodoc/ogc/ogc.abstract-specification-topic.xsl +1502 -401
  17. data/lib/isodoc/ogc/ogc.best-practice.xsl +1502 -401
  18. data/lib/isodoc/ogc/ogc.change-request-supporting-document.xsl +1502 -401
  19. data/lib/isodoc/ogc/ogc.community-practice.xsl +1502 -401
  20. data/lib/isodoc/ogc/ogc.community-standard.xsl +1502 -401
  21. data/lib/isodoc/ogc/ogc.discussion-paper.xsl +1502 -401
  22. data/lib/isodoc/ogc/ogc.engineering-report.xsl +1502 -401
  23. data/lib/isodoc/ogc/ogc.other.xsl +1502 -401
  24. data/lib/isodoc/ogc/ogc.policy.xsl +1502 -401
  25. data/lib/isodoc/ogc/ogc.reference-model.xsl +1502 -401
  26. data/lib/isodoc/ogc/ogc.release-notes.xsl +1502 -401
  27. data/lib/isodoc/ogc/ogc.standard.xsl +1502 -401
  28. data/lib/isodoc/ogc/ogc.test-suite.xsl +1502 -401
  29. data/lib/isodoc/ogc/ogc.user-guide.xsl +1502 -401
  30. data/lib/isodoc/ogc/ogc.white-paper.xsl +1521 -420
  31. data/lib/isodoc/ogc/presentation_xml_convert.rb +14 -10
  32. data/lib/isodoc/ogc/word_convert.rb +3 -4
  33. data/lib/isodoc/ogc/xref.rb +6 -2
  34. data/lib/metanorma/ogc/biblio.rng +69 -42
  35. data/lib/metanorma/ogc/isodoc.rng +65 -0
  36. data/lib/metanorma/ogc/version.rb +1 -1
  37. data/lib/relaton/render/config.yml +10 -0
  38. data/lib/relaton/render/date.rb +9 -0
  39. data/lib/relaton/render/fields.rb +23 -0
  40. data/lib/relaton/render/general.rb +25 -0
  41. data/lib/relaton/render/parse.rb +11 -0
  42. data/metanorma-ogc.gemspec +1 -1
  43. metadata +10 -5
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 4976045f5f9e91f8e3063916d3c83b19eeddce73f7e599a00b7f0117a172a329
4
- data.tar.gz: 431db0941bdfeef065773432b51817e74f32fbdc179ab1315f994106445db6fe
3
+ metadata.gz: 303ccad748a28a5ae6977c24324c93c9e3a784999fdec12c680ff08e9842c69b
4
+ data.tar.gz: c7f8885a017e94eb472490645c0d2739219810f1fcf23b67dad0459178d3d5e6
5
5
  SHA512:
6
- metadata.gz: 3ce12d5dcb3f4c4020a22e8210a31c39d43d02af6b76099588456b50ac46fbe93cfad0dbe714cdef49295e87b94848899086b21a3c8e82144e2275252ff3bb3f
7
- data.tar.gz: 055d3c4851ea3d1745a7742e07922ad961e91ecd3067178b7778ac1b15434cf781f9b2f319dca6309cf5845fd720e7774ede7326c421f48846b9eb62e0a51f7b
6
+ metadata.gz: a7649a0e94e2f95ae0db7d88b92648433700422f71fb90982ab844d66e2c0aace1bff69682af73d7c17c28c7be99245e16c31e333dc192fea61a6cecaf410bd7
7
+ data.tar.gz: f2886969928de3c9e9468d61c685d5a4ee32db66174cd92ade3ad91919f5109fd2bb99cb52e4119c6ce3df3bdfb05f43322415d48ec44bf49233dc8a5384392d
@@ -4,7 +4,7 @@ module IsoDoc
4
4
  def std_bibitem_entry(list, bib, ordinal, biblio)
5
5
  list.p **attr_code(iso_bibitem_entry_attrs(bib, biblio)) do |ref|
6
6
  prefix_bracketed_ref(ref, "[#{ordinal}]") if biblio
7
- standard_citation(ref, bib)
7
+ reference_format(bib, ref)
8
8
  end
9
9
  end
10
10
 
@@ -19,139 +19,6 @@ module IsoDoc
19
19
  reference_format(bib, r)
20
20
  end
21
21
  end
22
-
23
- def reference_format(bib, ref)
24
- if ftitle = bib.at(ns("./formattedref"))
25
- ftitle&.children&.each { |n| parse(n, ref) }
26
- else
27
- # eventually will be full LNCS reference
28
- standard_citation(ref, bib)
29
- end
30
- end
31
-
32
- def multiplenames(names)
33
- names.join(", ")
34
- end
35
-
36
- def multiplenames_and(names)
37
- return "" if names.empty?
38
- return names[0] if names.length == 1
39
- return "#{names[0]} and #{names[1]}" if names.length == 2
40
-
41
- names[0..-2].join(", ") + " and #{names[-1]}"
42
- end
43
-
44
- def nodes_to_span(node)
45
- noko do |xml|
46
- xml.span do |s|
47
- node&.children&.each { |x| parse(x, s) }
48
- end
49
- end.join
50
- end
51
-
52
- def extract_publisher(bib)
53
- abbrs = []
54
- names = []
55
- bib.xpath(ns("./contributor[role/@type = 'publisher']"\
56
- "[organization]"))&.each do |c1|
57
- n = c1.at(ns("./organization/name")) or next
58
- abbrs << (c1.at(ns("./organization/abbreviation")) || n)
59
- names << nodes_to_span(n)
60
- end
61
- return [nil, nil] if names.empty?
62
-
63
- [multiplenames_and(names), abbrs.map(&:text).join("/")]
64
- end
65
-
66
- def extract_author(bib)
67
- c = bib.xpath(ns("./contributor[role/@type = 'author']"))
68
- c = bib.xpath(ns("./contributor[role/@type = 'editor']")) if c.empty?
69
- return nil if c.empty?
70
-
71
- c.map do |c1|
72
- c1&.at(ns("./organization/name"))&.text || extract_person_name(c1)
73
- end.reject { |e| e.nil? || e.empty? }.join(", ")
74
- end
75
-
76
- def extract_person_name(bib)
77
- p = bib.at(ns("./person/name")) or return
78
- c = p.at(ns("./completename")) and return c.text
79
- s = p&.at(ns("./surname"))&.text or return
80
- i = p.xpath(ns("./initial")) and
81
- front = i.map { |e| e.text.gsub(/[^[:upper:]]/, "") }.join
82
- i.empty? and f = p.xpath(ns("./forename")) and
83
- front = f.map { |e| e.text[0].upcase }.join
84
- front ? "#{s} #{front}" : s
85
- end
86
-
87
- def date_render(date)
88
- return nil if date.nil?
89
-
90
- on = date&.at(ns("./on"))&.text
91
- from = date&.at(ns("./from"))&.text
92
- to = date&.at(ns("./to"))&.text
93
- return on if on && !on.empty?
94
- return "#{from}&ndash;#{to}" if from && !from.empty?
95
-
96
- nil
97
- end
98
-
99
- def extract_year(bib)
100
- d = bib.at(ns("./date[@type = 'published']")) ||
101
- bib.at(ns("./date[@type = 'issued']")) ||
102
- bib.at(ns("./date[@type = 'circulated']")) ||
103
- bib.at(ns("./date"))
104
- date_render(d)
105
- end
106
-
107
- def extract_city(bib)
108
- bib.at(ns("./place"))
109
- end
110
-
111
- def extract_uri(bib)
112
- bib.at(ns("./uri[@type = 'src']")) || bib.at(ns("./uri"))
113
- end
114
-
115
- # {author}: {document identifier}, {title}. {publisher}, {city} ({year})
116
- def standard_citation(out, bib)
117
- if ftitle = bib.at(ns("./formattedref"))
118
- ftitle&.children&.each { |n| parse(n, out) }
119
- else
120
- pub, pub_abbrev = extract_publisher(bib)
121
- author = extract_author(bib)
122
- c = extract_city(bib)
123
- y = extract_year(bib)
124
- u = extract_uri(bib)
125
- out << "#{author || pub_abbrev}: " if author || pub_abbrev
126
- id = render_identifier(inline_bibitem_ref_code(bib))
127
- out << id[:sdo] if id[:sdo]
128
- out << " (Draft)" if ogc_draft_ref?(bib)
129
- out << ", "
130
- out.i do |i|
131
- iso_title(bib)&.children&.each { |n| parse(n, i) }
132
- end
133
- out << ". "
134
- out << pub if pub
135
- out << ", " if pub && c
136
- c&.children&.each { |n| parse(n, out) }
137
- out << " " if (pub || c) && y
138
- out << "(#{y}). " if y
139
- u and out << "<a href='#{u.text}'>#{u.text}</a>"
140
- end
141
- end
142
-
143
- def inline_bibitem_ref_code(bib)
144
- id = bib.at(ns("./docidentifier[not(@type = 'DOI' "\
145
- "or @type = 'metanorma' or @type = 'ISSN' "\
146
- "or @type = 'ISBN' or @type = 'metanorma-ordinal')]"))
147
- id ||= bib.at(ns("./docidentifier[not(@type = 'metanorma' or "\
148
- "@type = 'metanorma-ordinal')]"))
149
- return [nil, id, nil, nil] if id
150
-
151
- id = Nokogiri::XML::Node.new("docidentifier", bib.document)
152
- id << "(NO ID)"
153
- [nil, id, nil, nil]
154
- end
155
22
  end
156
23
  end
157
24
  end
@@ -98,6 +98,8 @@
98
98
  <div class="coverpage-warning">
99
99
  <div id="boilerplate-legal-destination"/>
100
100
  </div>
101
+ <div class="coverpage-warning" id="coverpage-note-destination"/>
102
+
101
103
 
102
104
  <div class="docstage-box">
103
105
  <table>
@@ -930,6 +930,12 @@ p.Biblio, p.NormRef {
930
930
  font-size: 1em;
931
931
  text-align: center; }
932
932
 
933
+ .ListTitle {
934
+ font-weight: 700;
935
+ font-size: 1em;
936
+ text-align: center;
937
+ text-align: left; }
938
+
933
939
  pre {
934
940
  font-family: {{monospacefont}};
935
941
  font-variant-ligatures: none;
@@ -408,6 +408,8 @@ p.Biblio, p.NormRef {
408
408
  @include blockTitle();
409
409
  }
410
410
 
411
+ @include listBlock();
412
+
411
413
  pre {
412
414
  @include sourceBlock(#f7f7f7);
413
415
 
@@ -111,7 +111,7 @@ p.AdmonitionTitle, p.RecommendationTitle, p.RecommendationTestTitle {
111
111
  mso-bidi-font-family: {{bodyfont}};
112
112
  mso-ansi-language: EN-GB; }
113
113
 
114
- p.TableTitle {
114
+ p.TableTitle, p.ListTitle {
115
115
  mso-style-unhide: no;
116
116
  mso-style-qformat: yes;
117
117
  mso-style-parent: "";
@@ -142,13 +142,15 @@ p.Note, div.Note, li.Note, p.TableFootnote, div.TableFootnote, li.TableFootnote
142
142
  line-height: 12.0pt;
143
143
  mso-pagination: widow-orphan;
144
144
  tab-stops: 2.0cm;
145
- font-size: {{smallerfontsize}};
146
145
  mso-bidi-font-size: 11.0pt;
147
- font-family: {{bodyfont}};
148
146
  mso-fareast-font-family: {{bodyfont}};
149
147
  mso-bidi-font-family: {{bodyfont}};
150
148
  mso-ansi-language: EN-GB; }
151
149
 
150
+ p.Note, li.Note, p.TableFootnote, div.TableFootnote, li.TableFootnote {
151
+ font-size: {{smallerfontsize}};
152
+ font-family: {{bodyfont}}; }
153
+
152
154
  p.ANNEX, li.ANNEX, div.ANNEX {
153
155
  mso-style-name: ANNEX;
154
156
  mso-style-priority: 10;
@@ -518,12 +520,14 @@ p.Quote, li.Quote, div.Quote {
518
520
  line-height: 12.0pt;
519
521
  mso-pagination: widow-orphan;
520
522
  tab-stops: 20.15pt;
521
- font-size: {{normalfontsize}};
522
- font-family: {{bodyfont}};
523
523
  mso-fareast-font-family: {{bodyfont}};
524
524
  mso-bidi-font-family: {{bodyfont}};
525
525
  mso-ansi-language: EN-GB; }
526
526
 
527
+ p.Quote, li.Quote {
528
+ font-size: {{normalfontsize}};
529
+ font-family: {{bodyfont}}; }
530
+
527
531
  p.QuoteAttribution {
528
532
  text-align: right;
529
533
  mso-style-priority: 99;
@@ -553,8 +557,6 @@ p.Admonition, li.Admonition, div.Admonition {
553
557
  mso-border-themecolor: accent1;
554
558
  padding: 0cm;
555
559
  mso-padding-alt: 10.0pt 10.0pt 10.0pt 10.0pt;
556
- font-size: 12.0pt;
557
- font-family: {{bodyfont}};
558
560
  mso-ascii-font-family: {{bodyfont}};
559
561
  mso-ascii-theme-font: minor-latin;
560
562
  mso-fareast-font-family: {{bodyfont}};
@@ -565,7 +567,11 @@ p.Admonition, li.Admonition, div.Admonition {
565
567
  mso-bidi-theme-font: minor-bidi;
566
568
  color: #4472C4;
567
569
  mso-themecolor: accent1;
568
- mso-ansi-language: EN-AU;
570
+ mso-ansi-language: EN-AU; }
571
+
572
+ p.Admonition, li.Admonition {
573
+ font-size: 12.0pt;
574
+ font-family: {{bodyfont}};
569
575
  font-style: italic; }
570
576
 
571
577
  p.Code, li.Code, div.Code {
@@ -793,7 +799,9 @@ aside {
793
799
 
794
800
  p.example, li.example, td.example {
795
801
  margin-right: 0pt;
796
- margin-left: 0pt; }
802
+ margin-left: 0pt;
803
+ font-size: {{smallerfontsize}};
804
+ font-family: {{bodyfont}}; }
797
805
 
798
806
  div.example {
799
807
  margin-right: 36.0pt;
@@ -802,9 +810,7 @@ div.example {
802
810
  margin-bottom: 0cm; }
803
811
 
804
812
  p.example, li.example, div.example, td.example {
805
- mso-pagination: none;
806
- font-size: {{smallerfontsize}};
807
- font-family: {{bodyfont}}; }
813
+ mso-pagination: none; }
808
814
 
809
815
  td.example p.MsoListParagraph {
810
816
  font-size: {{smallerfontsize}}; }
@@ -105,7 +105,7 @@ p.AdmonitionTitle, p.RecommendationTitle, p.RecommendationTestTitle
105
105
  mso-fareast-font-family:$bodyfont;
106
106
  mso-bidi-font-family:$bodyfont;
107
107
  mso-ansi-language:EN-GB;}
108
- p.TableTitle
108
+ p.TableTitle, p.ListTitle
109
109
  {mso-style-unhide:no;
110
110
  mso-style-qformat:yes;
111
111
  mso-style-parent:"";
@@ -135,12 +135,14 @@ p.Note, div.Note, li.Note, p.TableFootnote, div.TableFootnote, li.TableFootnote
135
135
  line-height:12.0pt;
136
136
  mso-pagination:widow-orphan;
137
137
  tab-stops:2.0cm;
138
- font-size:$smallerfontsize;
139
138
  mso-bidi-font-size:11.0pt;
140
- font-family:$bodyfont;
141
139
  mso-fareast-font-family:$bodyfont;
142
140
  mso-bidi-font-family:$bodyfont;
143
141
  mso-ansi-language:EN-GB;}
142
+ p.Note, li.Note, p.TableFootnote, div.TableFootnote, li.TableFootnote {
143
+ font-size:$smallerfontsize;
144
+ font-family:$bodyfont;
145
+ }
144
146
  p.ANNEX, li.ANNEX, div.ANNEX
145
147
  {mso-style-name:ANNEX;
146
148
  mso-style-priority:10;
@@ -494,11 +496,13 @@ p.Quote, li.Quote, div.Quote
494
496
  line-height:12.0pt;
495
497
  mso-pagination:widow-orphan;
496
498
  tab-stops:20.15pt;
497
- font-size:$normalfontsize;
498
- font-family:$bodyfont;
499
499
  mso-fareast-font-family:$bodyfont;
500
500
  mso-bidi-font-family:$bodyfont;
501
501
  mso-ansi-language:EN-GB;}
502
+ p.Quote, li.Quote {
503
+ font-size:$normalfontsize;
504
+ font-family:$bodyfont;
505
+ }
502
506
  p.QuoteAttribution
503
507
  {text-align:right;
504
508
  mso-style-priority:99;
@@ -528,8 +532,6 @@ p.Admonition, li.Admonition, div.Admonition
528
532
  mso-border-themecolor:accent1;
529
533
  padding:0cm;
530
534
  mso-padding-alt:10.0pt 10.0pt 10.0pt 10.0pt;
531
- font-size:12.0pt;
532
- font-family:$bodyfont;
533
535
  mso-ascii-font-family:$bodyfont;
534
536
  mso-ascii-theme-font:minor-latin;
535
537
  mso-fareast-font-family:$bodyfont;
@@ -541,6 +543,10 @@ p.Admonition, li.Admonition, div.Admonition
541
543
  color:#4472C4;
542
544
  mso-themecolor:accent1;
543
545
  mso-ansi-language:EN-AU;
546
+ }
547
+ p.Admonition, li.Admonition {
548
+ font-size:12.0pt;
549
+ font-family:$bodyfont;
544
550
  font-style:italic;}
545
551
  p.Code, li.Code, div.Code
546
552
  {mso-style-name:Code;
@@ -746,6 +752,8 @@ margin-left: -36.0pt;
746
752
  p.example, li.example, td.example {
747
753
  margin-right: 0pt;
748
754
  margin-left: 0pt;
755
+ font-size:$smallerfontsize;
756
+ font-family:$bodyfont;
749
757
  }
750
758
 
751
759
  div.example {
@@ -757,8 +765,7 @@ div.example {
757
765
 
758
766
  p.example, li.example, div.example, td.example {
759
767
  mso-pagination:none;
760
- font-size:$smallerfontsize;
761
- font-family:$bodyfont;}
768
+ }
762
769
 
763
770
  td.example p.MsoListParagraph {
764
771
  font-size: $smallerfontsize;
@@ -60,7 +60,7 @@ p.SourceTitle {
60
60
  p.AdmonitionTitle, p.RecommendationTitle, p.RecommendationTestTitle {
61
61
  page-break-after: avoid; }
62
62
 
63
- p.TableTitle, p.FigureTitle, p.SourceTitle, p.AdmonitionTitle, p.RecommendationTitle, p.RecommendationTestTitle, p.example-title {
63
+ p.TableTitle, p.FigureTitle, p.SourceTitle, p.AdmonitionTitle, p.RecommendationTitle, p.RecommendationTestTitle, p.example-title, p.ListTitle {
64
64
  mso-style-unhide: no;
65
65
  mso-style-qformat: yes;
66
66
  mso-style-parent: "";
@@ -96,13 +96,15 @@ p.Note, div.Note, li.Note, p.TableFootnote, div.TableFootnote, li.TableFootnote
96
96
  line-height: 12.0pt;
97
97
  mso-pagination: widow-orphan;
98
98
  tab-stops: 2.0cm;
99
- font-size: {{smallerfontsize}};
100
99
  mso-bidi-font-size: {{normalfontsize}};
101
- font-family: {{bodyfont}};
102
100
  mso-fareast-font-family: {{bodyfont}};
103
101
  mso-bidi-font-family: {{bodyfont}};
104
102
  mso-ansi-language: EN-GB; }
105
103
 
104
+ p.Note, li.Note, p.TableFootnote, div.TableFootnote, li.TableFootnote {
105
+ font-size: {{smallerfontsize}};
106
+ font-family: {{bodyfont}}; }
107
+
106
108
  p.ANNEX, li.ANNEX, div.ANNEX {
107
109
  mso-style-name: ANNEX;
108
110
  mso-style-priority: 10;
@@ -454,12 +456,14 @@ p.Quote, li.Quote, div.Quote {
454
456
  line-height: 12.0pt;
455
457
  mso-pagination: widow-orphan;
456
458
  tab-stops: 20.15pt;
457
- font-size: {{normalfontsize}};
458
- font-family: {{bodyfont}};
459
459
  mso-fareast-font-family: {{bodyfont}};
460
460
  mso-bidi-font-family: {{bodyfont}};
461
461
  mso-ansi-language: EN-GB; }
462
462
 
463
+ p.Quote, li.Quote {
464
+ font-size: {{normalfontsize}};
465
+ font-family: {{bodyfont}}; }
466
+
463
467
  p.QuoteAttribution {
464
468
  text-align: right;
465
469
  mso-style-priority: 99;
@@ -489,8 +493,6 @@ p.Admonition, li.Admonition, div.Admonition {
489
493
  mso-border-themecolor: accent1;
490
494
  padding: 0cm;
491
495
  mso-padding-alt: 10.0pt 10.0pt 10.0pt 10.0pt;
492
- font-size: {{normalfontsize}};
493
- font-family: {{bodyfont}};
494
496
  mso-ascii-font-family: {{bodyfont}};
495
497
  mso-ascii-theme-font: minor-latin;
496
498
  mso-fareast-font-family: {{bodyfont}};
@@ -501,7 +503,11 @@ p.Admonition, li.Admonition, div.Admonition {
501
503
  mso-bidi-theme-font: minor-bidi;
502
504
  color: #4472C4;
503
505
  mso-themecolor: accent1;
504
- mso-ansi-language: EN-AU;
506
+ mso-ansi-language: EN-AU; }
507
+
508
+ p.Admonition, li.Admonition {
509
+ font-size: {{normalfontsize}};
510
+ font-family: {{bodyfont}};
505
511
  font-style: italic; }
506
512
 
507
513
  p.Code, li.Code, div.Code {
@@ -713,7 +719,9 @@ aside {
713
719
 
714
720
  p.example, li.example, td.example {
715
721
  margin-right: 0pt;
716
- margin-left: 0pt; }
722
+ margin-left: 0pt;
723
+ font-size: {{smallerfontsize}};
724
+ font-family: {{bodyfont}}; }
717
725
 
718
726
  div.example {
719
727
  margin-right: 36.0pt;
@@ -722,9 +730,7 @@ div.example {
722
730
  margin-bottom: 0cm; }
723
731
 
724
732
  p.example, li.example, div.example, td.example {
725
- mso-pagination: none;
726
- font-size: {{smallerfontsize}};
727
- font-family: {{bodyfont}}; }
733
+ mso-pagination: none; }
728
734
 
729
735
  td.example p.MsoListParagraph {
730
736
  font-size: {{smallerfontsize}}; }
@@ -60,7 +60,7 @@ p.AdmonitionTitle, p.RecommendationTitle, p.RecommendationTestTitle
60
60
  {
61
61
  page-break-after:avoid;
62
62
  }
63
- p.TableTitle, p.FigureTitle, p.SourceTitle, p.AdmonitionTitle, p.RecommendationTitle, p.RecommendationTestTitle, p.example-title
63
+ p.TableTitle, p.FigureTitle, p.SourceTitle, p.AdmonitionTitle, p.RecommendationTitle, p.RecommendationTestTitle, p.example-title, p.ListTitle
64
64
  {mso-style-unhide:no;
65
65
  mso-style-qformat:yes;
66
66
  mso-style-parent:"";
@@ -95,12 +95,14 @@ p.Note, div.Note, li.Note, p.TableFootnote, div.TableFootnote, li.TableFootnote
95
95
  line-height:12.0pt;
96
96
  mso-pagination:widow-orphan;
97
97
  tab-stops:2.0cm;
98
- font-size:$smallerfontsize;
99
98
  mso-bidi-font-size:$normalfontsize;
100
- font-family:$bodyfont;
101
99
  mso-fareast-font-family:$bodyfont;
102
100
  mso-bidi-font-family:$bodyfont;
103
101
  mso-ansi-language:EN-GB;}
102
+ p.Note, li.Note, p.TableFootnote, div.TableFootnote, li.TableFootnote {
103
+ font-size:$smallerfontsize;
104
+ font-family:$bodyfont;
105
+ }
104
106
  p.ANNEX, li.ANNEX, div.ANNEX
105
107
  {mso-style-name:ANNEX;
106
108
  mso-style-priority:10;
@@ -437,11 +439,13 @@ p.Quote, li.Quote, div.Quote
437
439
  line-height:12.0pt;
438
440
  mso-pagination:widow-orphan;
439
441
  tab-stops:20.15pt;
440
- font-size:$normalfontsize;
441
- font-family:$bodyfont;
442
442
  mso-fareast-font-family:$bodyfont;
443
443
  mso-bidi-font-family:$bodyfont;
444
444
  mso-ansi-language:EN-GB;}
445
+ p.Quote, li.Quote {
446
+ font-size:$normalfontsize;
447
+ font-family:$bodyfont;
448
+ }
445
449
  p.QuoteAttribution
446
450
  {text-align:right;
447
451
  mso-style-priority:99;
@@ -471,8 +475,6 @@ p.Admonition, li.Admonition, div.Admonition
471
475
  mso-border-themecolor:accent1;
472
476
  padding:0cm;
473
477
  mso-padding-alt:10.0pt 10.0pt 10.0pt 10.0pt;
474
- font-size:$normalfontsize;
475
- font-family:$bodyfont;
476
478
  mso-ascii-font-family:$bodyfont;
477
479
  mso-ascii-theme-font:minor-latin;
478
480
  mso-fareast-font-family:$bodyfont;
@@ -484,6 +486,10 @@ p.Admonition, li.Admonition, div.Admonition
484
486
  color:#4472C4;
485
487
  mso-themecolor:accent1;
486
488
  mso-ansi-language:EN-AU;
489
+ }
490
+ p.Admonition, li.Admonition {
491
+ font-size:$normalfontsize;
492
+ font-family:$bodyfont;
487
493
  font-style:italic;}
488
494
  p.Code, li.Code, div.Code
489
495
  {mso-style-name:Code;
@@ -676,6 +682,8 @@ div.coverpage_warning
676
682
  p.example, li.example, td.example {
677
683
  margin-right: 0pt;
678
684
  margin-left: 0pt;
685
+ font-size:$smallerfontsize;
686
+ font-family:$bodyfont;
679
687
  }
680
688
 
681
689
  div.example {
@@ -687,8 +695,7 @@ div.example {
687
695
 
688
696
  p.example, li.example, div.example, td.example {
689
697
  mso-pagination:none;
690
- font-size:$smallerfontsize;
691
- font-family:$bodyfont;}
698
+ }
692
699
 
693
700
  td.example p.MsoListParagraph {
694
701
  font-size: $smallerfontsize;
@@ -6,10 +6,9 @@
6
6
  {% endif %}
7
7
  </div>
8
8
 
9
- <span lang=EN-US style='font-size:12.0pt;font-family:"Times New Roman",serif;
9
+ <span lang="EN-US" style='font-size:12.0pt;font-family:"Times New Roman",serif;
10
10
  mso-fareast-font-family:"Times New Roman";mso-ansi-language:EN-US;mso-fareast-language:
11
- EN-US;mso-bidi-language:AR-SA'><br clear=all style='mso-special-character:line-break;
12
- page-break-before:always'>
11
+ EN-US;mso-bidi-language:AR-SA'><br clear="all" style='mso-special-character:line-break;page-break-before:always'>
13
12
  </span>
14
13
 
15
14
  <p class="zzContents" style='margin-top:0cm'><span lang="EN-GB">Contents</span></p>
@@ -5,8 +5,7 @@
5
5
 
6
6
  <span lang="EN-US" style='font-size:12.0pt;font-family:"Times New Roman",serif;
7
7
  mso-fareast-font-family:"Times New Roman";mso-ansi-language:EN-US;mso-fareast-language:
8
- EN-US;mso-bidi-language:AR-SA'><br clear=all style='mso-special-character:line-break;
9
- page-break-before:always'>
8
+ EN-US;mso-bidi-language:AR-SA'><br clear="all" style='mso-special-character:line-break;page-break-before:always'>
10
9
  </span>
11
10
 
12
11
  <p class="zzContents"><span lang="EN-GB">Table of Contents</span></p>
@@ -50,61 +50,64 @@ style='mso-bidi-font-weight:normal'><span lang="EN-GB" style='font-size:24.0pt'>
50
50
 
51
51
  <div class="warning">
52
52
  <div id="boilerplate-legal-destination"/>
53
+ <div id="boilerplate-license-destination"/>
53
54
  </div>
55
+ <div class="coverpage-warning" id="coverpage-note-destination"/>
56
+
54
57
 
55
58
  <div style='mso-element:frame;mso-element-frame-hspace:7.1pt;mso-element-frame-vspace:
56
59
  7.1pt;mso-element-wrap:auto;mso-element-anchor-vertical:page;mso-element-anchor-horizontal:
57
60
  page;mso-element-left:39.9pt;mso-element-top:693.25pt;mso-height-rule:exactly'>
58
61
 
59
- <table cellspacing=0 cellpadding=0 hspace=0 vspace=0>
62
+ <table cellspacing="0" cellpadding="0" hspace="0" vspace="0">
60
63
  <tr>
61
- <td valign=top align=left style='padding-top:7.1pt;padding-right:7.1pt;
64
+ <td valign="top" align="left" style='padding-top:7.1pt;padding-right:7.1pt;
62
65
  padding-bottom:7.1pt;padding-left:7.1pt'>
63
- <p class=zzCover align=left style='margin-bottom:0cm;margin-bottom:.0001pt;
66
+ <p class="zzCover" align="left" style='margin-bottom:0cm;margin-bottom:.0001pt;
64
67
  text-align:left;mso-hyphenate:none;tab-stops:99.0pt;mso-element:frame;
65
68
  mso-element-frame-hspace:7.1pt;mso-element-frame-vspace:7.1pt;mso-element-wrap:
66
69
  auto;mso-element-anchor-vertical:page;mso-element-anchor-horizontal:page;
67
70
  mso-element-left:39.9pt;mso-element-top:693.25pt;mso-height-rule:exactly'><span
68
- lang=EN-GB style='font-size:10.0pt;mso-color-alt:windowtext;font-weight:normal'>Document
71
+ lang="EN-GB" style='font-size:10.0pt;mso-color-alt:windowtext;font-weight:normal'>Document
69
72
  number:&nbsp;&nbsp;&nbsp;<span style='mso-tab-count:1'>         </span><span
70
- class=SpellE><span lang=EN-GB
71
- style='font-size:10.0pt;font-weight:normal'>{{ docnumber }}</span><span lang=EN-GB style='font-size:10.0pt;
73
+ class="SpellE"><span lang="EN-GB"
74
+ style='font-size:10.0pt;font-weight:normal'>{{ docnumber }}</span><span lang="EN-GB" style='font-size:10.0pt;
72
75
  mso-color-alt:windowtext;font-weight:normal'><o:p></o:p></span></p>
73
76
 
74
- <p class=zzCover align=left style='margin-bottom:0cm;margin-bottom:.0001pt;
77
+ <p class="zzCover" align="left" style='margin-bottom:0cm;margin-bottom:.0001pt;
75
78
  text-align:left;mso-hyphenate:none;tab-stops:99.0pt;mso-element:frame;
76
79
  mso-element-frame-hspace:7.1pt;mso-element-frame-vspace:7.1pt;mso-element-wrap:
77
80
  auto;mso-element-anchor-vertical:page;mso-element-anchor-horizontal:page;
78
81
  mso-element-left:39.9pt;mso-element-top:693.25pt;mso-height-rule:exactly'><span
79
- lang=EN-GB style='font-size:10.0pt;mso-color-alt:windowtext;font-weight:normal'>Document
82
+ lang="EN-GB" style='font-size:10.0pt;mso-color-alt:windowtext;font-weight:normal'>Document
80
83
  type:&nbsp;&nbsp;&nbsp;<span style='mso-tab-count:1'>         </span><span
81
- class=SpellE>OGC</span><sup>®</sup> </span><span lang=EN-GB
82
- style='font-size:10.0pt;font-weight:normal'>{{ doctype }}</span><span lang=EN-GB style='font-size:10.0pt;
84
+ class="SpellE">OGC</span><sup>®</sup> </span><span lang="EN-GB"
85
+ style='font-size:10.0pt;font-weight:normal'>{{ doctype }}</span><span lang="EN-GB" style='font-size:10.0pt;
83
86
  mso-color-alt:windowtext;font-weight:normal'><o:p></o:p></span></p>
84
87
 
85
- <p class=zzCover align=left style='margin-bottom:0cm;margin-bottom:.0001pt;
88
+ <p class="zzCover" align="left" style='margin-bottom:0cm;margin-bottom:.0001pt;
86
89
  text-align:left;mso-hyphenate:none;tab-stops:99.0pt;mso-element:frame;
87
90
  mso-element-frame-hspace:7.1pt;mso-element-frame-vspace:7.1pt;mso-element-wrap:
88
91
  auto;mso-element-anchor-vertical:page;mso-element-anchor-horizontal:page;
89
92
  mso-element-left:39.9pt;mso-element-top:693.25pt;mso-height-rule:exactly'><span
90
- lang=EN-GB style='font-size:10.0pt;mso-color-alt:windowtext;font-weight:normal'>Document
93
+ lang="EN-GB" style='font-size:10.0pt;mso-color-alt:windowtext;font-weight:normal'>Document
91
94
  subtype:&nbsp;&nbsp;&nbsp;<span style='mso-tab-count:1'>    </span>{{ docsubstatus }}<o:p></o:p></span></p>
92
95
 
93
- <p class=zzCover align=left style='margin-bottom:0cm;margin-bottom:.0001pt;
96
+ <p class="zzCover" align="left" style='margin-bottom:0cm;margin-bottom:.0001pt;
94
97
  text-align:left;mso-hyphenate:none;tab-stops:99.0pt;mso-element:frame;
95
98
  mso-element-frame-hspace:7.1pt;mso-element-frame-vspace:7.1pt;mso-element-wrap:
96
99
  auto;mso-element-anchor-vertical:page;mso-element-anchor-horizontal:page;
97
100
  mso-element-left:39.9pt;mso-element-top:693.25pt;mso-height-rule:exactly'><span
98
- lang=EN-GB style='font-size:10.0pt;mso-color-alt:windowtext;font-weight:normal'>Document
101
+ lang="EN-GB" style='font-size:10.0pt;mso-color-alt:windowtext;font-weight:normal'>Document
99
102
  stage:&nbsp;&nbsp;&nbsp;<span style='mso-tab-count:1'>        </span>{{ stage_display }}<o:p></o:p></span></p>
100
- <p class=zzCover align=left style='margin-bottom:0cm;margin-bottom:.0001pt;
103
+ <p class="zzCover" align="left" style='margin-bottom:0cm;margin-bottom:.0001pt;
101
104
  text-align:left;mso-hyphenate:none;tab-stops:99.0pt;mso-element:frame;
102
105
  mso-element-frame-hspace:7.1pt;mso-element-frame-vspace:7.1pt;mso-element-wrap:
103
106
  auto;mso-element-anchor-vertical:page;mso-element-anchor-horizontal:page;
104
107
  mso-element-left:39.9pt;mso-element-top:693.25pt;mso-height-rule:exactly'><span
105
- lang=EN-GB style='font-size:10.0pt;mso-color-alt:windowtext;font-weight:normal'>Document
108
+ lang="EN-GB" style='font-size:10.0pt;mso-color-alt:windowtext;font-weight:normal'>Document
106
109
  language:&nbsp;<span style='mso-tab-count:1'>    </span>{{ doclanguage }}</span><span
107
- lang=EN-GB style='font-size:8.0pt;mso-bidi-font-size:10.0pt;mso-color-alt:
110
+ lang="EN-GB" style='font-size:8.0pt;mso-bidi-font-size:10.0pt;mso-color-alt:
108
111
  windowtext'><o:p></o:p></span></p>
109
112
  </td>
110
113
  </tr>
@@ -65,8 +65,11 @@ style='mso-no-proof:yes;font-size:10.0pt'>Category: {{ doctype }}</span></p>
65
65
  <div id="boilerplate-copyright-destination"/>
66
66
  <div class="warning">
67
67
  <div id="boilerplate-legal-destination"/>
68
+ <div id="boilerplate-license-destination"/>
68
69
  </div>
69
70
  </div>
71
+ <div class="coverpage-warning" id="coverpage-note-destination"/>
72
+
70
73
 
71
74
  <v:shape id="Picture_x0020_4" o:spid="_x0000_s1026" type="#_x0000_t75"
72
75
  alt="A close up of a sign&#10;&#10;Description automatically generated"
@@ -3,7 +3,7 @@ module IsoDoc
3
3
  class I18n < IsoDoc::I18n
4
4
  def load_yaml1(lang, script)
5
5
  y = YAML.load_file(File.join(File.dirname(__FILE__), "i18n-en.yaml"))
6
- super.merge(y)
6
+ super.deep_merge(y)
7
7
  end
8
8
  end
9
9
  end