Commit Graph

90 Commits

Author SHA1 Message Date
Jean-Marc Lasgouttes
1a702924d4 Small tweak to r20121
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20122 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-07 10:04:10 +00:00
Jean-Marc Lasgouttes
6e974a3d42 Fix bug 4212
* Text2.cpp (deleteEmptyParagraphMechanism):
	* paragraph_func.cpp (breakParagraph): make sure that the start of 
	appendix marker is not lost when deleting or breaking a paragraph


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20121 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-07 09:55:57 +00:00
Abdelrazak Younes
2ea432bab1 * TextMetrics: getDisplayFont() and isRTLBoundary() takes pit instead of Paragraph.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20015 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-02 22:28:49 +00:00
Abdelrazak Younes
d35d25460b * Text: Move some more stuff from Text to TextMetrics:
- getFont() becomes TextMetrics::getDisplayFont()
- setCharFont() now needs a display font.
- setInsetFont() and setFont() now needs a BufferView, will be transferred to TextMetrics too.
- isRTL(): moved to TextMetrics
- isRTLBoundary(): ditto
- font_: ditto

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20014 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-02 21:48:49 +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
af06ed5ff1 Transfer current_font and real_current_font from Text to Cursor.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19999 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-02 13:35:48 +00:00
Abdelrazak Younes
13e8185afa header cleanup.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19997 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-02 11:46:05 +00:00
Abdelrazak Younes
67fc32064f header cleanup.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19996 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-02 11:33:04 +00:00
Abdelrazak Younes
502b048246 Transfer metrics and screen related methods from Text to TextMetrics.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19994 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-02 11:21:33 +00:00
Abdelrazak Younes
4048448236 Transfer metrics and screen related methods from Text to TextMetrics.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19991 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-02 09:44:08 +00:00
Jürgen Spitzmüller
e606e5eacc * src/Text2.cpp:
- fix wrong DEPM in ct mode (bug 3961).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19884 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-29 13:04:29 +00:00
André Pönitz
39c7e2faf0 rename Layout_ptr into LayoutPtr
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19758 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-23 19:59:07 +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
Alfredo Braunstein
c1b155fbe8 simplify setInsetFont, removing a potential bug (an invalid DocIterator was built). Use CursorSlices when possible.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19690 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-21 10:54:04 +00:00
Richard Heck
de373da67b Add LFUN_PARAGRAPH_PARAMS (= paragraph-params), used for changing a paragraph's alignment, spacing, etc. This is complementary to LFUN_PARAGRAPH_PARAMS_APPLY, which sets the parameters. The difference is that APPLY over-rides all existing parameters, setting any not given to the default, whereas this one simply changes those that are given. So
paragraph-params \align right
will align the paragraph right, leaving spacing, etc, as they were, whereas
  paragraph-params-apply \align right
will align the paragraph right but also reset all other parameters to defaults. Note, by the way, that this means that
  paragraph-params-apply
sets everything to default.

Some new arguments have also been introduced. These are:
  \indent
  \indent-toggle
  \spacing default
Of course, none of these are found in valid LyX files, but they are useful in menu bindings, etc.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19581 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-15 02:21:09 +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
Christian Ridderström
1050cc4471 Converted '#warning ...' into FIXME-comments
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19397 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-10 11:47:12 +00:00
Richard Heck
519e73acc8 Make LYX_ALIGN_LAYOUT always be an available layout. This simplifies a couple
chunks of code and makes a lot of sense.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19332 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-06 05:04:38 +00:00
Abdelrazak Younes
4a53fa6e01 Allow unicode in Layout names.
* Layout.h:
  - name_, obsoleted_by_, depends_on_ are now docstrings.

All other changes results from the above string -> docstring changes. In particular, we now try to translate the layout names only if possible (i.e. if they are ASCII only).



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19042 a592a061-630c-0410-9148-cb99ea01b6c8
2007-07-11 13:39:08 +00:00
Richard Heck
3fcc6711f0 Fix some issues with the paragraph settings dialog. The main change
is that we distinguish between the "Default" alignment and whatever
that default happens to be: I.e., so far as the code goes, the UI now
distinguishes LYX_ALIGN_LAYOUT from LYX_ALIGN_WHATEVER, when WHATEVER
happens to be the default. So you can explicitly force, say, left-align,
and that will stick between document classes.

* src/Paragraph.cpp:
Don't output params if alignment is the default.

* src/ParagraphParameters.cpp
Treat LYX_ALIGN_LAYOUT as its own alignment.

* src/Text2.cpp
Treat LYX_ALIGN_LAYOUT as its own alignment, and force it to be accepted
as a possible alignment.

* src/frontends/controllers/ControlParagraph.{h,cpp}
New method haveMultiParSelection().

*src/frontends/qt4/QParagraph.{h,cpp}
*src/frontends/qt4/ui/ParagraphUi.ui
UI adjustments as mentioned.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18922 a592a061-630c-0410-9148-cb99ea01b6c8
2007-06-28 00:48:06 +00:00
Dov Feldstern
d8040b41af When inserting an inset use the current font.
This fixes http://bugzilla.lyx.org/show_bug.cgi?id=3011


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18781 a592a061-630c-0410-9148-cb99ea01b6c8
2007-06-15 10:43:10 +00:00
Stefan Schimanski
41e194bf88 * safe Text::setCurrentFont which does not use Text::bidi and hence
does not depend on paragraph metrics (fixes #3790, #3801, #3809)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18705 a592a061-630c-0410-9148-cb99ea01b6c8
2007-06-07 19:55:22 +00:00
Stefan Schimanski
ff8fcc268a * no_bidi_isboundary.patch: added isRTLBoundary as a replacement to several references to the Text::bidi object.
(fixes #3790, #3801, #3809)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18704 a592a061-630c-0410-9148-cb99ea01b6c8
2007-06-07 19:50:02 +00:00
Stefan Schimanski
6d67f77467 * stay in front of insets/segment on RTL/LTR boundary
(fixes bug 3754: Cursor movement at RTL-LTR boundary)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18666 a592a061-630c-0410-9148-cb99ea01b6c8
2007-06-04 18:35:03 +00:00
Stefan Schimanski
57294cd9c7 * help future developers reading my code and wondering what the heck I am doing here with all those variables
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18578 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-30 07:30:17 +00:00
Stefan Schimanski
fb74387b44 * put debug variables into #ifdef 0 block. Good that modern computer
science can enforce good code quality by stopping compilation if
  unused variables are found.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18577 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-30 06:58:08 +00:00
Stefan Schimanski
880b6c4d6e 1. switch LFUN_UP/DOWN handling to a structural approach, i.e. the
dispatchers in mathed and text only do local work, i.e. only try to
move the cursor with their local knowledge, not globally as before in
the Cursor::goUpDown function before. The old approach used one of
brutefind functions as a last way out to really move the cursor up or
down. The result was some strange behavior that the nearest inset was
selected when jumping from math to text, not one in the next line. 
2. removed LFUN_FINISHED_UP/DOWN, as there seem to be no effect and it
seems to be obsolete.
3. target_x is working again, mainly by adding a textTargetOffset_
member to the Cursor which keeps the difference between the target_x
and the actual position of the cursor on screen. As long as
pos+offset=target is fulfilled the target_x is not touched and the
cursor keep the column while going up/down.
4. moved the text cursor up/down code to the Cursor class, in analogy
to the mathed code.
5. For 1 it is necessary to know the cursor position before the
dispatch. So this data is added to the Cursor.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18569 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-29 20:53:32 +00:00
Jürgen Spitzmüller
ac45b49fb9 Fix bug 2555:
* src/Text2.cpp:
	- (setFont): set font of inset as well, not only content
	-  (setCharFont): remove obsolete assert

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18563 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-29 17:02:29 +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
Stefan Schimanski
15055e721a * depending on "front" the last position is a valid one (Dov Feldstern's patch)
* fixes http://bugzilla.lyx.org/show_bug.cgi?id=3720


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18532 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-27 08:16:17 +00:00
Georg Baum
7930b9e5b6 fix bug 1973 (hopefully)
* src/Text2.cpp
	(Text::setCharFont): Assert
	(Text::setInsetFont): New, set the font recursively in insets
	(Text::setFont): Call setInsetFont instead of setCharFont if needed

	* src/DocIterator.cpp
	(DocIterator::forwardIdx): Implement

	* src/Text.h
	(Text::setInsetFont): New, set the font recursively in insets
	(Text::setCharFont): Document



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18452 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-22 10:51:38 +00:00
José Matox
4729f795bc Fix a crash which occurs when RTL flag is turned on.
The crash was being caused by the fact that when moving back from the
beginning of the line to the previous line (by pressing RIGHT in an
RTL paragraph, or LEFT in an LTR one), Bidi metrics for the new line
do not yet exist, but an attempt is made to access them.

Basically, this patch was created by trying to "symmetrically" copy
cursorRight (which seems to work well) to cursorLeft (which was
problematic).



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18389 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-17 21:53:11 +00:00
Richard Heck
3430c35ee3 [Bugs 3461 and 3630] Allow real_current_font to be reset in Text::setFont even when we have a selection.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18382 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-17 12:17:38 +00:00
Abdelrazak Younes
e9780fe317 Fix cursor movement inside insets within RTL mode.
* Bidi.{h,cpp}:
  - isWithinRtlParagraph(): new helper function.

* Text2.cpp: use function above for cursor up and down instead of needReverseDirection() which is about cursor left and right.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18364 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-16 09:35:12 +00:00
Abdelrazak Younes
06676b6d5b rev 18350: forgot this.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18352 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-15 17:25:30 +00:00
Abdelrazak Younes
105b8b2bf1 rev 18350: forgot this.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18351 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-15 17:24:26 +00:00
Bernhard Roider
9b5b7587a3 add comments and rtl support for cursor positioning problem
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18323 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-14 20:03:40 +00:00
Bernhard Roider
5d9e65058c fix cursor movement (up/down) problem at the end of lines in insets and table cells.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18293 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-13 19:53:06 +00:00
Michael Schmitt
8dcc7cf00e * src/Text2.cpp: fix error message (do not refer to old, non-existing menu item);
I wonder whether this message is used at all, as it does not occur when
	runnig font-free-apply after program start


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18149 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-01 10:25:46 +00:00
André Pönitz
e0d54dd3b4 LyXText -> Text
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18103 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-29 23:33:02 +00:00