diff options
| -rw-r--r-- | CHANGES | 20 | ||||
| -rw-r--r-- | pygments/formatters/img.py | 6 | ||||
| -rw-r--r-- | pygments/lexers/compiled.py | 4 | ||||
| -rw-r--r-- | pygments/lexers/functional.py | 4 | ||||
| -rw-r--r-- | pygments/lexers/other.py | 6 | ||||
| -rw-r--r-- | pygments/lexers/text.py | 4 |
6 files changed, 22 insertions, 22 deletions
@@ -5,6 +5,13 @@ Version 1.1 ----------- (codename not selected, released XXX YY, 2009) +- Lexers added: + + * GLSL (#369) + * Erlang shell + * (Ba)sh shell (#349) + * Prolog (#373) + - Fix a bug lexing extended Ruby strings. - Fix a bug when lexing git diffs. @@ -13,20 +20,13 @@ Version 1.1 - Support multiline strings in Lua lexer. -- Fix a Perl heredoc bug (#729) +- Fix a Perl heredoc bug (#729). -- Fix a bug in the image formatter which misdetected lines (#380) +- Fix a bug in the image formatter which misdetected lines (#380). - When pygmentize is asked to highlight a file for which multiple lexers match the filename, use the analyse_text guessing engine to determine the - winner. (#355) - -- Lexers added: - - * GLSL (#369) - * Erlang shell - * (Ba)sh shell (#349) - * Prolog (#373) + winner (#355). Version 1.0 diff --git a/pygments/formatters/img.py b/pygments/formatters/img.py index 7c343fd7..6dd1d9cc 100644 --- a/pygments/formatters/img.py +++ b/pygments/formatters/img.py @@ -395,9 +395,9 @@ class ImageFormatter(Formatter): while ttype not in self.styles: ttype = ttype.parent style = self.styles[ttype] - #TODO make sure tab expansion happens earlier in the chain. It - #really ought to be done on the input, as to do it right here is - #quite complex. + # TODO: make sure tab expansion happens earlier in the chain. It + # really ought to be done on the input, as to do it right here is + # quite complex. value = value.expandtabs(4) lines = value.splitlines(True) #print lines diff --git a/pygments/lexers/compiled.py b/pygments/lexers/compiled.py index 768bdf88..bd8fbc26 100644 --- a/pygments/lexers/compiled.py +++ b/pygments/lexers/compiled.py @@ -5,7 +5,7 @@ Lexers for compiled languages. - :copyright: 2006-2008 by Georg Brandl, Armin Ronacher, Christoph Hack, + :copyright: 2006-2009 by Georg Brandl, Armin Ronacher, Christoph Hack, Whitney Young, Kirk McDonald, Stou Sandalski, Krzysiek Goj. :license: BSD, see LICENSE for more details. """ @@ -1299,7 +1299,7 @@ class GLShaderLexer(RegexLexer): """ GLSL (OpenGL Shader) lexer. - *New in Pygments 1.1* + *New in Pygments 1.1.* """ name = 'GLSL' aliases = ['glsl'] diff --git a/pygments/lexers/functional.py b/pygments/lexers/functional.py index aa9b9678..2f3a45f2 100644 --- a/pygments/lexers/functional.py +++ b/pygments/lexers/functional.py @@ -5,7 +5,7 @@ Lexers for functional languages. - :copyright: 2006-2008 by Georg Brandl, Marek Kubica, + :copyright: 2006-2009 by Georg Brandl, Marek Kubica, Adam Blinkinsop <blinks@acm.org>, Matteo Sasso. :license: BSD, see LICENSE for more details. """ @@ -719,7 +719,7 @@ class ErlangShellLexer(Lexer): """ Shell sessions in erl (for Erlang code). - *New in Pygments 1.1* + *New in Pygments 1.1.* """ name = 'Erlang erl session' aliases = ['erl'] diff --git a/pygments/lexers/other.py b/pygments/lexers/other.py index dec4b0ba..2b1eafaa 100644 --- a/pygments/lexers/other.py +++ b/pygments/lexers/other.py @@ -5,7 +5,7 @@ Lexers for other languages. - :copyright: 2006-2008 by Georg Brandl, Tim Hatch <tim@timhatch.com>, + :copyright: 2006-2009 by Georg Brandl, Tim Hatch <tim@timhatch.com>, Stou Sandalski, Paulo Moura, Clara Dimene, Andreas Amann <aamann@mac.com>. :license: BSD, see LICENSE for more details. @@ -400,7 +400,7 @@ class BashSessionLexer(Lexer): """ Lexer for simplistic shell sessions. - *New in Pygments 1.1* + *New in Pygments 1.1.* """ name = 'Bash Session' @@ -1207,7 +1207,7 @@ class PovrayLexer(RegexLexer): r'light_source|merge|mesh|object|plane|poly|polygon|prism|' r'quadric|quartic|smooth_triangle|sor|sphere|superellipsoid|' r'text|torus|triangle|union', Name.Builtin), - #TODO: <=, etc + # TODO: <=, etc (r'[\[\](){}<>;,]', Punctuation), (r'[-+*/=]', Operator), (r'\b(x|y|z|u|v)\b', Name.Builtin.Pseudo), diff --git a/pygments/lexers/text.py b/pygments/lexers/text.py index 75a90bb0..e098c0fa 100644 --- a/pygments/lexers/text.py +++ b/pygments/lexers/text.py @@ -5,7 +5,7 @@ Lexers for non-source code file types. - :copyright: 2006-2008 by Armin Ronacher, Georg Brandl, + :copyright: 2006-2009 by Armin Ronacher, Georg Brandl, Tim Hatch <tim@timhatch.com>, Ronny Pfannschmidt, Dennis Kaarsemaker, @@ -184,7 +184,7 @@ class BaseMakefileLexer(RegexLexer): # targets (r'([^\n:]+)(:+)([ \t]*)', bygroups(Name.Function, Operator, Text), 'block-header'), - #TODO: add paren handling (grr) + # TODO: add paren handling (grr) ], 'export': [ (r'[a-zA-Z0-9_${}-]+', Name.Variable), |