Skip to content

Commit e1e83b0

Browse files
committed
Merge branch 'master' into fix-rdoc
2 parents 36e9155 + fc16be2 commit e1e83b0

File tree

19 files changed

+276
-235
lines changed

19 files changed

+276
-235
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ bench/test.div.html
2222
diff.html
2323
etc/CodeRay.tmproj
2424
*.swp
25-
etc
25+
old-stuff

.travis.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,11 @@ rvm:
55
- jruby-18mode
66
- jruby-19mode
77
- rbx-18mode
8-
# - rbx-19mode # test again later
9-
# - ruby-head # test again later
10-
# - jruby-head # test again later
8+
- rbx-19mode
9+
- ruby-head # test again later: RedCloth not compiling
10+
- jruby-head
1111
- ree
1212
branches:
1313
only:
1414
- master
15-
- stable
1615
script: "rake test" # test:scanners"

README.textile renamed to CREDITS.textile

Lines changed: 1 addition & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,4 @@
1-
h1. CodeRay !https://secure.travis-ci.org/rubychan/coderay.png!:https://secure.travis-ci.org/rubychan/coderay
2-
3-
h2. About
4-
5-
CodeRay is a Ruby library for syntax highlighting.
6-
7-
You put your code in, and you get it back colored; Keywords, strings, floats, comments - all in different colors. And with line numbers.
8-
9-
*Syntax Highlighting*…
10-
11-
* makes code easier to read and maintain
12-
* lets you detect syntax errors faster
13-
* helps you to understand the syntax of a language
14-
* looks nice
15-
* is what everybody wants to have on their website
16-
* solves all your problems and makes the girls run after you
17-
18-
19-
h2. Installation
20-
21-
bc. gem install coderay
22-
23-
h3. Dependencies
24-
25-
CodeRay needs Ruby 1.8.7+ or 1.9.2+. It also runs on Rubinius and JRuby.
26-
27-
h2. Example Usage
28-
29-
bc.. require 'coderay'
30-
31-
html = CodeRay.scan("puts 'Hello, world!'", :ruby).div(:line_numbers => :table)
32-
33-
p.
34-
35-
h2. Documentation
36-
37-
See "http://coderay.rubychan.de/doc/":http://coderay.rubychan.de/doc/.
38-
39-
40-
h2. Credits
1+
h1. Credits
412

423
h3. Special Thanks to
434

0 commit comments

Comments
 (0)