##// END OF EJS Templates
fix fileext and html multidisplay
Matthias BUSSONNIER -
Show More
@@ -5,4 +5,6 b' c.ConverterTemplate.extract_figures=False'
5 c.ConverterTemplate.template_file='basichtml'
5 c.ConverterTemplate.template_file='basichtml'
6 c.ConverterTemplate.tex_environement=False
6 c.ConverterTemplate.tex_environement=False
7
7
8 c.NbconvertApp.fileext='html'
9
8 c.ExtractFigureTransformer.enabled = False
10 c.ExtractFigureTransformer.enabled = False
@@ -5,4 +5,6 b' c.ConverterTemplate.extract_figures=False'
5 c.ConverterTemplate.template_file='fullhtml'
5 c.ConverterTemplate.template_file='fullhtml'
6 c.ConverterTemplate.tex_environement=False
6 c.ConverterTemplate.tex_environement=False
7
7
8 c.NbconvertApp.fileext='html'
9
8 c.ExtractFigureTransformer.enabled = False
10 c.ExtractFigureTransformer.enabled = False
@@ -5,6 +5,7 b" c.ConverterTemplate.template_file='latex_base'"
5 c.ConverterTemplate.tex_environement=True
5 c.ConverterTemplate.tex_environement=True
6 c.ConverterTemplate.display_data_priority=['latex', 'svg', 'png', 'jpg', 'jpeg' , 'text']
6 c.ConverterTemplate.display_data_priority=['latex', 'svg', 'png', 'jpg', 'jpeg' , 'text']
7 c.ExtractFigureTransformer.display_data_priority=['latex', 'svg', 'png', 'jpg', 'jpeg']
7 c.ExtractFigureTransformer.display_data_priority=['latex', 'svg', 'png', 'jpg', 'jpeg']
8 c.NbconvertApp.fileext='tex'
8
9
9 c.ExtractFigureTransformer.extra_ext_map={'svg':'pdf'}
10 c.ExtractFigureTransformer.extra_ext_map={'svg':'pdf'}
10 c.ExtractFigureTransformer.enabled=True
11 c.ExtractFigureTransformer.enabled=True
@@ -3,3 +3,5 b' c = get_config()'
3 c.ConverterTemplate.extract_figures=False
3 c.ConverterTemplate.extract_figures=False
4 c.ConverterTemplate.template_file='python'
4 c.ConverterTemplate.template_file='python'
5 c.ConverterTemplate.tex_environement=False
5 c.ConverterTemplate.tex_environement=False
6
7 c.NbconvertApp.fileext='py'
@@ -38,6 +38,8 b' class NbconvertApp(Application):'
38 stdout = Bool(True, config=True)
38 stdout = Bool(True, config=True)
39 write = Bool(False, config=True)
39 write = Bool(False, config=True)
40
40
41 fileext = Unicode('txt', config=True)
42
41 aliases = {
43 aliases = {
42 'stdout':'NbconvertApp.stdout',
44 'stdout':'NbconvertApp.stdout',
43 'write':'NbconvertApp.write',
45 'write':'NbconvertApp.write',
@@ -98,7 +100,7 b' class NbconvertApp(Application):'
98
100
99 keys = resources.keys()
101 keys = resources.keys()
100 if self.write :
102 if self.write :
101 with io.open(os.path.join(out_root+'.'+'ext'),'w') as f:
103 with io.open(os.path.join(out_root+'.'+self.fileext),'w') as f:
102 f.write(output)
104 f.write(output)
103 if keys :
105 if keys :
104 if self.write and not os.path.exists(out_root+'_files'):
106 if self.write and not os.path.exists(out_root+'_files'):
@@ -14,13 +14,11 b''
14 {% endblock input_group %}
14 {% endblock input_group %}
15
15
16 {% block output_group -%}
16 {% block output_group -%}
17 <div class="vbox output_wrapper">
17 <div class="output_wrapper">
18 <div class="output vbox">
18 <div class="output vbox">
19 <div class="hbox output_area">
20 {{ super() }}
19 {{ super() }}
21 </div>
20 </div>
22 </div>
21 </div>
23 </div>
24 {% endblock output_group %}
22 {% endblock output_group %}
25
23
26
24
@@ -30,10 +28,12 b''
30
28
31 {% block output_prompt -%}
29 {% block output_prompt -%}
32 <div class="prompt output_prompt">
30 <div class="prompt output_prompt">
31 <div class="output vbox">
33 {%- if cell.haspyout -%}
32 {%- if cell.haspyout -%}
34 Out[{{cell.prompt_number}}]:
33 Out[{{cell.prompt_number}}]:
35 {%- endif -%}
34 {%- endif -%}
36 </div>
35 </div>
36 </div>
37 {% endblock output_prompt %}
37 {% endblock output_prompt %}
38
38
39 {% block input %}
39 {% block input %}
@@ -67,21 +67,30 b' unknown type {{cell.type}}'
67
67
68
68
69 {% block pyout -%}
69 {% block pyout -%}
70 <div class="output_subarea output_pyout">
70 <div class="hbox output_area">
71 <div class="prompt"></div>
72 <div class="box-flex1 output_subarea output_pyout">
71 {% block data_priority scoped %}{{ super()}}{% endblock %}
73 {% block data_priority scoped %}{{ super()}}{% endblock %}
72 </div>
74 </div>
75 </div>
73 {%- endblock pyout %}
76 {%- endblock pyout %}
74
77
75 {% block stream_stdout -%}
78 {% block stream_stdout -%}
76 <div class="output_subarea output_stream output_stdout">
79 <div class="hbox output_area">
80 <div class="prompt"></div>
81 <div class="box-flex1 output_subarea output_stream output_stdout">
77 <pre>{{output.text |ansi2html}}</pre>
82 <pre>{{output.text |ansi2html}}</pre>
78 </div>
83 </div>
84 </div>
79 {%- endblock stream_stdout %}
85 {%- endblock stream_stdout %}
80
86
81 {% block stream_stderr -%}
87 {% block stream_stderr -%}
82 <div class="output_subarea output_stream output_stderr">
88 <div class="hbox output_area">
89 <div class="prompt"></div>
90 <div class="box-flex1 output_subarea output_stream output_stderr">
83 <pre>{{output.text |ansi2html}}</pre>
91 <pre>{{output.text |ansi2html}}</pre>
84 </div>
92 </div>
93 </div>
85 {%- endblock stream_stderr %}
94 {%- endblock stream_stderr %}
86
95
87 {% block data_svg -%}
96 {% block data_svg -%}
@@ -110,9 +119,12 b' unknown type {{cell.type}}'
110 {%- endblock data_latex %}
119 {%- endblock data_latex %}
111
120
112 {% block pyerr -%}
121 {% block pyerr -%}
113 <div class="output_subarea output_pyerr">
122 <div class="hbox output_area">
123 <div class="prompt"></div>
124 <div class="box-flex1 output_subarea output_pyerr">
114 <pre>{{super()}}</pre>
125 <pre>{{super()}}</pre>
115 </div>
126 </div>
127 </div>
116 {%- endblock pyerr %}
128 {%- endblock pyerr %}
117
129
118 {%- block traceback_line %}
130 {%- block traceback_line %}
@@ -126,7 +138,10 b' unknown type {{cell.type}}'
126
138
127
139
128 {%- block display_data scoped -%}
140 {%- block display_data scoped -%}
129 <div class="output_subarea output_display_data">
141 <div class="hbox output_area">
142 <div class="prompt"></div>
143 <div class="box-flex1 output_subarea output_display_data">
130 {{super()}}
144 {{super()}}
131 </div>
145 </div>
146 </div>
132 {%- endblock display_data -%}
147 {%- endblock display_data -%}
General Comments 0
You need to be logged in to leave comments. Login now