Vincent van Ravesteijn
80c1e18bda
Compile fix: solve the merge conflicts in the correct way ;)
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36607 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-29 23:47:55 +00:00
Vincent van Ravesteijn
c42a61c5ac
Fix bug #6642 : Concatenate the context menus for: InsetCollapsables without a button, InsetTexts which have a custom context menu and InsetTabulars. Override the default behaviour for InsetInfo.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36606 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-29 23:21:52 +00:00
Vincent van Ravesteijn
e7f2bbe1ee
Rename InsetXXX::contextMenu to InsetXXX::contextMenuName. Now this function doesn't need all the parameters and we split the functionality of choosing which context menu to return, from the functionality of supplying the name for the Inset itself. Now, the InsetText context menu is returned for InsetCollapsables when the button is not hit by the mouse. There is no (intended) change in functionality for insets without a button, collapsed insets. This fixes partly bug #6642 . A fix for InsetTabular and for insets with no button will follow.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36604 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-29 21:27:25 +00:00
Vincent van Ravesteijn
5eb7add409
Fix bug #6315 : counters in insets that don't produce output have ghost values.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36603 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-29 19:11:38 +00:00
Vincent van Ravesteijn
f814bb14bb
Properly check for the value of an enum. Unexpected things will happen whenever the enum itself changes.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36599 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-29 17:14:38 +00:00
Vincent van Ravesteijn
dc9d39dafe
Add missing cur.forceBufferUpdate() to LFUN_BRANCH_(DE)ACTIVATE.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36598 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-29 16:50:22 +00:00
Jean-Marc Lasgouttes
4439f6144f
Fix bug #6768 : inset-toggle points cursor after inset
...
Strangely enough, the code to go after the inset is here explicitely (so somebody thought at some time that it was a good idea. However, it is not active in 1.6.x...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36595 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-29 15:19:20 +00:00
Jean-Marc Lasgouttes
f75569d08c
fix #6930 : ERT inset should not act on INSET_MODIFY requests directed to someone else
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36592 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-29 13:30:17 +00:00
Jean-Marc Lasgouttes
574931dcdb
Fix bug #6930 : no undo for inset type changing
...
THis is a consequence of the new AtPoint mechanism. In the old
world, recordUndoInset was called before INSET_MODIFY. I reintroduced
manual recordUndoInset calls in all places that matter. I suspect
that this issue should be revisited later.
Note that recordUndoInset can now take an optional parameter that tells
what inset is concerned. This is useful because the cursor can be
either just inside the inset or in front of it.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36580 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-29 09:47:46 +00:00
Jürgen Spitzmüller
72f24353fa
* InsetInclude.cpp:
...
- if a master is compiled with XeteX or LuaTeX, all children must have plain utf8 encoding
(bug #6774 ).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36554 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-28 14:20:45 +00:00
Richard Heck
c9f9cb88c0
Not sure why I introduced this test at r28378, but it causes pasting to
...
fail e.g., of URLs in math, since tocString() is called by
Paragraph::asString() to give us the contents of insets. Probably, I was
misled by the name, and the comment in Inset.h. That means, at least,
that this method is misnamed, but it probably means we do the wrong
thing in other cases.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36517 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-26 17:08:40 +00:00
Richard Heck
9a272ec26d
We need to do the sanity check here, too, as we do in
...
Inset::getLayout(). Fixes the crash in bug #7069 . My bad.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36515 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-26 16:45:58 +00:00
Richard Heck
a3e8adde24
Remove obsolete comment.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36513 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-26 16:35:08 +00:00
Vincent van Ravesteijn
73a1a11018
Fix bug #7077 : Listings validator doesn't recognize 'breakatwhitespace'
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36496 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-26 00:08:07 +00:00
Uwe Stöhr
dc182537b4
InsetTabular.cpp: fine-tune vertical table alignment to get exactly the result of the latex output
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36494 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-25 22:49:05 +00:00
Uwe Stöhr
f11a0d3eaa
InsetTabular.cpp: comments
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36493 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-25 22:06:31 +00:00
Vincent van Ravesteijn
f27853ad41
Cosmetics, typos and comments.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36492 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-25 16:53:56 +00:00
Vincent van Ravesteijn
9fe6d655f3
Reuse some code and simplify InsetTabular::cursorPos()
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36487 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-25 13:22:04 +00:00
Vincent van Ravesteijn
0fd75fefc4
Fix bug #7059 : Display the vertical alignment of tables.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36486 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-25 13:20:56 +00:00
Vincent van Ravesteijn
3c5b30a8ea
Disentangle InsetTabular::drawSelection and InsetTabular::drawBackground().
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36484 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-25 13:08:26 +00:00
Vincent van Ravesteijn
340b1b0473
Comment out code that does nothing. InsetTableCell does not handle drawSelection. Now it raises the impression that this causes the selection of the cells to be painted but that is done somewhere else.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36483 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-25 13:02:30 +00:00
Vincent van Ravesteijn
8279da6e20
Move SCRIPT_CODE to the end to make sure the numbering is still correct.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36482 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-25 13:01:24 +00:00
Vincent van Ravesteijn
40b0f2f6b0
Reorder InsetScript.h and add member groups.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36481 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-25 13:00:31 +00:00
Richard Heck
a81bf77314
Change the escaping mechanism for XHTML output and so allow a fix for
...
bug #7061 .
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36455 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-24 15:27:36 +00:00
Jürgen Spitzmüller
2868ff7a52
add basic LuaTeX backend.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36448 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-23 16:07:42 +00:00
Jürgen Spitzmüller
fc9c1494ce
further xetex disambiguation: use the flavor where the flavor is apt.
...
This introduces an isFullUnicode() function to OutputParams that currently only contains XETEX, but later can also contain other fully unicode-aware backends (LUATEX for instance).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36445 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-23 12:23:36 +00:00
Jürgen Spitzmüller
7cbeed2e40
* Introduce polyglossia support (bug 6576).
...
Please test this.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36433 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-22 12:10:16 +00:00
Georg Baum
dea050cb93
fix bug 3008: Add subscript/superscript inset for text
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36424 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-21 17:00:12 +00:00
Uwe Stöhr
934e013505
InsetTabular.cpp: typo
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36420 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-21 04:45:07 +00:00
Uwe Stöhr
6cbbec8236
InsetTabular.cpp: fix #7055
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36415 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-20 18:59:16 +00:00
Uwe Stöhr
08f49bc27a
InsetTabular.cpp: correct alignment for multirows:
...
- if column of multirow has no width, the alignment is that of the column
- otherwise multirows are fix left-aligned
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36403 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-20 07:57:35 +00:00
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
Vincent van Ravesteijn
7222ce9e31
set eol-style
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36379 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-18 19:50:29 +00:00
Richard Heck
0940cd77d4
Better way of doing these checks, suggested by Enrico.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36356 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-17 22:17:53 +00:00
Richard Heck
d764a97cf4
Hadn't see this empty_docstring() thing before. Very useful.
...
Add a comment to strfwd.h.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36355 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-17 22:11:33 +00:00
Richard Heck
4bf281106b
Be more careful here about isalpha and isalnum. Per Enrico's suggestion,
...
we first do a range test, then check the status. I think this is right
in both cases.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36351 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-17 21:19:01 +00:00
Richard Heck
897404e34d
Simplify more of the tooltips. There will be some speed improvements
...
here, but not very noticeable, I think, as these ones aren't called by
the addToToc stuff.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36347 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-17 17:25:22 +00:00
Richard Heck
4133f627b2
Simplify some of the tooltip stuff now.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36346 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-17 16:55:58 +00:00
Richard Heck
7d0b98a858
Optimize InsetText::toolTipText() a bit. The old version was doing
...
plaintext() on the entire inset, even though the tooltip is only going
to show the first few lines. This could make things slow when you had a
lot of branches, because this is called by InsetBranch::addToToc().
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36345 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-17 16:35:37 +00:00
Richard Heck
b8d207901b
Fix crash reported by Enrico. Thinko or something in r35856.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36317 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-16 18:26:21 +00:00
Pavel Sanda
71501eb543
Next indices
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36268 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-12 20:15:25 +00:00
Jürgen Spitzmüller
2afa7eabd0
* revert r36189, since there is no consensus for this change.
...
Happy Friday, everybody!
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36257 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-12 09:31:55 +00:00
Richard Heck
6f76593069
Fix a bug in getFormattedReference().
...
Also, change from using the "cha" prefix for chapters, a la prettyref,
to the "chap" prefix, a la refstyle. We alias \pr@chap to \pr@cha for
prettyref users.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36238 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-10 16:45:55 +00:00
Richard Heck
19aa16756c
Fix bug in fallback reference output with refstyle. Based on idea by
...
Jean-Pierre Chretien.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36211 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-08 17:50:02 +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
e94a9732b1
stdinsets.inc, InsetERT.cpp: change "ERT" to "TeX" to be consistent - the documentation and all other menus use consequently since LyX 1.6.0 "TeX-code" because it turned out that ERT is a meaningless abbreviation for new users
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36189 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-07 15:31:05 +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
Vincent van Ravesteijn
afa873dc5f
Remove the FileName parameter of Buffer::loadLyXFile and friends. Now, getAutosaveFileNameFor and getEmergencyFileNamefor can be removed too. Last, the call to lyxvc.file_found_hook can now be centralized and can be given the correct parameter (d->filename instead of the name of the emergency/autosave file).
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36145 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 21:21:01 +00:00