Commit Graph

376 Commits

Author SHA1 Message Date
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
Vincent van Ravesteijn
3c78445234 Remove duplicated entry from status.20x 2012-03-19 19:29:38 +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
uwestoehr
0bfe15d969 status.20x: some cosmetics as test commit 2012-03-15 00:26:59 +01:00
Richard Heck
26868fc04e Minor updates to status.20x. 2012-03-13 17:13:36 -04: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
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
Enrico Forestieri
8c24088b79 On Windows, properly account for the encoding of the temporary directory.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40875 a592a061-630c-0410-9148-cb99ea01b6c8
2012-03-06 21:24:04 +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
e377fa3168 EmbeddedObjects.lyx: description how to color every second table row
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40855 a592a061-630c-0410-9148-cb99ea01b6c8
2012-03-04 23:54:31 +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
Uwe Stöhr
433539cdac ia.po: updates by Giovanni
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40838 a592a061-630c-0410-9148-cb99ea01b6c8
2012-03-03 13:13:58 +00:00
Uwe Stöhr
91e11aff96 iop-article.lyx: add some important info to avoid compilation errors and improve the template a bit (thanks to MaX Funk for the hints)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40836 a592a061-630c-0410-9148-cb99ea01b6c8
2012-03-03 12:39:57 +00:00
Uwe Stöhr
db3152a3e0 modernCV.lyx: fix #8064 for branch
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40833 a592a061-630c-0410-9148-cb99ea01b6c8
2012-03-02 23:43:58 +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
Uwe Stöhr
d5aa03bfd0 status.20x: entry for the knitr fix
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40819 a592a061-630c-0410-9148-cb99ea01b6c8
2012-02-29 23:44:05 +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
Georg Baum
fbe35a1178 back to svn
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40805 a592a061-630c-0410-9148-cb99ea01b6c8
2012-02-28 20:43:35 +00:00