metanorma-m3aawg 1.4.0 → 1.5.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (25) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/macos.yml +0 -1
  3. data/.github/workflows/ubuntu.yml +10 -7
  4. data/.github/workflows/windows.yml +0 -1
  5. data/Rakefile +2 -0
  6. data/lib/asciidoctor/m3aawg/converter.rb +3 -32
  7. data/lib/asciidoctor/m3aawg/isodoc.rng +12 -6
  8. data/lib/isodoc/m3aawg/base_convert.rb +0 -32
  9. data/lib/isodoc/m3aawg/html/htmlstyle.css +1030 -0
  10. data/lib/isodoc/m3aawg/html/m3d.css +758 -0
  11. data/lib/isodoc/m3aawg/html/m3d.scss +0 -1
  12. data/lib/isodoc/m3aawg/html/wordstyle.css +1278 -0
  13. data/lib/isodoc/m3aawg/html/wordstyle.scss +0 -1
  14. data/lib/isodoc/m3aawg/html_convert.rb +2 -0
  15. data/lib/isodoc/m3aawg/i18n-en.yaml +1 -0
  16. data/lib/isodoc/m3aawg/i18n.rb +10 -0
  17. data/lib/isodoc/m3aawg/init.rb +27 -0
  18. data/lib/isodoc/m3aawg/m3d.report.xsl +1431 -1173
  19. data/lib/isodoc/m3aawg/presentation_xml_convert.rb +10 -1
  20. data/lib/isodoc/m3aawg/word_convert.rb +2 -0
  21. data/lib/isodoc/m3aawg/xref.rb +6 -0
  22. data/lib/metanorma/m3aawg/processor.rb +1 -5
  23. data/lib/metanorma/m3aawg/version.rb +1 -1
  24. data/metanorma-m3d.gemspec +3 -7
  25. metadata +24 -59
data/lib/isodoc/m3aawg/presentation_xml_convert.rb CHANGED
@@ -1,9 +1,18 @@
1
- require_relative "base_convert"
1
+ require_relative "init"
2
2
  require "isodoc"
3
3
 
4
4
  module IsoDoc
5
5
  module M3AAWG
6
6
  class PresentationXMLConvert < IsoDoc::PresentationXMLConvert
7
+ def annex1(f)
8
+ lbl = @xrefs.anchor(f['id'], :label)
9
+ if t = f.at(ns("./title"))
10
+ t.children = "<strong>#{t.children.to_xml}</strong>"
11
+ end
12
+ prefix_name(f, "<br/>", lbl, "title")
13
+ end
14
+
15
+ include Init
7
16
  end
8
17
  end
9
18
  end
data/lib/isodoc/m3aawg/word_convert.rb CHANGED
@@ -1,5 +1,6 @@
1
1
  require "isodoc"
2
2
  require_relative "base_convert"
3
+ require_relative "init"
3
4
 
4
5
  module IsoDoc
5
6
  module M3AAWG
@@ -56,6 +57,7 @@ module IsoDoc
56
57
  end
57
58
 
58
59
  include BaseRender
60
+ include Init
59
61
  end
60
62
  end
61
63
  end
data/lib/isodoc/m3aawg/xref.rb ADDED
@@ -0,0 +1,6 @@
1
+ module IsoDoc
2
+ module M3AAWG
3
+ class Xref < IsoDoc::Xref
4
+ end
5
+ end
6
+ end
data/lib/metanorma/m3aawg/processor.rb CHANGED
@@ -30,10 +30,6 @@ module Metanorma
30
30
  "Metanorma::M3AAWG #{Metanorma::M3AAWG::VERSION}"
31
31
  end
32
32
 
33
- def input_to_isodoc(file, filename)
34
- Metanorma::Input::Asciidoc.new.process(file, filename, @asciidoctor_backend)
35
- end
36
-
37
33
  def output(isodoc_node, inname, outname, format, options={})
38
34
  case format
39
35
  when :html
@@ -41,7 +37,7 @@ module Metanorma
41
37
  when :doc
42
38
  IsoDoc::M3AAWG::WordConvert.new(options).convert(inname, isodoc_node, nil, outname)
43
39
  when :pdf
44
- IsoDoc::M3AAWG::WordConvert.new(options).convert(inname, isodoc_node, nil, outname)
40
+ IsoDoc::M3AAWG::PdfConvert.new(options).convert(inname, isodoc_node, nil, outname)
45
41
  when :presentation
46
42
  IsoDoc::M3AAWG::PresentationXMLConvert.new(options).convert(inname, isodoc_node, nil, outname)
47
43
  else
data/lib/metanorma/m3aawg/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module M3AAWG
3
- VERSION = "1.4.0"
3
+ VERSION = "1.5.1"
4
4
  end
5
5
  end
data/metanorma-m3d.gemspec CHANGED
@@ -29,17 +29,13 @@ Gem::Specification.new do |spec|
29
29
  spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
30
30
 
31
31
  spec.add_dependency "htmlentities", "~> 4.3.4"
32
- spec.add_dependency "image_size"
33
- spec.add_dependency "mime-types"
34
- #spec.add_dependency "nokogiri"
35
- spec.add_dependency "ruby-jing"
36
32
  spec.add_dependency "thread_safe"
37
- spec.add_dependency "uuidtools"
38
33
 
39
- spec.add_dependency "metanorma-standoc", "~> 1.4.0"
40
- spec.add_dependency "isodoc", "~> 1.1.0"
34
+ spec.add_dependency "metanorma-standoc", "~> 1.5.0"
35
+ spec.add_dependency "isodoc", "~> 1.2.0"
41
36
 
42
37
  spec.add_development_dependency "byebug", "~> 9.1"
38
+ spec.add_development_dependency "sassc", "~> 2.4.0"
43
39
  spec.add_development_dependency "equivalent-xml", "~> 0.6"
44
40
  spec.add_development_dependency "guard", "~> 2.14"
45
41
  spec.add_development_dependency "guard-rspec", "~> 4.7"
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-m3aawg
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.4.0
4
+ version: 1.5.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2020-06-26 00:00:00.000000000 Z
11
+ date: 2020-08-14 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: htmlentities
@@ -24,48 +24,6 @@ dependencies:
24
24
  - - "~>"
25
25
  - !ruby/object:Gem::Version
26
26
  version: 4.3.4
27
- - !ruby/object:Gem::Dependency
28
- name: image_size
29
- requirement: !ruby/object:Gem::Requirement
30
- requirements:
31
- - - ">="
32
- - !ruby/object:Gem::Version
33
- version: '0'
34
- type: :runtime
35
- prerelease: false
36
- version_requirements: !ruby/object:Gem::Requirement
37
- requirements:
38
- - - ">="
39
- - !ruby/object:Gem::Version
40
- version: '0'
41
- - !ruby/object:Gem::Dependency
42
- name: mime-types
43
- requirement: !ruby/object:Gem::Requirement
44
- requirements:
45
- - - ">="
46
- - !ruby/object:Gem::Version
47
- version: '0'
48
- type: :runtime
49
- prerelease: false
50
- version_requirements: !ruby/object:Gem::Requirement
51
- requirements:
52
- - - ">="
53
- - !ruby/object:Gem::Version
54
- version: '0'
55
- - !ruby/object:Gem::Dependency
56
- name: ruby-jing
57
- requirement: !ruby/object:Gem::Requirement
58
- requirements:
59
- - - ">="
60
- - !ruby/object:Gem::Version
61
- version: '0'
62
- type: :runtime
63
- prerelease: false
64
- version_requirements: !ruby/object:Gem::Requirement
65
- requirements:
66
- - - ">="
67
- - !ruby/object:Gem::Version
68
- version: '0'
69
27
  - !ruby/object:Gem::Dependency
70
28
  name: thread_safe
71
29
  requirement: !ruby/object:Gem::Requirement
@@ -81,61 +39,61 @@ dependencies:
81
39
  - !ruby/object:Gem::Version
82
40
  version: '0'
83
41
  - !ruby/object:Gem::Dependency
84
- name: uuidtools
42
+ name: metanorma-standoc
85
43
  requirement: !ruby/object:Gem::Requirement
86
44
  requirements:
87
- - - ">="
45
+ - - "~>"
88
46
  - !ruby/object:Gem::Version
89
- version: '0'
47
+ version: 1.5.0
90
48
  type: :runtime
91
49
  prerelease: false
92
50
  version_requirements: !ruby/object:Gem::Requirement
93
51
  requirements:
94
- - - ">="
52
+ - - "~>"
95
53
  - !ruby/object:Gem::Version
96
- version: '0'
54
+ version: 1.5.0
97
55
  - !ruby/object:Gem::Dependency
98
- name: metanorma-standoc
56
+ name: isodoc
99
57
  requirement: !ruby/object:Gem::Requirement
100
58
  requirements:
101
59
  - - "~>"
102
60
  - !ruby/object:Gem::Version
103
- version: 1.4.0
61
+ version: 1.2.0
104
62
  type: :runtime
105
63
  prerelease: false
106
64
  version_requirements: !ruby/object:Gem::Requirement
107
65
  requirements:
108
66
  - - "~>"
109
67
  - !ruby/object:Gem::Version
110
- version: 1.4.0
68
+ version: 1.2.0
111
69
  - !ruby/object:Gem::Dependency
112
- name: isodoc
70
+ name: byebug
113
71
  requirement: !ruby/object:Gem::Requirement
114
72
  requirements:
115
73
  - - "~>"
116
74
  - !ruby/object:Gem::Version
117
- version: 1.1.0
118
- type: :runtime
75
+ version: '9.1'
76
+ type: :development
119
77
  prerelease: false
120
78
  version_requirements: !ruby/object:Gem::Requirement
121
79
  requirements:
122
80
  - - "~>"
123
81
  - !ruby/object:Gem::Version
124
- version: 1.1.0
82
+ version: '9.1'
125
83
  - !ruby/object:Gem::Dependency
126
- name: byebug
84
+ name: sassc
127
85
  requirement: !ruby/object:Gem::Requirement
128
86
  requirements:
129
87
  - - "~>"
130
88
  - !ruby/object:Gem::Version
131
- version: '9.1'
89
+ version: 2.4.0
132
90
  type: :development
133
91
  prerelease: false
134
92
  version_requirements: !ruby/object:Gem::Requirement
135
93
  requirements:
136
94
  - - "~>"
137
95
  - !ruby/object:Gem::Version
138
- version: '9.1'
96
+ version: 2.4.0
139
97
  - !ruby/object:Gem::Dependency
140
98
  name: equivalent-xml
141
99
  requirement: !ruby/object:Gem::Requirement
@@ -289,20 +247,27 @@ files:
289
247
  - lib/isodoc/m3aawg/html/header.html
290
248
  - lib/isodoc/m3aawg/html/html_m3d_intro.html
291
249
  - lib/isodoc/m3aawg/html/html_m3d_titlepage.html
250
+ - lib/isodoc/m3aawg/html/htmlstyle.css
292
251
  - lib/isodoc/m3aawg/html/htmlstyle.scss
293
252
  - lib/isodoc/m3aawg/html/logo.jpg
294
253
  - lib/isodoc/m3aawg/html/m3-logo.png
254
+ - lib/isodoc/m3aawg/html/m3d.css
295
255
  - lib/isodoc/m3aawg/html/m3d.scss
296
256
  - lib/isodoc/m3aawg/html/scripts.html
297
257
  - lib/isodoc/m3aawg/html/word_m3d_intro.html
298
258
  - lib/isodoc/m3aawg/html/word_m3d_titlepage.html
259
+ - lib/isodoc/m3aawg/html/wordstyle.css
299
260
  - lib/isodoc/m3aawg/html/wordstyle.scss
300
261
  - lib/isodoc/m3aawg/html_convert.rb
262
+ - lib/isodoc/m3aawg/i18n-en.yaml
263
+ - lib/isodoc/m3aawg/i18n.rb
264
+ - lib/isodoc/m3aawg/init.rb
301
265
  - lib/isodoc/m3aawg/m3d.report.xsl
302
266
  - lib/isodoc/m3aawg/metadata.rb
303
267
  - lib/isodoc/m3aawg/pdf_convert.rb
304
268
  - lib/isodoc/m3aawg/presentation_xml_convert.rb
305
269
  - lib/isodoc/m3aawg/word_convert.rb
270
+ - lib/isodoc/m3aawg/xref.rb
306
271
  - lib/metanorma-m3aawg.rb
307
272
  - lib/metanorma/m3aawg.rb
308
273
  - lib/metanorma/m3aawg/processor.rb