Let getOutputFlavor return the correct flavors for the latex varieties

(cherry picked from commit 4698ebd2b749ca24f962f9e0ebfb94bc13a88658)

Conflicts:

	src/BufferParams.cpp

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index cb3d673b1645e3a8bc8e334d18e7b09e86965021..3a07c0160bbcf1c7d21cd2ac619a72fbdba3b950 100644 (file)
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -2167,10 +2167,20 @@ OutputParams::FLAVOR BufferParams::getOutputFlavor(string const format) const
 
        OutputParams::FLAVOR result = OutputParams::LATEX;
 
+       // FIXME It'd be better not to hardcode this, but to do
+       //       something with formats.
        if (dformat == "xhtml")
                result = OutputParams::HTML;
        else if (dformat == "text")
                result = OutputParams::TEXT;
+       else if (dformat == "pdflatex")
+               result = OutputParams::PDFLATEX;
+       else if (dformat == "xetex")
+               result = OutputParams::XETEX;
+       else if (dformat == "luatex")
+               result = OutputParams::LUATEX;
+       else if (dformat == "dviluatex")
+               result = OutputParams::DVILUATEX;
        else {
                // Try to determine flavor of default output format
                vector<string> backs = backends();