Commit Graph

167 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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