diff options
| author | Tim Hatch <tim@timhatch.com> | 2015-10-16 07:58:40 -0700 |
|---|---|---|
| committer | Tim Hatch <tim@timhatch.com> | 2015-10-16 07:58:40 -0700 |
| commit | 3462d42d897351070e3003b7d686a61a5ec5ad3d (patch) | |
| tree | 9f04ef9ec621a773db35337239c43eed71ad9937 /external | |
| parent | 1dd59da29be1cc8a3c47dff4f03452f76595070f (diff) | |
| parent | a18b96f18b2bc421f9172a42982e22f5149ac432 (diff) | |
| download | pygments-3462d42d897351070e3003b7d686a61a5ec5ad3d.tar.gz | |
Merged in EricFromCanada/pygments-main (pull request #417)
Update Lasso lexer with fixes for edge cases and reordered builtins list
Diffstat (limited to 'external')
| -rwxr-xr-x | external/autopygmentize | 10 | ||||
| -rw-r--r-- | external/markdown-processor.py | 2 | ||||
| -rw-r--r-- | external/moin-parser.py | 2 | ||||
| -rw-r--r-- | external/rst-directive.py | 2 |
4 files changed, 9 insertions, 7 deletions
diff --git a/external/autopygmentize b/external/autopygmentize index 964c138f..d2f969a1 100755 --- a/external/autopygmentize +++ b/external/autopygmentize @@ -1,6 +1,6 @@ #!/bin/bash # Best effort auto-pygmentization with transparent decompression -# (c) Reuben Thomas 2012-2013 +# by Reuben Thomas 2008-2015 # This program is in the public domain. # Strategy: first see if pygmentize can find a lexer; if not, ask file; if that finds nothing, fail @@ -18,6 +18,7 @@ if [[ "$lexer" == text ]]; then unset lexer case $(file --mime-type --uncompress $file_common_opts "$file") in application/xml|image/svg+xml) lexer=xml;; + application/javascript) lexer=javascript;; text/html) lexer=html;; text/troff) lexer=nroff;; text/x-asm) lexer=nasm;; @@ -43,11 +44,13 @@ if [[ "$lexer" == text ]]; then text/x-tcl) lexer=tcl;; text/x-tex|text/x-texinfo) lexer=latex;; # FIXME: texinfo really needs its own lexer - # Types that file outputs which pygmentize didn't support as of file 5.11, pygments 1.6rc1 + # Types that file outputs which pygmentize didn't support as of file 5.20, pygments 2.0 # text/calendar + # text/inf # text/PGP # text/rtf # text/texmacs + # text/vnd.graphviz # text/x-bcpl # text/x-info # text/x-m4 @@ -74,8 +77,7 @@ if [[ -n "$lexer" ]]; then application/x-bzip2) concat=bzcat;; application/x-xz) concat=xzcat;; esac - # FIXME: Specify input encoding rather than output encoding https://bitbucket.org/birkenfeld/pygments-main/issue/800 - exec $concat "$file" | pygmentize -f terminal256 -O style=native,encoding=$encoding,outencoding=UTF-8 $PYGMENTIZE_OPTS $options -l $lexer + exec $concat "$file" | pygmentize -O inencoding=$encoding $PYGMENTIZE_OPTS $options -l $lexer fi exit 1 diff --git a/external/markdown-processor.py b/external/markdown-processor.py index 2a92a40e..a3e178ec 100644 --- a/external/markdown-processor.py +++ b/external/markdown-processor.py @@ -22,7 +22,7 @@ .. _Markdown: https://pypi.python.org/pypi/Markdown - :copyright: Copyright 2006-2014 by the Pygments team, see AUTHORS. + :copyright: Copyright 2006-2015 by the Pygments team, see AUTHORS. :license: BSD, see LICENSE for details. """ diff --git a/external/moin-parser.py b/external/moin-parser.py index 41131185..9cb082a2 100644 --- a/external/moin-parser.py +++ b/external/moin-parser.py @@ -31,7 +31,7 @@ If you do not want to do that and are willing to accept larger HTML output, you can set the INLINESTYLES option below to True. - :copyright: Copyright 2006-2014 by the Pygments team, see AUTHORS. + :copyright: Copyright 2006-2015 by the Pygments team, see AUTHORS. :license: BSD, see LICENSE for details. """ diff --git a/external/rst-directive.py b/external/rst-directive.py index 8ce150c4..f81677b6 100644 --- a/external/rst-directive.py +++ b/external/rst-directive.py @@ -31,7 +31,7 @@ .. _directive documentation: http://docutils.sourceforge.net/docs/howto/rst-directives.html - :copyright: Copyright 2006-2014 by the Pygments team, see AUTHORS. + :copyright: Copyright 2006-2015 by the Pygments team, see AUTHORS. :license: BSD, see LICENSE for details. """ |