Fix bug #2200 (The size of previewed images should be independent of the latex font...

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@38709 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/scripts/lyxpreview-lytex2bitmap.py b/lib/scripts/lyxpreview-lytex2bitmap.py
index 0666593790dceaac8c85fb69ee80d545b551b292..1e4cf5d8636565b63fe29226c9592955f667c224 100755 (executable)
--- 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[012]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%s\n" % (match.group(1), match.group(3), match.group(4)))
+
+    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 0468b2b24a4c527ea67ac5b554ddc590f6f363a3..7929ae014ef4b2bc77ab21da799469666bba1447 100755 (executable)
--- 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[012]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%s\n" % (match.group(1), match.group(3), match.group(4)))
+
+    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:

diff --git a/status.20x b/status.20x
index 87255ab93350d79686c02bb39dbaa322ad3b7ad0..6499f720411edacbc2519705a587c752659a23c3 100644 (file)
--- a/status.20x
+++ b/status.20x
@@ -88,6 +88,9 @@ What's new
 
 - Correct erroneous report of duplicate labels when dissolving insets (#7319).
 
+- Make size of characters in instant preview snippets independent of the
+  LaTeX font size (bug 2200).
+
 
 * DOCUMENTATION AND LOCALIZATION