metanorma-ogc 2.0.0 → 2.0.4
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 +4 -4
- data/lib/isodoc/ogc/base_convert.rb +5 -3
- data/lib/isodoc/ogc/html/html_ogc_titlepage.html +6 -0
- data/lib/isodoc/ogc/html/htmlstyle.css +18 -17
- data/lib/isodoc/ogc/html/htmlstyle.scss +3 -2
- data/lib/isodoc/ogc/html/ogc.css +1 -2
- data/lib/isodoc/ogc/html/ogc.scss +0 -1
- data/lib/isodoc/ogc/html/ogc_wp.css +1 -2
- data/lib/isodoc/ogc/html/ogc_wp.scss +0 -1
- data/lib/isodoc/ogc/html/word_ogc_titlepage.html +6 -1
- data/lib/isodoc/ogc/html/word_ogc_titlepage_wp.html +6 -1
- data/lib/isodoc/ogc/metadata.rb +3 -0
- data/lib/isodoc/ogc/ogc.abstract-specification-topic.xsl +2433 -1494
- data/lib/isodoc/ogc/ogc.best-practice.xsl +2433 -1494
- data/lib/isodoc/ogc/ogc.change-request-supporting-document.xsl +2433 -1494
- data/lib/isodoc/ogc/ogc.community-practice.xsl +2433 -1494
- data/lib/isodoc/ogc/ogc.community-standard.xsl +2433 -1494
- data/lib/isodoc/ogc/ogc.discussion-paper.xsl +2433 -1494
- data/lib/isodoc/ogc/ogc.engineering-report.xsl +2433 -1494
- data/lib/isodoc/ogc/ogc.other.xsl +2433 -1494
- data/lib/isodoc/ogc/ogc.policy.xsl +2433 -1494
- data/lib/isodoc/ogc/ogc.reference-model.xsl +2433 -1494
- data/lib/isodoc/ogc/ogc.release-notes.xsl +2433 -1494
- data/lib/isodoc/ogc/ogc.standard.xsl +2433 -1494
- data/lib/isodoc/ogc/ogc.test-suite.xsl +2433 -1494
- data/lib/isodoc/ogc/ogc.user-guide.xsl +2433 -1494
- data/lib/isodoc/ogc/ogc.white-paper.xsl +2444 -1605
- data/lib/isodoc/ogc/presentation_xml_convert.rb +21 -25
- data/lib/isodoc/ogc/reqt.rb +19 -4
- data/lib/isodoc/ogc/xref.rb +11 -4
- data/lib/metanorma/ogc/basicdoc.rng +5 -3
- data/lib/metanorma/ogc/biblio.rng +7 -5
- data/lib/metanorma/ogc/cleanup.rb +15 -0
- data/lib/metanorma/ogc/front.rb +13 -1
- data/lib/metanorma/ogc/isodoc.rng +142 -4
- data/lib/metanorma/ogc/validate.rb +38 -0
- data/lib/metanorma/ogc/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 8f96712a836ecd61ea5c7c706335c5f5ee895c819a3b65905a0f88b42ad63991
|
|
4
|
+
data.tar.gz: a177b6bdfbf926afd1946f9891f8ae11f7763595cf73716d7e8457648e5b1d8a
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 4465fc5ab6f9b7994c01db9c7f61f94e7c699c1120bd073e455a42947eb1c62e52ad9f7676f7a9eddbff1b1c11b6f460b19fd41761729176488ba6a22da3f477
|
|
7
|
+
data.tar.gz: 9e4661b7d45f62b8bcf704ce5ede43462ce05aa3cfc5a5c3b0516480e95794b8c70ae61517bf3a1f73a8fe895f35c6929b790653670d2d73cceb5b82263035d8
|
|
@@ -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
|
|
@@ -129,7 +129,8 @@ module IsoDoc
|
|
|
129
129
|
end
|
|
130
130
|
|
|
131
131
|
def para_class(node)
|
|
132
|
-
return node["class"] if node["class"]
|
|
132
|
+
return node["class"] if node["class"] &&
|
|
133
|
+
node["class"] != "RecommendationLabel"
|
|
133
134
|
|
|
134
135
|
super
|
|
135
136
|
end
|
|
@@ -139,7 +140,8 @@ module IsoDoc
|
|
|
139
140
|
node.at(".//ancestor::xmlns:ol[@class = 'steps']")
|
|
140
141
|
|
|
141
142
|
idx = node.xpath("./ancestor-or-self::xmlns:ol[@class = 'steps']").size
|
|
142
|
-
|
|
143
|
+
styles = %i(arabic alphabet roman alphabet_upper roman_upper)
|
|
144
|
+
ol_style(styles[(idx - 1) % 5])
|
|
143
145
|
end
|
|
144
146
|
end
|
|
145
147
|
end
|
|
@@ -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>
|
|
@@ -514,58 +514,59 @@ dl {
|
|
|
514
514
|
dl pre {
|
|
515
515
|
overflow-x: scroll; }
|
|
516
516
|
|
|
517
|
-
#toc ul, #toc > 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
|
|
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
|
|
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
|
|
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
|
|
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
|
|
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
|
|
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
|
|
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
|
|
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
|
|
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
|
|
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
|
|
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
|
|
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
|
|
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
|
|
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
|
|
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 {
|
|
@@ -64,7 +64,7 @@ dl {
|
|
|
64
64
|
}
|
|
65
65
|
}
|
|
66
66
|
|
|
67
|
-
#toc, #toc > ul
|
|
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
|
|
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/ogc.css
CHANGED
|
@@ -813,8 +813,7 @@ div.example p.MsoListParagraph {
|
|
|
813
813
|
font-size: {{smallerfontsize}}; }
|
|
814
814
|
|
|
815
815
|
div.Note p.MsoListParagraph {
|
|
816
|
-
font-size: {{smallerfontsize}};
|
|
817
|
-
margin-left: 1.0cm; }
|
|
816
|
+
font-size: {{smallerfontsize}}; }
|
|
818
817
|
|
|
819
818
|
div.Note span.stem {
|
|
820
819
|
font-size: {{smallerfontsize}}; }
|
|
@@ -733,8 +733,7 @@ div.example p.MsoListParagraph {
|
|
|
733
733
|
font-size: {{smallerfontsize}}; }
|
|
734
734
|
|
|
735
735
|
div.Note p.MsoListParagraph {
|
|
736
|
-
font-size: {{smallerfontsize}};
|
|
737
|
-
margin-left: 1.0cm; }
|
|
736
|
+
font-size: {{smallerfontsize}}; }
|
|
738
737
|
|
|
739
738
|
div.Note span.stem {
|
|
740
739
|
font-size: {{smallerfontsize}}; }
|
|
@@ -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
|
|
@@ -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
|
|