metanorma-standoc 1.7.3 → 1.8.5
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/workflows/rake.yml +11 -41
- data/.rubocop.yml +1 -1
- data/lib/asciidoctor/standoc/base.rb +34 -45
- data/lib/asciidoctor/standoc/basicdoc.rng +5 -3
- data/lib/asciidoctor/standoc/blocks.rb +20 -11
- data/lib/asciidoctor/standoc/blocks_notes.rb +2 -2
- data/lib/asciidoctor/standoc/cleanup.rb +29 -77
- data/lib/asciidoctor/standoc/cleanup_block.rb +39 -27
- data/lib/asciidoctor/standoc/cleanup_boilerplate.rb +56 -0
- data/lib/asciidoctor/standoc/cleanup_inline.rb +26 -29
- data/lib/asciidoctor/standoc/cleanup_maths.rb +123 -0
- data/lib/asciidoctor/standoc/cleanup_ref.rb +4 -98
- data/lib/asciidoctor/standoc/cleanup_ref_dl.rb +94 -0
- data/lib/asciidoctor/standoc/cleanup_section.rb +5 -0
- data/lib/asciidoctor/standoc/cleanup_terms.rb +2 -2
- data/lib/asciidoctor/standoc/converter.rb +0 -1
- data/lib/asciidoctor/standoc/front.rb +2 -2
- data/lib/asciidoctor/standoc/inline.rb +8 -16
- data/lib/asciidoctor/standoc/isodoc.rng +108 -2
- data/lib/asciidoctor/standoc/lists.rb +2 -2
- data/lib/asciidoctor/standoc/macros_plantuml.rb +1 -1
- data/lib/asciidoctor/standoc/ref_sect.rb +2 -2
- data/lib/asciidoctor/standoc/reqt.rb +6 -1
- data/lib/asciidoctor/standoc/section.rb +12 -80
- data/lib/asciidoctor/standoc/table.rb +1 -1
- data/lib/asciidoctor/standoc/terms.rb +125 -0
- data/lib/asciidoctor/standoc/utils.rb +2 -120
- data/lib/asciidoctor/standoc/validate.rb +16 -1
- data/lib/metanorma/standoc/version.rb +1 -1
- data/metanorma-standoc.gemspec +4 -4
- data/spec/{asciidoctor-standoc → asciidoctor}/base_spec.rb +30 -1
- data/spec/{asciidoctor-standoc → asciidoctor}/blocks_spec.rb +0 -0
- data/spec/{asciidoctor-standoc → asciidoctor}/cleanup_sections_spec.rb +0 -0
- data/spec/{asciidoctor-standoc → asciidoctor}/cleanup_spec.rb +408 -6
- data/spec/{asciidoctor-standoc → asciidoctor}/datamodel/attributes_table_preprocessor_spec.rb +0 -0
- data/spec/{asciidoctor-standoc → asciidoctor}/datamodel/diagram_preprocessor_spec.rb +0 -0
- data/spec/{asciidoctor-standoc → asciidoctor}/inline_spec.rb +2 -0
- data/spec/{asciidoctor-standoc → asciidoctor}/isobib_cache_spec.rb +4 -4
- data/spec/{asciidoctor-standoc → asciidoctor}/lists_spec.rb +0 -0
- data/spec/{asciidoctor-standoc → asciidoctor}/macros_json2text_spec.rb +0 -0
- data/spec/{asciidoctor-standoc → asciidoctor}/macros_lutaml_spec.rb +0 -0
- data/spec/{asciidoctor-standoc → asciidoctor}/macros_plantuml_spec.rb +0 -0
- data/spec/{asciidoctor-standoc → asciidoctor}/macros_spec.rb +0 -0
- data/spec/{asciidoctor-standoc → asciidoctor}/macros_yaml2text_spec.rb +0 -0
- data/spec/{asciidoctor-standoc → asciidoctor}/refs_dl_spec.rb +13 -1
- data/spec/{asciidoctor-standoc → asciidoctor}/refs_spec.rb +175 -153
- data/spec/{asciidoctor-standoc → asciidoctor}/section_spec.rb +22 -3
- data/spec/{asciidoctor-standoc → asciidoctor}/table_spec.rb +0 -0
- data/spec/{asciidoctor-standoc → asciidoctor}/validate_spec.rb +20 -0
- data/spec/fixtures/action_schemaexpg1.svg +122 -0
- data/spec/spec_helper.rb +8 -0
- data/spec/vcr_cassettes/dated_iso_ref_joint_iso_iec.yml +47 -47
- data/spec/vcr_cassettes/isobib_get_123.yml +14 -14
- data/spec/vcr_cassettes/isobib_get_123_1.yml +27 -27
- data/spec/vcr_cassettes/isobib_get_123_1_fr.yml +36 -36
- data/spec/vcr_cassettes/isobib_get_123_2001.yml +13 -13
- data/spec/vcr_cassettes/isobib_get_124.yml +13 -13
- data/spec/vcr_cassettes/rfcbib_get_rfc8341.yml +94 -30
- data/spec/vcr_cassettes/separates_iev_citations_by_top_level_clause.yml +45 -45
- metadata +49 -46
- data/lib/asciidoctor/standoc/log.rb +0 -59
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: metanorma-standoc
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.
|
4
|
+
version: 1.8.5
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Ribose Inc.
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2021-
|
11
|
+
date: 2021-03-16 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: asciidoctor
|
@@ -44,14 +44,14 @@ dependencies:
|
|
44
44
|
requirements:
|
45
45
|
- - "~>"
|
46
46
|
- !ruby/object:Gem::Version
|
47
|
-
version: 1.
|
47
|
+
version: 1.5.0
|
48
48
|
type: :runtime
|
49
49
|
prerelease: false
|
50
50
|
version_requirements: !ruby/object:Gem::Requirement
|
51
51
|
requirements:
|
52
52
|
- - "~>"
|
53
53
|
- !ruby/object:Gem::Version
|
54
|
-
version: 1.
|
54
|
+
version: 1.5.0
|
55
55
|
- !ruby/object:Gem::Dependency
|
56
56
|
name: iev
|
57
57
|
requirement: !ruby/object:Gem::Requirement
|
@@ -122,20 +122,6 @@ dependencies:
|
|
122
122
|
- - "~>"
|
123
123
|
- !ruby/object:Gem::Version
|
124
124
|
version: 1.1.0
|
125
|
-
- !ruby/object:Gem::Dependency
|
126
|
-
name: sterile
|
127
|
-
requirement: !ruby/object:Gem::Requirement
|
128
|
-
requirements:
|
129
|
-
- - "~>"
|
130
|
-
- !ruby/object:Gem::Version
|
131
|
-
version: 1.0.14
|
132
|
-
type: :runtime
|
133
|
-
prerelease: false
|
134
|
-
version_requirements: !ruby/object:Gem::Requirement
|
135
|
-
requirements:
|
136
|
-
- - "~>"
|
137
|
-
- !ruby/object:Gem::Version
|
138
|
-
version: 1.0.14
|
139
125
|
- !ruby/object:Gem::Dependency
|
140
126
|
name: concurrent-ruby
|
141
127
|
requirement: !ruby/object:Gem::Requirement
|
@@ -165,19 +151,19 @@ dependencies:
|
|
165
151
|
- !ruby/object:Gem::Version
|
166
152
|
version: 0.0.1
|
167
153
|
- !ruby/object:Gem::Dependency
|
168
|
-
name:
|
154
|
+
name: metanorma-utils
|
169
155
|
requirement: !ruby/object:Gem::Requirement
|
170
156
|
requirements:
|
171
|
-
- - "
|
157
|
+
- - "~>"
|
172
158
|
- !ruby/object:Gem::Version
|
173
|
-
version:
|
159
|
+
version: 1.0.2
|
174
160
|
type: :runtime
|
175
161
|
prerelease: false
|
176
162
|
version_requirements: !ruby/object:Gem::Requirement
|
177
163
|
requirements:
|
178
|
-
- - "
|
164
|
+
- - "~>"
|
179
165
|
- !ruby/object:Gem::Version
|
180
|
-
version:
|
166
|
+
version: 1.0.2
|
181
167
|
- !ruby/object:Gem::Dependency
|
182
168
|
name: mathml2asciimath
|
183
169
|
requirement: !ruby/object:Gem::Requirement
|
@@ -206,6 +192,20 @@ dependencies:
|
|
206
192
|
- - ">="
|
207
193
|
- !ruby/object:Gem::Version
|
208
194
|
version: '0'
|
195
|
+
- !ruby/object:Gem::Dependency
|
196
|
+
name: asciimath2unitsml
|
197
|
+
requirement: !ruby/object:Gem::Requirement
|
198
|
+
requirements:
|
199
|
+
- - "~>"
|
200
|
+
- !ruby/object:Gem::Version
|
201
|
+
version: 0.2.0
|
202
|
+
type: :runtime
|
203
|
+
prerelease: false
|
204
|
+
version_requirements: !ruby/object:Gem::Requirement
|
205
|
+
requirements:
|
206
|
+
- - "~>"
|
207
|
+
- !ruby/object:Gem::Version
|
208
|
+
version: 0.2.0
|
209
209
|
- !ruby/object:Gem::Dependency
|
210
210
|
name: byebug
|
211
211
|
requirement: !ruby/object:Gem::Requirement
|
@@ -282,14 +282,14 @@ dependencies:
|
|
282
282
|
requirements:
|
283
283
|
- - "~>"
|
284
284
|
- !ruby/object:Gem::Version
|
285
|
-
version: '
|
285
|
+
version: '13.0'
|
286
286
|
type: :development
|
287
287
|
prerelease: false
|
288
288
|
version_requirements: !ruby/object:Gem::Requirement
|
289
289
|
requirements:
|
290
290
|
- - "~>"
|
291
291
|
- !ruby/object:Gem::Version
|
292
|
-
version: '
|
292
|
+
version: '13.0'
|
293
293
|
- !ruby/object:Gem::Dependency
|
294
294
|
name: rspec
|
295
295
|
requirement: !ruby/object:Gem::Requirement
|
@@ -412,7 +412,9 @@ files:
|
|
412
412
|
- lib/asciidoctor/standoc/cleanup_boilerplate.rb
|
413
413
|
- lib/asciidoctor/standoc/cleanup_footnotes.rb
|
414
414
|
- lib/asciidoctor/standoc/cleanup_inline.rb
|
415
|
+
- lib/asciidoctor/standoc/cleanup_maths.rb
|
415
416
|
- lib/asciidoctor/standoc/cleanup_ref.rb
|
417
|
+
- lib/asciidoctor/standoc/cleanup_ref_dl.rb
|
416
418
|
- lib/asciidoctor/standoc/cleanup_section.rb
|
417
419
|
- lib/asciidoctor/standoc/cleanup_terms.rb
|
418
420
|
- lib/asciidoctor/standoc/converter.rb
|
@@ -424,7 +426,6 @@ files:
|
|
424
426
|
- lib/asciidoctor/standoc/inline.rb
|
425
427
|
- lib/asciidoctor/standoc/isodoc.rng
|
426
428
|
- lib/asciidoctor/standoc/lists.rb
|
427
|
-
- lib/asciidoctor/standoc/log.rb
|
428
429
|
- lib/asciidoctor/standoc/macros.rb
|
429
430
|
- lib/asciidoctor/standoc/macros_plantuml.rb
|
430
431
|
- lib/asciidoctor/standoc/macros_terms.rb
|
@@ -435,6 +436,7 @@ files:
|
|
435
436
|
- lib/asciidoctor/standoc/section.rb
|
436
437
|
- lib/asciidoctor/standoc/table.rb
|
437
438
|
- lib/asciidoctor/standoc/term_lookup_cleanup.rb
|
439
|
+
- lib/asciidoctor/standoc/terms.rb
|
438
440
|
- lib/asciidoctor/standoc/utils.rb
|
439
441
|
- lib/asciidoctor/standoc/validate.rb
|
440
442
|
- lib/asciidoctor/standoc/validate_section.rb
|
@@ -449,25 +451,25 @@ files:
|
|
449
451
|
- lib/metanorma/standoc/processor.rb
|
450
452
|
- lib/metanorma/standoc/version.rb
|
451
453
|
- metanorma-standoc.gemspec
|
452
|
-
- spec/asciidoctor
|
453
|
-
- spec/asciidoctor
|
454
|
-
- spec/asciidoctor
|
455
|
-
- spec/asciidoctor
|
456
|
-
- spec/asciidoctor
|
457
|
-
- spec/asciidoctor
|
458
|
-
- spec/asciidoctor
|
459
|
-
- spec/asciidoctor
|
460
|
-
- spec/asciidoctor
|
461
|
-
- spec/asciidoctor
|
462
|
-
- spec/asciidoctor
|
463
|
-
- spec/asciidoctor
|
464
|
-
- spec/asciidoctor
|
465
|
-
- spec/asciidoctor
|
466
|
-
- spec/asciidoctor
|
467
|
-
- spec/asciidoctor
|
468
|
-
- spec/asciidoctor
|
469
|
-
- spec/asciidoctor
|
470
|
-
- spec/asciidoctor
|
454
|
+
- spec/asciidoctor/base_spec.rb
|
455
|
+
- spec/asciidoctor/blocks_spec.rb
|
456
|
+
- spec/asciidoctor/cleanup_sections_spec.rb
|
457
|
+
- spec/asciidoctor/cleanup_spec.rb
|
458
|
+
- spec/asciidoctor/datamodel/attributes_table_preprocessor_spec.rb
|
459
|
+
- spec/asciidoctor/datamodel/diagram_preprocessor_spec.rb
|
460
|
+
- spec/asciidoctor/inline_spec.rb
|
461
|
+
- spec/asciidoctor/isobib_cache_spec.rb
|
462
|
+
- spec/asciidoctor/lists_spec.rb
|
463
|
+
- spec/asciidoctor/macros_json2text_spec.rb
|
464
|
+
- spec/asciidoctor/macros_lutaml_spec.rb
|
465
|
+
- spec/asciidoctor/macros_plantuml_spec.rb
|
466
|
+
- spec/asciidoctor/macros_spec.rb
|
467
|
+
- spec/asciidoctor/macros_yaml2text_spec.rb
|
468
|
+
- spec/asciidoctor/refs_dl_spec.rb
|
469
|
+
- spec/asciidoctor/refs_spec.rb
|
470
|
+
- spec/asciidoctor/section_spec.rb
|
471
|
+
- spec/asciidoctor/table_spec.rb
|
472
|
+
- spec/asciidoctor/validate_spec.rb
|
471
473
|
- spec/assets/boilerplate.xml
|
472
474
|
- spec/assets/codes.yml
|
473
475
|
- spec/assets/header.html
|
@@ -527,6 +529,7 @@ files:
|
|
527
529
|
- spec/examples/rice_images/rice_image3_1.png
|
528
530
|
- spec/examples/rice_images/rice_image3_2.png
|
529
531
|
- spec/examples/rice_images/rice_image3_3.png
|
532
|
+
- spec/fixtures/action_schemaexpg1.svg
|
530
533
|
- spec/fixtures/diagram_definitions.lutaml
|
531
534
|
- spec/fixtures/macros_datamodel/address_class_profile.xml
|
532
535
|
- spec/fixtures/macros_datamodel/address_component_profile.xml
|
@@ -564,7 +567,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
564
567
|
- !ruby/object:Gem::Version
|
565
568
|
version: '0'
|
566
569
|
requirements: []
|
567
|
-
rubygems_version: 3.
|
570
|
+
rubygems_version: 3.1.4
|
568
571
|
signing_key:
|
569
572
|
specification_version: 4
|
570
573
|
summary: metanorma-standoc realises standards following the Metanorma standoc model
|
@@ -1,59 +0,0 @@
|
|
1
|
-
module Asciidoctor
|
2
|
-
module Standoc
|
3
|
-
class Log
|
4
|
-
def initialize
|
5
|
-
@log = {}
|
6
|
-
end
|
7
|
-
|
8
|
-
def add(category, loc, msg)
|
9
|
-
return if @novalid
|
10
|
-
@log[category] = [] unless @log[category]
|
11
|
-
@log[category] << { location: current_location(loc), message: msg,
|
12
|
-
context: context(loc) }
|
13
|
-
loc = loc.nil? ? "" : "(#{current_location(loc)}): "
|
14
|
-
warn "#{category}: #{loc}#{msg}"
|
15
|
-
end
|
16
|
-
|
17
|
-
def current_location(n)
|
18
|
-
return "" if n.nil?
|
19
|
-
return n if n.is_a? String
|
20
|
-
return "Asciidoctor Line #{"%06d" % n.lineno}" if n.respond_to?(:lineno) &&
|
21
|
-
!n.lineno.nil? && !n.lineno.empty?
|
22
|
-
return "XML Line #{"%06d" % n.line}" if n.respond_to?(:line) &&
|
23
|
-
!n.line.nil?
|
24
|
-
return "ID #{n.id}" if n.respond_to?(:id) && !n.id.nil?
|
25
|
-
while !n.nil? &&
|
26
|
-
(!n.respond_to?(:level) || n.level.positive?) &&
|
27
|
-
(!n.respond_to?(:context) || n.context != :section)
|
28
|
-
n = n.parent
|
29
|
-
return "Section: #{n.title}" if n&.respond_to?(:context) &&
|
30
|
-
n&.context == :section
|
31
|
-
end
|
32
|
-
"??"
|
33
|
-
end
|
34
|
-
|
35
|
-
def context(n)
|
36
|
-
return nil if n.is_a? String
|
37
|
-
n.respond_to?(:to_xml) and return n.to_xml
|
38
|
-
n.respond_to?(:to_s) and return n.to_s
|
39
|
-
nil
|
40
|
-
end
|
41
|
-
|
42
|
-
def write(file)
|
43
|
-
File.open(file, "w:UTF-8") do |f|
|
44
|
-
f.puts "#{file} errors"
|
45
|
-
@log.keys.each do |key|
|
46
|
-
f.puts "\n\n== #{key}\n\n"
|
47
|
-
@log[key].sort do |a, b|
|
48
|
-
a[:location] <=> b[:location]
|
49
|
-
end.each do |n|
|
50
|
-
loc = n[:location] ? "(#{n[:location]}): " : ""
|
51
|
-
f.puts "#{loc}#{n[:message]}"
|
52
|
-
n[:context]&.split(/\n/)&.first(5)&.each { |l| f.puts "\t#{l}" }
|
53
|
-
end
|
54
|
-
end
|
55
|
-
end
|
56
|
-
end
|
57
|
-
end
|
58
|
-
end
|
59
|
-
end
|