Commit Graph

20083 Commits

Author SHA1 Message Date
Richard Heck
3a03e71c3e Deal with the part of #7872 involving changes of branch activation
from Document>Settings.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40333 a592a061-630c-0410-9148-cb99ea01b6c8
2011-12-02 21:21:30 +00:00
Stephan Witt
42e7089a61 correct capitalization of AppKit framework - for case sensitive Mac OS X filesystems
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40316 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-29 20:41:08 +00:00
Georg Baum
5a525d932f Move some more packages from unconditionally swallowing to the package
registration mechanism, so that they are only swallowed if LyX will load them.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40315 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-29 20:09:40 +00:00
Georg Baum
4925de1097 Do not output parameters twice if the file was not found (part of bug #6127).
In this case, the inset parameters win in case there is any conflict. The only
exception is "type=eps", since I was too lazy to make the full keyval parser
of tex2lyx available to InsetGraphics in order to parse the special parameter.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40298 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-27 20:12:32 +00:00
Georg Baum
529a018bc3 Fix parsing of stuff with ] in \item arguments (part of bug #6127)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40295 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-27 13:29:56 +00:00
Georg Baum
76c5902b40 Parse the picture variant of \framebox correctly (part of bug #6449)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40294 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-27 11:57:47 +00:00
Uwe Stöhr
2906a35663 tex2lyx: support for Spreadsheet and chess external templates
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40270 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-25 01:01:45 +00:00
Richard Heck
8656d7fda3 Whitespace.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40246 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-23 18:23:11 +00:00
Richard Heck
6e6f036f03 Fix bug #7709. Seems we need to reset the source model here.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40245 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-23 16:52:46 +00:00
Richard Heck
05194fa79b Simplify code a bit.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40244 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-23 16:49:34 +00:00
Richard Heck
66af29735c Fix bug #7906. Check the widgets after creating the dialog.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40243 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-23 16:44:31 +00:00
Richard Heck
01dc4e4b83 Didn't mean to include this.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40241 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-22 18:49:16 +00:00
Richard Heck
d38d332d9f Fix bug #7905. We don't want to move out of the inset unless
we've put something into it. (We also don't need to copy an
empty string into it.)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40240 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-22 18:40:01 +00:00
Georg Baum
76e90badc0 Beautify documents created by writer2latex (see bug #5187).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40235 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-20 20:30:12 +00:00
Georg Baum
3f8a615477 Fix bug in paragraph detection (can be seen in test case of bug #5187):
If we want to look at the token after the next token, it may be needed
to call tokenize_one() twice and not only once as done in good().


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40234 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-20 20:28:55 +00:00
Peter Kümmel
8abb5429b9 prepare switch to switch-case in when parsing tex files
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40232 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-20 19:44:08 +00:00
Richard Heck
74ee5c0e69 Add assertion to check for memory leaks and remove the list when
we are done.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40228 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-20 18:49:12 +00:00
Richard Heck
7e42cfd690 New attempt to fix Pavel's crash, this modifies r40205 and r40207.
The global list of cloned buffers was a bad idea. We don't have multiple
export threads, but we can have multiple autosave threads. So now we keep
more than one of these lists at the same time, and each cloned buffer has
a pointer to the relevant list. Note that this would make multiple export
possible, if we wanted to do that at some time.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40227 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-20 18:49:05 +00:00
Georg Baum
0d28af3fba make a bit room for more ifs
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40225 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-20 17:03:00 +00:00
Richard Heck
6be38da1ff This commented-out line has been there since r13692! I think we can
get rid of it.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40217 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-18 23:32:58 +00:00
Richard Heck
eef5148a49 Fix bug #7873. Patch is sufficiently explanatory.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40212 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-18 21:34:40 +00:00
Richard Heck
14c10e40a8 Fix bug #7872: Mark Buffer dirty after changing branch activation.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40211 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-18 20:48:54 +00:00
Richard Heck
eecb001e95 Make sure we aren't trying to reuse the global variable, and make
sure we aren't leaking any cloned buffers.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40208 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-17 18:26:42 +00:00
Richard Heck
a8d12fdd66 Fix crash reported by Pavel. Multiply included children would crash
the destructor since we could, in some cases, end up deleting them
multiple times. So we need to keep a list of the Buffers we need to
delete, kind of like the BufferList.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40205 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-17 17:58:22 +00:00
Richard Heck
6e15590764 Revert previous patch to get a decent log message.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40204 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-17 17:58:18 +00:00
Richard Heck
75dc38ca74 Merge branch 'PavelCrash2'
Conflicts:
	src/Buffer.cpp

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40203 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-17 17:54:20 +00:00
Richard Heck
de3148c7c3 Simplify code slightly.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40202 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-17 17:29:38 +00:00
Richard Heck
94f0968e92 Minor cleanup.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40201 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-17 17:24:11 +00:00
Richard Heck
2b4fb23941 Clarify by renaming some arguments.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40200 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-16 00:38:06 +00:00
Richard Heck
bfad09a073 Cosmetics.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40199 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-15 18:24:42 +00:00
Georg Baum
76731046f0 Fix bug #7895: Do not output lines with only a single space.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40193 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-14 21:00:47 +00:00
Uwe Stöhr
966d76f86b tex2lyx/test/test-insets.tex: add a booktabs test table
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40192 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-14 00:13:09 +00:00
Georg Baum
f077658248 Fix bug #4553: booktabs for tex2lyx
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40189 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-13 19:49:50 +00:00
Georg Baum
a1cef2d55a Fix bug #3036: font changes inside \markright do not escape outside their scope
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40186 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-13 16:11:45 +00:00
Georg Baum
36f7ae1207 Do not swallow geometry settings if they are given as package options and
replace home made keyval parsing with the more robust process_keyval_opt().


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40185 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-13 12:23:27 +00:00
Georg Baum
8d707723b7 Fix bug #7668 (cosmetic whitespace issues)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40184 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-13 11:29:48 +00:00
Georg Baum
2a216184c4 Fix bug #7663: Misparsing of description \item with spaces
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40182 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-13 10:40:07 +00:00
Georg Baum
c8a715d855 Fix "stray '}' in text" warnings: When parsing with FLAG_ITEM the braces need
to occur in pairs.
If you change something in tex2lyx please don't commit without running the
tests and ensuring that no warnings or errors are written on stderr.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40177 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-12 18:41:44 +00:00
Georg Baum
f441663600 tabular*
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40176 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-12 17:54:50 +00:00
Peter Kümmel
a1ce213291 add header guard
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40165 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-10 20:16:22 +00:00
Julien Rioux
7ffc54f70e File format bump after r39982 (renaming of the japanese encodings for pLaTeX).
LyX file format incremented to 417.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40155 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-07 18:36:56 +00:00
Uwe Stöhr
ec0458ba01 tex2lyx/text.cpp: add a comment and fix a typo
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40152 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-06 22:46:30 +00:00
Uwe Stöhr
605e660d50 tex2lyx/test/box-color-size-space-align.tex: translation and a further testcase
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40151 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-06 22:42:51 +00:00
Uwe Stöhr
0fb02b561c tex2lyx:
- support for \makebox
- fix import of boxes without an inner box (the on-screen display was broken because of wrong default width setting)
- fix parsing of \framebox{content}, which LyX does not support yet - we have to use ERT

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40150 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-06 22:42:05 +00:00
Jean-Marc Lasgouttes
d7320ad89b Fix shortenng of file names in MakeDisplayPath: it is not a good idea to slice an utf8 string at arbitrary offsets, we have to work on a docstring instead. We need unfortunately to switch back and orth between utf8 and docstring.
This is a candidate for branch too, although the bug is minor.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40149 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-06 22:36:14 +00:00
Georg Baum
a3360ac3c6 Import optional argument of tabular (vertical alignment)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40147 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-06 18:54:15 +00:00
Georg Baum
eb882b2666 and another one
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40146 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-06 18:17:33 +00:00
Georg Baum
b4c6c95ad9 Forgot this in r40139.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40145 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-06 18:17:04 +00:00
Georg Baum
491bad7b00 Distinguish between empty argument and no argument
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40141 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-06 17:32:15 +00:00
Georg Baum
93d6ce915f Must not output anything between p.pushPosition() and p.popPosition().
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40140 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-06 17:16:54 +00:00