Commit Graph

406 Commits

Author SHA1 Message Date
Uwe Stöhr
a2022d457b tex2lyx: support bibtex inset with \phantomsection
This is an addendum to [72a44b3c/lyxgit] because depending on the environment, LyX adds a \phantomsection before \addcontentsline.

- also update the test file
2013-02-17 04:17:02 +01:00
Uwe Stöhr
a99241266b tex2lyx/Preamble.cpp: proper handling of the refstyle preamble code
- also rename the test file because it is also an excellent test file for the theorem environments - which are not yet supported by tex2lyx
2013-02-17 03:15:24 +01:00
Uwe Stöhr
ec09560cb8 tex2lyx: support for the \textipa inset 2013-02-17 02:11:54 +01:00
Georg Baum
d7013065ad Fix tex2lyx file format comparison
This is an important part of the tests. If updating the test cases is really a
problem there are two better solutions than not testing the format: Convert
the references with lyx2lyx on the fly, or remove the hard coupling of tex2lyx
and LyX versions again. Both increase additional possible error sources, but
these errors could at least be detected. If the test machinery is made blind
for versions, file format errors are impossible to detect.
2013-02-16 17:48:43 +01:00
Georg Baum
633aca9273 Update test case file format 2013-02-16 17:48:43 +01:00
Kornel Benko
fe24992a93 tex2lyx testing. Adapt files. 2013-02-16 10:49:34 +01:00
Uwe Stöhr
72a44b3c75 tex2lyx: support for \addcontentsline in BibTeX inset 2013-02-16 05:51:23 +01:00
Kornel Benko
f78c69b554 Adapt to corrected tex2lyx 2013-02-15 19:07:26 +01:00
Kornel Benko
df4003b232 Adapt test-insets.lyx.lyx to now correctly running tex2lyx.
Removed errocase.
2013-02-15 18:49:00 +01:00
Kornel Benko
f1102e8dd4 tex2lyx-tests: Adapt to changes for emty line in preamble 2013-02-11 09:43:10 +01:00
Uwe Stöhr
690d9b68f2 tex2lyx: add test for font settings 2013-02-11 00:49:20 +01:00
Kornel Benko
7333494c89 tex2lyx tests:
Corrected the tex2lyx check-file for test-refstyle-references.tex
2013-02-06 13:44:46 +01:00
Kornel Benko
55c2dc15fa tex2lyx tests:
1.) Remove empty layout 'Plain'
2.) Adapt to changed look of layout 'Verbatim'
2013-02-06 13:42:27 +01:00
Uwe Stöhr
f2eb5004de tex2lyx: adapt refstyle support aft the fix for bug #8536 2013-02-04 21:37:14 +01:00
Kornel Benko
83e2c45d83 Add test for verbatim environment in tex2lyx tests 2013-02-04 10:53:25 +01:00
Kornel Benko
9dbbe6a372 Add test-refstyle-references to cmake. Also added missing file test-refstyle-references.lyx.lyx 2013-02-04 08:36:18 +01:00
Uwe Stöhr
ede866f67a tex2lyx: test also for algorithm floats 2013-02-04 02:19:54 +01:00
Uwe Stöhr
49c887761a tex2lyx: support refstyle and its commands
fixes #4288
2013-02-04 01:41:56 +01:00
Uwe Stöhr
793dd3b9c0 tex2lyx: update fileformat of LyX files 2013-02-04 01:39:49 +01:00
Kornel Benko
e04523f77b Make change tracking in export to latex be independent of timezone 2013-01-07 15:46:47 +01:00
Kornel Benko
bd2468c341 Use program suffix to address lyx-executable, according to suffix
of tex2lyx.

Still the is error in tex2lyx, which searches for invalid suffix to
find the correct lyx executable.
2013-01-03 13:02:34 +01:00
Kornel Benko
4ff3e14144 In tex2lyx tests do not compare the first 2 lines.
This removes the need to update the lyx-format of the test files too often.
(To please Vincent and me)
2013-01-01 13:23:24 +01:00
Kornel Benko
297d534fdd Adapt format to lyx-files in tex2lyx-tests 2012-12-31 18:50:35 +01:00
Georg Baum
9c33bddffa Let tex2lyx really produce format 458. 2012-12-31 18:22:05 +01:00
Georg Baum
ee3ce572a0 Fix import of shift-jis and big5 CJK texts.
These encodings were not defined, since they must not be used as document
encodings (the characters {, } and \ may appear in high bytes, and latex
would be confused). However, they are supported by CJK.sty (which uses a
preprocessor to circumvent the limitations of the latex executable). These
encodings are now defined, but used for import in tex2lyx only.
The test case CJK.tex contained fake tests for shift-jis and big5 (the
japanese and chinese characters were entered using the utf8 encoding), and
therefore the wrong interpretation of these encoding looked as if it worked.
The comments about missing iconv support of shift-jis and big5 were wrong as
well (otherwise shift-jis-plain would not work either).
2012-12-30 20:52:50 +01:00
Georg Baum
de5e348727 Fix bug #8468: Wrong import of UTF8 CJK.
Actually, the test case showed several problems:
- ERT insets did use layout "Standard", not "Plain Layout"
- The font scale was read correctly, but tex2lyx claimed that it did ignore
  the option "scaled=0.95"
- If a third argument of the CJK environment was given, it caused the whole
  environment to be put in ERT with a broken encoding. This is now fixed for
  the bug test case by using the \font_cjk header variable, but the encoding
  problem still exists for unsupported encodings. I'll file a separate bug
  for that.
- The CJKutf8 package was not handled in the preamble parsing. Therefore the
  chinese comment in the preamble was read with a wrong encoding, and guessing
  the document language did not work.
The new file CJKutf8.tex was created by copying and modifying CJK.tex, but
unfortunately it is impossible to tell git to inherit the history of CJK.tex
for the new file (search the web for git svn copy if you want to know details).
2012-12-30 20:52:49 +01:00
Georg Baum
c51449cac6 Fix tex2lyx bug #8466: special file names.
Special characters as created by latex_path() where not converted corectly
from LaTeX macros by tex2lyx. Now this is done, even for file names containing
double quotes which are not used for quoting spaces. These file names are not
legal on windows, and will causes probelms in DVI files, but if they occur
tex2lyx does not produce invalid .lyx files.
2012-12-30 20:52:49 +01:00
Kornel Benko
1ccc92717c The param 'close_fds' is not allowed on windos for subprocess.popen call,
if there are also redirections to stdin, stdout or stderr.
2012-12-30 11:30:15 +01:00
Georg Baum
56ece75ad9 Fix bug #8464: stackrel with subscript.
The fix is basically mechanical, the additional code for fraction like insets
with three arguments was stolen from \unitfrac. As any math package,
stackrel.sty needs a buffer parameter to switch it off.
I also added the two stackrel flavours to the toolbar.
2012-12-28 20:08:43 +01:00
Georg Baum
594c83261a Update tex2lyx test cases
The recent file format changes do not change the output of the existing test
cases, so only the version number needs to be updated.
2012-12-28 20:08:42 +01:00
Kornel Benko
981b9c69d1 1.) Add format to CJK.lyx.lyx(missed in previous commit)
2.) Add lyx2lyx test to runtests.py. This is done with extra parameter only,
  and does not change the behaviour without this parameter.
2012-12-28 16:22:25 +01:00
Kornel Benko
889563984f Adapt format to test files 2012-12-28 16:19:34 +01:00
Vincent van Ravesteijn
1b3871b302 Add custom target to run tests
This target can depend on the individual test projects and this makes sure
that the test projects are build before running the tests.
2012-12-17 22:26:14 +01:00
Georg Baum
3d4da7fa61 Do not call tex2lyx in roundtrip mode for tests 2012-12-15 17:47:09 +01:00
Kornel Benko
9f7c8be6d7 Cmake build tex2lyx testing:
To please Georg:
1.) Do _not_ use globbing to get test file
2.) Do not evaluate stderr output of tex2lyx
2012-12-15 15:38:48 +01:00
Georg Baum
f67cf6f4bb Add support for stmaryrd.sty (bug #8434)
The stmaryrd package adds support for lots of math symbols, using a font
designed to accompany the computer modern fonts. The changes in detail:

- Fix generate_symbols_list.py to work with stmaryrd.sty. It loooks like it
  was automatically translated from a perl version and never used.
- Generate the new symbols in lib/symbols using generate_symbols_list.py and
  add some manual adjustments
- Generate stmary10.ttf by a simple ttf export from stmary10.sfd with fontforge
- Add license info for stmary10.ttf
- Create a test file with all symbols from stmaryrd.sty. Actually it would be
  nice to have this for the other fonts as well.
- The mechanics: lyx2lyx, tex2lyx, font machinery etc.
2012-12-15 13:10:31 +01:00
Kornel Benko
892e237fe1 Cmake build: Testing
Make this all more the cmake way
2012-12-15 00:15:59 +01:00
Kornel Benko
78470fba03 Cmake build: tex2lyx
Retrieve and name the test-cases with a globbing expression
2012-12-14 19:47:43 +01:00
Kornel Benko
2b66f1b1ac Split roundtrip tests (at least on cmake build)
to show better grained output
2012-12-14 19:07:28 +01:00
Kornel Benko
8c0ca33295 Roundtrip test. Forgotten in previous commit 2012-12-14 13:33:56 +01:00
Kornel Benko
c3256a2d52 Roundtrip test corrected, due to changes of tex2lyx (less emty lines) 2012-12-14 13:31:21 +01:00
Kornel Benko
96dd1363a2 Cmake build: all tests
1.) Rename tests to show their grouping
2.) Adapt the roundtrip tests to new lyx-format
2012-12-13 15:35:04 +01:00
Juergen Spitzmueller
53626a8beb tex2lyx updates for the recent format change 2012-12-04 12:20:34 +01:00
Juergen Spitzmueller
3931331b56 update tex2lyx test files 2012-11-30 09:08:54 +01:00
Georg Baum
f952882bc8 Update tex2lyx tests to new file format 2012-11-25 12:42:40 +01:00
Georg Baum
78a7743166 Import theorems correctly (bugs #5702, #5776)
Actually tex2lyx can handle modules since some time (#5702), but not
theorems (#5776). Now the following issues are fixed:
- Modules that depend on other modules can be loaded, since the dependencies
  are loaded first
- Default moduls of the text class are loaded correctly
- \newtheorem is recognized as a command that defines new environments and
  treated similar to \newenvironment
2012-10-26 22:23:16 +02:00
Juergen Spitzmueller
7c6ae4d740 Update tex2lyx test files 2012-10-25 07:47:42 +02:00
Georg Baum
ecf24f1cb5 Add xfig import test 2012-10-23 22:09:26 +02:00
Kornel Benko
f7680c696d Cmake build:
Added dependencies to target `test'. Now all the needed executables
are recreated prior to running tests if not already existant.
2012-10-21 16:58:45 +02:00
Kornel Benko
ed5dfa9cd7 Cmake tests:
Add tests the cmake-way. Now there is only _one_ target `test'
2012-10-21 12:05:50 +02:00
Kornel Benko
1822a10639 Cmake build:
Supply the correct path to created executable (use ${CMAKE_CFG_INTDIR})
2012-10-20 15:27:30 +02:00
Georg Baum
75ba5d3db5 Add automatic color package loading for listings
The listings inset does automatically load the color package if any parameter
contains \color. As mentioned in bug #8066 tex2lyx needs to be aware of this,
so the \usepckage{color} is automatically skipped in these cases.
2012-10-18 20:41:23 +02:00
Georg Baum
53694874f3 Make tex2lyx tests almost compilable
If the original tests cannot ve compiled with latex/pdflatex/xelatex it is
difficult to compare the visual output.
2012-10-08 21:23:11 +02:00
Georg Baum
269a942294 Fix wrong parsing of \framebox[3in][s]{...}
s is a valid horizontal position for framebox (as well as for makebox, which
was already parsed correctly). There was even a test case, but with a wrong
reference.
2012-10-06 15:23:36 +02:00
Georg Baum
8863ac62aa Really output file format 444
The previous output was read correctly by LyX as well, but the new version is
more similar to the files written by LyX. Also update TODO with recent file
format changes.
2012-10-06 00:29:16 +02:00
Georg Baum
fce4f66718 Acknowledge additional \lang command 2012-10-05 23:58:16 +02:00
Georg Baum
c85228432c Update file format of test references 2012-10-05 23:50:28 +02:00
Georg Baum
2f7f0c7631 Really fix bug #4468.
The old fix was incomplete (\verb~\~ was translated to \verb~~ in roundtrip).
The real cause for this bug (and also the mistranslation of \href{...}{\}})
was the misbehaviour of Token::character() (see comment in Parser.h): This
method even returns a character if the category is catEscape, and this is not
wanted in most (all?) cases.
2012-10-05 00:12:18 +02:00
Kornel Benko
66cb259a96 tex2lyx tests adapted to cmake build 2012-10-03 17:04:00 +02:00
Georg Baum
d56295bcdf Add make target to update tex2lyx test references
Now "make check" does not overwrite the test references anymore, use the
updatetests target instead. "make check" now also recognizes test failures.
2012-10-03 15:23:09 +02:00
Georg Baum
adcd2281af Add evaluation for tex2lyx regression tests 2012-10-03 15:01:54 +02:00
Georg Baum
133ceaf0d4 Support out of source tests in tex2lyx test runner 2012-10-03 13:59:20 +02:00
Georg Baum
a08c693f90 Add test for Parser::getFullArg()
It shows that the special handling of a single backslash in the argument
(whcih is supposed to fix bug #4468) does not work.
2012-09-25 22:25:55 +02:00
Kornel Benko
ea76d6de95 Roundtrip tex2lyx, cmake-build:
1.) test.ltx, test.lyx.tex in build-dir (missed this one in previous commit)
2.) Added dependency to "lyx" to work on clean build dir too
2012-07-30 10:04:45 +02:00
Kornel Benko
6fa12b0971 Adapt tex2lyx roundtrip to cmake build.
Use build tree only.
2012-07-30 09:30:16 +02:00
Georg Baum
840f6fda51 Don't stop testing after first error.
This was the reason why I forgot to update the last test file in the last
commit.
2012-07-08 20:52:26 +02:00
Georg Baum
45fd75fe96 Manually update test results to current format.
Now you can see the regressions without differences caused by real
fixes or file format updates.
2012-07-08 20:09:02 +02:00
Georg Baum
1c0bd0132c Add very simple tex2lyx regression test suite.
It is invoked by 'make check' (automake only, it would be nice if someone
could add it to cmake as well), or by calling

python src/tex2lyx/test/runtests.py <path to tex2lyx binary>

by hand. Currently, it does not compare the output (this comes later).
The added .lyx files are from tex2lyx around mid of april, so that you
can see the regressions of the current version if you run the test
yourself (simply run git diff afterwards).

The home made test runner is quite stupid, but better than nothing.
Feel free to improve it or replace it with something better, as long
as running it stays as simple as now.
2012-07-08 19:28:19 +02:00
Uwe Stöhr
fe5a4c8c81 tex2lyx: improve CJK handling
- tex2lyx/text.cpp:
 - fix bug that swallowed valid braces
 - the encoding is "Bg5" not "BIG5"
 - add and update comments

- CJK.tex: add an example for the Bg5 encoding
2012-07-07 13:37:26 +02:00
Uwe Stöhr
02b6586ad7 update a tex2lyx test file
box-color-size-space-align.tex:
 - add all possible math spaces
 - remove 2 invalid non-math spaces
2012-07-06 23:33:28 +02:00
Uwe Stöhr
85c479f4e7 test-structure.tex: add checks for \verb 2012-06-30 15:29:53 +02:00
Uwe Stöhr
85ef627eac fix mistake in tex2lyx testfile
- XeTeX-polyglossia.tex: Hebrew is used in the file and so it must be declared
2012-06-30 02:21:15 +02:00
Uwe Stöhr
2e8ed3b3b5 tex2lyx: support fontspec scale option
Preamble.cpp:
 - support the font scaling
 - improve coding style

text.cpp: - improve logic/coding style

XeTeX-polyglossia.tex:
 - add scaling
 - change document so that it is compilable using the Libertine font
2012-06-26 00:46:02 +02:00
Uwe Stöhr
adb0d7f63f support synctex in tex2lyx.cpp
- tex2lyx/Preamble.cpp/h: handle \synctex and package srcltx
- tex2lyx/test/test-structure.tex: add \synctex
2012-06-24 16:59:21 +02:00
Uwe Stöhr
a3f4f2d1e3 CJK support for tex2lyx
- support as best as possible; setting a document language is however not possible
- fixes bug #4377
2012-06-24 06:38:33 +02:00
Uwe Stöhr
828f7171e8 - tex2lyx: support for the polyglossia language variants
- XeTeX-polyglossia.tex: simplifications, added some more testcases
2012-06-23 04:28:52 +02:00
Uwe Stöhr
73f0f4dd6c - Preamble.cpp: handle \setxxxlanguage with options
- text.cpp: handle the commands \textxxx with options
- XeTeX-polyglossia.tex: add 2 more testcases
2012-06-22 17:19:46 +02:00
Uwe Stöhr
79352b9882 tex2lyx/XeTeX-polyglossia.tex: add a further test 2012-06-22 15:40:40 +02:00
Uwe Stöhr
46051b57ae XeTeX-polyglossia.tex: add missing \setotherlanguages 2012-06-22 04:43:33 +02:00
Uwe Stöhr
aa9fed9322 - tex2lyx/text.cpp:
- bugfix for the parsing of polyglossia's paragraph environments
 - new support for polyglossia's language change commands \textxxx
- XeTeX-polyglossia.tex: add more testcases and add a missing \end
2012-06-22 03:41:00 +02:00
Uwe Stöhr
7eca5d94d1 - support a bunch of new languages (fileformat change)
- tex2lyx support for
  - fontspec fonts
  - polyglossia
2012-06-08 02:37:36 +02:00
Georg Baum
de00ce40aa Forgot the test case for bug #8116. 2012-05-13 18:54:14 +02:00
Georg Baum
cd691081b4 Import table cells in turn environment.
This is a part of bug #8081: Translate cells in
\begin{turn}{number}...\end{turn} to native syntax.
2012-05-06 19:12:51 +02:00
Georg Baum
c90e02ff0d Import table cells in sideways environment.
This is a part of bug #8081: Translate cells in
\begin{sideways}...\end{sideways} to native syntax. The turn environment
comes in a later commit, since this one os suitable for backporting.
2012-05-06 18:47:53 +02:00
Georg Baum
c9f68139cb Do not swallow math comments in tex2lyx.
This is not needed, since LyX supports comments in math. Data loss with math
comments containing a backslash in LyX has been fixed as well.
The test case was found in bug #8104.
2012-05-06 16:48:44 +02:00
Georg Baum
c1965123ed Fix bug #8104 (\date argument was eaten)
I introduced this bug in r40091 where support for empty dates was added.
I also noticed that the title_layout_found flag was not properly passed down
to all variants of parse_text*. Since this is rather a global variable I
placed it into the preamble class.

The test case of bug #8104 shows other problems as well, but those are no
regressions and will be fixed separately.

OK for branch?
2012-04-19 20:46:08 +02:00
Georg Baum
27733452f7 Native support for \lstlistoflistings 2012-04-16 21:40:59 +02: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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Uwe Stöhr
54cee82fb6 tex2lyx:
- support for \nocite (since format 309)
- add \nocite{*} option to testfile

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36960 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-20 02:08:22 +00:00
Georg Baum
300cd0dedd Increase tex2lyx output format to 320.
320: Support protected hfill
Detect other horizontal spaces that are already part of format 319
Add forgotton use_parbox tag to boxes (confuses lyx2lyx, but no lyx)



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36949 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-19 21:24:24 +00:00
Georg Baum
58fde18a9f Increase tex2lyx output format to 319.
311:     Nothing to do (tex2lyx produced already the new format, because it
         uses the current layout files. This is also a reason why it should
	 not lag behind too much with the format.)
312:     Nothing to do (empty lyx2lyx conversion)
313:     Nothing to do (tex2lyx does not know about modules)
314-315: Nothing to do (empty lyx2lyx conversion)
316:     Nothing to do (tex2lyx does not know subfigures)
317-318: Nothing to do (empty lyx2lyx conversion)
319:     Convert horizontal spaces to new format (and convert some newly
         supported spaces)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36948 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-19 20:23:55 +00:00
Georg Baum
d1be0d2af7 Increase tex2lyx output format to 310.
299-302: Nothing to do (empty lyx2lyx conversion)
303:     Nothing to do (tex2lyx did not use the serbocroation language)
304:     Convert framed and greyed out notes to box insets
305-310: Nothing to do (empty lyx2lyx conversion)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36947 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-19 19:29:07 +00:00
Georg Baum
2d5e1123d1 Increase tex2lyx output format to 298.
298: All math macros are exported with \\global to LaTeX now, so a \\global
     in front of a math macro has to be recognized. Since the math macros do
     no longer use the same syntax in .lyx and .tex (which is a mistake IMHO)
     an exact match is no longer possible except for \global\long\def.
Bugfix this time: \\providecommand was errornously recognized as math macro


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36946 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-19 19:21:53 +00:00
Georg Baum
93232c3ad6 Improve roundtrip of tex2lyx test documents:
- Make test-insets.tex and test-structure.tex compilable
- Avoid duplicate definition of \lyxarrow in test-insets.lyx
- Prevent subscript package from being ignored in test-insets.lyx
- Prevent commands listed with optional arg in syntax.default from being
  concatenated with the next word if no optional arg is given
- Handle spaces and comments inbetween a command an "{}" consistently


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36943 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-19 14:54:23 +00:00
Georg Baum
7610b9add5 Increase tex2lyx output format to 288.
278:     Nothing to do, tex2lyx writes already an \end_deeper for each \begin_deeper
279-280: Nothing to do, tex2lyx does not produce character styles yet
281-282: Nothing to do (empty lyx2lyx conversion)
283:     Nothing to do, tex2lyx does not produce character styles yet
284-286: Nothing to do (empty lyx2lyx conversion)
287:     Nothing to do, tex2lyx does not produce wrapped figures yet
288:     Use new syntax for command inset
This time, the (not format related) bug fix is to parse the starred jurabib
and natbib citation commands correctly.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36927 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-17 21:02:39 +00:00
Georg Baum
1b04aa7301 Do not use math commands from unicodesymbols in tex2lyx text mode,
since they are usually invalid in text mode (partial fix of bug 6797).
Also, prepare proper translation of \\slash{} and \nobreakdash.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36840 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-12 13:23:05 +00:00
Georg Baum
a4a7502769 textsubscript and textsuperscript for tex2lyx
(deactivated until format is recent enough)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36839 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-12 12:16:18 +00:00
Georg Baum
e693a60c34 Fix bug #5716.
Since separators are not allowed by the current .lyx version written by
tex2lyx, an empty note is used instead.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36838 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-12 11:45:09 +00:00
Uwe Stöhr
0eb2e5c22c tex2lyx/test/test-insets.tex: correct code for nomenclatures
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30102 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-15 00:15:13 +00:00
Uwe Stöhr
f1a2bf1c66 test/test-structure.tex: add caption with OptArg
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30097 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-14 14:20:22 +00:00
Uwe Stöhr
6dad0a4cd7 test/test-structure.tex: add nomenclature
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30092 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-14 02:14:42 +00:00
Uwe Stöhr
ebda762af9 test/test-structure.tex: add labeling list
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30069 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-12 13:07:20 +00:00
Uwe Stöhr
f2d0a94b91 tex2lyx/test/test-insets.tex: more tests
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30060 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-11 23:56:48 +00:00
Uwe Stöhr
5742cf9ce6 tex2lyx: testfiles modified as preparation for the upcoming tex2lyx work
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30044 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-11 17:56:05 +00:00
Jean-Marc Lasgouttes
f83ae91f05 Add a new command line parameter -e that sets the default (latex) encoding.
This is overridden by any subsequent inputenc command.

The current encoding is also passed down to \input or \included files.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28295 a592a061-630c-0410-9148-cb99ea01b6c8
2009-01-30 14:47:06 +00:00
Jean-Marc Lasgouttes
552da336ac Now tex2lyx is able to parse stuff that is in unicodesymbols file, as well
as accents. Time will tell how robust this is.

All support for InsetLatexAccent has been removed.

I did not do the support for \inputencoding yet, because it is more difficult 
to get right...



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27596 a592a061-630c-0410-9148-cb99ea01b6c8
2008-11-16 23:24:56 +00:00
Jean-Marc Lasgouttes
7d9a6e19fd forgot to move one file
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27550 a592a061-630c-0410-9148-cb99ea01b6c8
2008-11-16 14:27:01 +00:00
Jean-Marc Lasgouttes
c8b2234f39 move test files in their own directory
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27442 a592a061-630c-0410-9148-cb99ea01b6c8
2008-11-15 13:04:15 +00:00