summaryrefslogtreecommitdiff
path: root/pygments/lexers/math.py
diff options
context:
space:
mode:
authormitsuhiko <devnull@localhost>2008-05-07 12:13:20 +0200
committermitsuhiko <devnull@localhost>2008-05-07 12:13:20 +0200
commit8fd8882818a020d8e5b39bb7ca31297ade34dd41 (patch)
treed892db85a59b363d63471883652ad22943e9b9ff /pygments/lexers/math.py
parent78f23152429c3c09c7721c38a49d1df6c0ec4bc0 (diff)
parentbea7b882efa3e67cf6b5e9e38fa55f15c7eb7e26 (diff)
downloadpygments-8fd8882818a020d8e5b39bb7ca31297ade34dd41.tar.gz
Automated merge with ssh://team@pocoo.org/pygments-main
Diffstat (limited to 'pygments/lexers/math.py')
-rw-r--r--pygments/lexers/math.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/pygments/lexers/math.py b/pygments/lexers/math.py
index 00ba9e58..cf628c04 100644
--- a/pygments/lexers/math.py
+++ b/pygments/lexers/math.py
@@ -102,7 +102,7 @@ class MatlabLexer(RegexLexer):
For Matlab (or GNU Octave) source code.
Contributed by Ken Schutte <kschutte@csail.mit.edu>.
- *New in Pygments 1.0.*
+ *New in Pygments 0.10.*
"""
name = 'Matlab'
aliases = ['matlab', 'octave']
@@ -198,7 +198,7 @@ class MatlabSessionLexer(Lexer):
For Matlab (or GNU Octave) sessions. Modeled after PythonConsoleLexer.
Contributed by Ken Schutte <kschutte@csail.mit.edu>.
- *New in Pygments 1.0.*
+ *New in Pygments 0.10.*
"""
name = 'Matlab session'
aliases = ['matlabsession']
@@ -246,7 +246,7 @@ class NumPyLexer(PythonLexer):
'''
A Python lexer recognizing Numerical Python builtins.
- *New in Pygments 1.0.*
+ *New in Pygments 0.10.*
'''
name = 'NumPy'
@@ -332,7 +332,7 @@ class SLexer(RegexLexer):
"""
For S, S-plus, and R source code.
- *New in Pygments 1.0.*
+ *New in Pygments 0.10.*
"""
name = 'S'
@@ -352,7 +352,8 @@ class SLexer(RegexLexer):
(r'\[|\]|\[\[|\]\]|\$|\(|\)|@|:::?|;|,', Punctuation),
],
'keywords': [
- (r'for(?=\s*\()|while(?=\s*\()|if(?=\s*\()|(?<=\s)else|(?<=\s)break(?=;|$)',
+ (r'for(?=\s*\()|while(?=\s*\()|if(?=\s*\()|(?<=\s)else|'
+ r'(?<=\s)break(?=;|$)|return(?=\s*\()|function(?=\s*\()',
Keyword.Reserved)
],
'operators': [