summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-01-30 19:44:18 +0100
committerGeorg Brandl <georg@python.org>2010-01-30 19:44:18 +0100
commitbc120d761ac1865632dd2b3a259b301662a1a6ab (patch)
tree4884a2a578adee8eae4d9a287ebd00e8042e4cf3
parent9d89919df45baa70742b5aa4727ee3d90ced23a8 (diff)
downloadpygments-bc120d761ac1865632dd2b3a259b301662a1a6ab.tar.gz
Haml/Sass lexers: add "new in", changelog and authors entry.
-rw-r--r--AUTHORS1
-rw-r--r--CHANGES1
-rw-r--r--pygments/lexers/web.py19
3 files changed, 16 insertions, 5 deletions
diff --git a/AUTHORS b/AUTHORS
index f8a6adfe..6e96d014 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -61,6 +61,7 @@ Other contributors, listed alphabetically, are:
* Jeremy Thurgood -- Erlang, Squid config lexers
* Erick Tryzelaar -- Felix lexer
* Whitney Young -- ObjectiveC lexer
+* Nathan Weizenbaum -- Haml and Sass lexers
* Dietmar Winkler -- Modelica lexer
* Nils Winter -- Smalltalk lexer
* Davy Wybiral -- Clojure lexer
diff --git a/CHANGES b/CHANGES
index e239a632..48560e3d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -13,6 +13,7 @@ Version 1.3
* haXe
* R console
* Objective-J
+ * Haml and Sass
Version 1.2.2
diff --git a/pygments/lexers/web.py b/pygments/lexers/web.py
index f2322162..661f3b54 100644
--- a/pygments/lexers/web.py
+++ b/pygments/lexers/web.py
@@ -1204,6 +1204,8 @@ def _starts_block(token, state):
class HamlLexer(ExtendedRegexLexer):
"""
For Haml markup.
+
+ *New in Pygments 1.3.*
"""
name = 'Haml'
@@ -1242,12 +1244,15 @@ class HamlLexer(ExtendedRegexLexer):
(r'(/)(\[' + _dot + '*?\])(' + _dot + '*\n)',
bygroups(Comment, Comment.Special, Comment),
'#pop'),
- (r'/' + _dot + '*\n', _starts_block(Comment, 'html-comment-block'), '#pop'),
- (r'-#' + _dot + '*\n', _starts_block(Comment.Preproc, 'haml-comment-block'), '#pop'),
+ (r'/' + _dot + '*\n', _starts_block(Comment, 'html-comment-block'),
+ '#pop'),
+ (r'-#' + _dot + '*\n', _starts_block(Comment.Preproc,
+ 'haml-comment-block'), '#pop'),
(r'(-)(' + _dot + '*\n)',
bygroups(Punctuation, using(RubyLexer)),
'#pop'),
- (r':' + _dot + '*\n', _starts_block(Name.Decorator, 'filter-block'), '#pop'),
+ (r':' + _dot + '*\n', _starts_block(Name.Decorator, 'filter-block'),
+ '#pop'),
include('eval-or-plain'),
],
@@ -1306,6 +1311,8 @@ class HamlLexer(ExtendedRegexLexer):
class SassLexer(ExtendedRegexLexer):
"""
For Sass stylesheets.
+
+ *New in Pygments 1.3.*
"""
name = 'Sass'
@@ -1321,8 +1328,10 @@ class SassLexer(ExtendedRegexLexer):
],
'content': [
- (r'//[^\n]*', _starts_block(Comment.Single, 'single-comment'), 'root'),
- (r'/\*[^\n]*', _starts_block(Comment.Multiline, 'multi-comment'), 'root'),
+ (r'//[^\n]*', _starts_block(Comment.Single, 'single-comment'),
+ 'root'),
+ (r'/\*[^\n]*', _starts_block(Comment.Multiline, 'multi-comment'),
+ 'root'),
(r'@import', Keyword, 'import'),
(r'@for', Keyword, 'for'),
(r'@(debug|if|while)', Keyword, 'script'),