metanorma-ogc 2.0.2 → 2.0.5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (33) hide show
  1. checksums.yaml +4 -4
  2. data/lib/isodoc/ogc/base_convert.rb +8 -6
  3. data/lib/isodoc/ogc/html/ogc.css +1 -2
  4. data/lib/isodoc/ogc/html/ogc.scss +0 -1
  5. data/lib/isodoc/ogc/html/ogc_wp.css +1 -2
  6. data/lib/isodoc/ogc/html/ogc_wp.scss +0 -1
  7. data/lib/isodoc/ogc/html_convert.rb +6 -6
  8. data/lib/isodoc/ogc/ogc.abstract-specification-topic.xsl +1258 -513
  9. data/lib/isodoc/ogc/ogc.best-practice.xsl +1258 -513
  10. data/lib/isodoc/ogc/ogc.change-request-supporting-document.xsl +1258 -513
  11. data/lib/isodoc/ogc/ogc.community-practice.xsl +1258 -513
  12. data/lib/isodoc/ogc/ogc.community-standard.xsl +1258 -513
  13. data/lib/isodoc/ogc/ogc.discussion-paper.xsl +1258 -513
  14. data/lib/isodoc/ogc/ogc.engineering-report.xsl +1258 -513
  15. data/lib/isodoc/ogc/ogc.other.xsl +1258 -513
  16. data/lib/isodoc/ogc/ogc.policy.xsl +1258 -513
  17. data/lib/isodoc/ogc/ogc.reference-model.xsl +1258 -513
  18. data/lib/isodoc/ogc/ogc.release-notes.xsl +1258 -513
  19. data/lib/isodoc/ogc/ogc.standard.xsl +1258 -513
  20. data/lib/isodoc/ogc/ogc.test-suite.xsl +1258 -513
  21. data/lib/isodoc/ogc/ogc.user-guide.xsl +1258 -513
  22. data/lib/isodoc/ogc/ogc.white-paper.xsl +1120 -397
  23. data/lib/isodoc/ogc/presentation_xml_convert.rb +25 -34
  24. data/lib/isodoc/ogc/reqt.rb +2 -1
  25. data/lib/isodoc/ogc/word_convert.rb +2 -78
  26. data/lib/isodoc/ogc/xref.rb +13 -6
  27. data/lib/metanorma/ogc/basicdoc.rng +5 -3
  28. data/lib/metanorma/ogc/biblio.rng +5 -3
  29. data/lib/metanorma/ogc/converter.rb +7 -0
  30. data/lib/metanorma/ogc/isodoc.rng +73 -3
  31. data/lib/metanorma/ogc/processor.rb +10 -10
  32. data/lib/metanorma/ogc/version.rb +1 -1
  33. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 44ee1a340ca37855ff816bf3165f9a3c621a49b6cf84c066c1da4c5e59ccddfc
4
- data.tar.gz: 91717d247b8885191960133aad5ed66a922bd4fc24380d851025b933acce9205
3
+ metadata.gz: 056640c9b99f89ac5e10954d3902f72441ec971b2245724e15d47a7f65e20b62
4
+ data.tar.gz: 8dd6622cd5bdd70472865ce662e23a555db66f661d33f274bff9cb4b9a2d4742
5
5
  SHA512:
6
- metadata.gz: d59fdeee4090b4b49224172713ed75482c99bc8fdf06bb2580637d92122228ef7fe8278352f202cd3efcba6a6cce8e9f31916ef0b6e89799e20e4191e7222fde
7
- data.tar.gz: eb7235d7c53b998ca950074562df5e3192972b1628c939b658abf06548db9047339e8c8418d6576cd43e04be8605370fcb849ce3f39a8c5225501f334b9ed949
6
+ metadata.gz: 68082bdefeadf5e0be4ac14485c32ee8514788c1734ec10ddab4c449f5d454014834311290a7837002b7022f73811e24ab1ddc66ac8475899357c2a2f7d54b69
7
+ data.tar.gz: da8f7bc31006422fa95fc20b99392fe218ef18d9c7335c0d929c2437ed0d438678644e5e200f7c2e7de6ab262d5579dcbf5f857d2cbba0840453817554d42396
data/lib/isodoc/ogc/base_convert.rb CHANGED
@@ -117,11 +117,11 @@ module IsoDoc
117
117
  ret
118
118
  end
119
119
 
120
- def make_tr_attr(td, row, totalrows, header)
120
+ def make_tr_attr(cell, row, totalrows, header)
121
121
  ret = super
122
- if td.at("./ancestor::xmlns:table[@class = 'recommendation'] | "\
123
- "./ancestor::xmlns:table[@class = 'requirement'] | "\
124
- "./ancestor::xmlns:table[@class = 'permission']")
122
+ if cell.at("./ancestor::xmlns:table[@class = 'recommendation'] | "\
123
+ "./ancestor::xmlns:table[@class = 'requirement'] | "\
124
+ "./ancestor::xmlns:table[@class = 'permission']")
125
125
  ret[:style] = "vertical-align:top;"
126
126
  ret[:class] = "recommend"
127
127
  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
- ol_style(%i(arabic alphabet roman alphabet_upper roman_upper)[(idx - 1) % 5])
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
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}}; }
data/lib/isodoc/ogc/html/ogc.scss CHANGED
@@ -770,7 +770,6 @@ div.example p.MsoListParagraph {
770
770
 
771
771
  div.Note p.MsoListParagraph {
772
772
  font-size: $smallerfontsize;
773
- margin-left: 1.0cm;
774
773
  }
775
774
 
776
775
  div.Note span.stem {
data/lib/isodoc/ogc/html/ogc_wp.css CHANGED
@@ -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}}; }
data/lib/isodoc/ogc/html/ogc_wp.scss CHANGED
@@ -700,7 +700,6 @@ div.example p.MsoListParagraph {
700
700
 
701
701
  div.Note p.MsoListParagraph {
702
702
  font-size: $smallerfontsize;
703
- margin-left: 1.0cm;
704
703
  }
705
704
 
706
705
  div.Note span.stem {
data/lib/isodoc/ogc/html_convert.rb CHANGED
@@ -6,7 +6,6 @@ require_relative "metadata"
6
6
 
7
7
  module IsoDoc
8
8
  module Ogc
9
-
10
9
  # A {Converter} implementation that generates HTML output, and a document
11
10
  # schema encapsulation of the document for validation
12
11
  #
@@ -16,7 +15,7 @@ module IsoDoc
16
15
  super
17
16
  end
18
17
 
19
- def default_fonts(options)
18
+ def default_fonts(_options)
20
19
  {
21
20
  bodyfont: '"Overpass",sans-serif',
22
21
  headerfont: '"Overpass",sans-serif',
@@ -37,9 +36,9 @@ module IsoDoc
37
36
 
38
37
  def googlefonts
39
38
  <<~HEAD.freeze
40
- <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,600,600i|Space+Mono:400,700" rel="stylesheet" />
41
- <link href="https://fonts.googleapis.com/css?family=Overpass:300,300i,600,900" rel="stylesheet">
42
- <link href="https://fonts.googleapis.com/css?family=Teko:300,400,500" rel="stylesheet">
39
+ <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,600,600i|Space+Mono:400,700" rel="stylesheet" />
40
+ <link href="https://fonts.googleapis.com/css?family=Overpass:300,300i,600,900" rel="stylesheet">
41
+ <link href="https://fonts.googleapis.com/css?family=Teko:300,400,500" rel="stylesheet">
43
42
  HEAD
44
43
  end
45
44
 
@@ -53,7 +52,8 @@ module IsoDoc
53
52
  end
54
53
 
55
54
  def make_body(xml, docxml)
56
- body_attr = { lang: "EN-US", link: "blue", vlink: "#954F72", "xml:lang": "EN-US", class: "container" }
55
+ body_attr = { lang: "EN-US", link: "blue", vlink: "#954F72",
56
+ "xml:lang": "EN-US", class: "container" }
57
57
  xml.body **body_attr do |body|
58
58
  make_body1(body, docxml)
59
59
  make_body2(body, docxml)