[svn] removed mokuwiki and trypy. now part of the mitsuhiko trac to keep the repo here clean

5 files changed, 17 insertions, 2 deletions

diff --git a/TODO b/TODO
index f8cd3848..74f39160 100644
--- a/TODO
+++ b/TODO
@@ -20,6 +20,7 @@ for 0.7
   * Objective C
   * MySQL/PostgreSQL/SQLite
   * Tcl
+  * reStructuredText
 
 - automatically get help for lexers/formatters/options from docstrings
 
diff --git a/pygments/lexers/_mapping.py b/pygments/lexers/_mapping.py
index 0688ef11..fe5e28bf 100644
--- a/pygments/lexers/_mapping.py
+++ b/pygments/lexers/_mapping.py
@@ -62,6 +62,7 @@ LEXERS = {
     'PythonLexer': ('pygments.lexers.agile', 'Python', ('python', 'py'), ('*.py', '*.pyw'), ('text/x-python', 'application/x-python')),
     'RawTokenLexer': ('pygments.lexers.special', 'Raw token data', ('raw',), ('*.raw',), ('application/x-pygments-tokens',)),
     'RhtmlLexer': ('pygments.lexers.templates', 'RHTML', ('rhtml', 'html+erb', 'html+ruby'), ('*.rhtml',), ()),
+    'RstLexer': ('pygments.lexers.text', 'reStructuredText', ('rst', 'restructuredtext'), ('*.rst',), ()),
     'RubyConsoleLexer': ('pygments.lexers.agile', 'Ruby irb session', ('rbcon', 'irb'), (), ()),
     'RubyLexer': ('pygments.lexers.agile', 'Ruby', ('rb', 'ruby'), ('*.rb', '*.rbw', 'Rakefile', '*.rake', '*.gemspec', '*.rbx'), ('text/x-ruby', 'application/x-ruby')),
     'SchemeLexer': ('pygments.lexers.agile', 'Scheme', ('scheme',), ('*.scm',), ('text/x-scheme', 'application/x-scheme')),
diff --git a/pygments/lexers/text.py b/pygments/lexers/text.py
index 16abed89..64b47195 100644
--- a/pygments/lexers/text.py
+++ b/pygments/lexers/text.py
@@ -12,14 +12,19 @@
 """
 
 import re
+try:
+    set
+except NameError:
+    from sets import Set as set
 
-from pygments.lexer import RegexLexer, bygroups, include
+from pygments.lexer import Lexer, RegexLexer, bygroups, include
 from pygments.token import Punctuation, \
     Text, Comment, Keyword, Name, String, Generic, Operator, Number
 
 
 __all__ = ['IniLexer', 'MakefileLexer', 'DiffLexer', 'IrcLogsLexer',
-           'TexLexer', 'GroffLexer', 'ApacheConfLexer', 'BBCodeLexer']
+           'TexLexer', 'GroffLexer', 'ApacheConfLexer', 'BBCodeLexer',
+           'RstLexer']
 
 
 class IniLexer(RegexLexer):
@@ -306,3 +311,9 @@ class ApacheConfLexer(RegexLexer):
             (r'[^\s"]+', Text)
         ]
     }
+
+
+class RstLexer(RegexLexer):
+    name = 'reStructuredText'
+    aliases = ['rst', 'restructuredtext']
+    filenames = ['*.rst']
diff --git a/pygments/lexers/web.py b/pygments/lexers/web.py
index 83552746..9ae674cb 100644
--- a/pygments/lexers/web.py
+++ b/pygments/lexers/web.py
@@ -37,6 +37,7 @@ class JavascriptLexer(RegexLexer):
     tokens = {
         'root': [
             (r'\s+', Text),
+            (r'<!--', Comment),
             (r'//.*?\n', Comment),
             (r'/\*.*?\*/', Comment),
             (r'/(\\\\|\\/|[^/\n])*/[gim]*', String.Regex),
diff --git a/pygments/token.py b/pygments/token.py
index 64c67be4..f0b6f8c9 100644
--- a/pygments/token.py
+++ b/pygments/token.py
@@ -142,6 +142,7 @@ STANDARD_TYPES = {
     Comment.Multiline:             'cm',
     Comment.Preproc:               'cp',
     Comment.Single:                'c1',
+    Comment.Special:               'cs',
 
     Generic:                       'g',
     Generic.Deleted:               'gd',