Commit Graph

2451 Commits

Author SHA1 Message Date
André Pönitz
fad47c0fe0 boost/utility -> boost/noncopyable
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20608 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-30 15:47:00 +00:00
Jürgen Spitzmüller
cb28ab77bc * src/insets/InsetGraphics.cpp (prepareFile):
- Fix wrong external_path that triggered an assert on Windows
	  while exporting to LaTeX (bug 4243).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20607 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-30 12:38:08 +00:00
André Pönitz
cd72af583f cosmetics
(maily move layout related enums into a header of there own to remov
include dependencies, alos rename a few things)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20598 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-29 20:02:32 +00:00
Uwe Stöhr
9259fb187c InsetBox.cpp: fix an issue with the height parameter handling
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20595 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-29 16:47:23 +00:00
André Pönitz
581b67b26e move ChangeLogs to the attic
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20587 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-29 14:12:55 +00:00
Uwe Stöhr
e63f19a97a GuiBox: fix bug 3242 http://bugzilla.lyx.org/show_bug.cgi?id=3242:
make minipage optional height argument optional

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20547 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-27 20:19:06 +00:00
Richard Heck
0787ade6c0 This is the first part of a cleanup of how we handle the InsetCommand hierarchy. This part starts to disentangle the type of the inset from the command that a single instance of the inset represents. This involves two sorts of changes:
(i) The file format is changed, so that command insets are represented as:
    \begin_inset CommandInset insetype
    LatexCommand command
    ...
    \end_inset
This involves some lyx2lyx and changes to the readInset() routine in factory.cpp
(ii) The InsetCommand and InsetCommandParams classes also have to be changed, as the command name was used in these classes for various purposes for which the inset type ought really to be used.
Further clean-up to come.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20544 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-27 18:24:18 +00:00
Abdelrazak Younes
fb6af9a08a Remove remnant of the past.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20481 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-25 07:41:03 +00:00
Abdelrazak Younes
4b649e746a Fix drawing of horizontal line and page break.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20480 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-25 07:07:11 +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
Jürgen Spitzmüller
d00ae71b63 Fix bug 4182, partially:
* src/insets/InsetCaption.cpp (draw, metrics):
	- set correct font for caption in Workarea.
* src/insets/insetListings.cpp (latex):
	- try to set correct font for caption in output (doesn't work yet).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20472 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-24 17:51:15 +00:00
Uwe Stöhr
b7d0510502 Fileformat increased to 287: support for optional arguments of package wrapfig that is used for wrap floats
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20462 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-24 13:43:58 +00:00
Abdelrazak Younes
a7058ad9c7 * CoordCacheBase::covers(): new method.
* CoordCache: correct and extend documentation.

* Inset::covers(): use CoordCacheBase::covers().


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20459 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-24 08:05:49 +00:00
Abdelrazak Younes
137158532b Put mathed on a diet: transfer dimension cache from inset to BufferView.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20457 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-23 22:39:49 +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
André Pönitz
3ff14b8300 Pavel Sanda's "PDFOptions" patch
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20389 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-20 22:31:18 +00:00
André Pönitz
82309f0c2d Remove a few includes from Text.h
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20386 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-20 20:44:08 +00:00
Richard Heck
aa01777060 Change LFUN_FONT_CODE to LFUN_FONT_TYPEWERITER, possibly in preparation for a move to character-style-based font changes, etc.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20381 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-20 18:02:39 +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
Abdelrazak Younes
4c82dd1fc8 Inset coords shall not be recorded in Inset::draw() because this can create problems with inheritance (which often modify the coords but not the Inset pointer itself). Right now there three kind of inset containers: paragraphs, tables and math arrays. The coords caching is fixed in the first two.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20376 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-20 10:58:38 +00:00
Abdelrazak Younes
7fca730b3b Remove TextMetrics.h header.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20373 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-20 08:51:58 +00:00
Richard Heck
0917ffc697 Indentation fix.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20369 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-20 06:22:07 +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
85fa1e9efd remove InsetCaption::drawSelection(): this was not used.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20328 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-17 21:51:32 +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
Bo Peng
6258199fe8 make index label translatable
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20318 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-16 14:43:10 +00:00
Bo Peng
18d587cb7e Display index name in InsetIndex label
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20313 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-16 14:08:16 +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
Bo Peng
93196b1f73 Embedding: add a check box to InsetGraphic and show/change embedding status
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20297 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-15 18:31:32 +00:00
Martin Vermeer
a750970781 Force current font to red typewriter in ERT
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20261 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-13 14:29:44 +00:00
Bo Peng
ca281eaa0c Embedding: update related insets when the embedding status of a fileitem is changed
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20240 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-12 14:27:47 +00:00
André Pönitz
887bd847c6 remove unnneded #include
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20233 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-11 22:31:24 +00:00
André Pönitz
9b8e429a64 remove unnecessary includes
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20228 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-11 21:43:55 +00:00
Jürgen Spitzmüller
59c2e75e41 * src/insets/InsetCommand.{cpp,h}:
- implement edit function that opens the inset's dialog.
* src/BufferView.cpp (doDispatch):
	- call inset->edit (i.e. open dialog) for EDITABLE insets on next-inset-toggle (bug 2907)
* src/Text3.cpp (doDispatch: INDEX_INSERT):
	- move inset->edit to where it belongs.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20193 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-10 16:06:01 +00:00
Bo Peng
3189e7b5dd Embedding: prepare to read/write manifest in .lyx file
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20186 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-10 03:54:02 +00:00
Uwe Stöhr
17112f655d Helge's wrapfig patch:
- Format incremented to 284
- LaTeX-package wrapfig is now used instead of flotflt for wrap floats (this allows us to implement now also a table wrap float)

(the optional overhang argument of wrapfig will be implemented later)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20185 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-09 23:47:22 +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
Bo Peng
2a1a156f47 Embedding: store inset pointer instead of ParConstIterator to enable more accurate navigation in the Embedding dialog
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20164 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-09 07:07:13 +00:00
Martin Vermeer
2e5355e4c2 Convert CharStyle to Flex also in file format
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20138 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-08 13:01:29 +00:00
Bo Peng
d4a2219813 Embedding: remove AUTO feature, barely make it compile
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20119 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-07 03:02:24 +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