Change the backends() routine so it only gives us backends that

are appropriate for the current document.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40899 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index 2c97acef6b199ae668cb4ec2a45e159f6514386c..81a13bdb2b1a8b0bfa044abccb0777aa0301732b 100644 (file)
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -2133,17 +2133,24 @@ bool BufferParams::isExportableFormat(string const & format) const
 vector<string> BufferParams::backends() const
 {
        vector<string> v;
-       v.push_back(bufferFormat());
+       string const buffmt = bufferFormat();
+
        // FIXME: Don't hardcode format names here, but use a flag
-       if (v.back() == "latex") {
-               v.push_back("pdflatex");
+       if (buffmt == "latex") {
+               if (!useNonTeXFonts) {
+                       v.push_back("pdflatex");
+                       v.push_back("latex");
+               }
                v.push_back("luatex");
                v.push_back("dviluatex");
                v.push_back("xetex");
-       } else if (v.back() == "xetex") {
+       } else if (buffmt == "xetex") {
+               v.push_back("xetex");
                v.push_back("luatex");
                v.push_back("dviluatex");
-       }
+       } else
+               v.push_back(buffmt);
+
        v.push_back("xhtml");
        v.push_back("text");
        v.push_back("lyx");

diff --git a/src/BufferParams.h b/src/BufferParams.h
index 7280506a09c09cf2f8a9c2815389bd7da7b8ade6..772f42de84924d4d97e0c05e6433f76e9a66e0c2 100644 (file)
--- a/src/BufferParams.h
+++ b/src/BufferParams.h
@@ -176,7 +176,8 @@ public:
        std::vector<Format const *> exportableFormats(bool only_viewable) const;
        ///
        bool isExportableFormat(std::string const & format) const;
-       ///
+       /// the backends appropriate for use with this document.
+       /// so, e.g., latex is excluded , if we're using non-TeX fonts
        std::vector<std::string> backends() const;
 
        /// List of included children (for includeonly)