From 66a95b9c1bd26da63459fe430452991b0bc3ec3a Mon Sep 17 00:00:00 2001 From: Enrico Forestieri Date: Thu, 26 Apr 2012 15:23:42 +0200 Subject: [PATCH] Fix bug #8139 and a thinko in [737e9b2c/lyxgit]. I had already noticed the above mentioned thinko and this commit should have been part of [3285ce1d5/lygit] but somehow I managed to lose it in the git branches game: do a branch for that, than try a different thing in another branch, then rebase to avoid merge conficts, and finally delete all unneeded branches. Well it is too much easy to do the wrong thing and pick the wrong branch, deleting the right one. I will never follow the git way anymore and will do I was used to do with svn. --- src/Converter.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Converter.cpp b/src/Converter.cpp index ed5f893f7b..7199fa5212 100644 --- a/src/Converter.cpp +++ b/src/Converter.cpp @@ -252,7 +252,9 @@ OutputParams::FLAVOR Converters::getFlavor(Graph::EdgePath const & path, for (Graph::EdgePath::const_iterator cit = path.begin(); cit != path.end(); ++cit) { Converter const & conv = converterlist_[*cit]; - if (conv.latex) + if (conv.latex) { + if (conv.latex_flavor == "latex") + return OutputParams::LATEX; if (conv.latex_flavor == "xelatex") return OutputParams::XETEX; if (conv.latex_flavor == "lualatex") @@ -261,6 +263,7 @@ OutputParams::FLAVOR Converters::getFlavor(Graph::EdgePath const & path, return OutputParams::DVILUATEX; if (conv.latex_flavor == "pdflatex") return OutputParams::PDFLATEX; + } if (conv.xml) return OutputParams::XML; } -- 2.39.5