Imported Upstream version 2.1.3

diff --git a/.hgtags b/.hgtags
index a7e6537f1e7fd23b71e48252d9ecc5d82a96e523..33b32ca27a7b79852dcbc230843a64138d69e681 100644 (file)
--- a/.hgtags
+++ b/.hgtags
@@ -28,3 +28,4 @@ ed3206a773e9cb90a0edeabee8ef6b56b5b9a53c 2.0
 34530db252d35d7ef57a8dbb9fce7bcc46f6ba6b 2.1
 2935c3a59672e8ae74ffb7ea66ea6567f49782f6 2.1.1
 8e7ebc56153cf899067333bff4f15ae98758a2e1 2.1.2
+88527db663dce0729c2cd6e3bc2f3c657ae39254 2.1.3

diff --git a/CHANGES b/CHANGES
index aacfef885d701be5012f0d2d5e4483e043b1fc3f..478970ddee26c49fdc7af0e8b7a900ad4cb60803 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,13 @@ Issue numbers refer to the tracker at
 pull request numbers to the requests at
 <https://bitbucket.org/birkenfeld/pygments-main/pull-requests/merged>.
 
+Version 2.1.3
+-------------
+(released Mar 2, 2016)
+
+- Fixed regression in Bash lexer (PR#563)
+
+
 Version 2.1.2
 -------------
 (released Feb 29, 2016)

diff --git a/PKG-INFO b/PKG-INFO
index bf82a0237f525fb01c6c334ff18cea3f850d582b..4e7523494e43513368535642eecd0581a6b8c1a9 100644 (file)
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: Pygments
-Version: 2.1.2
+Version: 2.1.3
 Summary: Pygments is a syntax highlighting package written in Python.
 Home-page: http://pygments.org/
 Author: Georg Brandl

diff --git a/Pygments.egg-info/PKG-INFO b/Pygments.egg-info/PKG-INFO
index bf82a0237f525fb01c6c334ff18cea3f850d582b..4e7523494e43513368535642eecd0581a6b8c1a9 100644 (file)
--- a/Pygments.egg-info/PKG-INFO
+++ b/Pygments.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: Pygments
-Version: 2.1.2
+Version: 2.1.3
 Summary: Pygments is a syntax highlighting package written in Python.
 Home-page: http://pygments.org/
 Author: Georg Brandl

diff --git a/pygments/__init__.py b/pygments/__init__.py
index 45c53b876bbcd9d0c81b83e1ad16b15743b1cbd2..c62344048f0779d8ea501bbbab7f892e238750f5 100644 (file)
--- a/pygments/__init__.py
+++ b/pygments/__init__.py
@@ -26,7 +26,7 @@
     :license: BSD, see LICENSE for details.
 """
 
-__version__ = '2.1.2'
+__version__ = '2.1.3'
 __docformat__ = 'restructuredtext'
 
 __all__ = ['lex', 'format', 'highlight']

diff --git a/pygments/lexers/shell.py b/pygments/lexers/shell.py
index 6a3b38156f9e6d810a397946ae6e036a61567597..ad2e2d7aefd9f896a7c6b566e8d8e2f378a83302 100644 (file)
--- a/pygments/lexers/shell.py
+++ b/pygments/lexers/shell.py
@@ -214,16 +214,16 @@ class BatchLexer(RegexLexer):
                        (_nl, _punct, _ws, _nl))
     _number = r'(?:-?(?:0[0-7]+|0x[\da-f]+|\d+)%s)' % _token_terminator
     _opword = r'(?:equ|geq|gtr|leq|lss|neq)'
-    _string = r'(?:"[^%s"]*"?)' % _nl
+    _string = r'(?:"[^%s"]*(?:"|(?=[%s])))' % (_nl, _nl)
     _variable = (r'(?:(?:%%(?:\*|(?:~[a-z]*(?:\$[^:]+:)?)?\d|'
                  r'[^%%:%s]+(?::(?:~(?:-?\d+)?(?:,(?:-?\d+)?)?|(?:[^%%%s^]|'
                  r'\^[^%%%s])[^=%s]*=(?:[^%%%s^]|\^[^%%%s])*)?)?%%))|'
                  r'(?:\^?![^!:%s]+(?::(?:~(?:-?\d+)?(?:,(?:-?\d+)?)?|(?:'
                  r'[^!%s^]|\^[^!%s])[^=%s]*=(?:[^!%s^]|\^[^!%s])*)?)?\^?!))' %
                  (_nl, _nl, _nl, _nl, _nl, _nl, _nl, _nl, _nl, _nl, _nl, _nl))
-    _core_token = r'(?:(?:(?:\^[%s]?)?[^%s%s%s])+)' % (_nl, _nl, _punct, _ws)
-    _core_token_compound = r'(?:(?:(?:\^[%s]?)?[^%s%s%s)])+)' % (_nl, _nl,
-                                                                 _punct, _ws)
+    _core_token = r'(?:(?:(?:\^[%s]?)?[^"%s%s%s])+)' % (_nl, _nl, _punct, _ws)
+    _core_token_compound = r'(?:(?:(?:\^[%s]?)?[^"%s%s%s)])+)' % (_nl, _nl,
+                                                                  _punct, _ws)
     _token = r'(?:[%s]+|%s)' % (_punct, _core_token)
     _token_compound = r'(?:[%s]+|%s)' % (_punct, _core_token_compound)
     _stoken = (r'(?:[%s]+|(?:%s|%s|%s)+)' %

diff --git a/setup.py b/setup.py
index 03dcffb8c8c4af30686618d90592c54a90b87481..39499090e5ee492bea9a969787c88b5c8f0e4abb 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -54,7 +54,7 @@ else:
 
 setup(
     name = 'Pygments',
-    version = '2.1.2',
+    version = '2.1.3',
     url = 'http://pygments.org/',
     license = 'BSD License',
     author = 'Georg Brandl',

diff --git a/tests/examplefiles/example.bat b/tests/examplefiles/example.bat
index bf27673c1d6ea1eb5b004df994741a1ac3102b2d..596f65de32bb41e9fcb1d3dad06f4709fa18370d 100644 (file)
--- a/tests/examplefiles/example.bat
+++ b/tests/examplefiles/example.bat
@@ -99,6 +99,10 @@ goto fail
 rem "comment comment"^\r
 goto fail\r
 rem comment comment^\r
+if "1==1" equ "1==1" goto comments4\r
+goto fail\r
+:comments4\r
+rem comment"comment^\r
 set /a _passed+=1\r
 GOTO :EOF\r
 goto :fail\r