Changeset 124

Timestamp:

10/03/05 12:38:39 (3 years ago)

Author:

vgough

Message:

LatexFormulaMacro:

Make image format selectable via 'image_format' configuration option (defaults
to 'jpg').

Allow paths to executables to be specified in configuration by setting
'latex_path', 'dvips_path', 'convert_path' to point to executable. Based on
code by Reed Cartwright.

Files:

• latexformulamacro/0.8/formula.py (modified) (8 diffs)

latexformulamacro/0.8/formula.py

@@ -4 +4 @@
-
-Changes:
+    2005-10-03:
+        * make image format selectable via 'image_format' configuration option
+          (defaults to 'jpg')
+        * allow paths to executables to be specified in configuration by
+          setting 'latex_path', 'dvips_path', 'convert_path' to point to
+          executable. Based on code by Reed Cartwright.
-    2005-10-01:
-        * add #display and #fleqn options to add html formatting around image
@@ -106 +112 @@
-    displayPath = env.get_config('latex', 'display_path')
-    fleqnIndent = env.get_config('latex', 'fleqn_indent')
+    latexPath = env.get_config('latex', 'latex_path')
+    dvipsPath = env.get_config('latex', 'dvips_path')
+    convertPath = env.get_config('latex', 'convert_path')
+    texMag = env.get_config('latex', 'mag')
+    imageFormat = env.get_config('latex', 'image_format')
-
-    if not tmpdir or not imagePath or not displayPath:
-        return "<b>Error: missing configuration settings in 'latex' macro</b><br>"
-
+    # set defaults
-    if not fleqnIndent:
-        fleqnIndent = '5%'
+    if not latexPath:
+        latexPath = 'latex'
+    if not dvipsPath:
+        dvipsPath = 'dvips'
+    if not convertPath:
+        convertPath = 'convert'
+    if not texMag:
+        texMag = '1' # TODO: need a reasonable default here..
+    if not imageFormat:
+        imageFormat = 'jpg'
-
-    path = tmpdir # + hdf.getValue("project.name.encoded", "default")
@@ -127 +149 @@
-    hash.update( outputVersion )
-    name = hash.hexdigest()
-jpgFile = "%s/%s.jpg" % (imagePath, name
+imageFile = "%s/%s.%s" % (imagePath, name, imageFormat
-
-    log = "<br>"
-jpg
+image
-        # latex writes out lots of stuff to the current directory, so we have
-        # to run it from there.
@@ -137 +159 @@
-
-        texFile = name + ".tex"
-
+, texMag
-
-        # the output from latex on stdout seems to cause problems, so sent it
-        # to /dev/null
-latex %s > /dev/null" % texFile
+%s %s > /dev/null" % (latexPath, texFile)
-        log += execprog( cmd )
-        os.chdir(cwd)
@@ -148 +170 @@
-        dviFile = "%s/%s.dvi" % (path, name)
-        epsFile = "%s/%s.eps" % (path, name)
-dvips -q -D 600 -E -n 1 -p 1 -o %s %s" % (
+%s -q -D 600 -E -n 1 -p 1 -o %s %s" % (dvipsPath, 
-        log += execprog( cmd )
-
-jpg
-convert -antialias -density %ix%i %s %s" % (density, density, epsFile, jpg
+[imageFormat] type
+%s -antialias -density %ix%i %s %s" % (convertPath, density, density, epsFile, image
-        log += execprog( cmd )
-
@@ -160 +182 @@
-        margin = ""
-        
-jpg' border='0' style='vertical-align: middle;%s' alt='formula' />" % (displayPath, name
+%s' border='0' style='vertical-align: middle;%s' alt='formula' />" % (displayPath, name, imageFormat
-    return html
-
@@ -167 +189 @@
-    return cmd + "<br>"
-
-
+, texMag
-    tex = "\\batchmode\n"
-    tex += "\\documentclass{article}\n"
@@ -174 +196 @@
-    tex += "\\usepackage{epsfig}\n"
-    tex += "\\pagestyle{empty}\n"
+# TODO: magnification doesn't work correctly..
+    #tex += "\\mag=%s\n" % texMag
-    # matrix macro
-    tex += "\\newcommand{\\mat}[2][rrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr]{\n"