Commit Graph

578 Commits

Author SHA1 Message Date
Uwe Stöhr
d2eefdb889 tex2lyx/text.cpp: backport fixes from trunk (no status entry necessary)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40482 a592a061-630c-0410-9148-cb99ea01b6c8
2011-12-11 23:24:44 +00:00
Uwe Stöhr
d9788beac8 tex2lyx Preamble.cpp, text.cpp: fix #7845 also for spreadsheet template
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40425 a592a061-630c-0410-9148-cb99ea01b6c8
2011-12-07 21:21:41 +00:00
Uwe Stöhr
fd2ff50b69 tex2lyx: support for pdfpages
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40370 a592a061-630c-0410-9148-cb99ea01b6c8
2011-12-05 01:12:41 +00:00
Georg Baum
159875f201 Mass backport tex2lyx bug fixes.
tex2lyx is no identical with the version in trunk (except for cosmetic changes
and file formats > 413).
The output of the test cases is either unchanged or improved.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40364 a592a061-630c-0410-9148-cb99ea01b6c8
2011-12-04 16:16:32 +00:00
Jean-Marc Lasgouttes
d45fdbc3c6 Fix linking on Mac OS X when using autotools without the fancy mac build script.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40322 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-30 11:19:57 +00:00
Georg Baum
b6eb513d94 Fix bug #7895: Do not output lines with only a single space.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40194 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-14 21:04:00 +00:00
Georg Baum
044565f535 Fix bug #7663: Misparsing of description \item with spaces
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40183 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-13 10:43:30 +00:00
Georg Baum
b79cde1dfd Fix "stray '}' in text" warnings: When parsing with FLAG_ITEM the braces need
to occur in pairs.
If you change something in tex2lyx please don't commit without running the
tests and ensuring that no warnings or errors are written on stderr.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40178 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-12 18:43:13 +00:00
Uwe Stöhr
ec3b686f8e backporting tex2lyx:
- support for \makebox
- fix import of boxes without an inner box (the on-screen display was broken because of wrong default width setting)
- fix parsing of \framebox{content}, which LyX does not support yet - we have to use ERT

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40157 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-07 21:57:49 +00:00
Georg Baum
f3a833ca7e Import optional argument of tabular (vertical alignment)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40148 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-06 18:56:26 +00:00
Georg Baum
191b561026 Must not output anything between p.pushPosition() and p.popPosition().
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40142 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-06 17:34:42 +00:00
Uwe Stöhr
14ee3de872 backporting tex2lyx: fix remaining part of bug #7846 (no status entry necessary)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40138 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-06 15:22:00 +00:00
Uwe Stöhr
2c0c8fc41f backporting tex2lyx: fix bug #7843
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40137 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-06 15:15:13 +00:00
Uwe Stöhr
120d030a89 backporting tex2lyx: fix bug #7863
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40109 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-31 01:58:58 +00:00
Uwe Stöhr
75ade33280 backporting tex2lyx: fix bug #7862
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40072 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-29 20:34:31 +00:00
Uwe Stöhr
38a6341d1c backporting tex2lyx: the support for subfloats
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40070 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-29 20:26:50 +00:00
Uwe Stöhr
25ea525d9b backporting tex2lyx: the support for wrap floats
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40055 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-28 18:28:28 +00:00
Uwe Stöhr
57a0b232fd backporting tex2lyx: the support for \date{} in the preamble
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40054 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-28 18:00:56 +00:00
Uwe Stöhr
62486d95e3 tex2lyx/preamble.cpp: prevent bug #7858 (that I accidentally introduced in r39988) and this way fix bug #7861 as side-effect
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40051 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-28 12:46:53 +00:00
Uwe Stöhr
11e727b977 backporting tex2lyx: forgot this in r40036
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40038 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-27 13:17:40 +00:00
Uwe Stöhr
0041e6e301 backporting tex2lyx: updates testfile
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40037 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-27 13:14:32 +00:00
Uwe Stöhr
5fc564c469 backporting tex2lyx: the support for rotated floats
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40036 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-27 13:13:43 +00:00
Uwe Stöhr
04eb1d59a2 backporting tex2lyx: the support for \href
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40033 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-27 12:49:29 +00:00
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
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
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
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
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
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
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
Richard Heck
502aebe800 Fix bug #7640: Importing underlined text fails in LyX 2.0
Just recognize \uline as a synonym or \underbar.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39183 a592a061-630c-0410-9148-cb99ea01b6c8
2011-06-21 15:35:04 +00:00
Uwe Stöhr
d7e88ea7e0 revert r38758 as discussed in http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg169087.html
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@38767 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-15 17:14:31 +00:00
Uwe Stöhr
9eb6b3b8ac backport CMake efforts to branch to be able to compile LyX 2.0.x the same way as trunk
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@38758 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-14 21:35:36 +00:00
Georg Baum
6da499d3f6 Small improvement for bug #7509 as suggested by JMarc
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@38643 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-08 15:40:45 +00:00
Georg Baum
95d2b2f082 Fix bug #7402. Many thanks to Vincent who found the wrong revision.
Read the comment of odocstream in src/support/docstream.h if you want to 
know why this fix is correct.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38335 a592a061-630c-0410-9148-cb99ea01b6c8
2011-04-11 20:11:27 +00:00
Peter Kümmel
1bd35e75f7 just to be sure: don't know if other compilers mangle the access
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38093 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-28 07:10:40 +00:00
Peter Kümmel
2874889b9b fix msvc linker error: for the linker struct and class isn't the same here
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38092 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-28 07:06:20 +00:00
Enrico Forestieri
a99340cd10 Infrastructure for choosing different icon sets. This currently works
through the rc setting \icon_set. Preferences dialog will follow shortly.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38038 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-25 01:59:34 +00:00
Georg Baum
a750126b54 prevent endless loop
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37744 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-20 18:57:13 +00:00
Georg Baum
4ec822909f Fix bug #7306
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37731 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-18 20:55:50 +00:00
Georg Baum
29ee44e84c LyX does not support optional arguments of ref commands
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37730 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-18 20:39:58 +00:00