Commit Graph

402 Commits

Author SHA1 Message Date
Richard Heck
773f2b365c Status for last commit. 2012-05-03 15:42:21 -04:00
Richard Heck
264948348e Fix bug 8124. We enable LFUN_INSET_MODIFY in InsetBox if it
is intended for us, i.e., if the first argument is "box". Maybe we
should also check to make sure that the rest of the arguments are
good, but we used just to return true no matter what the argument
was, so this is an improvement.

LFUN_INSET_MODIFY is really kind of a mess.
2012-05-02 17:43:18 -04:00
Vincent van Ravesteijn
3a53a52b1c Fix bug #7914: Freeze on docbook export of lists and bibliography
The LATEX_LIST_ENVIRONMENT and LATEX_BIB_ENVIRONMENT type paragraphs are
not yet implemented in DocBook export. However, we need to actively skip
these paragraphs in order not to end up in an endless loop.

(cherry picked from commit fa9bd04ea4)
2012-05-02 18:27:13 +02:00
Vincent van Ravesteijn
2e771bf78d Fix bug #8089: Handle spaces at the end of the stream
If the stream is good (i.e. there are still tokens) and we expect an
argument, we call getArg(). However, if there are only spaces, the stream
suddenly isn't good anymore after 'skipSpaces' and we would get an error
when calling 'getChar'. Therefore we have to check whether the stream is
still good.

MathParser: Do not rewind the stream if we can't read from it

If the stream is not good, we don't need to 'putback', because we didn't
read anything yet. If we now do rewind the stream, we are asking for
problems as in bug #8089.

This was introduced in [3cafb856\lyxgit] to fix bug #4318.

(cherry picked from commit 26dcfcd343)
(cherry picked from commit 1ef930c058)
2012-05-02 18:24:24 +02:00
Richard Heck
f79fd6013e More re-ordering, again mostly to test emails. 2012-05-02 11:28:15 -04:00
Richard Heck
f1c4a8fd03 Re-order status.20x, again. 2012-05-02 10:57:15 -04:00
Richard Heck
4b6ddefcaa Introduce LyXHTML section in status.20x 2012-05-02 10:54:22 -04:00
Vincent van Ravesteijn
39f06f37c3 Fix bug #7518: Assert when selecting in RTL text
If we are in rtl text, we *need* to check whether the first character is a
space. We can't use the rtl variable for this because this is only
computed on the last row.

This bug was introduced in [0a137e31/lyxgit] to fix the computation for
freespacing paragraphs. We better can just check whether the paragraph is
freespacing or not.

(cherry picked from commit d7f68078cf)
2012-05-01 11:45:58 +02:00
Vincent van Ravesteijn
0665673d03 Fix bug #8078: Assertions in xhtml output on Windows
(cherry picked from commit 3c0e3c16c8)
2012-05-01 11:42:52 +02:00
Enrico Forestieri
124bc762a7 Fix bug #8140: Crash with math macros and input completion
When clicking away in the same math inset after hitting '\', the
cursor may be broken and all of its instances have to be fixed.

(cherry picked from commit 9825621798)
2012-05-01 01:01:03 +02:00
Richard Heck
4296e47d28 Re-order status.20x a bit more. 2012-04-30 18:08:33 -04:00
Richard Heck
384ba91d5c OK, one more try here. Re-order a bit more. 2012-04-30 17:55:10 -04:00
Richard Heck
d831a451d1 OK, re-order a bit more. Last try with the email stuff for now. 2012-04-30 17:53:39 -04:00
Richard Heck
6cfbc51039 Re-order a bit. 2012-04-30 17:51:17 -04:00
Richard Heck
1b23d6ada8 Another small test. Sorry for all of these. I'm trying to get the
commits into the email, and there's only one good way to test it.
2012-04-30 17:45:49 -04:00
Richard Heck
5fc596ff09 Another silly test. 2012-04-30 17:25:35 -04:00
Richard Heck
cdd0b5c187 Another silly fix for testing. 2012-04-30 17:20:57 -04:00
Richard Heck
71f9611d70 Another fix for testing. 2012-04-30 17:19:07 -04:00
Richard Heck
d14646964a Re-order status.20x a bit. This is really just a test. 2012-04-30 16:51:49 -04:00
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
Vincent van Ravesteijn
507701261a Include the qt gif plugin in the Windows installer
Since LyX2.0 there was a busy icon in the status bar,
but it is not visible on Windows unless the gif plugin
is distributed along.
2012-04-29 17:00:09 +02:00
Pavel Sanda
7cea9372d5 Backport 217ef5bf3 (#81380 2012-04-26 14:19:05 +02:00
Richard Heck
ddee4f872b Don't output extra body tags with included files. 2012-04-23 14:14:01 -04:00
Uwe Stöhr
4e1bc622ca backport fix for #8102 2012-04-23 01:28:55 +02: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
Richard Heck
9b5da57623 Fix header of status.20x. 2012-04-15 22:43:21 -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
Uwe Stöhr
fea4cfbbd7 status.20x: fix 2 typos; Richard, can you please revise the now invalid info about SVN in the header? 2012-04-15 04:22:02 +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
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
Uwe Stöhr
4d9c273d02 uk.po: translation update by Yuri 2012-04-07 03:15:23 +02: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
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
Uwe Stöhr
3c2c0c182f Merge branch '2.0.x' of git.lyx.org:lyx into 2.0.x 2012-03-28 22:51:50 +02:00
Uwe Stöhr
44ee575562 beamer.layout: fix #8094 also for branch 2012-03-28 22:51:36 +02:00
Richard Heck
e5c8f33be7 Clean up the include_bib script a bit. 2012-03-26 12:07:46 -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
Juergen Spitzmueller
0ee5c1919a Beamer supports \subsubsection. Add to layout. 2012-03-26 12:33:37 +02:00
Enrico Forestieri
ae06825513 status.20x for last commit.
I first used cherry-pick, then tried to modify status.20x but there
was no way I found to proceed from there. So, to be able to come
out form this situation I reverted the changes to status.20x,
pushed the cherry-picked revision and then committed the changes
to status.20x.

Let me say that git is way too much complicated to be really useful.
2012-03-25 15:49:10 +02: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
Uwe Stöhr
6f5ea2ae47 GuiTabular.cpp: fix bug #8092 also for branch 2012-03-21 21:50:34 +01:00