diff options
| author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2021-08-18 13:48:12 +0900 |
|---|---|---|
| committer | git <svn-admin@ruby-lang.org> | 2021-09-03 19:13:15 +0900 |
| commit | 76c7388c1f41fb0ae3dacda0d9c02e7562a6655d (patch) | |
| tree | 8a6100bacc26905c6a3a74098d3d8174d929a667 /lib | |
| parent | 33676a7aa6a9f10c72a811f4b6b6ad08958f2bca (diff) | |
[ruby/rdoc] Add tests for `--template-stylesheets` option
Also flattens `@options.template_stylesheets` when parsing the
command lines.
Fixes #205
Fixes #828 too
https://github.com/ruby/rdoc/commit/857002a763
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/rdoc/generator/darkfish.rb | 4 | ||||
| -rw-r--r-- | lib/rdoc/generator/template/darkfish/_head.rhtml | 4 | ||||
| -rw-r--r-- | lib/rdoc/options.rb | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/lib/rdoc/generator/darkfish.rb b/lib/rdoc/generator/darkfish.rb index b46861d009..60e0265e8c 100644 --- a/lib/rdoc/generator/darkfish.rb +++ b/lib/rdoc/generator/darkfish.rb @@ -220,8 +220,8 @@ class RDoc::Generator::Darkfish install_rdoc_static_file @template_dir + item, "./#{item}", options end - @options.template_stylesheets.each do |stylesheet| - FileUtils.cp stylesheet, '.', options + unless @options.template_stylesheets.empty? + FileUtils.cp @options.template_stylesheets, '.', **options end Dir[(@template_dir + "{js,images}/**/*").to_s].each do |path| diff --git a/lib/rdoc/generator/template/darkfish/_head.rhtml b/lib/rdoc/generator/template/darkfish/_head.rhtml index e61fce1b9a..4f331245c3 100644 --- a/lib/rdoc/generator/template/darkfish/_head.rhtml +++ b/lib/rdoc/generator/template/darkfish/_head.rhtml @@ -15,8 +15,6 @@ <link href="<%= asset_rel_prefix %>/css/fonts.css" rel="stylesheet"> <link href="<%= asset_rel_prefix %>/css/rdoc.css" rel="stylesheet"> -<%- if @options.template_stylesheets.flatten.any? then -%> -<%- @options.template_stylesheets.flatten.each do |stylesheet| -%> +<%- @options.template_stylesheets.each do |stylesheet| -%> <link href="<%= asset_rel_prefix %>/<%= File.basename stylesheet %>" rel="stylesheet"> -<%- end -%> <%- end -%> diff --git a/lib/rdoc/options.rb b/lib/rdoc/options.rb index 7a45a9c610..792b473b79 100644 --- a/lib/rdoc/options.rb +++ b/lib/rdoc/options.rb @@ -971,7 +971,7 @@ Usage: #{opt.program_name} [options] [names...] opt.on("--template-stylesheets=FILES", PathArray, "Set (or add to) the list of files to", "include with the html template.") do |value| - @template_stylesheets << value + @template_stylesheets.concat value end opt.separator nil |