move Ansi related filters to ansi.py

nbconvert/filters/ansi.py

@@ -1,97 +1,138 b''
 """Filters for processing ANSI colors within Jinja templates.
 """
 #-----------------------------------------------------------------------------
 # Copyright (c) 2013, the IPython Development Team.
 #
 # Distributed under the terms of the Modified BSD License.
 #
 # The full license is in the file COPYING.txt, distributed with this software.
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
 # Imports
 #-----------------------------------------------------------------------------
 
 import re
 
 #-----------------------------------------------------------------------------
 # Classes and functions
 #-----------------------------------------------------------------------------
 
 def remove_ansi(source):
     """
     Remove ansi from text
     
     Parameters
     ----------
     source : str
         Source to remove the ansi from
     """
     
     return re.sub(r'\033\[(0|\d;\d\d)m', '', source)
 
 
 def ansi2html(text):
     """
     Conver ansi colors to html colors.
     
     Parameters
     ----------
     text : str
         Text containing ansi colors to convert to html
     """
     
     ansi_colormap = {
         '30': 'ansiblack',
         '31': 'ansired',
         '32': 'ansigreen',
         '33': 'ansiyellow',
         '34': 'ansiblue',
         '35': 'ansipurple',
         '36': 'ansicyan',
         '37': 'ansigrey',
         '01': 'ansibold',
     }
 
     # do ampersand first
     text = text.replace('&', '&')
     html_escapes = {
         '<': '&lt;',
         '>': '&gt;',
         "'": '&apos;',
         '"': '&quot;',
         '`': '&#96;',
     }
     
     for c, escape in html_escapes.iteritems():
         text = text.replace(c, escape)
 
     ansi_re = re.compile('\x1b' + r'\[([\dA-Fa-f;]*?)m')
     m = ansi_re.search(text)
     opened = False
     cmds = []
     opener = ''
     closer = ''
     while m:
         cmds = m.groups()[0].split(';')
         closer = '</span>' if opened else ''
         
         # True if there is there more than one element in cmds, *or*
         # if there is only one but it is not equal to a string of zeroes.
         opened = len(cmds) > 1 or cmds[0] != '0' * len(cmds[0])
         classes = []
         for cmd in cmds:
             if cmd in ansi_colormap:
                 classes.append(ansi_colormap.get(cmd))
 
         if classes:
             opener = '<span class="%s">' % (' '.join(classes))
         else:
             opener = ''
         text = re.sub(ansi_re, closer + opener, text, 1)
 
         m = ansi_re.search(text)
 
     if opened:
         text += '</span>'
     return text
+
+
+def single_ansi2latex(code):
+    """Converts single ansi markup to latex format
+
+    Return latex code and number of open brackets.
+    """
+    for color in coloransi.color_templates:
+        colcode = getattr(coloransi.TermColors,color[0])
+        # regular fonts
+        if code == colcode:
+            return '\\'+color[0].lower()+'{', 1
+        # bold fonts
+        if code == colcode[:3]+str(1)+colcode[3:]:
+            return '\\textbf{\\textcolor{'+color[0].lower()+'}{', 2
+    return '', 0
+
+def ansi2latex(text):
+    """Converts ansi formated text to latex version
+
+    based on https://bitbucket.org/birkenfeld/sphinx-contrib/ansi.py
+    """
+    color_pattern = re.compile('\x1b\\[([^m]+)m')
+    last_end = 0
+    openbrack = 0
+    outstring = ''
+    for match in color_pattern.finditer(text):
+        head = text[last_end:match.start()]
+        formater = match.group()
+        outstring += head
+        if openbrack:
+            outstring += '}'*openbrack
+            openbrack = 0
+        if match.group() <> coloransi.TermColors.Normal and not openbrack:
+            texform, openbrack = single_ansi2latex(match.group())
+            outstring += texform
+        last_end = match.end()
+    if openbrack: 
+        outstring += '}'*openbrack
+    outstring += text[last_end:]
+    return outstring.strip()

nbconvert/filters/strings.py

@@ -1,151 +1,105 b''
 """String filters.
 
 Contains a collection of useful string manipulation filters for use in Jinja
 templates.
 """
 #-----------------------------------------------------------------------------
 # Copyright (c) 2013, the IPython Development Team.
 #
 # Distributed under the terms of the Modified BSD License.
 #
 # The full license is in the file COPYING.txt, distributed with this software.
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
 # Imports
 #-----------------------------------------------------------------------------
 import re
 
 # Our own imports
 import textwrap
 from IPython.utils import coloransi
 #-----------------------------------------------------------------------------
 # Functions
 #-----------------------------------------------------------------------------
 
 def wrap(text, width=100):
     """ 
     Intelligently wrap text.
     Wrap text without breaking words if possible.
     
     Parameters
     ----------
     text : str
         Text to wrap.
     width : int, optional
         Number of characters to wrap to, default 100.
     """
 
     split_text = text.split('\n')
     wrp = map(lambda x:textwrap.wrap(x,width), split_text)
     wrpd = map('\n'.join, wrp)
     return '\n'.join(wrpd)
 
 
 def strip_dollars(text):
     """
     Remove all dollar symbols from text
     
     Parameters
     ----------
     text : str
         Text to remove dollars from
     """
 
     return text.strip('$')
 
-def add_ansi_attr(ansistr, attr):
-    """Adds the attribute key to the ansi colors defined
-    with IPython.utils.ansicolors. Allows to boldface
-    the dark characters.
-    """
-    return ansistr[:3]+str(attr)+ansistr[3:]
-
-def single_ansi2latex(code):
-    """Converts single ansi markup to latex format
-
-    Return latex code and number of open brackets.
-    """
-    for color in coloransi.color_templates:
-        colcode = getattr(coloransi.TermColors,color[0])
-        # regular fonts
-        if code == colcode:
-            return '\\'+color[0].lower()+'{', 1
-        # bold fonts
-        if code == add_ansi_attr(colcode,1):
-            return '\\textbf{\\textcolor{'+color[0].lower()+'}{', 2
-    return '', 0
-
-def ansi2latex(text):
-    """Converts ansi formated text to latex version
-
-    based on https://bitbucket.org/birkenfeld/sphinx-contrib/ansi.py
-    """
-    color_pattern = re.compile('\x1b\\[([^m]+)m')
-    last_end = 0
-    openbrack = 0
-    outstring = ''
-    for match in color_pattern.finditer(text):
-        head = text[last_end:match.start()]
-        formater = match.group()
-        outstring += head
-        if openbrack:
-            outstring += '}'*openbrack
-            openbrack = 0
-        if match.group() <> coloransi.TermColors.Normal and not openbrack:
-            texform, openbrack = single_ansi2latex(match.group())
-            outstring += texform
-        last_end = match.end()
-    if openbrack: 
-        outstring += '}'*openbrack
-    outstring += text[last_end:]
-    return outstring.strip()
 
 def rm_fake(text):
     """
     Remove all occurrences of '/files/' from text
     
     Parameters
     ----------
     text : str
         Text to remove '/files/' from
     """
     return text.replace('/files/', '')
 
 
 def python_comment(text):
     """
     Build a Python comment line from input text.
     
     Parameters
     ----------
     text : str
         Text to comment out.
     """
     
     #Replace line breaks with line breaks and comment symbols.
     #Also add a comment symbol at the beginning to comment out
     #the first line.
     return '# '+'\n# '.join(text.split('\n')) 
 
 
 def get_lines(text, start=None,end=None):
     """
     Split the input text into separate lines and then return the 
     lines that the caller is interested in.
     
     Parameters
     ----------
     text : str
         Text to parse lines from.
     start : int, optional
         First line to grab from.
     end : int, optional
         Last line to grab from.
     """
     
     # Split the input into lines.
     lines = text.split("\n")
     
     # Return the right lines.
     return "\n".join(lines[start:end]) #re-join