Commit Graph

1618 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
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
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
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
29627f1680 Fix converters with input redirection, such as the second htlatex one.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40647 a592a061-630c-0410-9148-cb99ea01b6c8
2012-01-22 12:35:07 +00:00
Georg Baum
a6f843aacb get rid of dead code and silly function
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40605 a592a061-630c-0410-9148-cb99ea01b6c8
2012-01-12 19:48:08 +00:00
Georg Baum
3dba00246c Quick fix bug #4267.
A real fix would be to ditch the home made file format detection and use libmagic.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40587 a592a061-630c-0410-9148-cb99ea01b6c8
2012-01-07 19:18:38 +00:00
Peter Kümmel
56cbb9eb11 cleanup before unsubscribing
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40517 a592a061-630c-0410-9148-cb99ea01b6c8
2011-12-18 12:03:42 +00:00
Peter Kümmel
c2ff9de084 timeout_min is platform independent
#7928

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40402 a592a061-630c-0410-9148-cb99ea01b6c8
2011-12-06 20:52:19 +00:00
Stephan Witt
42e7089a61 correct capitalization of AppKit framework - for case sensitive Mac OS X filesystems
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40316 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-29 20:41:08 +00:00
Peter Kümmel
8abb5429b9 prepare switch to switch-case in when parsing tex files
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40232 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-20 19:44:08 +00:00
Jean-Marc Lasgouttes
d7320ad89b Fix shortenng of file names in MakeDisplayPath: it is not a good idea to slice an utf8 string at arbitrary offsets, we have to work on a docstring instead. We need unfortunately to switch back and orth between utf8 and docstring.
This is a candidate for branch too, although the bug is minor.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40149 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-06 22:36:14 +00:00
Georg Baum
0dee3eff18 Fix bug #4213: Change tracking support for tex2lyx.
Of course this will only work if output_changes was true when creating the
.tex file.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40139 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-06 17:03:59 +00:00
Georg Baum
07fc1c3abc Replace a half-baked attempt to remove \lyxdot from the directory part of
file names with a proper one: Only replace dots in the base name, and only
request the lyxdot feature if it is needed. This is a partial fix of bug #7650.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40115 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-31 20:27:21 +00:00
Enrico Forestieri
c58f009c9b Properly account for output redirection with QProcess.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40110 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-31 02:02:27 +00:00
Enrico Forestieri
ef4f08daef Compile fix for *nix...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40053 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-28 14:58:27 +00:00
Enrico Forestieri
775466100f Detect the correct version of python at runtime and store the result
for later calls. The check is only performed on the major version
number, such as to avoid using python 3.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40049 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-28 11:51:48 +00:00
Enrico Forestieri
8a4b25875a Thinking about it, it is better to always convert to docstrings all
utf8 strings, and not only if they contain encoding changes. This is
because if the output encoding was previously changed and an utf8
string is inserted in the stream, the encoding changes cannot occur.
This was not a problem until now because normal strings could not be
inserted in a odocstream, as them would have been exchanged with encoding
changes. Indeed, the SetEnc struct has only a std::string member and
outputting a std::string would be interpreted by the compiler the same
as inserting setEncoding(std::string). However, a std::string can be
inserted in an otexstream and it is better to account for this.
I wonder whether trying "os << std::string", where os is an odocstream,
should produce an error instead of actually trying to change the stream
output encoding, but this has not been a problem until now...


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39944 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-23 14:24:17 +00:00
Enrico Forestieri
7fec736162 As stated in r39928, conversion on the fly only works for docstrings
and not for utf8 ones. But the simple solution is to convert to a
docstring before outputting to the underlying docstream.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39930 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-23 03:04:09 +00:00
Enrico Forestieri
bbca759363 Restore r39921, as a simple solution exists.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39929 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-23 03:02:02 +00:00
Enrico Forestieri
936ae8020f Revert r39921. This would not work because proper facets for converting
on the fly are only available for ucs4 encoded strings and not for utf8
ones. So, it does only work with docstrings.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39928 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-23 02:33:38 +00:00
Enrico Forestieri
5a69c96ccd Fix typo.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39922 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-22 18:29:11 +00:00
Enrico Forestieri
0cac034d10 Also account for possible encoding changes embedded in utf8 strings
other than docstrings.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39921 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-22 18:27:56 +00:00
Enrico Forestieri
d703d90574 Fix bug #7835 (Relative paths are not supported by the TEXINPUTS prefix)
This restores \input@path handling, which turns out to be necessary, as
the TEXINPUTS mechanism is not used with relative paths. It turns out
that both methods must be used, because \input@path does not work in all
cases (most notably with tikz).


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39918 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-22 15:10:43 +00:00
Enrico Forestieri
37ba87cfb1 Avoid unnecessary spaces with the Windows shell.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39824 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-09 21:53:35 +00:00
Enrico Forestieri
6c85f8338f No need for the more expensive to_utf8() here.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39821 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-08 22:21:01 +00:00
Enrico Forestieri
33c5f6d628 Fix bug #7800 (Lyx cannot create dvi with Russian)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39820 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-08 22:13:38 +00:00
Enrico Forestieri
3bcfee0627 Make sure to check command for emptiness, instead of prefix+command.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39762 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-25 20:49:53 +00:00
Enrico Forestieri
9c365e841e Apparently, the env program does not strip quotes around the values of the
environment variables. So, replace single quotes by double ones, such that
the QProcess parser will strip them, and strip them by ourselves in ForkedCall.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39761 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-25 20:33:06 +00:00
Enrico Forestieri
a749b73d95 The second argument of Systemcall::startscript is supposed to be encoded
in the filesystem encoding, i.e., the local 8 bit encoding.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39760 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-25 16:38:51 +00:00
Enrico Forestieri
b53445e6cd Adjust the simple parser in ForkedCalls.cpp to also account for quotes
don't delimiting an entire word and adapt the quoting such that it works
for Systemcall, ForkedCall, and also for the case when QProcess in not used.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39759 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-25 16:32:31 +00:00
Enrico Forestieri
e5cc5ac2e8 Manage the setting of the latex environment for Systemcall and ForkedCall
in a central place.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39758 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-25 13:35:42 +00:00
Enrico Forestieri
7a15d8b232 Do not change, even if temporarily, the environment of the main process
but only that of the launched QProcess.
This will help changing the code in order to manage in a central place
the LaTeX environment, thus avoiding the current code duplication in
Systemcall and ForkedCalls.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39754 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-24 20:53:28 +00:00
Enrico Forestieri
5a63cba12a Fix typo.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39749 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-24 18:08:19 +00:00
Enrico Forestieri
5c17ce4195 Also set TEXINPUTS when launching ForkedCall processes.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39742 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-24 01:32:35 +00:00
Tommaso Cucinotta
b4f97b61cf Added support for natively zipped file formats that do not need decompression for being handled by converters
(e.g., compressed dia, odg, sxd, ...). These need to be marked via the "zipped=native" flag in the RC file.
The old 'dia' configuration is automatically updated (it used to be hardcoded in the code, now it is handled
via the flag).
See also http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg170974.html


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39705 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-19 00:12:09 +00:00
Enrico Forestieri
93b6b6fc04 Leave alone the header and add the include where it is needed.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39628 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-07 08:05:44 +00:00
Enrico Forestieri
cfad46ed5d Fix compile error with gcc 4.5.3 when using the included mythes library:
../../src/support/mythes/mythes.hxx:25:9: error: ‘FILE’ does not name a type
../../src/support/mythes/mythes.hxx:55:22: error: ‘FILE’ has not been declared


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39580 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-03 16:10:07 +00:00
Enrico Forestieri
6eabcc2dd3 Protect against autorun commands on Windows (see also bug #7718).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39550 a592a061-630c-0410-9148-cb99ea01b6c8
2011-08-28 16:53:38 +00:00
Enrico Forestieri
d3c96214f3 Allow batch files with QProcess.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39548 a592a061-630c-0410-9148-cb99ea01b6c8
2011-08-28 16:45:46 +00:00
Enrico Forestieri
d68309ee17 On Windows, also fix call to octave (related to bug #7715).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39513 a592a061-630c-0410-9148-cb99ea01b6c8
2011-08-23 18:45:46 +00:00
Enrico Forestieri
f3f38f492b Fix #7715 (Lyx 2.0.0 doesn't work with Mathematica 8: call to 'math' problem?)
The fix also allows to execute again batch files when using runCommand.
Unfortunately, this is still not possible with QProcess as that code is not
under our control.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39504 a592a061-630c-0410-9148-cb99ea01b6c8
2011-08-22 01:39:49 +00:00
Enrico Forestieri
2de1163efc Fix bug #253 (Incorrect protection of closing quotation marks)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39420 a592a061-630c-0410-9148-cb99ea01b6c8
2011-08-05 11:23:00 +00:00
John C. McCabe-Dansted
2885ea3921 Fix bug #7467: build failure on GNU/Hurd, which doesn't define PATH_MAX.
(Patch from Pino, adapted for trunk by Sven)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39333 a592a061-630c-0410-9148-cb99ea01b6c8
2011-07-17 12:32:00 +00:00
Enrico Forestieri
0eedbdee03 Don't rely on Qt for setting an environment variable.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39049 a592a061-630c-0410-9148-cb99ea01b6c8
2011-06-14 18:06:57 +00:00
Kornel Benko
e307b60811 Revert the not needed part for 'Run in place', as it was already done
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38805 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-21 14:15:55 +00:00
Kornel Benko
9190519e98 1.) Run in place feature: If everything fails, try with source path
2.) Read the PATCH_VERSION from configure.ac too
3.) Ident-text in script


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38804 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-21 13:48:45 +00:00
Peter Kümmel
b4fc66621d improve function name
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38756 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-14 13:03:48 +00:00
Peter Kümmel
1af61e659c run in-place: don't speculate where the lyx binary is, search for it at the common places
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38753 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-14 12:26:11 +00:00