Commit Graph

838 Commits

Author SHA1 Message Date
Georg Baum
4f6579e9d3 Update tex2lyx to file format 427. InsetIPA is not yet supported, but the
produced output is valid format 427.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40903 a592a061-630c-0410-9148-cb99ea01b6c8
2012-03-10 11:53:47 +00:00
Uwe Stöhr
408728aed9 tex2lyx: support for inline listings (fixes last part of #8066)
OK also for branch?

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40860 a592a061-630c-0410-9148-cb99ea01b6c8
2012-03-05 22:04:22 +00:00
Uwe Stöhr
1a5891e1fd tex2lyx/text.cpp: don't parse catBegin in verbatim environments
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40859 a592a061-630c-0410-9148-cb99ea01b6c8
2012-03-05 21:04:21 +00:00
Uwe Stöhr
9c5a8b3224 tex2lyx/text.cpp: clarify a comment and add a question
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40857 a592a061-630c-0410-9148-cb99ea01b6c8
2012-03-05 01:51:19 +00:00
Uwe Stöhr
80d0710422 - text.cpp: full tex2lyx support for lstlisting (support for \lstinline will follow soon)
- test/test-insets.tex: add a more advanced examples

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40856 a592a061-630c-0410-9148-cb99ea01b6c8
2012-03-05 01:45:14 +00:00
Uwe Stöhr
b2a03f4e67 tex2lyx/text.cpp: whitespace fixes
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40853 a592a061-630c-0410-9148-cb99ea01b6c8
2012-03-04 14:18:33 +00:00
Uwe Stöhr
06d9238f30 test/test-insets.tex: add examples for listings
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40852 a592a061-630c-0410-9148-cb99ea01b6c8
2012-03-04 14:06:13 +00:00
Uwe Stöhr
df95041141 - text.cpp: - fix tex2lyx parsing of verbatim environments
- Parser.cpp: - new function to parse verbatim environments
- test/test-structure.tex: updated example

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40850 a592a061-630c-0410-9148-cb99ea01b6c8
2012-03-04 13:27:53 +00:00
Georg Baum
c2748157bb Fix parsing of \sindex{stuff} and \sindex[]{stuff}
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40826 a592a061-630c-0410-9148-cb99ea01b6c8
2012-03-01 20:37:34 +00:00
Uwe Stöhr
0d165bf5d6 tex2lyx/text.cpp: a fix and a clarification
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40813 a592a061-630c-0410-9148-cb99ea01b6c8
2012-02-29 22:39:21 +00:00
Georg Baum
190ab4774d Import \sindex correctly
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40804 a592a061-630c-0410-9148-cb99ea01b6c8
2012-02-28 20:34:50 +00:00
Uwe Stöhr
8bca3e510f - text.cpp: escape backslashes in verbatim, fix a thinko
- test-structure.tex: add verbatim testcase

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40798 a592a061-630c-0410-9148-cb99ea01b6c8
2012-02-27 00:55:57 +00:00
Uwe Stöhr
05446b232f support for verbatim: step 2: tex2lyx support
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40785 a592a061-630c-0410-9148-cb99ea01b6c8
2012-02-20 23:38:13 +00:00
Jean-Marc Lasgouttes
586e0e6b8a Set use_non_tex_fonts buffer parameter and default encoding correctly when we detect that xetex or luatex is used.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40765 a592a061-630c-0410-9148-cb99ea01b6c8
2012-02-16 10:40:02 +00:00
Julien Rioux
a99960cc04 Update tex2lyx to format 424.
The type of citation engine is determined by the citation package
being used and, in the case of natbib, its options.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40593 a592a061-630c-0410-9148-cb99ea01b6c8
2012-01-09 13:16:41 +00:00
Georg Baum
db9e633b7f Fix bug #5906 (missing -p command) by updating the man page.
tex2lyx does not need a -p command since it detects partial files automatically.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40591 a592a061-630c-0410-9148-cb99ea01b6c8
2012-01-08 17:38:48 +00:00
Georg Baum
6332326cf6 Load mathtools.sty automatically (bug #7949) and make lyx2lyx reversion
more robust.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40574 a592a061-630c-0410-9148-cb99ea01b6c8
2012-01-05 20:53:48 +00:00
Georg Baum
bf3f3f9816 Second step towards a more generic package off/auto/on handling:
File format change


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40563 a592a061-630c-0410-9148-cb99ea01b6c8
2012-01-03 21:26:09 +00:00
Georg Baum
efa0f19836 More sensible longtable caption handling (needed for bug #7412)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40522 a592a061-630c-0410-9148-cb99ea01b6c8
2011-12-18 21:27:17 +00:00
Julien Rioux
e6051e1559 Update tex2lyx to format 420. Determine the default style
from the citation package being used or from a \bibliographystyle
command in the preamble, if any>

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40499 a592a061-630c-0410-9148-cb99ea01b6c8
2011-12-14 01:11:18 +00:00
Julien Rioux
9a101c7bef Remove extra whitespace.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40498 a592a061-630c-0410-9148-cb99ea01b6c8
2011-12-14 01:08:54 +00:00
Julien Rioux
3c41715774 Remove extra whitespace.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40497 a592a061-630c-0410-9148-cb99ea01b6c8
2011-12-14 00:20:41 +00:00
Georg Baum
9b8773826c do not hardcode packages loaded by external insets
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40491 a592a061-630c-0410-9148-cb99ea01b6c8
2011-12-13 19:40:05 +00:00
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
Georg Baum
18d18f1b8c First step towards proper handling of partially supported packages:
Convert the preamble code into a class.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40090 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-30 12:47:45 +00:00
Uwe Stöhr
73d292be90 tex2lyx/preamble.cpp: add a note
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40074 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-29 21:20:09 +00:00
Uwe Stöhr
5666b903ba tex2lyx/preamble.cpp: sorting and add a comment
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40066 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-29 20:11:21 +00:00
Uwe Stöhr
a493847599 tex2lyx/preamble.cpp: fix bug #7863
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40065 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-29 20:03:09 +00:00
Uwe Stöhr
709e428fad tex2lyx: fix for documents using Latvian, Lithuanian, Mongolian, Turkmen and/or Vietnamese fixes bug #7862
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40064 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-29 19:32:09 +00:00
Uwe Stöhr
2bf4494dc4 tex2lyx/preamble.cpp: correct a whitespace mistake I just introduced
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40052 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-28 12:49:12 +00:00
Uwe Stöhr
b8a8d5052f tex2lyx/preamble.cpp: fix bug #7861 and #7858
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40050 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-28 12:37:59 +00:00
Uwe Stöhr
a3e5f3cd47 - tex2lyx/text.cpp: a fix for subfloat support
- tex2lyx: some testfile tweaks

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40035 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-27 13:00:09 +00:00
Uwe Stöhr
51790e6321 tex2lyx: support for subfloats
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40025 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-27 02:29:03 +00:00
Uwe Stöhr
be3e3a3b22 tex2lyx/test/test-structure.tex:
- update preamble to the features used in the file
- add some floats

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40024 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-27 02:27:42 +00:00
Uwe Stöhr
e9bf232397 tex2lyx/TODO.txt: this feature is also covered by r40020
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40023 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-27 02:24:24 +00:00
Uwe Stöhr
3d1cace2bc tex2lyx: support for wrapped floats and all their possible options
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40020 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-26 20:53:18 +00:00
Uwe Stöhr
f397989137 tex2lyx/preamble.cpp: revert r39962 (the string initialization was already reverted)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40019 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-26 19:53:29 +00:00
Vincent van Ravesteijn
042d0118ae Constify some variables in tex2lyx
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40013 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-26 14:04:22 +00:00
Uwe Stöhr
dc7a53aeb4 tex2lyx/text.cpp: fix 2 typos
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40012 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-26 13:37:32 +00:00
Uwe Stöhr
e8c0344791 tex2lyx: support for hyperlinks
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40005 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-26 05:02:37 +00:00
Uwe Stöhr
f68b287be6 tex2lyx/text.cpp: code simplification
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40004 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-26 04:14:45 +00:00
Uwe Stöhr
df95c6273d tex2lyx: support for sideway floats including their starred (wide) counterparts
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40003 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-26 03:23:31 +00:00
Uwe Stöhr
c55326048a tex2lyx: add strike-outs etc. to the TeX testfile
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40002 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-26 02:46:26 +00:00
Uwe Stöhr
6dccac85ce tex2lyx: fix problem that non-empty \date in the preamble would be lost
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39994 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-26 01:29:24 +00:00
Uwe Stöhr
0cd0f955fb tex2lyx: addendum to r39989; support for basic (predefined) colors; useful for things like \color{green}
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39991 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-26 01:18:27 +00:00
Uwe Stöhr
7be5a98e1d tex2lyx: testfiles: the spaces are already in box-color-size-space-align.tex
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39990 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-26 01:16:19 +00:00
Uwe Stöhr
e9d2c866b4 tex2lyx: addendum to r39949; handle the case that LyX's defined colors are defined but not used, now it is assures that only the color is used that is actually used for \color and \pagecolor
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39989 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-26 00:31:02 +00:00
Uwe Stöhr
fc75fcafbd tex2lyx: fix a typo and a whitespace
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39987 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-25 23:34:59 +00:00
Uwe Stöhr
e2d9adadaa tex2lyx: fix bug #7856
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39983 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-25 23:17:24 +00:00
Uwe Stöhr
d1d597d9cf tex2lyx: support for beraserif.sty
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39979 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-25 22:37:16 +00:00
Uwe Stöhr
2de511d90c TODO.txt: restore an entry
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39978 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-25 22:24:06 +00:00
Georg Baum
2736d09656 Adjust comment (thanks Jose)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39976 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-25 20:02:59 +00:00
Uwe Stöhr
01f9794b50 tex2lyx: addendum to r39964, although utopia.sty is outdated and even listed in l2tabu, users might use it anyway and supporting it doesn't harm
(info I missed in r39965: beraserif.sty does not exist on CTAN, Bera's sansserif is named "berasans" and is already supported by tex2lyx)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39968 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-25 17:44:55 +00:00
Uwe Stöhr
05a59595e8 tex2lyx: support for different language packages: none, babel or a custom one
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39967 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-25 17:30:27 +00:00
Uwe Stöhr
c5f5d559fb tex2lyx: nothing to do for the new math spaces as shown by the updated TeX testfile
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39966 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-25 16:47:31 +00:00
Uwe Stöhr
bd42b9f25a tex2lyx: support for chancery and ccfonts
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39965 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-25 16:25:37 +00:00
Uwe Stöhr
999222b0c2 tex2lyx: fix handling of fourier: Utopia as roman font can be combined with any other tt font, not only with tt-fourier
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39964 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-25 15:54:53 +00:00
Uwe Stöhr
ad8c0df251 tex2lyx/preamble.cpp: correct a mistake from previous commit
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39963 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-25 15:43:11 +00:00
Uwe Stöhr
80523bbe07 tex2lyx: adapt handling of \fontencoding to LyX 2.x's syntax
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39962 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-25 15:39:50 +00:00
Uwe Stöhr
ff9deb53f1 tex2lyx/TODO.txt: columnsep is already supported
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39961 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-25 15:23:28 +00:00
Uwe Stöhr
8f2791ed20 tex2lyx: support width setting of \printnomenclature
(the tex2lyx support in branch for \printnomenclature is currently broken so this must be backported to branch for 2.0.2, OK Richard?)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39960 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-25 00:11:02 +00:00
Uwe Stöhr
46e4463066 tex2lyx: support for phantom insets
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39958 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-24 22:39:54 +00:00
Uwe Stöhr
8ed06703aa tex2lyx: support for the LaTeX command \rule
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39957 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-24 21:07:00 +00:00
Uwe Stöhr
5e38d7ff26 tex2lyx: fix bug #7845
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39954 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-24 02:22:35 +00:00
Uwe Stöhr
3b6c927814 tex2lyx/TODO.txt: add a note
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39953 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-24 02:21:47 +00:00
Uwe Stöhr
45bdfb2fe8 test-structure.tex: forgot this testcase in last commit
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39952 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-24 02:14:43 +00:00
Uwe Stöhr
483891b7cf tex2lyx: support the case that \date{} is used in the preamble to suppress the date
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39951 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-24 02:06:05 +00:00
Uwe Stöhr
0c1c13bbd0 tex2lyx: roundtrip support for the suppress_date option, for the remaining part I opened bug #7844
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39950 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-24 01:17:30 +00:00
Uwe Stöhr
2a8dcf2b10 tex2lyx:
- support for box background color, document fontcolor and background color (note_fontcolor was already supported)
- add colors and a nested box to the testfile

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39949 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-24 00:29:59 +00:00
Georg Baum
5247de506c Import \textvisiblespace, \negmedspace and \negthickspace.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39942 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-23 11:16:11 +00:00
Georg Baum
3d373d9135 Was already supported
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39940 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-23 11:08:37 +00:00
Georg Baum
c697b2ee2c All encodings of lib/encodings are already supported if they are supported by inputenc
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39938 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-23 11:02:50 +00:00
Georg Baum
c5c04954f3 Import \uuline, \uwave and \sout
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39937 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-23 10:58:05 +00:00
Georg Baum
b62d8f2c6a Tie file formats of LyX and tex2lyx, since there are implicit depencies anyway.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39936 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-23 10:29:21 +00:00
Georg Baum
34a033b20a Increase tex2lyx output format to 416 (current trunk format).
414: Nothing to do (empty lyx2lyx conversion)
415: Added \use_undertilde preamble parameter
416: Nothing to do (empty lyx2lyx conversion)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39935 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-23 10:11:39 +00:00
Georg Baum
5fc072a079 Support fontenc options in tex2lyx
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39926 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-22 19:54:31 +00:00
Georg Baum
9ce23fd5c2 More paper sizes for tex2lyx
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39925 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-22 19:37:10 +00:00
Georg Baum
f7cfdc48a5 Increase tex2lyx output format to 413 (LyX 2.0.x).
411: Added \language_package preamble parameter
412: Nothing to do (empty lyx2lyx conversion)
413: Added \html_css_as_file preamble parameter


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39924 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-22 19:27:46 +00:00
Georg Baum
436a0c13a5 Increase tex2lyx output format to 410.
406: Convert noweb layouts to new syntax (untested, see bug #7838)
407: Nothing to do (empty lyx2lyx conversion)
408: Activated the already existing script inset code
409: Nothing to do (tex2lyx does not support XeTeX)
410: Nothing to do (the old code already used the new layouts)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39923 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-22 19:09:56 +00:00
Georg Baum
544f5033bf Increase tex2lyx output format to 405.
402: Nothing to do (tex2lyx does not support bibtotoc)
403: Nothing to do (the old code already used the new layouts, bug #7780)
404: Nothing to do (write new prettyref syntax)
405: Nothing to do (empty lyx2lyx conversion)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39920 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-22 17:25:34 +00:00
Georg Baum
5bfba3e564 Increase tex2lyx output format to 401.
400: Convert \lyxline to new InsetLine syntax
401: Nothing to do (empty lyx2lyx conversion)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39919 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-22 16:58:32 +00:00
Georg Baum
997ca078bf Increase tex2lyx output format to 399.
399: Added \use_mathdots preamble parameter


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39917 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-22 11:17:57 +00:00
Georg Baum
ce4c8e64ee Increase tex2lyx output format to 398.
394: Added use_makebox parameter to InsetBox
395: Nothing to do (empty lyx2lyx conversion)
396: Nothing to do (empty lyx2lyx conversion)
397: Nothing to do (tex2lyx does not support nameref)
398: Nothing to do (empty lyx2lyx conversion)



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39916 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-22 11:11:50 +00:00
Georg Baum
16935917de Increase tex2lyx output format to 393.
389: Nothing to do (html output changes)
390: Nothing to do (empty lyx2lyx conversion)
391: Nothing to do (empty lyx2lyx conversion)
392: Activated already prepared required arguments code
393: Renamed OptArg inset to Argument


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39915 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-22 10:59:39 +00:00
Georg Baum
a1030cc599 Increase tex2lyx output format to 388.
379: Nothing to do (html output changes)
380: Nothing to do (empty lyx2lyx conversion)
381: Nothing to do (empty lyx2lyx conversion)
382: Activated already prepared notefontcolor code
383: Nothing to do (empty lyx2lyx conversion)
384: Nothing to do (empty lyx2lyx conversion)
385: Nothing to do (empty lyx2lyx conversion)
386: Nothing to do (empty lyx2lyx conversion)
387: Nothing to do (empty lyx2lyx conversion)
388: Nothing to do (empty lyx2lyx conversion)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39912 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-21 21:11:37 +00:00
Georg Baum
81505cc5a3 Increase tex2lyx output format to 378.
369: Nothing to do (empty lyx2lyx conversion)
370: Nothing to do (empty lyx2lyx conversion)
371: Added \use_mhchem parameter
372: Nothing to do (empty lyx2lyx conversion)
373: Nothing to do (the old version was wrong since it used the new g-brief
     layout files with the old file format)
374: Nothing to do (html output changes)
375: Nothing to do (empty lyx2lyx conversion)
376: Nothing to do (empty lyx2lyx conversion)
377: Nothing to do (empty lyx2lyx conversion)
378: Nothing to do (empty lyx2lyx conversion)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39911 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-21 20:18:49 +00:00
Georg Baum
081fb1c4d8 Increase tex2lyx output format to 368.
357: Added comment about \underbar and \ulem
358: Nothing to do (empty lyx2lyx conversion)
359: Nothing to do (empty lyx2lyx conversion)
360: Nothing to do (empty lyx2lyx conversion)
361: Nothing to do (empty lyx2lyx conversion)
362: Nothing to do (empty lyx2lyx conversion)
363: Nothing to do (empty lyx2lyx conversion)
364: Nothing to do (empty lyx2lyx conversion)
365: Nothing to do (empty lyx2lyx conversion)
366: Nothing to do (empty lyx2lyx conversion)
367: Nothing to do (empty lyx2lyx conversion)
368: Nothing to do (empty lyx2lyx conversion)



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39910 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-21 19:57:03 +00:00
Georg Baum
beb87874e9 that was wrong
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39898 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-20 20:55:25 +00:00
Georg Baum
024bd206af Increase tex2lyx output format to 356.
352: New syntax for InsetIndex and printindex command inset
353: Nothing to do (empty lyx2lyx conversion)
354: Nothing to do (empty lyx2lyx conversion)
355: Nothing to do (empty lyx2lyx conversion)
356: Nothing to do (empty lyx2lyx conversion)



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39897 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-20 20:52:19 +00:00
Georg Baum
ac166e196d Increase tex2lyx output format to 351.
346: Nothing to do (swiss german is not supported by babel/polyglossia)
347: Nothing to do (empty lyx2lyx conversion)
348: Nothing to do (empty lyx2lyx conversion)
349: Nothing to do (empty lyx2lyx conversion)
350: Nothing to do (empty lyx2lyx conversion)
351: Nothing to do (empty lyx2lyx conversion)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39896 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-20 20:16:37 +00:00
Georg Baum
d267511d42 Fix bug #7468 (at least for standard environments).
List environments (as the one in the bug report) can't
be handled correctly in tex2lyx as long as LyX does not allow contents
after the environment start but before the first \item.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39871 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-16 19:57:10 +00:00
Abdelrazak Younes
27f3327fa1 tex2lyx: disambiguate duplicate trim() function by reusing trim() from src/support.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39870 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-16 08:22:20 +00:00
Julien Rioux
23ab7f0819 tex2lyx : Also allow -h and -v command-line options, manpage update.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39807 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-06 16:21:58 +00:00
Julien Rioux
18f79eeddc tex2lyx : More descriptive --help message and implement --version (#6827).
The init_package before easyParse is necessary to initiate the default
values for userdir and sysdir, which are now part of the help message.
This step would be necessary anyway if we ever internationalize tex2lyx.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39799 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-03 17:47:37 +00:00
Kornel Benko
3004722131 Add framework AppKit to cmake as in the automake case (MAC only)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39798 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-03 16:49:06 +00:00
Stephan Witt
3c846d98ac to succesfully link lyx on mac the AppKit framework is needed only
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39791 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-30 16:05:46 +00:00
Jean-Marc Lasgouttes
9e53e98b05 Link against Cocoa and/or Carbon for Mac OS X. This is needed for autoOpen and Linkback.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39772 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-27 07:27:19 +00:00
Jean-Marc Lasgouttes
79fb39058c 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/trunk@39182 a592a061-630c-0410-9148-cb99ea01b6c8
2011-06-21 13:24:26 +00:00
Peter Kümmel
41a0adcb47 cmake: build a .dmg file on Mac, looks not as nice as the official installer but it runs
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38765 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-15 13:21:18 +00:00
Peter Kümmel
1af61e659c run in-place: don't speculate where the lyx binary is, search for it at the common places
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38753 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-14 12:26:11 +00:00
Peter Kümmel
eef204ca33 cmake on mac: also build with LYX_NLS=0
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38733 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-12 22:06:06 +00:00
Kornel Benko
5c1666c0e1 In colaboration with Stephan Witt, adapted to our libintl to MAC
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38695 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-10 19:18:44 +00:00
Peter Kümmel
897edc10c0 cmake: move CMakeLists.txt into source dir (multiple steps)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38691 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-10 17:44:41 +00:00
Georg Baum
12f8e7a6f9 Small improvement for bug #7509 as suggested by JMarc
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38628 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-08 08:23:42 +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
Enrico Forestieri
d866717ef7 Integrate texrow with otexstream in order to perform automatic line
counting when exporting to latex. This is done for the code comprised
between \begin{document} and \end{document}, while the preamble code
still needs manual calls to TexRow::newline() for registering new lines.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37584 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-10 20:02:48 +00:00
Georg Baum
9b4ee44620 Improve roundtrip of Customization.lyx:
The lstlistings environment is no longer be unknown.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37355 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-28 21:20:48 +00:00
Georg Baum
b2e1eb0dda Clean up parsing of optional arguments:
If an optional argument can be followed by another one, we need to use
getFullOpt(). Otherwise it would not be possible to parse \foo[][bar].
Remove getOptContent to avoid confusion (it does exactly the same as
getArg('[', ']') which is used in most places.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37354 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-28 20:29:06 +00:00
Georg Baum
d3c385de20 Next step towards a working roundtrip of files generated by LyX:
Try to recognize modules.
Again, this is needed because the complete LyX preamble is ignored.
It is not possible to recognize a module in all cases, but at least the simple
ones are handled now. As a prerequisite I also had to revive the filling of
known_environments. This has been removed (probably by accident) some time ago.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37306 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-23 21:10:20 +00:00
Georg Baum
87944eedc7 The roundtrip of the math manual produces a compilable document now:
- translate the arguments of \texorpdfstring, so that the floating footnote
  code gets enabled
- honor the ForcePlainLayout flag of insets like the Index inset
- remove hardcoded \url support, this is handled by the general Flex inset code


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37297 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-22 12:00:33 +00:00
Georg Baum
85d2c53532 handle commands from xargs.sty correctly
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37289 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-21 21:21:58 +00:00
Georg Baum
c0778a3d0e Translate all known box insets. This is needed since the super-clever preamble
parser discards all needed packages like calc.sty or framed.sty, so the
resulting document would be uncompilable with those boxes as ERT.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37287 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-21 18:29:10 +00:00
Georg Baum
7a74bbf06b Ignore \protect if it is directly in front of \LyX{} (otherwise it would
accumulate for each round trip, since LyX  writes \protect if needed)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37214 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-14 20:06:15 +00:00
Georg Baum
cfd6767ec1 Import notefontcolor (one more step towards a working roundtrip for the LyX documentation)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37213 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-14 20:00:55 +00:00
Georg Baum
7c83f74f26 Exclude more conditional commands from preamble parsing:
LyX would output the parsed stuff unconditionally, so we must not translate
it in LyX document settings.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37191 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-12 22:03:15 +00:00
Georg Baum
b8d6c10e6c add list of missing tex2lyx features
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37189 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-12 21:19:01 +00:00
Georg Baum
acd57ccaaf Fix language handling in tex2lyx:
- Add missing babel synonyms (taken from a standard TeXLive 2010 install).
  Some synonyms might still be missing (if they are defined not by babel
  itself, but additional packages). Adding these is now simple: Only
  known_languages and known_coded_languages need to be touched.
- Translate babel language name arguments of \foreignlanguage and
  \selectlanguage to LyX names.
- Translate second argument of \foreignlanguage to LyX.
- Cleanup mixed language names in the preamble parser: Now all checks are
  done with LyX names, not a mix of babel and LyX names. This sets correct
  quotes even if the language as given as an alias.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37188 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-12 21:04:39 +00:00
Georg Baum
f49a526afc Parse Flex insets defined in the layout. This is needed e.g. for
lib/doc/Math.lyx, since tex2lyx swallows the LyX part of the preamble, and
thus \shortcut would not be defined.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37149 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-07 21:04:16 +00:00
Georg Baum
f8f69ca920 math macros do not understand \newcommand* and \renewcommand*
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37148 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-07 20:21:10 +00:00
Georg Baum
6ead3daac9 Fix invalid \size output with no active layout before sectioning environments.
Fix missing \size reset after sectioning environments.
Fix invalid \lang default (use english instead, as in the preamble)
Convert hard coded layout output of caption insets to Context class.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37147 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-07 19:58:31 +00:00
Georg Baum
9ac7fa483d Fix misparsing of \usepackage in
\@ifundefined{textcolor}{\usepackage{color}}{}


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37140 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-06 21:38:26 +00:00
Georg Baum
416d19ff84 hyperref support for tex2lyx
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37138 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-06 20:57:16 +00:00
Georg Baum
006a906858 forgot to declare debugToken() in r37117
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37133 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-06 18:36:03 +00:00
Georg Baum
0f3c4c2f04 Fix several false errors "stray '}' in text" that were caused by
misinterpreting "\}" as "}" when it occured inside a pair of unescaped
braces, like in "\code{@\{*\}r||p\{1in\}@\{*\}}".
The reason for this bug is that Token::character() behaves differently in
tex2lyx than in mathed. See the comment in Parser.h for a more general fix.
For now I played on the safe side and only changed those places where I
definitely know that the old code was wrong.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37117 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-05 20:32:45 +00:00
Georg Baum
8b2ea705df Fix wrong setting of bibinset options if \cite{*} was found.
Improve heuristic for outputting \bibliographystyle: Now it is suppressed
if \bibliography follows immediately, since LyX adds it automatically in that
case.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37066 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-02 18:16:23 +00:00
Georg Baum
5c53dcf88f tex2lyx: Do not swallow a user defined \parindent
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37065 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-02 16:54:58 +00:00
Georg Baum
812c27d793 Improve tex2lyx roundtrip of test-insets.tex:
- Replace special verbatim commands by standard LaTeX, since it would be
  extremely difficult to make tex2lyx understand them)
- Comment duplicated \bibliography{xampl}, since LaTeX cannot handle two
  \bibliography calls
- Fix a regression with spaces after commands, introduced in r36943
- Parse \multicolumn with space/comments between two arguments correctly
- Parse optional arguments correctly if there are space or comments between
  the command and the argument
- Remove duplicate "LyX" phrase handling (I overlooked that in r37052)
- Add new commands created with \let to the list of known commands. This is
  needed to parse the arguments correctly


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37064 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-02 15:39:48 +00:00
Georg Baum
ef10797f59 Also prevent replacement of LyX => \LyX{} if it is part of a word.
The automatic replacement in LyX is pretty broken (see bug 4752).


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37055 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-31 11:59:33 +00:00
Georg Baum
bce18bacfc partial man page update (it is still horribly outdated)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37054 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-31 11:57:25 +00:00
Uwe Stöhr
73cdd2547e tex2lyx/preamble.cpp: support for
- polytonic Greek
- Mongolian
- Mexican Spanish

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37053 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-31 07:31:59 +00:00
Georg Baum
3403727940 Translate "\LyX{}" and "LyX" correctly in tex2lyx
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37052 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-30 21:56:55 +00:00
Georg Baum
05bd78904a Fix translation of \pagebreak and \linebreak with optional arguments.
Please don't add new features to tex2lyx without testing.
In this case, the test case was even provided in test-insets.tex.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37051 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-30 21:03:36 +00:00
Georg Baum
d6ccb86f15 fix translation of \nobreakdash in tex2lyx
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37050 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-30 20:38:47 +00:00
Georg Baum
90f795a29e Add -roundtrip argument to tex2lyx for tex->lyx->tex roundtrip testing.
The reasons for doing this in tex2lyx instead of an external script are:
- Correct choice of latex/pdflatex export
- Using the correct LyX executable regardless of running inplace or from an
  installation, or with or without version suffix


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37049 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-30 20:29:33 +00:00
Georg Baum
3cdb7d3062 fix parsing of test document
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37017 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-27 21:12:40 +00:00
Georg Baum
84be0a0db4 fix parsing of \let: tex2lyx must not enclose the arguments with {}.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37016 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-27 20:15:24 +00:00
Georg Baum
8f037c8e91 Increase tex2lyx output format to 345 (LyX 1.6.x).
344: Remove pdf_pagebackref header flag
345: Nothing to do (this is a docbook-only change)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37015 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-27 18:19:19 +00:00
Georg Baum
32d435e150 Increase tex2lyx output format to 343.
343: Write the use_default_options header flag


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37014 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-27 18:16:22 +00:00
Georg Baum
4a54c581a2 Increase tex2lyx output format to 342.
335:     Create space inset in new syntax
336:     Nothing to do (empty lyx2lyx conversion)
337:     Nothing to do (tex2lyx does use the display flag)
338-339: Nothing to do (empty lyx2lyx conversion)
340:     Nothing to do (tex2lyx does not output empty layout names)
341-342: Nothing to do (empty lyx2lyx conversion)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37013 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-27 18:14:55 +00:00
Georg Baum
5247a0ed1c Increase tex2lyx output format to 334.
331:     Set the caption flag for longtable caption rows
332:     Nothing to do (empty lyx2lyx conversion)
333:     Nothing to do (tex2lyx did already use the new style names because it
         uses the current layout files)
334:     Nothing to do (tex2lyx did already produce the new format, since it
         used the LaTeX paper names also in the output and did not suffer from
	 bug 4868)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37012 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-27 18:10:23 +00:00
Georg Baum
6da25359f0 Increase tex2lyx output format to 330.
324:     Create newline inset in new syntax
325:     Nothing to do (tex2lyx does not support the japanese language)
326-327: Nothing to do (empty lyx2lyx conversion)
328:     Nothing to do (tex2lyx did never support embedding of files)
329-330: Nothing to do (empty lyx2lyx conversion)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37011 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-27 18:03:26 +00:00
Georg Baum
6639d78601 Increase tex2lyx output format to 323.
323: Create newpage inset in new syntax


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37010 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-27 17:58:36 +00:00
Georg Baum
e4efa00f8c Increase tex2lyx output format to 322.
321: Move leftlines/rightlines from column headers to cells
322: Nothing to do (tex2lyx does not produce plain layouts)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37009 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-27 17:56:48 +00:00
Georg Baum
94160f97c0 adjust xfig conversion to newer xfig as suggested by Jean-Pierre at
http://www.lyx.org/trac/ticket/3016#comment:6


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36972 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-20 21:35:08 +00:00
Georg Baum
77a8eb9288 fix bug #7189 (this worked originally, but after fixing protected \hfill I
forgot to recheck \hspace)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36971 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-20 20:45:18 +00:00