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

more whitespace bugs fixed

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@347 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 1999-12-01 10:46:58 +00:00
parent 825e70d124
commit 28ed26ab13
7 changed files with 32 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -2,6 +2,14 @@
* src/mathed/formula.C (LocalDispatch): fix small whitspace bug * src/mathed/formula.C (LocalDispatch): fix small whitspace bug
introduced by faulty regex. introduced by faulty regex.
* src/buffer.C: ditto
* src/lastfiles.C: ditto
* src/paragraph.C: ditto
* src/table.C: ditto
* src/vspace.C: ditto
* src/insets/figinset.C: ditto
Note: most of these is absolutely harmless, except the one in
src/mathed formula.C.
1999-11-30 Kayvan A. Sylvan <kayvan@satyr.sylvan.com> 1999-11-30 Kayvan A. Sylvan <kayvan@satyr.sylvan.com>

18
src/buffer.C
View File

@ -1746,10 +1746,10 @@ void Buffer::makeLaTeXFile(string const & filename,
switch (params.papersize2) { switch (params.papersize2) {
case BufferParams::VM_PAPER_CUSTOM: case BufferParams::VM_PAPER_CUSTOM:
if (!params.paperwidth.empty()) if (!params.paperwidth.empty())
LFile += ",paperwidth= " LFile += ",paperwidth="
+ params.paperwidth; + params.paperwidth;
if (!params.paperheight.empty()) if (!params.paperheight.empty())
LFile += ",paperheight= " LFile += ",paperheight="
+ params.paperheight; + params.paperheight;
break; break;
case BufferParams::VM_PAPER_USLETTER: case BufferParams::VM_PAPER_USLETTER:
@ -1807,19 +1807,19 @@ void Buffer::makeLaTeXFile(string const & filename,
} }
} }
if (!params.topmargin.empty()) if (!params.topmargin.empty())
LFile += ",tmargin= " + params.topmargin; LFile += ",tmargin=" + params.topmargin;
if (!params.bottommargin.empty()) if (!params.bottommargin.empty())
LFile += ",bmargin= " + params.bottommargin; LFile += ",bmargin=" + params.bottommargin;
if (!params.leftmargin.empty()) if (!params.leftmargin.empty())
LFile += ",lmargin= " + params.leftmargin; LFile += ",lmargin=" + params.leftmargin;
if (!params.rightmargin.empty()) if (!params.rightmargin.empty())
LFile += ",rmargin= " + params.rightmargin; LFile += ",rmargin=" + params.rightmargin;
if (!params.headheight.empty()) if (!params.headheight.empty())
LFile += ",headheight= " + params.headheight; LFile += ",headheight=" + params.headheight;
if (!params.headsep.empty()) if (!params.headsep.empty())
LFile += ",headsep= " + params.headsep; LFile += ",headsep=" + params.headsep;
if (!params.footskip.empty()) if (!params.footskip.empty())
LFile += ",footskip= " + params.footskip; LFile += ",footskip=" + params.footskip;
LFile += "}\n"; LFile += "}\n";
texrow.newline(); texrow.newline();
} }

2
src/insets/figinset.C
View File

@ -1240,7 +1240,7 @@ int InsetFig::DocBook(string & file)
if(suffixIs(figurename, ".eps")) if(suffixIs(figurename, ".eps"))
figurename.erase(fname.length() - 5); figurename.erase(fname.length() - 5);
file += "@<graphic fileref= \"" + figurename + "\"></graphic>"; file += "@<graphic fileref=\"" + figurename + "\"></graphic>";
return 0; return 0;
} }

2
src/lastfiles.C
View File

@ -40,7 +40,7 @@ void LastFiles::setNumberOfFiles(unsigned int no)
num_files = no; num_files = no;
else { else {
lyxerr << "LyX: lastfiles: too many files\n" lyxerr << "LyX: lastfiles: too many files\n"
"\tdefault (= " << int(DEFAULTFILES) "\tdefault (=" << int(DEFAULTFILES)
<< ") used." << endl; << ") used." << endl;
num_files = DEFAULTFILES; num_files = DEFAULTFILES;
} }

2
src/paragraph.C
View File

@ -2088,7 +2088,7 @@ int LyXParagraph::BeginningOfMainBody() const
char previous_char, temp; char previous_char, temp;
if (i < size() if (i < size()
&& (previous_char = GetChar(i)) != LyXParagraph::META_NEWLINE) { && (previous_char = GetChar(i)) != LyXParagraph::META_NEWLINE) {
// Yes, this ^ is supposed to be "= " not "== " // Yes, this ^ is supposed to be "= " not "=="
++i; ++i;
while (i < size() while (i < size()
&& previous_char != ' ' && previous_char != ' '

22
src/table.C
View File

@ -1475,7 +1475,7 @@ int LyXTable::DocBookEndOfCell(string & file, int cell, int &depth)
file += tostr(i+1); file += tostr(i+1);
file += "' COLNUM='"; file += "' COLNUM='";
file += tostr(i+1); file += tostr(i+1);
file += "' COLSEP= '"; file += "' COLSEP='";
if (i == (columns-1)) { if (i == (columns-1)) {
file += '1'; file += '1';
} else { } else {
@ -1497,11 +1497,11 @@ int LyXTable::DocBookEndOfCell(string & file, int cell, int &depth)
addNewlineAndDepth(file,++depth); addNewlineAndDepth(file,++depth);
file += "<ROW>"; file += "<ROW>";
addNewlineAndDepth(file,++depth); addNewlineAndDepth(file,++depth);
file += "<ENTRY ALIGN= '"; file += "<ENTRY ALIGN='";
file += getDocBookAlign(0); file += getDocBookAlign(0);
file += "'"; file += "'";
if (IsMultiColumn(0)) { if (IsMultiColumn(0)) {
file += " NAMEST= 'col1' NAMEEND= 'col"; file += " NAMEST='col1' NAMEEND='col";
file += tostr(cells_in_multicolumn(0)); file += tostr(cells_in_multicolumn(0));
file += "'"; file += "'";
} }
@ -1517,13 +1517,13 @@ int LyXTable::DocBookEndOfCell(string & file, int cell, int &depth)
addNewlineAndDepth(file, depth); addNewlineAndDepth(file, depth);
file += "<ROW>"; file += "<ROW>";
addNewlineAndDepth(file,++depth); addNewlineAndDepth(file,++depth);
file += "<ENTRY ALIGN= '"; file += "<ENTRY ALIGN='";
file += getDocBookAlign(cell+1); file += getDocBookAlign(cell+1);
file += "' VALIGN= 'middle'"; file += "' VALIGN='middle'";
if (IsMultiColumn(cell+1)) { if (IsMultiColumn(cell+1)) {
file += " NAMEST= 'col"; file += " NAMEST='col";
file += tostr(column_of_cell(cell+1) + 1); file += tostr(column_of_cell(cell+1) + 1);
file += "' NAMEEND= 'col"; file += "' NAMEEND='col";
file += tostr(column_of_cell(cell+1) + file += tostr(column_of_cell(cell+1) +
cells_in_multicolumn(cell+1)); cells_in_multicolumn(cell+1));
file += "'"; file += "'";
@ -1535,13 +1535,13 @@ int LyXTable::DocBookEndOfCell(string & file, int cell, int &depth)
addNewlineAndDepth(file,--depth); addNewlineAndDepth(file,--depth);
file += "</ENTRY>"; file += "</ENTRY>";
addNewlineAndDepth(file, depth); addNewlineAndDepth(file, depth);
file += "<ENTRY ALIGN= '"; file += "<ENTRY ALIGN='";
file += getDocBookAlign(cell+1); file += getDocBookAlign(cell+1);
file += "' VALIGN= 'middle'"; file += "' VALIGN='middle'";
if (IsMultiColumn(cell+1)) { if (IsMultiColumn(cell+1)) {
file += " NAMEST= 'col"; file += " NAMEST='col";
file += tostr(column_of_cell(cell+1) + 1); file += tostr(column_of_cell(cell+1) + 1);
file += "' NAMEEND= 'col"; file += "' NAMEEND='col";
file += tostr(column_of_cell(cell+1) + file += tostr(column_of_cell(cell+1) +
cells_in_multicolumn(cell+1)); cells_in_multicolumn(cell+1));
file += "'"; file += "'";

2
src/vspace.C
View File

@ -91,7 +91,7 @@ static char nextToken (string & data)
else { else {
string::size_type i; string::size_type i;
// I really mean assignment ("= ") below, not equality! // I really mean assignment ("=") below, not equality!
if ((i = data.find_last_of("0123456789.")) != string::npos) { if ((i = data.find_last_of("0123456789.")) != string::npos) {
if (number_index > 3) return 'E'; // Error if (number_index > 3) return 'E'; // Error
string buffer = data.substr(0, i + 1); string buffer = data.substr(0, i + 1);