Uwe Stöhr
6682ae0d90
tex2lyx/text.cpp: remove development residue
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40481 a592a061-630c-0410-9148-cb99ea01b6c8
2011-12-11 23:20:23 +00:00
Uwe Stöhr
2cc4d6ae25
tex2lyx/text.cpp: add a missing ',' and use LyX's method to remove the file extension (thanks Georg)
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40480 a592a061-630c-0410-9148-cb99ea01b6c8
2011-12-11 23:17:02 +00:00
Uwe Stöhr
fe8c185a6e
support for Australian and Newzealand as document language; fileformat change
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40452 a592a061-630c-0410-9148-cb99ea01b6c8
2011-12-08 23:58:30 +00:00
Georg Baum
bb0432d74a
Beautify output of \usepckage statements (each statement is on its own line
...
now) and move more packages to the new exclude mechanism.
The remaining ones are not so easy.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40442 a592a061-630c-0410-9148-cb99ea01b6c8
2011-12-08 20:05:51 +00:00
Uwe Stöhr
b947a8eea1
tex2lyx/text.cpp: a method to fix #7897
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40431 a592a061-630c-0410-9148-cb99ea01b6c8
2011-12-07 22:48:44 +00:00
Richard Heck
cad2ffea44
Update tex2lyx to format 418. Nothing really to do other than write
...
what we expect to see.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40430 a592a061-630c-0410-9148-cb99ea01b6c8
2011-12-07 22:46:15 +00:00
Richard Heck
5d2d5e8ad5
Revert unintentional commit.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40429 a592a061-630c-0410-9148-cb99ea01b6c8
2011-12-07 22:44:21 +00:00
Richard Heck
8ba08a53b2
Update all layouts to format 36.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40428 a592a061-630c-0410-9148-cb99ea01b6c8
2011-12-07 22:41:38 +00:00
Uwe Stöhr
75cbb27e5c
tex2lyx Preamble.cpp, text.cpp: fix #7845 also for spreadsheet template
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40424 a592a061-630c-0410-9148-cb99ea01b6c8
2011-12-07 21:21:22 +00:00
Vincent van Ravesteijn
0b790c05b8
CMake/Win32: Add an icon to the tex2lyx executable.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40375 a592a061-630c-0410-9148-cb99ea01b6c8
2011-12-05 12:29:24 +00:00
Uwe Stöhr
faaccd6605
tex2lyx: support for pdfpages
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40368 a592a061-630c-0410-9148-cb99ea01b6c8
2011-12-05 00:57:42 +00:00
Georg Baum
169bc143cb
fix parsing of \def macros (was broken with the spreadsheet template support)
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40363 a592a061-630c-0410-9148-cb99ea01b6c8
2011-12-04 16:00:00 +00:00
Georg Baum
07b2ffa469
fix preamble output in case child docs are present
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40362 a592a061-630c-0410-9148-cb99ea01b6c8
2011-12-04 15:35:59 +00:00
Georg Baum
528c984a57
Improve longtable import (part of bug #7412 ).
...
A complete fix is currently impossible because LyX assumes that all longtable
captions are in the first head.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40361 a592a061-630c-0410-9148-cb99ea01b6c8
2011-12-04 09:35:16 +00:00
Georg Baum
5a525d932f
Move some more packages from unconditionally swallowing to the package
...
registration mechanism, so that they are only swallowed if LyX will load them.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40315 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-29 20:09:40 +00:00
Georg Baum
529a018bc3
Fix parsing of stuff with ] in \item arguments (part of bug #6127 )
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40295 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-27 13:29:56 +00:00
Georg Baum
76c5902b40
Parse the picture variant of \framebox correctly (part of bug #6449 )
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40294 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-27 11:57:47 +00:00
Uwe Stöhr
2906a35663
tex2lyx: support for Spreadsheet and chess external templates
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40270 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-25 01:01:45 +00:00
Georg Baum
76e90badc0
Beautify documents created by writer2latex (see bug #5187 ).
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40235 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-20 20:30:12 +00:00
Georg Baum
3f8a615477
Fix bug in paragraph detection (can be seen in test case of bug #5187 ):
...
If we want to look at the token after the next token, it may be needed
to call tokenize_one() twice and not only once as done in good().
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40234 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-20 20:28:55 +00:00
Georg Baum
0d28af3fba
make a bit room for more ifs
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40225 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-20 17:03:00 +00:00
Georg Baum
76731046f0
Fix bug #7895 : Do not output lines with only a single space.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40193 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-14 21:00:47 +00:00
Uwe Stöhr
966d76f86b
tex2lyx/test/test-insets.tex: add a booktabs test table
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40192 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-14 00:13:09 +00:00
Georg Baum
f077658248
Fix bug #4553 : booktabs for tex2lyx
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40189 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-13 19:49:50 +00:00
Georg Baum
a1cef2d55a
Fix bug #3036 : font changes inside \markright do not escape outside their scope
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40186 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-13 16:11:45 +00:00
Georg Baum
36f7ae1207
Do not swallow geometry settings if they are given as package options and
...
replace home made keyval parsing with the more robust process_keyval_opt().
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40185 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-13 12:23:27 +00:00
Georg Baum
8d707723b7
Fix bug #7668 (cosmetic whitespace issues)
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40184 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-13 11:29:48 +00:00
Georg Baum
2a216184c4
Fix bug #7663 : Misparsing of description \item with spaces
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40182 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-13 10:40:07 +00:00
Georg Baum
c8a715d855
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/trunk@40177 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-12 18:41:44 +00:00
Georg Baum
f441663600
tabular*
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40176 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-12 17:54:50 +00:00
Peter Kümmel
a1ce213291
add header guard
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40165 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-10 20:16:22 +00:00
Uwe Stöhr
ec0458ba01
tex2lyx/text.cpp: add a comment and fix a typo
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40152 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-06 22:46:30 +00:00
Uwe Stöhr
605e660d50
tex2lyx/test/box-color-size-space-align.tex: translation and a further testcase
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40151 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-06 22:42:51 +00:00
Uwe Stöhr
0fb02b561c
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/trunk@40150 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-06 22:42:05 +00:00
Georg Baum
a3360ac3c6
Import optional argument of tabular (vertical alignment)
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40147 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-06 18:54:15 +00:00
Georg Baum
eb882b2666
and another one
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40146 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-06 18:17:33 +00:00
Georg Baum
b4c6c95ad9
Forgot this in r40139.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40145 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-06 18:17:04 +00:00
Georg Baum
491bad7b00
Distinguish between empty argument and no argument
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40141 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-06 17:32:15 +00:00
Georg Baum
93d6ce915f
Must not output anything between p.pushPosition() and p.popPosition().
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40140 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-06 17:16:54 +00:00
Georg Baum
0dee3eff18
Fix bug #4213 : Change tracking support for tex2lyx.
...
Of course this will only work if output_changes was true when creating the
.tex file.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40139 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-06 17:03:59 +00:00
Uwe Stöhr
713c14b71d
tex2lyx/text.cpp: fix remaining part of bug #7843
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40136 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-06 15:06:19 +00:00
Georg Baum
7185c39fb1
\color may have an optional argument (part of bug #6567 ).
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40134 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-04 21:24:05 +00:00
Georg Baum
292d4e3d5d
Fix bug #7843 : Recognize a shaded box inside a minipage correctly.
...
Also a warning "\end{foo} does not match \begin{bar}" is gone.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40133 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-04 21:03:51 +00:00
Georg Baum
13241e5e56
Fix bug #7846
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40116 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-31 21:31:32 +00:00
Uwe Stöhr
0e49fd22ad
tex2lyx/Preamble.cpp: fix some comments
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40108 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-31 01:51:46 +00:00
Georg Baum
b436f71b33
Only the packages subscript and ulem if they are automatically loaded
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40097 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-30 18:51:41 +00:00
Georg Baum
f8cc30a1f2
Create mechanism to handle packages for which we only know after parsing
...
the complete document whether LyX will load them or not.
Use the mechanism for the color package (fixes the color part of bug #7845 ).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40095 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-30 18:12:49 +00:00
Georg Baum
3d3e1e58b1
Fix bug #7700 partially: The \maketitle command is not swallowed anymore,
...
but the title commands in the preamble are still not recognized.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40093 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-30 13:57:49 +00:00
Georg Baum
0d10ca7e6e
get rid of the modules_placeholder hack
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40092 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-30 13:44:00 +00:00
Georg Baum
c93c44bf64
Fix bug #7844 : \date{} in main text is recognized
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40091 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-30 13:21:06 +00:00