Commit Graph

457 Commits

Author SHA1 Message Date
Peter Kümmel
615d42d357 TR1: use std::tr1 regex with msvc10
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34725 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-29 17:09:40 +00:00
Richard Heck
22c1d47b02 Fix bug #6762. Silly mistake.
Also, disable corresponding code for required arguments. tex2lyx does
not produce a high enough file format yet for this to make sense, I
don't think.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34635 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-09 15:08:04 +00:00
Richard Heck
b0097bcddb Introduce a new "RequiredArgs" tag for layouts. This functions much as
the OptionalArgs tag does and is implemented by the now misnamed
InsetOptArgs, except that its content gets wrapped in "{}" rather than
"[]". Required arguments do not actually have to be provided, but they
are always output. 

This will allow e.g. beamer's Block environment to be implemented
without ERT.

Documentation to follow.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34591 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-04 21:50:08 +00:00
Pavel Sanda
62ca7f3ae5 Proper camel case for FileName.absFilename
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34234 a592a061-630c-0410-9148-cb99ea01b6c8
2010-04-21 01:19:09 +00:00
Richard Heck
dcc7497bde Fix crash reported by Bennett. We could try to catch these exceptions
elsewhere, but I actually don't know why I put them here in the first
place.

The tex2lyx stuff allows us not to wrap the calls to
frontend::Alert::warning in "#ifdef TEX2LYX" blocks.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34192 a592a061-630c-0410-9148-cb99ea01b6c8
2010-04-17 22:36:31 +00:00
Vincent van Ravesteijn
69fd1193e5 Fix bug #6219: Latex problem with multi-line citep arguments
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34011 a592a061-630c-0410-9148-cb99ea01b6c8
2010-04-01 23:31:05 +00:00
Vincent van Ravesteijn
ba97587b16 Fix bug #6631: tex2lyx doesn't handle \textquotedbl{} nicely.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34010 a592a061-630c-0410-9148-cb99ea01b6c8
2010-04-01 22:49:52 +00:00
Richard Heck
29c93f87e6 Make these const, too. I mean, why not?
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33934 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-29 21:31:17 +00:00
Vincent van Ravesteijn
487e9ad92a Fix bug #6377: Tex2lyx error with multiple languages.
We have to set the language again when a new paragraph is started. Otherwise the n'th paragraph in a certain language is set to the document language.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33727 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-12 18:36:19 +00:00
Enrico Forestieri
0f8929d5d1 Fix command line parsing and allow unicode arguments for tex2lyx on Windows.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33723 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-12 01:18:39 +00:00
Vincent van Ravesteijn
b9b872f36a Fix bug #6474: Tex2lyx skips all spaces in the preamble.
Partially reverting r30113.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33711 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-11 16:56:41 +00:00
Peter Kümmel
3a5d681a9b cmake: fix merge build
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33660 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-07 11:03:23 +00:00
Enrico Forestieri
51d70699ef Fix bug #5525: Windows XP doesn't shut down with LyX open
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33077 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-17 23:01:48 +00:00
Uwe Stöhr
9c7b52dd3b preamble.cpp: extend a comment
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32496 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-12 21:23:54 +00:00
Uwe Stöhr
c7dfe186fb preamble.cpp: fix comment
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32482 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-11 23:14:36 +00:00
Uwe Stöhr
91ce0aa188 preamble.cpp:
- proper solution to determine the quotes language
- add Kazakh, that we already support in LyX for ages


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32476 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-11 04:11:44 +00:00
Uwe Stöhr
6b26b4abd1 preamble.cpp: tex2lyx creates fileformat 264 - the encoding "ascii" is known to LyX since fileformat 262 so that a special handling for this encoding is no longer necessary
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32472 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-11 01:26:07 +00:00
Uwe Stöhr
96c6a139c4 preamble.cpp: simplify code
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32471 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-11 01:22:48 +00:00
Uwe Stöhr
a831919c0c preamble.cpp: simplify code and reintroduce code that was accidentally deleted in previous commit
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32449 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-10 03:07:36 +00:00
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
Jean-Marc Lasgouttes
0a868fb846 remove special TEX2LYX code in Spacing,h
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31783 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-28 10:07:10 +00:00
Jean-Marc Lasgouttes
0c1ff6d89e Move some functions that only required a FontInfo parameter from Font.*
to FontInfo.*

This allows tex2lyx to use the plain FontInfo object (via Layout), and to remove
several '#ifdef TEX2LYX' in the code

Reorder a bit the makefile in tex2lyx


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31772 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-27 16:16:15 +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
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
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
Jean-Marc Lasgouttes
eef60e5197 fix part of ticket #6142: avoid a memory access error when an encoding is unkonwn
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31222 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-24 22:06:51 +00:00
Enrico Forestieri
0695afbc55 Don't rely on the signal delivered by raise(), as this may cause a bogus
assertion when Qt is compiled in debug mode, and simply directly perform
an emergency cleanup when a shutdown event occurs on Windows.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31029 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-14 13:19:02 +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
Jean-Marc Lasgouttes
d9e4ced1d4 Remove dummy gettext.cpp from tex2lyx source and use a dummy message
object instead.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30505 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-12 14:49:30 +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
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
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
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
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