Commit Graph

273 Commits

Author SHA1 Message Date
Jean-Marc Lasgouttes
ebb85745a9 When Sweave.sty is not available to LaTeX, copy it in the temp directory instead of using the stylepath argument of Sweave(). This is better under windows, where the path to Sweave.sty may contain spaces.
Add Yihui Xie as co-author.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39140 a592a061-630c-0410-9148-cb99ea01b6c8
2011-06-20 10:59:23 +00:00
Jean-Marc Lasgouttes
ddd76c6b15 Tentative fix for bug #7545. Please test.
The problem is with sweave when the temp file path contains spaces. This patch adds some postprocessing that removes the reference to the temp dir.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39070 a592a061-630c-0410-9148-cb99ea01b6c8
2011-06-15 15:51:02 +00:00
Jean-Marc Lasgouttes
c820e4f8e2 Better fix for #7551. We can now handle several dots in the file name.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39068 a592a061-630c-0410-9148-cb99ea01b6c8
2011-06-15 14:51:50 +00:00
Julien Rioux
dd8ed95a0c Fix bug #7610 (wrong latex flavor flag set by pref2pref).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38976 a592a061-630c-0410-9148-cb99ea01b6c8
2011-06-07 15:11:18 +00:00
Julien Rioux
54b626b8e0 Fix part of bug #7609 (PDF (pdflatex) no more directly
listed in file->export menu). Do not remove customized
document formats from the export menu.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38975 a592a061-630c-0410-9148-cb99ea01b6c8
2011-06-07 15:01:00 +00:00
Jean-Marc Lasgouttes
7854cc96ed Fix bug #7552: Use of expression() in plot R command fails
This is dur to the use of the null device, which causes problems. Note that, as a consequence, a Rplots.pdf file is created in the document directory.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38896 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-31 10:44:11 +00:00
Jean-Marc Lasgouttes
dc217ed08c Fix bug #7551: Inclusion "." in filename creates LaTeX error sweave graphic generation
This is different from the fix proposed in bug #7555, because we have to catter for dots in temp dir path.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38895 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-31 10:37:09 +00:00
Enrico Forestieri
5e52eb2dc2 Don't write a comma if not needed.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38710 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-11 17:11:08 +00:00
Enrico Forestieri
cc472f5d69 There's no reason to leave in place the 10pt option, as it may not be the
default option. Also account for the fact that babel may be switched off.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38708 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-11 14:33:49 +00:00
Enrico Forestieri
b44fe8b74b Fix bug #2200 (The size of previewed images should be independent of the latex font size)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38701 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-11 11:48:20 +00:00
Peter Kümmel
897edc10c0 cmake: move CMakeLists.txt into source dir (multiple steps)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38691 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-10 17:44:41 +00:00
Enrico Forestieri
5791d41544 MikTeX's kpsewhich doesn't mention "kpathsea emulation" anymore.
On Cygwin, the most reliable way to tell what is the right path
separator to use is a direct check.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38646 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-08 21:09:38 +00:00
Enrico Forestieri
1880933a87 Fix correct operation of lyxpak.py when using the '-t' or '-z' switches.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38416 a592a061-630c-0410-9148-cb99ea01b6c8
2011-04-16 16:22:58 +00:00
Richard Heck
4c24976164 Try to catch CopyStyle of a Flex inset, which we need to convert to the new
Flex:* format. We can't do this perfectly, but we can do so when it's done
within a single file.

Failure to do this (which mistake had been made before) was the root cause of
the problem reported by Enrico with IEEE.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38391 a592a061-630c-0410-9148-cb99ea01b6c8
2011-04-15 02:50:45 +00:00
Richard Heck
bcdb0dfcce prefs2prefs for #6966, per Pavel's suggestion.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38377 a592a061-630c-0410-9148-cb99ea01b6c8
2011-04-14 18:31:39 +00:00
Jean-Marc Lasgouttes
0a65e96ed3 Improvements to lyx sweave support
- use a null device to avoid the extra Rplots.pdf file created by Sweave
- use directly setwd() instead of in the preamble of the module
- add lots of comments.

This finally fixes ticket #6623.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38359 a592a061-630c-0410-9148-cb99ea01b6c8
2011-04-13 10:04:20 +00:00
Pavel Sanda
f9f7c4a4bd Mostly documentation for the pythonic part of instant preview.
Patch from Ale.
http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg167220.html


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38256 a592a061-630c-0410-9148-cb99ea01b6c8
2011-04-05 14:54:38 +00:00
Julien Rioux
adf6faf4d4 revert r37696 and apply a fallback mechanism to pdflatex
when latex fails with a preview. Fixes bug #7303 (IP fails with hyperref).
Patch by Ale with suggestions from Enrico

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38243 a592a061-630c-0410-9148-cb99ea01b6c8
2011-04-04 14:33:45 +00:00
Julien Rioux
9abb85aa72 fix regex after r38119 and r38120
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38141 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-30 00:24:15 +00:00
Jürgen Spitzmüller
9071f82080 * lyxpreview-lytex2bitmap.py: port color changes from lyxpreview2bitmap.py
Why do we need two separate files actually? The difference of these two files is minimal.
Couldn't we introduce a further option for "lytex" mode in lyxpreview2bitmap.py instead?
This would significantly lower the maintenance burden.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38120 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-29 10:09:41 +00:00
Jürgen Spitzmüller
fe76628b9e * lyxpreview2bitmap.py: color pdf also with XeTeX.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38119 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-29 10:01:49 +00:00
Richard Heck
ebe6c9287f Fix bug #7080.
- Have InsetFlex::layoutName() report "Flex:" + the inset name.
- Do some layout2layout work so that user insets that do not have
  the "Flex:" prefix get it.

Note that this will break some CopyStyle stuff, but we do not have any
decent way to do that, so users will have to make that change for
themselves. I guess we should add that to the release notes.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38112 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-28 23:11:54 +00:00
Richard Heck
dc18fcea6f These should all be case insensitive.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38111 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-28 22:44:17 +00:00
Richard Heck
a72642a174 Remove obsolete layout tags.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38096 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-28 15:11:57 +00:00
Julien Rioux
1348aa03d7 fix instant preview with lilypond module and pdf output
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38028 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-24 18:37:17 +00:00
Jean-Marc Lasgouttes
edd51121d8 Almost finish fixing bug http://www.lyx.org/trac/ticket/6623
Now we specify the output file for sweave explicitely for robustness reasons.
We also specify prefix.string (in order to have the temp files generated in lyx tmp directory.

The only annoying file now is Rplots.pdf, but I am not sure why it is generated... 


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37984 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-21 14:48:22 +00:00
José Matox
89bf17bfec Do not crash if the input file does not exist, instead warn and exit (fixes https://bugzilla.redhat.com/show_bug.cgi?id=595618)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37937 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-15 18:17:42 +00:00
José Matox
873704f865 Fix pref2pref bug with optional quotes
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37902 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-11 17:18:37 +00:00
Jürgen Spitzmüller
ebebdef6c9 * lyxpreview2bitmap.py:
- recognize foreground color in pdf route. This is not nice, but there's no better way, AFAICS.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37695 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-16 16:57:02 +00:00
Jürgen Spitzmüller
3634ae6c1f * lyxpreview-platex2bitmap.py:
- we might call this with 7 args, although the 7th will just be ignored (which is fine).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37673 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-15 08:52:37 +00:00
Richard Heck
ccb0a36e08 Fix stupid typo.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37672 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-14 22:14:42 +00:00
Richard Heck
b7c21b6ac6 More has_key replacements.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37647 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-14 02:30:44 +00:00
Richard Heck
e6ec7bdce5 Simple fixes to get layout2layout working with Python 3. These are all that the 2to3 script reported.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37646 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-14 02:28:13 +00:00
Richard Heck
4a6647d091 Fix bug #7298. Patch from Patrick Atamaniuk. Thanks!
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37644 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-14 01:36:00 +00:00
Richard Heck
c87c5ee46a Fix up some comments, and change the recursive call to match the new
signature.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37559 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-08 00:13:32 +00:00
Richard Heck
b26fc9ff62 Get rid of the global lyx2lyx variable.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37558 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-08 00:10:19 +00:00
Richard Heck
495558b5fd Factor out the routine that finds lyx2lyx.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37557 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-08 00:07:47 +00:00
Richard Heck
620cd90aa3 Very minor cleanup.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37555 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-07 23:48:29 +00:00
Richard Heck
10bedbd268 Introduce options for the lyxpak script, allowing the user to choose whether
to create a zip or a tar.gz, to provide the output directory as an option, 
and also to specify the location of the lyx2lyx script as an option.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37547 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-07 19:38:44 +00:00
Enrico Forestieri
21dd835f9d Don't rely on external utilities and use python modules for creating
a LyX archive. A zip archive is created on Windows and a gzip compressed
tar archive on *nix, as those are the de facto platform standards.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37525 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-06 23:45:03 +00:00
Enrico Forestieri
bf6c45dd09 Protect against multiple occurrences of the common prefix.
For example, if the common prefix is only the root '/'.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37516 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-06 18:35:27 +00:00
Richard Heck
5577b5c6f0 Add lyxpak.py to the distribution, and configure it appropriately for export.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37506 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-06 14:50:06 +00:00
Georg Baum
413f1381ed Fix wrong script permissions and missing shebang line (bug #7276)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37467 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-03 21:15:58 +00:00
Richard Heck
82b9adcea2 We never use numbers here, but others might.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37437 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-02 23:00:57 +00:00
Richard Heck
4c95238626 Change NeedsFloatPkg to UsesFloatPkg and introduce a new float tag
IsPredefined.

The point of this is that the current tag is doing both of these jobs,
and they are different. The achemso class shows this, since it uses
float.sty to define three different kinds of floats internally. We have
to set NeedsFloatPkg to false to prevent LyX from trying to redefine
them, but then we complain that there is no list command defined and so
do not enter it in Insert>List/TOC.

The new tag is not yet functional, just there.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37430 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-02 22:28:47 +00:00
Richard Heck
14f0e15573 Convert converter preferences to use new "latex=flavor" syntax.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37389 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-31 19:42:50 +00:00
Enrico Forestieri
6919ddf078 Bump layout format for the new Display tag used in Comments and Greyedout notes.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37381 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-30 22:22:18 +00:00
Enrico Forestieri
dc8adcf1ba Extend instant-preview error handling to the lilypond-book format.
Patch tested by Julien Rioux.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37290 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-21 22:52:03 +00:00
Enrico Forestieri
46cb01a5e0 Fix bug #6720 (Better error handling of instant preview)
Patch from Ale revised by me.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37274 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-20 23:39:08 +00:00
Richard Heck
7e7f98532d Silly typos. Thanks, Stephan.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37256 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-18 23:11:27 +00:00