#include "support/lstrings.h"
#include "support/lyxlib.h"
#include "support/filetools.h"
+#include "support/os.h"
+
#include <boost/filesystem/operations.hpp>
namespace fs = boost::filesystem;
#include <sstream>
+using lyx::docstring;
using lyx::support::libFileSearch;
using lyx::support::makeDisplayPath;
using lyx::support::quoteName;
}
std::ostringstream command;
- command << "python " << quoteName(script)
+ command << lyx::support::os::python() << ' ' << quoteName(script)
<< ' ' << quoteName(filename)
<< ' ' << quoteName(tempfile);
string const command_str = command.str();
if (!merge)
lyxerr[Debug::TCLASS] << "Reading textclass "
- << makeDisplayPath(filename)
- << endl;
+ << lyx::to_utf8(makeDisplayPath(filename))
+ << endl;
else
lyxerr[Debug::TCLASS] << "Reading input file "
- << makeDisplayPath(filename)
+ << lyx::to_utf8(makeDisplayPath(filename))
<< endl;
LyXLex lexrc(textClassTags,
if (!merge) { // we are at top level here.
lyxerr[Debug::TCLASS] << "Finished reading textclass "
- << makeDisplayPath(filename)
+ << lyx::to_utf8(makeDisplayPath(filename))
<< endl;
if (defaultlayout_.empty()) {
lyxerr << "Error: Textclass '" << name_
} else
lyxerr[Debug::TCLASS] << "Finished reading input file "
- << makeDisplayPath(filename)
+ << lyx::to_utf8(makeDisplayPath(filename))
<< endl;
return error;
keyword_item outputTypeTags[] = {
{ "docbook", DOCBOOK },
{ "latex", LATEX },
- { "linuxdoc", LINUXDOC },
{ "literate", LITERATE }
};
lexrc.printError("Unknown output type `$$Token'");
return;
case LATEX:
- case LINUXDOC:
case DOCBOOK:
case LITERATE:
outputType_ = static_cast<OutputType>(le);
if (!loaded_) {
lyxerr << "Error reading `"
- << makeDisplayPath(layout_file)
+ << lyx::to_utf8(makeDisplayPath(layout_file))
<< "'\n(Check `" << name_
<< "')\nCheck your installation and "
"try Options/Reconfigure..." << endl;