Commit Graph

80 Commits

Author SHA1 Message Date
Uwe Stöhr
64ede202fa preamble.cpp: set correct quotes language (currently an Italian document gets the non-existing quotes language "italian")
- also to branch?

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32448 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-10 02:41:33 +00:00
Uwe Stöhr
d04377a231 preamble.cpp: adjust comments for better clarity
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32447 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-10 02:29:49 +00:00
Vincent van Ravesteijn
e3b26029cc Fix bug #6365: tex2lyx uses wrong encoding in the preamble.
Everything is ok while reading the file, but when the lyxfile is written, only the first byte of a double-byte character is written to the file. This is because t.character() is sort of defined as cs_[0] in which cs_ is a docstring. This thus seems to fail for multi-byte characters.

Compare with src\tex2lyx\text.cpp line: 1250.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32441 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-09 12:29:48 +00:00
Jean-Marc Lasgouttes
ccfcd71b36 Get rid of Token::asString(), which is equivalent to cs().
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32439 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-09 11:53:16 +00:00
Uwe Stöhr
d319b368c7 tex2lyx/preamble.cpp: improve the fix from r31440:
- when languages are given in the documentclass options _and_ the babel options, babel takes the last language option of the \usepackage call
 - there is no quote language "ngerman", it is in both cases "german"

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31685 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-20 01:45:33 +00:00
Jean-Marc Lasgouttes
d87a67d8dc Fix a bug when the language passed as an option to babel is ignored.
This can be seen by trying out the document attached to ticket #6142.

The problem was that handle_opt() is not used only to parse languages,
and thus setting a lang-related bool in there is asking for trouble.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31440 a592a061-630c-0410-9148-cb99ea01b6c8
2009-09-22 13:23:36 +00:00
Uwe Stöhr
be82f88695 tex2lyx/preamble.cpp: revert r30103 and r30448 as discussed
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30974 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-11 00:07:08 +00:00
Vincent van Ravesteijn
6c2ab16e55 Revert previous commit.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30917 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-08 00:07:52 +00:00
Vincent van Ravesteijn
1b28af61e5 Fix part of bug #6127: Roundtrip Lyx->Latex->Lyx fails.
Add the package amstext to the list of known packages.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30916 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-07 22:51:02 +00:00
Uwe Stöhr
20f8c82aa8 tex2lyx/preamble.cpp: take also care of lyxlist, lyxcode, and lyxaddress
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30448 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-10 12:38:22 +00:00
Uwe Stöhr
c4675cc4be tex2lyx/preamble.cpp: support for fileformat 264 (nothing to do for tex2lyx)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30173 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-19 00:37:05 +00:00
Uwe Stöhr
6b85e6f99f tex2lyx/preamble.cpp: support for fileformat 263: support for the document languages Brazilian and Portuguese
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30172 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-19 00:28:20 +00:00
Uwe Stöhr
e06029fda5 tex2lyx/preamble.cpp: support for fileformat 262 (nothing to do for tex2lyx)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30171 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-19 00:10:18 +00:00
Uwe Stöhr
1b16d1545b tex2lyx/preamble.cpp: comment out no longer used code
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30169 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-19 00:00:46 +00:00
Uwe Stöhr
0aa4d9d25e tex2lyx/preamble.cpp: remove no longer used code
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30166 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-18 23:41:55 +00:00
Uwe Stöhr
1bcba82d8d tex2lyx/preamble.cpp: fix a bug reported by JMarc
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30165 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-18 23:35:49 +00:00
Uwe Stöhr
693b64674b tex2lyx/preamble.cpp: textcomp is also supported by LyX since we support Unicode
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30105 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-15 00:33:05 +00:00
Uwe Stöhr
d69af206ee tex2lyx/preamble.cpp: forgot this in last commit
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30104 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-15 00:21:34 +00:00
Uwe Stöhr
affc633c38 tex2lyx/preamble.cpp:
- better whitespace preamble output (still not perfect)
- support for fileformat 258
- proper solution how to treat LyX specific preamble stuff; this solves long standing issues (the old solution failed when more than one LyX specific command was used in a file)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30103 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-15 00:16:31 +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
c9a726bd43 tex2lyx/preamble.cpp: support for fileformat 256
- the code for \clear***page was already there
- tex2lyx allows already to use any input encoding

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30096 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-14 12:39:07 +00:00
Uwe Stöhr
6f1cd6eba2 tex2lyx/preamble.cpp: using amsmath and esint automatically is safer than not to use them. The automatic usage is also our default when you create a new LyX file.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30095 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-14 12:25:17 +00:00
Uwe Stöhr
a65af1e391 tex2lyx/preamble.cpp: support for fileformat 254: esint
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30094 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-14 12:21:30 +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
be48e7f9e5 tex2lyx/preamble.cpp:
- support for url, varioref, prettyref
- reduce the sometimes huge amount of whitespace in the preamble after importing files

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30058 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-11 23:45:17 +00:00
Uwe Stöhr
662846f227 preamble.cpp: fix http://bugzilla.lyx.org/show_bug.cgi?id=5846
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28751 a592a061-630c-0410-9148-cb99ea01b6c8
2009-03-10 23:55:25 +00:00
Jürgen Spitzmüller
3ccf39a084 * tex2lyx/preamble.cpp:
- fix thinko that caused tex2lyx to silently drop custom preamble entries in non-LyX-generated tex files.
	  (bug 5788). Patch from Jean-Marc.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28567 a592a061-630c-0410-9148-cb99ea01b6c8
2009-02-20 09:46:03 +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
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
Jean-Marc Lasgouttes
ee81b844d3 remove useless comments in tex2lyx
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27016 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-21 21:27:12 +00:00
André Pönitz
cb5a9b28d7 be kind to XaFooBarTeX
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26871 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-12 19:19:41 +00:00
André Pönitz
01bb9e2a57 fix problem with non-recognized utf8 encoding that lead to broken .lyx
files


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26844 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-11 16:07:14 +00:00
Jean-Marc Lasgouttes
1899c81d3e whitespace
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26608 a592a061-630c-0410-9148-cb99ea01b6c8
2008-09-29 08:30:41 +00:00
Uwe Stöhr
8f76634f10 tex2lyx/preamble.cpp: fix bug 19, patch by JMarc (I'm working with this patch for 4 months now and it is really stable.)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26603 a592a061-630c-0410-9148-cb99ea01b6c8
2008-09-28 20:15:08 +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
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
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
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
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
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
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
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