isodoc 2.2.2.2 → 2.2.3

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 (8) hide show
  1. checksums.yaml +4 -4
  2. data/isodoc.gemspec +4 -4
  3. data/lib/isodoc/i18n.rb +3 -18
  4. data/lib/isodoc/pdf_convert.rb +0 -1
  5. data/lib/isodoc/version.rb +1 -1
  6. data/lib/isodoc/xslfo_convert.rb +0 -2
  7. data/lib/relaton/render/general.rb +4 -1
  8. metadata +21 -21
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 35faf26226ce9567b1cbe542ce0e2e5e9addaa4db63d88460a978b91e1aa7b1f
4
- data.tar.gz: 3c6c08ee8a7b87edb3f4d17c5e1dd58e7b23081e3cce392a85404f8eafd3c280
3
+ metadata.gz: efcdfcde0ed6b8878845a1b030b1bf7f375dc21f7daae1589ba6b8324e06a333
4
+ data.tar.gz: 6498b1dc8efa9f850c2fed954ec9f7067d847fb932d86b4e353125754e780dad
5
5
  SHA512:
6
- metadata.gz: 2c1f5785099717614434d6099c2b6f843d24cb5e7de0cd2cfbfb4da5a42039bd790d90b91f270befd4fa6002f79509007024e2baf52803a5720d7f0d75433294
7
- data.tar.gz: 05203b0d0f5092a7e0ab26659d8b8f6a7b8ed9d1a2d3a6ffa0d2cd06b94748d432c264978c32bbc0af391817af0046313782dfff74f840c8b14cfcc28992b466
6
+ metadata.gz: 0b6a7404d5021f2ef2db93b83803a122a842febd05e30fb0fbda876407c8b8673382ef818038f73899376d6ba1b465410d12c4076c782829a8292adefd65e758
7
+ data.tar.gz: 251e5f94894578f8d5e365333a1512a1c8bac91d0c6020afa95d409eb1c9299f4bbb73762c94e2103775e85f5bb43e5b6710161c9f79ebee2fa0d29d5d94f0f1
data/isodoc.gemspec CHANGED
@@ -34,13 +34,14 @@ Gem::Specification.new do |spec|
34
34
  spec.add_dependency "asciimath"
35
35
  spec.add_dependency "html2doc", "~> 1.4.1"
36
36
  spec.add_dependency "htmlentities", "~> 4.3.4"
37
- spec.add_dependency "isodoc-i18n", "~> 1.0.6"
37
+ spec.add_dependency "isodoc-i18n", "~> 1.0.7"
38
38
  spec.add_dependency "liquid", "~> 4"
39
39
  # spec.add_dependency "metanorma", ">= 1.2.0"
40
40
  spec.add_dependency "emf2svg"
41
41
  spec.add_dependency "mathml2asciimath"
42
- spec.add_dependency "metanorma-utils", "~> 1.3.2"
43
- spec.add_dependency "mn-requirements", "~> 0.1.2"
42
+ spec.add_dependency "metanorma-utils", "~> 1.4.0"
43
+ spec.add_dependency "mn2pdf"
44
+ spec.add_dependency "mn-requirements", "~> 0.1.3"
44
45
  spec.add_dependency "relaton-cli"
45
46
  spec.add_dependency "relaton-render", "~> 0.4.0"
46
47
  spec.add_dependency "roman-numerals"
@@ -52,7 +53,6 @@ Gem::Specification.new do |spec|
52
53
  spec.add_development_dependency "equivalent-xml", "~> 0.6"
53
54
  spec.add_development_dependency "guard", "~> 2.14"
54
55
  spec.add_development_dependency "guard-rspec", "~> 4.7"
55
- spec.add_development_dependency "metanorma-iso", ">= 2.1.7"
56
56
  spec.add_development_dependency "rake", "~> 13.0"
57
57
  spec.add_development_dependency "rexml"
58
58
  spec.add_development_dependency "rspec", "~> 3.6"
data/lib/isodoc/i18n.rb CHANGED
@@ -1,9 +1,12 @@
1
1
  require "yaml"
2
2
  require "isodoc-i18n"
3
3
  require_relative "function/utils"
4
+ require "metanorma-utils"
4
5
 
5
6
  module IsoDoc
6
7
  class I18n
8
+ Hash.include Metanorma::Utils::Hash
9
+
7
10
  def load_yaml1(lang, script)
8
11
  case lang
9
12
  when "en", "fr", "ru", "de", "es", "ar"
@@ -24,21 +27,3 @@ module IsoDoc
24
27
  end
25
28
  end
26
29
 
27
- class ::Hash
28
- def deep_merge(second)
29
- merger = proc { |_, v1, v2|
30
- if Hash === v1 && Hash === v2
31
- v1.merge(v2, &merger)
32
- elsif Array === v1 && Array === v2
33
- v1 | v2
34
- elsif [:undefined, nil,
35
- :nil].include?(v2)
36
- v1
37
- else
38
- v2
39
- end
40
- }
41
- merge(second.to_h, &merger)
42
- end
43
- end
44
-
data/lib/isodoc/pdf_convert.rb CHANGED
@@ -1,7 +1,6 @@
1
1
  require_relative "html_function/comments"
2
2
  require_relative "html_function/footnotes"
3
3
  require_relative "html_function/html"
4
- require "metanorma"
5
4
 
6
5
  module IsoDoc
7
6
  class PdfConvert < ::IsoDoc::Convert
data/lib/isodoc/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module IsoDoc
2
- VERSION = "2.2.2.2".freeze
2
+ VERSION = "2.2.3".freeze
3
3
  end
data/lib/isodoc/xslfo_convert.rb CHANGED
@@ -1,5 +1,3 @@
1
- require "metanorma"
2
-
3
1
  module IsoDoc
4
2
  class XslfoPdfConvert < ::IsoDoc::Convert
5
3
  MN_OPTIONS_KEY = :mn2pdf
data/lib/relaton/render/general.rb CHANGED
@@ -5,8 +5,11 @@ module Relaton
5
5
  module Render
6
6
  module IsoDoc
7
7
  class General < ::Relaton::Render::General
8
+ Hash.include Metanorma::Utils::Hash
9
+
8
10
  def config_loc
9
- YAML.load_file(File.join(File.dirname(__FILE__), "config.yml"))
11
+ YAML.load_file(File.join(File.dirname(__FILE__),
12
+ "config.yml"))
10
13
  end
11
14
 
12
15
  def read_config
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: isodoc
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.2.2.2
4
+ version: 2.2.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
@@ -58,14 +58,14 @@ dependencies:
58
58
  requirements:
59
59
  - - "~>"
60
60
  - !ruby/object:Gem::Version
61
- version: 1.0.6
61
+ version: 1.0.7
62
62
  type: :runtime
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
66
  - - "~>"
67
67
  - !ruby/object:Gem::Version
68
- version: 1.0.6
68
+ version: 1.0.7
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: liquid
71
71
  requirement: !ruby/object:Gem::Requirement
@@ -114,28 +114,42 @@ dependencies:
114
114
  requirements:
115
115
  - - "~>"
116
116
  - !ruby/object:Gem::Version
117
- version: 1.3.2
117
+ version: 1.4.0
118
118
  type: :runtime
119
119
  prerelease: false
120
120
  version_requirements: !ruby/object:Gem::Requirement
121
121
  requirements:
122
122
  - - "~>"
123
123
  - !ruby/object:Gem::Version
124
- version: 1.3.2
124
+ version: 1.4.0
125
+ - !ruby/object:Gem::Dependency
126
+ name: mn2pdf
127
+ requirement: !ruby/object:Gem::Requirement
128
+ requirements:
129
+ - - ">="
130
+ - !ruby/object:Gem::Version
131
+ version: '0'
132
+ type: :runtime
133
+ prerelease: false
134
+ version_requirements: !ruby/object:Gem::Requirement
135
+ requirements:
136
+ - - ">="
137
+ - !ruby/object:Gem::Version
138
+ version: '0'
125
139
  - !ruby/object:Gem::Dependency
126
140
  name: mn-requirements
127
141
  requirement: !ruby/object:Gem::Requirement
128
142
  requirements:
129
143
  - - "~>"
130
144
  - !ruby/object:Gem::Version
131
- version: 0.1.2
145
+ version: 0.1.3
132
146
  type: :runtime
133
147
  prerelease: false
134
148
  version_requirements: !ruby/object:Gem::Requirement
135
149
  requirements:
136
150
  - - "~>"
137
151
  - !ruby/object:Gem::Version
138
- version: 0.1.2
152
+ version: 0.1.3
139
153
  - !ruby/object:Gem::Dependency
140
154
  name: relaton-cli
141
155
  requirement: !ruby/object:Gem::Requirement
@@ -276,20 +290,6 @@ dependencies:
276
290
  - - "~>"
277
291
  - !ruby/object:Gem::Version
278
292
  version: '4.7'
279
- - !ruby/object:Gem::Dependency
280
- name: metanorma-iso
281
- requirement: !ruby/object:Gem::Requirement
282
- requirements:
283
- - - ">="
284
- - !ruby/object:Gem::Version
285
- version: 2.1.7
286
- type: :development
287
- prerelease: false
288
- version_requirements: !ruby/object:Gem::Requirement
289
- requirements:
290
- - - ">="
291
- - !ruby/object:Gem::Version
292
- version: 2.1.7
293
293
  - !ruby/object:Gem::Dependency
294
294
  name: rake
295
295
  requirement: !ruby/object:Gem::Requirement