Commit Graph

497 Commits

Author SHA1 Message Date
Uwe Stöhr
9672f432f2 InsetTabular.cpp: really fix #7007 this time
(the onlycolumn flag is not necessary in setAlignment (but in getAlignment) because it is in every case the same as !IsMultiColumn)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36402 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-20 04:53:34 +00:00
Uwe Stöhr
266b87357b InsetTabular.cpp: fix #7007
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36401 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-20 04:19:13 +00:00
Vincent van Ravesteijn
a3c01d2e25 Fix bug #7007: Horizontal table alignment display broken.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36395 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-19 03:31:13 +00:00
Pavel Sanda
a83995b2c6 Squash warning
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36195 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-07 18:45:26 +00:00
Uwe Stöhr
86b99f8f32 GuiTabular: support for multirow offset; fileformat change
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36182 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-07 05:32:28 +00:00
Uwe Stöhr
7c2b2c464b InsetTabular.cpp: multirows are always left-aligned thus allow left alignment and forbid center alignment
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35969 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-01 17:45:02 +00:00
Uwe Stöhr
90291acefb InsetTabular.cpp: typo
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35968 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-01 17:12:46 +00:00
Uwe Stöhr
98b8e1eb81 InsetTabular.cpp: multirow cells are ALWAYS left aligned and thus cannot inherit the alignment of the column
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35967 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-01 17:09:38 +00:00
Uwe Stöhr
bc30270b35 InsetTabular.cpp: fix #7003 that I accidentally introduced when fixing #6958
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35966 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-01 16:16:40 +00:00
Jürgen Spitzmüller
9ef7efd85a whitespace
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35964 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-01 15:15:38 +00:00
Richard Heck
5c9dde4d3b Had to be a typo, right?
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35962 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-01 11:54:18 +00:00
Uwe Stöhr
c6fa2fa10e InsetTabular.cpp: fix #7000
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35957 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-01 04:30:06 +00:00
Vincent van Ravesteijn
34338c474a Remove unnecessary breaks.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35956 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-01 03:54:23 +00:00
Uwe Stöhr
fa695f939c InsetTabular.cpp: fix #6985 - we need to break after unsetting otherwise case Tabular::MULTICOLUMN: would be executed afterwards reverting the unsetting
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35955 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-01 03:26:25 +00:00
Uwe Stöhr
eb0c10b6b4 InsetTabular.cpp: multirows inherit the width and the alignment from the column; this fixes #6958 partly
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35932 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-30 18:11:37 +00:00
Uwe Stöhr
eef6b32eff InsetTabular.cpp; remove SET_SPECIAL_MULTIROW because according to the multirow documentation multirows inherit the LaTeX-argument from the current column since they don't span multiple columns
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35931 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-30 16:36:08 +00:00
Jürgen Spitzmüller
a3a51b545c * InsetTabular.cpp:
- only set/unset a caption if necessary.

This fixes the setting of multicols via dialog (part of bug 6985)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35929 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-30 11:28:16 +00:00
Jürgen Spitzmüller
3381784318 fix #6998. Center alignment is the default, also with multirow.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35912 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-29 17:02:01 +00:00
Jürgen Spitzmüller
40f06a50de * InsetTabular.cpp: simplification; no change in functionality.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35902 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-29 11:33:48 +00:00
Jürgen Spitzmüller
ec1fd2a860 * InsetTabular.cpp: simplification; no change in functionality.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35899 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-29 10:15:50 +00:00
Uwe Stöhr
fadde98eb3 InsetTabular: implement some SET/UNSET functions as prerequisite to fix #6985
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35897 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-29 04:09:49 +00:00
Uwe Stöhr
c378fede8b InsetTabular.cpp: fix #6585 also for wrapped floats - thanks Vincent
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35895 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-29 01:29:53 +00:00
Uwe Stöhr
a0b84e0ba0 GuiTabular.cpp: fix #6585
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35894 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-29 01:18:18 +00:00
Vincent van Ravesteijn
573500dd04 Remove unneccessary uses of dynamic_cast from the code.
A dynamic_cast is necessary when:

- the object to be casted is from an external library because we can't add Qxxx::asXxxx() to Qt e.g.:
    * QAbstractListModel to GuiIdListModel,
    * QValidator to PathValidator,
    * QWidget to TabWorkArea,
    * QWidget to GuiWorkArea;

- the object is to be casted from an interface to the implementing class, because the Interface does not know by whom it is implemented:
    * ProgressInterface to GuiProgress,
    * Application to GuiApplication.

A dynamic_cast can be replaced by:
  - already existing as***Inset() functions, e.g.:
    * asHullInset(),
    * asInsetMath()->asMacro(),
    * asInsetText();

  - a static_cast when we are sure this can't go wrong, e.g.:
    * we are sure that CellData::inset->clone() is an InsetTableCell,
    * in cases where we explicitly check it->lyxCode().


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35855 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-26 15:03:51 +00:00
Uwe Stöhr
dbe3d79e15 InsetTabular.cpp: remove comment, we already discussed this and the star as default was the result
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35847 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-26 02:02:10 +00:00
Vincent van Ravesteijn
ba19e8b5dd Fix bug #1839: Ctrl+arrows don't move to next/prev table cell.
Patch from Punyashloka Biswal.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35812 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-25 01:18:48 +00:00
Uwe Stöhr
27423f93ba InsetTabular.cpp: fix #6907, patch by goriccardo
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35561 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-05 01:14:34 +00:00
Jean-Marc Lasgouttes
d71281d4ae MetricsInfo::textColor: helper function that helps taking in account the
selection and chage tracking state

InsetTabular::drawCellLines: use the above function to draw properly tabular lines after a selection. 

This method can be used easily for other insets.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35268 a592a061-630c-0410-9148-cb99ea01b6c8
2010-09-02 12:13:54 +00:00
Jürgen Spitzmüller
f2f3ed23f0 * InsetTabular.cpp: do not attempt to access an empty DocIterator (bug 6810).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35148 a592a061-630c-0410-9148-cb99ea01b6c8
2010-08-14 14:32:52 +00:00
Uwe Stöhr
7547cf9e5f - InsetTabular.cpp: floats must not be inserted to tables, fixes #6844
- InsetCaption.cpp: margin notes and footnotes are not allowed in captions

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35073 a592a061-630c-0410-9148-cb99ea01b6c8
2010-08-07 03:16:38 +00:00
Richard Heck
0e14f379f3 Rename a couple routines. This will avoid confusion with a forthcoming
patch.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34816 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-08 20:04:35 +00:00
Vincent van Ravesteijn
7f593196fc Add an update parameter to BufferView::scrollToCursor and BufferView::scrollDocView. This parameter indicates whether a repaint is requested
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34658 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-14 21:48:23 +00:00
Edwin Leuven
c2e4c79f6e bit of cleanup to avoid ambiguities (in the sense of cell vs column)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34648 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-14 10:42:42 +00:00
Edwin Leuven
7b51fb74a7 columnWidth returns the col width of a cell, which is not what we want here (should fix tables flying of the screen)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34647 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-13 20:27:28 +00:00
Edwin Leuven
b031ac1e66 do not use cells without decimals when calculating column widths and cell text offsets
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34645 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-12 16:44:50 +00:00
Jean-Marc Lasgouttes
df62af4323 fix warnings
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34630 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-08 13:38:12 +00:00
Edwin Leuven
fea446303d simplify some conditions
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34611 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-07 09:39:04 +00:00
Edwin Leuven
0ebe0ff37e add support for decimal alignment in tables
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34598 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-05 07:44:44 +00:00
Richard Heck
319ca06167 Rename LFUN_OPTIONAL_INSERT as LFUN_ARGUMENT_INSERT.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34597 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-04 22:53:44 +00:00
Vincent van Ravesteijn
5e978cf02c Disallow InsetMarginals in InsetTabulars.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34373 a592a061-630c-0410-9148-cb99ea01b6c8
2010-05-05 21:15:15 +00:00
Peter Kümmel
c9b9748cee msvcUsing "using namespace std" with msvc10 makes also std::tr1::shared_ptr visible and generates conflicts with boost::shared_ptr.
Solution: don't use boost::shared_ptr for msvc10 (could also be extended  to several GCC versions)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34259 a592a061-630c-0410-9148-cb99ea01b6c8
2010-04-22 11:37:32 +00:00
Vincent van Ravesteijn
3417702346 * FuncStatus: unify naming of functions.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34160 a592a061-630c-0410-9148-cb99ea01b6c8
2010-04-16 10:51:20 +00:00
Vincent van Ravesteijn
108a67ed43 Make Cursor::anchor_ private and make an access function Cursor::realAnchor() to stress the fact that this is thus not the normalAnchor().
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34146 a592a061-630c-0410-9148-cb99ea01b6c8
2010-04-15 18:16:07 +00:00
Edwin Leuven
99366a9a44 correctly valign content of multirow cells
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34129 a592a061-630c-0410-9148-cb99ea01b6c8
2010-04-13 18:56:28 +00:00
Richard Heck
b79d8e5e2d Make members of FuncRequest private, per the FIXME there. Again, this is
basically a massive renaming, with no real changes.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34106 a592a061-630c-0410-9148-cb99ea01b6c8
2010-04-09 19:00:42 +00:00
Richard Heck
4c7a5d0024 This is just a giant renaming of member variables in FuncRequest,
preparatory to making them private.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34105 a592a061-630c-0410-9148-cb99ea01b6c8
2010-04-09 18:15:17 +00:00
Vincent van Ravesteijn
bb69584112 Introduce InsetPreview.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33890 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-28 13:47:50 +00:00
Edwin Leuven
dba368d291 silence compiler warning
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33830 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-22 00:42:01 +00:00
Edwin Leuven
9713edcce2 comments and housekeeping
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33823 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-21 12:15:25 +00:00
Uwe Stöhr
2211213cb9 InsetTabular.cpp: remove FIXME as nothing needs to be fixed
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33817 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-21 04:29:22 +00:00
Edwin Leuven
fbc91c1967 forgotten in r33799
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33810 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-20 10:20:28 +00:00
Edwin Leuven
1a1bf4988b fix the drawing for cells with a specified vertical alignment
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33799 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-19 09:41:31 +00:00
Edwin Leuven
1e67084666 revert awful spaghetti (r33780)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33793 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-18 19:02:01 +00:00
Abdelrazak Younes
bfe352d39d Fix gcc-4.4 warnings.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33791 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-18 14:00:44 +00:00
Uwe Stöhr
9231f19340 InsetTabular.cpp:
- reintroduce issue that was removed in r33731
  (multirow cells are by default left-aligned, LyX does not yet support to change this)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33782 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-16 22:48:07 +00:00
Edwin Leuven
28c759e171 correct cell line drawing for multirow cells
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33781 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-16 22:42:57 +00:00
Uwe Stöhr
76ff0540d1 InsetTabular.cpp/h: fix the drawing for cells with a specified vertical alignment
Please also see my according post on the mailing list

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33780 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-16 22:27:17 +00:00
Edwin Leuven
1f8b6f8a0a - deleteRow did not properly change multirows
little things:
- rename method to what it is
- correct parameter
- bit of formatting

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33774 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-16 21:42:16 +00:00
Edwin Leuven
613f9d8996 and also correctly draw selected multicolumn cells while we're at it...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33765 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-16 09:50:58 +00:00
Edwin Leuven
7ff4105558 correctly draw selected multirow cells
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33764 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-16 09:46:25 +00:00
Edwin Leuven
62b0691b3c avoid invalidated indexes with multicol/row
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33751 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-15 18:08:38 +00:00
Edwin Leuven
3c45586d96 use more flexible default for now...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33739 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-14 10:33:02 +00:00
Edwin Leuven
b5ddcaa4d1 increment in the same way in ::draw, ::drawSelection and ::cursorPos
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33733 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-13 12:00:37 +00:00
Edwin Leuven
559537c080 fix some vertical alignment issues in tabular
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33731 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-13 10:49:26 +00:00
Jean-Marc Lasgouttes
b8bbd7aea9 Cleanup InsetTabular::getStatus
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33690 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-09 23:04:59 +00:00
Edwin Leuven
684def2036 simplify
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33688 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-09 19:21:32 +00:00
Edwin Leuven
93830fd28d avoid crash when calling inset_modify with cursor not in table
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33687 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-09 19:07:54 +00:00
Edwin Leuven
f7ef9c3e6e lil' cleanup
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33666 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-08 04:08:11 +00:00
Edwin Leuven
f313bd6a90 erratum to r33628
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33665 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-08 04:04:56 +00:00
Edwin Leuven
ece4da2f01 fix cursor position(ing)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33663 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-07 17:33:33 +00:00
Edwin Leuven
42c5246b9d rename frenzy
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33628 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-05 18:10:34 +00:00
Uwe Stöhr
eb0ade4e9f InsetTabular.cpp:
- multirow cells are always left aligned, therefore disable horizontal alignment
- multirows cannot be vertically aligned, therefore disallow this

(Two issues less in http://wiki.lyx.org/Devel/Multirow .)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33622 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-05 03:37:21 +00:00
Edwin Leuven
f365532e35 remove old "logic"
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33620 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-04 21:31:06 +00:00
Edwin Leuven
9b93ec0732 - unset multicol (row) when setting multirow (col)
- bit of function cleanup


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33619 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-04 20:20:45 +00:00
Uwe Stöhr
20fbd7068a InsetTabular.cpp: fix bug that LyX allowed to specify the vertical alignment of table columns without a fixed width
Should also go to branch, Jürgen?

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33615 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-04 03:55:13 +00:00
Uwe Stöhr
497d6d13f7 InsetTabular.cpp: disallow the following cases:
- a multirow cannot be a multicolumn the same time
- a multirow cannot be the caption of a longtable

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33614 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-04 03:27:30 +00:00
Richard Heck
d65020b293 s/updateLabels/updateBuffer/g, per a suggestion of Abdel's.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33613 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-03 22:13:45 +00:00
Jean-Marc Lasgouttes
a9d094bcce fix compiler warnings
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33544 a592a061-630c-0410-9148-cb99ea01b6c8
2010-02-23 08:00:29 +00:00
Edwin Leuven
3c765c6bc5 bit of clean up
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33522 a592a061-630c-0410-9148-cb99ea01b6c8
2010-02-19 22:00:54 +00:00
Abdelrazak Younes
3ec48cce2a Fix single table action (from toolbar).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33511 a592a061-630c-0410-9148-cb99ea01b6c8
2010-02-19 12:21:49 +00:00
Abdelrazak Younes
addba25b98 r33506: better fix for table borders.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33507 a592a061-630c-0410-9148-cb99ea01b6c8
2010-02-19 10:03:03 +00:00
Abdelrazak Younes
816b7fdd91 Simplify featureAsString()... I don't understand why some people insist
on those complicated, verbose STL code...


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33504 a592a061-630c-0410-9148-cb99ea01b6c8
2010-02-19 08:11:09 +00:00
Abdelrazak Younes
e92aed709b Fix gcc warning.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33503 a592a061-630c-0410-9148-cb99ea01b6c8
2010-02-18 11:52:18 +00:00
Abdelrazak Younes
b5049e769b * InsetTabular cleanup:
- proper message passing for all tabular features
- properly define which feature needs an argument

* replace LFUN_TABULAR_FEATURE with LFUN_INSET_MODIFY
- The math tables are also affected. In the future a common base class
between math and text table will solve this inconsistency.
- There is a hack in GuiApplication in order to not rename the toolbar
icons. This will have to be cleaned up with a general icon naming for
LFUN_INSET_MODIFY... to be discussed.

* Tabular Dialog:
- big cleanup, lots and lots of bug fixing here
- migrated to InsetParamsWidget


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33495 a592a061-630c-0410-9148-cb99ea01b6c8
2010-02-18 08:28:46 +00:00
Edwin Leuven
8918e5df37 delete unused variable, fix multicolumn and some clean up
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33453 a592a061-630c-0410-9148-cb99ea01b6c8
2010-02-12 18:36:20 +00:00
Uwe Stöhr
8bb69f24b6 support for multirows in tables:
- fileformat change (lyx2lyx code follows the next days)
- the patch is a joint work of Edwin and me

The patch is huge but the major parts work already. I put it in now as the minor known issues can be solved step by step the next days. I think this is the best solution because collaborating with such large patches already lead to copy/paste bugs.

The known issues are listed here:
http://wiki.lyx.org/Devel/Multirow

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33414 a592a061-630c-0410-9148-cb99ea01b6c8
2010-02-11 01:07:54 +00:00
Abdelrazak Younes
377cdd5f6c Transfer LyXfunc code to GuiApplication::dispatch() and getStatus(). Now
a lot of simplification is possible. Except some instability period...


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33389 a592a061-630c-0410-9148-cb99ea01b6c8
2010-02-09 16:11:13 +00:00
Jürgen Spitzmüller
5b2d31fbb1 * InsetTabular.cpp (addToToc):
- pass correct iterator (and prevent assertion).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33247 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-28 12:25:43 +00:00
Jürgen Spitzmüller
bc5fd28ddf * InsetTabular.{cpp, h}:
- implement addToToc (bug 6372).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33240 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-28 08:33:14 +00:00
Richard Heck
caa4e94bf0 Get rid of some magic booleans in updateLabels() and related routines.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33110 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-20 19:42:12 +00:00
Richard Heck
3e654186d2 Move the StartTag, EndTag, and CompTag classes into the html namespace.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33099 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-19 22:08:04 +00:00
Vincent van Ravesteijn
87085fa2fd Set the current font when moving into a table or between two table cells.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32570 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-17 17:47:09 +00:00
Richard Heck
80ce542440 A little more CSS for tables.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32532 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-14 16:57:54 +00:00
Richard Heck
505cccfe7d Add some CSS for tables.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32528 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-14 16:05:36 +00:00
Richard Heck
5f04bedb1c Fix multicolumn output.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32526 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-14 15:44:49 +00:00
Richard Heck
93c121cfaa Remove dead code.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32525 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-14 15:40:54 +00:00
Richard Heck
dadda4cb44 Initial XHTML support for InsetTabular.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32524 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-14 15:39:13 +00:00
Richard Heck
996505c2ae This patch introduces an optional argument to Buffer::updateLabels(), so
as to allow us to call the routine when we are preparing for output and
so to do certain things we might not want to do every time. 

This is an abuse of updateLabels(), in a way, but updateLabels() long
ago became the general recurse-through-the-Buffer routine, and to
implement the sort of thing I want to do here in validate(), say, much
of the code in updateLabels()---in particular, the counter-update
code---would have to be duplicated. So I believe this is the best, and
easiest, way to go.

Actual use of the new argument will follow.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32318 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-04 03:03:38 +00:00
Vincent van Ravesteijn
2c32b53923 Access the correct cell function.
Fixes a bug introduced in r32157 while fixing bug #4360.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32200 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-25 19:57:57 +00:00
Vincent van Ravesteijn
f19b6178a9 Fix bug #4360: Instant preview does not render formulas which contain math-macro from input file.
Patch from Stefan.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32157 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-22 20:50:35 +00:00
Vincent van Ravesteijn
f961b60575 Move the contents of a row into the caption when setting a row as a longtable caption.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32156 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-22 18:39:48 +00:00
Vincent van Ravesteijn
e4f66e1032 Unset all caption rows and dissolve all captions in a long-table when converting to a normal table.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32155 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-22 18:37:08 +00:00
Vincent van Ravesteijn
8384fa4123 Better fix for bug #5754: Caption inset not dissolved when unsetting longtable caption.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32153 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-22 17:10:56 +00:00
Vincent van Ravesteijn
86a9302823 Fix bug #6240: Adding table row causes exception that triggers infinite loop in code.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32038 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-16 00:18:52 +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
Abdelrazak Younes
1a915927b5 Fix crash when copying an InsetTabular.
Buffer should not be set when cloning. If there is bug that was fixed by this line of code it should be fixed later by setting the Buffer after the cloning.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31900 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-08 13:41:29 +00:00
Vincent van Ravesteijn
a4ccbf67c3 Fix (again) bug #5754: Caption inset not dissolved when unsetting longtable caption row.
I forgot that inset-begin jumps out of the Inset if the cursor is already at the begin.

see r31823.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31839 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-03 13:06:52 +00:00
Vincent van Ravesteijn
3533becc2e Fix bug #6240: Adding table row causes exception that triggers infinite loop in code.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31826 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-02 07:25:05 +00:00
Vincent van Ravesteijn
da8c15d4c3 Fix (partly) bug #5754: Caption inset not dissolved when unsetting longtable caption row.
This removes the caption-inset, which is made possible by the clean-up of the LFUN_INSET_DISSOLVE (see r31822 and r31756). This assumes that there is nothing else in the row than the caption inset. I think that should be the case, but this is not yet guaranteed.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31823 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-02 04:31:06 +00:00
Vincent van Ravesteijn
6bc8b8c592 Fix bug #6158: Crash when entering math in tabular.
We have to determine whether we are in an empty cell before we dispatch the lfun to the inset. Otherwise we determine whether the math is empty and if so, we then go to the next cell in the math inset. This cell doesn't exist probably.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31121 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-18 18:34:22 +00:00
Abdelrazak Younes
2b9e44cb01 Move contents of paragraph_funcs.* to Text.h and Text.cpp.
The goal is to simplify the code afterwards.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30955 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-09 17:30:41 +00:00
Abdelrazak Younes
5425c53fd1 Now that Text knows its owner, use the associated Buffer access.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30941 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-09 15:29:34 +00:00
Jean-Marc Lasgouttes
408b96bb92 un-revert r30531, after Richard told me how to avoid the crash. Now, before
accepting changes in a clipboard copy (CutAndPaste.cpp), we set the buffer
of insets (and we reset them later).

Doing this makes sense because we know this is the only operation on these
out-of-document paragraphs that will require access to a buffer.

Also, this commit gets rid of one explicit test against ERT_CODE and 
LISTING_CODE.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30623 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-16 08:37:32 +00:00
Jean-Marc Lasgouttes
c3be74085f revert r30531, which causes a crash when copying an inset.
Basically, insets in cut stack do not have a buffer, and therefore cannot
acess to buffer parameters. What is annoying here is that acceptChanges 
requires this buffer params only to be able to read a font in moveItem,
in order to read the buffer language, and I doubt this is really needed...

Another change in this patch is that Inset::getLayout now returns a 
plainLayout when the inset does not have a buffer_. This fixes a remaining 
crash where dEPM reads isFreeSpacing() for an inset in the clipboard, but
this looks like a fragile situation. And it will not do the right thing when
doing depm in a freespacing inset.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30605 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-15 14:19:10 +00:00
Jean-Marc Lasgouttes
78c45693ef remove all trace of editMessage
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30585 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-14 18:56:13 +00:00
Uwe Stöhr
b015528fca update author settings for the files I recently notably modified
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30553 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-13 23:25:47 +00:00
Jean-Marc Lasgouttes
067a685263 remove BufferParams parameter from Inset::accept/rejectChanges; adapt rest of code accordingly
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30531 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-13 00:57:51 +00:00
Uwe Stöhr
dbf1f87bd7 InsetTabular.cpp: coding style
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30504 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-12 14:36:42 +00:00
Jürgen Spitzmüller
d3a17d2d5e * correct bug reference.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30503 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-12 13:47:06 +00:00
Jürgen Spitzmüller
4dfca52307 * InsetTabular.cpp: fix bug 6057: longtable captions must always be in a first header.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30500 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-12 13:43:05 +00:00
Uwe Stöhr
8a3a2baf6d - GuiTabular.cpp: longtables cannot have a vertical alignment
- InsetTabular.cpp: write the alignment as last features (to match the existing tex2lyx routines)
- InsetTabular.h: fix indexes

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30482 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-11 14:33:05 +00:00
Uwe Stöhr
ce143b21e6 InsetTabular.cpp: whitespace again, sorry
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30480 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-11 13:47:19 +00:00
Uwe Stöhr
0d75c1117f InsetTabular.cpp: whitespace
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30479 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-11 13:44:13 +00:00
Uwe Stöhr
6776598761 InsetTabular.cpp:
- longtables cannot have a valignment, tables not a longtablealignment

- squash a compiler warning

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30478 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-11 13:41:34 +00:00
Uwe Stöhr
424943af89 - support for longtable alignment, fileformat change
- GUI support for table alignment

(all comments to the polished layout of the table dialog welcome)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30477 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-11 13:09:45 +00:00
Jürgen Spitzmüller
06cdeb86f5 * InsetTabular.cpp (getStatus):
- allow again to set allocate multiple header attributes to a row,
	  since this is valid (fix bug 5950).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29721 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-18 06:22:25 +00:00
Vincent van Ravesteijn
3cc18261ef Fix bug #4952: Multiple cells pasting fails if cells are selected.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29719 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-17 21:22:02 +00:00
Jürgen Spitzmüller
8179094fa9 whitespace and typo.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29710 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-17 11:27:44 +00:00
Vincent van Ravesteijn
7083f02b1d Prevent two more assertions due to non-absolute filename as a parameter of file-insert-plaintext.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29638 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-12 00:15:16 +00:00
Pavel Sanda
6fde8f8067 Introduce double underline and wavy underline styles from ulem
http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg150803.html


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29542 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-05 09:26:28 +00:00
Pavel Sanda
381b86788d Introduce strikeout text style (strike-through)
http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg150743.html

Somewhat related to http://www.lyx.org/trac/ticket/4248 .


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29523 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-03 22:45:14 +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
Vincent van Ravesteijn
9b111ea5a6 Make the insets accept LFUN_INSET_SETTINGS. For these insets, LFUN_INSET_SETTINGS was already used to show the settings dialog (in contrast to the insets in the next commit).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29175 a592a061-630c-0410-9148-cb99ea01b6c8
2009-04-10 00:17:34 +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
ab3be86f96 * InsetTabular.cpp: Make sure the caption is inserted in the correct cell. This means we first have to reset the cursor to point to the new multicolumn, and then insert the caption.
See:
http://www.lyx.org/trac/changeset/28440

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28651 a592a061-630c-0410-9148-cb99ea01b6c8
2009-03-01 15:50:46 +00:00
Uwe Stöhr
8d69d174c5 InsetTabular.cpp: fix http://bugzilla.lyx.org/show_bug.cgi?id=5777
Also OK for branch?

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28494 a592a061-630c-0410-9148-cb99ea01b6c8
2009-02-14 21:39:15 +00:00
Uwe Stöhr
ba086ee65d InsetTabular.cpp: Reverting r28472 and part of r28461 - this would have been a regression, therefore readding it.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28485 a592a061-630c-0410-9148-cb99ea01b6c8
2009-02-13 23:48:19 +00:00
Uwe Stöhr
39aae243dc InsetTabular.cpp: I was over eager in r28442: there can only be one caption, but several header/footer rows
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28474 a592a061-630c-0410-9148-cb99ea01b6c8
2009-02-13 03:17:01 +00:00
Uwe Stöhr
256ba59d5f InsetTabular.cpp: when there is no first header or last footer, then don't mention it in the LaTeX code, otherwise the header/footer will not appear on the first page.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28472 a592a061-630c-0410-9148-cb99ea01b6c8
2009-02-12 23:59:31 +00:00
Uwe Stöhr
a12e81fe06 GuiTabular.cpp, InsetTabular.cpp: fix http://bugzilla.lyx.org/show_bug.cgi?id=5773
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28464 a592a061-630c-0410-9148-cb99ea01b6c8
2009-02-12 03:02:34 +00:00
Uwe Stöhr
ff677ecfdb InsetTabular.cpp: output the caption for docbook according to the docbook documentation http://docbook.org/tdg/en/html/caption.html and this example: http://sources.redhat.com/ml/docbook/2004-06/msg00017.html
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28463 a592a061-630c-0410-9148-cb99ea01b6c8
2009-02-12 02:37:14 +00:00
Uwe Stöhr
cb81a4e0d4 InsetTabular.cpp: output the caption for docbook
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28462 a592a061-630c-0410-9148-cb99ea01b6c8
2009-02-12 02:31:00 +00:00
Uwe Stöhr
21cab38549 InsetTabular.cpp: fix http://bugzilla.lyx.org/show_bug.cgi?id=5772
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28461 a592a061-630c-0410-9148-cb99ea01b6c8
2009-02-12 02:23:48 +00:00
Uwe Stöhr
b9df3d88c9 InsetTabular.cpp: partly reverting r28437, because I was wrong: it is totally valid to have several rows to be the header and also several rows can have a caption, my own EmebeddedObjects manual has examples for this - stupid me!
Bug 5752 is nevertheless still fixed.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28442 a592a061-630c-0410-9148-cb99ea01b6c8
2009-02-11 03:18:16 +00:00
Uwe Stöhr
8bbd9f254d InsetTabular.cpp: Insert a caption, when a longtable row is marked to be the caption, otherwise the LaTeX output would be is incorrect
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28440 a592a061-630c-0410-9148-cb99ea01b6c8
2009-02-11 01:30:20 +00:00
Uwe Stöhr
e029b216b7 GuiTabular, InsetTabular: fix http://bugzilla.lyx.org/show_bug.cgi?id=5752
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28437 a592a061-630c-0410-9148-cb99ea01b6c8
2009-02-10 18:08:09 +00:00
Vincent van Ravesteijn
0be0516d28 Fix bug 5753: http://bugzilla.lyx.org/show_bug.cgi?id=5753.
Crash when setting caption on a row with a multicolumn.

If there is already a multicolumn on the row, the number of cells is different from column_info.size().

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28427 a592a061-630c-0410-9148-cb99ea01b6c8
2009-02-10 00:02:39 +00:00
Vincent van Ravesteijn
09a0e37b15 Replace the PainterInfo::erased_ member by a proper Change object and remove the Color_deletedtext from InsetTabular.
see:
http://thread.gmane.org/gmane.editors.lyx.devel/114326

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28424 a592a061-630c-0410-9148-cb99ea01b6c8
2009-02-09 21:14:23 +00:00
Vincent van Ravesteijn
74163aa0cf Fix bug 5766: http://bugzilla.lyx.org/show_bug.cgi?id=5766.
Crash when selecting a row and doing "Delete column" in a table with multicolumns.

The check "column + 1 < column_info.size()" checks whether there is at least one column after this one. However, this check is no longer valid if we remove the column from column_info first.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28419 a592a061-630c-0410-9148-cb99ea01b6c8
2009-02-09 19:39:28 +00:00
Vincent van Ravesteijn
96eac2ca3f Fix bug 5750: http://bugzilla.lyx.org/show_bug.cgi?id=5750.
Wrong width display of multicolumn cells.

When changing a custom width cell into a multicolumn, the isFixedWidth bool should be set to false. Now, the function setFixedWidth could only set isFixedWidth to true when needed.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28407 a592a061-630c-0410-9148-cb99ea01b6c8
2009-02-09 09:02:50 +00:00
Vincent van Ravesteijn
72fdd1b861 Fix bug 5604: http://bugzilla.lyx.org/show_bug.cgi?id=5604.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28400 a592a061-630c-0410-9148-cb99ea01b6c8
2009-02-08 18:33:01 +00:00
Vincent van Ravesteijn
4706961841 Fix bug 1802: http://bugzilla.lyx.org/show_bug.cgi?id=1802.
* allows the selection of a whole cell with shift+key
* shift-movement between empty cells with a single keystroke 


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28385 a592a061-630c-0410-9148-cb99ea01b6c8
2009-02-07 15:24:47 +00:00
Vincent van Ravesteijn
22f7d3b3ba * InsetTabular.cpp cosmetics
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28369 a592a061-630c-0410-9148-cb99ea01b6c8
2009-02-05 22:14:57 +00:00
Uwe Stöhr
b742ff6406 support for the LaTeX commands \*phantom, fileformat change
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28292 a592a061-630c-0410-9148-cb99ea01b6c8
2009-01-30 00:56:37 +00:00
Vincent van Ravesteijn
dd64c572c2 Allow users to specify toolbar icons for commands with a backslash. This is in the same style as the replacements made for math-insert commands.
See the user's list:
http://thread.gmane.org/gmane.editors.lyx.general/52712

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27979 a592a061-630c-0410-9148-cb99ea01b6c8
2009-01-03 18:33:09 +00:00
Georg Baum
030e249d91 fix potential problems detected by gcc
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27956 a592a061-630c-0410-9148-cb99ea01b6c8
2008-12-22 18:18:47 +00:00
Vincent van Ravesteijn
d38cc523c6 Fix tabular cursor movement:
- allow repeated shift-up in a multi-line column,
- finish r27581 and r27567 :
    we have to call cur.selHandle ourselves now,
- do not dispatch to the cell in multicell selection.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27632 a592a061-630c-0410-9148-cb99ea01b6c8
2008-11-19 01:02:48 +00:00
Vincent van Ravesteijn
912979d2db Correct painting of a fully selected tabular cell.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27630 a592a061-630c-0410-9148-cb99ea01b6c8
2008-11-18 22:35:02 +00:00
Vincent van Ravesteijn
6f88e64895 Fix bug #5536.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27626 a592a061-630c-0410-9148-cb99ea01b6c8
2008-11-18 21:37:02 +00:00
André Pönitz
6192345f60 add Buffer * member to DocIterator
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27603 a592a061-630c-0410-9148-cb99ea01b6c8
2008-11-17 11:46:07 +00:00
André Pönitz
32a53f8d6a move more stuff from buffer_func to Buffer
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27565 a592a061-630c-0410-9148-cb99ea01b6c8
2008-11-16 17:49:00 +00:00
Jean-Marc Lasgouttes
ffafdb2bbe move the catInit call around
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27481 a592a061-630c-0410-9148-cb99ea01b6c8
2008-11-15 19:30:58 +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
Pavel Sanda
e4808961c9 Another selection painting patch, PainterInfo::backgroundColor introduced.
Patch by Vincent.

http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg145438.html



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27097 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-25 10:47:38 +00:00
Abdelrazak Younes
0ac664310a Modify the way multi-cell selection is done in tables:
* Always put the cursor at the end of the cell (this was set at the beginning with mouse selection).
* handle LFUN_SELF_INSERT in case of multi-cell selection -> the whole cell contents will be deleted.

This commit fixes http://bugzilla.lyx.org/show_bug.cgi?id=5225


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26668 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-01 08:18:57 +00:00
Jürgen Spitzmüller
4cb08129a3 attempt to fix bug 5282:
* src/insets/InsetTabular.cpp:
	- keep track of encoding after passing a copy of the OutputParams.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26592 a592a061-630c-0410-9148-cb99ea01b6c8
2008-09-27 15:32:43 +00:00
Uwe Stöhr
a7722811f7 InsetTabular: make Slovak and Czech documents compilable, fixes http://bugzilla.lyx.org/show_bug.cgi?id=5290, thanks to Heiko Obderdiek for the hint how to fix this
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26581 a592a061-630c-0410-9148-cb99ea01b6c8
2008-09-26 21:24:59 +00:00
André Pönitz
4c7fdddd74 streamlining setter syntax. using mutable references seems a bit
outlandish compared to the rest of LyX


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26527 a592a061-630c-0410-9148-cb99ea01b6c8
2008-09-24 21:27:41 +00:00
Jürgen Spitzmüller
0bb14ddfc7 get rid of two compiler warnings.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26444 a592a061-630c-0410-9148-cb99ea01b6c8
2008-09-18 16:29:27 +00:00
Enrico Forestieri
3e55de70dd Introduce LFUN_FONT_BOLDSYMBOL, performing the same as LFUN_FONT_BOLD
except when in math mode, where \boldsymbol is used instead of \mathbf.
Restore the previous binding of Ctrl-B and make sure that LFUN_FONT_BOLDSYMBOL,
now bound to Ctrl-Alt-B, can be toggled.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26418 a592a061-630c-0410-9148-cb99ea01b6c8
2008-09-15 16:49:11 +00:00
Jürgen Spitzmüller
eb3ab2f3d0 * InsetTabular.cpp:
- comment out non-working code that can trigger an assertion (probably bug 5225).
	  (this code also does not work as expected in branch, but it doesn't act as badly there)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26407 a592a061-630c-0410-9148-cb99ea01b6c8
2008-09-15 08:43:42 +00:00
Jürgen Spitzmüller
7bbb01f8b6 * src/insets/InsetTabular.{cpp,h}:
- improve updating of on-screen alignment

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26406 a592a061-630c-0410-9148-cb99ea01b6c8
2008-09-15 08:09:52 +00:00
Edwin Leuven
b1c3515769 comments don't hurt
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26402 a592a061-630c-0410-9148-cb99ea01b6c8
2008-09-14 17:43:04 +00:00
Edwin Leuven
3573d29271 clean up horizontal tabular line latex-output
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26395 a592a061-630c-0410-9148-cb99ea01b6c8
2008-09-14 12:31:58 +00:00
Jürgen Spitzmüller
a2c42bc702 fix bug 5250.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26394 a592a061-630c-0410-9148-cb99ea01b6c8
2008-09-14 07:42:15 +00:00
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
a3392f4088 I/1H\$Hl$Ld$Ll$ Lt$(L|$0H8M
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26376 a592a061-630c-0410-9148-cb99ea01b6c8
2008-09-12 17:25:11 +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
Jürgen Spitzmüller
623308f1e9 * src/insets/InsetTabular.cpp:
- correct LaTeX output for alignment in fixed width multicolumn cells
	  (bug 1747).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26352 a592a061-630c-0410-9148-cb99ea01b6c8
2008-09-10 12:49:08 +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
Edwin Leuven
fab42d011c fix sideways scrolling in tabulars with nested insets
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26347 a592a061-630c-0410-9148-cb99ea01b6c8
2008-09-09 14:12:08 +00:00
Richard Heck
ebfe9d60d7 The previous commit inadvertently contained some of this one, which is just a renaming.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26110 a592a061-630c-0410-9148-cb99ea01b6c8
2008-08-09 16:29:25 +00:00
Richard Heck
8498a50c64 Don't allow new pages within tables!
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26105 a592a061-630c-0410-9148-cb99ea01b6c8
2008-08-09 02:02:16 +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
6f77b93572 Fix cursor movement with multicell selections. There's no point allowing character by character selection in this case.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26103 a592a061-630c-0410-9148-cb99ea01b6c8
2008-08-09 00:43:15 +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
510174ba17 Set the cursor to the start of the cell when doing multicell selections,
since it doesn't make sense to select two and a half cells.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26101 a592a061-630c-0410-9148-cb99ea01b6c8
2008-08-08 19:34:47 +00:00
Richard Heck
b2f5782253 Fix bug 5145. InsetTabular was resetting cur.idx() but not cur.pit() or cur.pos(),
leaving them possibly invalid.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26100 a592a061-630c-0410-9148-cb99ea01b6c8
2008-08-08 19:21:06 +00:00
Richard Heck
9374e68bfd Fix bug 5146. The problem arose when attempting to paste normal text into
a multicell selection. But the more I thought about this, the more it seemed
that pasting into multicell selections shouldn't be allowed. What exactly
ought to happen if the user selects a 2x3 grid of cells and then tries to
paste a 5x5 group of cells? LyX, anyway, just ignores the selection in this 
case, which is not what the user will expect. So let's just not go there.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26099 a592a061-630c-0410-9148-cb99ea01b6c8
2008-08-08 17:28:25 +00:00
Richard Heck
cca78e3c8a Change the "empty layout" to the "plain layout", to try to avoid confusion.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26025 a592a061-630c-0410-9148-cb99ea01b6c8
2008-08-01 20:57:27 +00:00
Abdelrazak Younes
fa1305ccd3 InsetText: remove InsetText default ctor and make text_ member private.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25974 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-29 12:07:08 +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
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
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
dd6d173082 fix http://bugzilla.lyx.org/show_bug.cgi?id=4998
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25445 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-04 13:18:28 +00:00
Pavel Sanda
dcc50a2454 Fix include orderings.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25309 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-18 18:54:31 +00:00
Pavel Sanda
07113cf424 LFUN_FONT_FREE_* -> LFUN_TEXSTYLE_*
http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg141274.html


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25225 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-11 08:35:15 +00:00
Edwin Leuven
dbc07ef630 fix http://bugzilla.lyx.org/show_bug.cgi?id=4778
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25198 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-09 08:11:46 +00:00