Skip to content

Commit 0c98047

Browse files
kornykorny
committed
Merge branch 'master' into paint-integration
2 parents 2503736 + fc16be2 commit 0c98047

File tree

145 files changed

+464
-41018
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

145 files changed

+464
-41018
lines changed

‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
.DS_Store
12
*.gem
23
*.rbc
34
.bundle
@@ -21,3 +22,4 @@ bench/test.div.html
2122
diff.html
2223
etc/CodeRay.tmproj
2324
*.swp
25+
old-stuff

‎.travis.yml

+6-5
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@ rvm:
22
- 1.8.7
33
- 1.9.2
44
- 1.9.3
5-
- ruby-head
6-
- rbx
7-
- rbx-2.0
5+
- jruby-18mode
6+
- jruby-19mode
7+
- rbx-18mode
8+
- rbx-19mode
9+
- ruby-head # test again later: RedCloth not compiling
10+
- jruby-head
811
- ree
9-
- jruby
1012
branches:
1113
only:
1214
- master
13-
- stable
1415
script: "rake test" # test:scanners"

‎README.textile renamed to ‎CREDITS.textile

+1-40
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)