pygments · tmm1 · Mar 2, 2012 · Feb 9, 2012 · Feb 11, 2012 · Feb 13, 2012
diff --git a/vendor/pygments-main/AUTHORS b/vendor/pygments-main/AUTHORS
@@ -22,12 +22,14 @@ Other contributors, listed alphabetically, are:
 * Frits van Bommel -- assembler lexers
 * Pierre Bourdon -- bugfixes
 * Hiram Chirino -- Scaml and Jade lexers
+* Leaf Corcoran -- MoonScript lexer
 * Christopher Creutzig -- MuPAD lexer
 * Pete Curry -- bugfixes
 * Owen Durni -- haXe lexer
 * Nick Efford -- Python 3 lexer
 * Artem Egorkine -- terminal256 formatter
 * James H. Fisher -- PostScript lexer
+* Carlos Galdino -- Elixir and Elixir Console lexers
 * Naveen Garg -- Autohotkey lexer
 * Laurent Gautier -- R/S lexer
 * Alex Gaynor -- PyPy log lexer
@@ -36,6 +38,7 @@ Other contributors, listed alphabetically, are:
 * Matt Good -- Genshi, Cheetah lexers
 * Patrick Gotthardt -- PHP namespaces support
 * Olivier Guibe -- Asymptote lexer
+* Martin Harriman -- SNOBOL lexer
 * Matthew Harrison -- SVG formatter
 * Steven Hazel -- Tcl lexer
 * Aslak Hellesøy -- Gherkin lexer
@@ -44,18 +47,25 @@ Other contributors, listed alphabetically, are:
 * Varun Hiremath -- Debian control lexer
 * Ben Hollis -- Mason lexer
 * Tim Howard -- BlitzMax lexer
+* Ivan Inozemtsev -- Fantom lexer
 * Dennis Kaarsemaker -- sources.list lexer
+* Igor Kalnitsky -- vhdl lexer
+* Adam Koprowski -- Opa lexer
 * Benjamin Kowarsch -- Modula-2 lexer
 * Marek Kubica -- Scheme lexer
 * Jochen Kupperschmidt -- Markdown processor
 * Gerd Kurzbach -- Modelica lexer
+* Olov Lassus -- Dart lexer
+* Sylvestre Ledru -- Scilab lexer
 * Mark Lee -- Vala lexer
 * Ben Mabey -- Gherkin lexer
 * Simone Margaritelli -- Hybris lexer
 * Kirk McDonald -- D lexer
+* Gordon McGregor -- SystemVerilog lexer
 * Stephen McKamey -- Duel/JBST lexer
 * Brian McKenna -- F# lexer
 * Lukas Meuser -- BBCode formatter, Lua lexer
+* Hong Minhee -- HTTP lexer
 * Michael Mior -- Awk lexer
 * Paulo Moura -- Logtalk lexer
 * Mher Movsisyan -- DTD lexer
@@ -68,7 +78,9 @@ Other contributors, listed alphabetically, are:
 * Ronny Pfannschmidt -- BBCode lexer
 * Benjamin Peterson -- Test suite refactoring
 * Dominik Picheta -- Nimrod lexer
+* Clément Prévost -- UrbiScript lexer
 * Justin Reidy -- MXML lexer
+* Norman Richards -- JSON lexer
 * Lubomir Rintel -- GoodData MAQL and CL lexers
 * Andre Roberge -- Tango style
 * Konrad Rudolph -- LaTeX formatter enhancements
@@ -87,7 +99,9 @@ Other contributors, listed alphabetically, are:
 * Jeremy Thurgood -- Erlang, Squid config lexers
 * Erick Tryzelaar -- Felix lexer
 * Daniele Varrazzo -- PostgreSQL lexers
+* Abe Voelker -- OpenEdge ABL lexer
 * Whitney Young -- ObjectiveC lexer
+* Matthias Vallentin -- Bro lexer
 * Nathan Weizenbaum -- Haml and Sass lexers
 * Dietmar Winkler -- Modelica lexer
 * Nils Winter -- Smalltalk lexer

diff --git a/vendor/pygments-main/CHANGES b/vendor/pygments-main/CHANGES
@@ -6,7 +6,7 @@ http://bitbucket.org/birkenfeld/pygments-main/issues.
 
 Version 1.5
 -----------
-(codename not decided, released Jul xx, 2011)
+(codename not decided, released 2012)
 
 - Lexers added:
 
@@ -20,10 +20,30 @@ Version 1.5
   * Groovy (#501)
   * PostgreSQL (#660)
   * DTD
-  * Gosu
+  * Gosu (#634)
   * Octave (PR#22)
   * Standard ML (PR#14)
   * CFengine3 (#601)
+  * Opa (PR#37)
+  * HTTP sessions (PR#42)
+  * JSON (PR#31)
+  * SNOBOL (PR#30)
+  * MoonScript (PR#43)
+  * ECL (PR#29)
+  * Urbiscript (PR#17)
+  * OpenEdge ABL (PR#27)
+  * SystemVerilog (PR#35)
+  * Coq (#734)
+  * PowerShell (#654)
+  * Dart (#715)
+  * Fantom (PR#36)
+  * Bro (PR#5)
+  * NewLISP (PR#26)
+  * VHDL (PR#45)
+  * Scilab (#740)
+  * Elixir (PR#57)
+
+- Fix Python 3 terminal highlighting with pygmentize (#691).
 
 - In the LaTeX formatter, escape special &, < and > chars (#648).
 
@@ -38,14 +58,25 @@ Version 1.5
 
 - Fix Lua "class" highlighting: it does not have classes (#665).
 
-- Fix degenerate regex in Scala lexer (#671).
+- Fix degenerate regex in Scala lexer (#671) and highlighting bugs (#713, 708).
 
 - Fix number pattern order in Ocaml lexer (#647).
 
 - Fix generic type highlighting in ActionScript 3 (#666).
 
 - Fixes to the Clojure lexer (PR#9).
 
+- Fix degenerate regex in Nemerle lexer (#706).
+
+- Fix infinite looping in CoffeeScript lexer (#729).
+
+- Fix crashes and analysis with ObjectiveC lexer (#693, #696).
+
+- Add some Fortran 2003 keywords.
+
+- Fix Boo string regexes (#679).
+
+- Add "rrt" style (#727).
 
 Version 1.4
 -----------

diff --git a/vendor/pygments-main/Makefile b/vendor/pygments-main/Makefile
@@ -4,7 +4,7 @@
 #
 # Combines scripts for common tasks.
 #
-# :copyright: Copyright 2006-2011 by the Pygments team, see AUTHORS.
+# :copyright: Copyright 2006-2012 by the Pygments team, see AUTHORS.
 # :license: BSD, see LICENSE for details.
 #
 

diff --git a/vendor/pygments-main/docs/generate.py b/vendor/pygments-main/docs/generate.py
@@ -6,7 +6,7 @@
 
     Generates a bunch of html files containing the documentation.
 
-    :copyright: Copyright 2006-2011 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2012 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

diff --git a/vendor/pygments-main/external/markdown-processor.py b/vendor/pygments-main/external/markdown-processor.py
@@ -27,7 +27,7 @@
 
     .. _Markdown: http://www.freewisdom.org/projects/python-markdown/
 
-    :copyright: Copyright 2006-2011 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2012 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

diff --git a/vendor/pygments-main/external/moin-parser.py b/vendor/pygments-main/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-2011 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2012 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

diff --git a/vendor/pygments-main/external/rst-directive-old.py b/vendor/pygments-main/external/rst-directive-old.py
@@ -31,7 +31,7 @@
     .. _directive documentation:
        http://docutils.sourceforge.net/docs/howto/rst-directives.html
 
-    :copyright: Copyright 2006-2011 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2012 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

diff --git a/vendor/pygments-main/external/rst-directive.py b/vendor/pygments-main/external/rst-directive.py
@@ -31,7 +31,7 @@
     .. _directive documentation:
        http://docutils.sourceforge.net/docs/howto/rst-directives.html
 
-    :copyright: Copyright 2006-2011 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2012 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

diff --git a/vendor/pygments-main/pygments/__init__.py b/vendor/pygments-main/pygments/__init__.py
@@ -22,7 +22,7 @@
     .. _Pygments tip:
        http://bitbucket.org/birkenfeld/pygments-main/get/tip.zip#egg=Pygments-dev
 
-    :copyright: Copyright 2006-2011 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2012 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

diff --git a/vendor/pygments-main/pygments/cmdline.py b/vendor/pygments-main/pygments/cmdline.py
@@ -5,7 +5,7 @@
 
     Command line interface.
 
-    :copyright: Copyright 2006-2011 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2012 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 import sys
@@ -408,6 +408,9 @@ def main(args=sys.argv):
                                          None) or 'ascii'
                 fmter.encoding = getattr(sys.stdout, 'encoding',
                                          None) or 'ascii'
+    elif not outfn and sys.version_info > (3,):
+        # output to terminal with encoding -> use .buffer
+        outfile = sys.stdout.buffer
 
     # ... and do it!
     try:

diff --git a/vendor/pygments-main/pygments/console.py b/vendor/pygments-main/pygments/console.py
@@ -5,7 +5,7 @@
 
     Format colored console output.
 
-    :copyright: Copyright 2006-2011 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2012 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

diff --git a/vendor/pygments-main/pygments/filter.py b/vendor/pygments-main/pygments/filter.py
@@ -5,7 +5,7 @@
 
     Module that implements the default filter.
 
-    :copyright: Copyright 2006-2011 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2012 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

diff --git a/vendor/pygments-main/pygments/filters/__init__.py b/vendor/pygments-main/pygments/filters/__init__.py
@@ -6,7 +6,7 @@
     Module containing filter lookup functions and default
     filters.
 
-    :copyright: Copyright 2006-2011 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2012 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

diff --git a/vendor/pygments-main/pygments/formatter.py b/vendor/pygments-main/pygments/formatter.py
@@ -5,7 +5,7 @@
 
     Base formatter class.
 
-    :copyright: Copyright 2006-2011 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2012 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

diff --git a/vendor/pygments-main/pygments/formatters/__init__.py b/vendor/pygments-main/pygments/formatters/__init__.py
@@ -5,7 +5,7 @@
 
     Pygments formatters.
 
-    :copyright: Copyright 2006-2011 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2012 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 import os.path

diff --git a/vendor/pygments-main/pygments/formatters/_mapping.py b/vendor/pygments-main/pygments/formatters/_mapping.py
@@ -9,7 +9,7 @@
 
     Do not alter the FORMATTERS dictionary by hand.
 
-    :copyright: Copyright 2006-2011 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2012 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

diff --git a/vendor/pygments-main/pygments/formatters/bbcode.py b/vendor/pygments-main/pygments/formatters/bbcode.py
@@ -5,7 +5,7 @@
 
     BBcode formatter.
 
-    :copyright: Copyright 2006-2011 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2012 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

diff --git a/vendor/pygments-main/pygments/formatters/html.py b/vendor/pygments-main/pygments/formatters/html.py
@@ -5,7 +5,7 @@
 
     Formatter for HTML output.
 
-    :copyright: Copyright 2006-2011 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2012 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -596,7 +596,7 @@ def _wrap_inlinelinenos(self, inner):
 
     def _wrap_lineanchors(self, inner):
         s = self.lineanchors
-        i = 0
+        i = self.linenostart - 1 # subtract 1 since we have to increment i *before* yielding
         for t, line in inner:
             if t:
                 i += 1

diff --git a/vendor/pygments-main/pygments/formatters/img.py b/vendor/pygments-main/pygments/formatters/img.py
@@ -5,7 +5,7 @@
 
     Formatter for Pixmap output.
 
-    :copyright: Copyright 2006-2011 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2012 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

diff --git a/vendor/pygments-main/pygments/formatters/latex.py b/vendor/pygments-main/pygments/formatters/latex.py
@@ -5,7 +5,7 @@
 
     Formatter for LaTeX fancyvrb output.
 
-    :copyright: Copyright 2006-2011 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2012 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -286,7 +286,8 @@ def get_style_defs(self, arg=''):
         cp = self.commandprefix
         styles = []
         for name, definition in self.cmd2def.iteritems():
-            styles.append(r'\expandafter\def\csname %s@tok@%s\endcsname{%s}' % (cp, name, definition))
+            styles.append(r'\expandafter\def\csname %s@tok@%s\endcsname{%s}' %
+                          (cp, name, definition))
         return STYLE_TEMPLATE % {'cp': self.commandprefix,
                                  'styles': '\n'.join(styles)}
 

diff --git a/vendor/pygments-main/pygments/formatters/other.py b/vendor/pygments-main/pygments/formatters/other.py
@@ -5,7 +5,7 @@
 
     Other formatters: NullFormatter, RawTokenFormatter.
 
-    :copyright: Copyright 2006-2011 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2012 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

diff --git a/vendor/pygments-main/pygments/formatters/rtf.py b/vendor/pygments-main/pygments/formatters/rtf.py
@@ -5,7 +5,7 @@
 
     A formatter that generates RTF files.
 
-    :copyright: Copyright 2006-2011 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2012 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

diff --git a/vendor/pygments-main/pygments/formatters/svg.py b/vendor/pygments-main/pygments/formatters/svg.py
@@ -5,7 +5,7 @@
 
     Formatter for SVG output.
 
-    :copyright: Copyright 2006-2011 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2012 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

diff --git a/vendor/pygments-main/pygments/formatters/terminal.py b/vendor/pygments-main/pygments/formatters/terminal.py
@@ -5,10 +5,12 @@
 
     Formatter for terminal output with ANSI sequences.
 
-    :copyright: Copyright 2006-2011 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2012 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
+import sys
+
 from pygments.formatter import Formatter
 from pygments.token import Keyword, Name, Comment, String, Error, \
      Number, Operator, Generic, Token, Whitespace
@@ -86,7 +88,8 @@ def format(self, tokensource, outfile):
         # hack: if the output is a terminal and has an encoding set,
         # use that to avoid unicode encode problems
         if not self.encoding and hasattr(outfile, "encoding") and \
-           hasattr(outfile, "isatty") and outfile.isatty():
+           hasattr(outfile, "isatty") and outfile.isatty() and \
+           sys.version_info < (3,):
             self.encoding = outfile.encoding
         return Formatter.format(self, tokensource, outfile)