Customization.lyx: use change tracking for the changes made in 0eb651a2

[lyx.git] / src / Lexer.cpp

diff --git a/src/Lexer.cpp b/src/Lexer.cpp
index c4b738f119bcf13fe903d8a74df6e53e1514bc28..25d337a0793287e3ac6ba8e532dc74ca821b076f 100644 (file)
--- a/src/Lexer.cpp
+++ b/src/Lexer.cpp
@@ -320,12 +320,11 @@ bool Lexer::Pimpl::next(bool esc /* = false */)
        }
 
 
-       unsigned char c = 0; // getc() returns an int
        char cc = 0;
        status = 0;
        while (is && !status) {
                is.get(cc);
-               c = cc;
+               unsigned char c = cc;
 
                if (c == commentChar) {
                        // Read rest of line (fast :-)
@@ -348,9 +347,8 @@ bool Lexer::Pimpl::next(bool esc /* = false */)
 
                        if (esc) {
 
-                               bool escaped = false;
                                do {
-                                       escaped = false;
+                                       bool escaped = false;
                                        is.get(cc);
                                        c = cc;
                                        if (c == '\r') continue;
@@ -695,23 +693,23 @@ double Lexer::getFloat() const
 }
 
 
-string const Lexer::getString() const
+string const Lexer::getString(bool trim) const
 {
        lastReadOk_ = pimpl_->status == LEX_DATA || pimpl_->status == LEX_TOKEN;
 
        if (lastReadOk_)
-       return pimpl_->getString();
+               return trim ? support::trim(pimpl_->getString(), "\t ") : pimpl_->getString();
 
        return string();
 }
 
 
-docstring const Lexer::getDocString() const
+docstring const Lexer::getDocString(bool trim) const
 {
        lastReadOk_ = pimpl_->status == LEX_DATA || pimpl_->status == LEX_TOKEN;
 
        if (lastReadOk_)
-               return pimpl_->getDocString();
+               return trim ? support::trim(pimpl_->getDocString(), "\t ") : pimpl_->getDocString();
 
        return docstring();
 }