Commit Graph

269 Commits

Author SHA1 Message Date
Martin Vermeer
1f07a7f929 Introduce inset parameters keepempty, freespacing, needprotect and rename verbatim->passthru
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21197 a592a061-630c-0410-9148-cb99ea01b6c8
2007-10-25 09:19:26 +00:00
Martin Vermeer
9e6aa60d0f Move disabling LFUNS from ERT to Collapsable
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21178 a592a061-630c-0410-9148-cb99ea01b6c8
2007-10-24 11:30:47 +00:00
Martin Vermeer
ccacb487f2 Verbatim for URL inset, \protect for special phrases (index inset)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21083 a592a061-630c-0410-9148-cb99ea01b6c8
2007-10-20 17:05:28 +00:00
Martin Vermeer
04ee2d87fc Introduce allowMultiPar()
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20898 a592a061-630c-0410-9148-cb99ea01b6c8
2007-10-11 10:13:45 +00:00
Martin Vermeer
9585df177e Get Conglomerate-style rendering back into order
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20769 a592a061-630c-0410-9148-cb99ea01b6c8
2007-10-06 08:15:40 +00:00
Abdelrazak Younes
82d3607f05 Hopefully fix 'Corners' and 'SubLabel' insets drawing.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20479 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-25 06:49:04 +00:00
Abdelrazak Younes
237c132c1e * Inset:
- get rid of the cached Dimension. Text inset dimensions are saved in ParagraphMetrics and mathed maintain their own dimension where needed.
- width(), ascent(), descent(): deleted.
- dimension(): now needs a valid BufferView.
- metrics(): now void.

* BufferView::getCoveringInset(): simplify.

* ParagraphMetrics(): now cache inset dimensions.




git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20420 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-21 20:39:47 +00:00
Martin Vermeer
417c25c91b Robustify this
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20379 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-20 14:11:37 +00:00
Martin Vermeer
4cc0355468 Polish
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20354 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-18 20:48:39 +00:00
Martin Vermeer
dc23701244 Pick up some stitches dropped by Abdel ;-)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20353 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-18 20:18:50 +00:00
Abdelrazak Younes
516ff470d8 Fix InsetBox drawing and remove remnant of the wide() hack.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20334 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-18 08:52:38 +00:00
Abdelrazak Younes
745d9ac46e * InsetCollapsable::draw(): replace use of dim_ with InsetText::dimension().
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20331 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-17 22:18:07 +00:00
Abdelrazak Younes
2dc0945bda remove InsetCollapsable::drawSelection(): this was not used.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20327 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-17 21:48:25 +00:00
Abdelrazak Younes
74acf6b528 Cleanup the TEXT_TO_INSET_OFFSET mess. This correction is done now once in InsetText. Various other cleanup resulting from this change. In particular, pave the way to the removal of Dimension Inset::dim_ member by registering the inset dimension in RowPainter::paintInset() instead of InsetXXX::draw().
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20326 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-17 21:45:14 +00:00
Lars Gullik Bjønnes
26f336769a Remove warnings reported with gcc 4.3:
- Modifier on return type ignored
	- Ambigous else
	- Ambigous logical operators
	- Semi-colon instead of empty block
	- Missing header files
	- Missing using std::XX
	- Initialization out of order


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20304 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-16 10:36:57 +00:00
Abdelrazak Younes
c3e3534148 * TextMetrics::draw(): withdraw first row ascent before drawing because the convention is that the baseline of a multirow text is the baseline of the first row.
All other files: adapt to above change.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20177 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-09 20:21:43 +00:00
Martin Vermeer
2ddba774ce y-coord in Conglomerate, this time properly
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20103 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-06 14:17:03 +00:00
Martin Vermeer
6089258acc Fix y co-ordinate for Conglomerate-style inset
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20102 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-06 14:06:07 +00:00
Abdelrazak Younes
ea87429a23 Nicely align inset buttons with surrounding text.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20101 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-06 12:25:30 +00:00
Abdelrazak Younes
2d8b08b63c InsetCollapsable::draw(): Rename 'top' local variable to baseline as that's what it is really.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20100 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-06 12:00:32 +00:00
Abdelrazak Younes
95e09581c5 Fix alignment of text within insets.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20083 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-05 22:08:41 +00:00
Abdelrazak Younes
d9d7af7019 Fix drawing of collapsable inset without button.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20082 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-05 21:52:12 +00:00
Martin Vermeer
12e1d4bc8d Name change CharStyle -> Flex
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20072 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-05 15:29:04 +00:00
Abdelrazak Younes
6a35e705a4 Fix cursor positioning withing collapsable insets.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20070 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-05 14:15:07 +00:00
Alfredo Braunstein
8158e25ab7 (InsetCollapsable::draw) restore background color (avoid psychedelic effects when selecting a note)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20069 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-05 13:52:43 +00:00
Abdelrazak Younes
d1813ca269 * TextMetrics::draw(): get rid of the first par ascent offset.
* BufferView::draw(): adapt to above change.

* InsetCollapsable::draw(): ditto -> get rid of textdim_ member.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20068 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-05 13:45:58 +00:00
Abdelrazak Younes
bc6304d760 Don't save background color in Text. Hand it down at drawing time.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20002 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-02 14:34:15 +00:00
Abdelrazak Younes
7150b25b7e * InsetCollapsable::metrics(): Allow a bit more inlined size.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19993 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-02 10:35:36 +00:00
Abdelrazak Younes
452348f4ce * InsetCollapsable::metrics(): Put back the test previous to revision 14472 for openinlined_
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19985 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-01 23:01:21 +00:00
Martin Vermeer
8906059a0a Cleanup painting of corners
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19978 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-01 20:38:25 +00:00
Martin Vermeer
e0db6e2679 small cleanup collapsable; label fix branch
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19976 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-01 17:55:21 +00:00
Martin Vermeer
ed6f900552 Use Minimalistic for branches
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19973 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-01 11:40:09 +00:00
Abdelrazak Younes
fb74d5a476 * InsetCollapsable::metrics(): it seems we don't need to refit anymore. Saves an InsetText::metrics() call and enable single Row painting within opened inline insets.
* TextMetrics::drawParagraph(): force full repaint on Insets that are within the current repainting row.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19968 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-01 09:24:20 +00:00
Alfredo Braunstein
c94eb3deeb cosmetics
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19959 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-31 20:24:15 +00:00
Alfredo Braunstein
d44c6722f0 fix two metrics bug + remove an extra metrics call
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19954 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-31 17:32:27 +00:00
Martin Vermeer
92e8e19363 Further cleanup, decoration -> geometry, bugfix
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19944 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-31 12:05:41 +00:00
Martin Vermeer
2854410d7b Cleanup: Replace decoration() calls by geometry(). (And get rid of unused call)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19937 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-31 07:15:32 +00:00
Abdelrazak Younes
9b9168c31a Fix redrawing bug for multirow inlined collapsable inset.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19921 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-30 19:27:33 +00:00
André Pönitz
ed858d73e5 use bald pointers in clone()
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19920 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-30 18:03:17 +00:00
Abdelrazak Younes
235312c376 * InsetCollapsable::setStatus(): remove the Buffer::changed() signal emission. This causes a WorkArea redraw before the BufferView metrics update happens.
* WorkArea::dispatch(): replace the redraw() call with a Buffer::changed() signal emission in order to update all views of the Buffer, even though some view won't need the redraw...



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19867 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-28 18:13:17 +00:00
Martin Vermeer
def5620e58 Fix black float background
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19839 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-27 20:27:02 +00:00
Martin Vermeer
5541f145fa Set up decoration handling for all collapsable insets
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19798 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-25 20:12:50 +00:00
Martin Vermeer
30506f8e11 Clean-up in CharStyles, externalize detection of undefined styles to
layout files



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19790 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-25 14:43:59 +00:00
Martin Vermeer
e38b581bcb add preamble snippets to charstyles
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19732 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-22 18:55:03 +00:00
Abdelrazak Younes
0fcae6cc10 * BufferView::buffer() returns a reference instead of a pointer.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19691 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-21 13:03:55 +00:00
Martin Vermeer
f289399bf5 Inset configurability, LaTeX work
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19665 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-20 19:02:38 +00:00
Martin Vermeer
5c1ffabd05 Cleanup 3: move dispatch stuff from CharStyle to Collapsable
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19654 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-20 04:56:04 +00:00
Martin Vermeer
2b927e1575 Cleanup 2: moving more stuff charstyle -> collapsable
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19648 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-19 15:45:35 +00:00
Martin Vermeer
d39896da58 Small cleanup
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19642 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-19 10:08:09 +00:00
Martin Vermeer
3c504502bf Further inset configurability, moving charstyle stuff to collapsable
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19640 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-18 23:26:07 +00:00
Abdelrazak Younes
f32757e3ef * InsetCollapsable::geometry(): shut up warning by returning a dummy value and cosmetics.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19620 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-17 12:11:32 +00:00
Martin Vermeer
f0ece382e4 Streamlining CollapseStatus stuff
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19610 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-16 16:36:50 +00:00
Jean-Marc Lasgouttes
eca0637e51 compilation warning
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19523 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-13 20:12:52 +00:00
Alfredo Braunstein
bc0a64efc3 * DocIterator.h (forwardPosNoDescend): remove method
* DocIterator.cpp (forwardPos, backwardPos): move the 'flat' part to...
* CursorSlice.{h,cpp} (forwardPos, backwardPos, at_end, at_begin): new methods, the first two are part of their DocIterator homonym
* Text2.cpp (setFont): receive CursorSlice arguments as the function is not recursive, adapt
* Text.cpp:
* lyxfind.cpp (findNextChange):
* insets/InsetCollapsable.cpp: adapt



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19500 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-13 13:36:19 +00:00
Martin Vermeer
2bd998c29e Prepare for inset configurability
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19498 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-13 12:13:17 +00:00
Abdelrazak Younes
77736e8679 header cleanup.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18783 a592a061-630c-0410-9148-cb99ea01b6c8
2007-06-15 13:47:13 +00:00
Lars Gullik Bjønnes
897436efbb Whitespace cleanup
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18550 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-28 22:27:45 +00:00
Abdelrazak Younes
5112e0f821 Fix crash with collapsable insets and multiple views
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18471 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-23 07:43:16 +00:00
Jean-Marc Lasgouttes
a9a3b79528 revert r17737; it was designed to fix bug 2993, but it created bug 3503. Consequently I will mark bug 2993 as wontfix
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18454 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-22 14:06:40 +00:00
Michael Schmitt
a746aa5214 "fix" bug #3332 (plain text export depends on the menu language)
Please note that method B_ (translate text to buffer language) is presently broken (at least on Windows)!


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18143 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-01 08:26:40 +00:00
André Pönitz
6add1994c7 rename LyXTextClass* into TextClass*
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18097 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-29 19:53:54 +00:00
André Pönitz
fc6ce7cd08 rename LyXFont to Font except in tex2lyx
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18095 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-29 18:17:15 +00:00
André Pönitz
32871c1284 rename InsetBase to Inset
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18089 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-29 13:39:47 +00:00
André Pönitz
51fbea02a8 Remove InsetOld
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18087 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-29 12:32:14 +00:00
André Pönitz
5008ee540f rename LColor into Color
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18046 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-26 17:34:20 +00:00
André Pönitz
42123ab8a7 rename LCursor->Cursor
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18040 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-26 14:56:30 +00:00
André Pönitz
39e79d8602 rename LyXLex into Lexer
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18033 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-26 11:30:54 +00:00
Bo Peng
00e305c9d9 Rename .C ==> .cpp for files in src, part one
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18018 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-26 04:41:58 +00:00
Bo Peng
c8d00ed127 Rename insets/insetxxx to insets/InsetXxx, part 2
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17965 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-25 01:25:51 +00:00