diff --git a/lib/scripts/lyxpreview-lytex2bitmap.py b/lib/scripts/lyxpreview-lytex2bitmap.py index 0666593790..259c95eaee 100755 --- a/lib/scripts/lyxpreview-lytex2bitmap.py +++ b/lib/scripts/lyxpreview-lytex2bitmap.py @@ -148,6 +148,27 @@ def color_pdf(latex_file, bg_color, fg_color): return success +def fix_latex_file(latex_file): + documentclass_re = re.compile("(\\\\documentclass\[)(1[12]pt,)(.+)") + + tmp = mkstemp() + + 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))) + + if changed: + copyfileobj(tmp, open(latex_file,"wb"), 1) + + return + + def convert_to_ppm_format(pngtopnm, basename): png_file_re = re.compile("\.png$") @@ -191,6 +212,9 @@ def main(argv): lilypond_book = find_exe_or_terminate(["lilypond-book"], path) + # Omit font size specification in latex file. + fix_latex_file(latex_file) + # Make a copy of the latex file lytex_file = latex_file_re.sub(".lytex", latex_file) shutil.copyfile(latex_file, lytex_file) diff --git a/lib/scripts/lyxpreview2bitmap.py b/lib/scripts/lyxpreview2bitmap.py index 0468b2b24a..d75dc069b2 100755 --- a/lib/scripts/lyxpreview2bitmap.py +++ b/lib/scripts/lyxpreview2bitmap.py @@ -167,6 +167,27 @@ def color_pdf(latex_file, bg_color, fg_color): return success +def fix_latex_file(latex_file): + documentclass_re = re.compile("(\\\\documentclass\[)(1[12]pt,)(.+)") + + tmp = mkstemp() + + 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))) + + if changed: + copyfileobj(tmp, open(latex_file,"wb"), 1) + + return + + def convert_to_ppm_format(pngtopnm, basename): png_file_re = re.compile("\.png$") @@ -288,6 +309,9 @@ def main(argv): else: latex = find_exe_or_terminate(["latex", "pplatex", "platex", "latex2e"], path) + # Omit font size specification in latex file. + fix_latex_file(latex_file) + # This can go once dvipng becomes widespread. dvipng = find_exe(["dvipng"], path) if dvipng == None: