summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2019-11-27 06:38:55 +0100
committerGeorg Brandl <georg@python.org>2019-11-27 06:38:55 +0100
commitb45777fd2713bc3c6b80680168563afa5c96b46d (patch)
treeb672764662569c0e782ae7190d4644a08ac3ee9b
parent90f6fa9023bd4e159ea72f5780b34630c325362d (diff)
downloadpygments-git-b45777fd2713bc3c6b80680168563afa5c96b46d.tar.gz
recognize escapes in Matlab double quoted strings
-rw-r--r--CHANGES6
-rw-r--r--pygments/lexers/matlab.py2
2 files changed, 7 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index a8ae5df5..7e5e87e1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,12 +10,18 @@ Version 2.5.2
-------------
(not released yet)
+- Fix lexing of ReST field lists (PR#1279)
+- Fix lexing of Matlab keywords as field names (PR#1282)
+- Recognize double-quoted strings in Matlab (PR#1278)
+
+
Version 2.5.1
-------------
(released November 26, 2019)
- This release fixes a packaging issue. No functional changes.
+
Version 2.5.0
-------------
(released November 26, 2019)
diff --git a/pygments/lexers/matlab.py b/pygments/lexers/matlab.py
index 6c91f2d0..64dd3a3c 100644
--- a/pygments/lexers/matlab.py
+++ b/pygments/lexers/matlab.py
@@ -124,7 +124,7 @@ class MatlabLexer(RegexLexer):
# (not great, but handles common cases...)
(r'(?<=[\w)\].])\'+', Operator),
- (r'"[^"]*"', String),
+ (r'"(""|[^"])*"', String),
(r'(?<![\w)\].])\'', String, 'string'),
(r'[a-zA-Z_]\w*', Name),