Fix #1736

[lyx.git] / src / converter.C

diff --git a/src/converter.C b/src/converter.C
index 1c56579c00222d4af050e41e67d741dcc619625f..7ce839105aa506ca9198d7b5c0ce05ea5d73ff9f 100644 (file)
--- a/src/converter.C
+++ b/src/converter.C
@@ -18,7 +18,9 @@
 #include "debug.h"
 #include "format.h"
 #include "gettext.h"
+#include "language.h"
 #include "LaTeX.h"
+#include "mover.h"
 
 #include "frontends/Alert.h"
 
@@ -41,7 +43,6 @@ 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;
@@ -50,6 +51,7 @@ using std::endl;
 using std::find_if;
 using std::string;
 using std::vector;
+using std::distance;
 
 
 namespace {
@@ -85,12 +87,25 @@ 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
 
 
 Converter::Converter(string const & f, string const & t, string const & c,
          string const & l): from(f), to(t), command(c), flags(l),
-                            From(0), To(0), latex(false),
+                            From(0), To(0), latex(false), xml(false),
                             original_dir(false), need_aux(false)
 {}
 
@@ -104,6 +119,8 @@ void Converter::readFlags()
                flag_value = split(flag_value, flag_name, '=');
                if (flag_name == "latex")
                        latex = true;
+               else if (flag_name == "xml")
+                       xml = true;
                else if (flag_name == "originaldir")
                        original_dir = true;
                else if (flag_name == "needaux")
@@ -138,26 +155,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
@@ -165,13 +168,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;
 }
@@ -184,7 +187,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] == '*') {
@@ -214,7 +217,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);
 }
@@ -264,6 +267,8 @@ OutputParams::FLAVOR Converters::getFlavor(Graph::EdgePath const & path)
                if (conv.latex)
                        if (contains(conv.to, "pdf"))
                                return OutputParams::PDFLATEX;
+               if (conv.xml)
+                       return OutputParams::XML;
        }
        return OutputParams::LATEX;
 }
@@ -278,7 +283,7 @@ bool Converters::convert(Buffer const * buffer,
                                  formats.extension(to_format));
 
        if (from_format == to_format)
-               return move(from_file, to_file, false);
+               return move(from_format, from_file, to_file, false);
 
        Graph::EdgePath edgepath = getPath(from_format, to_format);
        if (edgepath.empty()) {
@@ -286,7 +291,6 @@ bool Converters::convert(Buffer const * buffer,
        }
        OutputParams runparams;
        runparams.flavor = getFlavor(edgepath);
-
        string path = OnlyPath(from_file);
        Path p(path);
 
@@ -370,7 +374,8 @@ bool Converters::convert(Buffer const * buffer,
                                res = one.startscript(type, command);
 
                        if (!real_outfile.empty()) {
-                               if (!rename(outfile, real_outfile))
+                               Mover const & mover = movers(conv.to);
+                               if (!mover.rename(outfile, real_outfile))
                                        res = -1;
                                else
                                        lyxerr[Debug::FILES]
@@ -410,7 +415,6 @@ bool Converters::convert(Buffer const * buffer,
        if (conv.To->dummy())
                return true;
 
-
        if (!conv.result_dir.empty()) {
                to_file = AddName(subst(conv.result_dir, token_base, to_base),
                                  subst(conv.result_file,
@@ -420,7 +424,8 @@ bool Converters::convert(Buffer const * buffer,
                                            token_base, from_base);
                        string to = subst(conv.result_dir,
                                          token_base, to_base);
-                       if (!rename(from, to)) {
+                       Mover const & mover = movers(conv.from);
+                       if (!mover.rename(from, to)) {
                                Alert::error(_("Cannot convert file"),
                                        bformat(_("Could not move a temporary file from %1$s to %2$s."),
                                                from, to));
@@ -429,13 +434,14 @@ bool Converters::convert(Buffer const * buffer,
                }
                return true;
        } else
-               return move(outfile, to_file, conv.latex);
+               return move(conv.to, outfile, to_file, conv.latex);
 }
 
 
 // If from = /path/file.ext and to = /path2/file2.ext2 then this method
 // moves each /path/file*.ext file to /path2/file2*.ext2'
-bool Converters::move(string const & from, string const & to, bool copy)
+bool Converters::move(string const & fmt,
+                     string const & from, string const & to, bool copy)
 {
        if (from == to)
                return true;
@@ -455,9 +461,11 @@ bool Converters::move(string const & from, string const & to, bool copy)
                        to2 = ChangeExtension(to2, to_extension);
                        lyxerr[Debug::FILES] << "moving " << from2
                                             << " to " << to2 << endl;
-                       bool const moved = (copy)
-                               ? lyx::support::copy(from2, to2)
-                               : rename(from2, to2);
+
+                       Mover const & mover = movers(fmt);
+                       bool const moved = copy
+                               ? mover.copy(from2, to2)
+                               : mover.rename(from2, to2);
                        if (!moved && no_errors) {
                                Alert::error(_("Cannot convert file"),
                                        bformat(_("Could not move a temporary file from %1$s to %2$s."),
@@ -508,10 +516,10 @@ bool Converters::scanLog(Buffer const & buffer, string const & /*command*/,
 
 namespace {
 
-class showMessage : public boost::signals::trackable {
+class showMessage : public std::unary_function<string, void>, public boost::signals::trackable {
 public:
        showMessage(Buffer const & b) : buffer_(b) {};
-       void operator()(string const & m)
+       void operator()(string const & m) const
        {
                buffer_.message(m);
        }
@@ -528,6 +536,8 @@ bool Converters::runLaTeX(Buffer const & buffer, string const & command,
        buffer.busy(true);
        buffer.message(_("Running LaTeX..."));
 
+       runparams.document_language = buffer.params().language->babel();
+
        // do the LaTeX run(s)
        string name = buffer.getLatexName();
        LaTeX latex(command, runparams, name, buffer.filePath());