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
c9da62fb08
Implement the possibility of concatenating (context) menus.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36605 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-29 23:15:31 +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
b81550b459
Remove unused #include.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36602 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-29 18:49:04 +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
940ab1261b
Fix part of bug #7072 by opening undo groups as needed.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36597 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-29 16:38:13 +00:00
Jean-Marc Lasgouttes
87a0c25bc4
Fix missing undo group when doing the following:
...
* create math inset
* enter macro name \ww
* press left arrow to re-enter the macro name inset, add a third 'w'.
* when leaving the inset is is updated through notifyCursorLeaves, but no undo group is active
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36596 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-29 16:06:43 +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
Pavel Sanda
fdc3b1efd5
ui glitches
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36583 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-29 11:26:10 +00:00
Pavel Sanda
182100d376
UI for #4581 .
...
Patch from Ale.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36582 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-29 11:26:08 +00:00
Jean-Marc Lasgouttes
3753804463
whitespace
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36581 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-29 10:48:40 +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
baaceb10c2
* PDFOptions.cpp:
...
- omit \inputencoding changes with XeTeX/LuaTeX.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36579 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-29 09:03:55 +00:00
Jürgen Spitzmüller
5c02ca57d4
* BufferParams.cpp: use polyglossia only with nonTeXFonts.
...
Now the UG compiles with XeTeX and tex fonts.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36578 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-29 07:52:58 +00:00
Uwe Stöhr
5524485856
InsetMathSubstack.cpp: fix #2498
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36567 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-29 03:18:02 +00:00
Uwe Stöhr
d80053cda8
GuiTabular.cpp: fix #3517
...
- disable column alignment and width if there is a LaTeX argument
- use also for the LaTeX argument the editingFinished method (as for all other edit fields in the dialog)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36566 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-29 02:38:29 +00:00
Uwe Stöhr
aa69852341
TabularUi.ui: fix spacing of column width unitCB
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36565 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-29 02:36:25 +00:00
Richard Heck
a61899ffe7
Allow InPreamble to be used with Paragraph-type environments. There is
...
no reason not to permit this, and using it with PassThru 1 allows for a
very simple Preamble layout-type that acts as ERT for the premable. Of
course, we do have the preamble in Document>Settings, but that allows
the embedding of preamble code in branches.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36562 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-28 22:08:11 +00:00
Jürgen Spitzmüller
3d1226b4f2
* Use the package luainputenc if LuaTeX is used as output format _with_ tex fonts. With this, the UG compiles with LuaTeX if "Unse non-TeX fonts" is not selected.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36559 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-28 17:51:21 +00:00
Jürgen Spitzmüller
7538a23c15
* Buffer.cpp (makeLaTeXFile):
...
- With XeTeX/LuaTeX and tex fonts, we need to force the encoding to utf8-plain manually.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36558 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-28 17:43:22 +00:00
Georg Baum
c8ec2c0a03
Fix bug #7088
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36557 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-28 17:16:11 +00:00
Georg Baum
c5799b7019
Fix bug #7091 and bug #7094
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36556 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-28 17:02:10 +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
Jürgen Spitzmüller
e14b6a280d
whitespace only.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36553 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-28 13:49:14 +00:00
Georg Baum
e2309ca098
Fix bug #6853 (Short titles ignored when InPreamble is set to 1 in layout file)
...
The fix includes required arguments and LaTeXParam, too.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36552 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-28 12:27:52 +00:00
Georg Baum
36698a933c
Add fixltx2e module which simply loads fixltx2e.sty.
...
This module can be used instead of \usepackage{fixltx2e} in the preamble
to avoid duplicate definitions of \textsubscript.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36550 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-28 10:46:47 +00:00
Jürgen Spitzmüller
ff20f7ebe9
Allow to use XeTeX and LuaTeX with tex fonts.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36537 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-27 13:43:13 +00:00
Stephan Witt
0ff09a4e49
#7082 add submenu for suggestions only when not empty
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36535 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-27 10:53:27 +00:00
Pavel Sanda
8435660410
This string composition badly fails on some languages since as a translator
...
you have no clue about the context for the proper grammatical case.
I'm not particularly happy about the fix, but didn't see much better alternatives.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36532 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-27 03:04:56 +00:00
Pavel Sanda
f5ad7f949e
Kill leading blankspaces in new strings, its weird to encounter them in .po.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36531 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-27 03:04:53 +00:00
Pavel Sanda
6d40196285
* Doxy. This function was probably meant as something more powerful in the begining.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36529 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-27 00:15:55 +00:00
Richard Heck
4540c4a18e
Final batch of BufferParam renaming.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36525 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-26 18:42:53 +00:00
Richard Heck
fc3b06eac8
Rename a bunch of BufferParams to conform to our usual style.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36524 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-26 18:32:29 +00:00
Richard Heck
58978d7bb5
Begin renaming some BufferParams to conform to our usual style.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36523 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-26 18:20:48 +00:00
Richard Heck
ab7a5bc382
Comment.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36522 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-26 18:09:03 +00:00
Richard Heck
c981018111
Fix bug #2743 .
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36521 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-26 17:30:45 +00:00
Richard Heck
7f8b868f4a
Fix bug #2607 .
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36520 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-26 17:21:17 +00:00
Georg Baum
e57084c140
fix bug 6698
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36519 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-26 17:14:21 +00:00
Richard Heck
b8b971cdd5
Fix bug #7045 .
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36518 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-26 17:11:02 +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
Jürgen Spitzmüller
2dc2e4770b
Implement GUI for LuaTeX. File format change due to the renaming of the \use_xetex buffer param.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36500 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-26 09:42:03 +00:00
Vincent van Ravesteijn
7073502308
Do not overwrite read-only files. We now move the file to the backup directory and write a new file. However, when the file is read-only it now appears as the file is overwritten anyway. Therefore we check wether the file is read-only before moving it.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36499 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-26 04:17:20 +00:00
Vincent van Ravesteijn
3508aaf2db
Fix bug #7035 : Read-only status and compressed status not set correctly when an autosave or emergency file is loaded, or when the file is been converted by lyx2lyx.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36497 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-26 02:01:04 +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