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

Fixed \r reading for tabulars.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1758 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Vigna 2001-03-14 16:10:15 +00:00
parent 8b1efb19a6
commit 898a191c48
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ChangeLog
View File

@ -1,3 +1,7 @@
2001-03-14 Juergen Vigna <jug@sad.it>
* tabular.C (l_getline): pay attention on \r\n (from Windows-files)
2001-03-14 Lars Gullik Bjønnes <larsbj@trylle.birdstep.com>
* buffer.C: add hack to fix compability reading of minipages.

8
src/tabular.C
View File

@ -1226,7 +1226,7 @@ static inline
void l_getline(istream & is, string & str)
{
getline(is, str);
while(str.empty())
while(str.empty() || ((str.length()==1) && (str[0] == '\r')))
getline(is, str);
}
@ -1325,20 +1325,20 @@ void LyXTabular::ReadNew(Buffer const * buf, istream & is,
cell_info[i][j].inset.Read(buf, lex);
l_getline(is, line);
}
if (line != "</cell>") {
if (!prefixIs(line, "</cell>")) {
lyxerr << "Wrong tabular format (expected </cell> got" <<
line << ")" << endl;
return;
}
}
l_getline(is, line);
if (line != "</row>") {
if (!prefixIs(line, "</row>")) {
lyxerr << "Wrong tabular format (expected </row> got" <<
line << ")" << endl;
return;
}
}
while (line != "</lyxtabular>") {
while (!prefixIs(line, "</lyxtabular>")) {
l_getline(is, line);
}
set_row_column_number_info();