metanorma-ogc 2.1.0 → 2.1.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (32) hide show
  1. checksums.yaml +4 -4
  2. data/lib/isodoc/ogc/html/htmlstyle.css +6 -0
  3. data/lib/isodoc/ogc/html/htmlstyle.scss +2 -0
  4. data/lib/isodoc/ogc/html/ogc.css +18 -12
  5. data/lib/isodoc/ogc/html/ogc.scss +16 -9
  6. data/lib/isodoc/ogc/html/ogc_wp.css +18 -12
  7. data/lib/isodoc/ogc/html/ogc_wp.scss +16 -9
  8. data/lib/isodoc/ogc/html/word_ogc_intro.html +2 -3
  9. data/lib/isodoc/ogc/html/word_ogc_intro_wp.html +1 -2
  10. data/lib/isodoc/ogc/html/word_ogc_titlepage.html +17 -17
  11. data/lib/isodoc/ogc/i18n.rb +1 -1
  12. data/lib/isodoc/ogc/ogc.abstract-specification-topic.xsl +1355 -329
  13. data/lib/isodoc/ogc/ogc.best-practice.xsl +1355 -329
  14. data/lib/isodoc/ogc/ogc.change-request-supporting-document.xsl +1355 -329
  15. data/lib/isodoc/ogc/ogc.community-practice.xsl +1355 -329
  16. data/lib/isodoc/ogc/ogc.community-standard.xsl +1355 -329
  17. data/lib/isodoc/ogc/ogc.discussion-paper.xsl +1355 -329
  18. data/lib/isodoc/ogc/ogc.engineering-report.xsl +1355 -329
  19. data/lib/isodoc/ogc/ogc.other.xsl +1355 -329
  20. data/lib/isodoc/ogc/ogc.policy.xsl +1355 -329
  21. data/lib/isodoc/ogc/ogc.reference-model.xsl +1355 -329
  22. data/lib/isodoc/ogc/ogc.release-notes.xsl +1355 -329
  23. data/lib/isodoc/ogc/ogc.standard.xsl +1355 -329
  24. data/lib/isodoc/ogc/ogc.test-suite.xsl +1355 -329
  25. data/lib/isodoc/ogc/ogc.user-guide.xsl +1355 -329
  26. data/lib/isodoc/ogc/ogc.white-paper.xsl +1339 -312
  27. data/lib/isodoc/ogc/presentation_xml_convert.rb +17 -2
  28. data/lib/isodoc/ogc/word_convert.rb +1 -1
  29. data/lib/metanorma/ogc/biblio.rng +134 -39
  30. data/lib/metanorma/ogc/isodoc.rng +16 -0
  31. data/lib/metanorma/ogc/version.rb +1 -1
  32. metadata +3 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 114f569b93b16cd055eda79bde9d167827b5af201bcab72cec2341a19f71e679
4
- data.tar.gz: 75b4b390941bece71edeb25dd481fac0a39631b72abc2dbccbdc4bb54b102210
3
+ metadata.gz: b9a74826873e47474f48b5bdc85a27daa9b662d7c80043d0d3ca846a14d11d1f
4
+ data.tar.gz: 665f97082b07ce1d75a1e70f68021f687e0c81c43ce97b749f79eb37f9a71d48
5
5
  SHA512:
6
- metadata.gz: 70bba60758978f653c396c98be63012440e00ae7d82dbd721256d0bc12db6b0d4ae099469acfa24208e5bd067812ca207fe465e986a9e4f2c2202142c2fa3a25
7
- data.tar.gz: 00267f9fc1fb975117feeceb9a2cb29c45ecf86cda368115138452369aa3f52ab36bcd851a9c4d9efaf1e37f1467c145551b4961f949f1e6d94369c808b5f837
6
+ metadata.gz: dbc9cba04e324003fd2b79ec6a9daeffeb4326f691d2ce3aedb402688a6162d326a99691f2b7a826a37cbcf07567b2fb1ae78ef7cb70f8773263a4b5a58707d6
7
+ data.tar.gz: 6dc46edcd44f1756ebe0b8be51167df11b1a7d54b9f75629fc25f00b5b241c103c9841a5b0c609c253ada7c4b00b50eea4f895aa415977ff8b05ff1cb094445a
data/lib/isodoc/ogc/html/htmlstyle.css CHANGED
@@ -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;
data/lib/isodoc/ogc/html/htmlstyle.scss CHANGED
@@ -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
 
data/lib/isodoc/ogc/html/ogc.css CHANGED
@@ -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}}; }
data/lib/isodoc/ogc/html/ogc.scss CHANGED
@@ -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;
data/lib/isodoc/ogc/html/ogc_wp.css CHANGED
@@ -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}}; }
data/lib/isodoc/ogc/html/ogc_wp.scss CHANGED
@@ -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;
data/lib/isodoc/ogc/html/word_ogc_intro.html CHANGED
@@ -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>
data/lib/isodoc/ogc/html/word_ogc_intro_wp.html CHANGED
@@ -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>
data/lib/isodoc/ogc/html/word_ogc_titlepage.html CHANGED
@@ -59,55 +59,55 @@ style='mso-bidi-font-weight:normal'><span lang="EN-GB" style='font-size:24.0pt'>
59
59
  7.1pt;mso-element-wrap:auto;mso-element-anchor-vertical:page;mso-element-anchor-horizontal:
60
60
  page;mso-element-left:39.9pt;mso-element-top:693.25pt;mso-height-rule:exactly'>
61
61
 
62
- <table cellspacing=0 cellpadding=0 hspace=0 vspace=0>
62
+ <table cellspacing="0" cellpadding="0" hspace="0" vspace="0">
63
63
  <tr>
64
- <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;
65
65
  padding-bottom:7.1pt;padding-left:7.1pt'>
66
- <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;
67
67
  text-align:left;mso-hyphenate:none;tab-stops:99.0pt;mso-element:frame;
68
68
  mso-element-frame-hspace:7.1pt;mso-element-frame-vspace:7.1pt;mso-element-wrap:
69
69
  auto;mso-element-anchor-vertical:page;mso-element-anchor-horizontal:page;
70
70
  mso-element-left:39.9pt;mso-element-top:693.25pt;mso-height-rule:exactly'><span
71
- 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
72
72
  number:&nbsp;&nbsp;&nbsp;<span style='mso-tab-count:1'>         </span><span
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;
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;
75
75
  mso-color-alt:windowtext;font-weight:normal'><o:p></o:p></span></p>
76
76
 
77
- <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;
78
78
  text-align:left;mso-hyphenate:none;tab-stops:99.0pt;mso-element:frame;
79
79
  mso-element-frame-hspace:7.1pt;mso-element-frame-vspace:7.1pt;mso-element-wrap:
80
80
  auto;mso-element-anchor-vertical:page;mso-element-anchor-horizontal:page;
81
81
  mso-element-left:39.9pt;mso-element-top:693.25pt;mso-height-rule:exactly'><span
82
- 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
83
83
  type:&nbsp;&nbsp;&nbsp;<span style='mso-tab-count:1'>         </span><span
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;
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;
86
86
  mso-color-alt:windowtext;font-weight:normal'><o:p></o:p></span></p>
87
87
 
88
- <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;
89
89
  text-align:left;mso-hyphenate:none;tab-stops:99.0pt;mso-element:frame;
90
90
  mso-element-frame-hspace:7.1pt;mso-element-frame-vspace:7.1pt;mso-element-wrap:
91
91
  auto;mso-element-anchor-vertical:page;mso-element-anchor-horizontal:page;
92
92
  mso-element-left:39.9pt;mso-element-top:693.25pt;mso-height-rule:exactly'><span
93
- 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
94
94
  subtype:&nbsp;&nbsp;&nbsp;<span style='mso-tab-count:1'>    </span>{{ docsubstatus }}<o:p></o:p></span></p>
95
95
 
96
- <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;
97
97
  text-align:left;mso-hyphenate:none;tab-stops:99.0pt;mso-element:frame;
98
98
  mso-element-frame-hspace:7.1pt;mso-element-frame-vspace:7.1pt;mso-element-wrap:
99
99
  auto;mso-element-anchor-vertical:page;mso-element-anchor-horizontal:page;
100
100
  mso-element-left:39.9pt;mso-element-top:693.25pt;mso-height-rule:exactly'><span
101
- 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
102
102
  stage:&nbsp;&nbsp;&nbsp;<span style='mso-tab-count:1'>        </span>{{ stage_display }}<o:p></o:p></span></p>
103
- <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;
104
104
  text-align:left;mso-hyphenate:none;tab-stops:99.0pt;mso-element:frame;
105
105
  mso-element-frame-hspace:7.1pt;mso-element-frame-vspace:7.1pt;mso-element-wrap:
106
106
  auto;mso-element-anchor-vertical:page;mso-element-anchor-horizontal:page;
107
107
  mso-element-left:39.9pt;mso-element-top:693.25pt;mso-height-rule:exactly'><span
108
- 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
109
109
  language:&nbsp;<span style='mso-tab-count:1'>    </span>{{ doclanguage }}</span><span
110
- 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:
111
111
  windowtext'><o:p></o:p></span></p>
112
112
  </td>
113
113
  </tr>
data/lib/isodoc/ogc/i18n.rb CHANGED
@@ -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