Commit Graph

110 Commits

Author SHA1 Message Date
Georg Baum
12f8e7a6f9 Small improvement for bug #7509 as suggested by JMarc
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38628 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-08 08:23:42 +00:00
Georg Baum
b2e1eb0dda Clean up parsing of optional arguments:
If an optional argument can be followed by another one, we need to use
getFullOpt(). Otherwise it would not be possible to parse \foo[][bar].
Remove getOptContent to avoid confusion (it does exactly the same as
getArg('[', ']') which is used in most places.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37354 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-28 20:29:06 +00:00
Georg Baum
d3c385de20 Next step towards a working roundtrip of files generated by LyX:
Try to recognize modules.
Again, this is needed because the complete LyX preamble is ignored.
It is not possible to recognize a module in all cases, but at least the simple
ones are handled now. As a prerequisite I also had to revive the filling of
known_environments. This has been removed (probably by accident) some time ago.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37306 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-23 21:10:20 +00:00
Georg Baum
cfd6767ec1 Import notefontcolor (one more step towards a working roundtrip for the LyX documentation)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37213 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-14 20:00:55 +00:00
Georg Baum
7c83f74f26 Exclude more conditional commands from preamble parsing:
LyX would output the parsed stuff unconditionally, so we must not translate
it in LyX document settings.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37191 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-12 22:03:15 +00:00
Georg Baum
acd57ccaaf Fix language handling in tex2lyx:
- Add missing babel synonyms (taken from a standard TeXLive 2010 install).
  Some synonyms might still be missing (if they are defined not by babel
  itself, but additional packages). Adding these is now simple: Only
  known_languages and known_coded_languages need to be touched.
- Translate babel language name arguments of \foreignlanguage and
  \selectlanguage to LyX names.
- Translate second argument of \foreignlanguage to LyX.
- Cleanup mixed language names in the preamble parser: Now all checks are
  done with LyX names, not a mix of babel and LyX names. This sets correct
  quotes even if the language as given as an alias.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37188 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-12 21:04:39 +00:00
Georg Baum
9ac7fa483d Fix misparsing of \usepackage in
\@ifundefined{textcolor}{\usepackage{color}}{}


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37140 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-06 21:38:26 +00:00
Georg Baum
416d19ff84 hyperref support for tex2lyx
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37138 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-06 20:57:16 +00:00
Georg Baum
5c53dcf88f tex2lyx: Do not swallow a user defined \parindent
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37065 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-02 16:54:58 +00:00
Uwe Stöhr
73cdd2547e tex2lyx/preamble.cpp: support for
- polytonic Greek
- Mongolian
- Mexican Spanish

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37053 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-31 07:31:59 +00:00
Georg Baum
8f037c8e91 Increase tex2lyx output format to 345 (LyX 1.6.x).
344: Remove pdf_pagebackref header flag
345: Nothing to do (this is a docbook-only change)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37015 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-27 18:19:19 +00:00
Georg Baum
32d435e150 Increase tex2lyx output format to 343.
343: Write the use_default_options header flag


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37014 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-27 18:16:22 +00:00
Uwe Stöhr
bea8c9ef8d tex2lyx/preamble.cpp: prerequisites for further language support
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36962 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-20 03:34:00 +00:00
Uwe Stöhr
a0ff0a15cf tex2lyx/preamble.cpp: support Vietnamese (since format 291)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36959 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-20 01:47:34 +00:00
Uwe Stöhr
fd3bd1a06a tex2lyx/preamble.cpp: add some further missing things from r36947: support for Latin and North Sami
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36958 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-20 01:36:27 +00:00
Uwe Stöhr
cc1710e943 tex2lyx/preamble.cpp: whitespace only
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36956 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-20 01:14:18 +00:00
Uwe Stöhr
3fa2875355 tex2lyx/preamble.cpp: add missing things from r36947
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36954 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-20 01:11:02 +00:00
Georg Baum
ec22820cbf Increase tex2lyx output format to 297.
297: new name for upper sorbian language, new languages albanian and lower
sorbian (actually lower sorbias was (incorrectly) already recognized)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36945 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-19 15:21:01 +00:00
Georg Baum
e5fd128200 Increase tex2lyx output format to 295.
294: Nothing needed, but add some placeholders to the preamble for documentation
295: Convert URL command inset to Flex inset


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36941 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-18 20:41:41 +00:00
Georg Baum
5aedfc6b9f Increase tex2lyx output format to 276 (LyX 1.5.x).
Add support for arabic (arabi package), and two languages that are already
avaiilable in previous formats, but have been forgotten: latvian and lithuanian.
Again, the previous format was not handled correctly:
arabic (arabi) was parsed as arabic (arabtex).


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36845 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-12 18:47:02 +00:00
Georg Baum
a4a7502769 textsubscript and textsuperscript for tex2lyx
(deactivated until format is recent enough)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36839 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-12 12:16:18 +00:00
Georg Baum
e693a60c34 Fix bug #5716.
Since separators are not allowed by the current .lyx version written by
tex2lyx, an empty note is used instead.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36838 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-12 11:45:09 +00:00
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
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
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
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