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

* paragraph.C (startTeXParams, endTeXParams):

Browse Source 
reset column count after linebreak.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16209 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Spitzmüller 2006-12-08 18:20:38 +00:00
parent e04c134ec2
commit 73b2f634af
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/paragraph.C
View File

@ -56,6 +56,8 @@
namespace lyx { namespace lyx {
using lyx::support::contains;
using lyx::support::rsplit;
using support::subst; using support::subst;
using std::distance; using std::distance;
@ -742,6 +744,17 @@ string const corrected_env(string const & suffix, string const & env,
return output; return output;
} }
int adjust_column_count(string const & str, int oldcol)
{
if (!contains(str, "\n"))
return oldcol + str.size();
else {
string tmp;
return rsplit(str, tmp, '\n').size();
}
}
} // namespace anon } // namespace anon
@ -785,7 +798,7 @@ int Paragraph::startTeXParParams(BufferParams const & bparams,
else else
output = corrected_env("\\begin", "flushright", ownerCode()); output = corrected_env("\\begin", "flushright", ownerCode());
os << from_ascii(output); os << from_ascii(output);
column += output.size(); column = adjust_column_count(output, column);
break; break;
} case LYX_ALIGN_RIGHT: { } case LYX_ALIGN_RIGHT: {
string output; string output;
@ -794,13 +807,13 @@ int Paragraph::startTeXParParams(BufferParams const & bparams,
else else
output = corrected_env("\\begin", "flushleft", ownerCode()); output = corrected_env("\\begin", "flushleft", ownerCode());
os << from_ascii(output); os << from_ascii(output);
column += output.size(); column = adjust_column_count(output, column);
break; break;
} case LYX_ALIGN_CENTER: { } case LYX_ALIGN_CENTER: {
string output; string output;
output = corrected_env("\\begin", "center", ownerCode()); output = corrected_env("\\begin", "center", ownerCode());
os << from_ascii(output); os << from_ascii(output);
column += output.size(); column = adjust_column_count(output, column);
break; break;
} }
} }
@ -844,7 +857,7 @@ int Paragraph::endTeXParParams(BufferParams const & bparams,
else else
output = corrected_env("\n\\par\\end", "flushright", ownerCode()); output = corrected_env("\n\\par\\end", "flushright", ownerCode());
os << from_ascii(output); os << from_ascii(output);
column += output.size(); column = adjust_column_count(output, column);
break; break;
} case LYX_ALIGN_RIGHT: { } case LYX_ALIGN_RIGHT: {
string output; string output;
@ -853,13 +866,13 @@ int Paragraph::endTeXParParams(BufferParams const & bparams,
else else
output = corrected_env("\n\\par\\end", "flushleft", ownerCode()); output = corrected_env("\n\\par\\end", "flushleft", ownerCode());
os << from_ascii(output); os << from_ascii(output);
column += output.size(); column = adjust_column_count(output, column);
break; break;
} case LYX_ALIGN_CENTER: { } case LYX_ALIGN_CENTER: {
string output; string output;
output = corrected_env("\n\\par\\end", "center", ownerCode()); output = corrected_env("\n\\par\\end", "center", ownerCode());
os << from_ascii(output); os << from_ascii(output);
column += output.size(); column = adjust_column_count(output, column);
break; break;
} }
} }