From 31d76f336870af4f37db9a042c5d0c389219cc02 Mon Sep 17 00:00:00 2001
From: Julien Rioux <jrioux@lyx.org>
Date: Sat, 11 Jun 2011 15:33:35 +0000
Subject: [PATCH] Fix bug #7610 (wrong latex flavor flag set by pref2pref).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39006 a592a061-630c-0410-9148-cb99ea01b6c8
---
 lib/scripts/prefs2prefs_prefs.py | 14 +++++++++++---
 status.20x                       |  2 ++
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/lib/scripts/prefs2prefs_prefs.py b/lib/scripts/prefs2prefs_prefs.py
index 40b5072f82..7a2cdd69bc 100644
--- a/lib/scripts/prefs2prefs_prefs.py
+++ b/lib/scripts/prefs2prefs_prefs.py
@@ -71,10 +71,18 @@ def latex_flavor(line):
 	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[^"]*?)"')
diff --git a/status.20x b/status.20x
index ec1edb12e8..cb8fded876 100644
--- a/status.20x
+++ b/status.20x
@@ -102,6 +102,8 @@ What's new
 - 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