Commit Graph

19878 Commits

Author SHA1 Message Date
Vincent van Ravesteijn
013dc6cb3a Fix bug #7653: Quotation marks have wrong color
Quotation marks had the wrong color when using change tracking, or when
selecting.

(cherry picked from commit 14ef7d2b82)
2012-04-29 17:00:14 +02:00
Vincent van Ravesteijn
d4238397b9 Fix bug #7667: Pixmap cache and CT lead to random colors
The signature of the character in cache should take into account the
change tracking baseColor (author) and mergeColor (added/deleted). If not,
we will mixup different cached pixmaps.

(cherry picked from commit 6327993867)
2012-04-29 17:00:13 +02:00
Vincent van Ravesteijn
a102ba7564 Reset the (running) change in PainterInfo
When an InsetText is deleted, all lines in the inset are painted as
deleted. This status should be restored afterwards. If not, insets will be
painted in the wrong color afterwards (e.g. tables).

(cherry picked from commit af4e31ec28)
2012-04-29 17:00:12 +02:00
Vincent van Ravesteijn
76bff4cc04 BufferView::dispatch(): add a missing break
(cherry picked from commit 3a395ca0f5)
2012-04-29 17:00:11 +02:00
Vincent van Ravesteijn
921445239a Do not show deleted text in the html title
(cherry picked from commit 77c8c15947)
2012-04-29 17:00:10 +02:00
Enrico Forestieri
7a605c4535 Fix bug #8139 and a thinko in [737e9b2c/lyxgit].
No status.20x entry needed, as this should have been part
of [3285ce1d5/lygit].

(cherry picked from commit 66a95b9c1b)
2012-04-26 17:20:23 +02:00
Pavel Sanda
7cea9372d5 Backport 217ef5bf3 (#81380 2012-04-26 14:19:05 +02:00
Pavel Sanda
ca0434c0df Attempt to fix #8137 (arrived at r40862).
1) Revert to designer compilable by older Qt's
2) Remove spacer in right part of dialog
3) Decrease height.
Richard, please check.
2012-04-24 01:32:45 +02:00
Richard Heck
ddee4f872b Don't output extra body tags with included files. 2012-04-23 14:14:01 -04:00
Richard Heck
650ab1783a Use InsetLayout to style the XHTML output.
Note that we have also changed the layout name to uppercase, but
this should be fine, since it was so far unused.

Conflicts:

	src/insets/InsetScript.cpp
2012-04-17 09:28:28 -04:00
Enrico Forestieri
482355e7b4 Fix bugs #6871 and #8119.
Both bugs above were due to a missing screen update. This patch
updates the current view after dispatching a lyxserver command
and thus solves both.

The patch is quite strightforward and the only difficulty was due
to the fact that the lyxserver needs the result of the dispatched
command. Now, GuiApplication::dispatch(FuncRequest const &)
does update the view, but does not return any result, while
GuiApplication::dispatch(FuncRequest const &, DispatchResult &),
which is also called by the former, does not update the view.
So, I split the first one, isolating the code performing the update,
such that the second one can also update the current view when
the caller is the lyx server. When the action is initiated by
anything different from the lyx server, the behavior is unchanged.

(cherry picked from commit ea31541848)
2012-04-16 00:19:22 +02:00
Enrico Forestieri
fe47997587 Fix bug #8105: Crash when deleting math macro from the inside
It seems that parameterless macros are not wrapped into a MathAtom.
Rather than touching the macro code (which is tantamount to opening
a can of worms, IMHO), I prefer this solution.

(cherry picked from commit d07f9eec20)
2012-04-15 23:59:18 +02:00
Pavel Sanda
e67f402cec Compile fix 2012-04-11 21:11:06 +02:00
Enrico Forestieri
99fe8ef2ba Use the right latex backend when a converter needs aux files.
If a converter specifies the needaux flag, latex (or xelatex) is
always run to produce the needed auxiliary files. This is wrong
because there are documents that can only be compiled with a specific
backend and thus the conversion may fail. On the other hand, even if
the document specifies the backend to be used, LyX ignores this info.

This commit rectifies this behavior by letting LyX run the same flavor
of the latex backend that shall be used for previewing the document
also for producing the auxiliary files.

(cherry picked from commit 3285ce1d5c)

Conflicts:

	src/Converter.cpp
2012-04-11 20:32:27 +02:00
Peter Kümmel
229fa2cd88 clang: std::string is used here, fwd is not enough
(cherry picked from commit f41057cae6)
2012-04-09 15:17:17 +02:00
Vincent van Ravesteijn
036e0c2abd Fix bug #8114: LyX does not retrieve negative bbox parameters
LyX fails to read the bounding box from an EPS file if it has
negative values. Adjusting the regex will overcome this problem.
Negative values do not pose big problems later on, but the GUI
doesn't handle it correctly yet (see bug #5718).

(cherry picked from commit f0754582b8)
2012-04-09 15:17:07 +02:00
Vincent van Ravesteijn
a6399dcd84 Fix a copy-paste error introduced in b754fb02
(cherry picked from commit 91bc04946f)
2012-04-08 23:33:29 +02:00
Richard Heck
25246819de Backport the following from trunk:
29cf7af6d3
		8dd436b7dc
		7c5f28ad26
This fixes issues with empty paragraphs in XHTML output.
2012-04-08 10:20:11 -04:00
Richard Heck
b82a856a32 Make index comparisons for XHTML output case insensitive. 2012-04-03 17:57:01 -04:00
Richard Heck
8558d84d4d Clear local layout before reading BufferParams. Otherwise, you can't
delete the local layout.
2012-04-03 15:58:06 -04:00
Richard Heck
6b5e8b3e83 Sorry, I didn't mean to include this change from trunk.
That said, Julien, if you see this, is that something we
should think about backporting?
2012-04-01 18:32:10 -04:00
Richard Heck
858ccc413f Backport fix for bug #8107. We need to invalidate the file
cache, not just the BibInfo cache, when we create a new BibTeX
inset.

Conflicts:

	src/insets/InsetBibtex.cpp
2012-04-01 18:28:55 -04:00
Jean-Marc Lasgouttes
f98bb89227 Better support for (Lua|Xe)TeX files in tex2lyx
When one of the packages specific to these engines are used in the TeX file:
* set default encoding to utf-8
* set \use_non_tex_fonts to true

This is a hand-made backport of svn commit r40765.
2012-03-26 16:10:31 +02:00
Vincent van Ravesteijn
c32c85c140 Fix monolithic build (bug #8079) 2012-03-24 15:33:34 +01:00
Vincent van Ravesteijn
87d97322ef Fix more possible crashes due to asInsetRef()
InsetMathHull has no method asInsetRef() and returns therefore 0.

See also 5bd68605.
2012-03-24 11:12:42 +01:00
Richard Heck
5bd68605df Backport fix for bug #8095.
The crash was due to the otherwise innocent looking 07924ac300. The cast
Vincent replaced was already wrong---it seems to have been a thinko in
7bbd67eb2679---but it worked kind of by accident before. Now it crashes.
2012-03-23 14:43:41 -04:00
Lars Gullik Bjønnes
862060f041 Setup .gitignore for generated files, now for branch. 2012-03-23 14:14:34 -04:00
Uwe Stöhr
5a2447ceda GuiTabular.cpp, InsetTabular.cpp: remaining issues I forgot in previous commit 2012-03-21 22:38:02 +01:00
Uwe Stöhr
6f5ea2ae47 GuiTabular.cpp: fix bug #8092 also for branch 2012-03-21 21:50:34 +01:00
Vincent van Ravesteijn
cddd90dfdf Fix bug #8083: Fix the selection of cells below multirows
Multirows were introduced in 8bb69f24 (Uwe Stoehr, 11 Feb 2010). In the
computation of the nearest cell, it was forgotten to account for the
vertical offset. tabular.cellHeight is the full height of the cell, while
the point that comes from the coordCache is offsetted by VOffset.
Therefore, we have to subtract the VOffset from o.y_.
2012-03-19 19:29:37 +01:00
Vincent van Ravesteijn
b754fb0253 Clear the error list from previous errors
We only copied the error list to the cloned buffer when makeLatexfile
failed. This means that a second try will never clear the error list and
the user will be presented the same list again.

Therefore, we unconditionally copy the error list such that we also clear
the list on success.
2012-03-19 19:29:36 +01:00
Juergen Spitzmueller
f50edc8673 Fix bug #8069: View/Update other formats button disabled with non-TeX fonts 2012-03-16 15:53:45 +01:00
Uwe Stöhr
7d200f302d GuiTabular.cpp: fix bug #8084 2012-03-15 02:29:47 +01:00
Uwe Stöhr
1b62b21fcc port from master: - test/test-insets.tex 2012-03-15 02:16:16 +01:00
Enrico Forestieri
92c92effa4 First timeout after 3 mins, not 30.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40882 a592a061-630c-0410-9148-cb99ea01b6c8
2012-03-07 00:34:32 +00:00
Enrico Forestieri
b067c04309 Fix bug #8032 (timeout when using the Sweave module)
After the timeout elapses, the user is notified that a command is taking
a long time to complete and is given the choice to stop it. If the user
decides to let the command run, the timeout is increased, otherwise the
command is killed. One is prompted a first time after 3 mins, a second
time after 9 mins, a third time after 27 mins, and so on, i.e., the n-th
prompt occurs after 3^n minutes.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40881 a592a061-630c-0410-9148-cb99ea01b6c8
2012-03-07 00:26:17 +00:00
Pavel Sanda
8bdd1082fa Squash warning
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40880 a592a061-630c-0410-9148-cb99ea01b6c8
2012-03-07 00:05:46 +00:00
Enrico Forestieri
b7cc97e2d0 Since version 1.9 SumatraPDF supports forward search without DDE commands.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40879 a592a061-630c-0410-9148-cb99ea01b6c8
2012-03-06 23:30:23 +00:00
Richard Heck
dc7fd33b84 Backport JMarc's fix for bug #6367.
* Undo.cpp:
 - rename cur member of UndoElement to cur_before
 - add new member cur_after, which is set by Undo::endUndoGroup
 - create a new Undo::endUndoGroup variant that takes a Cursor as parameter. We cannot get rid of the old one because it is used for LFUN_COMMAND_SEQUENCE.
* Cursor.cpp:
 - use endUndoGroup(Dociterator const &) for dispatch
 - update Cursor::endUndoGroup to pass cursor.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40876 a592a061-630c-0410-9148-cb99ea01b6c8
2012-03-06 23:12:36 +00:00
Richard Heck
8d3e242755 Backport fix for #7997.
The View->Source pane resets the format every time you click into
a new paragraph, which is very annoying. This commit fixes this bug.

If anyone has a better idea, please let me know. I posted to devel
about it but got no response.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40864 a592a061-630c-0410-9148-cb99ea01b6c8
2012-03-05 22:51:53 +00:00
Richard Heck
922726faae Backport fix for #7916.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40863 a592a061-630c-0410-9148-cb99ea01b6c8
2012-03-05 22:38:21 +00:00
Richard Heck
1b74e82b9c Add option to view only preamble when viewing source.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40862 a592a061-630c-0410-9148-cb99ea01b6c8
2012-03-05 22:36:27 +00:00
Richard Heck
ec5a0965d3 Backport fix for #7787.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40861 a592a061-630c-0410-9148-cb99ea01b6c8
2012-03-05 22:30:19 +00:00
Uwe Stöhr
874e1b5299 tex2lyx/text.cpp: some whitespace fixes
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40851 a592a061-630c-0410-9148-cb99ea01b6c8
2012-03-04 13:48:49 +00:00
Vincent van Ravesteijn
436ab3a2c2 branch: Fix handling of the add branch textfield in GuiBranches
- Enter in the textfield adds the branch,
- Make sure the dialog is not closed when pressing enter, 
- Pressing Ctrl+Enter or the Enter on the numpad closes the dialog.

Patch based on a patch from Scott Kostyshak.

see r40839.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40847 a592a061-630c-0410-9148-cb99ea01b6c8
2012-03-03 15:55:00 +00:00
Vincent van Ravesteijn
9a5c01acb8 branch: GuiCitation: Do not allow to add entries by pressing Enter when the Add button is disabled.
see r40835.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40846 a592a061-630c-0410-9148-cb99ea01b6c8
2012-03-03 15:52:21 +00:00
Jürgen Spitzmüller
d2b87f4706 Work around qt bug that prevents the glyph LATIN CAPITAL LETTER SHARP S from being pasted (bug #8057).
Backport of r40829.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40831 a592a061-630c-0410-9148-cb99ea01b6c8
2012-03-02 14:59:53 +00:00
Georg Baum
3655600dce backport r40826.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40827 a592a061-630c-0410-9148-cb99ea01b6c8
2012-03-01 20:39:46 +00:00
Pavel Sanda
435dce17c0 Backport graphics tooltip
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40812 a592a061-630c-0410-9148-cb99ea01b6c8
2012-02-29 18:54:26 +00:00
Georg Baum
4b77821d96 backport r40804
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40806 a592a061-630c-0410-9148-cb99ea01b6c8
2012-02-28 20:46:20 +00:00