fix "make dist" target

[lyx.git] / src / lyxlex_pimpl.C

diff --git a/src/lyxlex_pimpl.C b/src/lyxlex_pimpl.C
index 2dcd2c054cd4b4ac60ba4850c532522dec2d48ff..173d542ceebec217572749e68a97ef8a70274664 100644 (file)
--- a/src/lyxlex_pimpl.C
+++ b/src/lyxlex_pimpl.C
@@ -30,7 +30,7 @@ struct compare_tags {
 
 LyXLex::Pimpl::Pimpl(keyword_item * tab, int num) 
        : is(&fb__), table(tab), no_items(num),
-         status(0), lineno(0)
+         status(0), lineno(0), commentChar('#')
 {
        verifyTable();
 }
@@ -65,7 +65,7 @@ void LyXLex::Pimpl::verifyTable()
 {
        // Check if the table is sorted and if not, sort it.
        if (table
-           && !sorted(table, table + no_items, compare_tags())) {
+           && !lyx::sorted(table, table + no_items, compare_tags())) {
                lyxerr << "The table passed to LyXLex is not sorted!\n"
                       << "Tell the developers to fix it!" << endl;
                // We sort it anyway to avoid problems.
@@ -130,14 +130,30 @@ void LyXLex::Pimpl::setStream(istream & i)
        lineno = 0;
 }
 
+void LyXLex::Pimpl::setCommentChar(char c)
+{
+       commentChar = c;
+}
+
 
 bool LyXLex::Pimpl::next(bool esc /* = false */)
 {
        if (!pushTok.empty()) {
-               pushTok.copy(buff, string::npos);
-               buff[pushTok.length()] = '\0';
-               pushTok.erase();
-               return true;
+               // 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) {
+                       string tmp;
+                       pushTok = split(pushTok, tmp, ' ');
+                       tmp.copy(buff, string::npos);
+                       buff[tmp.length()] = '\0';
+                       return true;
+               } else {
+                       pushTok.copy(buff, string::npos);
+                       buff[pushTok.length()] = '\0';
+                       pushTok.erase();
+                       return true;
+               }     
        }
        if (!esc) {
                unsigned char c = 0; // getc() returns an int
@@ -146,7 +162,7 @@ bool LyXLex::Pimpl::next(bool esc /* = false */)
                while (is && !status) {
                        is.get(cc);
                        c = cc;
-                       if (c == '#') {
+                       if (c == commentChar) {
                                // Read rest of line (fast :-)
                                // That is not fast... (Lgb)
 #if 1
@@ -262,7 +278,7 @@ bool LyXLex::Pimpl::next(bool esc /* = false */)
                                continue;
                        }
                        
-                       if (c == '#') {
+                       if (c == commentChar) {
                                // Read rest of line (fast :-)
                                // That is still not fast... (Lgb)
 #if 1
@@ -407,10 +423,21 @@ bool LyXLex::Pimpl::EatLine()
 bool LyXLex::Pimpl::nextToken()
 {
        if (!pushTok.empty()) {
-               pushTok.copy(buff, string::npos);
-               buff[pushTok.length()] = '\0';
-               pushTok.erase();
-               return true;
+               // 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) {
+                       string tmp;
+                       pushTok = split(pushTok, tmp, ' ');
+                       tmp.copy(buff, string::npos);
+                       buff[tmp.length()] = '\0';
+                       return true;
+               } else {
+                       pushTok.copy(buff, string::npos);
+                       buff[pushTok.length()] = '\0';
+                       pushTok.erase();
+                       return true;
+               }
        }
 
        status = 0;