[Python-modules-commits] [pygments] 04/05: merge patched into master
Piotr Ożarowski
piotr at moszumanska.debian.org
Mon Jan 23 22:33:41 UTC 2017
This is an automated email from the git hooks/post-receive script.
piotr pushed a commit to branch master
in repository pygments.
commit 74c8bdeb573bf2aa751ab6d6cfe235646038cd96
Merge: 162a792 b6beafb
Author: Piotr Ożarowski <piotr at debian.org>
Date: Mon Jan 23 23:25:00 2017 +0100
merge patched into master
.hgignore | 19 -
.hgtags | 31 -
AUTHORS | 24 +-
CHANGES | 51 +
LICENSE | 2 +-
MANIFEST.in | 2 +-
Makefile | 5 +-
PKG-INFO | 4 +-
Pygments.egg-info/PKG-INFO | 4 +-
Pygments.egg-info/SOURCES.txt | 173 +-
debian/.git-dpm | 6 +-
debian/patches/change_docs_theme.patch | 2 +-
doc/_themes/pygments14/layout.html | 2 +-
doc/_themes/pygments14/static/pygments14.css_t | 2 +-
doc/docs/api.rst | 38 +
doc/docs/cmdline.rst | 17 +
doc/docs/lexerdevelopment.rst | 59 +-
doc/docs/lexers.rst | 2 +-
doc/docs/styles.rst | 56 +
doc/docs/tokens.rst | 16 +
doc/docs/unicode.rst | 2 +-
doc/languages.rst | 2 +
external/autopygmentize | 40 +-
external/markdown-processor.py | 2 +-
external/moin-parser.py | 2 +-
external/rst-directive.py | 2 +-
ez_setup.py | 382 --
pygments/__init__.py | 24 +-
pygments/cmdline.py | 71 +-
pygments/console.py | 26 +-
pygments/filter.py | 10 +-
pygments/filters/__init__.py | 2 +-
pygments/formatter.py | 4 +-
pygments/formatters/__init__.py | 39 +-
pygments/formatters/_mapping.py | 2 +-
pygments/formatters/bbcode.py | 2 +-
pygments/formatters/html.py | 2 +-
pygments/formatters/img.py | 39 +-
pygments/formatters/irc.py | 2 +-
pygments/formatters/latex.py | 2 +-
pygments/formatters/other.py | 2 +-
pygments/formatters/rtf.py | 2 +-
pygments/formatters/svg.py | 2 +-
pygments/formatters/terminal.py | 2 +-
pygments/formatters/terminal256.py | 38 +-
pygments/lexer.py | 6 +-
pygments/lexers/__init__.py | 64 +-
pygments/lexers/_asy_builtins.py | 2 +-
pygments/lexers/_cl_builtins.py | 2 +-
pygments/lexers/_cocoa_builtins.py | 2 +-
pygments/lexers/_csound_builtins.py | 2 +-
pygments/lexers/_lasso_builtins.py | 9 +-
pygments/lexers/_lua_builtins.py | 94 +-
pygments/lexers/_mapping.py | 51 +-
pygments/lexers/_mql_builtins.py | 2 +-
pygments/lexers/_openedge_builtins.py | 2 +-
pygments/lexers/_php_builtins.py | 2 +-
pygments/lexers/_postgres_builtins.py | 2 +-
pygments/lexers/_scilab_builtins.py | 2 +-
pygments/lexers/_sourcemod_builtins.py | 2 +-
pygments/lexers/_stan_builtins.py | 2 +-
pygments/lexers/_stata_builtins.py | 419 ++
pygments/lexers/_tsql_builtins.py | 1004 +++++
pygments/lexers/_vim_builtins.py | 2 +-
pygments/lexers/actionscript.py | 2 +-
pygments/lexers/agile.py | 2 +-
pygments/lexers/algebra.py | 8 +-
pygments/lexers/ambient.py | 2 +-
pygments/lexers/ampl.py | 87 +
pygments/lexers/apl.py | 2 +-
pygments/lexers/archetype.py | 2 +-
pygments/lexers/asm.py | 343 +-
pygments/lexers/automation.py | 2 +-
pygments/lexers/basic.py | 2 +-
pygments/lexers/bibtex.py | 160 +
pygments/lexers/business.py | 194 +-
pygments/lexers/c_cpp.py | 38 +-
pygments/lexers/c_like.py | 206 +-
pygments/lexers/capnproto.py | 78 +
pygments/lexers/chapel.py | 25 +-
pygments/lexers/clean.py | 288 ++
pygments/lexers/compiled.py | 3 +-
pygments/lexers/configs.py | 50 +-
pygments/lexers/console.py | 2 +-
pygments/lexers/crystal.py | 393 ++
pygments/lexers/csound.py | 32 +-
pygments/lexers/css.py | 485 ++-
pygments/lexers/d.py | 2 +-
pygments/lexers/dalvik.py | 2 +-
pygments/lexers/data.py | 39 +-
pygments/lexers/diff.py | 63 +-
pygments/lexers/dotnet.py | 47 +-
pygments/lexers/dsls.py | 206 +-
pygments/lexers/dylan.py | 2 +-
pygments/lexers/ecl.py | 2 +-
pygments/lexers/eiffel.py | 2 +-
pygments/lexers/elm.py | 16 +-
pygments/lexers/erlang.py | 34 +-
pygments/lexers/esoteric.py | 152 +-
pygments/lexers/ezhil.py | 21 +-
pygments/lexers/factor.py | 2 +-
pygments/lexers/fantom.py | 2 +-
pygments/lexers/felix.py | 4 +-
pygments/lexers/forth.py | 177 +
pygments/lexers/fortran.py | 15 +-
pygments/lexers/foxpro.py | 2 +-
pygments/lexers/functional.py | 2 +-
pygments/lexers/go.py | 2 +-
pygments/lexers/grammar_notation.py | 92 +-
pygments/lexers/graph.py | 2 +-
pygments/lexers/graphics.py | 2 +-
pygments/lexers/haskell.py | 9 +-
pygments/lexers/haxe.py | 2 +-
pygments/lexers/hdl.py | 2 +-
pygments/lexers/hexdump.py | 30 +-
pygments/lexers/html.py | 19 +-
pygments/lexers/idl.py | 15 +-
pygments/lexers/igor.py | 404 +-
pygments/lexers/inferno.py | 2 +-
pygments/lexers/installers.py | 2 +-
pygments/lexers/int_fiction.py | 2 +-
pygments/lexers/iolang.py | 2 +-
pygments/lexers/j.py | 8 +-
pygments/lexers/javascript.py | 257 +-
pygments/lexers/julia.py | 297 +-
pygments/lexers/jvm.py | 36 +-
pygments/lexers/lisp.py | 1784 ++++----
pygments/lexers/make.py | 6 +-
pygments/lexers/markup.py | 97 +-
pygments/lexers/math.py | 2 +-
pygments/lexers/matlab.py | 2 +-
pygments/lexers/ml.py | 2 +-
pygments/lexers/modeling.py | 2 +-
pygments/lexers/modula2.py | 4 +-
pygments/lexers/monte.py | 204 +
pygments/lexers/ncl.py | 894 ++++
pygments/lexers/nimrod.py | 24 +-
pygments/lexers/nit.py | 2 +-
pygments/lexers/nix.py | 2 +-
pygments/lexers/oberon.py | 8 +-
pygments/lexers/objective.py | 27 +-
pygments/lexers/ooc.py | 2 +-
pygments/lexers/other.py | 3 +-
pygments/lexers/parasail.py | 4 +-
pygments/lexers/parsers.py | 2 +-
pygments/lexers/pascal.py | 4 +-
pygments/lexers/pawn.py | 2 +-
pygments/lexers/perl.py | 29 +-
pygments/lexers/php.py | 38 +-
pygments/lexers/praat.py | 49 +-
pygments/lexers/prolog.py | 2 +-
pygments/lexers/python.py | 140 +-
pygments/lexers/qvt.py | 86 +-
pygments/lexers/r.py | 2 +-
pygments/lexers/rdf.py | 12 +-
pygments/lexers/rebol.py | 2 +-
pygments/lexers/resource.py | 5 +-
pygments/lexers/rnc.py | 67 +
pygments/lexers/roboconf.py | 2 +-
pygments/lexers/robotframework.py | 2 +-
pygments/lexers/ruby.py | 10 +-
pygments/lexers/rust.py | 110 +-
pygments/lexers/sas.py | 228 ++
pygments/lexers/scripting.py | 85 +-
pygments/lexers/shell.py | 40 +-
pygments/lexers/smalltalk.py | 2 +-
pygments/lexers/smv.py | 79 +
pygments/lexers/snobol.py | 2 +-
pygments/lexers/special.py | 5 +-
pygments/lexers/sql.py | 105 +-
pygments/lexers/stata.py | 108 +
pygments/lexers/supercollider.py | 12 +-
pygments/lexers/tcl.py | 2 +-
pygments/lexers/templates.py | 117 +-
pygments/lexers/testing.py | 4 +-
pygments/lexers/text.py | 2 +-
pygments/lexers/textedit.py | 2 +-
pygments/lexers/textfmts.py | 2 +-
pygments/lexers/theorem.py | 42 +-
pygments/lexers/trafficscript.py | 2 +-
pygments/lexers/typoscript.py | 226 ++
pygments/lexers/urbi.py | 2 +-
pygments/lexers/varnish.py | 190 +
pygments/lexers/verification.py | 111 +
pygments/lexers/web.py | 2 +-
pygments/lexers/webmisc.py | 31 +-
pygments/lexers/whiley.py | 116 +
pygments/lexers/x10.py | 2 +-
pygments/modeline.py | 11 +-
pygments/plugin.py | 30 +-
pygments/regexopt.py | 4 +-
pygments/scanner.py | 5 +-
pygments/sphinxext.py | 3 +-
pygments/style.py | 43 +-
pygments/styles/__init__.py | 5 +-
pygments/styles/abap.py | 29 +
pygments/styles/algol.py | 2 +-
pygments/styles/algol_nu.py | 2 +-
pygments/styles/arduino.py | 12 +-
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 | 6 +-
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 | 4 +-
pygments/styles/rainbow_dash.py | 89 +
pygments/styles/rrt.py | 2 +-
pygments/styles/sas.py | 44 +
pygments/styles/stata.py | 40 +
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 | 37 +-
pygments/unistring.py | 2 +-
pygments/util.py | 9 +-
requirements.txt | 5 -
scripts/check_sources.py | 4 +-
scripts/debug_lexer.py | 4 +-
scripts/find_error.py | 247 +-
scripts/get_vimkw.py | 2 +-
setup.cfg | 3 +-
setup.py | 32 +-
tests/.coverage | Bin 13152 -> 0 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 264 -> 0 bytes
tests/cover/keybd_open.png | Bin 267 -> 0 bytes
tests/cover/status.dat | 5179 ------------------------
tests/cover/style.css | 300 --
tests/run.py | 2 +-
tests/string_asserts.py | 2 +-
tests/support/empty.py | 1 +
tests/support/html_formatter.py | 6 +
tests/support/python_lexer.py | 12 +
tests/test_basic_api.py | 10 +-
tests/test_bibtex.py | 236 ++
tests/test_cfm.py | 2 +-
tests/test_clexer.py | 2 +-
tests/test_cmdline.py | 56 +-
tests/test_cpp.py | 33 +
tests/test_crystal.py | 308 ++
tests/test_data.py | 100 +
tests/test_examplefiles.py | 8 +-
tests/test_ezhil.py | 3 +-
tests/test_html_formatter.py | 2 +-
tests/test_inherit.py | 2 +-
tests/test_irc_formatter.py | 2 +-
tests/test_java.py | 2 +-
tests/test_javascript.py | 84 +
tests/test_julia.py | 58 +
tests/test_latex_formatter.py | 6 +-
tests/test_lexers_other.py | 28 +-
tests/test_modeline.py | 26 +
tests/test_objectiveclexer.py | 2 +-
tests/test_perllexer.py | 24 +-
tests/test_php.py | 36 +
tests/test_praat.py | 130 +
tests/test_properties.py | 89 +
tests/test_python.py | 113 +
tests/test_qbasiclexer.py | 2 +-
tests/test_regexlexer.py | 2 +-
tests/test_regexopt.py | 36 +-
tests/test_rtf_formatter.py | 2 +-
tests/test_ruby.py | 2 +-
tests/test_shell.py | 57 +-
tests/test_smarty.py | 2 +-
tests/test_sql.py | 74 +
tests/test_string_asserts.py | 2 +-
tests/test_terminal_formatter.py | 55 +-
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 | 2 +-
tests/test_whiley.py | 30 +
tox.ini | 7 -
293 files changed, 11764 insertions(+), 9219 deletions(-)
diff --cc debian/.git-dpm
index 51a4a9e,0000000..82d5616
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
- a8814206e0d8cd8842dd0c634b19e85ed0455300
- a8814206e0d8cd8842dd0c634b19e85ed0455300
- e69a782be13ffbdc263a758c17f1929526a111a9
++b6beafb7d7e6065f8d71cb260bd3cea68581dc43
++b6beafb7d7e6065f8d71cb260bd3cea68581dc43
++dac432c4f2fce948645897f9fa2300f3966b29a0
+dac432c4f2fce948645897f9fa2300f3966b29a0
+pygments_2.2.0+dfsg.orig.tar.gz
+3a30c8ae8a4b5f845521d1147a26f41533071c34
+1098631
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/change_docs_theme.patch
index d744f25,0000000..1edc202
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 a8814206e0d8cd8842dd0c634b19e85ed0455300 Mon Sep 17 00:00:00 2001
++From b6beafb7d7e6065f8d71cb260bd3cea68581dc43 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 Sphinx documentation theme to 'default'
+
+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 51a9161..82ae598 100644
+--- a/doc/conf.py
++++ b/doc/conf.py
+@@ -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