Commit Graph

16449 Commits

Author SHA1 Message Date
Vincent van Ravesteijn
bdf69de113 Don't set the read-only flags of the documents. The GuiCompare is modal anyway, so the user shouldn't be able to change something.
This reverts part of r31736.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31737 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-25 13:56:44 +00:00
Vincent van Ravesteijn
7227566e86 Call the Compare thread from the GuiCompare dialog.
Furthermore:
- increase safety, 
- improve error handling,
- minor cleanups,
- set documents to read-only while running the thread.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31736 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-25 13:41:46 +00:00
Vincent van Ravesteijn
18483e6362 Adds the threaded Compare class, which will eventually do the comparison between two documents.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31734 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-25 10:43:16 +00:00
Pavel Sanda
221bd56fae Fix warnings
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31728 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-25 09:28:02 +00:00
Jürgen Spitzmüller
d78bea45b4 * PrefDisplayUi.ui: add tooltip.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31725 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-25 09:15:18 +00:00
Richard Heck
d603b55b52 A couple comments and some very minor cleanup.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31720 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-25 02:22:36 +00:00
Richard Heck
14bb003b7e Add an HTML output flavor, and do something with it.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31719 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-25 01:48:14 +00:00
Richard Heck
d7d1b39adc More typos.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31718 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-24 20:25:35 +00:00
Richard Heck
e3cb00d7c7 Fix a couple typos.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31717 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-24 20:21:54 +00:00
Jürgen Spitzmüller
ebfacbe6ce * Makefile.am: add missing file
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31714 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-24 17:06:53 +00:00
Vincent van Ravesteijn
0fafccb7ed Change to camelbumpstyle.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31713 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-24 17:04:09 +00:00
Abdelrazak Younes
39d3b09150 Remove unused compile script that dates back to my initial Qt4 port...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31712 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-24 16:49:42 +00:00
Vincent van Ravesteijn
0e4d0ad7e9 Make trunk compile for now.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31711 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-24 16:17:24 +00:00
Vincent van Ravesteijn
36a8745291 set eol-styles.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31709 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-24 16:15:28 +00:00
Enrico Forestieri
5e26133947 Fix another problem related to bug #6284.
When pasting "# a" within \mbox{} through Ctrl+Shift+V, the space is
correctly retained. However, using Ctrl+Shift+V for pasting "^ a" into
\mbox{}, the space gets swallowed. This is fixed by this patch.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31708 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-24 15:54:03 +00:00
Vincent van Ravesteijn
d4be6cf24c Adds the user interface for the new Comparison feature.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31707 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-24 15:47:05 +00:00
Vincent van Ravesteijn
9722c8f1ea Add a global accessible function loadIfNeeded().
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31705 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-24 14:57:28 +00:00
Vincent van Ravesteijn
316a17f414 Changes in buffer_funcs.cpp::newUnnamedFile():
- the prefix can now be supplied,
- there can be more types of unnamed files,
- the code is made more concise,
- templatefile parameter is made optional,
- "newfile" is made translatable.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31704 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-24 14:20:00 +00:00
Vincent van Ravesteijn
f09a4ac03c Fix bug #6280: Wrong context menu is opened in an auto-opened inset.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31697 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-24 00:02:41 +00:00
Jean-Marc Lasgouttes
42546d3f2c Disable forking on Mac OS X. This should fix crashes on Snow Leopard.
It would be better to
* detect OS X version at run time (how??)
or
* use proper threads for autosave


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31696 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-23 16:50:40 +00:00
Jean-Marc Lasgouttes
b265203a84 Paragraph::write: buffer normal characters into a docstring, in order to reduce the number of calls to to_qstr().
THis leads to a big speedup of the buffer-write function (>60%). The goal is to make autosave less noticeable.

This patch should be safe as long as transforming a docstring to utf8 is equivalent to transforming the characters one by one.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31695 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-23 16:48:55 +00:00
Enrico Forestieri
1535e4b825 Fix the rest of bug #6284.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31694 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-23 15:00:36 +00:00
Jürgen Spitzmüller
537caa8833 * LaTeXFeatures.cpp:
- do not eat space at the beginning of \lyxadded macro (bug 6282).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31692 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-23 09:01:51 +00:00
Enrico Forestieri
456449bd56 Better fix for bug #6284. There's no need to check for spaces here
as they are already accounted for during the tokenization phase.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31687 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-20 15:26:22 +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
Enrico Forestieri
5484edda22 Fix bug #6284: missing space between # and text in math mode when using \mbox
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31680 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-19 23:11:36 +00:00
Enrico Forestieri
ba9d500de4 The current buffer is the master of an included file, not the grandmaster.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31677 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-19 10:29:15 +00:00
Enrico Forestieri
128e349191 Restore the master language at the end of an included child document
instead of the child document language.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31665 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-18 21:48:13 +00:00
Pavel Sanda
8962886acb String formatting
http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg155067.html


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31656 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-18 03:58:20 +00:00
Richard Heck
5f8f8dd947 Factor out some common code.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31655 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-17 22:58:44 +00:00
Richard Heck
973b0e25fb Redo the viewer_alternatives and editor_alternatives in terms of a map,
rather than a vector. This helps deal with problems involving multiple
specifications of a single command. (Even after the previous commit, 
we were still getting duplicates in the UI after every alteration of 
the preferences.) It's also more natural, anyway.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31654 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-17 22:52:16 +00:00
Richard Heck
9c3fc03f3a Fix how viewer_alternatives and editor_alternatives are written
to the preferences file. The old way produced tons of duplicates.
The fix is the same as for a prior bug with bibtex_alternatives.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31652 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-17 18:02:40 +00:00
Richard Heck
3d19a3a820 Viewer and editor selections were not being saved.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31651 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-16 16:17:52 +00:00
Jean-Marc Lasgouttes
d23a75a3dc Remove dead includes in FileName, since we do not use mkstemp anymore
Do not check for headers strings.h, io.h, process.h

Do not check for functions mkstemp, mktemp

Do not check for declarations of istreambug_iterator, iterator, mktemp

NOTE to cmake/scons maintainers: you should also get rid of the handling of those symbols.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31646 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-16 09:32:50 +00:00
Pavel Sanda
da55181c33 More info into emergency dialog. This is especially useful in case
more master/child emergency files were detected.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31642 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-15 21:37:09 +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
Pavel Sanda
d4bf62b417 Fixes
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31617 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-14 19:27:12 +00:00
Pavel Sanda
4257aa5e7f Make updating less dangerous, see comments in #6255.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31615 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-14 19:18:06 +00:00
Jürgen Spitzmüller
1f1c3a3ea8 * VCBackend.cpp: typo.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31607 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-13 08:39:03 +00:00
Jürgen Spitzmüller
cb815e4045 * Changes.cpp (getLaTeXMarkup):
- pass references, not copies.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31606 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-13 07:30:46 +00:00
Jürgen Spitzmüller
3b6931719a Assure the author is encoded correctly in the LaTeX output of change tracking markup (bug 6225).
Patch reviewed by Jean-Marc.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31602 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-12 16:22:05 +00:00
Jean-Marc Lasgouttes
60dca30530 disable the del-suppresses-equation-label-at-end feature (not easy to describe, is it?) when there is a selection
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31600 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-12 15:20:23 +00:00
Peter Kümmel
bdd92ac7a2 fix merged build
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31589 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-11 10:30:00 +00:00
Jürgen Spitzmüller
ba7efd136e * InsetInclude.cpp:
- use bformat for syntactically proper translatable message. 

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31586 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-11 09:34:13 +00:00
Enrico Forestieri
3cce787c6c Fix bug #6270: Bug in parsing selection as math macro argument
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31582 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-10 19:11:23 +00:00
Enrico Forestieri
a7c944b280 Fix bug #6250: LyX 1.6.4 crashes when copying Japanese text in math to clipboard
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31572 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-09 21:33:08 +00:00
Jürgen Spitzmüller
5f982b8c83 * InsetExternal.cpp:
* GuiExternal.cpp:
	- do not crash if the list of external templates is empty (bug #3974).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31569 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-09 12:40:34 +00:00
Jürgen Spitzmüller
2c6f0ae445 * GuiExternal.cpp:
- do not use invalid index if a template is not found. Fixes crash bug #6259.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31567 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-09 12:08:47 +00:00
Enrico Forestieri
6fb07e35c5 Fix bug #6264: Broken undo of removed script in mathed when both scripts are present.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31558 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-08 12:32:11 +00:00
Pavel Sanda
05182073a1 Correct sorting
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31552 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-07 09:15:29 +00:00