Commit Graph

30730 Commits

Author SHA1 Message Date
Georg Baum
de6e4a2937 Make guessFormatFromContents() a bit more private, since it is not supposed
to be used in new code.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40790 a592a061-630c-0410-9148-cb99ea01b6c8
2012-02-21 20:46:37 +00:00
Georg Baum
26e5f1a8ec Use libmagic for file format detection if available.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40789 a592a061-630c-0410-9148-cb99ea01b6c8
2012-02-21 20:29:44 +00:00
Georg Baum
9f58d50944 merge triplicated image format lists
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40788 a592a061-630c-0410-9148-cb99ea01b6c8
2012-02-21 20:20:53 +00:00
Kornel Benko
992b1d021e * sk.po
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40787 a592a061-630c-0410-9148-cb99ea01b6c8
2012-02-21 15:35:59 +00:00
Pavel Sanda
15e42e93ee Fix #7787
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40786 a592a061-630c-0410-9148-cb99ea01b6c8
2012-02-21 13:54:55 +00:00
Uwe Stöhr
05446b232f support for verbatim: step 2: tex2lyx support
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40785 a592a061-630c-0410-9148-cb99ea01b6c8
2012-02-20 23:38:13 +00:00
Uwe Stöhr
6869d5205f support for verbatim: step 1: the layout and the lyx2lyx code,;fileformat change (next step is the beamer issue and last step tex2lyx support)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40784 a592a061-630c-0410-9148-cb99ea01b6c8
2012-02-20 02:10:33 +00:00
Enrico Forestieri
3018614da1 On *nix, a proper forward definition of docstring is necessary for
overriding a pure virtual method (part of bug #8032).
I wonder why it was working on Windows and why it works for QString.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40783 a592a061-630c-0410-9148-cb99ea01b6c8
2012-02-19 21:44:47 +00:00
Georg Baum
360b94ee35 Remove outdated, unmaintained build system. Still one to go ;-)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40780 a592a061-630c-0410-9148-cb99ea01b6c8
2012-02-19 13:13:05 +00:00
Uwe Stöhr
1585015805 documentation files: port recent changes from branch
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40779 a592a061-630c-0410-9148-cb99ea01b6c8
2012-02-19 04:41:01 +00:00
Uwe Stöhr
19efc2d2e7 ja.po: make it compilable (this file was accidentally truncated in r40749, fixes #8048)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40776 a592a061-630c-0410-9148-cb99ea01b6c8
2012-02-19 02:39:47 +00:00
Enrico Forestieri
1eb41a88f2 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/trunk@40775 a592a061-630c-0410-9148-cb99ea01b6c8
2012-02-18 14:16:25 +00:00
Enrico Forestieri
dd2185a4a6 Call lyxpak.py using the original (not mangled) document file name.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40773 a592a061-630c-0410-9148-cb99ea01b6c8
2012-02-18 13:49:33 +00:00
Richard Heck
a26b53885e Minor clarification. See bug #8044.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40769 a592a061-630c-0410-9148-cb99ea01b6c8
2012-02-16 17:52:01 +00:00
Richard Heck
6f821fe14d Change i.g. to i.e. throughout.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40768 a592a061-630c-0410-9148-cb99ea01b6c8
2012-02-16 15:47:42 +00:00
Richard Heck
cc4734f317 Typos and the like in the Additional Features manual, fixed thanks
to Scott Kostyshak.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40767 a592a061-630c-0410-9148-cb99ea01b6c8
2012-02-16 15:39:53 +00:00
Kornel Benko
ceefd398fe * sk.po
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40766 a592a061-630c-0410-9148-cb99ea01b6c8
2012-02-16 14:50:27 +00:00
Jean-Marc Lasgouttes
586e0e6b8a Set use_non_tex_fonts buffer parameter and default encoding correctly when we detect that xetex or luatex is used.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40765 a592a061-630c-0410-9148-cb99ea01b6c8
2012-02-16 10:40:02 +00:00
Uwe Stöhr
220cbe0fd8 cmake/build.bat: disable merged build be default, can be re-enabled for a final build (as suggested by Peter)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40764 a592a061-630c-0410-9148-cb99ea01b6c8
2012-02-15 23:17:34 +00:00
Uwe Stöhr
93ec58a66c fr.po: port recent fixes from branch by using the file from branch (fr.po has not yet been changed in trunk for LyX 2.1)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40763 a592a061-630c-0410-9148-cb99ea01b6c8
2012-02-15 23:04:36 +00:00
Uwe Stöhr
064834e468 port changes from branch
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40762 a592a061-630c-0410-9148-cb99ea01b6c8
2012-02-15 22:46:48 +00:00
Georg Baum
481acc66e7 Forgot that in r40694: There is no {} needed after \nobreakdash-
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40758 a592a061-630c-0410-9148-cb99ea01b6c8
2012-02-15 20:56:40 +00:00
Georg Baum
9fe72c3501 Move readBB_from_PSFile() out of support (no code change),
since it soon will need to use the Formats class.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40757 a592a061-630c-0410-9148-cb99ea01b6c8
2012-02-15 20:50:52 +00:00
Georg Baum
433b919457 Revert r40742, since it broke the tooltips of the changed commands.
Apart from that it implies a tab width of 4, which is not used by everybody.
The other commands should probably be fixed as well, but I do not touch foreign code.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40756 a592a061-630c-0410-9148-cb99ea01b6c8
2012-02-15 20:18:21 +00:00
Jean-Marc Lasgouttes
5d3461b10f Sort out usage of INset::has Settings and Inset::clickable
* now hasSettings only means... that the inset has a settings dialog
 * and clickable means that something should happen with left-clicking on the inset

Some inset behaviours are changed:
 * (V)Space insets are not clickable anymore (the settings dialog is still accessible via context menu and Edit menu)
 * TOC inset is now shown as active
 * FloatList inset is shown as active and clicking on it opens the relevant part of the TOC dialog

This could be a candidate for branch (2.0.4)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40755 a592a061-630c-0410-9148-cb99ea01b6c8
2012-02-15 09:42:13 +00:00
Uwe Stöhr
fcca6c2d11 - German UserGuide.lyx: some translations
- UserGuide.lyx: mention LibreOffice and some small glitches

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40754 a592a061-630c-0410-9148-cb99ea01b6c8
2012-02-15 00:49:19 +00:00
Uwe Stöhr
4f913c3e72 UserGuide.lyx: port changes from branch
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40752 a592a061-630c-0410-9148-cb99ea01b6c8
2012-02-14 21:50:18 +00:00
Uwe Stöhr
b6a70a84a8 ja.po: big update for trunk from Koji
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40749 a592a061-630c-0410-9148-cb99ea01b6c8
2012-02-14 21:06:51 +00:00
Uwe Stöhr
827e82b05a de.po: 3 translations and 2 shortcut clashes fixed
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40746 a592a061-630c-0410-9148-cb99ea01b6c8
2012-02-13 01:26:16 +00:00
Uwe Stöhr
e0436370b6 sweave.lyx: completely revised example file by Yihui Xie
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40744 a592a061-630c-0410-9148-cb99ea01b6c8
2012-02-13 00:36:57 +00:00
Uwe Stöhr
dfee6bc359 stdtoolbars.inc: correct layout to fit with the other entries
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40742 a592a061-630c-0410-9148-cb99ea01b6c8
2012-02-12 22:44:23 +00:00
Uwe Stöhr
322a1c1740 add icon files for the \cancel support in math
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40741 a592a061-630c-0410-9148-cb99ea01b6c8
2012-02-12 22:41:23 +00:00
Enrico Forestieri
28d6f364c6 Update it.po
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40740 a592a061-630c-0410-9148-cb99ea01b6c8
2012-02-12 17:23:18 +00:00
Enrico Forestieri
4ec6c3fb2b Update it.po
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40738 a592a061-630c-0410-9148-cb99ea01b6c8
2012-02-12 16:47:03 +00:00
Uwe Stöhr
613feeae86 thesis files: port fixes from branch
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40737 a592a061-630c-0410-9148-cb99ea01b6c8
2012-02-12 14:58:44 +00:00
Uwe Stöhr
877e68373b EmbeddedObjects.lyx: lots of typos spotted by Scott Kostyshak and some small fixes
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40733 a592a061-630c-0410-9148-cb99ea01b6c8
2012-02-12 03:16:05 +00:00
Uwe Stöhr
aca7f65121 - EmbeddedObjects.lyx: correct the description of Automatic Reference Naming
- Math.lyx: correct the preamble accordingly

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40731 a592a061-630c-0410-9148-cb99ea01b6c8
2012-02-12 02:17:32 +00:00
Uwe Stöhr
ed79c47794 UserGuide.lyx: revert unwanted changes from last commit
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40729 a592a061-630c-0410-9148-cb99ea01b6c8
2012-02-11 18:31:14 +00:00
Uwe Stöhr
2cc43b390d - German UserGuide.lyx: some translations
- UserGuide.lyx: some typographic and expression corrections

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40728 a592a061-630c-0410-9148-cb99ea01b6c8
2012-02-11 18:16:50 +00:00
Uwe Stöhr
f8f50e7eb9 EmbeddedObjects.lyx: revert unintended change from r40720
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40723 a592a061-630c-0410-9148-cb99ea01b6c8
2012-02-11 05:23:18 +00:00
Uwe Stöhr
5f968dd2ea ChangesToolbar.png: update image to the layout of LyX 2.0.x
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40722 a592a061-630c-0410-9148-cb99ea01b6c8
2012-02-11 05:16:40 +00:00
Uwe Stöhr
c316d3635a documentation files: port changes from branch
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40720 a592a061-630c-0410-9148-cb99ea01b6c8
2012-02-11 05:05:25 +00:00
Uwe Stöhr
57dbc84ee0 Tutorial.lyx: fix a typo reported on the list
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40717 a592a061-630c-0410-9148-cb99ea01b6c8
2012-02-11 01:21:13 +00:00
Uwe Stöhr
70cc99c9a4 languages: add some encodings
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40716 a592a061-630c-0410-9148-cb99ea01b6c8
2012-02-10 23:31:58 +00:00
Enrico Forestieri
9d6ebf6cc7 Update it.po
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40715 a592a061-630c-0410-9148-cb99ea01b6c8
2012-02-09 01:04:58 +00:00
Jean-Marc Lasgouttes
ec3aed75ad Fix bug #6367: Screen jumps around when using undo/redo
http://www.lyx.org/trac/ticket/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/trunk@40713 a592a061-630c-0410-9148-cb99ea01b6c8
2012-02-07 14:56:16 +00:00
Richard Heck
2627eb26e5 Convert InsetMathCancel.* to UTF-8.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40712 a592a061-630c-0410-9148-cb99ea01b6c8
2012-02-06 22:38:46 +00:00
Richard Heck
23832ce191 HTML output for InsetMathCancel.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40711 a592a061-630c-0410-9148-cb99ea01b6c8
2012-02-06 22:38:41 +00:00
Uwe Stöhr
cf4e6ddad9 InsetMathCancel: add MathML output
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40710 a592a061-630c-0410-9148-cb99ea01b6c8
2012-02-06 17:35:29 +00:00
Jean-Marc Lasgouttes
d6246362e6 Fix #8019 (from yihui)
* avoid creation of file Rplots.pdf in document file
* find correctly Sweave.sty on old R versions


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40703 a592a061-630c-0410-9148-cb99ea01b6c8
2012-02-02 22:30:38 +00:00