Author: jrioux
Date: Sat Jun 11 17:33:35 2011
New Revision: 39006
URL: http://www.lyx.org/trac/changeset/39006
Log:
Fix bug #7610 (wrong latex flavor flag set by pref2pref).
Modified:
lyx-devel/branches/BRANCH_2_0_X/lib/scripts/prefs2prefs_prefs.py
lyx-devel/branches/BRANCH_2_0_X/status.20x
Modified: lyx-devel/branches/BRANCH_2_0_X/lib/scripts/prefs2prefs_prefs.py
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/lib/scripts/prefs2prefs_prefs.py Sat Jun
11 17:29:41 2011 (r39005)
+++ lyx-devel/branches/BRANCH_2_0_X/lib/scripts/prefs2prefs_prefs.py Sat Jun
11 17:33:35 2011 (r39006)
@@ -71,10 +71,18 @@
conv = m.group(1)
fmat = m.group(2)
args = m.group(3)
- flavor = "pdflatex"
- if conv in ("platex", "xetex", "luatex"):
+ conv2fl = {
+ "luatex": "lualatex",
+ "pplatex": "latex",
+ "xetex": "xelatex",
+ }
+ if conv in conv2fl.keys():
+ flavor = conv2fl[conv]
+ else:
flavor = conv
- return (True,
+ if flavor == "latex":
+ return no_match
+ return (True,
"\\converter \"%s\" \"%s\" \"%s\" \"latex=%s\"" % (conv, fmat,
args, flavor))
emre = re.compile(r'^\\[Ff]ormat\s+(.*)\s+"(document[^"]*?)"')
Modified: lyx-devel/branches/BRANCH_2_0_X/status.20x
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/status.20x Sat Jun 11 17:29:41 2011
(r39005)
+++ lyx-devel/branches/BRANCH_2_0_X/status.20x Sat Jun 11 17:33:35 2011
(r39006)
@@ -102,6 +102,8 @@
- On Windows, improve detection of the TeX engine when the file system does
not support short names and the temp directory contains spaces.
+- Fixed the latex flag set by the prefs2prefs script (bug 7610).
+
* USER INTERFACE
