explain why ownsClipbiard() does not work on Windows and OS X

[lyx.git] / src / lyxlex_pimpl.C

diff --git a/src/lyxlex_pimpl.C b/src/lyxlex_pimpl.C
index 0ae2b1391c85323f36a6f4d3aef64ef6543879bb..ac74909773d49805122467fcd25f2783a07e2019 100644 (file)
--- a/src/lyxlex_pimpl.C
+++ b/src/lyxlex_pimpl.C
@@ -150,13 +150,13 @@ bool LyXLex::Pimpl::setFile(FileName const & filename)
        string const format = getFormatFromContents(filename);
 
        if (format == "gzip" || format == "zip" || format == "compress") {
-               lyxerr[Debug::LYXLEX] << "lyxlex: compressed" << endl;
+               LYXERR(Debug::LYXLEX) << "lyxlex: compressed" << endl;
 
                // 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_.empty() || istream::off_type(is.tellg()) > -1)
-                       lyxerr[Debug::LYXLEX] << "Error in LyXLex::setFile: "
+                       LYXERR(Debug::LYXLEX) << "Error in LyXLex::setFile: "
                                "file or stream already set." << endl;
                gz_.push(io::gzip_decompressor());
                gz_.push(io::file_source(filename.toFilesystemEncoding()));
@@ -165,13 +165,13 @@ bool LyXLex::Pimpl::setFile(FileName const & filename)
                lineno = 0;
                return gz_.component<io::file_source>(1)->is_open() && is.good();
        } else {
-               lyxerr[Debug::LYXLEX] << "lyxlex: UNcompressed" << endl;
+               LYXERR(Debug::LYXLEX) << "lyxlex: UNcompressed" << endl;
 
                // 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 (fb_.is_open() || istream::off_type(is.tellg()) > 0)
-                       lyxerr[Debug::LYXLEX] << "Error in LyXLex::setFile: "
+                       LYXERR(Debug::LYXLEX) << "Error in LyXLex::setFile: "
                                "file or stream already set." << endl;
                fb_.open(filename.toFilesystemEncoding().c_str(), ios::in);
                is.rdbuf(&fb_);
@@ -185,7 +185,7 @@ bool LyXLex::Pimpl::setFile(FileName const & filename)
 void LyXLex::Pimpl::setStream(istream & i)
 {
        if (fb_.is_open() || istream::off_type(is.tellg()) > 0)
-               lyxerr[Debug::LYXLEX]  << "Error in LyXLex::setStream: "
+               LYXERR(Debug::LYXLEX)  << "Error in LyXLex::setStream: "
                        "file or stream already set." << endl;
        is.rdbuf(i.rdbuf());
        lineno = 0;
@@ -204,15 +204,15 @@ bool LyXLex::Pimpl::next(bool esc /* = false */)
                // There can have been a whole line pushed so
                // we extract the first word and leaves the rest
                // in pushTok. (Lgb)
-               if (pushTok.find(' ') != string::npos && pushTok[0] == '\\') {
+               if (pushTok[0] == '\\' && pushTok.find(' ') != string::npos) {
                        buff.clear();
                        pushTok = split(pushTok, buff, ' ');
-                       return true;
                } else {
                        buff = pushTok;
                        pushTok.clear();
-                       return true;
                }
+               status = LEX_TOKEN;
+               return true;
        }
        if (!esc) {
                unsigned char c = 0; // getc() returns an int
@@ -228,7 +228,7 @@ bool LyXLex::Pimpl::next(bool esc /* = false */)
                                string dummy;
                                getline(is, dummy);
 
-                               lyxerr[Debug::LYXLEX] << "Comment read: `" << c
+                               LYXERR(Debug::LYXLEX) << "Comment read: `" << c
                                                      << dummy << '\'' << endl;
 #else
                                // unfortunately ignore is buggy (Lgb)
@@ -306,26 +306,8 @@ bool LyXLex::Pimpl::next(bool esc /* = false */)
                        c = cc;
 
                        // skip ','s
-                       if (c == ',') continue;
-
-                       if (c == '\\') {
-                               // escape
-                               buff.clear();
-
-                               do {
-                                       if (c == '\\') {
-                                               // escape the next char
-                                               is.get(cc);
-                                               c = cc;
-                                       }
-                                       buff.push_back(c);
-                                       is.get(cc);
-                                       c = cc;
-                               } while (c > ' ' && c != ',' && is);
-
-                               status = LEX_TOKEN;
+                       if (c == ',') 
                                continue;
-                       }
 
                        if (c == commentChar) {
                                // Read rest of line (fast :-)
@@ -334,7 +316,7 @@ bool LyXLex::Pimpl::next(bool esc /* = false */)
                                string dummy;
                                getline(is, dummy);
 
-                               lyxerr[Debug::LYXLEX] << "Comment read: `" << c
+                               LYXERR(Debug::LYXLEX) << "Comment read: `" << c
                                                      << dummy << '\'' << endl;
 #else
                                // but ignore is also still buggy (Lgb)
@@ -446,7 +428,7 @@ bool LyXLex::Pimpl::eatLine()
        while (is && c != '\n') {
                is.get(cc);
                c = cc;
-               //lyxerr[Debug::LYXLEX] << "LyXLex::EatLine read char: `"
+               //LYXERR(Debug::LYXLEX) << "LyXLex::EatLine read char: `"
                //                    << c << '\'' << endl;
                if (c != '\r')
                        buff.push_back(c);
@@ -457,6 +439,9 @@ bool LyXLex::Pimpl::eatLine()
                buff.resize(buff.size() - 1);
                status = LEX_DATA;
                return true;
+       } else if (buff.length() > 0) { // last line
+               status = LEX_DATA;
+               return true;
        } else {
                return false;
        }
@@ -469,15 +454,15 @@ bool LyXLex::Pimpl::nextToken()
                // There can have been a whole line pushed so
                // we extract the first word and leaves the rest
                // in pushTok. (Lgb)
-               if (pushTok.find(' ') != string::npos && pushTok[0] == '\\') {
+               if (pushTok[0] == '\\' && pushTok.find(' ') != string::npos) {
                        buff.clear();
                        pushTok = split(pushTok, buff, ' ');
-                       return true;
                } else {
                        buff = pushTok;
                        pushTok.clear();
-                       return true;
                }
+               status = LEX_TOKEN;
+               return true;
        }
 
        status = 0;
@@ -519,6 +504,11 @@ bool LyXLex::Pimpl::nextToken()
 }
 
 
+bool LyXLex::Pimpl::inputAvailable() {
+       return is.good(); 
+}
+
+
 void LyXLex::Pimpl::pushToken(string const & pt)
 {
        pushTok = pt;