[Pkg-javascript-commits] [highlight.js] 02/03: Merge tag 'upstream/8.2+ds'

Cédric Boutillier boutil at moszumanska.debian.org
Mon Sep 15 12:08:34 UTC 2014


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

boutil pushed a commit to branch master
in repository highlight.js.

commit 8c6b9ace7ce26ac033611fac6b76a3ee89ec2801
Merge: 1e13661 90a86ea
Author: Cédric Boutillier <boutil at debian.org>
Date:   Sun Aug 24 10:39:19 2014 +0200

    Merge tag 'upstream/8.2+ds'
    
    Upstream version 8.2+ds
    
    # gpg: Signature faite le dim. 24 août 2014 10:39:15 CEST avec la clef RSA d'identifiant 39CD217A
    # gpg: Bonne signature de « Cédric Boutillier <boutil at debian.org> »
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at upmc.fr> »
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at polytechnique.org> »
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at gmail.com> »

 .gitignore                                   |   1 +
 .travis.yml                                  |  10 +
 AUTHORS.en.txt                               |  12 +-
 AUTHORS.ru.txt                               |  12 +-
 CHANGES.md                                   |  47 +++++
 README.md                                    |  12 +-
 README.ru.md                                 |  10 +-
 docs/building-testing.rst                    |  29 ++-
 docs/conf.py                                 |   4 +-
 docs/css-classes-reference.rst               |  93 +++++++-
 docs/language-contribution.rst               |   6 +-
 package.json                                 |  41 ++++
 src/highlight.js                             |  55 +++--
 src/languages/axapta.js                      |   6 +-
 src/languages/clojure.js                     |   8 +-
 src/languages/coffeescript.js                |   9 +-
 src/languages/cs.js                          |  39 +++-
 src/languages/dart.js                        | 106 ++++++++++
 src/languages/dos.js                         |  40 ++--
 src/languages/dust.js                        |  41 ++++
 src/languages/erlang.js                      |   4 +-
 src/languages/fsharp.js                      |  19 +-
 src/languages/gcode.js                       |  82 ++++++++
 src/languages/gherkin.js                     |   1 +
 src/languages/groovy.js                      |  90 ++++++++
 src/languages/java.js                        |  51 +++--
 src/languages/lisp.js                        |   6 +-
 src/languages/livecodeserver.js              |   2 +-
 src/languages/makefile.js                    |   1 +
 src/languages/markdown.js                    |  16 +-
 src/languages/nginx.js                       |   3 +-
 src/languages/objectivec.js                  |   3 +-
 src/languages/php.js                         |   5 +-
 src/languages/q.js                           |  27 +++
 src/languages/ruby.js                        |  48 ++---
 src/languages/rust.js                        |  27 ++-
 src/languages/scala.js                       |  89 ++++----
 src/languages/scheme.js                      | 126 +++++++++++
 src/languages/swift.js                       |  10 +-
 src/languages/xml.js                         |   2 +-
 src/package.json                             |  24 ---
 src/styles/arta.css                          |   8 +-
 src/styles/ascetic.css                       |   2 +-
 src/styles/atelier-dune.dark.css             |   1 +
 src/styles/atelier-dune.light.css            |   1 +
 src/styles/atelier-forest.dark.css           |   1 +
 src/styles/atelier-forest.light.css          |   1 +
 src/styles/atelier-heath.dark.css            |   1 +
 src/styles/atelier-heath.light.css           |   1 +
 src/styles/atelier-lakeside.dark.css         |   1 +
 src/styles/atelier-lakeside.light.css        |   1 +
 src/styles/atelier-seaside.dark.css          |   1 +
 src/styles/atelier-seaside.light.css         |   1 +
 src/styles/brown_paper.css                   |  12 +-
 src/styles/codepen-embed.css                 |   1 +
 src/styles/color-brewer.css                  |   8 +-
 src/styles/dark.css                          |  12 +-
 src/styles/default.css                       |   7 +-
 src/styles/docco.css                         |   2 +
 src/styles/far.css                           |  14 +-
 src/styles/foundation.css                    |   1 +
 src/styles/github.css                        |  16 +-
 src/styles/googlecode.css                    |  10 +-
 src/styles/hybrid.css                        |   4 +-
 src/styles/idea.css                          |   5 +-
 src/styles/ir_black.css                      |   4 +-
 src/styles/kimbie.dark.css                   |   3 +-
 src/styles/kimbie.light.css                  |   1 +
 src/styles/magula.css                        |   6 +-
 src/styles/mono-blue.css                     |   5 +
 src/styles/monokai.css                       |  12 +-
 src/styles/monokai_sublime.css               |   9 +-
 src/styles/obsidian.css                      |  12 +-
 src/styles/paraiso.dark.css                  |   1 +
 src/styles/paraiso.light.css                 |   1 +
 src/styles/pojoaque.css                      |   8 +-
 src/styles/railscasts.css                    |   6 +-
 src/styles/rainbow.css                       |  14 +-
 src/styles/school_book.css                   |  12 +-
 src/styles/solarized_dark.css                |   5 +-
 src/styles/solarized_light.css               |   5 +-
 src/styles/sunburst.css                      |   6 +-
 src/styles/tomorrow-night-blue.css           |   1 +
 src/styles/tomorrow-night-bright.css         |   1 +
 src/styles/tomorrow-night-eighties.css       |   1 +
 src/styles/tomorrow-night.css                |   1 +
 src/styles/tomorrow.css                      |   1 +
 src/styles/vs.css                            |   6 +-
 src/styles/xcode.css                         |   6 +-
 src/styles/zenburn.css                       |   7 +-
 src/test.html                                | 303 +++++++++++++++++++++++----
 test/detect/1c/default.txt                   |  16 ++
 test/detect/actionscript/default.txt         |  24 +++
 test/detect/apache/default.txt               |  19 ++
 test/detect/applescript/default.txt          |  14 ++
 test/detect/asciidoc/default.txt             |  65 ++++++
 test/detect/autohotkey/default.txt           |  24 +++
 test/detect/avrasm/default.txt               |  19 ++
 test/detect/axapta/default.txt               |  32 +++
 test/detect/bash/default.txt                 |  30 +++
 test/detect/brainfuck/default.txt            |  17 ++
 test/detect/capnproto/default.txt            |  55 +++++
 test/detect/clojure/default.txt              |  18 ++
 test/detect/cmake/default.txt                |  19 ++
 test/detect/coffeescript/default.txt         |  42 ++++
 test/detect/cpp/default.txt                  |  15 ++
 test/detect/cs/default.txt                   |  25 +++
 test/detect/css/default.txt                  |  25 +++
 test/detect/d/default.txt                    |  44 ++++
 test/detect/dart/default.txt                 |  32 +++
 test/detect/delphi/default.txt               |  30 +++
 test/detect/diff/default.txt                 |  30 +++
 test/detect/django/default.txt               |  16 ++
 test/detect/dos/default.txt                  |  24 +++
 test/detect/dust/default.txt                 |   7 +
 test/detect/elixir/default.txt               |  49 +++++
 test/detect/erlang-repl/default.txt          |  27 +++
 test/detect/erlang/default.txt               |  60 ++++++
 test/detect/fix/default.txt                  |   4 +
 test/detect/fsharp/default.txt               |  48 +++++
 test/detect/gcode/default.txt                |  31 +++
 test/detect/gherkin/default.txt              |  25 +++
 test/detect/glsl/default.txt                 |  37 ++++
 test/detect/go/default.txt                   |  34 +++
 test/detect/gradle/default.txt               |  62 ++++++
 test/detect/groovy/default.txt               |  56 +++++
 test/detect/haml/default.txt                 |  14 ++
 test/detect/handlebars/default.txt           |   7 +
 test/detect/haskell/default.txt              |  44 ++++
 test/detect/haxe/default.txt                 |  29 +++
 test/detect/http/default.txt                 |   6 +
 test/detect/ini/default.txt                  |  12 ++
 test/detect/java/default.txt                 |  35 ++++
 test/detect/javascript/default.txt           |  16 ++
 test/detect/json/default.txt                 |  12 ++
 test/detect/lasso/default.txt                |  47 +++++
 test/detect/lisp/default.txt                 |  22 ++
 test/detect/livecodeserver/default.txt       |  30 +++
 test/detect/lua/default.txt                  |  32 +++
 test/detect/makefile/default.txt             |  13 ++
 test/detect/markdown/default.txt             |  23 ++
 test/detect/mathematica/default.txt          |  14 ++
 test/detect/matlab/default.txt               |  38 ++++
 test/detect/mel/default.txt                  |  25 +++
 test/detect/mizar/default.txt                |  86 ++++++++
 test/detect/monkey/default.txt               |  37 ++++
 test/detect/nginx/default.txt                |  47 +++++
 test/detect/nimrod/default.txt               |  22 ++
 test/detect/nix/default.txt                  |  24 +++
 test/detect/nsis/default.txt                 |  33 +++
 test/detect/objectivec/default.txt           |  43 ++++
 test/detect/ocaml/default.txt                |  23 ++
 test/detect/oxygene/default.txt              |  56 +++++
 test/detect/parser3/default.txt              |  34 +++
 test/detect/perl/default.txt                 |  32 +++
 test/detect/php/default.txt                  |  52 +++++
 test/detect/profile/default.txt              |   8 +
 test/detect/protobuf/default.txt             |  23 ++
 test/detect/python/default.txt               |  12 ++
 test/detect/q/default.txt                    |   9 +
 test/detect/r/default.txt                    |  69 ++++++
 test/detect/rib/default.txt                  |  25 +++
 test/detect/rsl/default.txt                  |  15 ++
 test/detect/ruby/default.txt                 |  57 +++++
 test/detect/ruleslanguage/default.txt        |  36 ++++
 test/detect/rust/default.txt                 |  75 +++++++
 test/detect/scala/default.txt                |  44 ++++
 test/detect/scheme/default.txt               |  28 +++
 test/detect/scilab/default.txt               |  14 ++
 test/detect/scss/default.txt                 |  73 +++++++
 test/detect/smalltalk/default.txt            |  39 ++++
 test/detect/sql/default.txt                  |  19 ++
 test/detect/swift/default.txt                |  11 +
 test/detect/tex/default.txt                  |  17 ++
 test/detect/thrift/default.txt               |  40 ++++
 test/detect/typescript/default.txt           |  16 ++
 test/detect/vala/default.txt                 |  46 ++++
 test/detect/vbnet/default.txt                |  42 ++++
 test/detect/vbscript/default.txt             |  29 +++
 test/detect/vhdl/default.txt                 |  41 ++++
 test/detect/vim/default.txt                  |  15 ++
 test/detect/x86asm/default.txt               |  40 ++++
 test/detect/xml/default.txt                  |  22 ++
 test/expect/brInPre.txt                      |   1 +
 test/expect/custommarkup.txt                 |   3 +
 test/expect/customtabreplace.txt             |   4 +
 test/expect/explicit.txt                     |   2 +
 test/expect/languagealias.txt                |   1 +
 test/expect/shortenedexplicit.txt            |   2 +
 test/expect/tabreplace.txt                   |   2 +
 test/highlightAuto.js                        |  38 ++++
 test/index.html                              |  54 +++++
 test/markup.js                               |  33 +++
 test/markup/coffeescript/division.expect.txt |   8 +
 test/markup/coffeescript/division.txt        |   8 +
 test/markup/coffeescript/function.expect.txt |  11 +
 test/markup/coffeescript/function.txt        |  11 +
 test/markup/coffeescript/regex.expect.txt    |   8 +
 test/markup/coffeescript/regex.txt           |   8 +
 test/markup/cs/titles.expect.txt             |  16 ++
 test/markup/cs/titles.txt                    |  16 ++
 test/mocha.opts                              |   5 +
 test/special.js                              |  23 ++
 test/special/customMarkup.js                 |  48 +++++
 test/special/explicitLanguage.js             |  42 ++++
 test/special/languageAlias.js                |  21 ++
 test/special/noHighlight.js                  |  17 ++
 test/utility.js                              |  11 +
 tools/build.py                               |  11 +-
 209 files changed, 4636 insertions(+), 382 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/highlight.js.git



More information about the Pkg-javascript-commits mailing list