anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-08 10:11:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix bug 391

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH-1_2_X@4312 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2002-05-31 12:15:36 +00:00
parent f2c7e37413
commit ba5a184c97
4 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/insets/ChangeLog
View File

@ -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> 2002-05-30 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr>
* insetexternal.C (updateExternal): do not look for difftime only * insetexternal.C (updateExternal): do not look for difftime only

14
src/insets/insetert.C
View File

@ -492,7 +492,7 @@ string const InsetERT::get_new_label() const
la += inset.paragraph()->getChar(j); la += inset.paragraph()->getChar(j);
++i; ++i;
} }
if (i > 0 && j < p_siz) { if (inset.paragraph()->next() || (i > 0 && j < p_siz)) {
la += "..."; la += "...";
} }
if (la.empty()) { if (la.empty()) {
@ -709,3 +709,15 @@ int InsetERT::getMaxWidth(BufferView * bv, UpdatableInset const * in) const
return -1; return -1;
return w; 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);
}

2
src/insets/insetert.h
View File

@ -134,6 +134,8 @@ public:
} }
/// ///
int getMaxWidth(BufferView *, UpdatableInset const *) const; int getMaxWidth(BufferView *, UpdatableInset const *) const;
///
void update(BufferView *, LyXFont const &, bool =false);
private: private:
/// ///

10
status.12x
View File

@ -1,4 +1,12 @@
-*- text -*- -*- 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 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 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 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 - 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 - disable 'Load' button of 'include file' dialog for verbatim include
- only use the amsmath package when it is needed - only use the amsmath package when it is needed