Commit Graph

98 Commits

Author SHA1 Message Date
Vincent van Ravesteijn
6b96abd211 Correctly paint the background of the instant preview of a displayed equation.
For a displayed equation, the height is artificially increased by a displayMargin() in InsetMathHull::metrics if it is a displayed equation and there is a preview. 

This extra height is not covered by the preview image and what one can see is the background as drawn by the MathHull inset. The color of this background should be either Color_mathbg or Color_background depending on whether the preview is shown or not.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32560 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-17 14:09:37 +00:00
Abdelrazak Younes
82c7e15e64 Uniformize Inset construction (passing Buffer * everywhere). Lots of cleanup to do still...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31901 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-08 15:53:21 +00:00
Vincent van Ravesteijn
3b409626f0 Move CollapseStatus from Inset to InsetCollapsable (where it belongs IMO).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31824 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-02 05:03:09 +00:00
Vincent van Ravesteijn
f09a4ac03c Fix bug #6280: Wrong context menu is opened in an auto-opened inset.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31697 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-24 00:02:41 +00:00
Jean-Marc Lasgouttes
0585f2b2b4 This commit terminates the great InsetCollapsable shrink party
* rename InsetLayout::isForceLtr to forceLTR
 * move InsetCollapsable::xhtml to InsetText
 * move InsetCollapsable::tocString to InsetText.
 * move forcePlainLayout and allowParagraphCustomization from IC to IT
 * use isPassThru instead of forceLTR in places where it seems to make 
   sense (was introduced in r21285)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30591 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-14 21:14:39 +00:00
Jean-Marc Lasgouttes
435a1f67b4 move InsetCollapsable::docbook to InsetText; move InsetCollapsable::undefined to Inset
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30589 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-14 20:25:25 +00:00
Jean-Marc Lasgouttes
ace4f7d3b8 move the the latex and validate methods from InsetCollapsable to InsetText; small cleanups
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30582 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-14 18:27:54 +00:00
Jean-Marc Lasgouttes
c1b89e4d68 fix button label of insets like InsetMarginal
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30570 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-14 16:01:07 +00:00
Jean-Marc Lasgouttes
e33095f10d Move special handling of paste function from InsetCollapsable to InsetText
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30562 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-14 13:00:42 +00:00
Jean-Marc Lasgouttes
5bf8df4fbc Remove the layout_ cache in InsetCollapsable.
Remove setLayout methods and all the calls to it.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30560 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-14 12:07:51 +00:00
Jean-Marc Lasgouttes
defe820a8a note to self: always compile before committing
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30550 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-13 15:57:08 +00:00
Jean-Marc Lasgouttes
d0cb2cc0b7 The most important change in this changeset is that InsetCollapsable::getLayout
is commented out, so that the documentclass is queried every time instead of
using the layout_ cache. For now I have kept the setLayout calls, but they are 
inoperant. 

Other changes:
 * remove non-const usePlainLayout methods
 * move InsetCollapsable::allowSpellCheck and allowMultiPar to InsetText
 * move InsetCollapsable::isFreespacing and forceLTR to Inset

Freespacing support could be moved to insettext, but I have to check who 
uses it. 


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30549 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-13 15:47:40 +00:00
Jean-Marc Lasgouttes
4dbe411ba9 Remove all BufferParam arguments in InsetXXX methods (since insets know about their Buffer)
Add an assertion in Inset::dispatch that checks that buffer() == *cur.buffer()


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30540 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-13 12:56:20 +00:00
Jürgen Spitzmüller
bbfc419c10 Finally make the label color of multiple index entries work.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30533 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-13 06:46:52 +00:00
Jean-Marc Lasgouttes
081fad9557 First step of InsetLayout cleanup.
Get rid of Inset::getLayout(BufferParams), since all insets have access to
their own buffer. Inset::getLayout() does the same now.

Get rid of InsetCollapsable::getLayout(BufferParams) too, and remove most references to InsetCollapsable::layout_. For now IC::getLayout() still returns layout_, but the idea is to change this (provided there is no performance problem).


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30530 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-13 00:28:22 +00:00
Richard Heck
3b707bc0ed Polish some of the recent changes in accord with suggestions
of JMarc's.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30186 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-19 13:50:19 +00:00
Richard Heck
33c6656769 Move these, too, so they can be used in InsetListings, and maybe
even elsewhere.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30184 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-19 13:16:27 +00:00
Richard Heck
3579d53108 Move getCaptionInset() to InsetCollapsable, so it can be used in InsetListings.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30182 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-19 13:12:02 +00:00
Richard Heck
67e70c6c02 Well, it turns out that we need a different return value for the xhtml
routines, one that allows us to "defer" certain material, e.g., a float
that ought to appear in a div but can't simply be put into the middle
of a paragraph.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30079 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-12 17:23:17 +00:00
Richard Heck
12f57a57bd The return value for xhtml() is not going to be needed.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30078 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-12 16:11:33 +00:00
Richard Heck
ccf91c3bf0 Add a couple more HTML* tags to InsetLayout, in a way that improves the
footnote output and allows a lot more flexibility. (In some ways, this now
seems to be more like what docbook does.)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29981 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-06 03:02:43 +00:00
Richard Heck
6ef03cc4ac Get InsetCollapsable working, at least to some extent.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29963 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-05 18:57:53 +00:00
Richard Heck
47b796d41f Revert unintended commit.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29961 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-05 18:47:22 +00:00
Richard Heck
37a9bbebff Cosmetics
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29960 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-05 18:45:23 +00:00
Vincent van Ravesteijn
4c9fe33c83 * Move handling of LFUN_INSET_SETTINGS to Inset,
* Remove the EDITABLE enum,
* add functions hasSettings() for all insets.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29375 a592a061-630c-0410-9148-cb99ea01b6c8
2009-04-22 20:55:13 +00:00
Richard Heck
920bfedf1f Manage the initial setting of Default or Plain Layout more simply.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29093 a592a061-630c-0410-9148-cb99ea01b6c8
2009-04-04 19:34:14 +00:00
Vincent van Ravesteijn
07dba7f761 Fix^3 of bug 4346.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28633 a592a061-630c-0410-9148-cb99ea01b6c8
2009-02-27 00:04:28 +00:00
Pavel Sanda
37f82f7c2b Squash zillion warnings
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28612 a592a061-630c-0410-9148-cb99ea01b6c8
2009-02-25 23:26:09 +00:00
Vincent van Ravesteijn
7eb04d61d9 Fix the fix for bug 4346: http://bugzilla.lyx.org/show_bug.cgi?id=4346.
Synchronizing insets asserts with two views open

This finishes the change of http://www.lyx.org/trac/changeset/28587.

Replace the setButtonLabels functions that need a BufferView by buttonLabel functions. These functions modify the label at drawing time. 

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28610 a592a061-630c-0410-9148-cb99ea01b6c8
2009-02-25 22:35:41 +00:00
Vincent van Ravesteijn
aedfb81808 Fix bug 4346: http://bugzilla.lyx.org/show_bug.cgi?id=4346.
Synchronizing insets asserts with two views open

It changes the autoOpen_ member of InsetCollapsable into a map, such that an autoOpen value can be specified for each bufferView. Now, the assertion is avoided and insetCollapsable can be open in one bufferview and be closed in the other in very special cases that the cursor end up in a closed inset.

Compare with the MathMacro::editing_ member. 

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28573 a592a061-630c-0410-9148-cb99ea01b6c8
2009-02-21 16:27:00 +00:00
Richard Heck
a864caf6f4 Move some stuff from InsetFlex to InsetCollapsable, and make use of the
InToc tag in a couple places.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28378 a592a061-630c-0410-9148-cb99ea01b6c8
2009-02-06 17:56:47 +00:00
Richard Heck
ac4e461898 Move a couple routines from InsetFlex to InsetCollapsable so the CustomPars
and ForcePlain tags will work not just with InsetFlex but all InsetCollapsables.
Thanks to Jurgen and JMarc for reminding me I'd meant to do this.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28340 a592a061-630c-0410-9148-cb99ea01b6c8
2009-02-03 21:12:59 +00:00
André Pönitz
f1cba8ff64 more latin1..utf8 schanges. all of src/* should be utf8 now
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27425 a592a061-630c-0410-9148-cb99ea01b6c8
2008-11-14 15:58:50 +00:00
Richard Heck
f771d9a994 This is a conservative fix for the layout setting bug discussed in
this thread:
  http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg145547.html
The more dramatic fix suggested there can wait.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27164 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-28 14:11:24 +00:00
Richard Heck
d6f1915684 This optional argument to the InsetCollapsable constructor
is more trouble than it is worth.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27131 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-26 02:25:57 +00:00
Jean-Marc Lasgouttes
45312b5f49 Fix bug 4166: Crash when middle button click on inset label
http://bugzilla.lyx.org/show_bug.cgi?id=4662

	* InsetCollapsable.cpp (doDispatch): cleanup the handling of mouse-
	related lfuns. The new behavior is as follows:
	- everything that does not touch the button is sent to the insettext,
	if it is visible, and delegated to enclosing inset instead
	- mouse1-press is delegated to enclosing inset (which will set the
	cursor)
	- the rest is either acted upon or results on a mere cur.noUpdate().


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26122 a592a061-630c-0410-9148-cb99ea01b6c8
2008-08-12 14:13:16 +00:00
Richard Heck
780bce0f96 Rename empty layout stuff to plain layout stuff.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25541 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-10 17:41:52 +00:00
Jürgen Spitzmüller
d341c4f446 * src/insets/InsetCollapsable.h:
- exclude insets with latex_language from spell checking (bug 4810).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24543 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-28 18:49:23 +00:00
André Pönitz
efe09aeb50 if we have a buffer we don't need to pass part of it separately...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24132 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-05 20:24:05 +00:00
Stefan Schimanski
76dc2c0d30 * make macros global. This is conceptionally much easier for the user,
and moreover simplifies the code a lot.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23616 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-10 12:49:02 +00:00
Abdelrazak Younes
22aa0137d3 Transfer general edit context menu from BufferView to InsetText.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23574 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-08 22:57:22 +00:00
André Pönitz
75999ba650 make code look a bit more uniform
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23468 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-05 00:21:05 +00:00
André Pönitz
a694476ac6 try to pass a Buffer & to inset construction if some buffer(param)
access is needed


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23465 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-04 22:28:18 +00:00
Richard Heck
d8a6b5bfd0 Remove TextClassPtr without losing the type safety it provided.
See these threads:
http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg136112.html
http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg136062.html
http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg135997.html
for some background.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23299 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-28 01:42:02 +00:00
André Pönitz
db8c16d554 progress on buffer-reference-in-insets. beware of instabilities...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23289 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-27 20:43:16 +00:00
Richard Heck
b2475f6625 Replace boost::shared_ptr<TextClass> with a global cache of sorts of the TextClass's used by Buffers---or, more strictly, constructed by BufferParams::makeTextClass(). The action is in TextClass.{h,cpp}.
I've left the typedef in TextClassPtr.h. At the moment, it's kind of silly. But I've left it mostly because it helps to identify where the TextClass's stored in the TextClassBundle are used, and maybe it'd be worth having some sort of strong typedef like the one for BaseClassIndex here.

I need to check whether the textClass_ member of InsetCollapsable is needed now. I think not.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23232 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-25 19:31:31 +00:00
Richard Heck
2e7d1199df Revert 23154.
Sorry, Andre, but this broke not only the modules stuff but the general handling of TextClasses. I'm not opposed to doing this sort of thing, but it's going to be a little more complicated. I'll do it when I get a bit of time, or I can explain what the issue is here if you want to do it.

I'll separately re-commit some of the cleanup here.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23189 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-24 14:59:23 +00:00
André Pönitz
b306e9a2e1 Replace the text class shared ptr by good old index-into-global-list.
Also a few cosmetical changes where I xould not resist.

Would be nice if the 'modules people' could verify that their baby 
is strill alive... 



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23154 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-23 11:36:15 +00:00
Richard Heck
2812202c2b Move the enum into InsetLayout.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23136 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-22 16:24:55 +00:00
Richard Heck
2c357c1d23 This should be the last of the commits refactoring the InsetLayout code.
This one just moves the Decoration enum into InsetLayout, changing the names
to avoid possible conflicts now that it is in the lyx namespace.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23135 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-22 16:15:21 +00:00