Merge pull request #4466 from minrk/pandoc-preamble

various pandoc latex fixes

- add missing declarations to latex_base (required for pandoc-highlighted code in markdown)
- fix ansi color in latex, which didn't work in a variety of ways.

closes  #4245

IPython/nbconvert/filters/ansi.py

@@ -122,12 +122,13 b' def single_ansi2latex(code):'
         color_code = style_code.split(';')[1]
         is_normal = style_code.split(';')[0] == '0'
 
-        # regular fonts
+        # regular weight
         if (code == style_code) or (is_normal and code == color_code):
-            return '\\'+color[0].lower()+'{', 1
-        # bold fonts
+            
+            return r'{\color{'+color[0].lower()+'}', 1
+        # bold
         if code == style_code[:3]+str(1)+style_code[3:]:
-            return '\\textbf{\\textcolor{'+color[0].lower()+'}{', 2
+            return r'\textbf{\color{'+color[0].lower()+'}', 1
     return '', 0
 
 def ansi2latex(text):
@@ -149,8 +150,8 b' def ansi2latex(text):'
             texform, openbrack = single_ansi2latex(match.group())
             outstring += texform
         last_end = match.end()
-
-    #Add the remainer of the string and THEN close any remaining color brackets.
+    
+    # Add the remainer of the string and THEN close any remaining color brackets.
     outstring += text[last_end:]
     if openbrack: 
         outstring += '}'*openbrack

IPython/nbconvert/filters/tests/test_ansi.py

@@ -68,12 +68,12 b' class TestAnsi(TestsBase):'
     def test_ansi2latex(self):
         """ansi2latex test"""
         correct_outputs = {
-            '%s' % (TermColors.Red)  : r'\red{}',
-            'hello%s' % TermColors.Blue: r'hello\blue{}',
-            'he%s%sllo' % (TermColors.Green, TermColors.Cyan) : r'he\green{}\cyan{llo}',
-            '%shello' % TermColors.Yellow : r'\yellow{hello}',
-            '{0}h{0}e{0}l{0}l{0}o{0}'.format(TermColors.White) : r'\white{h}\white{e}\white{l}\white{l}\white{o}\white{}',
-            'hel%slo' % TermColors.Green : r'hel\green{lo}',
+            '%s' % (TermColors.Red)  : r'{\color{red}}',
+            'hello%s' % TermColors.Blue: r'hello{\color{blue}}',
+            'he%s%sllo' % (TermColors.Green, TermColors.Cyan) : r'he{\color{green}}{\color{cyan}llo}',
+            '%shello' % TermColors.Yellow : r'{\color{yellow}hello}',
+            '{0}h{0}e{0}l{0}l{0}o{0}'.format(TermColors.White) : r'{\color{white}h}{\color{white}e}{\color{white}l}{\color{white}l}{\color{white}o}{\color{white}}',
+            'hel%slo' % TermColors.Green : r'hel{\color{green}lo}',
             'hello' : 'hello'}
 
         for inval, outval in correct_outputs.items():

IPython/nbconvert/templates/latex/latex_base.tplx

@@ -43,15 +43,45 b' This template does not define a docclass, the inheriting class must define this.'
     \definecolor{inputbackground}{rgb}{.95, .95, .85}
     \definecolor{outputbackground}{rgb}{.95, .95, .95}
     \definecolor{traceback}{rgb}{1, .95, .95}
-    % new ansi colors
-    \definecolor{brown}{rgb}{0.54,0.27,0.07}
-    \definecolor{purple}{rgb}{0.5,0.0,0.5}
+    % ansi colors
+    \definecolor{red}{rgb}{.6,0,0}
+    \definecolor{green}{rgb}{0,.65,0}
+    \definecolor{brown}{rgb}{0.6,0.6,0}
+    \definecolor{blue}{rgb}{0,.145,.698}
+    \definecolor{purple}{rgb}{.698,.145,.698}
+    \definecolor{cyan}{rgb}{0,.698,.698}
+    \definecolor{lightgray}{gray}{0.5}
+    
+    % bright ansi colors
     \definecolor{darkgray}{gray}{0.25}
     \definecolor{lightred}{rgb}{1.0,0.39,0.28}
     \definecolor{lightgreen}{rgb}{0.48,0.99,0.0}
     \definecolor{lightblue}{rgb}{0.53,0.81,0.92}
     \definecolor{lightpurple}{rgb}{0.87,0.63,0.87}
     \definecolor{lightcyan}{rgb}{0.5,1.0,0.83}
+    
+    % commands and environments needed by pandoc snippets
+    % extracted from the output of `pandoc -s`
+    
+    \DefineShortVerb[commandchars=\\\{\}]{\|}
+    \DefineVerbatimEnvironment{Highlighting}{Verbatim}{commandchars=\\\{\}}
+    % Add ',fontsize=\small' for more characters per line
+    \newenvironment{Shaded}{}{}
+    \newcommand{\KeywordTok}[1]{\textcolor[rgb]{0.00,0.44,0.13}{\textbf{{#1}}}}
+    \newcommand{\DataTypeTok}[1]{\textcolor[rgb]{0.56,0.13,0.00}{{#1}}}
+    \newcommand{\DecValTok}[1]{\textcolor[rgb]{0.25,0.63,0.44}{{#1}}}
+    \newcommand{\BaseNTok}[1]{\textcolor[rgb]{0.25,0.63,0.44}{{#1}}}
+    \newcommand{\FloatTok}[1]{\textcolor[rgb]{0.25,0.63,0.44}{{#1}}}
+    \newcommand{\CharTok}[1]{\textcolor[rgb]{0.25,0.44,0.63}{{#1}}}
+    \newcommand{\StringTok}[1]{\textcolor[rgb]{0.25,0.44,0.63}{{#1}}}
+    \newcommand{\CommentTok}[1]{\textcolor[rgb]{0.38,0.63,0.69}{\textit{{#1}}}}
+    \newcommand{\OtherTok}[1]{\textcolor[rgb]{0.00,0.44,0.13}{{#1}}}
+    \newcommand{\AlertTok}[1]{\textcolor[rgb]{1.00,0.00,0.00}{\textbf{{#1}}}}
+    \newcommand{\FunctionTok}[1]{\textcolor[rgb]{0.02,0.16,0.49}{{#1}}}
+    \newcommand{\RegionMarkerTok}[1]{{#1}}
+    \newcommand{\ErrorTok}[1]{\textcolor[rgb]{1.00,0.00,0.00}{\textbf{{#1}}}}
+    \newcommand{\NormalTok}[1]{{#1}}
+    
     % Define a nice break command that doesn't care if a line doesn't already
     % exist.
     \def\br{\hspace*{\fill} \\* }

IPython/nbconvert/tests/files/notebook2.ipynb

@@ -1,6 +1,6 b''
 {
  "metadata": {
-  "name": "notebook2"
+  "name": ""
  },
  "nbformat": 3,
  "nbformat_minor": 0,
@@ -171,12 +171,15 b''
      "prompt_number": 14
     },
     {
-     "cell_type": "code",
-     "collapsed": false,
-     "input": [],
-     "language": "python",
+     "cell_type": "markdown",
      "metadata": {},
-     "outputs": []
+     "source": [
+      "```python\n",
+      "def foo(bar=1):\n",
+      "    \"\"\"docstring\"\"\"\n",
+      "    raise Exception(\"message\")\n",
+      "```"
+     ]
     }
    ],
    "metadata": {}

examples/notebooks/Part 5 - Rich Display System.ipynb

@@ -1296,28 +1296,29 b''
      "collapsed": false,
      "input": [
       "%%latex\n",
-      "\\begin{aligned}\n",
+      "\\begin{align}\n",
       "\\nabla \\times \\vec{\\mathbf{B}} -\\, \\frac1c\\, \\frac{\\partial\\vec{\\mathbf{E}}}{\\partial t} & = \\frac{4\\pi}{c}\\vec{\\mathbf{j}} \\\\\n",
       "\\nabla \\cdot \\vec{\\mathbf{E}} & = 4 \\pi \\rho \\\\\n",
       "\\nabla \\times \\vec{\\mathbf{E}}\\, +\\, \\frac1c\\, \\frac{\\partial\\vec{\\mathbf{B}}}{\\partial t} & = \\vec{\\mathbf{0}} \\\\\n",
       "\\nabla \\cdot \\vec{\\mathbf{B}} & = 0\n",
-      "\\end{aligned}"
+      "\\end{align}"
      ],
      "language": "python",
      "metadata": {},
      "outputs": [
       {
        "latex": [
-        "\\begin{aligned}\n",
+        "\\begin{align}\n",
         "\\nabla \\times \\vec{\\mathbf{B}} -\\, \\frac1c\\, \\frac{\\partial\\vec{\\mathbf{E}}}{\\partial t} & = \\frac{4\\pi}{c}\\vec{\\mathbf{j}} \\\\\n",
         "\\nabla \\cdot \\vec{\\mathbf{E}} & = 4 \\pi \\rho \\\\\n",
         "\\nabla \\times \\vec{\\mathbf{E}}\\, +\\, \\frac1c\\, \\frac{\\partial\\vec{\\mathbf{B}}}{\\partial t} & = \\vec{\\mathbf{0}} \\\\\n",
         "\\nabla \\cdot \\vec{\\mathbf{B}} & = 0\n",
-        "\\end{aligned}"
+        "\\end{align}"
        ],
+       "metadata": {},
        "output_type": "display_data",
        "text": [
-        "<IPython.core.display.Latex at 0x10a617c90>"
+        "<IPython.core.display.Latex at 0x106c04dd0>"
        ]
       }
      ],

examples/notebooks/Typesetting Math Using MathJax.ipynb

@@ -1,6 +1,6 b''
 {
  "metadata": {
-  "name": "Typesetting Math Using MathJax"
+  "name": ""
  },
  "nbformat": 3,
  "nbformat_minor": 0,
@@ -24,18 +24,18 b''
       "\n",
       "## The Lorenz Equations\n",
       "### Source\n",
-      "```\\begin{aligned}\n",
+      "```\\begin{align}\n",
       "\\dot{x} & = \\sigma(y-x) \\\\\n",
       "\\dot{y} & = \\rho x - y - xz \\\\\n",
       "\\dot{z} & = -\\beta z + xy\n",
-      "\\end{aligned}\n",
+      "\\end{align}\n",
       "```\n",
       "### Display\n",
-      "\\begin{aligned}\n",
+      "\\begin{align}\n",
       "\\dot{x} & = \\sigma(y-x) \\\\\n",
       "\\dot{y} & = \\rho x - y - xz \\\\\n",
       "\\dot{z} & = -\\beta z + xy\n",
-      "\\end{aligned}"
+      "\\end{align}"
      ]
     },
     {
@@ -140,18 +140,18 b''
      "source": [
       "## Maxwell's Equations\n",
       "### Source\n",
-      "```\\begin{aligned}\n",
+      "```\\begin{align}\n",
       "\\nabla \\times \\vec{\\mathbf{B}} -\\, \\frac1c\\, \\frac{\\partial\\vec{\\mathbf{E}}}{\\partial t} & = \\frac{4\\pi}{c}\\vec{\\mathbf{j}} \\\\   \\nabla \\cdot \\vec{\\mathbf{E}} & = 4 \\pi \\rho \\\\\n",
       "\\nabla \\times \\vec{\\mathbf{E}}\\, +\\, \\frac1c\\, \\frac{\\partial\\vec{\\mathbf{B}}}{\\partial t} & = \\vec{\\mathbf{0}} \\\\\n",
       "\\nabla \\cdot \\vec{\\mathbf{B}} & = 0 \n",
-      "\\end{aligned}\n",
+      "\\end{align}\n",
       "```\n",
       "### Display\n",
-      "\\begin{aligned}\n",
+      "\\begin{align}\n",
       "\\nabla \\times \\vec{\\mathbf{B}} -\\, \\frac1c\\, \\frac{\\partial\\vec{\\mathbf{E}}}{\\partial t} & = \\frac{4\\pi}{c}\\vec{\\mathbf{j}} \\\\   \\nabla \\cdot \\vec{\\mathbf{E}} & = 4 \\pi \\rho \\\\\n",
       "\\nabla \\times \\vec{\\mathbf{E}}\\, +\\, \\frac1c\\, \\frac{\\partial\\vec{\\mathbf{B}}}{\\partial t} & = \\vec{\\mathbf{0}} \\\\\n",
       "\\nabla \\cdot \\vec{\\mathbf{B}} & = 0 \n",
-      "\\end{aligned}"
+      "\\end{align}"
      ]
     },
     {