import getopt, glob, os, re, shutil, string, sys
-from legacy_lyxpreview2ppm import legacy_conversion_step1
+from legacy_lyxpreview2ppm import extract_resolution, legacy_conversion_step1
from lyxpreview_tools import bibtex_commands, check_latex_log, copyfileobj, \
error, filter_pages, find_exe, find_exe_or_terminate, \
def fix_latex_file(latex_file, pdf_output):
- documentclass_re = re.compile("(\\\\documentclass\[)(1[012]pt,?)(.+)")
- usepackage_re = re.compile("\\\\usepackage")
- userpreamble_re = re.compile("User specified LaTeX commands")
- enduserpreamble_re = re.compile("\\\\makeatother")
- begindoc_re = re.compile("\\\\begin\{document\}")
+ def_re = re.compile(r"(\\newcommandx|\\global\\long\\def)(\\[a-zA-Z]+)")
tmp = mkstemp()
- in_doc_body = 0
- in_user_preamble = 0
- usepkg = 0
- changed = 0
+ changed = False
+ macros = []
for line in open(latex_file, 'r').readlines():
- if in_doc_body:
- if changed:
- tmp.write(line)
- continue
- else:
- break
-
- if begindoc_re.match(line) != None:
- in_doc_body = 1
-
- if not pdf_output and not usepkg:
- if userpreamble_re.search(line) != None:
- in_user_preamble = 1
- elif enduserpreamble_re.search(line) != None:
- in_user_preamble = 0
- if usepackage_re.match(line) != None and in_user_preamble:
- usepkg = 1
- changed = 1
- tmp.write("\\def\\t@a{microtype}\n")
- tmp.write("\\let\\oldusepkg\\usepackage\n")
- tmp.write("\\def\\usepackage{\\@ifnextchar[\\@usepkg{\\@usepkg[]}}\n")
- tmp.write("\\def\@usepkg[#1]#2{\\def\\t@b{#2}")
- tmp.write("\\ifx\\t@a\\t@b\\else\\oldusepkg[#1]{#2}\\fi}\n")
- tmp.write(line)
- continue
-
- 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)))
+ if not pdf_output and line.startswith("\\documentclass"):
+ changed = True
+ line += "\\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 == "\\newcommandx":
+ changed = True
+ line = line.replace(definecmd, "\\renewcommandx")
+ else:
+ macros.append(macroname)
+ tmp.write(line)
if changed:
copyfileobj(tmp, open(latex_file,"wb"), 1)
progress("Preprocess through lilypond-book: %s" % lilypond)
progress("Altering the latex file for font size and colors")
- # Omit font size specification in latex file and make sure that
- # the microtype package doesn't cause issues in dvi mode.
+ # 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:
# Compile the latex file.
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_file_re.sub(".log", latex_file))
+ error_pages = check_latex_log(latex_log)
# The dvi output file name
dvi_file = latex_file_re.sub(".dvi", latex_file)
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_dvipng, bg_color_dvipng, 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: