LFUN_UNICODE_INSERT - unicode-insert

[lyx.git] / src / lyxlex_pimpl.C

diff --git a/src/lyxlex_pimpl.C b/src/lyxlex_pimpl.C
index 823d14d7d5355d2041ec99a55e4f428a90a6c2db..eb8765db5fceed0651df36526a3cea0e03409262 100644 (file)
--- a/src/lyxlex_pimpl.C
+++ b/src/lyxlex_pimpl.C
@@ -19,14 +19,19 @@
 #include "support/filetools.h"
 #include "support/lyxalgo.h"
 #include "support/lstrings.h"
+#include "support/types.h"
+#include "support/unicode.h"
 
 #include <functional>
 
-using lyx::support::compare_ascii_no_case;
-using lyx::support::getFormatFromContents;
-using lyx::support::MakeDisplayPath;
-using lyx::support::split;
-using lyx::support::subst;
+
+namespace lyx {
+
+using support::compare_ascii_no_case;
+using support::getFormatFromContents;
+using support::makeDisplayPath;
+using support::split;
+using support::subst;
 
 using std::endl;
 using std::getline;
@@ -39,8 +44,9 @@ using std::ostream;
 
 namespace {
 
-struct compare_tags
+class compare_tags
        : public std::binary_function<keyword_item, keyword_item, bool> {
+public:
        // used by lower_bound, sort and sorted
        bool operator()(keyword_item const & a, keyword_item const & b) const
        {
@@ -68,11 +74,19 @@ string const LyXLex::Pimpl::getString() const
 }
 
 
+docstring const LyXLex::Pimpl::getDocString() const
+{
+       std::vector<char_type> res = utf8_to_ucs4(buff);
+       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 " << to_utf8(makeDisplayPath(name)) << ']' << endl;
 }
 
 
@@ -142,14 +156,15 @@ bool LyXLex::Pimpl::setFile(string const & filename)
                // 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)
-               if (gz_.is_open() || istream::off_type(is.tellg()) > -1)
+               if (!gz_.empty() || istream::off_type(is.tellg()) > -1)
                        lyxerr[Debug::LYXLEX] << "Error in LyXLex::setFile: "
                                "file or stream already set." << endl;
-               gz_.open(filename.c_str(), ios::in);
+               gz_.push(io::gzip_decompressor());
+               gz_.push(io::file_source(filename));
                is.rdbuf(&gz_);
                name = filename;
                lineno = 0;
-               return gz_.is_open() && is.good();
+               return gz_.component<io::file_source>(1)->is_open() && is.good();
        } else {
                lyxerr[Debug::LYXLEX] << "lyxlex: UNcompressed" << endl;
 
@@ -511,3 +526,6 @@ void LyXLex::Pimpl::pushToken(string const & pt)
 {
        pushTok = pt;
 }
+
+
+} // namespace lyx