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

fix pullArg when pressing <Delete> at the end of an cell

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2308 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
André Pönitz 2001-07-23 14:15:14 +00:00
parent 3024e24e80
commit efc5820ea3
4 changed files with 45 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/mathed/ChangeLog
View File

@ -1,12 +1,16 @@
2001-07-22 André Pönitz <poenitz@gmx.net>
* math_cursor.C: fix "pullArg" behaviour
2001-07-22 Jean-Marc Lasgouttes <lasgouttes@lyx.org> 2001-07-22 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* formula.C (insetAllowed): allow insertion of label * formula.C (insetAllowed): allow insertion of label
2001-07-20 André Pönitz <poenitz@htwm.de> 2001-07-20 André Pönitz <poenitz@gmx.net>
* math_macrotable.C: support for \land and \vee * math_macrotable.C: support for \land and \vee
2001-07-16 André Pönitz <poenitz@htwm.de> 2001-07-16 André Pönitz <poenitz@gmx.net>
* math_grid.[Ch] -> math_gridinset.[Ch] * math_grid.[Ch] -> math_gridinset.[Ch]
math_root.[Ch] -> math_rootinset.[Ch]: more consistent names math_root.[Ch] -> math_rootinset.[Ch]: more consistent names
@ -20,7 +24,7 @@
(operator<): ditto (operator<): ditto
(normalAnchor): reversed one test (but shouldn't it really be >= ?) (normalAnchor): reversed one test (but shouldn't it really be >= ?)
2001-07-16 André Pönitz <poenitz@htwm.de> 2001-07-16 André Pönitz <poenitz@gmx.net>
* math_cursor.[hC]: multicell selection (multicell pasete still defunct) * math_cursor.[hC]: multicell selection (multicell pasete still defunct)
@ -37,22 +41,20 @@
* math_decorationinset.h: add std:: qualifier * math_decorationinset.h: add std:: qualifier
2001-07-12 André Pönitz <poenitz@htwm.de> 2001-07-12 André Pönitz <poenitz@gmx.net>
* math_updowninset.[hC]: new base class for script and bigop insets * math_updowninset.[hC]: new base class for script and bigop insets
*.[hC]: subsequent changes to all Metric() functions *.[hC]: subsequent changes to all Metric() functions
* math_parser.C: small changes (\sqrt0 is read properly now) * math_parser.C: small changes (\sqrt0 is read properly now)
2001-07-10 André Pönitz <poenitz@htwm.de> 2001-07-10 André Pönitz <poenitz@gmx.net>
* math_accentinset.[hC]: rewrite * math_accentinset.[hC]: rewrite
* math_parser.C: * math_parser.C:
math_cursor.C: subsequent changes math_cursor.C: subsequent changes
2001-07-10 André Pönitz <poenitz@htwm.de>
* math_grid.C: <Delete> in the first cell of a completely empty row * math_grid.C: <Delete> in the first cell of a completely empty row
deletes that row, <C-Return> places the cursor in the first of the deletes that row, <C-Return> places the cursor in the first of the
new empty cells. new empty cells.
@ -75,7 +77,7 @@
* formulabase.C (mathDispatchInsertMath): remove bogus return * formulabase.C (mathDispatchInsertMath): remove bogus return
statement. statement.
2001-07-09 André Pönitz <poenitz@htwm.de> 2001-07-09 André Pönitz <poenitz@gmx.net>
* math_*inset.C: Change order of arguments in MathInset constructor * math_*inset.C: Change order of arguments in MathInset constructor
@ -85,13 +87,13 @@
* formulabase.C (mathDispatchInsertMath): Create an inline formula. * formulabase.C (mathDispatchInsertMath): Create an inline formula.
2001-07-04 André Pönitz <poenitz@htwm.de> 2001-07-04 André Pönitz <poenitz@gmx.net>
* math_parser.C: fix reading of "unusual" alpha chars * math_parser.C: fix reading of "unusual" alpha chars
* xarray.[hC]: fix debug output of xarray * xarray.[hC]: fix debug output of xarray
2001-07-03 André Pönitz <poenitz@htwm.de> 2001-07-03 André Pönitz <poenitz@gmx.net>
* math_parser.C: fix bug where equations did not get their labels * math_parser.C: fix bug where equations did not get their labels
@ -235,13 +237,13 @@
* formula.C (HandleExtern): add .c_str() to .str() (useful when * formula.C (HandleExtern): add .c_str() to .str() (useful when
using lyxtring) using lyxtring)
2001-04-27 André Pönitz <poenitz@htwm.de> 2001-04-27 André Pönitz <poenitz@gmx.net>
* math_parser.C: fix \frac handling bug introduced on 04-24 * math_parser.C: fix \frac handling bug introduced on 04-24
* math_xiter.C: hotfix for merging "shared" insets * math_xiter.C: hotfix for merging "shared" insets
* formula.C: fixing display after using math-insert * formula.C: fixing display after using math-insert
2001-04-25 André Pönitz <poenitz@htwm.de> 2001-04-25 André Pönitz <poenitz@gmx.net>
* math_*.[Ch]: WriteNormal * math_*.[Ch]: WriteNormal
* formula.C: Support for new "math extern" command * formula.C: Support for new "math extern" command
@ -252,7 +254,7 @@
* math_macrotable.C: include <iostream> * math_macrotable.C: include <iostream>
2001-04-24 André Pönitz <poenitz@htwm.de> 2001-04-24 André Pönitz <poenitz@gmx.net>
* math_macro.[Ch]: * math_macro.[Ch]:
* math_macrotable.[Ch]: * math_macrotable.[Ch]:
@ -301,7 +303,7 @@
* math_rowst.C: add missing #include <config.h>. * math_rowst.C: add missing #include <config.h>.
2001-03-16 André Pönitz <poenitz@htwm.de> 2001-03-16 André Pönitz <poenitz@gmx.net>
* math_matrixinset.h: * math_matrixinset.h:
* math_parinset.[Ch]: * math_parinset.[Ch]:
@ -321,7 +323,7 @@
* math_cursor.C: use lyxerr instead of cerr. * math_cursor.C: use lyxerr instead of cerr.
2001-03-15 André Pönitz <poenitz@htwm.de> 2001-03-15 André Pönitz <poenitz@gmx.net>
* math_cursor.C: fix bug (cursor was leaving two insets at a time * math_cursor.C: fix bug (cursor was leaving two insets at a time
instead of one) instead of one)
@ -333,7 +335,7 @@
* math_rowst.h: make MathedRowContainer::iterator public. * math_rowst.h: make MathedRowContainer::iterator public.
2001-03-15 André Pönitz <poenitz@htwm.de> 2001-03-15 André Pönitz <poenitz@gmx.net>
* math_parser.C: read '\nonumber' again (was broken) * math_parser.C: read '\nonumber' again (was broken)
@ -343,26 +345,26 @@
* math_cursor.C: added using directive. * math_cursor.C: added using directive.
2001-03-15 André Pönitz <poenitz@htwm.de> 2001-03-15 André Pönitz <poenitz@gmx.net>
* math_rowst.h: Finally remove MathedRowSt * math_rowst.h: Finally remove MathedRowSt
* math_parser.C: * math_parser.C:
math_xiter.C: changed accordingly math_xiter.C: changed accordingly
2001-03-12 André Pönitz <poenitz@htwm.de> 2001-03-12 André Pönitz <poenitz@gmx.net>
* math_rowst.h: replace MathedRowSt with MathedRowStruct, * math_rowst.h: replace MathedRowSt with MathedRowStruct,
more robust MathedRowSt::[gs]etTab (to get rid of the constructor arg) more robust MathedRowSt::[gs]etTab (to get rid of the constructor arg)
2001-03-10 André Pönitz <poenitz@htwm.de> 2001-03-10 André Pönitz <poenitz@gmx.net>
* math_xiter.[Ch]: * math_xiter.[Ch]:
math_matrixinset.C: move adjustVerticalSt to the only place where math_matrixinset.C: move adjustVerticalSt to the only place where
it is used. Fix a small bug where the cached row structure and the it is used. Fix a small bug where the cached row structure and the
actual data get out of sync after the deletion of whole rows actual data get out of sync after the deletion of whole rows
2001-03-09 André Pönitz <poenitz@htwm.de> 2001-03-09 André Pönitz <poenitz@gmx.net>
* math_cursor.C: use std::vector<> in MathStackXIter * math_cursor.C: use std::vector<> in MathStackXIter
change selstk from a pointer to the "real thing" change selstk from a pointer to the "real thing"
@ -373,7 +375,7 @@
* math_parser.C: use MathedRowContainer::insert_after * math_parser.C: use MathedRowContainer::insert_after
2001-03-08 André Pönitz <poenitz@htwm.de> 2001-03-08 André Pönitz <poenitz@gmx.net>
* math_rowst.h: give MathedRowContainer an 'insert' method. * math_rowst.h: give MathedRowContainer an 'insert' method.
@ -386,7 +388,7 @@
* math_matrixinset.[hC]: remove copy constructr and destructor. Those * math_matrixinset.[hC]: remove copy constructr and destructor. Those
automatically created by the compiler are ok now. automatically created by the compiler are ok now.
2001-03-06 André Pönitz <poenitz@htwm.de> 2001-03-06 André Pönitz <poenitz@gmx.net>
* array.[Ch]: factor out deep_copy, * array.[Ch]: factor out deep_copy,
remove third argument from raw_pointer_insert remove third argument from raw_pointer_insert
@ -399,7 +401,7 @@
* math_rowst.h: introduction of MathRowContainer * math_rowst.h: introduction of MathRowContainer
several files: corresponding changes several files: corresponding changes
2001-03-04 André Pönitz <poenitz@htwm.de> 2001-03-04 André Pönitz <poenitz@gmx.net>
* math_macrotemplate.[Ch]: * math_macrotemplate.[Ch]:
math_macro.C: move update() functionality to the macro math_macro.C: move update() functionality to the macro
@ -623,7 +625,7 @@
* formulamacro.C (LocalDispatch): ditto. * formulamacro.C (LocalDispatch): ditto.
2001-02-14 André Pönitz <poenitz@htwm.de> 2001-02-14 André Pönitz <poenitz@gmx.net>
* math_parinset.[Ch]: make array a real MathArray, not just a * math_parinset.[Ch]: make array a real MathArray, not just a
pointer to one. pointer to one.
@ -641,7 +643,7 @@
* array.C (MathedArray): Fix compilation problem. * array.C (MathedArray): Fix compilation problem.
2001-02-14 André Pönitz <poenitz@htwm.de> 2001-02-14 André Pönitz <poenitz@gmx.net>
* array.[Ch]: "deep" copy constructor and assignment operator for * array.[Ch]: "deep" copy constructor and assignment operator for
MathArray MathArray
@ -651,7 +653,7 @@
* math_iter.[Ch]: remove SetData * math_iter.[Ch]: remove SetData
several files: subsequent changes several files: subsequent changes
2001-02-14 André Pönitz <poenitz@htwm.de> 2001-02-14 André Pönitz <poenitz@gmx.net>
* array.[Ch]: remove constructor and enums ARRAY_MIN_SIZE and * array.[Ch]: remove constructor and enums ARRAY_MIN_SIZE and
ARRAY_STEP ARRAY_STEP
@ -669,7 +671,7 @@
* changes to several files because of the above. * changes to several files because of the above.
2001-02-14 André Pönitz <poenitz@htwm.de> 2001-02-14 André Pönitz <poenitz@gmx.net>
* math_iter.[Ch]: hide fcode_ * math_iter.[Ch]: hide fcode_
* math_xiter.C: * math_xiter.C:
@ -697,7 +699,7 @@
* several files: changes so that several friends can be removed * several files: changes so that several friends can be removed
2001-02-14 André Pönitz <poenitz@htwm.de> 2001-02-14 André Pönitz <poenitz@gmx.net>
* formula.C: reformatting * formula.C: reformatting
@ -714,7 +716,7 @@
* array.C (begin): new method * array.C (begin): new method
(end): ditto (end): ditto
2001-02-14 André Pönitz <poenitz@htwm.de> 2001-02-14 André Pönitz <poenitz@gmx.net>
* math_iter.[Ch]: remove 'insert', 'maxsize' and 'ARRAY_SIZE' * math_iter.[Ch]: remove 'insert', 'maxsize' and 'ARRAY_SIZE'
@ -735,7 +737,7 @@
* math_accentinset.C: * math_accentinset.C:
* math_sqrtinset.C: include LOstream.h and add using directive. * math_sqrtinset.C: include LOstream.h and add using directive.
2001-02-14 André Pönitz <poenitz@htwm.de> 2001-02-14 André Pönitz <poenitz@gmx.net>
* math_iter.C: reformatting * math_iter.C: reformatting
@ -824,7 +826,7 @@
files they belong to. Only first attempt at cleanup more will files they belong to. Only first attempt at cleanup more will
follow. follow.
2001-02-12 André Pönitz <poenitz@htwm.de> 2001-02-12 André Pönitz <poenitz@gmx.net>
* math_macro.[hC]: replace MathMacroArgument[] with * math_macro.[hC]: replace MathMacroArgument[] with
std::vector<MathMacroArgument> std::vector<MathMacroArgument>
@ -848,7 +850,7 @@
* math_inset.C (Metrics): Correct drawing of the multline * math_inset.C (Metrics): Correct drawing of the multline
environment. environment.
2001-02-12 André Pönitz <poenitz@htwm.de> 2001-02-12 André Pönitz <poenitz@gmx.net>
* array.[hC]: replace private variable maxsize_ with call to * array.[hC]: replace private variable maxsize_ with call to
bf_.size() bf_.size()
@ -872,7 +874,7 @@
* Many files: add support for the align environment from amsmath. * Many files: add support for the align environment from amsmath.
2001-02-09 André Pönitz <poenitz@htwm.de> 2001-02-09 André Pönitz <poenitz@gmx.net>
* array.h: replace array buffer 'byte bf[]' by 'std::vector<byte> bf' * array.h: replace array buffer 'byte bf[]' by 'std::vector<byte> bf'
* several files: subsequent changes * several files: subsequent changes
@ -885,7 +887,7 @@
compiling with lyxstring, but STL sstream). compiling with lyxstring, but STL sstream).
(Metrics): ditto. (Metrics): ditto.
2001-02-08 André Pönitz <poenitz@htwm.de> 2001-02-08 André Pönitz <poenitz@gmx.net>
* several files: get rid of reinterpret_cast. * several files: get rid of reinterpret_cast.

7
src/mathed/formulabase.C
View File

@ -472,7 +472,7 @@ InsetFormulaBase::localDispatch(BufferView * bv, kb_action action,
// if (!mathcursor->InMacroMode() && mathcursor->pos() == 0) // if (!mathcursor->InMacroMode() && mathcursor->pos() == 0)
if (mathcursor->pos() == 0) { if (mathcursor->pos() == 0) {
bv->lockedInsetStoreUndo(Undo::DELETE); bv->lockedInsetStoreUndo(Undo::DELETE);
mathcursor->pullArg(); mathcursor->pullArg(false);
bv->updateInset(this, true); bv->updateInset(this, true);
break; break;
} }
@ -484,7 +484,10 @@ InsetFormulaBase::localDispatch(BufferView * bv, kb_action action,
case LFUN_DELETE: case LFUN_DELETE:
bv->lockedInsetStoreUndo(Undo::DELETE); bv->lockedInsetStoreUndo(Undo::DELETE);
mathcursor->Delete(); if (mathcursor->pos() == mathcursor->array().size())
mathcursor->pullArg(true);
else
mathcursor->Delete();
bv->updateInset(this, true); bv->updateInset(this, true);
break; break;

4
src/mathed/math_cursor.C
View File

@ -1062,7 +1062,7 @@ MathInset * MathCursor::enclosing(MathInsetTypes t, int & idx) const
} }
void MathCursor::pullArg() void MathCursor::pullArg(bool goright)
{ {
// pullArg // pullArg
dump("pullarg"); dump("pullarg");
@ -1070,6 +1070,8 @@ void MathCursor::pullArg()
if (pop()) { if (pop()) {
array().erase(cursor().pos_); array().erase(cursor().pos_);
array().insert(cursor().pos_, a); array().insert(cursor().pos_, a);
if (goright)
cursor().pos_ += a.size();
} }
} }

2
src/mathed/math_cursor.h
View File

@ -167,7 +167,7 @@ public:
/// ///
void idxPrev(); void idxPrev();
/// ///
void pullArg(); void pullArg(bool goright);
/// ///
bool isInside(MathInset *) const; bool isInside(MathInset *) const;
/// ///