more cursor dispatch

[lyx.git] / src / converter.C

diff --git a/src/converter.C b/src/converter.C
index 7f7ef49fa0e2844176e3dbb6b53e403d5229eecd..32f03719d75cf4e5a1a732e1378267d7ea60c674 100644 (file)
--- a/src/converter.C
+++ b/src/converter.C
@@ -11,13 +11,14 @@
 #include <config.h>
 
 #include "converter.h"
-#include "bufferparams.h"
-#include "format.h"
+
 #include "buffer.h"
 #include "buffer_funcs.h"
-#include "LaTeX.h"
-#include "gettext.h"
+#include "bufferparams.h"
 #include "debug.h"
+#include "format.h"
+#include "gettext.h"
+#include "LaTeX.h"
 
 #include "frontends/Alert.h"
 
@@ -26,11 +27,28 @@
 #include "support/path.h"
 #include "support/systemcall.h"
 
-using namespace lyx::support;
+using lyx::support::AddName;
+using lyx::support::bformat;
+using lyx::support::ChangeExtension;
+using lyx::support::compare_ascii_no_case;
+using lyx::support::contains;
+using lyx::support::DirList;
+using lyx::support::GetExtension;
+using lyx::support::LibScriptSearch;
+using lyx::support::MakeRelPath;
+using lyx::support::OnlyFilename;
+using lyx::support::OnlyPath;
+using lyx::support::Path;
+using lyx::support::prefixIs;
+using lyx::support::QuoteName;
+using lyx::support::rename;
+using lyx::support::split;
+using lyx::support::subst;
+using lyx::support::Systemcall;
 
 using std::endl;
 using std::find_if;
-
+using std::string;
 using std::vector;
 
 
@@ -67,6 +85,19 @@ string const dvipdfm_options(BufferParams const & bp)
        return result;
 }
 
+
+class ConverterEqual : public std::binary_function<string, string, bool> {
+public:
+       ConverterEqual(string const & from, string const & to)
+               : from_(from), to_(to) {}
+       bool operator()(Converter const & c) const {
+               return c.from == from_ && c.to == to_;
+       }
+private:
+       string const from_;
+       string const to_;
+};
+
 } // namespace anon
 
 
@@ -120,26 +151,12 @@ bool operator<(Converter const & a, Converter const & b)
 }
 
 
-class compare_Converter {
-public:
-       compare_Converter(string const & f, string const & t)
-               : from(f), to(t) {}
-       bool operator()(Converter const & c) {
-               return c.from == from && c.to == to;
-       }
-private:
-       string const & from;
-       string const & to;
-};
-
-
-
 Converter const * Converters::getConverter(string const & from,
-                                           string const & to)
+                                           string const & to) const
 {
        ConverterList::const_iterator cit =
                find_if(converterlist_.begin(), converterlist_.end(),
-                       compare_Converter(from, to));
+                       ConverterEqual(from, to));
        if (cit != converterlist_.end())
                return &(*cit);
        else
@@ -147,13 +164,13 @@ Converter const * Converters::getConverter(string const & from,
 }
 
 
-int Converters::getNumber(string const & from, string const & to)
+int Converters::getNumber(string const & from, string const & to) const
 {
        ConverterList::const_iterator cit =
                find_if(converterlist_.begin(), converterlist_.end(),
-                       compare_Converter(from, to));
+                       ConverterEqual(from, to));
        if (cit != converterlist_.end())
-               return cit - converterlist_.begin();
+               return distance(converterlist_.begin(), cit);
        else
                return -1;
 }
@@ -166,7 +183,7 @@ void Converters::add(string const & from, string const & to,
        formats.add(to);
        ConverterList::iterator it = find_if(converterlist_.begin(),
                                             converterlist_.end(),
-                                            compare_Converter(from, to));
+                                            ConverterEqual(from , to));
 
        Converter converter(from, to, command, flags);
        if (it != converterlist_.end() && !flags.empty() && flags[0] == '*') {
@@ -196,7 +213,7 @@ void Converters::erase(string const & from, string const & to)
 {
        ConverterList::iterator it = find_if(converterlist_.begin(),
                                             converterlist_.end(),
-                                            compare_Converter(from, to));
+                                            ConverterEqual(from, to));
        if (it != converterlist_.end())
                converterlist_.erase(it);
 }
@@ -238,15 +255,16 @@ void Converters::sort()
 }
 
 
-bool Converters::usePdflatex(Graph::EdgePath const & path)
+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)
-                       return contains(conv.to, "pdf");
+                       if (contains(conv.to, "pdf"))
+                               return OutputParams::PDFLATEX;
        }
-       return false;
+       return OutputParams::LATEX;
 }
 
 
@@ -265,9 +283,8 @@ bool Converters::convert(Buffer const * buffer,
        if (edgepath.empty()) {
                return false;
        }
-       LatexRunParams runparams;
-       runparams.flavor = usePdflatex(edgepath) ?
-               LatexRunParams::PDFLATEX : LatexRunParams::LATEX;
+       OutputParams runparams;
+       runparams.flavor = getFlavor(edgepath);
 
        string path = OnlyPath(from_file);
        Path p(path);
@@ -337,7 +354,9 @@ bool Converters::convert(Buffer const * buffer,
                                                      dvipdfm_options(buffer->params()));
 
                        lyxerr[Debug::FILES] << "Calling " << command << endl;
-                       buffer->message(_("Executing command: ") + command);
+                       if (buffer)
+                               buffer->message(_("Executing command: ")
+                                       + command);
 
                        Systemcall::Starttype type = (dummy)
                                ? Systemcall::DontWait : Systemcall::Wait;
@@ -474,8 +493,8 @@ bool Converters::formatIsUsed(string const & format)
 bool Converters::scanLog(Buffer const & buffer, string const & /*command*/,
                         string const & filename)
 {
-       LatexRunParams runparams;
-       runparams.flavor = LatexRunParams::LATEX;
+       OutputParams runparams;
+       runparams.flavor = OutputParams::LATEX;
        LaTeX latex("", runparams, filename, "");
        TeXErrors terr;
        int result = latex.scanLogFile(terr);
@@ -503,7 +522,7 @@ private:
 
 
 bool Converters::runLaTeX(Buffer const & buffer, string const & command,
-                         LatexRunParams const & runparams)
+                         OutputParams const & runparams)
 {
        buffer.busy(true);
        buffer.message(_("Running LaTeX..."));