metanorma-ogc 2.0.3 → 2.0.6

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 5e8614f0756871df71fbe86d5a3bf7ce5fc6ebd76f9764a803be35cf6ec38bdb
4
- data.tar.gz: c8f3de3643c38786188ebc3f618624b733d50cb85d2c254600010bd141241068
3
+ metadata.gz: 61e36c2e89b6b98ad39875845197c8614cd4c1906f4d6f4e2359cc33c7933010
4
+ data.tar.gz: 151018908ddb1823476252db5ea5a196854999365e34f678c47d9c5f3775c2a9
5
5
  SHA512:
6
- metadata.gz: d5dd85084c3420d9b4d27e097784ba6f1b636288f412cc14edc83dedc7f185a4ae03d057eea0424d64db23157da5e8e563130f2a01dc85929228617bcf23b710
7
- data.tar.gz: a1f2ca81d35514c361a6f49cfaf4459e723371354dcf928672371725677b29ecb1a52db91eeefe2d30410aee162448ba947d676f2dd2fd52fe2443f15d9b52a5
6
+ metadata.gz: 1ac0c8664160741ddaff9f625c64663338d6c1fd176f6b2d60f59d0810c3b448865cadeb5a15c1a269542cfce7fb98dc192b5a90a9dcb37d18e010db2f1127fc
7
+ data.tar.gz: d9b93b3c092a5d9b57d6ce03b8cf865e82ae04f0cb1faaf9feb55a2b67f9827aa7a8a511c6afcbd8fc202c6d12e393f8e2f8e6008c249f9d19448d53af037326
@@ -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
@@ -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)