Skip to content

Commit 7daf10d

Browse files
committed
Change the default theme to Aliki
1 parent a28af21 commit 7daf10d

File tree

12 files changed

+402
-27
lines changed

12 files changed

+402
-27
lines changed

.rdoc_options

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ main_page: README.md
44
autolink_excluded_words:
55
- RDoc
66

7-
generator_name: aliki
8-
97
exclude:
108
- AGENTS.md
119
- CLAUDE.md

AGENTS.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,10 +146,13 @@ lib/rdoc/
146146
│ ├── prism_ruby.rb # Prism-based Ruby parser
147147
│ └── ...
148148
├── generator/ # Documentation generators
149-
│ ├── darkfish.rb # HTML generator (default theme)
149+
│ ├── aliki.rb # HTML generator (default theme)
150+
│ ├── darkfish.rb # HTML generator (deprecated, will be removed in v8.0)
150151
│ ├── markup.rb # Markup format generator
151152
│ ├── ri.rb # RI command generator
152-
│ └── template/darkfish/ # ERB templates (.rhtml files)
153+
│ └── template/ # ERB templates (.rhtml files)
154+
│ ├── aliki/ # Aliki theme (default)
155+
│ └── darkfish/ # Darkfish theme (deprecated)
153156
├── markup/ # Markup parsing and formatting
154157
├── code_object/ # AST objects for documented items
155158
├── markdown/ # Markdown parsing
@@ -196,7 +199,7 @@ exe/
196199
### Pluggable System
197200

198201
- **Parsers:** Ruby, C, Markdown, RD, Prism-based Ruby (experimental)
199-
- **Generators:** HTML/Darkfish, RI, POT (gettext), JSON, Markup
202+
- **Generators:** HTML/Aliki (default), HTML/Darkfish (deprecated), RI, POT (gettext), JSON, Markup
200203

201204
## Common Workflows
202205

CONTRIBUTING.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,8 @@ bundle exec rake coverage
136136

137137
RDoc ships with two HTML themes:
138138

139-
- **Aliki** - Modern theme with improved styling and navigation (will become the default)
140-
- **Darkfish** - Classic theme (entering maintenance mode)
139+
- **Aliki** (default) - Modern theme with improved styling and navigation
140+
- **Darkfish** (deprecated) - Classic theme, will be removed in v8.0
141141

142142
New feature development should focus on the Aliki theme. Darkfish will continue to receive bug fixes but no new features.
143143

@@ -156,12 +156,13 @@ lib/rdoc/
156156
│ ├── prism_ruby.rb # Prism-based Ruby parser
157157
│ └── ...
158158
├── generator/ # Documentation generators
159-
│ ├── darkfish.rb # HTML generator (default theme)
159+
│ ├── aliki.rb # HTML generator (default theme)
160+
│ ├── darkfish.rb # HTML generator (deprecated, will be removed in v8.0)
160161
│ ├── markup.rb # Markup format generator
161162
│ ├── ri.rb # RI command generator
162163
│ └── template/ # ERB templates
163-
│ ├── darkfish/ # Darkfish theme (maintenance mode)
164-
│ └── aliki/ # Aliki theme (active development)
164+
│ ├── aliki/ # Aliki theme (default)
165+
│ └── darkfish/ # Darkfish theme (deprecated)
165166
├── markup/ # Markup parsing and formatting
166167
├── code_object/ # AST objects for documented items
167168
├── markdown.kpeg # Parser source (edit this)

LEGAL.rdoc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@
44

55
The files in this distribution are covered by the Ruby license (see LICENSE) except the features mentioned below:
66

7+
Aliki::
8+
Aliki was written by Stan Lo and is included under the MIT license.
9+
10+
* lib/rdoc/generator/aliki.rb
11+
* lib/rdoc/generator/template/aliki/*
12+
713
Darkfish::
814
Darkfish was written by Michael Granger and is included under the BSD 3-Clause
915
license. Darkfish contains images from the Silk Icons set by Mark James.

README.md

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ require 'rdoc/rdoc'
4848

4949
options = RDoc::Options.new
5050
options.files = ['a.rb', 'b.rb']
51-
options.setup_generator 'darkfish'
51+
options.setup_generator 'aliki'
5252
# see RDoc::Options
5353

5454
rdoc = RDoc::RDoc.new
@@ -90,7 +90,24 @@ To determine how well your project is documented run `rdoc -C lib` to get a docu
9090

9191
## Theme Options
9292

93-
There are a few community-maintained themes for RDoc:
93+
RDoc ships with two built-in themes:
94+
95+
- **Aliki** (default) - A modern, clean theme with improved navigation and search
96+
- **Darkfish** (deprecated) - The classic theme, will be removed in v8.0
97+
98+
To use the Darkfish theme instead of the default Aliki theme:
99+
100+
```shell
101+
rdoc --format darkfish
102+
```
103+
104+
Or in your `.rdoc_options` file:
105+
106+
```yaml
107+
generator_name: darkfish
108+
```
109+
110+
There are also a few community-maintained themes for RDoc:
94111
95112
- [rorvswild-theme-rdoc](https://github.com/BaseSecrete/rorvswild-theme-rdoc)
96113
- [hanna](https://github.com/jeremyevans/hanna) (a fork maintained by [Jeremy Evans](https://github.com/jeremyevans))

lib/rdoc/options.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@ def init_ivars # :nodoc:
411411
@files = nil
412412
@force_output = false
413413
@force_update = true
414-
@generator_name = "darkfish"
414+
@generator_name = "aliki"
415415
@generators = RDoc::RDoc::GENERATORS
416416
@generator_options = []
417417
@hyperlink_all = false

lib/rdoc/rubygems_hook.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ def delete_legacy_args(args)
118118
end
119119

120120
##
121-
# Generates documentation using the named +generator+ ("darkfish" or "ri")
121+
# Generates documentation using the named +generator+ ("aliki" or "ri")
122122
# and following the given +options+.
123123
#
124124
# Documentation will be generated into +destination+
@@ -190,7 +190,7 @@ def generate
190190

191191
Dir.chdir @spec.full_gem_path do
192192
# RDoc::Options#finish must be called before parse_files.
193-
# RDoc::Options#finish is also called after ri/darkfish generator setup.
193+
# RDoc::Options#finish is also called after ri/aliki generator setup.
194194
# We need to dup the options to avoid modifying it after finish is called.
195195
parse_options = options.dup
196196
parse_options.finish
@@ -202,7 +202,7 @@ def generate
202202
document 'ri', options, @ri_dir if
203203
@generate_ri and (@force or not File.exist? @ri_dir)
204204

205-
document 'darkfish', options, @rdoc_dir if
205+
document 'aliki', options, @rdoc_dir if
206206
@generate_rdoc and (@force or not File.exist? @rdoc_dir)
207207
end
208208

0 commit comments

Comments
 (0)