Commit Graph

90 Commits

Author SHA1 Message Date
Jean-Marc Lasgouttes
4fc6c1247a Fix bug #6276: tex2lyx fails to import captions
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31638 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-15 14:22:35 +00:00
Jean-Marc Lasgouttes
7a52f14bc0 fix bug #6249: optional argument of \bibitem is not imported correctly by tex2lyx
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31489 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-01 09:58:53 +00:00
Uwe Stöhr
8bda8d10b8 tex2lyx/text.cpp: \linebreak and \pagebreak are first supported by LyX with fileformat 300
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30106 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-15 00:33:54 +00:00
Uwe Stöhr
36e82b8d45 tex2lyx/text.cpp: tipo
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30101 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-14 23:58:37 +00:00
Uwe Stöhr
868ffa3864 tex2lyx: whitespace and typos
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30100 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-14 21:29:24 +00:00
Uwe Stöhr
14021f7233 tex2lyx: support for fileformat 257: command inset instead of layout inset for captions
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30098 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-14 14:21:20 +00:00
Uwe Stöhr
1e4def9460 tex2lyx:
- correct the conversion of InsetCommand
- code optimization
- support for format 253: nomenclature is now recognized

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30093 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-14 02:16:51 +00:00
Uwe Stöhr
5858128386 tex2lyx/text.cpp: code optimization as also suggested by JMarc
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30087 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-13 15:34:31 +00:00
Uwe Stöhr
f8d655d4e2 tex2lyx/text.cpp: tex2lyx supports now fileformat 252
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30059 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-11 23:46:41 +00:00
Richard Heck
4df7d8ab1a A little cleanup of the layout files.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29903 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-02 13:45:32 +00:00
Jean-Marc Lasgouttes
3e3179b4d4 Hopefully complete fix to bug #5935
Make several Parser methods return copies of tokens, because the
vector containing the token may get reallocated when it grows.

Revert now useless changeset 29557.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29627 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-11 11:02:25 +00:00
Jean-Marc Lasgouttes
440df1c789 (partial?) fix to bug 5935
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29557 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-07 10:09:03 +00:00
Enrico Forestieri
ccc77c73da Speed up FileName operator== (Georg's solution).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29498 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-02 17:12:31 +00:00
Jean-Marc Lasgouttes
0a99e817f1 Fix bug #5912: http://www.lyx.org/trac/ticket/5912
The problem was that \" was forgotten in the list of accents to check
in unicodesymbols (because it used to have its own german-centric derogatory
handling).

I took the Comprehensive LaTeX Symbols List (table 6) and added all the
missing accents.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29387 a592a061-630c-0410-9148-cb99ea01b6c8
2009-04-23 13:08:31 +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
a4391b65ca now that tex2lyx reads the files as utf8, file names should be correct
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28294 a592a061-630c-0410-9148-cb99ea01b6c8
2009-01-30 14:42:35 +00:00
Jean-Marc Lasgouttes
632da1cc57 very basic support for switching encoding in a document (no context of grouping right now)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27721 a592a061-630c-0410-9148-cb99ea01b6c8
2008-11-27 14:16:02 +00:00
Jean-Marc Lasgouttes
c0828f5c52 small spacing bug
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27599 a592a061-630c-0410-9148-cb99ea01b6c8
2008-11-16 23:29:11 +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
28f43b1896 Now tex2lyx is able to set the encoding from what it reads in the preamble.
What works:
- parsing of inputenc should work
- \inputencoding is acted on in the preamble

What does not work:
- \inputencoding in the text
- all the corner cases I have not considered, and all buggy stuff in the
  'what works' paragraph
- InsetLatexAccent are still created, but I do not know when they got added
to the code.

The only notable trick in the code is that I had to disable buffering. Otherwise
the whole text was read before I had a chance to change the encoding...

Finally I remove the artificial limitation that forbid
  \usepackage[opt1,opt2]{package1,package2}



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27592 a592a061-630c-0410-9148-cb99ea01b6c8
2008-11-16 21:51:18 +00:00
Jean-Marc Lasgouttes
337c6d1577 First serious step for utf8 file format format. tex2lyx is now able to
read utf8 tex documents and translate them to lyxformat 249.

There is still no code to discover the encoding and use it, but it is the
easiest part (I hope).


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27563 a592a061-630c-0410-9148-cb99ea01b6c8
2008-11-16 17:02:00 +00:00
Jean-Marc Lasgouttes
bb04efd5a8 Now the document is not parsed at the beginning anymore.
Instead, new token are read when requested. The idea from now is
to be able to chenge encoding on the fly.

Now it is time to see whether idocstream actually works...


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27489 a592a061-630c-0410-9148-cb99ea01b6c8
2008-11-15 20:30:45 +00:00
André Pönitz
f1cba8ff64 more latin1..utf8 schanges. all of src/* should be utf8 now
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27425 a592a061-630c-0410-9148-cb99ea01b6c8
2008-11-14 15:58:50 +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
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