[DRE-commits] [coderay] 02/03: Merge tag 'upstream/1.1.0'

[Youhei SASAKI]

This is an automated email from the git hooks/post-receive script.

uwabami-guest pushed a commit to branch master
in repository coderay.

commit 9cd4a6eeebb9021edf86173afe5e986476ffa910
Merge: 5c55d81 88155c0
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Wed Sep 4 18:48:00 2013 +0900

    Merge tag 'upstream/1.1.0'
    
    Upstream version 1.1.0
    
    Conflicts:
    	lib/coderay/encoders/terminal.rb
    	lib/coderay/scanners/ruby.rb
    	lib/coderay/version.rb
    	metadata.yml

 Rakefile                                  |    4 +-
 bin/coderay                               |    8 +-
 checksums.yaml.gz                         |  Bin 0 -> 270 bytes
 lib/coderay.rb                            |    5 +-
 lib/coderay/encoders/debug.rb             |   22 +--
 lib/coderay/encoders/debug_lint.rb        |   63 +++++++
 lib/coderay/encoders/html.rb              |  185 +++++++++----------
 lib/coderay/encoders/html/css.rb          |   14 +-
 lib/coderay/encoders/html/numbering.rb    |   43 +++--
 lib/coderay/encoders/html/output.rb       |    2 +-
 lib/coderay/encoders/lint.rb              |   59 ++++++
 lib/coderay/encoders/statistic.rb         |    1 -
 lib/coderay/encoders/terminal.rb          |  226 ++++++++++++-----------
 lib/coderay/helpers/file_type.rb          |  106 ++++++-----
 lib/coderay/helpers/gzip.rb               |   41 -----
 lib/coderay/helpers/plugin.rb             |   39 ++--
 lib/coderay/scanner.rb                    |   84 ++++++---
 lib/coderay/scanners/c.rb                 |    2 +-
 lib/coderay/scanners/cpp.rb               |    2 +-
 lib/coderay/scanners/css.rb               |   47 +++--
 lib/coderay/scanners/debug.rb             |   26 ++-
 lib/coderay/scanners/diff.rb              |   84 +++++----
 lib/coderay/scanners/{c.rb => go.rb}      |  155 +++++++++-------
 lib/coderay/scanners/groovy.rb            |   21 ++-
 lib/coderay/scanners/html.rb              |   54 ++++--
 lib/coderay/scanners/java.rb              |    2 +-
 lib/coderay/scanners/java_script.rb       |   36 +++-
 lib/coderay/scanners/json.rb              |   27 +--
 lib/coderay/scanners/lua.rb               |  280 +++++++++++++++++++++++++++++
 lib/coderay/scanners/php.rb               |   26 ++-
 lib/coderay/scanners/python.rb            |    6 +-
 lib/coderay/scanners/raydebug.rb          |   45 +++--
 lib/coderay/scanners/ruby.rb              |    4 +-
 lib/coderay/scanners/ruby/patterns.rb     |    5 +-
 lib/coderay/scanners/ruby/string_state.rb |   14 +-
 lib/coderay/scanners/sass.rb              |  232 ++++++++++++++++++++++++
 lib/coderay/scanners/sql.rb               |   11 +-
 lib/coderay/scanners/taskpaper.rb         |   36 ++++
 lib/coderay/scanners/yaml.rb              |    4 +-
 lib/coderay/styles/alpha.rb               |   56 +++---
 lib/coderay/token_kinds.rb                |  145 ++++++++-------
 lib/coderay/tokens.rb                     |  100 +++--------
 lib/coderay/version.rb                    |    2 +-
 metadata.yml                              |   26 +--
 test/functional/basic.rb                  |    4 +-
 test/functional/examples.rb               |    6 +-
 test/functional/for_redcloth.rb           |   14 +-
 47 files changed, 1567 insertions(+), 807 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/coderay.git