Merge pull request #1509 from learning-unlimited/fix-letterhead

Fix letterhead

Author: jmoldow

.gitignore

@@ -6,6 +6,7 @@ esp/esp/local_settings.py
 *#
 esp/public/media/subsection_images/*
 esp/public/media/latex/*
+esp/public/media/latex_media/letterhead.*
 esp/public/media/email_images/*
 esp/public/media/uploaded/*
 esp/public/media/styles

esp/esp/survey/templatetags/survey.py

@@ -36,6 +36,9 @@
 from django.template import loader
 from esp.program.models.class_ import ClassSubject
 
+import os
+import subprocess
+
 try:
     import cPickle as pickle
 except ImportError:
@@ -109,8 +112,6 @@ def histogram(answer_list, format='html'):
     from django.conf import settings
     HISTOGRAM_PATH = 'images/histograms/'
     HISTOGRAM_DIR = settings.MEDIA_ROOT + HISTOGRAM_PATH
-    from esp.web.util.latex import get_rand_file_base
-    import os
     import tempfile
 
     image_width = 2.75
@@ -158,7 +159,8 @@ def histogram(answer_list, format='html'):
     import hashlib
     file_base = hashlib.sha1(pickle.dumps(context)).hexdigest()
     file_name = os.path.join(tempfile.gettempdir(), file_base+'.eps')
-    template_file = settings.TEMPLATE_DIRS[0] + '/survey/histogram_base.eps'
+    template_file = os.path.join(settings.TEMPLATE_DIRS[0],
+                                 'survey', 'histogram_base.eps')
 
     context['file_name'] = file_name # This guy depends on the SHA-1
 
@@ -170,13 +172,20 @@ def histogram(answer_list, format='html'):
 
     #   We have the necessary EPS file, now we do any necessary conversions and include
     #   it into the output.
+    png_filename = "%s.png" % file_base
     if format == 'tex':
-        return '\includegraphics[width=%fin]{%s}' % (image_width, file_name)
+        image_path = os.path.join(tempfile.gettempdir(), png_filename)
     elif format == 'html':
-        image_path = '%s%s.png' % (HISTOGRAM_DIR, file_base)
-        if not os.path.exists(image_path):
-            os.system('gs -dBATCH -dNOPAUSE -dTextAlphaBits=4 -dDEVICEWIDTHPOINTS=216 -dDEVICEHEIGHTPOINTS=162 -sDEVICE=png16m -R96 -sOutputFile=%s %s' % (image_path, file_name))
-        return '<img src="%s.png" />' % ('/media/' + HISTOGRAM_PATH + file_base)
+        image_path = os.path.join(HISTOGRAM_DIR, png_filename)
+    if not os.path.exists(image_path):
+        subprocess.call(['gs', '-dBATCH', '-dNOPAUSE', '-dTextAlphaBits=4',
+                         '-dDEVICEWIDTHPOINTS=216', '-dDEVICEHEIGHTPOINTS=162',
+                         '-sDEVICE=png16m', '-R96',
+                         '-sOutputFile=' + image_path, file_name])
+    if format == 'tex':
+        return '\includegraphics[width=%fin]{%s}' % (image_width, image_path)
+    if format == 'html':
+        return '<img src="%s" />' % ('/media/' + HISTOGRAM_PATH + png_filename)
 
 @register.filter
 def answer_to_list(ans):

esp/esp/web/util/latex.py

@@ -47,7 +47,7 @@
 TEX_TEMP = tempfile.gettempdir()
 TEX_EXT  = '.tex'
 
-def render_to_latex(filepath, context_dict=None, filetype='pdf', landscape=None):
+def render_to_latex(filepath, context_dict=None, filetype='pdf'):
     """ Render some tex source to latex. This will run the latex
         interpreter and generate the necessary file type
         (either pdf, tex, ps, dvi, or a log file)   """
@@ -67,20 +67,12 @@ def render_to_latex(filepath, context_dict=None, filetype='pdf', landscape=None)
 
     context['MEDIA_ROOT'] = settings.MEDIA_ROOT
     context['file_type'] = filetype
-        
 
     rendered_source = t.render(context)
 
-    #   Autodetect landscape mode if 'landscape' is in the first 10 lines of output
-    top_lines = rendered_source.split('\n')[:10]
-    if landscape is None:
-        if 'landscape' in '\n'.join(top_lines):
-            landscape=True
-    
-    return gen_latex(rendered_source, filetype, landscape)
-
+    return gen_latex(rendered_source, filetype)
 
-def gen_latex(texcode, type='pdf', landscape=False, remove_files=False, stdout=PIPE, stderr=STDOUT):
+def gen_latex(texcode, type='pdf', remove_files=False, stdout=PIPE, stderr=STDOUT):
     """Generate the latex code.
 
     :param texcode:
@@ -89,16 +81,12 @@ def gen_latex(texcode, type='pdf', landscape=False, remove_files=False, stdout=P
         `unicode`
     :param type:
         The type of file to generate.
-        Must be one of 'tex', 'dvi', 'ps', 'log', 'svg', or 'png'.
+        Must be one of 'pdf', 'tex', 'log', 'svg', or 'png'.
         'tex' returns texcode itself, without processing.
         'log' returns the log file from the execution of latex on texcode.
         The others return the compilation of texcode into that format.
     :type type:
-        `str`, element of ('tex', 'dvi', 'ps', 'log', 'svg', 'png')
-    :param landscape:
-        True if the output should be in landscape format, else False.
-    :type landscape:
-        `bool`
+        `str`, element of ('pdf', 'tex', 'log', 'svg', 'png')
     :param remove_files:
         True if intermediate build files should be removed, else False.
     :type remove_files:
@@ -132,67 +120,42 @@ def gen_latex(texcode, type='pdf', landscape=False, remove_files=False, stdout=P
     texfile.close()
 
 
-    file_types = ['pdf','dvi','ps','log','tex','svg','png']
+    file_types = ['pdf','log','tex','svg','png']
 
     # Get (sometimes-)necessary library files
     from django.conf import settings
     import shutil
 
     #   Set latex options
     latex_options = ['-interaction', 'nonstopmode', '-halt-on-error']
-    #   Set dvips options
-    dvips_options = ['-t', 'letter']
-    if landscape:
-        dvips_options = ['-t', 'letter,landscape']
 
     # All command calls will use the same values for the cwd, stdout, and
     # stderr arguments, so we define a partially-applied callable call()
     # that makes it easier to call check_call() with these values.
     call = partial(check_call, cwd=TEX_TEMP, stdout=stdout, stderr=stderr)
 
-    if type=='pdf':
+    if type == 'pdf':
         mime = 'application/pdf'
-        call(['latex'] + latex_options + ['%s.tex' % file_base])
-        call(['dvips'] + dvips_options + ['%s.dvi' % file_base])
-        call(['ps2pdf', '%s.ps' % file_base])
-        if remove_files:
-            os.remove('%s.dvi' % file_base)
-            os.remove('%s.ps' % file_base)
-            
-    elif type=='dvi':
-        mime = 'application/x-dvi'
-        call(['latex'] + latex_options + ['%s.tex' % file_base])
-        
-    elif type=='ps':
-        mime = 'application/postscript'
-        call(['latex'] + latex_options + ['%s.tex' % file_base])
-        call(['dvips'] + dvips_options + [file_base, '-o', '%s.ps' % file_base])
-        if remove_files:
-            os.remove('%s.dvi' % file_base)
-        
-    elif type=='log':
+        call(['pdflatex'] + latex_options + ['%s.tex' % file_base])
+
+    elif type == 'log':
         mime = 'text/plain'
         call(['latex'] + latex_options + ['%s.tex' % file_base])
 
-    elif type=='svg':
+    elif type == 'svg':
         mime = 'image/svg+xml'
-        call(['latex'] + latex_options + ['%s.tex' % file_base])
-        call(['dvips'] + dvips_options + ['%s.dvi' % file_base])
-        call(['ps2pdf', '%s.ps' % file_base])
+        call(['pdflatex'] + latex_options + ['%s.tex' % file_base])
         call(['inkscape', '%s.pdf' % file_base, '-l', '%s.svg' % file_base])
         if remove_files:
-            os.remove('%s.dvi' % file_base)
-            os.remove('%s.ps' % file_base)
             os.remove('%s.pdf' % file_base)
-        
-    elif type=='png':
+
+    elif type == 'png':
         mime = 'image/png'
-        call(['latex'] + latex_options + ['%s.tex' % file_base])
-        call(['dvips'] + dvips_options + ['%s.dvi' % file_base])
-        call(['convert', '-density', '192', '%s.ps' % file_base, '%s.png' % file_base])
+        call(['pdflatex'] + latex_options + ['%s.tex' % file_base])
+        call(['convert', '-density', '192',
+              '%s.pdf' % file_base, '%s.png' % file_base])
         if remove_files:
-            os.remove('%s.dvi' % file_base)
-            os.remove('%s.ps' % file_base)
+            os.remove('%s.pdf' % file_base)
 
     else:
         raise ESPError('Invalid type received for latex generation: %s should be one of %s' % (type, file_types))