cleanup after svn hang-up, #undef CursorShape. Should be compilable ganin now.

[lyx.git] / src / lyxtextclass.C

diff --git a/src/lyxtextclass.C b/src/lyxtextclass.C
index 1790d979b6e2cd4a8b7999f9be39ea323206420d..7eae766cff10c94623f2a20c2b64171a842ee238 100644 (file)
--- a/src/lyxtextclass.C
+++ b/src/lyxtextclass.C
@@ -24,16 +24,20 @@
 #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;
 using lyx::support::rtrim;
 using lyx::support::subst;
+using lyx::support::addName;
 
 using std::endl;
 using std::find_if;
@@ -71,7 +75,7 @@ bool layout2layout(string const & filename, string const & tempfile)
        }
 
        std::ostringstream command;
-       command << "python " << quoteName(script)
+       command << lyx::support::os::python() << ' ' << quoteName(script)
                << ' ' << quoteName(filename)
                << ' ' << quoteName(tempfile);
        string const command_str = command.str();
@@ -207,11 +211,11 @@ bool LyXTextClass::read(string const & filename, bool merge)
 
        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,
@@ -444,7 +448,7 @@ bool LyXTextClass::read(string const & filename, bool merge)
 
        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_
@@ -474,7 +478,7 @@ bool LyXTextClass::read(string const & filename, bool merge)
 
        } else
                lyxerr[Debug::TCLASS] << "Finished reading input file "
-                                     << makeDisplayPath(filename)
+                                     << lyx::to_utf8(makeDisplayPath(filename))
                                      << endl;
 
        return error;
@@ -513,7 +517,6 @@ void LyXTextClass::readOutputType(LyXLex & lexrc)
        keyword_item outputTypeTags[] = {
                { "docbook", DOCBOOK },
                { "latex", LATEX },
-               { "linuxdoc", LINUXDOC },
                { "literate", LITERATE }
        };
 
@@ -525,7 +528,6 @@ void LyXTextClass::readOutputType(LyXLex & lexrc)
                lexrc.printError("Unknown output type `$$Token'");
                return;
        case LATEX:
-       case LINUXDOC:
        case DOCBOOK:
        case LITERATE:
                outputType_ = static_cast<OutputType>(le);
@@ -917,15 +919,17 @@ bool LyXTextClass::load(string const & path) const
        if (loaded_)
                return true;
 
-       // Read style-file, current directory is searched before system ones
-       string real_file = path + "/" + name_ + ".layout";
-       if (!fs::exists(real_file))
-               real_file = libFileSearch("layouts", name_, "layout");
-       loaded_ = const_cast<LyXTextClass*>(this)->read(real_file) == 0;
+       // Read style-file, provided path is searched before the system ones
+       string layout_file;
+       if (!path.empty())
+               layout_file = addName(path, name_ + ".layout");
+       if (layout_file.empty() || !fs::exists(layout_file))
+               layout_file = libFileSearch("layouts", name_, "layout");
+       loaded_ = const_cast<LyXTextClass*>(this)->read(layout_file) == 0;
 
        if (!loaded_) {
                lyxerr << "Error reading `"
-                      << makeDisplayPath(real_file)
+                      << lyx::to_utf8(makeDisplayPath(layout_file))
                       << "'\n(Check `" << name_
                       << "')\nCheck your installation and "
                        "try Options/Reconfigure..." << endl;