move raw cell inclusion to null.tpl

select based on raw_format metadata key if defined.
Default behavior is to include raw cells of unspecified format (consistent with existing behavior).

IPython/nbconvert/templates/html_basic.tpl

@@ -65,10 +65,6 b' In [{{ cell.prompt_number }}]:'
 </div>
 {% endblock headingcell %}
 
-{% block rawcell scoped %}
-{{ cell.source }}
-{% endblock rawcell %}
-
 {% block unknowncell scoped %}
 unknown type  {{ cell.type }}
 {% endblock unknowncell %}

IPython/nbconvert/templates/latex/latex_base.tplx

@@ -218,11 +218,6 b' This template does not define a docclass, the inheriting class must define this.'
     ((( cell.source | citation2latex | 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 *))

IPython/nbconvert/templates/latex/skeleton/null.tplx

@@ -80,7 +80,10 b' consider calling super even if it is a leave block, we might insert more blocks '
                 ((*- block headingcell scoped-*))
                 ((*- endblock headingcell -*))
             ((*- elif cell.cell_type in ['raw'] -*))
-                ((*- block rawcell scoped-*))
+                ((*- block rawcell scoped -*))
+                ((* if cell.metadata.get('raw_format', resources.get('raw_format')) == resources.get('raw_format') *))
+                ((( cell.source )))
+                ((* endif *))
                 ((*- endblock rawcell -*))
             ((*- else -*))
                 ((*- block unknowncell scoped-*))

IPython/nbconvert/templates/markdown.tpl

@@ -63,10 +63,6 b''
 {{ '#' * cell.level }} {{ cell.source | replace('\n', ' ') }}
 {% endblock headingcell %}
 
-{% block rawcell scoped %}
-{{ cell.source }}
-{% endblock rawcell %}
-
 {% block unknowncell scoped %}
 unknown type  {{ cell.type }}
 {% endblock unknowncell %}
  No newline at end of file

IPython/nbconvert/templates/python.tpl

@@ -46,10 +46,6 b' it introduces a new line'
 {{ '#' * cell.level }}{{ cell.source | replace('\n', ' ') | comment_lines }}
 {% endblock headingcell %}
 
-{% block rawcell scoped %}
-{{ cell.source | comment_lines }}
-{% endblock rawcell %}
-
 {% block unknowncell scoped %}
 unknown type  {{ cell.type }}
 {% endblock unknowncell %}
  No newline at end of file

IPython/nbconvert/templates/rst.tpl

@@ -75,10 +75,6 b''
 {{ ("#" * cell.level + cell.source) | replace('\n', ' ') | markdown2rst }}
 {% endblock headingcell %}
 
-{% block rawcell scoped %}
-{{ cell.source }}
-{% endblock rawcell %}
-
 {% block unknowncell scoped %}
 unknown type  {{cell.type}}
 {% endblock unknowncell %}

IPython/nbconvert/templates/skeleton/null.tpl

@@ -76,7 +76,10 b' consider calling super even if it is a leave block, we might insert more blocks '
                 {%- block headingcell scoped-%}
                 {%- endblock headingcell -%}
             {%- elif cell.cell_type in ['raw'] -%}
-                {%- block rawcell scoped-%}
+                {%- block rawcell scoped -%}
+                {% if cell.metadata.get('raw_format', resources.get('raw_format', '')).lower() in resources.get('raw_formats', ['']) %}
+                {{ cell.source }}
+                {% endif %}
                 {%- endblock rawcell -%}
             {%- else -%}
                 {%- block unknowncell scoped-%}