anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix bug 1254 (handling of blanks in change tracking mode)

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10380 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Spitzmüller 2005-08-01 12:37:25 +00:00
parent ea7c8548d2
commit a9ec2ab3df
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ChangeLog
View File

@ -1,3 +1,9 @@
2005-07-27 Jürgen Spitzmüller <j.spitzmueller@gmx.de>
* text.C (insertChar):
* text2.C (deleteEmptyParagraphMechanism): take care whether
a blank has been deleted (in change tracking mode) (bug 1254).
2005-07-20 John Levon <levon@movementarian.org>
* text2.C (insertStringAsLines): remove old dubious code,

5
src/text.C
View File

@ -1170,8 +1170,9 @@ void LyXText::insertChar(LCursor & cur, char c)
return;
}
BOOST_ASSERT(cur.pos() > 0);
if (par.isLineSeparator(cur.pos() - 1)
|| par.isNewline(cur.pos() - 1)) {
if ((par.isLineSeparator(cur.pos() - 1)
|| par.isNewline(cur.pos() - 1))
&& par.lookupChange(cur.pos() - 1) != Change::DELETED) {
static bool sent_space_message = false;
if (!sent_space_message) {
cur.message(_("You cannot type two spaces this way. "

3
src/text2.C
View File

@ -1218,7 +1218,8 @@ bool LyXText::deleteEmptyParagraphMechanism(LCursor & cur, LCursor const & old)
if (old.pos() > 0
&& old.pos() < oldpar.size()
&& oldpar.isLineSeparator(old.pos())
&& oldpar.isLineSeparator(old.pos() - 1)) {
&& oldpar.isLineSeparator(old.pos() - 1)
&& oldpar.lookupChange(old.pos() - 1) != Change::DELETED) {
// We need to set the text to Change::INSERTED to
// get it erased properly
pars_[old.pit()].setChange(old.pos() -1,