reverse last change

[lyx.git] / src / lyxlex.C

diff --git a/src/lyxlex.C b/src/lyxlex.C
index 118162bdc1b43c3e70f8f4a548f2f25080635d8c..3bd90f40b4381f8ffd86a8504cf23c9908c621b8 100644 (file)
--- a/src/lyxlex.C
+++ b/src/lyxlex.C
@@ -1,15 +1,14 @@
-/* This file is part of
- * ======================================================
+/**
+ * \file lyxlex.C
+ * Copyright 1996-2002 the LyX Team
+ * Read the file COPYING
  *
- *           LyX, The Document Processor
+ * Generalized simple lexical analyzer.
+ * It can be used for simple syntax parsers, like lyxrc,
+ * texclass and others to come.
  *
- *           Copyright 1996-2001 The LyX Team.
- *
- *   Generalized simple lexical analizer.
- *   It can be used for simple syntax parsers, like lyxrc,
- *   texclass and others to come.   [asierra30/03/96]
- *
- * ====================================================== */
+ * \author Alejandro Aguilar Sierra <asierra@servidor.unam.mx>
+ */
 
 #include <config.h>
 
@@ -161,36 +160,35 @@ string const LyXLex::getLongString(string const & endtoken)
                        // blank line in the file being read
                        continue;
 
-               string const token = frontStrip(strip(getString()), " \t");
+               string const token = trim(getString(), " \t");
 
                lyxerr[Debug::PARSER] << "LongString: `"
                                      << getString() << '\'' << endl;
 
                // We do a case independent comparison, like search_kw
                // does.
-               if (compare_no_case(token, endtoken) != 0) {
-                       string tmpstr = getString();
-                       if (firstline) {
-                               unsigned int i = 0;
-                               while (i < tmpstr.length()
-                                     && tmpstr[i] == ' ') {
-                                       ++i;
-                                       prefix += ' ';
-                               }
-                               firstline = false;
-                               lyxerr[Debug::PARSER] << "Prefix = `" << prefix
-                                                     << '\'' << endl;
-                       }
-
-                       if (!prefix.empty()
-                           && prefixIs(tmpstr, prefix)) {
-                               tmpstr.erase(0, prefix.length() - 1);
-                       }
-                       str += frontStrip(tmpstr, "\t") + '\n';
-               }
-               else // token == endtoken
+               if (compare_ascii_no_case(token, endtoken) == 0)
                        break;
+
+               string tmpstr = getString();
+               if (firstline) {
+                       string::size_type i(tmpstr.find_first_not_of(' '));
+                       if (i != string::npos)
+                               prefix = tmpstr.substr(0, i);
+                       firstline = false;
+                       lyxerr[Debug::PARSER]
+                               << "Prefix = `" << prefix << "\'" << endl;
+               }
+
+               // further lines in long strings may have the same
+               // whitespace prefix as the first line. Remove it.
+               if (prefix.length() && prefixIs(tmpstr, prefix)) {
+                       tmpstr.erase(0, prefix.length() - 1);
+               }
+
+               str += ltrim(tmpstr, "\t") + '\n';
        }
+
        if (!isOK()) {
                printError("Long string not ended by `" + endtoken + '\'');
        }
@@ -236,21 +234,22 @@ void LyXLex::pushToken(string const & pt)
 
 int LyXLex::findToken(char const * str[])
 {
+       if (!next()) {
+               pimpl_->printError("file ended while scanning string token");
+               return -1;
+       }
+
        int i = 0;
 
-       if (next()) {
-               if (compare(pimpl_->buff, "default")) {
-                       while (str[i][0] && compare(str[i], pimpl_->buff)) {
-                               ++i;
-                       }
-                       if (!str[i][0]) {
-                               pimpl_->printError("Unknown argument `$$Token'");
-                               i = -1;
-                       }
+       if (compare(pimpl_->buff, "default")) {
+               while (str[i][0] && compare(str[i], pimpl_->buff)) {
+                       ++i;
+               }
+               if (!str[i][0]) {
+                       pimpl_->printError("Unknown argument `$$Token'");
+                       i = -1;
                }
-       } else {
-               pimpl_->printError("file ended while scanning string token");
-               i = -1;
        }
+
        return i;
 }