metanorma-ogc 2.0.1 → 2.0.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (29) hide show
  1. checksums.yaml +4 -4
  2. data/lib/isodoc/ogc/base_convert.rb +1 -1
  3. data/lib/isodoc/ogc/html/html_ogc_titlepage.html +6 -0
  4. data/lib/isodoc/ogc/html/htmlstyle.css +18 -17
  5. data/lib/isodoc/ogc/html/htmlstyle.scss +3 -2
  6. data/lib/isodoc/ogc/html/word_ogc_titlepage.html +6 -1
  7. data/lib/isodoc/ogc/html/word_ogc_titlepage_wp.html +6 -1
  8. data/lib/isodoc/ogc/metadata.rb +3 -0
  9. data/lib/isodoc/ogc/ogc.abstract-specification-topic.xsl +310 -93
  10. data/lib/isodoc/ogc/ogc.best-practice.xsl +310 -93
  11. data/lib/isodoc/ogc/ogc.change-request-supporting-document.xsl +310 -93
  12. data/lib/isodoc/ogc/ogc.community-practice.xsl +310 -93
  13. data/lib/isodoc/ogc/ogc.community-standard.xsl +310 -93
  14. data/lib/isodoc/ogc/ogc.discussion-paper.xsl +310 -93
  15. data/lib/isodoc/ogc/ogc.engineering-report.xsl +310 -93
  16. data/lib/isodoc/ogc/ogc.other.xsl +310 -93
  17. data/lib/isodoc/ogc/ogc.policy.xsl +310 -93
  18. data/lib/isodoc/ogc/ogc.reference-model.xsl +310 -93
  19. data/lib/isodoc/ogc/ogc.release-notes.xsl +310 -93
  20. data/lib/isodoc/ogc/ogc.standard.xsl +310 -93
  21. data/lib/isodoc/ogc/ogc.test-suite.xsl +310 -93
  22. data/lib/isodoc/ogc/ogc.user-guide.xsl +310 -93
  23. data/lib/isodoc/ogc/ogc.white-paper.xsl +300 -95
  24. data/lib/isodoc/ogc/presentation_xml_convert.rb +16 -15
  25. data/lib/metanorma/ogc/biblio.rng +2 -2
  26. data/lib/metanorma/ogc/front.rb +13 -1
  27. data/lib/metanorma/ogc/isodoc.rng +69 -1
  28. data/lib/metanorma/ogc/version.rb +1 -1
  29. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 4ad987b89c8efd7675c9c69273504f68c9f3bab4e820058c6da06b52410a759f
4
- data.tar.gz: 217fbd536e8fb0ddb00e15ac5d689fc0355039a7a2850bb141bd6d7de1b8a0f5
3
+ metadata.gz: 44ee1a340ca37855ff816bf3165f9a3c621a49b6cf84c066c1da4c5e59ccddfc
4
+ data.tar.gz: 91717d247b8885191960133aad5ed66a922bd4fc24380d851025b933acce9205
5
5
  SHA512:
6
- metadata.gz: 7e0a7677cd7219074486ee9ba053c98c5d746032913edbabff1ab6560a583c06f21bbc9cb4991e0b635f39db196d9eb5d0e185905fa74cb6aab958d40c815ac7
7
- data.tar.gz: a86bb6dcd9fd860d9a488edcce06d9249c6d4c257b15328404f5046b8a0d96f96849b203e7c64ecc78c9b7a0a433add609ea5b240492e4c9e6402be4fc6f9aa4
6
+ metadata.gz: d59fdeee4090b4b49224172713ed75482c99bc8fdf06bb2580637d92122228ef7fe8278352f202cd3efcba6a6cce8e9f31916ef0b6e89799e20e4191e7222fde
7
+ data.tar.gz: eb7235d7c53b998ca950074562df5e3192972b1628c939b658abf06548db9047339e8c8418d6576cd43e04be8605370fcb849ce3f39a8c5225501f334b9ed949
data/lib/isodoc/ogc/base_convert.rb CHANGED
@@ -28,7 +28,7 @@ module IsoDoc
28
28
  def term_cleanup(docxml)
29
29
  docxml.xpath("//p[@class = 'Terms']").each do |d|
30
30
  term_cleanup_merge_termnum(d)
31
- term_cleanup_merge_admitted(d)
31
+ # term_cleanup_merge_admitted(d)
32
32
  end
33
33
  docxml
34
34
  end
data/lib/isodoc/ogc/html/html_ogc_titlepage.html CHANGED
@@ -35,6 +35,12 @@
35
35
  -->
36
36
 
37
37
  <div class="authors">
38
+ {% if contributors %}
39
+ {% for contributor in contributors %}
40
+ <span>{{ contributor }} <span class="roletag">Contributor</span></span>
41
+ {% endfor %}
42
+ {% endif %}
43
+
38
44
  {% if editors %}
39
45
  {% for editor in editors %}
40
46
  <span>{{ editor }} <span class="roletag">Editor</span></span>
data/lib/isodoc/ogc/html/htmlstyle.css CHANGED
@@ -514,58 +514,59 @@ dl {
514
514
  dl pre {
515
515
  overflow-x: scroll; }
516
516
 
517
- #toc ul, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) ul {
517
+ #toc ul, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) ul {
518
518
  margin: 0;
519
519
  padding: 0;
520
520
  list-style: none; }
521
- #toc ul li a, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) ul li a {
521
+ #toc ul li a, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) ul li a {
522
522
  padding: 5px 10px; }
523
- #toc ul a, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) ul a {
523
+ #toc ul a, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) ul a {
524
524
  color: #00335b;
525
525
  text-decoration: none;
526
526
  display: block; }
527
- #toc ul a:hover, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) ul a:hover {
527
+ #toc ul a:hover, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) ul a:hover {
528
528
  box-shadow: none;
529
529
  color: white; }
530
530
 
531
- #toc .h2, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) .h2 {
531
+ #toc .h2, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) .h2 {
532
532
  padding-left: 30px; }
533
533
 
534
- #toc .h3, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) .h3 {
534
+ #toc .h3, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) .h3 {
535
535
  padding-left: 50px; }
536
536
 
537
- #toc .toc-active, #toc li:hover, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) .toc-active, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover {
537
+ #toc .toc-active, #toc li:hover, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) .toc-active, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover {
538
538
  background: #00335b;
539
539
  box-shadow: inset -5px 0px 10px -5px #00335b !important; }
540
- #toc .toc-active a, #toc li:hover a, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) .toc-active a, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover a {
540
+ #toc .toc-active a, #toc li:hover a, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) .toc-active a, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover a {
541
541
  color: white; }
542
542
 
543
543
  @media print {
544
- #toc .toc-active, #toc li:hover, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) .toc-active, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover {
544
+ #toc .toc-active, #toc li:hover, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) .toc-active, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover {
545
545
  background: white;
546
546
  box-shadow: none !important; }
547
- #toc .toc-active a, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) .toc-active a {
547
+ #toc .toc-active a, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) .toc-active a {
548
548
  color: #00335b; }
549
- #toc li:hover a, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover a {
549
+ #toc li:hover a, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover a {
550
550
  color: black; } }
551
551
 
552
- #toc li a, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) li a {
552
+ #toc li a, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) li a {
553
553
  font-size: 14px; }
554
554
 
555
- #toc li:before, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) li:before {
555
+ #toc li:before, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) li:before {
556
556
  content: " ";
557
557
  display: none; }
558
558
 
559
- #toc .toc-active, #toc li:hover, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) .toc-active, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover {
559
+ #toc .toc-active, #toc li:hover, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) .toc-active, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover {
560
560
  font-weight: 600; }
561
561
 
562
- #toc li:hover a, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover a {
562
+ #toc li:hover a, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover a {
563
563
  background: none;
564
564
  box-shadow: none; }
565
565
 
566
- #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) {
566
+ #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) {
567
567
  margin-top: 0;
568
- margin-bottom: 0; }
568
+ margin-bottom: 0;
569
+ font-size: 100%; }
569
570
 
570
571
  @media screen and (min-width: 768px) {
571
572
  nav {
data/lib/isodoc/ogc/html/htmlstyle.scss CHANGED
@@ -64,7 +64,7 @@ dl {
64
64
  }
65
65
  }
66
66
 
67
- #toc, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) {
67
+ #toc, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) {
68
68
  @include toc($colorLink: #00335b, $colorLinkActiveBg: #00335b, $colorLinkActiveFg: white);
69
69
 
70
70
  li a {
@@ -86,9 +86,10 @@ dl {
86
86
  }
87
87
  }
88
88
 
89
- #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) {
89
+ #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) {
90
90
  margin-top: 0;
91
91
  margin-bottom: 0;
92
+ font-size: 100%;
92
93
  }
93
94
 
94
95
  nav {
data/lib/isodoc/ogc/html/word_ogc_titlepage.html CHANGED
@@ -30,9 +30,14 @@ style='mso-no-proof:yes;font-size:10.0pt'>Version: {{ edition }}</span></span></
30
30
  <p class="MsoNormal" align="right" style='text-align:right'><span lang="EN-GB"
31
31
  style='mso-no-proof:yes;font-size:10.0pt'>Category: {{ doctype }}</span></span></p>
32
32
 
33
+ {% if contributors %}
34
+ <p class="MsoNormal" align="right" style='text-align:right'><span lang="EN-GB"
35
+ style='mso-no-proof:yes;font-size:10.0pt'>Contributor{% if contributors.size > 1 %}s{% endif %}: {{ contributors | join: ", " }}</span></span></p>
36
+ {% endif %}
37
+
33
38
  {% if editors %}
34
39
  <p class="MsoNormal" align="right" style='text-align:right'><span lang="EN-GB"
35
- style='mso-no-proof:yes;font-size:10.0pt'>Editor: {{ editors | join: ", " }}</span></span></p>
40
+ style='mso-no-proof:yes;font-size:10.0pt'>Editor{% if editors.size > 1 %}s{% endif %}: {{ editors | join: ", " }}</span></span></p>
36
41
  {% endif %}
37
42
 
38
43
  <p class="MsoNormal" align="center" style='text-align:center;line-height:18.0pt;margin-bottom:0.0pt'><b
data/lib/isodoc/ogc/html/word_ogc_titlepage_wp.html CHANGED
@@ -50,9 +50,14 @@ style='mso-no-proof:yes;font-size:10.0pt'>Version: {{ edition }}</span></p>
50
50
  <p class="MsoNormal" align="right" style='text-align:right'><span lang="EN-GB"
51
51
  style='mso-no-proof:yes;font-size:10.0pt'>Category: {{ doctype }}</span></p>
52
52
 
53
+ {% if contributors %}
54
+ <p class="MsoNormal" align="right" style='text-align:right'><span lang="EN-GB"
55
+ style='mso-no-proof:yes;font-size:10.0pt'>Contributor{% if contributors.size > 1 %}s{% endif %}: {{ contributors | join: ", " }}</span></span></p>
56
+ {% endif %}
57
+
53
58
  {% if editors %}
54
59
  <p class="MsoNormal" align="right" style='text-align:right'><span lang="EN-GB"
55
- style='mso-no-proof:yes;font-size:10.0pt'>Editor: {{ editors | join: ", " }}</span></p>
60
+ style='mso-no-proof:yes;font-size:10.0pt'>Editor{% if editors.size > 1 %}s{% endif %}: {{ editors | join: ", " }}</span></span></p>
56
61
  {% endif %}
57
62
 
58
63
  <div style="margin-top:1.0cm;">
data/lib/isodoc/ogc/metadata.rb CHANGED
@@ -63,6 +63,9 @@ module IsoDoc
63
63
  editors = isoxml.xpath(ns("//bibdata/contributor"\
64
64
  "[role/@type = 'editor']/person"))
65
65
  set(:editors, extract_person_names(editors))
66
+ contributors = isoxml.xpath(ns("//bibdata/contributor"\
67
+ "[role/@type = 'contributor']/person"))
68
+ set(:contributors, extract_person_names(contributors))
66
69
  agency(isoxml)
67
70
  end
68
71