On Mon, Jan 02, 2006 at 08:52:06PM +0200, Martin Vermeer wrote: > On Mon, Jan 02, 2006 at 06:17:31PM +0200, Martin Vermeer wrote: > ...
> Bugzilla has a fix which simply disables font attribute editing inside a > charstyle inset; see above theory. Problem solved :-) ... > See attached, tested and works. OK to commit? > > - Martin Ping... > Index: insetcharstyle.C > =================================================================== > RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetcharstyle.C,v > retrieving revision 1.39 > diff -u -p -r1.39 insetcharstyle.C > --- insetcharstyle.C 25 Nov 2005 14:40:32 -0000 1.39 > +++ insetcharstyle.C 2 Jan 2006 18:59:02 -0000 > @@ -249,6 +249,19 @@ bool InsetCharStyle::getStatus(LCursor & > case LFUN_BREAKPARAGRAPH: > case LFUN_BREAKPARAGRAPHKEEPLAYOUT: > case LFUN_BREAKPARAGRAPH_SKIP: > + // font attributes also not allowed > + case LFUN_DEFAULT: > + case LFUN_CODE: > + case LFUN_ROMAN: > + case LFUN_SANS: > + case LFUN_BOLD: > + case LFUN_ITAL: > + case LFUN_EMPH: > + case LFUN_NOUN: > + case LFUN_UNDERLINE: > + case LFUN_FONT_SIZE: > + case LFUN_FREEFONT_APPLY: > + case LFUN_FREEFONT_UPDATE: > status.enabled(false); > return true; >
pgprG9vBaGq3N.pgp
Description: PGP signature
