Commit Graph

350 Commits

Author SHA1 Message Date
Jean-Marc Lasgouttes
3b99db73e4 Remove our in tree gettext version and replace with a mechanism to import it.
* autogen.sh: use autopoint to poulate the gettext code; simplify.

	* po/Rules-lyx: move the LyX-specific code of the Makefile here.

	* configure.ac: add magic incantation telling autopoint to import 
	gettext 0.16.1. Generate config.h in toplevel directory to please 
	gettext.

	* src/tex2lyx/Makefile.am:
	* src/client/Messages.cpp: compile fix

	* remove all files that came from a gettext distribution.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25167 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-06 15:25:55 +00:00
Abdelrazak Younes
31517754ad fix MSVC warning
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24864 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-20 11:24:12 +00:00
Uwe Stöhr
fdea53d34b tex2lyx/preamble.cpp: handle also onecolumn and oneside as discussed
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24811 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-17 15:11:41 +00:00
Uwe Stöhr
8c8a2794b3 tex2lyx/preamble.cpp: support for the \geometry settings and the paper orientation, fixes bug 4826.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24809 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-16 20:25:44 +00:00
Uwe Stöhr
001c77d65b tex2lyx/preamble.cpp: cosmetics again
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24793 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-15 23:02:53 +00:00
Uwe Stöhr
f185e01c68 - tex2lyx\box-color-size-space-align.tex: add preamble options to test the geometry settings
- tey2lyx\test-structure.tex: add paper size document class option for testing

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24791 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-15 22:48:54 +00:00
Uwe Stöhr
34bdb2151b tex2lyx/preamble.cpp: cosmetics
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24790 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-15 21:09:53 +00:00
Uwe Stöhr
2546bde017 tex2lyx/preamble.cpp: support for the document class options twocolumn and twoside, fixes bug 4867
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24789 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-15 21:05:25 +00:00
Uwe Stöhr
ffe427cfdd tex2lyx/text.cpp: only whitespace
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24727 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-11 14:13:23 +00:00
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
Uwe Stöhr
d50354fc5b tex2lyx/box-color-size-space-align.tex: 2 small changes for better output
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24649 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-07 00:29:44 +00:00
Uwe Stöhr
35b677045e tex2lyx/test-structure.tex: add an appendix
tex2lyx/test-insets.tex: add an unindented paragraph

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24622 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-05 22:45:22 +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
43ef7962bb box-color-sizes-space-align.tex: add testcases for defined horizontal spaces
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24549 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-28 22:59:43 +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
f68a8d097c tex2lyx/preamble.cpp: only cosmetics
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24419 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-21 22:08:52 +00:00
Uwe Stöhr
d4355c552b tex2lyx/preamble.cpp: fix the import of paragraph settings, fixes http://bugzilla.lyx.org/show_bug.cgi?id=4773
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24404 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-20 23:22:36 +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
Jürgen Spitzmüller
5445b04a9b * src/tex2lyx/tex2lyx.man:
- make the man page a bit less outdated (bug 2770).

note that the page isn't really up to date yet. I didn't check anything thoroughly (especially the "what's supported" and "what's not supported" part). Uwe, maybe a job for you, as you are most familiar with it nowadays.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24386 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-20 15:22:17 +00:00
Jean-Marc Lasgouttes
a77cd8c0c6 cleanup parser code at least
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24323 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-18 12:26:21 +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
Uwe Stöhr
8d6583e9ce tex2lyx/preamble.cpp: change encoding from ascii to auto when importing TeX files, fixes
http://bugzilla.lyx.org/show_bug.cgi?id=4719

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24196 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-09 20:19:47 +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
José Matox
45d42022f7 Add headers necessary to compile with g++ 4.3 (I am not sure about the typeinfo, the others are clearly correct).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23862 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-21 11:26:20 +00:00
José Matox
7ef2816cd0 remove lengthcommon.cpp and use it as a link from the upper dir
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23849 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-20 13:20:18 +00:00
José Matox
2b1859e8f0 Fighting with autotools to have a building system :-(
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23836 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-19 19:37:35 +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
6edb3984bf BaseClassList --> LayoutFileList
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23532 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-07 03:53:21 +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
6f1cb456cf Improve performance of TextClass type objects by making BaseClassList and DocumentClassBundle containers of pointers rather than of objects, thus reducing the need to copy. Since these classes are singletons that live the life of the process, there's not much need to worry about memory leaks.
We take the opportunity to make TextClass objects noncopyable, nonassignable, etc.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23526 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-06 23:31:40 +00:00
Richard Heck
926ad3d183 Get rid of LayoutPtr.h.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23524 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-06 21:55:33 +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
Richard Heck
2b3bd7b5f4 This is the last of the commits that hopes to enforce the distinction between "layout files" and "document classes" that was introduced by the modules code. For the most part, these changes just refactor code from TextClass between: (a) a TextClass base class; (b) a LayoutFile subclass, which represents the information in a .layout file; and (c) a DocumentClass subclass, which represents the layout information associated with a Buffer---a LayoutFile plus Modules. Methods from TextClass have been apportioned between the three classes depending upon what is needed where, and signatures have been changed where necessary so that the right kind of class is required.
At this point, there are no simple TextClass objects in the main LyX code, and it is impossible to create them, since the TextClass constructor is protected. Only LayoutFile and DocumentClass objects can be constructed, and for the most part these are constructed only by their respective containers: BaseClassList and DocumentClassBundle. There is an exception: LayoutFile does have a public default constructor, but if anyone knows how to make it go away, please do.

There will be one or two more commits along these lines, but these will be simple renamings. For example, BaseClassList should be LayoutFileList.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23343 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-29 02:45:33 +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