[Python-modules-commits] [pygments] 04/05: merge patched into master
Dmitry Shachnev
mitya57 at moszumanska.debian.org
Mon Jan 25 15:06:41 UTC 2016
This is an automated email from the git hooks/post-receive script.
mitya57 pushed a commit to branch master
in repository pygments.
commit 7c48c957773059e81aa18bc5465efacc1702be8b
Merge: 5e36c18 ee06730
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date: Mon Jan 25 18:03:47 2016 +0300
merge patched into master
AUTHORS | 42 +-
CHANGES | 89 +-
LICENSE | 2 +-
Makefile | 12 +-
PKG-INFO | 4 +-
Pygments.egg-info/PKG-INFO | 4 +-
Pygments.egg-info/SOURCES.txt | 208 +-
README.rst | 2 +-
TODO | 3 -
debian/.git-dpm | 6 +-
debian/patches/change_docs_theme.patch | 6 +-
doc/_themes/pygments14/layout.html | 2 +-
doc/_themes/pygments14/static/pygments14.css_t | 2 +-
doc/conf.py | 12 +-
doc/docs/filterdevelopment.rst | 7 +-
doc/docs/integrate.rst | 15 -
doc/docs/java.rst | 14 +-
doc/docs/lexerdevelopment.rst | 15 +-
doc/docs/lexers.rst | 2 +-
doc/docs/tokens.rst | 8 +-
doc/docs/unicode.rst | 2 +-
doc/faq.rst | 4 +-
doc/languages.rst | 15 +-
external/autopygmentize | 10 +-
external/lasso-builtins-generator-9.lasso | 122 +-
external/markdown-processor.py | 2 +-
external/moin-parser.py | 2 +-
external/rst-directive.py | 2 +-
pygments/__init__.py | 17 +-
pygments/cmdline.py | 176 +-
pygments/console.py | 2 +-
pygments/filter.py | 6 +-
pygments/filters/__init__.py | 2 +-
pygments/formatter.py | 2 +-
pygments/formatters/__init__.py | 6 +-
pygments/formatters/_mapping.py | 17 +-
pygments/formatters/bbcode.py | 2 +-
pygments/formatters/html.py | 102 +-
pygments/formatters/img.py | 21 +-
pygments/formatters/{terminal.py => irc.py} | 87 +-
pygments/formatters/latex.py | 25 +-
pygments/formatters/other.py | 2 +-
pygments/formatters/rtf.py | 2 +-
pygments/formatters/svg.py | 2 +-
pygments/formatters/terminal.py | 73 +-
pygments/formatters/terminal256.py | 66 +-
pygments/lexer.py | 21 +-
pygments/lexers/__init__.py | 4 +-
pygments/lexers/_asy_builtins.py | 2 +-
pygments/lexers/_cl_builtins.py | 2 +-
pygments/lexers/_cocoa_builtins.py | 13 +-
pygments/lexers/_csound_builtins.py | 1346 ++++
pygments/lexers/_lasso_builtins.py | 9240 ++++++++++++------------
pygments/lexers/_lua_builtins.py | 5 +-
pygments/lexers/_mapping.py | 84 +-
pygments/lexers/_mql_builtins.py | 2 +-
pygments/lexers/_openedge_builtins.py | 2 +-
pygments/lexers/_php_builtins.py | 5 +-
pygments/lexers/_postgres_builtins.py | 5 +-
pygments/lexers/_scilab_builtins.py | 5 +-
pygments/lexers/_sourcemod_builtins.py | 6 +-
pygments/lexers/_stan_builtins.py | 54 +-
pygments/lexers/_vim_builtins.py | 2 +-
pygments/lexers/actionscript.py | 2 +-
pygments/lexers/agile.py | 2 +-
pygments/lexers/algebra.py | 42 +-
pygments/lexers/ambient.py | 2 +-
pygments/lexers/apl.py | 2 +-
pygments/lexers/archetype.py | 318 +
pygments/lexers/asm.py | 7 +-
pygments/lexers/automation.py | 5 +-
pygments/lexers/basic.py | 2 +-
pygments/lexers/business.py | 4 +-
pygments/lexers/c_cpp.py | 48 +-
pygments/lexers/c_like.py | 132 +-
pygments/lexers/chapel.py | 12 +-
pygments/lexers/compiled.py | 2 +-
pygments/lexers/configs.py | 293 +-
pygments/lexers/console.py | 4 +-
pygments/lexers/csound.py | 366 +
pygments/lexers/css.py | 40 +-
pygments/lexers/d.py | 2 +-
pygments/lexers/dalvik.py | 2 +-
pygments/lexers/data.py | 2 +-
pygments/lexers/diff.py | 2 +-
pygments/lexers/dotnet.py | 7 +-
pygments/lexers/dsls.py | 210 +-
pygments/lexers/dylan.py | 2 +-
pygments/lexers/ecl.py | 2 +-
pygments/lexers/eiffel.py | 2 +-
pygments/lexers/elm.py | 121 +
pygments/lexers/erlang.py | 2 +-
pygments/lexers/esoteric.py | 113 +-
pygments/lexers/ezhil.py | 68 +
pygments/lexers/factor.py | 2 +-
pygments/lexers/fantom.py | 2 +-
pygments/lexers/felix.py | 2 +-
pygments/lexers/fortran.py | 69 +-
pygments/lexers/foxpro.py | 2 +-
pygments/lexers/functional.py | 4 +-
pygments/lexers/go.py | 2 +-
pygments/lexers/grammar_notation.py | 131 +
pygments/lexers/graph.py | 3 +-
pygments/lexers/graphics.py | 2 +-
pygments/lexers/haskell.py | 2 +-
pygments/lexers/haxe.py | 2 +-
pygments/lexers/hdl.py | 2 +-
pygments/lexers/hexdump.py | 97 +
pygments/lexers/html.py | 30 +-
pygments/lexers/idl.py | 13 +-
pygments/lexers/igor.py | 17 +-
pygments/lexers/inferno.py | 2 +-
pygments/lexers/installers.py | 2 +-
pygments/lexers/int_fiction.py | 3 +-
pygments/lexers/iolang.py | 2 +-
pygments/lexers/j.py | 146 +
pygments/lexers/javascript.py | 291 +-
pygments/lexers/julia.py | 9 +-
pygments/lexers/jvm.py | 57 +-
pygments/lexers/lisp.py | 897 ++-
pygments/lexers/make.py | 3 +-
pygments/lexers/markup.py | 2 +-
pygments/lexers/math.py | 2 +-
pygments/lexers/matlab.py | 2 +-
pygments/lexers/ml.py | 2 +-
pygments/lexers/modeling.py | 8 +-
pygments/lexers/modula2.py | 1561 ++++
pygments/lexers/nimrod.py | 2 +-
pygments/lexers/nit.py | 2 +-
pygments/lexers/nix.py | 2 +-
pygments/lexers/oberon.py | 105 +
pygments/lexers/objective.py | 194 +-
pygments/lexers/ooc.py | 2 +-
pygments/lexers/other.py | 2 +-
pygments/lexers/parasail.py | 79 +
pygments/lexers/parsers.py | 2 +-
pygments/lexers/pascal.py | 211 +-
pygments/lexers/pawn.py | 2 +-
pygments/lexers/perl.py | 3 +-
pygments/lexers/php.py | 2 +-
pygments/lexers/praat.py | 295 +
pygments/lexers/prolog.py | 10 +-
pygments/lexers/python.py | 127 +-
pygments/lexers/qvt.py | 150 +
pygments/lexers/r.py | 2 +-
pygments/lexers/rdf.py | 208 +-
pygments/lexers/rebol.py | 2 +-
pygments/lexers/resource.py | 2 +-
pygments/lexers/roboconf.py | 82 +
pygments/lexers/robotframework.py | 32 +-
pygments/lexers/ruby.py | 19 +-
pygments/lexers/rust.py | 117 +-
pygments/lexers/scripting.py | 324 +-
pygments/lexers/shell.py | 548 +-
pygments/lexers/smalltalk.py | 2 +-
pygments/lexers/snobol.py | 2 +-
pygments/lexers/special.py | 2 +-
pygments/lexers/sql.py | 6 +-
pygments/lexers/supercollider.py | 90 +
pygments/lexers/tcl.py | 2 +-
pygments/lexers/templates.py | 24 +-
pygments/lexers/testing.py | 90 +-
pygments/lexers/text.py | 2 +-
pygments/lexers/textedit.py | 2 +-
pygments/lexers/textfmts.py | 6 +-
pygments/lexers/theorem.py | 56 +-
pygments/lexers/trafficscript.py | 54 +
pygments/lexers/urbi.py | 2 +-
pygments/lexers/web.py | 2 +-
pygments/lexers/webmisc.py | 139 +-
pygments/lexers/x10.py | 69 +
pygments/modeline.py | 7 +-
pygments/plugin.py | 2 +-
pygments/regexopt.py | 2 +-
pygments/scanner.py | 2 +-
pygments/sphinxext.py | 8 +-
pygments/style.py | 4 +-
pygments/styles/__init__.py | 5 +-
pygments/styles/algol.py | 63 +
pygments/styles/algol_nu.py | 63 +
pygments/styles/arduino.py | 98 +
pygments/styles/autumn.py | 2 +-
pygments/styles/borland.py | 2 +-
pygments/styles/bw.py | 2 +-
pygments/styles/colorful.py | 2 +-
pygments/styles/default.py | 2 +-
pygments/styles/emacs.py | 2 +-
pygments/styles/friendly.py | 2 +-
pygments/styles/fruity.py | 2 +-
pygments/styles/igor.py | 2 +-
pygments/styles/lovelace.py | 93 +
pygments/styles/manni.py | 2 +-
pygments/styles/monokai.py | 2 +-
pygments/styles/murphy.py | 2 +-
pygments/styles/native.py | 2 +-
pygments/styles/paraiso_dark.py | 2 +-
pygments/styles/paraiso_light.py | 2 +-
pygments/styles/pastie.py | 2 +-
pygments/styles/perldoc.py | 2 +-
pygments/styles/rrt.py | 2 +-
pygments/styles/tango.py | 2 +-
pygments/styles/trac.py | 2 +-
pygments/styles/vim.py | 2 +-
pygments/styles/vs.py | 2 +-
pygments/styles/xcode.py | 2 +-
pygments/token.py | 4 +-
pygments/unistring.py | 6 +-
pygments/util.py | 30 +-
scripts/check_sources.py | 4 +-
scripts/debug_lexer.py | 60 +-
scripts/get_vimkw.py | 2 +-
setup.py | 4 +-
tests/.coverage | Bin 0 -> 13152 bytes
tests/cover/coverage_html.js | 376 +
tests/cover/jquery.hotkeys.js | 99 +
tests/cover/jquery.isonscreen.js | 53 +
tests/cover/jquery.min.js | 166 +
tests/cover/jquery.tablesorter.min.js | 2 +
tests/cover/keybd_closed.png | Bin 0 -> 264 bytes
tests/cover/keybd_open.png | Bin 0 -> 267 bytes
tests/cover/status.dat | 5179 +++++++++++++
tests/cover/style.css | 300 +
tests/run.py | 31 +-
tests/string_asserts.py | 2 +-
tests/test_basic_api.py | 32 +-
tests/test_cfm.py | 4 +-
tests/test_clexer.py | 25 +-
tests/test_cmdline.py | 243 +-
tests/test_examplefiles.py | 2 +-
tests/test_ezhil.py | 182 +
tests/test_html_formatter.py | 37 +-
tests/test_inherit.py | 2 +-
tests/test_irc_formatter.py | 30 +
tests/test_java.py | 40 +-
tests/test_latex_formatter.py | 4 +-
tests/test_lexers_other.py | 25 +-
tests/test_objectiveclexer.py | 2 +-
tests/test_perllexer.py | 2 +-
tests/test_qbasiclexer.py | 2 +-
tests/test_regexlexer.py | 2 +-
tests/test_regexopt.py | 2 +-
tests/test_rtf_formatter.py | 2 +-
tests/test_ruby.py | 2 +-
tests/test_shell.py | 28 +-
tests/test_smarty.py | 2 +-
tests/test_string_asserts.py | 2 +-
tests/test_terminal_formatter.py | 51 +
tests/test_textfmts.py | 2 +-
tests/test_token.py | 2 +-
tests/test_unistring.py | 2 +-
tests/test_using_api.py | 2 +-
tests/test_util.py | 70 +-
252 files changed, 21592 insertions(+), 6207 deletions(-)
diff --cc debian/.git-dpm
index 7daa2af,0000000..3bca434
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
+# see git-dpm(1) from git-dpm package
- 41619bd44acdfd66fb9c56ce3dae3d84c28ea862
- 41619bd44acdfd66fb9c56ce3dae3d84c28ea862
- 5af00867c24200bf923105deb40df521563084b2
++ee06730e4e7551f20bb14e4d395b122f099a15c9
++ee06730e4e7551f20bb14e4d395b122f099a15c9
++2795ecc67b331bde9b00cbad508e1ace0e4eed18
+2795ecc67b331bde9b00cbad508e1ace0e4eed18
+pygments_2.1+dfsg.orig.tar.gz
+b3903c22be80f67eeaa670b823dca13b1c6771b8
+1062778
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/change_docs_theme.patch
index d2c32de,0000000..a62fd53
mode 100644,000000..100644
--- a/debian/patches/change_docs_theme.patch
+++ b/debian/patches/change_docs_theme.patch
@@@ -1,23 -1,0 +1,23 @@@
- From 41619bd44acdfd66fb9c56ce3dae3d84c28ea862 Mon Sep 17 00:00:00 2001
++From ee06730e4e7551f20bb14e4d395b122f099a15c9 Mon Sep 17 00:00:00 2001
+From: SVN-Git Migration <python-modules-team at lists.alioth.debian.org>
+Date: Thu, 8 Oct 2015 10:34:58 -0700
+Subject: change_docs_theme
+
+Patch-Name: change_docs_theme.patch
+---
+ doc/conf.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/doc/conf.py b/doc/conf.py
- index 4ac487f..79be2e3 100644
++index 51a9161..82ae598 100644
+--- a/doc/conf.py
++++ b/doc/conf.py
- @@ -93,7 +93,7 @@ exclude_patterns = ['_build']
++@@ -85,7 +85,7 @@ exclude_patterns = ['_build']
+
+ # The theme to use for HTML and HTML Help pages. See the documentation for
+ # a list of builtin themes.
+-html_theme = 'pygments14'
++html_theme = 'default'
+
+ # Theme options are theme-specific and customize the look and feel of a theme
+ # further. For a list of options available for each theme, see the
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/pygments.git
More information about the Python-modules-commits
mailing list