Commit Graph

66 Commits

Author SHA1 Message Date
Uwe Stöhr
bbd5ddeff3 tex2lyx/text.cpp: support for the centering environment used to center e.g. images
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24708 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-10 00:01:46 +00:00
Uwe Stöhr
2b69b18cdd tex2lyx/text.cpp: fix bug 20
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24673 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-07 22:52:56 +00:00
Jean-Marc Lasgouttes
4b07e1ea92 Fix bug 4806
* Context.cpp (begin_layout): make it a (private) method, and output
	the extra stuff here.
	(add_par_extra_stuff): this is used for stuff that is only for next 
	paragraph (like extra_stuff used to be); add_extra_stuff is now for 
	code that is output for all paragraphs in the context.

	* text.cpp: update to new Context methods. Every user of add_extra_stuff
	uses add_par_extra_stuff, except alignment (which has to be repeated
	to fix bug 4806).


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24656 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-07 13:55:03 +00:00
Jean-Marc Lasgouttes
9b4a26a252 rename assert.h to lassert.h
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24559 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-30 08:26:40 +00:00
Jürgen Spitzmüller
93cc3b9416 revert some new features so that tex2lyx outputs format 247 proper again.
The reverted features could (and should) be reapplied as soon as tex2lyx can output unicode (bug 4379).

The patch of this change can be found here:
http://bugzilla.lyx.org/show_bug.cgi?id=4379

and can be applied with -R in this case.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24557 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-29 18:11:46 +00:00
Uwe Stöhr
b84e0c158d tex2lyx/text.cpp: cosmetic
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24551 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-29 00:12:56 +00:00
Uwe Stöhr
455d441029 - tex2lyx/text.cpp: correct font size handling because font size switches don't affect section headings, fixes bug 4807
- box-color-size-space-align.tex: add testcase for the above fix

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24550 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-29 00:03:55 +00:00
Uwe Stöhr
f0e4582a0b tex2lyx/text.cpp: support for \hspace
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24548 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-28 22:49:10 +00:00
Uwe Stöhr
6363e27250 tex2lyx/text.cpp: \InsetSpace has no begin and end (LyX 1.5 was tolerant to the missing end, LyX 1.6 is correctly not tolerant)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24547 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-28 22:47:47 +00:00
Uwe Stöhr
0d7fe3346f - tex2lyx/test-insets.tex: make it compilable, update the document, and add some testcases
- tex2lyx/box-color-sizes-spacings-alignments.tex: update the document
- tex2lyx/text.cpp: correct some typos

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24521 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-27 13:32:20 +00:00
Uwe Stöhr
1396dc00a5 tex2lyx/text.cpp: remove support for \centering and the like as first step to fix the broken paragraph alignment import, see bug 4806
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24520 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-27 12:44:09 +00:00
Uwe Stöhr
04911c0462 tex2lyx/text.cpp:
- fix an off by one error in the font size handling, fixes bug 4803
- support \lyxline, fixes bug 4795

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24518 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-27 10:54:06 +00:00
Uwe Stöhr
329461c700 tex2lyx/text.cpp: take care of the brace pair after comment environments that are there when the TeX file was created by LyX
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24498 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-25 00:38:59 +00:00
Uwe Stöhr
b6eed01602 - tex2lyx/preamble.cpp, text.cpp: add support for \textcolor fixes http://bugzilla.lyx.org/show_bug.cgi?id=2457
- box-color.tex: testfile for tex2lyx to check if colors and boxes are correctly imported

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24403 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-20 23:16:55 +00:00
Uwe Stöhr
7ba6ed2654 tex2lyx/Parser.cpp: rename a function since it returns a mandatory argument
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24310 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-17 00:22:16 +00:00
Uwe Stöhr
d3b2f94388 tex2lyx: text.cpp, Parser.h, Parser.cpp:
fix the import of \makebox, fixes http://bugzilla.lyx.org/show_bug.cgi?id=2504

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24244 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-12 12:50:04 +00:00
André Pönitz
7f461f4392 infrastructure for 'graceful asserts'
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24216 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-10 21:49:34 +00:00
André Pönitz
835d051ae3 more Lexer;
also move tex2lyx specific code to tex2lyx


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24129 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-05 19:01:43 +00:00
Stefan Schimanski
29dca708f7 * comments
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23625 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-10 12:57:45 +00:00
Stefan Schimanski
97a1fcc721 * \newcommandx parsing for tex2lyx
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23623 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-10 12:52:37 +00:00
Abdelrazak Younes
cab2fe4cce MSVC compile fix
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23533 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-07 07:21:13 +00:00
Richard Heck
ac6e5b871c Get rid of the boost::shared_ptr's in TextClass.{h,cpp}. It's not clear what these were really doing here now, and they will cause bugs now that DocumentClass objects are more dynamic.
Abdel suggested it might be worth pimpl'ing the FloatList and Counter objects, to get the header dependencies back down.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23530 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-07 03:41:12 +00:00
Richard Heck
f401ce5d29 Changes LayoutList from a vector<LayoutPtr> to a vector<Layout>.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23519 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-06 20:01:30 +00:00
Abdelrazak Younes
a56dec8330 fix the bug fix in 23507
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23508 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-06 09:47:14 +00:00
Abdelrazak Younes
682f4efd13 compile fixes
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23507 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-06 09:15:53 +00:00
André Pönitz
30fff63257 compile fix
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23169 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-23 22:21:03 +00:00
Stefan Schimanski
5636ca5dea * indention fix
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22284 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-23 16:33:34 +00:00
Stefan Schimanski
3f5e1c0e27 * tex2lyx support for multiple optional argument using \newlyxcommand
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22282 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-23 16:33:01 +00:00
Stefan Schimanski
f85fccef65 * newlyxcommand support as LaTeX feature
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22281 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-23 16:32:00 +00:00
Richard Heck
e285d2a7d8 Support for nocite, provided by Bernhard Reiter.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22217 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-20 15:46:14 +00:00
Abdelrazak Younes
9439b6e6e0 * get rid of support::absolutePath()
* remove FileName.h inclusion from filetools.h


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22188 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-17 16:04:46 +00:00
Abdelrazak Younes
7c392af6ea getting rid of superfluous lyx::support:: statements.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22106 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-12 19:57:42 +00:00
Abdelrazak Younes
9abb7db468 getting rid of superfluous std:: statements.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22104 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-12 19:28:07 +00:00
Abdelrazak Younes
b89cc942eb 'using namespace lyx::support' instead of 'using support::xxx'
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22103 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-12 18:57:56 +00:00
Abdelrazak Younes
9383f4c3c6 'using namespace std' instead of 'using std::xxx'
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22097 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-12 10:16:00 +00:00
Jürgen Spitzmüller
49497a6803 * src/tex2lyx/text.cpp:
- add space between bounding box arguments (bug 4418).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22086 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-11 17:14:01 +00:00
Uwe Stöhr
dc9dcc9c1f set encoding from utf8 back to latin1
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22047 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-09 17:47:41 +00:00
Uwe Stöhr
2ea605f85a tex2lyx/text.cpp: support for all quotation marks (bug2703).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22032 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-09 13:40:03 +00:00
Uwe Stöhr
cdffbf18bd tex2lyx: support font settings -> move fileformat to 247
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21970 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-05 20:02:49 +00:00
Uwe Stöhr
d8013aa18d preamble.cpp, text.cpp:
- fix bug 27
 - support for multi-language files
 - code cleanups

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21950 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-04 20:09:40 +00:00
Uwe Stöhr
396dba93b7 revert r21813
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21841 a592a061-630c-0410-9148-cb99ea01b6c8
2007-11-28 00:03:11 +00:00
André Pönitz
c8fd502b56 some de-boostification
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21830 a592a061-630c-0410-9148-cb99ea01b6c8
2007-11-27 20:30:22 +00:00
Uwe Stöhr
116740d7e3 very big tex2lyx patch:
tex2lyx Version 0.1.5

Commands

- support for \lyxline
- fix for bug 27:
  - support for \selectlanguage
  - support for \foreignlanguage
  - support for \inputencoding
- updated support for \printindex
- support for \printnomenclature
- updated support for \listof
- updated support for \tableofcontents

Environments

- support for hyperlink
- support for shaded note
- support for framed note

Preamble

- support for font settings
- updated preamble format to lyxformat 303
  (tex2lyx will still use lyxformat 245 for a while)
- updated language support
- support for multi-language documents that use babel
  (CJK follows later)
- fix bug 2310:
  - support for document encoding

Packages

- support for esint
- updated support for amsmath

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21813 a592a061-630c-0410-9148-cb99ea01b6c8
2007-11-27 01:38:50 +00:00
Uwe Stöhr
12f7869ac0 support for \linebreak:
- fileformat change
- tex2lyx support
- rename LFUN_BREAK_LINE to LFUN_NEW_LINE because this is what the lfun does and to avoid confusions
- new menu entry
- new shortcut C-S-Return

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21778 a592a061-630c-0410-9148-cb99ea01b6c8
2007-11-25 18:34:37 +00:00
Uwe Stöhr
650c2a816c tex2lyx/text.cpp: - support for LyX 1.6's hyperlink inset (\href)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21765 a592a061-630c-0410-9148-cb99ea01b6c8
2007-11-24 20:07:05 +00:00
Uwe Stöhr
cf87469cb2 tex2lyx/text.cpp:
- support for \newline
- support for framed and shaded notes

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21764 a592a061-630c-0410-9148-cb99ea01b6c8
2007-11-24 18:04:26 +00:00
Uwe Stöhr
97aa558cac support for \pagebreak:
- rename former "pagebreak" to "newpage" since it produces a \newpage
- new LFUN
- menu entry
- tex2lyx support
- fileformat change


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21732 a592a061-630c-0410-9148-cb99ea01b6c8
2007-11-23 02:10:00 +00:00
Stefan Schimanski
e43dc9d38c * Added conversion of latex macros with optional parameters
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21330 a592a061-630c-0410-9148-cb99ea01b6c8
2007-11-01 11:15:05 +00:00
André Pönitz
e7aa8ce683 cosmetics... less than intented
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21190 a592a061-630c-0410-9148-cb99ea01b6c8
2007-10-24 22:55:02 +00:00
André Pönitz
0e08bc5e16 start using FileName::exists()
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21044 a592a061-630c-0410-9148-cb99ea01b6c8
2007-10-18 19:29:32 +00:00