From 301c4a11c3010635be53853dc4f23b99ec99b2ee 2013-02-10 13:08:55
From: Matthias BUSSONNIER <bussonniermatthias@gmail.com>
Date: 2013-02-10 13:08:55
Subject: [PATCH] cleanup profile fixup rst

---

diff --git a/profile/base_html.nbcv b/profile/base_html.nbcv
index 8320378..efad8a1 100644
--- a/profile/base_html.nbcv
+++ b/profile/base_html.nbcv
@@ -1,11 +1,10 @@
 c = get_config()
 
 
-c.ConverterTemplate.extract_figures=False
 c.ConverterTemplate.template_file='basichtml'
 c.ConverterTemplate.tex_environement=False
 
 c.NbconvertApp.fileext='html'
 
-c.ExtractFigureTransformer.enabled = False
+c.ExtractFigureTransformer.enabled=False
 c.CSSHtmlHeaderTransformer.enabled=True
diff --git a/profile/full_html.nbcv b/profile/full_html.nbcv
index 2e18e58..797dcf6 100644
--- a/profile/full_html.nbcv
+++ b/profile/full_html.nbcv
@@ -1,4 +1,5 @@
 c = get_config()
+
 load_subconfig('base_html.nbcv')
 
 c.ConverterTemplate.template_file='fullhtml'
diff --git a/profile/latex_base.nbcv b/profile/latex_base.nbcv
index cf41f30..2b4fede 100644
--- a/profile/latex_base.nbcv
+++ b/profile/latex_base.nbcv
@@ -1,11 +1,15 @@
 c = get_config()
 
-c.ConverterTemplate.extract_figures=True
 c.ConverterTemplate.template_file='latex_base'
 c.ConverterTemplate.tex_environement=True
-c.ConverterTemplate.display_data_priority=['latex', 'svg', 'png', 'jpg', 'jpeg' , 'text']
-c.ExtractFigureTransformer.display_data_priority=['latex', 'svg', 'png', 'jpg', 'jpeg']
+
+
 c.NbconvertApp.fileext='tex'
 
+c.GlobalConfigurable.display_data_priority      =['latex', 'svg', 'png', 'jpg', 'jpeg' , 'text']
+# do not extract text
+c.ExtractFigureTransformer.display_data_priority=['latex', 'svg', 'png', 'jpg', 'jpeg']
+
+
 c.ExtractFigureTransformer.extra_ext_map={'svg':'pdf'}
 c.ExtractFigureTransformer.enabled=True
diff --git a/profile/python.nbcv b/profile/python.nbcv
index 75d5b2d..5cc51b5 100644
--- a/profile/python.nbcv
+++ b/profile/python.nbcv
@@ -1,6 +1,5 @@
 c = get_config()
 
-c.ConverterTemplate.extract_figures=False
 c.ConverterTemplate.template_file='python'
 c.ConverterTemplate.tex_environement=False
 
diff --git a/profile/rst.nbcv b/profile/rst.nbcv
index 53d5f96..f30f602 100644
--- a/profile/rst.nbcv
+++ b/profile/rst.nbcv
@@ -1,12 +1,12 @@
 c = get_config()
 
-c.ConverterTemplate.extract_figures=True
 c.ConverterTemplate.template_file='rst'
 c.ConverterTemplate.tex_environement=False
 
 c.NbconvertApp.fileext='rst'
 c.ExtractFigureTransformer.enabled=True
 
+c.GlobalConfigurable.display_data_priority      =['svg', 'png', 'latex',  'jpg', 'jpeg','text']
 c.ExtractFigureTransformer.display_data_priority=['svg', 'png', 'latex',  'jpg', 'jpeg','text']
 c.ConverterTemplate.display_data_priority=       ['svg', 'png', 'latex',  'jpg', 'jpeg','text']
 
diff --git a/tests/ipynbref/00_notebook_tour.orig.rst b/tests/ipynbref/00_notebook_tour_orig.rst
similarity index 100%
rename from tests/ipynbref/00_notebook_tour.orig.rst
rename to tests/ipynbref/00_notebook_tour_orig.rst
diff --git a/tests/template_ref/00_notebook_tour_orig.rst b/tests/template_ref/00_notebook_tour_orig.rst
index 0c198f6..6557bee 100644
--- a/tests/template_ref/00_notebook_tour_orig.rst
+++ b/tests/template_ref/00_notebook_tour_orig.rst
@@ -65,7 +65,6 @@ In[3]:
 Plots with matplotlib
 ---------------------
 
-
 IPython adds an 'inline' matplotlib backend, which embeds any matplotlib
 figures into the notebook.
 
@@ -168,6 +167,7 @@ In[19]:
 .. parsed-literal::
 
     0 1 2 3 4 5 6 7
+
 Clean crash and restart
 -----------------------
 
@@ -248,6 +248,10 @@ In[2]:
     Image(url='http://python.org/images/python-logo.gif')
 
 Out[2]:
+.. parsed-literal::
+
+    <IPython.core.display.Image at 0x1060e7410>
+
 
 SVG images are also supported out of the box (since modern browsers do a
 good job of rendering them):
@@ -314,6 +318,10 @@ In[6]:
     SoftLinked
 
 Out[6]:
+.. parsed-literal::
+
+    <IPython.core.display.Image at 0x10fb99b10>
+
 
 Of course, if you re-run the all notebook, the two images will be the
 same again.
@@ -338,6 +346,10 @@ In[7]:
     YouTubeVideo('1j_HxD4iLn8')
 
 Out[7]:
+.. parsed-literal::
+
+    <IPython.lib.display.YouTubeVideo at 0x10fba2190>
+
 
 Using the nascent video capabilities of modern browsers, you may also be
 able to display local videos. At the moment this doesn't work very well
@@ -360,6 +372,10 @@ In[8]:
     HTML(data=video_tag)
 
 Out[8]:
+.. parsed-literal::
+
+    <IPython.core.display.HTML at 0x10fba28d0>
+
 
 Local Files
 -----------
@@ -446,6 +462,10 @@ In[2]:
     FileLink('00_notebook_tour.ipynb')
 
 Out[2]:
+.. parsed-literal::
+
+    <IPython.lib.display.FileLink at 0x10f7ea3d0>
+
 
 Alternatively, if we want to link to all of them, we can use the
 ``FileLinks`` object, passing ``'.'`` to indicate that we want links
@@ -462,6 +482,10 @@ In[7]:
     FileLinks('.')
 
 Out[7]:
+.. parsed-literal::
+
+    <IPython.lib.display.FileLinks at 0x10f7eaad0>
+
 
 External sites
 ~~~~~~~~~~~~~~
@@ -476,6 +500,10 @@ In[9]:
     HTML('<iframe src=http://en.mobile.wikipedia.org/?useformat=mobile width=700 height=350></iframe>')
 
 Out[9]:
+.. parsed-literal::
+
+    <IPython.core.display.HTML at 0x1094900d0>
+
 
 Mathematics
 ~~~~~~~~~~~
@@ -630,4 +658,3 @@ In[16]:
 
 
 .. image:: _fig_60.png
-