From ba5a184c979352aa1f95bf60e2bb06bbd44546c4 Mon Sep 17 00:00:00 2001
From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Fri, 31 May 2002 12:15:36 +0000
Subject: [PATCH] fix bug 391

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH-1_2_X@4312 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/insets/ChangeLog  |  6 ++++++
 src/insets/insetert.C | 14 +++++++++++++-
 src/insets/insetert.h |  2 ++
 status.12x            | 10 ++++++++++
 4 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index 29def02cf1..ecc879d4a9 100644
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,3 +1,9 @@
+2002-05-31  Juergen Vigna  <jug@sad.it>
+
+	* insetert.C (get_new_label): add '...' for multi-paragraph ert
+	insets too
+	(update) new method
+
 2002-05-30  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
 
 	* insetexternal.C (updateExternal): do not look for difftime only
diff --git a/src/insets/insetert.C b/src/insets/insetert.C
index 8471c83579..9f6581e5f5 100644
--- a/src/insets/insetert.C
+++ b/src/insets/insetert.C
@@ -492,7 +492,7 @@ string const InsetERT::get_new_label() const
 		la += inset.paragraph()->getChar(j);
 		++i;
 	}
-	if (i > 0 && j < p_siz) {
+	if (inset.paragraph()->next() || (i > 0 && j < p_siz)) {
 		la += "...";
 	}
 	if (la.empty()) {
@@ -709,3 +709,15 @@ int InsetERT::getMaxWidth(BufferView * bv, UpdatableInset const * in) const
 		return -1;
 	return w;
 }
+
+
+void InsetERT::update(BufferView * bv, LyXFont const & font,
+                      bool reinit)
+{
+	if (inset.need_update & InsetText::INIT ||
+		inset.need_update & InsetText::FULL)
+	{
+		setButtonLabel();
+	}
+	InsetCollapsable::update(bv, font, reinit);
+}
diff --git a/src/insets/insetert.h b/src/insets/insetert.h
index 8f8c02d282..95a41dbf3c 100644
--- a/src/insets/insetert.h
+++ b/src/insets/insetert.h
@@ -134,6 +134,8 @@ public:
 	}
 	///
 	int getMaxWidth(BufferView *, UpdatableInset const *) const;
+	///
+	void update(BufferView *, LyXFont const &, bool =false);
 
 private:
 	///
diff --git a/status.12x b/status.12x
index 8d7b8540dc..141e81b4f0 100644
--- a/status.12x
+++ b/status.12x
@@ -1,4 +1,12 @@
 -*- text -*-
+
+This file describes what has been done in the preparation of LyX
+1.2.1.
+All comments are welcome.
+
+You can find a list of bugs pending for 1.2.1 at URL
+http://bugzilla.lyx.org/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&&target_milestone=1.2.1
+
 I'd be glad if some of you could take the time to check it out (or fix
 a bug or two if you are feeling adventurous). Let me recall that all
 these fixes have been checked in the branch BRANCH-1_2_X, which you
@@ -29,6 +37,8 @@ What's new
 
 - re-read correctly graphics insets when file name contains a comma
 
+- fix drawing problems for collapsed ERT insets
+
 - disable 'Load' button of 'include file' dialog for verbatim include
 
 - only use the amsmath package when it is needed