19900 Commits

Author SHA1 Message Date
Uwe Stöhr
8472702349 backporting tex2lyx: some simplifications
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40032 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-27 12:43:07 +00:00
Stephan Witt
7de601b63e #7778 backport of fix in trunk
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40026 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-27 09:05:55 +00:00
Uwe Stöhr
7439464374 backporting tex2lyx: the support for strike out and underlined (by Georg)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40022 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-26 21:47:27 +00:00
Uwe Stöhr
0c684343a7 backporting tex2lyx: the example files
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40021 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-26 21:43:08 +00:00
Vincent van Ravesteijn
84e3817673 branch: Fix bug #7793: LyX leaves behind autosave files
The LyX buffer is cloned before autosaving, but the unnamed_ member was not
copied. This causes the autosave files to end up in the wrong location and
consequently they were never removed afterwards.

see r40008.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40018 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-26 19:50:33 +00:00
Uwe Stöhr
af227ddd8b backport fix for bug #7851
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40017 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-26 19:32:33 +00:00
Richard Heck
a2705e1474 Backporting fix for #3821.
Allow insertStringAs* to reset the cursor.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40015 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-26 16:02:30 +00:00
Uwe Stöhr
9ed2296196 tex2lyx/text.cpp: fix 2 typos
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40011 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-26 13:37:11 +00:00
Vincent van Ravesteijn
93ba21cd5a branch: Make the scrolling for large insets more naturally (bug #7662)
The patch fixes a case that I had forgotten. Namely, the case that when the height of a row was larger than the height of the screen and that the cursor is already visible. That's why I added a new if case to catch all situations in which the row height is larger than the height of the screen. If we then need scrolling we scroll to height/4 and 3*height/4. In the end, the height_/4 and 3*height_/4 should be replaced by the rowheights in the inset, but we need some extra infrastructure for that.

see r39697.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40010 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-26 13:35:49 +00:00
Vincent van Ravesteijn
269e688857 branch: Fix bug #7662: Incorrect scrolling for rows with larger ascent.
- After introducing the displayed vertical alignment for tables, we met for the first time situations in which row.ascent is very large. To make sure the scrolling still works, we have to do the same as we did for rows with a large descent.
- change row.ascent into defaultRowHeight. Before the above mentioned change, row.ascent usually was approximately the same as defaultRowHeight (by chance). However, it is now clear we don't really want row.ascent here.

see r39486.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40009 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-26 13:35:47 +00:00
Uwe Stöhr
535867bb5f backporting tex2lyx: update the TODO file to what is already supported in branch
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40001 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-26 02:18:06 +00:00
Uwe Stöhr
dd87ea4a99 backport bug #7853
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40000 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-26 02:03:33 +00:00
Uwe Stöhr
fa641135d2 backporting tex2lyx: the \printnomenclature support
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39997 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-26 01:47:47 +00:00
Uwe Stöhr
4f878f6892 backporting tex2lyx: the \rule support
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39996 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-26 01:42:56 +00:00
Uwe Stöhr
b19cfd71ee backporting tex2lyx: the phantom support
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39995 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-26 01:38:39 +00:00
Uwe Stöhr
3e9d409771 backporting tex2lyx: fix bug #7856
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39993 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-26 01:25:43 +00:00
Uwe Stöhr
b4e2effa3d backporting tex2lyx: the color support
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39992 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-26 01:22:31 +00:00
Uwe Stöhr
1122af1e84 backporting tex2lyx: support for language packages
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39988 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-25 23:36:57 +00:00
Uwe Stöhr
299ebef138 backporting tex2lyx: the font support (status entries follow at the end of the backporting
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39981 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-25 22:56:55 +00:00
Uwe Stöhr
82e997fd5f backporting tex2lyx: the TeX testfiles
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39980 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-25 22:38:50 +00:00
Georg Baum
91fe97eca7 Adjust comment (thanks Jose)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39977 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-25 20:04:00 +00:00
Richard Heck
be2b9eb9eb Backport r39970--39971 to branch.
Fix display of section headings, etc, that include math in the TOC
and menus. The newline we were writing previously caused all kinds
of problems. Writing a whole array in some cases would also cause
problems. So we do less.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39972 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-25 18:56:58 +00:00
Uwe Stöhr
d98eb6e4f1 InsetBox.cpp: backport fix for bug #7849
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39969 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-25 17:59:24 +00:00
Enrico Forestieri
5b91832bc9 Fix bug #7835 (Relative paths are not supported by the TEXINPUTS prefix)
This restores \input@path handling, which turns out to be necessary, as
the TEXINPUTS mechanism is not used with relative paths. It turns out
that both methods must be used, because \input@path does not work in all
cases (most notably with tikz).


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39931 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-23 03:32:37 +00:00
Georg Baum
13bca637e4 Update tex2lyx to produce the current 2.0.x file format
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39927 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-22 20:12:55 +00:00
Pavel Sanda
3a10b238e3 Backport string to branch.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39905 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-21 13:25:33 +00:00
Julien Rioux
fbdf373cda tex2lyx : More descriptive --help message and implement --version (#6827).
Also allow -h and -v command-line options, manpage update.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39887 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-19 14:53:01 +00:00
Jürgen Spitzmüller
c6dee6cfe0 Fix parsing of branch names with spaces.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39853 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-14 13:57:48 +00:00
Uwe Stöhr
9115fb222f PrefLanguageUi.ui: this string was forgotten in r39609
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39847 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-14 04:17:38 +00:00
Julien Rioux
1c56ffc10f Allow \nocite again with the basic citation engine (backport r39777).
Fix a bug introduced in r26547. Also reorders the entries for
natbib-numerical into a more natural, visually pleasing order.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39830 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-11 18:33:35 +00:00
Julien Rioux
e2a82f44bd Fix the tab ordering of PrefsUi and GuiDocument Ui components.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39829 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-11 18:22:06 +00:00
Julien Rioux
80ba75d0b1 Don't allow newline characters in document settings and preferences (#5840).
Set a validator on QLineEdit widgets. The validator removes any
\n and \r characters, thus preventing users from copy-pasting
newline characters into these fields, and subsequently saving
them, inadvertantly, to their lyx file or preferences file.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39828 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-11 17:57:33 +00:00
Enrico Forestieri
8c51cd2ad0 Avoid unnecessary spaces with the Windows shell. No status line needed as
this is a correction to r39770. Essentially, the white space before '&'
becomes part of the TEXINPUTS variable, such that the last path element
is not empty but a space. This still works with miktex but upsets texlive.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39827 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-10 22:47:52 +00:00
Jürgen Spitzmüller
aa184ab645 Fix biber execution om MikTeX.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39817 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-07 13:48:59 +00:00
Jürgen Spitzmüller
4bb8009f4b backport r39756: As for setMultiRow, check border status _before_ merging, thus fixing border allocation problems.
No status entry needed; this is a complementing change to r39755.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39800 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-05 12:57:04 +00:00
Jürgen Spitzmüller
336e0ea9f5 backport r39757:
* Fix merging of cells (multicolumn, multirow) when the first cell in the selection is already a multi-cell (bug #7792).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39793 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-01 07:24:17 +00:00
Enrico Forestieri
fe65104a7c Fix bug #7796 (LyX creates file on startup that cannot be deleted)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39781 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-28 07:04:29 +00:00
Enrico Forestieri
9c5a8a5baa Manage the setting of the latex environment for Systemcall and ForkedCall
in a central place. This is a backport of r39754 and r39758-r39762.
No status line needed.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39770 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-26 17:14:24 +00:00
Jürgen Spitzmüller
4619ec4637 Fix bottom border allocation when setting a multirow.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39755 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-25 06:36:58 +00:00
Enrico Forestieri
864cbd5422 Fix typo.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39750 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-24 18:08:57 +00:00
Enrico Forestieri
477d0ee0a6 Also set TEXINPUTS when launching ForkedCall processes.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39748 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-24 17:56:06 +00:00
Jürgen Spitzmüller
7a27682192 * InsetTabular.cpp: fix logic of multirow top/bottom line output (bug #7578)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39734 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-23 13:07:00 +00:00
Jürgen Spitzmüller
6c27ed49fa backport r39696
Timestamp: 
09/17/11 17:25:14 (5 days ago) 
Author: 
spitz 
Message: 
finally commit the fix for #7607.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39729 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-22 07:49:25 +00:00
Enrico Forestieri
9f1a845234 When changing the document language, also change the language of the
text which is not explicitly marked in a different language, irrespective
of the multilingual status, except for LTR<=>RTL changes.
See discussion in this thread:
http://thread.gmane.org/gmane.editors.lyx.devel/138380


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39721 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-21 15:48:51 +00:00
Julien Rioux
85b53b183b Mark settings as changed when the Nomenclature line is edited (backport r39663).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39719 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-20 18:42:40 +00:00
Julien Rioux
8bc200adc9 Fix the tab ordering of GuiPrefs components (backport r39662).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39718 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-20 18:40:45 +00:00
Enrico Forestieri
cd4684bd65 Fix bug #7621 (Images are not displayed if path of temp folder contains accented characters)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39701 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-18 19:57:25 +00:00
Richard Heck
042454a101 Typo.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39684 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-15 22:04:59 +00:00
Richard Heck
b3cd6747eb Better label for index list.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39683 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-15 21:49:20 +00:00
Richard Heck
e6101f9807 Get default font color and background color working for XHTML export.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39680 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-15 21:38:05 +00:00