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

[lyx.git] / src / lyxlex_pimpl.C

diff --git a/src/lyxlex_pimpl.C b/src/lyxlex_pimpl.C
index 853b007f829106bc3db53bf506aa8cce8b2eb021..a3270e355d15b748f7f8ea15991323e9a7508e96 100644 (file)
--- a/src/lyxlex_pimpl.C
+++ b/src/lyxlex_pimpl.C
@@ -19,6 +19,8 @@
 #include "support/filetools.h"
 #include "support/lyxalgo.h"
 #include "support/lstrings.h"
+#include "support/types.h"
+#include "support/unicode.h"
 
 #include <functional>
 
@@ -69,11 +71,19 @@ string const LyXLex::Pimpl::getString() const
 }
 
 
+lyx::docstring const LyXLex::Pimpl::getDocString() const
+{
+       std::vector<lyx::char_type> res = utf8_to_ucs4(buff);
+       lyx::docstring dstr(res.begin(), res.end());
+       return dstr;
+}
+
+
 void LyXLex::Pimpl::printError(string const & message) const
 {
        string const tmpmsg = subst(message, "$$Token", getString());
        lyxerr << "LyX: " << tmpmsg << " [around line " << lineno
-              << " of file " << makeDisplayPath(name) << ']' << endl;
+               << " of file " << lyx::to_utf8(makeDisplayPath(name)) << ']' << endl;
 }
 
 
@@ -140,7 +150,6 @@ bool LyXLex::Pimpl::setFile(string const & filename)
        if (format == "gzip" || format == "zip" || format == "compress") {
                lyxerr[Debug::LYXLEX] << "lyxlex: compressed" << endl;
 
-#ifdef USE_COMPRESSION
                // The check only outputs a debug message, because it triggers
                // a bug in compaq cxx 6.2, where is_open() returns 'true' for
                // a fresh new filebuf.  (JMarc)
@@ -153,9 +162,6 @@ bool LyXLex::Pimpl::setFile(string const & filename)
                name = filename;
                lineno = 0;
                return gz_.component<io::file_source>(1)->is_open() && is.good();
-#else
-               return false;
-#endif
        } else {
                lyxerr[Debug::LYXLEX] << "lyxlex: UNcompressed" << endl;