IPythonWidget now supports styling the syntax highlighting.

IPython/frontend/qt/console/ipython_widget.py

@@ -41,7 +41,7 class IPythonWidget(FrontendWidget):
         self._prompt_count = 0
 
         # Set a default stylesheet.
-        self.reset_style_sheet()
+        self.reset_styling()
 
     #---------------------------------------------------------------------------
     # 'FrontendWidget' interface
@@ -106,17 +106,35 class IPythonWidget(FrontendWidget):
     # 'IPythonWidget' interface
     #---------------------------------------------------------------------------
 
-    def reset_style_sheet(self):
-        """ Sets the style sheet to the default style sheet.
+    def reset_styling(self):
+        """ Restores the default IPythonWidget styling.
         """
-        self.set_style_sheet(self.default_stylesheet)
-
-    def set_style_sheet(self, stylesheet):
-        """ Sets the style sheet.
+        self.set_styling(self.default_stylesheet, syntax_style='default')
+        #self.set_styling(self.dark_stylesheet, syntax_style='monokai')
+
+    def set_styling(self, stylesheet, syntax_style=None):
+        """ Sets the IPythonWidget styling.
+
+        Parameters:
+        -----------
+        stylesheet : str
+            A CSS stylesheet. The stylesheet can contain classes for:
+                1. Qt: QPlainTextEdit, QFrame, QWidget, etc
+                2. Pygments: .c, .k, .o, etc (see PygmentsHighlighter)
+                3. IPython: .error, .in-prompt, .out-prompt, etc.
+
+        syntax_style : str or None [default None]
+            If specified, use the Pygments style with given name. Otherwise, 
+            the stylesheet is queried for Pygments style information.
         """
         self.setStyleSheet(stylesheet)
         self.document().setDefaultStyleSheet(stylesheet)
 
+        if syntax_style is None:
+            self._highlighter.set_style_sheet(stylesheet)
+        else:
+            self._highlighter.set_style(syntax_style)
+
 
 if __name__ == '__main__':
     from IPython.frontend.qt.kernelmanager import QtKernelManager

IPython/frontend/qt/console/pygments_highlighter.py

@@ -1,9 +1,9
 # System library imports.
 from PyQt4 import QtGui
+from pygments.formatters.html import HtmlFormatter
 from pygments.lexer import RegexLexer, _TokenType, Text, Error
 from pygments.lexers import PythonLexer
-from pygments.styles.default import DefaultStyle
-from pygments.token import Comment
+from pygments.styles import get_style_by_name
 
 
 def get_tokens_unprocessed(self, text, stack=('root',)):
@@ -87,20 +87,23 class PygmentsBlockUserData(QtGui.QTextBlockUserData):
 class PygmentsHighlighter(QtGui.QSyntaxHighlighter):
     """ Syntax highlighter that uses Pygments for parsing. """
 
+    #---------------------------------------------------------------------------
+    # 'QSyntaxHighlighter' interface
+    #---------------------------------------------------------------------------
+
     def __init__(self, parent, lexer=None):
         super(PygmentsHighlighter, self).__init__(parent)
 
+        self._document = QtGui.QTextDocument()
+        self._formatter = HtmlFormatter(nowrap=True)
         self._lexer = lexer if lexer else PythonLexer()
-        self._style = DefaultStyle
-        # Caches for formats and brushes.
-        self._brushes = {}
-        self._formats = {}
+        self.set_style('default')
 
     def highlightBlock(self, qstring):
         """ Highlight a block of text.
         """
         qstring = unicode(qstring)
-        prev_data = self.previous_block_data()
+        prev_data = self.currentBlock().previous().userData()
 
         if prev_data is not None:
             self._lexer._saved_state_stack = prev_data.syntax_stack
@@ -123,18 +126,67 class PygmentsHighlighter(QtGui.QSyntaxHighlighter):
             # Clean up for the next go-round.
             del self._lexer._saved_state_stack
 
-    def previous_block_data(self):
-        """ Convenience method for returning the previous block's user data.
+    #---------------------------------------------------------------------------
+    # 'PygmentsHighlighter' interface
+    #---------------------------------------------------------------------------
+
+    def set_style(self, style):
+        """ Sets the style to the specified Pygments style.
+        """
+        if isinstance(style, basestring):
+            style = get_style_by_name(style)
+        self._style = style
+        self._clear_caches()
+
+    def set_style_sheet(self, stylesheet):
+        """ Sets a CSS stylesheet. The classes in the stylesheet should
+        correspond to those generated by:
+
+            pygmentize -S <style> -f html
+
+        Note that 'set_style' and 'set_style_sheet' completely override each
+        other, i.e. they cannot be used in conjunction.
+        """
+        self._document.setDefaultStyleSheet(stylesheet)
+        self._style = None
+        self._clear_caches()
+
+    #---------------------------------------------------------------------------
+    # Protected interface
+    #---------------------------------------------------------------------------
+
+    def _clear_caches(self):
+        """ Clear caches for brushes and formats.
         """
-        return self.currentBlock().previous().userData()
+        self._brushes = {}
+        self._formats = {}
 
     def _get_format(self, token):
         """ Returns a QTextCharFormat for token or None.
         """
         if token in self._formats:
             return self._formats[token]
+
+        if self._style is None:
+            result = self._get_format_from_document(token, self._document)
+        else:
+            result = self._get_format_from_style(token, self._style)
+
+        self._formats[token] = result
+        return result
+
+    def _get_format_from_document(self, token, document):
+        """ Returns a QTextCharFormat for token by 
+        """
+        code, html = self._formatter._format_lines([(token, 'dummy')]).next()
+        self._document.setHtml(html)
+        return QtGui.QTextCursor(self._document).charFormat()
+
+    def _get_format_from_style(self, token, style):
+        """ Returns a QTextCharFormat for token by reading a Pygments style.
+        """
         result = None
-        for key, value in self._style.style_for_token(token).items():
+        for key, value in style.style_for_token(token).items():
             if value:
                 if result is None:
                     result = QtGui.QTextCharFormat()
@@ -155,13 +207,6 class PygmentsHighlighter(QtGui.QSyntaxHighlighter):
                     result.setFontStyleHint(QtGui.QFont.Times)
                 elif key == 'mono':
                     result.setFontStyleHint(QtGui.QFont.TypeWriter)
-                elif key == 'border':
-                    # Borders are normally used for errors. We can't do a border
-                    # so instead we do a wavy underline
-                    result.setUnderlineStyle(
-                        QtGui.QTextCharFormat.WaveUnderline)
-                    result.setUnderlineColor(self._get_color(value))
-        self._formats[token] = result
         return result
 
     def _get_brush(self, color):