rdoc 5.0.0 → 6.3.1
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of rdoc might be problematic. Click here for more details.
- checksums.yaml +5 -5
- data/CONTRIBUTING.rdoc +4 -4
- data/Gemfile +9 -0
- data/History.rdoc +12 -2
- data/README.rdoc +5 -6
- data/Rakefile +35 -65
- data/lib/rdoc/alias.rb +1 -1
- data/lib/rdoc/anon_class.rb +1 -1
- data/lib/rdoc/any_method.rb +59 -15
- data/lib/rdoc/attr.rb +1 -1
- data/lib/rdoc/class_module.rb +5 -3
- data/lib/rdoc/code_object.rb +2 -9
- data/lib/rdoc/code_objects.rb +1 -1
- data/lib/rdoc/comment.rb +32 -11
- data/lib/rdoc/constant.rb +3 -3
- data/lib/rdoc/context/section.rb +1 -14
- data/lib/rdoc/context.rb +74 -21
- data/lib/rdoc/cross_reference.rb +33 -15
- data/lib/rdoc/encoding.rb +58 -30
- data/lib/rdoc/erb_partial.rb +2 -2
- data/lib/rdoc/erbio.rb +8 -4
- data/lib/rdoc/extend.rb +1 -1
- data/lib/rdoc/generator/darkfish.rb +60 -29
- data/lib/rdoc/generator/json_index.rb +7 -4
- data/lib/rdoc/generator/markup.rb +3 -13
- data/lib/rdoc/generator/pot/message_extractor.rb +1 -1
- data/lib/rdoc/generator/pot/po.rb +3 -3
- data/lib/rdoc/generator/pot/po_entry.rb +11 -11
- data/lib/rdoc/generator/pot.rb +4 -4
- data/lib/rdoc/generator/ri.rb +1 -1
- data/lib/rdoc/generator/template/darkfish/_footer.rhtml +2 -2
- data/lib/rdoc/generator/template/darkfish/_head.rhtml +9 -7
- data/lib/rdoc/generator/template/darkfish/_sidebar_VCS_info.rhtml +2 -2
- data/lib/rdoc/generator/template/darkfish/_sidebar_classes.rhtml +2 -2
- data/lib/rdoc/generator/template/darkfish/_sidebar_extends.rhtml +7 -7
- data/lib/rdoc/generator/template/darkfish/_sidebar_in_files.rhtml +2 -2
- data/lib/rdoc/generator/template/darkfish/_sidebar_includes.rhtml +7 -7
- data/lib/rdoc/generator/template/darkfish/_sidebar_installed.rhtml +6 -6
- data/lib/rdoc/generator/template/darkfish/_sidebar_methods.rhtml +5 -5
- data/lib/rdoc/generator/template/darkfish/_sidebar_pages.rhtml +5 -5
- data/lib/rdoc/generator/template/darkfish/_sidebar_parent.rhtml +5 -5
- data/lib/rdoc/generator/template/darkfish/_sidebar_sections.rhtml +4 -4
- data/lib/rdoc/generator/template/darkfish/_sidebar_table_of_contents.rhtml +4 -4
- data/lib/rdoc/generator/template/darkfish/class.rhtml +45 -47
- data/lib/rdoc/generator/template/darkfish/css/rdoc.css +55 -6
- data/lib/rdoc/generator/template/darkfish/index.rhtml +3 -4
- data/lib/rdoc/generator/template/darkfish/js/darkfish.js +22 -99
- data/lib/rdoc/generator/template/darkfish/js/search.js +32 -31
- data/lib/rdoc/generator/template/darkfish/servlet_root.rhtml +15 -16
- data/lib/rdoc/generator/template/darkfish/table_of_contents.rhtml +16 -16
- data/lib/rdoc/generator/template/json_index/js/navigation.js +4 -41
- data/lib/rdoc/generator/template/json_index/js/searcher.js +6 -6
- data/lib/rdoc/generator.rb +1 -1
- data/lib/rdoc/ghost_method.rb +1 -1
- data/lib/rdoc/i18n/locale.rb +2 -2
- data/lib/rdoc/i18n/text.rb +5 -5
- data/lib/rdoc/i18n.rb +3 -3
- data/lib/rdoc/include.rb +1 -1
- data/lib/rdoc/known_classes.rb +1 -1
- data/lib/rdoc/markdown/entities.rb +1 -1
- data/lib/rdoc/markdown/literals.kpeg +1 -0
- data/lib/rdoc/markdown/literals.rb +19 -7
- data/lib/rdoc/markdown.kpeg +92 -44
- data/lib/rdoc/markdown.rb +1171 -610
- data/lib/rdoc/markup/attr_changer.rb +1 -1
- data/lib/rdoc/markup/attr_span.rb +9 -3
- data/lib/rdoc/markup/attribute_manager.rb +115 -50
- data/lib/rdoc/markup/attributes.rb +7 -7
- data/lib/rdoc/markup/blank_line.rb +1 -1
- data/lib/rdoc/markup/block_quote.rb +1 -1
- data/lib/rdoc/markup/document.rb +1 -1
- data/lib/rdoc/markup/formatter.rb +25 -24
- data/lib/rdoc/markup/hard_break.rb +1 -1
- data/lib/rdoc/markup/heading.rb +4 -4
- data/lib/rdoc/markup/include.rb +1 -1
- data/lib/rdoc/markup/indented_paragraph.rb +1 -1
- data/lib/rdoc/markup/list.rb +1 -1
- data/lib/rdoc/markup/list_item.rb +1 -1
- data/lib/rdoc/markup/paragraph.rb +1 -1
- data/lib/rdoc/markup/parser.rb +79 -47
- data/lib/rdoc/markup/pre_process.rb +11 -6
- data/lib/rdoc/markup/raw.rb +1 -1
- data/lib/rdoc/markup/regexp_handling.rb +41 -0
- data/lib/rdoc/markup/rule.rb +1 -1
- data/lib/rdoc/markup/to_ansi.rb +1 -1
- data/lib/rdoc/markup/to_bs.rb +4 -4
- data/lib/rdoc/markup/to_html.rb +71 -26
- data/lib/rdoc/markup/to_html_crossref.rb +41 -26
- data/lib/rdoc/markup/to_html_snippet.rb +10 -10
- data/lib/rdoc/markup/to_joined_paragraph.rb +7 -32
- data/lib/rdoc/markup/to_label.rb +10 -10
- data/lib/rdoc/markup/to_markdown.rb +9 -9
- data/lib/rdoc/markup/to_rdoc.rb +35 -7
- data/lib/rdoc/markup/to_table_of_contents.rb +2 -1
- data/lib/rdoc/markup/to_test.rb +1 -1
- data/lib/rdoc/markup/to_tt_only.rb +3 -3
- data/lib/rdoc/markup/verbatim.rb +1 -1
- data/lib/rdoc/markup.rb +14 -17
- data/lib/rdoc/meta_method.rb +1 -1
- data/lib/rdoc/method_attr.rb +2 -2
- data/lib/rdoc/mixin.rb +1 -1
- data/lib/rdoc/normal_class.rb +3 -3
- data/lib/rdoc/normal_module.rb +1 -1
- data/lib/rdoc/options.rb +79 -21
- data/lib/rdoc/parser/c.rb +147 -194
- data/lib/rdoc/parser/changelog.rb +150 -19
- data/lib/rdoc/parser/markdown.rb +1 -1
- data/lib/rdoc/parser/rd.rb +1 -1
- data/lib/rdoc/parser/ripper_state_lex.rb +590 -0
- data/lib/rdoc/parser/ruby.rb +634 -465
- data/lib/rdoc/parser/ruby_tools.rb +33 -34
- data/lib/rdoc/parser/simple.rb +3 -3
- data/lib/rdoc/parser/text.rb +1 -1
- data/lib/rdoc/parser.rb +12 -35
- data/lib/rdoc/rd/block_parser.rb +109 -108
- data/lib/rdoc/rd/block_parser.ry +3 -3
- data/lib/rdoc/rd/inline.rb +5 -5
- data/lib/rdoc/rd/inline_parser.rb +186 -185
- data/lib/rdoc/rd/inline_parser.ry +1 -1
- data/lib/rdoc/rd.rb +1 -1
- data/lib/rdoc/rdoc.rb +54 -41
- data/lib/rdoc/require.rb +1 -1
- data/lib/rdoc/ri/driver.rb +132 -42
- data/lib/rdoc/ri/formatter.rb +1 -1
- data/lib/rdoc/ri/paths.rb +4 -18
- data/lib/rdoc/ri/store.rb +1 -1
- data/lib/rdoc/ri/task.rb +2 -2
- data/lib/rdoc/ri.rb +1 -1
- data/lib/rdoc/rubygems_hook.rb +3 -3
- data/lib/rdoc/servlet.rb +21 -12
- data/lib/rdoc/single_class.rb +1 -1
- data/lib/rdoc/stats/normal.rb +24 -18
- data/lib/rdoc/stats/quiet.rb +1 -1
- data/lib/rdoc/stats/verbose.rb +1 -1
- data/lib/rdoc/stats.rb +1 -1
- data/lib/rdoc/store.rb +38 -27
- data/lib/rdoc/task.rb +2 -2
- data/lib/rdoc/text.rb +16 -21
- data/lib/rdoc/token_stream.rb +56 -33
- data/lib/rdoc/tom_doc.rb +17 -12
- data/lib/rdoc/top_level.rb +9 -3
- data/lib/rdoc/version.rb +8 -0
- data/lib/rdoc.rb +24 -10
- data/man/ri.1 +247 -0
- data/rdoc.gemspec +206 -15
- metadata +15 -64
- data/.document +0 -5
- data/.gitignore +0 -13
- data/.travis.yml +0 -23
- data/lib/gauntlet_rdoc.rb +0 -82
- data/lib/rdoc/generator/template/darkfish/js/jquery.js +0 -4
- data/lib/rdoc/markup/formatter_test_case.rb +0 -764
- data/lib/rdoc/markup/inline.rb +0 -2
- data/lib/rdoc/markup/special.rb +0 -41
- data/lib/rdoc/markup/text_formatter_test_case.rb +0 -115
- data/lib/rdoc/ruby_lex.rb +0 -1367
- data/lib/rdoc/ruby_token.rb +0 -461
- data/lib/rdoc/test_case.rb +0 -204
data/lib/rdoc/erb_partial.rb
CHANGED
@@ -1,4 +1,4 @@
|
|
1
|
-
# frozen_string_literal:
|
1
|
+
# frozen_string_literal: true
|
2
2
|
##
|
3
3
|
# Allows an ERB template to be rendered in the context (binding) of an
|
4
4
|
# existing ERB template evaluation.
|
@@ -12,7 +12,7 @@ class RDoc::ERBPartial < ERB
|
|
12
12
|
def set_eoutvar compiler, eoutvar = '_erbout'
|
13
13
|
super
|
14
14
|
|
15
|
-
compiler.pre_cmd = ["#{eoutvar} ||= ''"]
|
15
|
+
compiler.pre_cmd = ["#{eoutvar} ||= +''"]
|
16
16
|
end
|
17
17
|
|
18
18
|
end
|
data/lib/rdoc/erbio.rb
CHANGED
@@ -1,4 +1,4 @@
|
|
1
|
-
# frozen_string_literal:
|
1
|
+
# frozen_string_literal: true
|
2
2
|
require 'erb'
|
3
3
|
|
4
4
|
##
|
@@ -9,7 +9,7 @@ require 'erb'
|
|
9
9
|
#
|
10
10
|
# erbio = RDoc::ERBIO.new '<%= "hello world" %>', nil, nil
|
11
11
|
#
|
12
|
-
# open 'hello.txt', 'w' do |io|
|
12
|
+
# File.open 'hello.txt', 'w' do |io|
|
13
13
|
# erbio.result binding
|
14
14
|
# end
|
15
15
|
#
|
@@ -20,8 +20,12 @@ class RDoc::ERBIO < ERB
|
|
20
20
|
##
|
21
21
|
# Defaults +eoutvar+ to 'io', otherwise is identical to ERB's initialize
|
22
22
|
|
23
|
-
def initialize str, safe_level = nil,
|
24
|
-
|
23
|
+
def initialize str, safe_level = nil, legacy_trim_mode = nil, legacy_eoutvar = 'io', trim_mode: nil, eoutvar: 'io'
|
24
|
+
if RUBY_VERSION >= '2.6'
|
25
|
+
super(str, trim_mode: trim_mode, eoutvar: eoutvar)
|
26
|
+
else
|
27
|
+
super(str, safe_level, legacy_trim_mode, legacy_eoutvar)
|
28
|
+
end
|
25
29
|
end
|
26
30
|
|
27
31
|
##
|
data/lib/rdoc/extend.rb
CHANGED
@@ -1,10 +1,10 @@
|
|
1
|
-
# frozen_string_literal:
|
1
|
+
# frozen_string_literal: true
|
2
2
|
# -*- mode: ruby; ruby-indent-level: 2; tab-width: 2 -*-
|
3
3
|
|
4
4
|
require 'erb'
|
5
5
|
require 'fileutils'
|
6
6
|
require 'pathname'
|
7
|
-
|
7
|
+
require_relative 'markup'
|
8
8
|
|
9
9
|
##
|
10
10
|
# Darkfish RDoc HTML Generator
|
@@ -269,7 +269,7 @@ class RDoc::Generator::Darkfish
|
|
269
269
|
|
270
270
|
@options.static_path.each do |path|
|
271
271
|
unless File.directory? path then
|
272
|
-
FileUtils.install path, @outputdir, fu_options.merge(:mode => 0644)
|
272
|
+
FileUtils.install path, @outputdir, **fu_options.merge(:mode => 0644)
|
273
273
|
next
|
274
274
|
end
|
275
275
|
|
@@ -278,9 +278,9 @@ class RDoc::Generator::Darkfish
|
|
278
278
|
dest_file = @outputdir + entry
|
279
279
|
|
280
280
|
if File.directory? entry then
|
281
|
-
FileUtils.mkdir_p entry, fu_options
|
281
|
+
FileUtils.mkdir_p entry, **fu_options
|
282
282
|
else
|
283
|
-
FileUtils.install entry, dest_file, fu_options.merge(:mode => 0644)
|
283
|
+
FileUtils.install entry, dest_file, **fu_options.merge(:mode => 0644)
|
284
284
|
end
|
285
285
|
end
|
286
286
|
end
|
@@ -313,12 +313,16 @@ class RDoc::Generator::Darkfish
|
|
313
313
|
search_index_rel_prefix = rel_prefix
|
314
314
|
search_index_rel_prefix += @asset_rel_path if @file_output
|
315
315
|
|
316
|
-
|
317
|
-
asset_rel_prefix = asset_rel_prefix = rel_prefix + @asset_rel_path
|
316
|
+
asset_rel_prefix = rel_prefix + @asset_rel_path
|
318
317
|
|
319
318
|
@title = @options.title
|
320
319
|
|
321
|
-
render_template template_file, out_file do |io|
|
320
|
+
render_template template_file, out_file do |io|
|
321
|
+
here = binding
|
322
|
+
# suppress 1.9.3 warning
|
323
|
+
here.local_variable_set(:asset_rel_prefix, asset_rel_prefix)
|
324
|
+
here
|
325
|
+
end
|
322
326
|
rescue => e
|
323
327
|
error = RDoc::Error.new \
|
324
328
|
"error generating index.html: #{e.message} (#{e.class})"
|
@@ -343,14 +347,19 @@ class RDoc::Generator::Darkfish
|
|
343
347
|
search_index_rel_prefix = rel_prefix
|
344
348
|
search_index_rel_prefix += @asset_rel_path if @file_output
|
345
349
|
|
346
|
-
|
347
|
-
|
348
|
-
svninfo = svninfo = get_svninfo(current)
|
350
|
+
asset_rel_prefix = rel_prefix + @asset_rel_path
|
351
|
+
svninfo = get_svninfo(current)
|
349
352
|
|
350
353
|
@title = "#{klass.type} #{klass.full_name} - #{@options.title}"
|
351
354
|
|
352
355
|
debug_msg " rendering #{out_file}"
|
353
|
-
render_template template_file, out_file do |io|
|
356
|
+
render_template template_file, out_file do |io|
|
357
|
+
here = binding
|
358
|
+
# suppress 1.9.3 warning
|
359
|
+
here.local_variable_set(:asset_rel_prefix, asset_rel_prefix)
|
360
|
+
here.local_variable_set(:svninfo, svninfo)
|
361
|
+
here
|
362
|
+
end
|
354
363
|
end
|
355
364
|
|
356
365
|
##
|
@@ -416,8 +425,7 @@ class RDoc::Generator::Darkfish
|
|
416
425
|
search_index_rel_prefix = rel_prefix
|
417
426
|
search_index_rel_prefix += @asset_rel_path if @file_output
|
418
427
|
|
419
|
-
|
420
|
-
asset_rel_prefix = asset_rel_prefix = rel_prefix + @asset_rel_path
|
428
|
+
asset_rel_prefix = rel_prefix + @asset_rel_path
|
421
429
|
|
422
430
|
unless filepage_file then
|
423
431
|
if file.text? then
|
@@ -434,7 +442,13 @@ class RDoc::Generator::Darkfish
|
|
434
442
|
@title += " - #{@options.title}"
|
435
443
|
template_file ||= filepage_file
|
436
444
|
|
437
|
-
render_template template_file, out_file do |io|
|
445
|
+
render_template template_file, out_file do |io|
|
446
|
+
here = binding
|
447
|
+
# suppress 1.9.3 warning
|
448
|
+
here.local_variable_set(:asset_rel_prefix, asset_rel_prefix)
|
449
|
+
here.local_variable_set(:current, current)
|
450
|
+
here
|
451
|
+
end
|
438
452
|
end
|
439
453
|
rescue => e
|
440
454
|
error =
|
@@ -458,14 +472,19 @@ class RDoc::Generator::Darkfish
|
|
458
472
|
search_index_rel_prefix = rel_prefix
|
459
473
|
search_index_rel_prefix += @asset_rel_path if @file_output
|
460
474
|
|
461
|
-
|
462
|
-
|
463
|
-
asset_rel_prefix = asset_rel_prefix = rel_prefix + @asset_rel_path
|
475
|
+
current = file
|
476
|
+
asset_rel_prefix = rel_prefix + @asset_rel_path
|
464
477
|
|
465
478
|
@title = "#{file.page_name} - #{@options.title}"
|
466
479
|
|
467
480
|
debug_msg " rendering #{out_file}"
|
468
|
-
render_template template_file, out_file do |io|
|
481
|
+
render_template template_file, out_file do |io|
|
482
|
+
here = binding
|
483
|
+
# suppress 1.9.3 warning
|
484
|
+
here.local_variable_set(:current, current)
|
485
|
+
here.local_variable_set(:asset_rel_prefix, asset_rel_prefix)
|
486
|
+
here
|
487
|
+
end
|
469
488
|
end
|
470
489
|
|
471
490
|
##
|
@@ -483,12 +502,16 @@ class RDoc::Generator::Darkfish
|
|
483
502
|
search_index_rel_prefix = rel_prefix
|
484
503
|
search_index_rel_prefix += @asset_rel_path if @file_output
|
485
504
|
|
486
|
-
|
487
|
-
asset_rel_prefix = asset_rel_prefix = ''
|
505
|
+
asset_rel_prefix = ''
|
488
506
|
|
489
507
|
@title = 'Not Found'
|
490
508
|
|
491
|
-
render_template template_file do |io|
|
509
|
+
render_template template_file do |io|
|
510
|
+
here = binding
|
511
|
+
# suppress 1.9.3 warning
|
512
|
+
here.local_variable_set(:asset_rel_prefix, asset_rel_prefix)
|
513
|
+
here
|
514
|
+
end
|
492
515
|
rescue => e
|
493
516
|
error = RDoc::Error.new \
|
494
517
|
"error generating servlet_not_found: #{e.message} (#{e.class})"
|
@@ -540,12 +563,16 @@ class RDoc::Generator::Darkfish
|
|
540
563
|
search_index_rel_prefix = rel_prefix
|
541
564
|
search_index_rel_prefix += @asset_rel_path if @file_output
|
542
565
|
|
543
|
-
|
544
|
-
asset_rel_prefix = asset_rel_prefix = rel_prefix + @asset_rel_path
|
566
|
+
asset_rel_prefix = rel_prefix + @asset_rel_path
|
545
567
|
|
546
568
|
@title = "Table of Contents - #{@options.title}"
|
547
569
|
|
548
|
-
render_template template_file, out_file do |io|
|
570
|
+
render_template template_file, out_file do |io|
|
571
|
+
here = binding
|
572
|
+
# suppress 1.9.3 warning
|
573
|
+
here.local_variable_set(:asset_rel_prefix, asset_rel_prefix)
|
574
|
+
here
|
575
|
+
end
|
549
576
|
rescue => e
|
550
577
|
error = RDoc::Error.new \
|
551
578
|
"error generating table_of_contents.html: #{e.message} (#{e.class})"
|
@@ -558,16 +585,16 @@ class RDoc::Generator::Darkfish
|
|
558
585
|
return unless source.exist?
|
559
586
|
|
560
587
|
begin
|
561
|
-
FileUtils.mkdir_p File.dirname(destination), options
|
588
|
+
FileUtils.mkdir_p File.dirname(destination), **options
|
562
589
|
|
563
590
|
begin
|
564
|
-
FileUtils.ln source, destination, options
|
591
|
+
FileUtils.ln source, destination, **options
|
565
592
|
rescue Errno::EEXIST
|
566
593
|
FileUtils.rm destination
|
567
594
|
retry
|
568
595
|
end
|
569
596
|
rescue
|
570
|
-
FileUtils.cp source, destination, options
|
597
|
+
FileUtils.cp source, destination, **options
|
571
598
|
end
|
572
599
|
end
|
573
600
|
|
@@ -751,7 +778,11 @@ class RDoc::Generator::Darkfish
|
|
751
778
|
erbout = "_erbout_#{file_var}"
|
752
779
|
end
|
753
780
|
|
754
|
-
|
781
|
+
if RUBY_VERSION >= '2.6'
|
782
|
+
template = klass.new template, trim_mode: '-', eoutvar: erbout
|
783
|
+
else
|
784
|
+
template = klass.new template, nil, '-', erbout
|
785
|
+
end
|
755
786
|
@template_cache[file] = template
|
756
787
|
template
|
757
788
|
end
|
@@ -1,4 +1,4 @@
|
|
1
|
-
# frozen_string_literal:
|
1
|
+
# frozen_string_literal: true
|
2
2
|
require 'json'
|
3
3
|
begin
|
4
4
|
require 'zlib'
|
@@ -147,12 +147,15 @@ class RDoc::Generator::JsonIndex
|
|
147
147
|
|
148
148
|
JSON.dump data, io, 0
|
149
149
|
end
|
150
|
+
unless ENV['SOURCE_DATE_EPOCH'].nil?
|
151
|
+
index_file.utime index_file.atime, Time.at(ENV['SOURCE_DATE_EPOCH'].to_i).gmtime
|
152
|
+
end
|
150
153
|
|
151
154
|
Dir.chdir @template_dir do
|
152
155
|
Dir['**/*.js'].each do |source|
|
153
156
|
dest = File.join out_dir, source
|
154
157
|
|
155
|
-
FileUtils.install source, dest, :mode => 0644, :verbose => $DEBUG_RDOC
|
158
|
+
FileUtils.install source, dest, :mode => 0644, :preserve => true, :verbose => $DEBUG_RDOC
|
156
159
|
end
|
157
160
|
end
|
158
161
|
end
|
@@ -161,7 +164,7 @@ class RDoc::Generator::JsonIndex
|
|
161
164
|
# Compress the search_index.js file using gzip
|
162
165
|
|
163
166
|
def generate_gzipped
|
164
|
-
return
|
167
|
+
return if @options.dry_run or not defined?(Zlib)
|
165
168
|
|
166
169
|
debug_msg "Compressing generated JSON index"
|
167
170
|
out_dir = @base_dir + @options.op_dir
|
@@ -170,7 +173,7 @@ class RDoc::Generator::JsonIndex
|
|
170
173
|
outfile = out_dir + "#{search_index_file}.gz"
|
171
174
|
|
172
175
|
debug_msg "Reading the JSON index file from %s" % search_index_file
|
173
|
-
search_index = search_index_file.read
|
176
|
+
search_index = search_index_file.read(mode: 'r:utf-8')
|
174
177
|
|
175
178
|
debug_msg "Writing gzipped search index to %s" % outfile
|
176
179
|
|
@@ -1,4 +1,4 @@
|
|
1
|
-
# frozen_string_literal:
|
1
|
+
# frozen_string_literal: true
|
2
2
|
##
|
3
3
|
# Handle common RDoc::Markup tasks for various CodeObjects
|
4
4
|
#
|
@@ -65,16 +65,6 @@ end
|
|
65
65
|
|
66
66
|
class RDoc::MethodAttr
|
67
67
|
|
68
|
-
@add_line_numbers = false
|
69
|
-
|
70
|
-
class << self
|
71
|
-
##
|
72
|
-
# Allows controlling whether <tt>#markup_code</tt> adds line numbers to
|
73
|
-
# the source code.
|
74
|
-
|
75
|
-
attr_accessor :add_line_numbers
|
76
|
-
end
|
77
|
-
|
78
68
|
##
|
79
69
|
# Prepend +src+ with line numbers. Relies on the first line of a source
|
80
70
|
# code listing having:
|
@@ -106,7 +96,7 @@ class RDoc::MethodAttr
|
|
106
96
|
##
|
107
97
|
# Turns the method's token stream into HTML.
|
108
98
|
#
|
109
|
-
# Prepends line numbers if +
|
99
|
+
# Prepends line numbers if +options.line_numbers+ is true.
|
110
100
|
|
111
101
|
def markup_code
|
112
102
|
return '' unless @token_stream
|
@@ -126,7 +116,7 @@ class RDoc::MethodAttr
|
|
126
116
|
end
|
127
117
|
src.gsub!(/^#{' ' * indent}/, '') if indent > 0
|
128
118
|
|
129
|
-
add_line_numbers(src) if
|
119
|
+
add_line_numbers(src) if options.line_numbers
|
130
120
|
|
131
121
|
src
|
132
122
|
end
|
@@ -1,4 +1,4 @@
|
|
1
|
-
# frozen_string_literal:
|
1
|
+
# frozen_string_literal: true
|
2
2
|
##
|
3
3
|
# Generates a PO format text
|
4
4
|
|
@@ -29,8 +29,8 @@ class RDoc::Generator::POT::PO
|
|
29
29
|
def to_s
|
30
30
|
po = ''
|
31
31
|
sort_entries.each do |entry|
|
32
|
-
po
|
33
|
-
po
|
32
|
+
po += "\n" unless po.empty?
|
33
|
+
po += entry.to_s
|
34
34
|
end
|
35
35
|
po
|
36
36
|
end
|
@@ -1,4 +1,4 @@
|
|
1
|
-
# frozen_string_literal:
|
1
|
+
# frozen_string_literal: true
|
2
2
|
##
|
3
3
|
# A PO entry in PO
|
4
4
|
|
@@ -40,11 +40,11 @@ class RDoc::Generator::POT::POEntry
|
|
40
40
|
|
41
41
|
def to_s
|
42
42
|
entry = ''
|
43
|
-
entry
|
44
|
-
entry
|
45
|
-
entry
|
46
|
-
entry
|
47
|
-
entry
|
43
|
+
entry += format_translator_comment
|
44
|
+
entry += format_extracted_comment
|
45
|
+
entry += format_references
|
46
|
+
entry += format_flags
|
47
|
+
entry += <<-ENTRY
|
48
48
|
msgid #{format_message(@msgid)}
|
49
49
|
msgstr #{format_message(@msgstr)}
|
50
50
|
ENTRY
|
@@ -75,9 +75,9 @@ msgstr #{format_message(@msgstr)}
|
|
75
75
|
|
76
76
|
formatted_comment = ''
|
77
77
|
comment.each_line do |line|
|
78
|
-
formatted_comment
|
78
|
+
formatted_comment += "#{mark} #{line}"
|
79
79
|
end
|
80
|
-
formatted_comment
|
80
|
+
formatted_comment += "\n" unless formatted_comment.end_with?("\n")
|
81
81
|
formatted_comment
|
82
82
|
end
|
83
83
|
|
@@ -94,7 +94,7 @@ msgstr #{format_message(@msgstr)}
|
|
94
94
|
|
95
95
|
formatted_references = ''
|
96
96
|
@references.sort.each do |file, line|
|
97
|
-
formatted_references
|
97
|
+
formatted_references += "\#: #{file}:#{line}\n"
|
98
98
|
end
|
99
99
|
formatted_references
|
100
100
|
end
|
@@ -111,8 +111,8 @@ msgstr #{format_message(@msgstr)}
|
|
111
111
|
|
112
112
|
formatted_message = '""'
|
113
113
|
message.each_line do |line|
|
114
|
-
formatted_message
|
115
|
-
formatted_message
|
114
|
+
formatted_message += "\n"
|
115
|
+
formatted_message += "\"#{escape(line)}\""
|
116
116
|
end
|
117
117
|
formatted_message
|
118
118
|
end
|
data/lib/rdoc/generator/pot.rb
CHANGED
@@ -1,4 +1,4 @@
|
|
1
|
-
# frozen_string_literal:
|
1
|
+
# frozen_string_literal: true
|
2
2
|
##
|
3
3
|
# Generates a POT file.
|
4
4
|
#
|
@@ -91,8 +91,8 @@ class RDoc::Generator::POT
|
|
91
91
|
extractor.extract
|
92
92
|
end
|
93
93
|
|
94
|
-
|
95
|
-
|
96
|
-
|
94
|
+
require_relative 'pot/message_extractor'
|
95
|
+
require_relative 'pot/po'
|
96
|
+
require_relative 'pot/po_entry'
|
97
97
|
|
98
98
|
end
|
data/lib/rdoc/generator/ri.rb
CHANGED
@@ -1,5 +1,5 @@
|
|
1
1
|
<footer id="validator-badges" role="contentinfo">
|
2
|
-
<p><a href="
|
3
|
-
<p>Generated by <a href="https://
|
2
|
+
<p><a href="https://validator.w3.org/check/referer">Validate</a>
|
3
|
+
<p>Generated by <a href="https://ruby.github.io/rdoc/">RDoc</a> <%= RDoc::VERSION %>.
|
4
4
|
<p>Based on <a href="http://deveiate.org/projects/Darkfish-RDoc/">Darkfish</a> by <a href="http://deveiate.org">Michael Granger</a>.
|
5
5
|
</footer>
|
@@ -7,14 +7,16 @@
|
|
7
7
|
var index_rel_prefix = "<%= rel_prefix %>/";
|
8
8
|
</script>
|
9
9
|
|
10
|
-
<script src="<%= asset_rel_prefix %>/js/
|
11
|
-
<script src="<%= asset_rel_prefix %>/js/
|
10
|
+
<script src="<%= asset_rel_prefix %>/js/navigation.js" defer></script>
|
11
|
+
<script src="<%= asset_rel_prefix %>/js/search.js" defer></script>
|
12
|
+
<script src="<%= asset_rel_prefix %>/js/search_index.js" defer></script>
|
13
|
+
<script src="<%= asset_rel_prefix %>/js/searcher.js" defer></script>
|
14
|
+
<script src="<%= asset_rel_prefix %>/js/darkfish.js" defer></script>
|
12
15
|
|
13
16
|
<link href="<%= asset_rel_prefix %>/css/fonts.css" rel="stylesheet">
|
14
17
|
<link href="<%= asset_rel_prefix %>/css/rdoc.css" rel="stylesheet">
|
15
|
-
|
16
|
-
|
18
|
+
<%- if @options.template_stylesheets.flatten.any? then -%>
|
19
|
+
<%- @options.template_stylesheets.flatten.each do |stylesheet| -%>
|
17
20
|
<link href="<%= asset_rel_prefix %>/<%= File.basename stylesheet %>" rel="stylesheet">
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
+
<%- end -%>
|
22
|
+
<%- end -%>
|