>>>>> "Jean-Marc" == Jean-Marc Lasgouttes <[EMAIL PROTECTED]> writes:
Jean-Marc> What about this different version?
Here is what I am going to apply right now.
JMarc
Index: status.13x
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/Attic/status.13x,v
retrieving revision 1.1.2.280
diff -u -p -r1.1.2.280 status.13x
--- status.13x 9 Nov 2005 15:15:42 -0000 1.1.2.280
+++ status.13x 29 Nov 2005 10:15:37 -0000
@@ -19,6 +19,8 @@ What's new
** Updates
+- update lyx2lyx to handle properly the latest LyX 1.4 format (245).
+
- New hungarian translation.
- Update German documentation.
@@ -30,6 +32,10 @@ What's new
- Don't load the wasysym package automatically anymore (bug 1942)
- Fix crash with S-Home while entering a macro name (bug 2046)
+
+- Do not delete selection when entering an index entry.
+
+- Fix LaTeX output when a bibtex inset is used in a child document.
* User Interface:
Index: src/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/ChangeLog,v
retrieving revision 1.1021.2.93
diff -u -p -r1.1021.2.93 ChangeLog
--- src/ChangeLog 3 Nov 2005 10:49:53 -0000 1.1021.2.93
+++ src/ChangeLog 29 Nov 2005 10:15:38 -0000
@@ -1,3 +1,8 @@
+2005-11-29 Jean-Marc Lasgouttes <[EMAIL PROTECTED]>
+
+ * text3.C (dispatch): LFUN_INDEX_INSERT: when a selection is set,
+ do not remove it (this inset behaves differently from the others).
+
2005-11-02 Jean-Marc Lasgouttes <[EMAIL PROTECTED]>
* lyxlength.h: undefine macros that clash with solaris/x86 (bug 992)
Index: src/text3.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/text3.C,v
retrieving revision 1.29.2.3
diff -u -p -r1.29.2.3 text3.C
--- src/text3.C 29 Dec 2003 13:27:26 -0000 1.29.2.3
+++ src/text3.C 29 Nov 2005 10:15:38 -0000
@@ -1614,6 +1614,17 @@ Inset::RESULT LyXText::dispatch(FuncRequ
break;
}
+ case LFUN_INDEX_INSERT: {
+ Inset * inset = createInset(cmd);
+ if (inset) {
+ BufferView * bv = cmd.view();
+ if (bv->insertInset(inset))
+ inset->edit(bv);
+ else
+ delete inset;
+ }
+ break;
+ }
#if 0
case LFUN_INSET_LIST:
@@ -1637,7 +1648,6 @@ Inset::RESULT LyXText::dispatch(FuncRequ
case LFUN_INSERT_URL:
case LFUN_INSET_EXTERNAL:
- case LFUN_INDEX_INSERT:
// Just open the inset
doInsertInset(this, cmd, true, false);
break;
Index: src/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/ChangeLog,v
retrieving revision 1.2332
diff -u -p -r1.2332 ChangeLog
--- src/ChangeLog 29 Nov 2005 15:08:33 -0000 1.2332
+++ src/ChangeLog 30 Nov 2005 15:37:01 -0000
@@ -1,5 +1,10 @@
2005-11-29 Jean-Marc Lasgouttes <[EMAIL PROTECTED]>
+ * text3.C (dispatch/LFUN_INDEX_INSERT): when a selection is set,
+ do not remove it (this inset behaves differently from the others).
+
+2005-11-29 Jean-Marc Lasgouttes <[EMAIL PROTECTED]>
+
Fix bug 2096.
* BufferView_pimpl.C (getStatus): it is only possible to insert a
Index: src/text3.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/text3.C,v
retrieving revision 1.319
diff -u -p -r1.319 text3.C
--- src/text3.C 25 Nov 2005 09:27:08 -0000 1.319
+++ src/text3.C 30 Nov 2005 15:37:01 -0000
@@ -1220,11 +1220,18 @@ void LyXText::dispatch(LCursor & cur, Fu
cur.dispatch(FuncRequest(LFUN_LAYOUT, "Caption"));
break;
- case LFUN_INDEX_INSERT:
- // Just open the inset
- doInsertInset(cur, this, cmd, true, false);
+ case LFUN_INDEX_INSERT: {
+ InsetBase * inset = createInset(&cur.bv(), cmd);
+ if (!inset)
+ break;
+
+ recordUndo(cur);
+ cur.clearSelection();
+ insertInset(cur, inset);
+ inset->edit(cur, true);
cur.posRight();
break;
+ }
case LFUN_INDEX_PRINT:
case LFUN_TOC_INSERT:
