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

Cédric Boutillier boutil at moszumanska.debian.org
Sat Jul 26 19:25:05 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 3289f4e7b7a24f5d6ce7d6c806cbb73e660e09e3
Merge: 282e209 166a81b
Author: Cédric Boutillier <boutil at debian.org>
Date:   Thu Jul 24 14:07:28 2014 +0200

    Merge tag 'upstream/8.1+ds'
    
    Upstream version 8.1+ds
    
    # gpg: Signature faite le jeu. 24 juil. 2014 14:07:24 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 +
 AUTHORS.en.txt                                     |  22 +-
 AUTHORS.ru.txt                                     |  24 +-
 CHANGES.md                                         |  95 ++-
 README.md                                          | 180 ++--
 README.ru.md                                       | 184 ++---
 docs/api.rst                                       |   9 +-
 docs/building-testing.rst                          |   4 +-
 docs/conf.py                                       |   4 +-
 docs/css-classes-reference.rst                     | 381 +++++++--
 docs/index.rst                                     |   9 +-
 ...{contribution.rst => language-contribution.rst} |  14 +-
 docs/reference.rst                                 |  13 +-
 docs/style-contribution.rst                        |  41 +
 docs/style-guide.rst                               |   6 +
 src/export.html                                    |  87 --
 src/highlight.js                                   |  76 +-
 src/languages/actionscript.js                      |   5 +-
 src/languages/apache.js                            |   1 +
 src/languages/applescript.js                       |   5 +-
 src/languages/avrasm.js                            |  10 +-
 src/languages/axapta.js                            |   2 +-
 src/languages/bash.js                              |   1 +
 src/languages/brainfuck.js                         |   1 +
 src/languages/capnproto.js                         |  54 ++
 src/languages/clojure.js                           |   1 +
 src/languages/cmake.js                             |   1 +
 src/languages/coffeescript.js                      |   3 +-
 src/languages/cpp.js                               |  13 +-
 src/languages/cs.js                                |  18 +-
 src/languages/css.js                               |  10 +-
 src/languages/d.js                                 | 440 +++++-----
 src/languages/diff.js                              |   1 +
 src/languages/django.js                            |   1 +
 src/languages/dos.js                               |   1 +
 src/languages/elixir.js                            | 114 +++
 src/languages/erlang.js                            |  11 +-
 src/languages/fsharp.js                            |   6 +-
 src/languages/gherkin.js                           |  35 +
 src/languages/gradle.js                            |  40 +
 src/languages/haml.js                              |   2 +-
 src/languages/handlebars.js                        |   1 +
 src/languages/haskell.js                           |   1 +
 src/languages/{actionscript.js => haxe.js}         |  36 +-
 src/languages/java.js                              |   5 +-
 src/languages/javascript.js                        |   5 +-
 src/languages/lasso.js                             |  23 +-
 src/languages/lisp.js                              |  11 +-
 src/languages/livecodeserver.js                    |   4 +-
 src/languages/lua.js                               |   2 +-
 src/languages/makefile.js                          |   5 +-
 src/languages/markdown.js                          |   3 +-
 src/languages/matlab.js                            |   9 +-
 src/languages/monkey.js                            |  83 ++
 src/languages/nginx.js                             |   7 +-
 src/languages/nimrod.js                            |  58 ++
 src/languages/nix.js                               |  56 ++
 src/languages/nsis.js                              |  92 +++
 src/languages/objectivec.js                        |  52 +-
 src/languages/ocaml.js                             |   5 +-
 src/languages/oxygene.js                           |  12 +-
 src/languages/perl.js                              |   7 +-
 src/languages/php.js                               |   7 +-
 src/languages/protobuf.js                          |  42 +
 src/languages/python.js                            |   9 +-
 src/languages/ruby.js                              |  71 +-
 src/languages/rust.js                              |  49 +-
 src/languages/scala.js                             |  12 +-
 src/languages/scilab.js                            |   5 +-
 src/languages/scss.js                              |  26 +-
 src/languages/smalltalk.js                         |   1 +
 src/languages/sql.js                               | 105 ++-
 src/languages/swift.js                             | 111 +++
 src/languages/thrift.js                            |  41 +
 src/languages/{javascript.js => typescript.js}     |  34 +-
 src/languages/vala.js                              |   2 +-
 src/languages/vbnet.js                             |   5 +-
 src/languages/vbscript.js                          |   1 +
 src/languages/vim.js                               |  68 ++
 src/languages/x86asm.js                            | 152 ++++
 src/languages/xml.js                               |   2 +-
 src/package.json                                   |   2 +-
 src/styles/arta.css                                |  49 +-
 src/styles/ascetic.css                             |   9 +-
 src/styles/atelier-dune.dark.css                   |   3 +-
 src/styles/atelier-dune.light.css                  |   3 +-
 src/styles/atelier-forest.dark.css                 |   3 +-
 src/styles/atelier-forest.light.css                |   3 +-
 src/styles/atelier-heath.dark.css                  |   3 +-
 src/styles/atelier-heath.light.css                 |   3 +-
 src/styles/atelier-lakeside.dark.css               |   3 +-
 src/styles/atelier-lakeside.light.css              |   3 +-
 src/styles/atelier-seaside.dark.css                |   3 +-
 src/styles/atelier-seaside.light.css               |   3 +-
 src/styles/brown_paper.css                         |  10 +-
 src/styles/codepen-embed.css                       | 107 +++
 src/styles/{default.css => color-brewer.css}       |  38 +-
 src/styles/dark.css                                |  10 +-
 src/styles/default.css                             |  11 +-
 src/styles/docco.css                               |  40 +-
 src/styles/far.css                                 |  19 +-
 src/styles/foundation.css                          |   4 +-
 src/styles/github.css                              |  38 +-
 src/styles/googlecode.css                          |  25 +-
 src/styles/hybrid.css                              | 169 ++++
 src/styles/idea.css                                |   7 +-
 src/styles/ir_black.css                            |  31 +-
 src/styles/{paraiso.light.css => kimbie.dark.css}  |  44 +-
 src/styles/{paraiso.light.css => kimbie.light.css} |  44 +-
 src/styles/magula.css                              |   7 +-
 src/styles/mono-blue.css                           |  11 +-
 src/styles/monokai.css                             |  18 +-
 src/styles/monokai_sublime.css                     |   4 +-
 src/styles/obsidian.css                            |  42 +-
 src/styles/paraiso.dark.css                        |   1 +
 src/styles/paraiso.light.css                       |   1 +
 src/styles/pojoaque.css                            |  12 +-
 src/styles/railscasts.css                          |  51 +-
 src/styles/rainbow.css                             |  15 +-
 src/styles/school_book.css                         |  12 +-
 src/styles/solarized_dark.css                      |   1 +
 src/styles/solarized_light.css                     |   1 +
 src/styles/sunburst.css                            |  57 +-
 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                                  |  13 +-
 src/styles/xcode.css                               |  25 +-
 src/styles/zenburn.css                             |  29 +-
 src/test.html                                      | 908 ++++++++++++++++++---
 tools/build.py                                     |  49 +-
 133 files changed, 3725 insertions(+), 1370 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