From: JinWang An <jinwang.an@samsung.com>
Date: Tue, 5 Jan 2021 03:17:19 +0000 (+0900)
Subject: Imported Upstream version 2.1.3
X-Git-Tag: upstream/2.1.3^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b916d883180d9fa78d2435ba73a02a45dc1c0290;p=platform%2Fupstream%2Fpython3-pygments.git

Imported Upstream version 2.1.3
---

diff --git a/.hgtags b/.hgtags
index a7e6537..33b32ca 100644
--- 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 aacfef8..478970d 100644
--- 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 bf82a02..4e75234 100644
--- 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 bf82a02..4e75234 100644
--- 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 45c53b8..c623440 100644
--- 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 6a3b381..ad2e2d7 100644
--- 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 03dcffb..3949909 100755
--- 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 bf27673..596f65d 100644
--- a/tests/examplefiles/example.bat
+++ b/tests/examplefiles/example.bat
@@ -99,6 +99,10 @@ goto fail
 rem "comment comment"^
 goto fail
 rem comment comment^
+if "1==1" equ "1==1" goto comments4
+goto fail
+:comments4
+rem comment"comment^
 set /a _passed+=1
 GOTO :EOF
 goto :fail