s/pygment/pygments

IPython/nbconvert/preprocessors/latex.py

@@ -1,74 +1,74 b''
 """Module that allows latex output notebooks to be conditioned before
 they are converted.
 """
 #-----------------------------------------------------------------------------
 # 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
 #-----------------------------------------------------------------------------
 
 from __future__ import print_function, absolute_import
 import os
 
 # Third-party import, needed for Pygments latex definitions.
 from pygments.formatters import LatexFormatter
 
 # ipy imports
 from .base import (Preprocessor)
 from IPython.nbconvert import filters
 
 #-----------------------------------------------------------------------------
 # Classes
 #-----------------------------------------------------------------------------
 
 class LatexPreprocessor(Preprocessor):
     """
     Converter for latex destined documents.
     """
 
     def preprocess(self, nb, resources):
         """
         Preprocessing to apply on each notebook.
         
         Parameters
         ----------
         nb : NotebookNode
             Notebook being converted
         resources : dictionary
             Additional resources used in the conversion process.  Allows
             preprocessors to pass variables into the Jinja engine.
         """
         # Generate Pygments definitions for Latex 
         resources["latex"] = {}
-        resources["latex"]["pygment_definitions"] = LatexFormatter().get_style_defs()
+        resources["latex"]["pygments_definitions"] = LatexFormatter().get_style_defs()
         return super(LatexPreprocessor, self).preprocess(nb, resources)
 
 
     def preprocess_cell(self, cell, resources, index):
         """
         Apply a transformation on each cell,
         
         Parameters
         ----------
         cell : NotebookNode cell
             Notebook cell being processed
         resources : dictionary
             Additional resources used in the conversion process.  Allows
             preprocessors to pass variables into the Jinja engine.
         index : int
             Modified index of the cell being processed (see base.py)
         """
         
         #If the cell is a markdown cell, preprocess the ampersands used to
         #remove the space between them and their contents.  Latex will complain
         #if spaces exist between the ampersands and the math content.  
         #See filters.latex.rm_math_space for more information.
         if hasattr(cell, "source") and cell.cell_type == "markdown":
             cell.source = filters.strip_math_space(cell.source)
         return cell, resources

IPython/nbconvert/templates/latex/style_ipython.tplx

@@ -1,54 +1,54 b''
 ((= IPython input/output style =))
 
 ((*- extends 'latex_base.tplx' -*))
 
 % Custom definitions
 ((* block definitions *))
     ((( super() )))
 
     % Pygments definitions
-    ((( resources.latex.pygment_definitions )))
+    ((( resources.latex.pygments_definitions )))
 
     % Exact colors from NB
     \definecolor{incolor}{rgb}{0.0, 0.0, 0.5}
     \definecolor{outcolor}{rgb}{0.545, 0.0, 0.0}
 
 ((* endblock definitions *))
 
 %===============================================================================
 % Input
 %===============================================================================
 
 ((* block input scoped *))
     ((( add_prompt(cell.input | highlight2latex(strip_verbatim=True), cell, 'In ', 'incolor') )))
 ((* endblock input *))
 
 
 %===============================================================================
 % Output
 %===============================================================================
 
 ((* block pyout scoped *))
     ((*- for type in output | filter_data_type -*))
         ((*- if type in ['text']*))
             ((( add_prompt(output.text | escape_latex, cell, 'Out', 'outcolor') )))
         ((* else -*))
 \texttt{\color{outcolor}Out[{\color{outcolor}((( cell.prompt_number )))}]:}((( super() )))
         ((*- endif -*))
     ((*- endfor -*))
 ((* endblock pyout *))
 
 
 %==============================================================================
 % Support Macros
 %==============================================================================
 
 % Name: draw_prompt
 % Purpose: Renders an output/input prompt
 ((* macro add_prompt(text, cell, prompt, prompt_color) -*))
     ((*- set prompt_number = "" ~ cell.prompt_number -*))
     ((*- set indention =  " " * (prompt_number | length + 7) -*))
 \begin{Verbatim}[commandchars=\\\{\}]
 ((( text | add_prompts(first='{\color{' ~ prompt_color ~ '}' ~ prompt ~ '[{\\color{' ~ prompt_color ~ '}' ~ prompt_number ~ '}]:} ', cont=indention) )))
 \end{Verbatim}
 ((*- endmacro *))

IPython/nbconvert/templates/latex/style_notebook.tplx

@@ -1,191 +1,191 b''
 ((= Notebook input/output style =))
 
 ((* extends 'latex_base.tplx' *))
 
 % Custom packages
 ((* block packages *))    
     ((( super() )))
 
     \usepackage{tikz} % Needed to box output/input
     \usepackage{scrextend} % Used to indent output
     \usepackage{needspace} % Make prompts follow contents
     \usepackage{framed} % Used to draw output that spans multiple pages
 ((* endblock packages *))
 
 % Custom definitions
 ((* block definitions *))
     ((( super() )))
 
     % Pygments definitions
-    ((( resources.latex.pygment_definitions )))
+    ((( resources.latex.pygments_definitions )))
 
     % NB prompt colors
     \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}
 
     % NB prompt lengths
     \newlength{\inputpadding}
     \setlength{\inputpadding}{0.5em}
     \newlength{\cellleftmargin}
     \setlength{\cellleftmargin}{0.15\linewidth}
     \newlength{\borderthickness}
     \setlength{\borderthickness}{0.4pt}
     \newlength{\smallerfontscale}
     \setlength{\smallerfontscale}{9.5pt}
 
     % NB prompt font size
     \def\smaller{\fontsize{\smallerfontscale}{\smallerfontscale}\selectfont}
 
     % Define a background layer, in which the nb prompt shape is drawn
     \pgfdeclarelayer{background}
     \pgfsetlayers{background,main}
     \usetikzlibrary{calc}
 
     % define styles for the normal border and the torn border
     \tikzset{
       normal border/.style={draw=nbframe-border, fill=nbframe-bg,
         rectangle, rounded corners=2.5pt, line width=\borderthickness},
       torn border/.style={draw=white, fill=white, line width=\borderthickness}}
 
     % Macro to draw the shape behind the text, when it fits completly in the
     % page
     \def\notebookcellframe#1{%
     \tikz{%
       \node[inner sep=\inputpadding] (A) {#1};% Draw the text of the node
       \begin{pgfonlayer}{background}% Draw the shape behind
       \fill[normal border]%
             (A.south east) -- ($(A.south west)+(\cellleftmargin,0)$) -- 
             ($(A.north west)+(\cellleftmargin,0)$) -- (A.north east) -- cycle;
       \end{pgfonlayer}}}%
 
     % Macro to draw the shape, when the text will continue in next page
     \def\notebookcellframetop#1{%
     \tikz{%
       \node[inner sep=\inputpadding] (A) {#1};    % Draw the text of the node
       \begin{pgfonlayer}{background}    
       \fill[normal border]              % Draw the ``complete shape'' behind
             (A.south east) -- ($(A.south west)+(\cellleftmargin,0)$) -- 
             ($(A.north west)+(\cellleftmargin,0)$) -- (A.north east) -- cycle;
       \fill[torn border]                % Add the torn lower border
             ($(A.south east)-(0,.1)$) -- ($(A.south west)+(\cellleftmargin,-.1)$) -- 
             ($(A.south west)+(\cellleftmargin,.1)$) -- ($(A.south east)+(0,.1)$) -- cycle;
       \end{pgfonlayer}}}
 
     % Macro to draw the shape, when the text continues from previous page
     \def\notebookcellframebottom#1{%
     \tikz{%
       \node[inner sep=\inputpadding] (A) {#1};   % Draw the text of the node
       \begin{pgfonlayer}{background}   
       \fill[normal border]             % Draw the ``complete shape'' behind
             (A.south east) -- ($(A.south west)+(\cellleftmargin,0)$) -- 
             ($(A.north west)+(\cellleftmargin,0)$) -- (A.north east) -- cycle;
       \fill[torn border]               % Add the torn upper border
             ($(A.north east)-(0,.1)$) -- ($(A.north west)+(\cellleftmargin,-.1)$) -- 
             ($(A.north west)+(\cellleftmargin,.1)$) -- ($(A.north east)+(0,.1)$) -- cycle;
       \end{pgfonlayer}}}
 
     % Macro to draw the shape, when both the text continues from previous page
     % and it will continue in next page
     \def\notebookcellframemiddle#1{%
     \tikz{%
       \node[inner sep=\inputpadding] (A) {#1};   % Draw the text of the node
       \begin{pgfonlayer}{background}   
       \fill[normal border]             % Draw the ``complete shape'' behind
             (A.south east) -- ($(A.south west)+(\cellleftmargin,0)$) -- 
             ($(A.north west)+(\cellleftmargin,0)$) -- (A.north east) -- cycle;
       \fill[torn border]               % Add the torn lower border
             ($(A.south east)-(0,.1)$) -- ($(A.south west)+(\cellleftmargin,-.1)$) -- 
             ($(A.south west)+(\cellleftmargin,.1)$) -- ($(A.south east)+(0,.1)$) -- cycle;
       \fill[torn border]               % Add the torn upper border
             ($(A.north east)-(0,.1)$) -- ($(A.north west)+(\cellleftmargin,-.1)$) -- 
             ($(A.north west)+(\cellleftmargin,.1)$) -- ($(A.north east)+(0,.1)$) -- cycle;
       \end{pgfonlayer}}}
 
     % Define the environment which puts the frame
     % In this case, the environment also accepts an argument with an optional
     % title (which defaults to ``Example'', which is typeset in a box overlaid
     % on the top border
     \newenvironment{notebookcell}[1][0]{%
       \def\FrameCommand{\notebookcellframe}%
       \def\FirstFrameCommand{\notebookcellframetop}%
       \def\LastFrameCommand{\notebookcellframebottom}%
       \def\MidFrameCommand{\notebookcellframemiddle}%
       \par\vspace{1\baselineskip}%
       \MakeFramed {\FrameRestore}%
       \noindent\tikz\node[inner sep=0em] at ($(A.north west)-(0,0)$) {%
       ((( draw_prompt("In", "#1", "nbframe-in-prompt", "2pt") )))%
       }; \par}%
     {\endMakeFramed}
 
 ((* endblock definitions *))
 
 %===============================================================================
 % Input
 %===============================================================================
 
 ((* block input scoped *))
     % Add contents below.
 
 {\par%
 \vspace{-1\baselineskip}%
 \needspace{4\baselineskip}}%
 \begin{notebookcell}[((( cell.prompt_number )))]%
 \begin{addmargin}[\cellleftmargin]{0em}% left, right
 {\smaller%
 \par%
 ((* block extra_input_spacing *))((* endblock extra_input_spacing *))%
 \vspace{-1\smallerfontscale}%
 ((( cell.input | highlight2latex )))%
 \par%
 \vspace{-1\smallerfontscale}}%
 \end{addmargin}
 \end{notebookcell}
 
 ((* endblock input *))
 
 %===============================================================================
 % Output
 %===============================================================================
 
 ((* block output -*))
     \par\vspace{1\smallerfontscale}%
     \needspace{4\baselineskip}%
     % 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'] *))
         {\par%
         \vspace{-1\smallerfontscale}%
         \noindent%
         ((( draw_prompt("Out", cell.prompt_number, "nbframe-out-prompt", "0em") )))%
         ((* block extra_output_spacing *))((* endblock extra_output_spacing *))}%
     ((* endif *))%
     %
     \begin{addmargin}[\cellleftmargin]{0em}% left, right
     {\smaller%
     \vspace{-1\smallerfontscale}%
     ((( super() )))}%
     \end{addmargin}%
 ((*- endblock output *))
 
 %==============================================================================
 % Support Macros
 %==============================================================================
 
 % Name: draw_prompt
 % Purpose: Renders an output/input prompt for notebook style pdfs
 ((* macro draw_prompt(prompt, number, color, space) -*))
     \begin{minipage}{\cellleftmargin}%
     \hfill%
     {\smaller%
     \tt%
     \color{(((color)))}%
     (((prompt)))[(((number)))]:}%
     \hspace{\inputpadding}%
     \hspace{(((space)))}%
     \hspace{3pt}%
     \end{minipage}%
 ((*- endmacro *))
 

IPython/nbconvert/templates/latex/style_python.tplx

@@ -1,21 +1,21 b''
 ((= Python input/output style =))
 
 ((*- extends 'latex_base.tplx' -*))
 
 % Custom definitions
 ((* block definitions *))
     ((( super() )))
 
     % Pygments definitions
-    ((( resources.latex.pygment_definitions )))
+    ((( resources.latex.pygments_definitions )))
 ((* endblock definitions *))
 
 %===============================================================================
 % Input
 %===============================================================================
 
 ((* block input scoped *))
     \begin{Verbatim}[commandchars=\\\{\}]
 ((( cell.input | highlight2latex(strip_verbatim=True) | add_prompts )))
     \end{Verbatim}
 ((* endblock input *))

IPython/nbconvert/templates/latex/style_simple.tplx

@@ -1,68 +1,68 b''
 ((= Simple input/output style =))
 
 ((*- extends 'latex_base.tplx' -*))
 
 % Custom packages
 ((* block packages *))
     ((( super() )))
 
     \usepackage{needspace} % Make prompts follow contents
 ((* endblock packages *))
 
 % Custom definitions
 ((* block definitions *))
     ((( super() )))
 
     % Pygments definitions
-    ((( resources.latex.pygment_definitions )))
+    ((( resources.latex.pygments_definitions )))
 
     \newlength{\promptspace}
     \setlength{\promptspace}{4\baselineskip} % Space needed to start a new
                                              % input/output
 ((* endblock definitions *))
 %===============================================================================
 % Input
 %===============================================================================
 
 ((*- block in_prompt scoped -*))
     \par\vspace{-1\baselineskip}
     ((( draw_prompt('Input') )))
 ((*- endblock in_prompt -*))
 
 ((*- block input_group scoped -*))
     (((- super() )))
     \par\vspace{-2\baselineskip}
 ((* endblock input_group -*))
 
 ((* block input scoped *))
     ((( cell.input | highlight2latex )))
 ((* endblock input *))
 
 %===============================================================================
 % Output
 %===============================================================================
 
 ((*- block output_prompt scoped -*))
     ((( draw_prompt('Output') )))
 ((*- endblock output_prompt -*))
 
 ((*- block output_group scoped -*))
     (((- super() )))
     \par\vspace{-1\baselineskip}
 ((* endblock output_group -*))
 
 %==============================================================================
 % Support Macros
 %==============================================================================
 
 % Name: draw_prompt
 % Purpose: Renders an output/input prompt for notebook style pdfs
 ((* macro draw_prompt(prompt) *))
     % Add a horizantal break, along with break title.
     \needspace{\promptspace}
     \br\br
     {\scriptsize ((( prompt )))}
     \br
     \rule[10pt]{\linewidth}{0.5pt}
     \vspace{-2.5em}
 ((* endmacro *))