anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-24 13:48:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert John's change as it breaks reading of the user preamble.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4845 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2002-08-02 16:18:15 +00:00
parent 4e350da717
commit 1c9df5074e
2 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ChangeLog
View File

@ -1,3 +1,8 @@
2002-08-02 Angus Leeming <leeming@lyx.org>
* lyxlex.C: revert John's change as it breaks reading of the user
preamble.
2002-08-02 Angus Leeming <leeming@lyx.org> 2002-08-02 Angus Leeming <leeming@lyx.org>
* importer.C (Import): * importer.C (Import):

41
src/lyxlex.C
View File

@ -168,28 +168,29 @@ string const LyXLex::getLongString(string const & endtoken)
// We do a case independent comparison, like search_kw // We do a case independent comparison, like search_kw
// does. // does.
if (compare_ascii_no_case(token, endtoken) == 0) if (compare_ascii_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 += ltrim(tmpstr, "\t") + '\n';
}
else // token == endtoken
break; 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 (prefixIs(tmpstr, prefix)) {
tmpstr.erase(0, prefix.length() - 1);
}
str += ltrim(tmpstr, "\t") + '\n';
} }
if (!isOK()) { if (!isOK()) {
printError("Long string not ended by `" + endtoken + '\''); printError("Long string not ended by `" + endtoken + '\'');
} }