Commit Graph

65 Commits

Author SHA1 Message Date
Jürgen Spitzmüller
a942cf9e86 * Fix display of horizontal alignment in fixed width tabular cells (bug 3484)
* src/Inset.h:
	- new member content Alignment that indicates whether the content
	  of text insets should be displayed with a specific alignment
* src/TextMetrics.cpp:
	- handle inset's contentAlignment
* src/insets/InsetTabular.{cpp,h}:
	- set contentAlignment for tabular cells.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26380 a592a061-630c-0410-9148-cb99ea01b6c8
2008-09-13 10:10:01 +00:00
Jürgen Spitzmüller
9b99e7be2c Fix rest of bug 4886, following Richard's advices.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26354 a592a061-630c-0410-9148-cb99ea01b6c8
2008-09-10 16:02:32 +00:00
Richard Heck
3bb9c0d34d Fix bug 4886.
Introduce OutputParams::inTableCell, to track when we are in a table cell.
Use this information to output \newline rather than \\ when in one.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26349 a592a061-630c-0410-9148-cb99ea01b6c8
2008-09-09 18:42:17 +00:00
Richard Heck
a457ab321f Move isMultiCell() to Cursor, and use it.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26104 a592a061-630c-0410-9148-cb99ea01b6c8
2008-08-09 01:58:57 +00:00
Richard Heck
939503ee85 Fix crash reported on the list involving multicell selections. We have to
be careful to check for that!


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26102 a592a061-630c-0410-9148-cb99ea01b6c8
2008-08-08 21:26:18 +00:00
Richard Heck
2455bc258f Fix layout bug. Pasting text into a cell tried to set Standard layout, because
cur.inset() returns InsetTabular as the inset the cursor is in, not InsetTableCell.
It still does that, but now we return the right thing.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26098 a592a061-630c-0410-9148-cb99ea01b6c8
2008-08-08 16:19:28 +00:00
Abdelrazak Younes
b4f4a5c245 God damn tabular dual head :-/
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25851 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-23 13:25:03 +00:00
Abdelrazak Younes
4bc7feaa96 * Inset: ensure that the Buffer pointer is not copied. This was the cause of very weird bugs with copy and paste within table.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25837 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-23 12:13:41 +00:00
Jürgen Spitzmüller
b896fa110d * src/insets/InsetTabular.h:
- implement hasFixedWidth() (fixes part of bug 3484).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25805 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-22 16:13:59 +00:00
Jürgen Spitzmüller
7e3ebd9864 * src/insets/InsetTabular.h:
- make neverIndent() non-virtual and const, fixing bug 4641
	- also make neverIndent(), usePlainLayout(), forcePlainLayout() and
	  allowParagraphCustomization() private.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25802 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-22 14:31:16 +00:00
Richard Heck
951d0dc28d Try to fix a problem noted by Dov. There are design problems that prevent a really good solution. Please see the FIXME in InsetTabular.h for a description of the problem and a plea for a better solution.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25752 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-21 02:07:54 +00:00
Richard Heck
14be46fd4b Comment.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25667 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-16 14:28:26 +00:00
Richard Heck
a4ed71a212 Try to fix bug 5015---at least the crash is gone---and remove some unused code.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25666 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-16 14:23:32 +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
Edwin Leuven
832bbc4329 fix: http://bugzilla.lyx.org/show_bug.cgi?id=4688
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24598 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-04 07:51:50 +00:00
Edwin Leuven
d95201096e this we don't use anymore
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24488 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-24 15:54:04 +00:00
Abdelrazak Younes
60cb88d2ef Tabular de-spaghettization, step 2: move functions to where they are used.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24414 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-21 13:47:01 +00:00
Abdelrazak Younes
884bb0c4bc Tabular de-spaghettization, step 1.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24413 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-21 13:33:39 +00:00
Dov Feldstern
5dfa0c0381 visual mode for bidi cursor movement --- in tables
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24235 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-11 12:02:10 +00:00
Abdelrazak Younes
53daaabef4 Add tabular context menu. Feel free to enhance/modify Edwin.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24018 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-28 18:50:33 +00:00
André Pönitz
f9b81e51e9 remove remaining MailInsets.
please check your favourite insets, I am sure I broke _something_...



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24006 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-27 22:26:24 +00:00
Edwin Leuven
998787c78b make selecting several rows/col more convenient
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23955 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-25 21:26:03 +00:00
Edwin Leuven
30a290743d more border tweaks
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23954 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-25 20:48:48 +00:00
Edwin Leuven
4806c3f4cc rename some methods
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23947 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-25 13:32:38 +00:00
Edwin Leuven
8aae2dcd3b remove cruft (simplify code)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23922 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-24 14:03:00 +00:00
Edwin Leuven
41a01648a7 simplify logic
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23901 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-23 11:35:46 +00:00
Richard Heck
b922cfd3b3 Another attempt at 2178. This is a "minimal" patch designed to fix the bug with the minimum amount of new code. A better fix, suggested by Andre, would merge InsetTableCell and CellData into one class, in which case InsetTableCell::cell_data_ can be removed. A definite plus. I'll do that later if this works. But let's get it right first.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23879 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-21 17:45:14 +00:00
Edwin Leuven
ed58c7dcd9 remove unused code
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23860 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-21 09:53:25 +00:00
Richard Heck
e995e8556b Prepare for InsetTableCell.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23858 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-21 06:16:05 +00:00
Edwin Leuven
b7406da7f0 * new function to set border around selection
* add to toolbar + icon
* update border icons to match in size

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23846 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-20 08:45:40 +00:00
Richard Heck
f2cd36e8ad Change the signature of forceEmptyLayout(), so that we can pass a cell index with it. We'll need this to get tables right.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23829 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-19 16:21:33 +00:00
Edwin Leuven
e01e14872d Free line setting in tabulars. FILE FORMAT CHANGE.
- gets rid of the M_TOGGLE_LINE_... functions
- allows arbitrary clines without multicol
- sets arbitrary vertical lines through multicol 
- drop row/col line properties, everything is now stored at the cell level

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23812 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-18 18:08:32 +00:00
Stefan Schimanski
9e499117e3 * possibility to disable the completion cursor in text. All those
"*supported" methods maybe should be merged with a bit-enum as return value.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23776 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-16 17:07:10 +00:00
Stefan Schimanski
cdbebdf093 * moved text completion logic into Text class
* added completion support to InsetTabular


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23763 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-15 12:22:28 +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
f3e89bc3c9 s/cellstruct/CellData/g
s/rowstruct/RowData/g
s/columnstruct/ColumnData/g

closer to the current naming convention.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23290 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-27 20:59:44 +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
André Pönitz
e05e2b6b19 (temporarily) add a Buffer * Inset::buffer_ membert
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23170 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-23 22:32:33 +00:00
Richard Heck
040f3431e7 Fix bug 4037 and related problems. The patch has been cleaned up a bit
from the one posted to the list.

The basic idea has two parts. First, we hard code an "empty layout"
(called PlainLayout, for want of a better name) in TextClass and read it
before doing anything else. It can therefore be customized by classes,
if they want---say, to make it left-aligned. Second, InsetText's are
divided into three types: (i) normal ones, that use the "default" layout
defined by the text class; (ii) highly restrictive ones, such as ERT and
(not quite an inset) table cells, which demand the empty layout; (iii)
middling ones, which default to an empty layout and use the empty layout
in place of the default. (This is so we don't get the same problem we
had with ERT in e.g. footnotes.) The type of inset is signaled by new
methods InsetText::forceEmptyLayout() and InsetText::useEmptyLayout().
(The latter might better be called: useEmptyLayoutInsteadOfDefault(),
but that's silly.) The old InsetText::forceDefaultParagraphs() has been
split into these, plus a new method InsetText::allowParagraphCustomization(). 
A lot of the changes just adapt to this change.

The other big change is in GuiToolbar: We want to show LyXDefault and
the "default" layout only when they're active.

There are a handful of places where I'm not entirely sure whether we
should be using forceEmptyLayout or !allowParagraphCustomization() or
both. The InsetCaption is one of these. These places, and some others,
are marked with FIXMEs, so I'd appreciate it if people would search
through the patch and let me know whether these need changing. If they
don't, the FIXMEs can be deleted.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22966 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-12 17:31:07 +00:00
Abdelrazak Younes
8e831bb602 modify Inset::EntryDirectionType to follow style used in FontEnums.h for enums.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22936 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-11 08:20:13 +00:00
Dov Feldstern
11a6b3c4c7 visual mode for bidi cursor movement
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22929 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-10 19:52:45 +00:00
Stefan Schimanski
36dbec4506 * Lazy MathData to avoid unneeded interpretation of macro definitions
* DocIterator as MacroPosition
* Iterative search for macro in scope until a visible one is found.
This include the ability to resolve macro inside nested text insets.
* Speed up macro lookups by factor 2: only getMacro(name) call, no
further hasMacro(name) call before
* Both way child/master support
* Correct macro scope for multi-paragraph environments
* Correct macro scope for multi-depth-paragraphs
* Buffer::updateMacros made const
* Update macros when loaded (of master and child)
* Do not remove too many braces when unfolding a macro. This could
lead to a data loss because the relationship between arguments of
macros can be mixed up if nested macros are unfold at once.
* Reduce dependencies to MetricsInfo in MathMacro   
* Update macros when needed. Normally it's done just before doing
metrics. But in cases without a brace around some constructs (like
\left(bla\right)) there is some help needed.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22241 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-21 20:42:46 +00:00
Uwe Stöhr
97aa558cac support for \pagebreak:
- rename former "pagebreak" to "newpage" since it produces a \newpage
- new LFUN
- menu entry
- tex2lyx support
- fileformat change


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21732 a592a061-630c-0410-9148-cb99ea01b6c8
2007-11-23 02:10:00 +00:00
Abdelrazak Younes
36e14ceb10 Fix bug 4147.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21344 a592a061-630c-0410-9148-cb99ea01b6c8
2007-11-01 16:59:40 +00:00
Abdelrazak Younes
f7b1c86393 Move Inset::Code to InsetCode.h
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20936 a592a061-630c-0410-9148-cb99ea01b6c8
2007-10-13 09:04:52 +00:00
André Pönitz
06fe2c019f next one
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20772 a592a061-630c-0410-9148-cb99ea01b6c8
2007-10-06 09:19:53 +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
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
Edwin Leuven
e5c0c385ca rename method
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20043 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-04 18:13:19 +00:00
Edwin Leuven
39ee5b3fb2 renaming of some methods that hurt the eyes + removal of:
- column and row count, 
- tabular width and method that goes with it
- method declaration without implementation: void delete_column(col_type)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20032 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-04 10:52:08 +00:00