[DRE-commits] [ruby-rouge] 01/06: Merge tag 'upstream/1.11.0'

[Cédric Boutillier]

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

boutil pushed a commit to branch master
in repository ruby-rouge.

commit c99cd7eb8630cac0257e5cdc3fb2c6331775f4cc
Merge: 910e319 9a40e0d
Author: Cédric Boutillier <boutil at debian.org>
Date:   Sat Jun 11 22:10:54 2016 +0200

    Merge tag 'upstream/1.11.0'
    
    Upstream version 1.11.0
    
    # gpg: Signature faite le sam. 11 juin 2016 22:10:54 CEST
    # gpg:                avec la clef RSA 0x89AF82B739CD217A
    # gpg: Bonne signature de « Cédric Boutillier <boutil at debian.org> » [ultime]
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at upmc.fr> » [ultime]
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at polytechnique.org> » [ultime]
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at gmail.com> » [ultime]
    # Empreinte de clef principale : 3041 4D81 DC28 290C 2568  6DE3 DA49 58F6 11E1 49E9
    #    Empreinte de la sous-clef : 9CCD 6B31 9DBF 8E40 AB1A  BD1A 89AF 82B7 39CD 217A

 lib/rouge/cli.rb                                   |    2 +-
 lib/rouge/demos/actionscript                       |    4 +
 lib/rouge/demos/apiblueprint                       |   33 +
 lib/rouge/demos/biml                               |   38 +
 lib/rouge/demos/ceylon                             |    7 +
 lib/rouge/demos/cmake                              |    7 +
 lib/rouge/demos/coq                                |   11 +
 lib/rouge/demos/d                                  |   16 +
 lib/rouge/demos/eiffel                             |   30 +
 lib/rouge/demos/fortran                            |   22 +
 lib/rouge/demos/gradle                             |   10 +
 lib/rouge/demos/jinja                              |    9 +
 lib/rouge/demos/jsonnet                            |   28 +
 lib/rouge/demos/julia                              |   11 +
 lib/rouge/demos/nasm                               |   26 +
 lib/rouge/demos/objective_c                        |    4 +
 lib/rouge/demos/protobuf                           |    5 +
 lib/rouge/demos/shell_session                      |   10 +
 lib/rouge/demos/smarty                             |   12 +
 lib/rouge/demos/tap                                |    5 +
 lib/rouge/demos/twig                               |    9 +
 lib/rouge/demos/typescript                         |    1 +
 lib/rouge/demos/verilog                            |   27 +
 lib/rouge/demos/viml                               |   19 +-
 lib/rouge/formatters/html_inline.rb                |   20 -
 lib/rouge/formatters/html_linewise.rb              |   31 -
 lib/rouge/formatters/html_wrapper.rb               |   11 +
 lib/rouge/formatters/terminal256.rb                |    2 +-
 lib/rouge/lexer.rb                                 |    6 +-
 .../lexers/{javascript.rb => actionscript.rb}      |  142 +--
 lib/rouge/lexers/apache.rb                         |   43 +-
 lib/rouge/lexers/apache/keywords.yml               | 1131 +++++++++++++-------
 lib/rouge/lexers/apiblueprint.rb                   |   51 +
 lib/rouge/lexers/biml.rb                           |   41 +
 lib/rouge/lexers/c.rb                              |    9 +-
 lib/rouge/lexers/ceylon.rb                         |  123 +++
 lib/rouge/lexers/clojure.rb                        |    2 +-
 lib/rouge/lexers/cmake.rb                          |  206 ++++
 lib/rouge/lexers/coffeescript.rb                   |    2 +-
 lib/rouge/lexers/coq.rb                            |  187 ++++
 lib/rouge/lexers/cpp.rb                            |   13 +-
 lib/rouge/lexers/csharp.rb                         |   17 +-
 lib/rouge/lexers/css.rb                            |    2 +
 lib/rouge/lexers/d.rb                              |  176 +++
 lib/rouge/lexers/diff.rb                           |   18 +-
 lib/rouge/lexers/eiffel.rb                         |   65 ++
 lib/rouge/lexers/fortran.rb                        |  142 +++
 lib/rouge/lexers/gradle.rb                         |   37 +
 lib/rouge/lexers/groovy.rb                         |    4 +-
 lib/rouge/lexers/ini.rb                            |    4 +-
 lib/rouge/lexers/java.rb                           |   19 +-
 lib/rouge/lexers/javascript.rb                     |    3 +-
 lib/rouge/lexers/jinja.rb                          |  137 +++
 lib/rouge/lexers/jsonnet.rb                        |  151 +++
 lib/rouge/lexers/julia.rb                          |  172 +++
 lib/rouge/lexers/markdown.rb                       |    1 +
 lib/rouge/lexers/nasm.rb                           |  203 ++++
 lib/rouge/lexers/objective_c.rb                    |   11 +
 lib/rouge/lexers/php.rb                            |    2 +-
 lib/rouge/lexers/powershell.rb                     |    2 +-
 lib/rouge/lexers/protobuf.rb                       |   70 ++
 lib/rouge/lexers/python.rb                         |   23 +
 lib/rouge/lexers/r.rb                              |   73 +-
 lib/rouge/lexers/ruby.rb                           |    8 +-
 lib/rouge/lexers/rust.rb                           |    4 +-
 lib/rouge/lexers/shell_session.rb                  |   29 +
 lib/rouge/lexers/smarty.rb                         |   91 ++
 lib/rouge/lexers/sql.rb                            |    2 +-
 lib/rouge/lexers/swift.rb                          |   25 +-
 lib/rouge/lexers/tap.rb                            |   91 ++
 lib/rouge/lexers/twig.rb                           |   37 +
 lib/rouge/lexers/typescript.rb                     |   46 +
 lib/rouge/lexers/verilog.rb                        |  164 +++
 lib/rouge/regex_lexer.rb                           |    2 +-
 lib/rouge/version.rb                               |    2 +-
 metadata.yml                                       |  233 ----
 rouge.gemspec                                      |    2 +-
 77 files changed, 3520 insertions(+), 914 deletions(-)

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