Moved pygments logic to latex base.

IPython/nbconvert/templates/latex/latex_base.tplx

@@ -1,184 +1,189 b''
 ((= Latex base template (must inherit)
 This template builds upon the abstract template, adding common latex output
 functions.  Figures, data_text,
 This template does not define a docclass, the inheriting class must define this.=))
 
 ((*- extends 'abstract.tplx' -*))
 
 %===============================================================================
 % Abstract overrides
 %===============================================================================
 
 ((* block packages *))
     \usepackage{graphicx} % Used to insert images
     \usepackage{adjustbox} % Used to constrain images to a maximum size 
     \usepackage{color} % Allow colors to be defined
     \usepackage{enumerate} % Needed for markdown enumerations to work
     \usepackage{fancyvrb} % Needed to support color codes (tex) in verbatim blocks
     \usepackage{geometry} % Used to adjust the document margins
     \usepackage{amsmath} % Equations
     \usepackage{amssymb} % Equations
     \usepackage[utf8]{inputenc} % Allow utf-8 characters in the tex document
     \usepackage{ucs} % Extended unicode (utf-8) support
     \usepackage{alltt} % Verbatim replacement that allows latex
 
     \usepackage{grffile} % extends the file name processing of package graphics 
                          %to support a larger range 
 
     % The hyperref package gives us a pdf with properly built
     % internal navigation ('pdf bookmarks' for the table of contents,
     % internal cross-reference links, web links for URLs, etc.)
     \usepackage{hyperref}
 
     % Pygments definitions
     ((( resources.latex.pygment_definitions )))
 ((* endblock packages *))
 
 ((* block definitions *))
     \definecolor{orange}{cmyk}{0,0.4,0.8,0.2}
     \definecolor{darkorange}{rgb}{.71,0.21,0.01}
     \definecolor{darkgreen}{rgb}{.12,.54,.11}
     \definecolor{myteal}{rgb}{.26, .44, .56}
     \definecolor{gray}{gray}{0.45}
     \definecolor{lightgray}{gray}{.95}
     \definecolor{mediumgray}{gray}{.8}
     \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}
     \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}
 
     % Define a nice break command that doesn't care if a line doesn't already
     % exist.
     \def\br{\hspace*{\fill} \\* }
 
     % Define a custom verbatim that allows latex
     \renewenvironment{Verbatim}[1][\unskip]
     {\begin{alltt}\smaller\noindent}
     {\end{alltt}}
 ((* endblock definitions *))
 
 ((* block commands *))
     \sloppy % Prevent overflowing lines due to hard-to-break entities
 
     % Setup hyperref package
     \hypersetup{
       breaklinks=true,  % so long urls are correctly broken across lines
       colorlinks=true,
       urlcolor=blue,
       linkcolor=darkorange,
       citecolor=darkgreen,
       }
     
     % Slightly bigger margins than the latex defaults
     \geometry{verbose,tmargin=3cm,bmargin=3cm,lmargin=2.5cm,rmargin=2.5cm}
 
     % Hardcode size of all verbatim environments to be a bit smaller
     \makeatletter 
     \g@addto@macro\@verbatim\small\topsep=0.5em\partopsep=0pt
     \makeatother 
 ((* endblock commands *))
 
 %===============================================================================
 % Support blocks
 %===============================================================================
 
 % Displaying simple data text
 ((* block data_text *))
     \begin{Verbatim}
 ((( output.text | escape_latex )))
     \end{Verbatim}
 ((* endblock data_text *))
 
 % Display python error text as-is
 ((* block pyerr *))
     \begin{Verbatim}
 ((( super() )))
     \end{Verbatim}
 ((* endblock pyerr *))
 ((* block traceback_line *))
     ((( line | indent | strip_ansi | escape_latex )))
 ((* endblock traceback_line *))
 
 % Display stream ouput with coloring
 ((* block stream *))
     \begin{Verbatim}[commandchars=\\\{\}]
 ((( output.text | ansi2latex )))
     \end{Verbatim}
 ((* endblock stream *))
 
 % Display latex
 ((* block data_latex -*))
     ((*- if output.latex.startswith('$'): -*)) 
         ((= Replace $ symbols with more explicit, equation block. =))
         \begin{equation*}
         ((( output.latex | strip_dollars )))
         \end{equation*}
     ((*- else -*))
         ((( output.latex )))
     ((*- endif *))
 ((* endblock data_latex *))
 
 % Default mechanism for rendering figures
 ((*- block data_png -*))((( draw_figure(output.png_filename) )))((*- endblock -*))
 ((*- block data_jpg -*))((( draw_figure(output.jpeg_filename) )))((*- endblock -*))
 ((*- block data_svg -*))((( draw_figure(output.svg_filename) )))((*- endblock -*))
 ((*- block data_pdf -*))((( draw_figure(output.pdf_filename) )))((*- endblock -*))
 
 % Draw a figure using the graphicx package.
 ((* macro draw_figure(filename) -*))
 ((* set filename = filename | posix_path *))
 ((*- block figure scoped -*))
     \begin{center}
     \adjustimage{max size={0.9\linewidth}{0.9\paperheight}}{((( filename )))}
     \end{center}
     { \hspace*{\fill} \\}
 ((*- endblock figure -*))
 ((*- endmacro *))
 
 % Draw heading cell.  Explicitly map different cell levels.
 ((* block headingcell scoped -*))
     ((*- if cell.level == 1 -*))
         ((* block h1 -*))\section((* endblock h1 -*))
     ((*- elif cell.level == 2 -*))
         ((* block h2 -*))\subsection((* endblock h2 -*))
     ((*- elif cell.level == 3 -*))
         ((* block h3 -*))\subsubsection((* endblock h3 -*))
     ((*- elif cell.level == 4 -*))
         ((* block h4 -*))\paragraph((* endblock h4 -*))
     ((*- elif cell.level == 5 -*))
         ((* block h5 -*))\subparagraph((* endblock h5 -*))
     ((*- elif cell.level == 6 -*))
         ((* block h6 -*))\\*\textit((* endblock h6 -*))
     ((*- endif -*))
     {((( cell.source | escape_latex )))}
 ((*- endblock headingcell *))
 
 % Redirect pyout to display data priority.
 ((* block pyout scoped *))
     ((* block data_priority scoped *))
     ((( super() )))
     ((* endblock *))
 ((* endblock pyout *))
 
 % Render markdown
 ((* block markdowncell scoped *))
     ((( cell.source | markdown2latex )))
 ((* endblock markdowncell *))
 
 % Spit out the contents of raw cells unmodified
 ((* block rawcell scoped *))
     ((( cell.source )))
 ((* endblock rawcell *))
 
 % Don't display unknown types
 ((* block unknowncell scoped *))
 ((* endblock unknowncell *))
+
+% Render code using pygments
+((* block input scoped *))
+    ((( cell.input | highlight2latex )))
+((* endblock input *))
  No newline at end of file

IPython/nbconvert/templates/latex/notebook_style.tplx

@@ -1,138 +1,138 b''
 ((= Notebook input/output style =))
 
 ((* extends 'latex_base.tplx' *))
 
 % Custom packages
 ((* block packages *))
     ((( super() )))
 
     % Needed to box output/input
     \usepackage{tikz}
         \usetikzlibrary{calc,arrows,shadows}
     \usepackage[framemethod=tikz]{mdframed}
 ((* endblock packages *))
 
 % Custom definitions
 ((* block definitions *))
     ((( super() )))
 
     \listfiles
 
     \def\smaller{\fontsize{9.5pt}{9.5pt}\selectfont}
 
     \definecolor{nbframe-border}{rgb}{0.867,0.867,0.867}
     \definecolor{nbframe-bg}{rgb}{0.969,0.969,0.969}
     \definecolor{nbframe-in-prompt}{rgb}{0.0,0.0,0.502}
     \definecolor{nbframe-out-prompt}{rgb}{0.545,0.0,0.0}
 
     \newenvironment{ColorVerbatim}
     {\vspace{-2\baselineskip}
     \leavevmode\begin{mdframed}[%
         roundcorner=1.0pt, %
         backgroundcolor=nbframe-bg, %
         userdefinedwidth=1\linewidth, %
         leftmargin=0.1\linewidth, %
         innerleftmargin=0pt, %
         innerrightmargin=0pt, %
         linecolor=nbframe-border, %
         linewidth=1pt, %
         usetwoside=false, %
         everyline=true, %
         innerlinewidth=3pt, %
         innerlinecolor=nbframe-bg, %
         middlelinewidth=1pt, %
         middlelinecolor=nbframe-bg, %
         outerlinewidth=0.5pt, %
         outerlinecolor=nbframe-border, %
         needspace=0pt
     ]}
     {\end{mdframed}\vspace{-2\baselineskip}}
 
     \newenvironment{WhiteVerbatim}
     {\vspace{-2\baselineskip}
     \leavevmode\begin{mdframed}[%
         roundcorner=1.0pt, %
         backgroundcolor=white, %
         userdefinedwidth=1\linewidth, %
         leftmargin=0.1\linewidth, %
         innerleftmargin=0pt, %
         innerrightmargin=0pt, %
         linecolor=white, %
         linewidth=1pt, %
         usetwoside=false, %
         everyline=true, %
         innerlinewidth=3pt, %
         innerlinecolor=white, %
         middlelinewidth=1pt, %
         middlelinecolor=white, %
         outerlinewidth=0.5pt, %
         outerlinecolor=white, %
         needspace=0pt
     ]}
     {\end{mdframed}\vspace{-2\baselineskip}}
 
 ((* endblock definitions *))
 
 %===============================================================================
 % Input
 %===============================================================================
 
 
 ((* block in_prompt scoped *))
     \br
     ((( draw_prompt("In", cell.prompt_number, "nbframe-in-prompt") )))
 ((* endblock in_prompt *))
 
 ((* block input scoped *))
     % Add contents below.
     
     \begin{ColorVerbatim}
-    ((( cell.input | highlight2latex )))
+    \smaller{\leavevmode\hspace*{-0.1\linewidth}((( super() )))
     \end{ColorVerbatim}
 ((* endblock input *))
 
 ((* block input_group scoped *))
     ((( super() )))
 ((* endblock input_group *))
 
 
 %===============================================================================
 % Output
 %===============================================================================
 
 ((* block output *))
     \br
 
     % Only render the prompt if the cell is pyout.  Note, the outputs prompt 
     % block isn't used since we need to check each indiviual output and only
     % add prompts to the pyout ones.
     ((* if output.output_type in ['pyout'] *))
         ((( draw_prompt("Out", cell.prompt_number, "nbframe-out-prompt") )))
     ((* endif *))
 
     \begin{WhiteVerbatim}
     ((( super() )))
     \end{WhiteVerbatim}
 ((* endblock output *))
 
 %==============================================================================
 % Support Macros
 %==============================================================================
 
 % Name: draw_prompt
 % Purpose: Renders an output/input prompt for notebook style pdfs.  Prompt is
 %          rendered at the current location, the cursor position is left 
 %          unmodified.
 ((* macro draw_prompt(prompt, number, color) *))
     
     {
     \smaller
     \tt
     \color{((( color )))}
     \noindent
     ((( prompt )))
     {[}((( number ))){]}:
     }
     
     \vspace{-1\baselineskip}
 ((* endmacro *))

IPython/nbconvert/templates/latex/simple_style.tplx

@@ -1,50 +1,45 b''
 ((= Simple input/output style =))
 
 ((*- extends 'latex_base.tplx' -*))
 
 %===============================================================================
 % Input
 %===============================================================================
 
 ((*- block in_prompt scoped -*))
     ((( write_prompt('Input') )))
 ((*- endblock in_prompt -*))
 
-((*- block input scoped -*))
-    % Add contents below.
-    ((( cell.input | highlight2latex )))
-((*- endblock input -*))
-
 ((*- block input_group scoped -*))
     (((- super() )))
     \vspace{-2em}
 ((* endblock input_group -*))
 
 
 %===============================================================================
 % Output
 %===============================================================================
 
 ((*- block output_prompt scoped -*))
     ((( write_prompt('Output') )))
 ((*- endblock output_prompt -*))
 
 ((*- block output_group scoped -*))
     (((- super() )))
     \vspace{-2em}
 ((* endblock output_group -*))
 
 %==============================================================================
 % Support Macros
 %==============================================================================
 
 % Name: write_prompt
 % Purpose: Renders an output/input prompt for notebook style pdfs
 ((* macro write_prompt(prompt) *))
     % Add a horizantal break, along with break title.
     \br\br
     {\scriptsize ((( prompt )))}
     \br
     \rule[10pt]{\linewidth}{0.5pt}
     \vspace{-2.5em}
 ((* endmacro *))