X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Fscripts%2Flyxpreview2bitmap.py;h=eee000deeae33840f085d6554a0a82305b811850;hb=dcf06fdb22bf39637aa7e11e59ca281d921fcbc7;hp=3acab8dc22209875048de222ebab3143a7e96839;hpb=2dfa11904f00a3be13e6968c19ba02480ec4e72d;p=lyx.git
diff --git a/lib/scripts/lyxpreview2bitmap.py b/lib/scripts/lyxpreview2bitmap.py
index 3acab8dc22..eee000deea 100755
--- a/lib/scripts/lyxpreview2bitmap.py
+++ b/lib/scripts/lyxpreview2bitmap.py
@@ -1,4 +1,3 @@
-#! /usr/bin/env python
# -*- coding: utf-8 -*-
# file lyxpreview2bitmap.py
@@ -16,6 +15,7 @@
# png or ppm image files, one per previewed snippet.
# Pre-requisites:
+# * python 2.4 or later (subprocess module);
# * A latex executable;
# * preview.sty;
# * dvipng;
@@ -29,16 +29,28 @@
# CTAN/support/preview-latex/
# Example usage:
-# lyxpreview2bitmap.py png 0lyxpreview.tex 128 000000 faf0e6
-
-# This script takes six arguments:
-# FORMAT: The desired output format. Either 'png' or 'ppm'.
-# TEXFILE: the name of the .tex file to be converted.
-# DPI: a scale factor, used to ascertain the resolution of the
-# generated image which is then passed to gs.
-# FG_COLOR: the foreground color as a hexadecimal string, eg '000000'.
-# BG_COLOR: the background color as a hexadecimal string, eg 'faf0e6'.
-# CONVERTER: the converter (optional). Default is latex.
+# lyxpreview2bitmap.py --bg=faf0e6 0lyxpreview.tex
+
+# This script takes one obligatory argument:
+#
+# : The name of the .tex file to be converted.
+#
+# and these optional arguments:
+#
+# --png, --ppm: The desired output format. Either 'png' or 'ppm'.
+# --dpi=: A scale factor, used to ascertain the resolution of the
+# generated image which is then passed to gs.
+# --fg=: The foreground color as a hexadecimal string, eg '000000'.
+# --bg=: The background color as a hexadecimal string, eg 'faf0e6'.
+# --latex=: The converter for latex files. Default is latex.
+# --bibtex=: The converter for bibtex files. Default is bibtex.
+# --lilypond: Preprocess through lilypond-book. Default is false.
+# --lilypond-book=:
+# The converter for lytex files. Default is lilypond-book.
+#
+# -d, --debug Show the output from external commands.
+# -h, --help Show an help screen and exit.
+# -v, --verbose Show progress messages.
# Decomposing TEXFILE's name as DIR/BASE.tex, this script will,
# if executed successfully, leave in DIR:
@@ -63,26 +75,43 @@
# Moreover dvipng can't work with PDF files, so, if the CONVERTER
# paramter is pdflatex we have to fallback to legacy route (step 2).
-import glob, os, re, string, sys
+from __future__ import print_function
-from legacy_lyxpreview2ppm import legacy_conversion, \
- legacy_conversion_step2, legacy_extract_metrics_info, filter_pages
+import getopt, glob, os, re, shutil, sys, tempfile
-from lyxpreview_tools import copyfileobj, error, find_exe, \
- find_exe_or_terminate, make_texcolor, mkstemp, run_command, warning, \
- write_metrics_info, join_metrics_and_rename
+import lyxpreview_tools
+from legacy_lyxpreview2ppm import extract_resolution, legacy_conversion_step1
-# Pre-compiled regular expressions.
-latex_file_re = re.compile("\.tex$")
+from lyxpreview_tools import bibtex_commands, check_latex_log, copyfileobj, \
+ error, filter_pages, find_exe, find_exe_or_terminate, \
+ join_metrics_and_rename, latex_commands, latex_file_re, make_texcolor, \
+ pdflatex_commands, progress, run_command, run_latex, run_tex, \
+ warning, write_metrics_info
-# PATH environment variable
-path = string.split(os.environ["PATH"], os.pathsep)
+PY2 = sys.version_info[0] == 2
def usage(prog_name):
- return "Usage: %s \n" \
- "\twhere the colors are hexadecimal strings, eg 'faf0e6'" \
- % prog_name
+ msg = """
+Usage: %s
+
+Options:
+ --dpi=: Resolution per inch (default: 128)
+ --png, --ppm: Select the output format (default: png)
+ --fg=: Foreground color (default: black, ie '000000')
+ --bg=: Background color (default: white, ie 'ffffff')
+ --latex=: Specify the executable for latex (default: latex)
+ --bibtex=: Specify the executable for bibtex (default: bibtex)
+ --lilypond: Preprocess through lilypond-book (default: false)
+ --lilypond-book=:
+ The executable for lilypond-book (default: lilypond-book)
+
+ -d, --debug: Show the output from external commands
+ -h, --help: Show this help screen and exit
+ -v, --verbose: Show progress messages
+
+The colors are hexadecimal strings, eg 'faf0e6'."""
+ return msg % prog_name
# Returns a list of tuples containing page number and ascent fraction
# extracted from dvipng output.
@@ -110,11 +139,14 @@ def extract_metrics_info(dvipng_stdout):
success = 1
# Calculate the 'ascent fraction'.
- descent = string.atof(match.group(1))
- ascent = string.atof(match.group(2))
+ descent = float(match.group(1))
+ ascent = float(match.group(2))
frac = 0.5
- if ascent >= 0 or descent >= 0:
+ if ascent < 0:
+ # This is an empty image, forbid its display
+ frac = -1.0
+ elif ascent >= 0 or descent >= 0:
if abs(ascent + descent) > 0.1:
frac = ascent / (ascent + descent)
@@ -131,61 +163,37 @@ def extract_metrics_info(dvipng_stdout):
return results
-def color_pdf(latex_file, bg_color, fg_color):
- use_preview_pdf_re = re.compile("(\s*\\\\usepackage\[[^]]+)((pdftex|xetex)\]{preview})")
-
- tmp = mkstemp()
-
- fg = ""
- if fg_color != "0.000000,0.000000,0.000000":
- fg = ' \\AtBeginDocument{\\let\\oldpreview\\preview\\renewcommand\\preview{\\oldpreview\\color[rgb]{%s}}}\n' % (fg_color)
-
- success = 0
- try:
- for line in open(latex_file, 'r').readlines():
- match = use_preview_pdf_re.match(line)
- if match == None:
- tmp.write(line)
- continue
- success = 1
- tmp.write(" \\usepackage{color}\n" \
- " \\pagecolor[rgb]{%s}\n" \
- "%s" \
- "%s\n" \
- % (bg_color, fg, match.group()))
- continue
-
- except:
- # Unable to open the file, but do nothing here because
- # the calling function will act on the value of 'success'.
- warning('Warning in color_pdf! Unable to open "%s"' % latex_file)
- warning(`sys.exc_type` + ',' + `sys.exc_value`)
-
- if success:
- copyfileobj(tmp, open(latex_file,"wb"), 1)
-
- return success
-
-
-def fix_latex_file(latex_file):
- documentclass_re = re.compile("(\\\\documentclass\[)(1[012]pt,?)(.+)")
+def fix_latex_file(latex_file, pdf_output):
+ # python 2 does not allow to declare a string as raw byte so we double
+ # the backslashes and remove the r preffix
+ def_re = re.compile(b"(\\\\newcommandx|\\\\global\\\\long\\\\def)"
+ b"(\\\\[a-zA-Z]+)")
- tmp = mkstemp()
+ tmp = tempfile.TemporaryFile()
- changed = 0
- for line in open(latex_file, 'r').readlines():
- match = documentclass_re.match(line)
- if match == None:
- tmp.write(line)
- continue
-
- changed = 1
- tmp.write("%s%s\n" % (match.group(1), match.group(3)))
+ changed = False
+ macros = []
+ for line in open(latex_file, 'rb').readlines():
+ if not pdf_output and line.startswith(b"\\documentclass"):
+ changed = True
+ line += b"\\PassOptionsToPackage{draft}{microtype}\n"
+ else:
+ match = def_re.match(line)
+ if match != None:
+ macroname = match.group(2)
+ if macroname in macros:
+ definecmd = match.group(1)
+ if definecmd == b"\\newcommandx":
+ changed = True
+ line = line.replace(definecmd, b"\\renewcommandx")
+ else:
+ macros.append(macroname)
+ tmp.write(line)
if changed:
copyfileobj(tmp, open(latex_file,"wb"), 1)
- return
+ return changed
def convert_to_ppm_format(pngtopnm, basename):
@@ -196,7 +204,7 @@ def convert_to_ppm_format(pngtopnm, basename):
p2p_cmd = '%s "%s"' % (pngtopnm, png_file)
p2p_status, p2p_stdout = run_command(p2p_cmd)
- if p2p_status != None:
+ if p2p_status:
error("Unable to convert %s to ppm format" % png_file)
ppm = open(ppm_file, 'w')
@@ -205,49 +213,71 @@ def convert_to_ppm_format(pngtopnm, basename):
# Returns a tuple of:
# ps_pages: list of page indexes of pages containing PS literals
+# pdf_pages: list of page indexes of pages requiring running pdflatex
# page_count: total number of pages
-# pages_parameter: parameter for dvipng to exclude pages with PostScript
+# pages_parameter: parameter for dvipng to exclude pages with PostScript/PDF
def find_ps_pages(dvi_file):
# latex failed
# FIXME: try with pdflatex
if not os.path.isfile(dvi_file):
error("No DVI output.")
- # Check for PostScript specials in the dvi, badly supported by dvipng
+ # Check for PostScript specials in the dvi, badly supported by dvipng,
+ # and inclusion of PDF/PNG/JPG files.
# This is required for correct rendering of PSTricks and TikZ
- dv2dt = find_exe_or_terminate(["dv2dt"], path)
+ dv2dt = find_exe_or_terminate(["dv2dt"])
dv2dt_call = '%s "%s"' % (dv2dt, dvi_file)
# The output from dv2dt goes to stdout
dv2dt_status, dv2dt_output = run_command(dv2dt_call)
psliteral_re = re.compile("^special[1-4] [0-9]+ '(\"|ps:)")
-
- # Parse the dtl file looking for PostScript specials.
- # Pages using PostScript specials are recorded in ps_pages and then
- # used to create a different LaTeX file for processing in legacy mode.
+ hyperref_re = re.compile("^special[1-4] [0-9]+ 'ps:.*/DEST pdfmark")
+ pdffile_re = re.compile("^special[1-4] [0-9]+ 'PSfile=.*\\.(pdf|png|jpg|jpeg|PDF|PNG|JPG|JPEG)")
+
+ # Parse the dtl file looking for PostScript specials and pdflatex files.
+ # Pages using PostScript specials or pdflatex files are recorded in
+ # ps_pages or pdf_pages, respectively, and then used to create a
+ # different LaTeX file for processing in legacy mode.
+ # If hyperref is detected, the corresponding page is recorded in pdf_pages.
page_has_ps = False
+ page_has_pdf = False
page_index = 0
ps_pages = []
+ pdf_pages = []
+ ps_or_pdf_pages = []
for line in dv2dt_output.split("\n"):
# New page
if line.startswith("bop"):
page_has_ps = False
+ page_has_pdf = False
page_index += 1
# End of page
- if line.startswith("eop") and page_has_ps:
- # We save in a list all the PostScript pages
- ps_pages.append(page_index)
+ if line.startswith("eop") and (page_has_ps or page_has_pdf):
+ # We save in a list all the PostScript/PDF pages
+ if page_has_ps:
+ ps_pages.append(page_index)
+ else:
+ pdf_pages.append(page_index)
+ ps_or_pdf_pages.append(page_index)
if psliteral_re.match(line) != None:
# Literal PostScript special detected!
- page_has_ps = True
+ # If hyperref is detected, put this page on the pdf pages list
+ if hyperref_re.match(line) != None:
+ page_has_ps = False
+ page_has_pdf = True
+ else:
+ page_has_ps = True
+ elif pdffile_re.match(line) != None:
+ # Inclusion of pdflatex image file detected!
+ page_has_pdf = True
# Create the -pp parameter for dvipng
pages_parameter = ""
- if len(ps_pages) > 0 and len(ps_pages) < page_index:
- # Don't process Postscript pages with dvipng by selecting the
+ if len(ps_or_pdf_pages) > 0 and len(ps_or_pdf_pages) < page_index:
+ # Don't process Postscript/PDF pages with dvipng by selecting the
# wanted pages through the -pp parameter. E.g., dvipng -pp 4-12,14,64
pages_parameter = " -pp "
skip = True
@@ -255,8 +285,8 @@ def find_ps_pages(dvi_file):
# Use page ranges, as a list of pages could exceed command line
# maximum length (especially under Win32)
- for index in xrange(1, page_index + 1):
- if (not index in ps_pages) and skip:
+ for index in range(1, page_index + 1):
+ if (not index in ps_or_pdf_pages) and skip:
# We were skipping pages but current page shouldn't be skipped.
# Add this page to -pp, it could stay alone or become the
# start of a range.
@@ -265,7 +295,7 @@ def find_ps_pages(dvi_file):
last = index
# We're not skipping anymore
skip = False
- elif (index in ps_pages) and (not skip):
+ elif (index in ps_or_pdf_pages) and (not skip):
# We weren't skipping but current page should be skipped
if last != index - 1:
# If the start index of the range is the previous page
@@ -280,67 +310,170 @@ def find_ps_pages(dvi_file):
# Remove the trailing separator
pages_parameter = pages_parameter.rstrip(",")
# We've to manage the case in which the last page is closing a range
- if (not index in ps_pages) and (not skip) and (last != index):
+ if (not index in ps_or_pdf_pages) and (not skip) and (last != index):
pages_parameter += "-" + str(index)
- return (ps_pages, page_index, pages_parameter)
+ return (ps_pages, pdf_pages, page_index, pages_parameter)
def main(argv):
- # Parse and manipulate the command line arguments.
- if len(argv) != 6 and len(argv) != 7:
- error(usage(argv[0]))
+ # Set defaults.
+ dpi = 128
+ fg_color = "000000"
+ bg_color = "ffffff"
+ bibtex = None
+ latex = None
+ lilypond = False
+ lilypond_book = None
+ output_format = "png"
+ script_name = argv[0]
- output_format = string.lower(argv[1])
-
- dir, latex_file = os.path.split(argv[2])
+ # Parse and manipulate the command line arguments.
+ try:
+ (opts, args) = getopt.gnu_getopt(argv[1:], "dhv", ["bibtex=", "bg=",
+ "debug", "dpi=", "fg=", "help", "latex=", "lilypond",
+ "lilypond-book=", "png", "ppm", "verbose"])
+ except getopt.GetoptError as err:
+ error("%s\n%s" % (err, usage(script_name)))
+
+ opts.reverse()
+ for opt, val in opts:
+ if opt in ("-h", "--help"):
+ print(usage(script_name))
+ sys.exit(0)
+ elif opt == "--bibtex":
+ bibtex = [val]
+ elif opt == "--bg":
+ bg_color = val
+ elif opt in ("-d", "--debug"):
+ lyxpreview_tools.debug = True
+ elif opt == "--dpi":
+ try:
+ dpi = int(val)
+ except:
+ error("Cannot convert %s to an integer value" % val)
+ elif opt == "--fg":
+ fg_color = val
+ elif opt == "--latex":
+ latex = [val]
+ elif opt == "--lilypond":
+ lilypond = True
+ elif opt == "--lilypond-book":
+ lilypond_book = [val]
+ elif opt in ("--png", "--ppm"):
+ output_format = opt[2:]
+ elif opt in ("-v", "--verbose"):
+ lyxpreview_tools.verbose = True
+
+ # Determine input file
+ if len(args) != 1:
+ err = "A single input file is required, %s given" % (len(args) or "none")
+ error("%s\n%s" % (err, usage(script_name)))
+
+ input_path = args[0]
+ dir, latex_file = os.path.split(input_path)
+
+ # Check for the input file
+ if not os.path.exists(input_path):
+ error('File "%s" not found.' % input_path)
if len(dir) != 0:
os.chdir(dir)
- dpi = string.atoi(argv[3])
- fg_color = make_texcolor(argv[4], False)
- bg_color = make_texcolor(argv[5], False)
-
- fg_color_gr = make_texcolor(argv[4], True)
- bg_color_gr = make_texcolor(argv[5], True)
+ if lyxpreview_tools.verbose:
+ f_out = open('verbose.txt', 'a')
+ sys.stdout = f_out
+ sys.stderr = f_out
+
+ # Echo the settings
+ progress("Running Python %s" % str(sys.version_info[:3]))
+ progress("Starting %s..." % script_name)
+ if os.name == "nt":
+ progress("Use win32_modules: %d" % lyxpreview_tools.use_win32_modules)
+ progress("Output format: %s" % output_format)
+ progress("Foreground color: %s" % fg_color)
+ progress("Background color: %s" % bg_color)
+ progress("Resolution (dpi): %s" % dpi)
+ progress("File to process: %s" % input_path)
+
+ # For python > 2 convert strings to bytes
+ if not PY2:
+ fg_color = bytes(fg_color, 'ascii')
+ bg_color = bytes(bg_color, 'ascii')
+
+ fg_color_dvipng = make_texcolor(fg_color, False)
+ bg_color_dvipng = make_texcolor(bg_color, False)
+
+ # For python > 2 convert bytes to string
+ if not PY2:
+ fg_color_dvipng = fg_color_dvipng.decode('ascii')
+ bg_color_dvipng = bg_color_dvipng.decode('ascii')
# External programs used by the script.
- if len(argv) == 7:
- latex = argv[6]
- else:
- latex = find_exe_or_terminate(["latex", "pplatex", "platex", "latex2e"], path)
-
- # Omit font size specification in latex file.
- fix_latex_file(latex_file)
+ latex = find_exe_or_terminate(latex or latex_commands)
+ bibtex = find_exe(bibtex or bibtex_commands)
+ if lilypond:
+ lilypond_book = find_exe_or_terminate(lilypond_book or
+ ["lilypond-book --safe"])
+
+ # These flavors of latex are known to produce pdf output
+ pdf_output = latex in pdflatex_commands
+
+ progress("Latex command: %s" % latex)
+ progress("Latex produces pdf output: %s" % pdf_output)
+ progress("Bibtex command: %s" % bibtex)
+ progress("Lilypond-book command: %s" % lilypond_book)
+ progress("Preprocess through lilypond-book: %s" % lilypond)
+ progress("Altering the latex file for font size and colors")
+
+ # Make sure that multiple defined macros and the microtype package
+ # don't cause issues in the latex file.
+ fix_latex_file(latex_file, pdf_output)
+
+ if lilypond:
+ progress("Preprocess the latex file through %s" % lilypond_book)
+ if pdf_output:
+ lilypond_book += " --pdf"
+ lilypond_book += " --latex-program=%s" % latex.split()[0]
+
+ # Make a copy of the latex file
+ lytex_file = latex_file_re.sub(".lytex", latex_file)
+ shutil.copyfile(latex_file, lytex_file)
+
+ # Preprocess the latex file through lilypond-book.
+ lytex_status, lytex_stdout = run_tex(lilypond_book, lytex_file)
+
+ if pdf_output:
+ progress("Using the legacy conversion method (PDF support)")
+ return legacy_conversion_step1(latex_file, dpi, output_format, fg_color,
+ bg_color, latex, pdf_output)
# This can go once dvipng becomes widespread.
- dvipng = find_exe(["dvipng"], path)
+ dvipng = find_exe(["dvipng"])
if dvipng == None:
- # The data is input to legacy_conversion in as similar
- # as possible a manner to that input to the code used in
- # LyX 1.3.x.
- vec = [ argv[0], argv[2], argv[3], argv[1], argv[4], argv[5], latex ]
- return legacy_conversion(vec)
+ progress("Using the legacy conversion method (dvipng not found)")
+ return legacy_conversion_step1(latex_file, dpi, output_format, fg_color,
+ bg_color, latex, pdf_output)
+
+ dv2dt = find_exe(["dv2dt"])
+ if dv2dt == None:
+ progress("Using the legacy conversion method (dv2dt not found)")
+ return legacy_conversion_step1(latex_file, dpi, output_format, fg_color,
+ bg_color, latex, pdf_output)
pngtopnm = ""
if output_format == "ppm":
- pngtopnm = find_exe_or_terminate(["pngtopnm"], path)
-
- # Move color information for PDF into the latex file.
- if not color_pdf(latex_file, bg_color_gr, fg_color_gr):
- error("Unable to move color info into the latex file")
+ pngtopnm = find_exe(["pngtopnm"])
+ if pngtopnm == None:
+ progress("Using the legacy conversion method (pngtopnm not found)")
+ return legacy_conversion_step1(latex_file, dpi, output_format,
+ fg_color, bg_color, latex, pdf_output)
# Compile the latex file.
- latex_call = '%s "%s"' % (latex, latex_file)
-
- latex_status, latex_stdout = run_command(latex_call)
- if latex_status != None:
- warning("%s had problems compiling %s" \
- % (os.path.basename(latex), latex_file))
-
- if latex == "xelatex":
- warning("Using XeTeX")
- # FIXME: skip unnecessary dvips trial in legacy_conversion_step2
- return legacy_conversion_step2(latex_file, dpi, output_format)
+ error_pages = []
+ latex_status, latex_stdout = run_latex(latex, latex_file, bibtex)
+ latex_log = latex_file_re.sub(".log", latex_file)
+ if latex_status:
+ progress("Will try to recover from %s failure" % latex)
+ error_pages = check_latex_log(latex_log)
# The dvi output file name
dvi_file = latex_file_re.sub(".dvi", latex_file)
@@ -350,34 +483,46 @@ def main(argv):
# No DVI, is there a PDF?
pdf_file = latex_file_re.sub(".pdf", latex_file)
if os.path.isfile(pdf_file):
- warning("%s produced a PDF output, fallback to legacy." % \
- (os.path.basename(latex)))
- return legacy_conversion_step2(latex_file, dpi, output_format)
+ progress("%s produced a PDF output, fallback to legacy." \
+ % (os.path.basename(latex)))
+ progress("Using the legacy conversion method (PDF support)")
+ return legacy_conversion_step1(latex_file, dpi, output_format,
+ fg_color, bg_color, latex, True)
else:
error("No DVI or PDF output. %s failed." \
% (os.path.basename(latex)))
- # Look for PS literals in DVI pages
- # ps_pages: list of page indexes of pages containing PS literals
+ # Look for PS literals or inclusion of pdflatex files in DVI pages
+ # ps_pages: list of indexes of pages containing PS literals
+ # pdf_pages: list of indexes of pages requiring running pdflatex
# page_count: total number of pages
# pages_parameter: parameter for dvipng to exclude pages with PostScript
- (ps_pages, page_count, pages_parameter) = find_ps_pages(dvi_file)
+ (ps_pages, pdf_pages, page_count, pages_parameter) = find_ps_pages(dvi_file)
- # If all pages need PostScript, directly use the legacy method.
+ # If all pages need PostScript or pdflatex, directly use the legacy method.
if len(ps_pages) == page_count:
- vec = [argv[0], argv[2], argv[3], argv[1], argv[4], argv[5], latex]
- return legacy_conversion(vec)
+ progress("Using the legacy conversion method (PostScript support)")
+ return legacy_conversion_step1(latex_file, dpi, output_format, fg_color,
+ bg_color, latex, pdf_output)
+ elif len(pdf_pages) == page_count:
+ progress("Using the legacy conversion method (PDF support)")
+ return legacy_conversion_step1(latex_file, dpi, output_format, fg_color,
+ bg_color, "pdflatex", True)
+
+ # Retrieve resolution
+ resolution = extract_resolution(latex_log, dpi)
# Run the dvi file through dvipng.
dvipng_call = '%s -Ttight -depth -height -D %d -fg "%s" -bg "%s" %s "%s"' \
- % (dvipng, dpi, fg_color, bg_color, pages_parameter, dvi_file)
+ % (dvipng, resolution, fg_color_dvipng, bg_color_dvipng, pages_parameter, dvi_file)
dvipng_status, dvipng_stdout = run_command(dvipng_call)
- if dvipng_status != None:
+ if dvipng_status:
warning("%s failed to generate images from %s... fallback to legacy method" \
% (os.path.basename(dvipng), dvi_file))
- # FIXME: skip unnecessary dvips trial in legacy_conversion_step2
- return legacy_conversion_step2(latex_file, dpi, output_format)
+ progress("Using the legacy conversion method (dvipng failed)")
+ return legacy_conversion_step1(latex_file, dpi, output_format, fg_color,
+ bg_color, latex, pdf_output)
# Extract metrics info from dvipng_stdout.
metrics_file = latex_file_re.sub(".metrics", latex_file)
@@ -391,9 +536,10 @@ def main(argv):
filter_pages(latex_file, legacy_latex_file, ps_pages)
# Pass the new LaTeX file to the legacy method
- vec = [ argv[0], latex_file_re.sub("_legacy.tex", argv[2]),
- argv[3], argv[1], argv[4], argv[5], latex ]
- legacy_metrics = legacy_conversion(vec, True)[1]
+ progress("Pages %s include postscript specials" % ps_pages)
+ progress("Using the legacy conversion method (PostScript support)")
+ legacy_status, legacy_metrics = legacy_conversion_step1(legacy_latex_file,
+ dpi, output_format, fg_color, bg_color, latex, pdf_output, True)
# Now we need to mix metrics data from dvipng and the legacy method
original_bitmap = latex_file_re.sub("%d." + output_format, legacy_latex_file)
@@ -403,6 +549,38 @@ def main(argv):
join_metrics_and_rename(dvipng_metrics, legacy_metrics, ps_pages,
original_bitmap, destination_bitmap)
+ # If some pages require running pdflatex pass them to legacy method
+ if len(pdf_pages) > 0:
+ # Create a new LaTeX file just for the snippets needing
+ # the legacy method
+ legacy_latex_file = latex_file_re.sub("_legacy.tex", latex_file)
+ filter_pages(latex_file, legacy_latex_file, pdf_pages)
+
+ # Pass the new LaTeX file to the legacy method
+ progress("Pages %s require processing with pdflatex" % pdf_pages)
+ progress("Using the legacy conversion method (PDF support)")
+ legacy_status, legacy_metrics = legacy_conversion_step1(legacy_latex_file,
+ dpi, output_format, fg_color, bg_color, "pdflatex", True, True)
+
+ # Now we need to mix metrics data from dvipng and the legacy method
+ original_bitmap = latex_file_re.sub("%d." + output_format, legacy_latex_file)
+ destination_bitmap = latex_file_re.sub("%d." + output_format, latex_file)
+
+ # Join metrics from dvipng and legacy, and rename legacy bitmaps
+ join_metrics_and_rename(dvipng_metrics, legacy_metrics, pdf_pages,
+ original_bitmap, destination_bitmap)
+
+ # Invalidate metrics for pages that produced errors
+ if len(error_pages) > 0:
+ error_count = 0
+ for index in error_pages:
+ if index not in ps_pages and index not in pdf_pages:
+ dvipng_metrics.pop(index - 1)
+ dvipng_metrics.insert(index - 1, (index, -1.0))
+ error_count += 1
+ if error_count:
+ warning("Failed to produce %d preview snippet(s)" % error_count)
+
# Convert images to ppm format if necessary.
if output_format == "ppm":
convert_to_ppm_format(pngtopnm, latex_file_re.sub("", latex_file))
@@ -413,4 +591,4 @@ def main(argv):
return (0, dvipng_metrics)
if __name__ == "__main__":
- exit(main(sys.argv)[0])
+ sys.exit(main(sys.argv)[0])