Commit Graph

5611 Commits

Author SHA1 Message Date
Julien Rioux
816331765f * configure.py : Detect java and perl scripts in a general way.
Issues #6339 and #7579 were fixed by specific code targeting those
RC entries. This commit fixes the detection of java and perl scripts
in a general way. As a result:

  - The detections of jfig3-itext.jar and jfig3.jar, which where
    previously overlooked, are now also fixed, and
  - Future additions of java and perl scripts to configure.py are
    straight forward.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39699 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-18 12:11:47 +00:00
Julien Rioux
ce6a179489 * configure.py : Add lyxpreview unconditionnally.
The check on dv2dt and dt2dv is not necessary, since even if these
are not available, we fall back to the legacy convertion method,
which uses ghostscript, and which is available in all cases.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39698 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-18 12:10:19 +00:00
Enrico Forestieri
40d4d94b01 Also include in the archive the files referenced in ERT in the document body.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39692 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-16 14:40:40 +00:00
Enrico Forestieri
45aa989efc Use the normalized path for checking whether it has already been gathered.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39691 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-16 12:03:54 +00:00
Enrico Forestieri
517cfe9266 Check whether the filename is really a file. Also protect against recursive
inclusions.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39690 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-16 10:07:56 +00:00
Julien Rioux
a5f72061d1 Fix the guiName of external insets.
- Remove hack with $$AbsOrRelPath substitution in the guiName.
    Instead, let LyX display the filename automatically in the gui,
    consistent with InsetInclude.

  - Use the guiName in the drop-down menu in the dialog instead of the
    internal lyxName. These guiNames ought to be more descriptive.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39675 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-13 21:50:07 +00:00
Julien Rioux
d57f66022c Show .htm files in HTML import file dialog (#6340).
- Add "htm" as a known extension for HTML.

  - Use all the extensions of a format as file filter,
    instead of using only the default extension.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39671 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-13 20:42:38 +00:00
Julien Rioux
a55ef8346a Allow to assign several extension to a given file format (#4798).
Additionnal extensions are separated by commas (,) in lyxrc
preference files, while spaces are ignored, e.g. "jpg, jpeg".

Preference lyxrc file format incremented to 2.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39670 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-13 20:42:23 +00:00
Julien Rioux
0fb13b648c * prefs2prefs.py : Use a list of [format, conversions] pair.
Use a list of [int, list of functions] pair, representing
      - int: the format number, and
      - list of functions: what needs to be done to the file to
                           update it to the given format number.

    This matches what is done in lyx2lyx and helps keeping track of
    format numbers and their corresponding conversion routines.

    Also, add another sanity check.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39668 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-12 20:43:06 +00:00
Julien Rioux
ba02c43178 * prefs2prefs.py : Error when both -l and -p are given, update usage.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39667 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-12 20:42:53 +00:00
Julien Rioux
603be7fe2f * prefs2prefs.py : Don't choke on empty input file.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39666 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-12 20:42:40 +00:00
Julien Rioux
454598b928 * layout2layout.py : Don't choke on empty input file.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39665 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-12 20:42:22 +00:00
Julien Rioux
45280f6bb5 Refine the lyxpreview legacy conversion (the ghostscript one).
- Break up steps 1, 2 and 3 from the legacy preview mechanism.
    These are really separate steps.

      1) Add color info, run latex
      2) Run dvips
      3) Run ghostscript

  - In the case of pdf output, skip step 2 and go directly to step 3.
  - Make sure that we fall back to the legacy conversion whenever we can.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39661 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-11 18:23:41 +00:00
Julien Rioux
bb55234cac Better error and progress messages for lyxpreview.
Introduce --debug and --verbose flags to control output. Also, use the
python subprocess module to capture stderr from external commands, thus
bumping the python requirement to version 2.4 or later.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39660 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-11 18:23:29 +00:00
Julien Rioux
81420e405f Merge the preview mechanism for japanese with the standard one.
- Japanese is now handled by passing the option --latex=platex
    to the standard lyxpreview script. This is done in PreviewLoader.
  - Remove obsoleted file lyxpreview-platex2bitmap.py and the
    corresponding lines in the configure script.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39659 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-11 18:23:15 +00:00
Julien Rioux
10868c31ac Merge the preview mechanism for lilypond-book with the standard one.
- Handle the preprocessing in the main lyxpreview script with the
    command-line arguments --lilypond and --lilypond-book=exe.
  - Remove the obsoleted file lyxpreview-lytex2bitmap.py and the
    corresponding lines in configure.py.

Fix for the japanese preview still to come.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39658 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-11 18:22:59 +00:00
Julien Rioux
2bd747fad4 Add command-line arguments to lyxpreview2bitmap.py
Add command-line arguments in a standard unix fashion, using getopt.

    Usage: ./lyxpreview2bitmap.py <options> <input file>

    Options:
      -h, --help:    Show this help screen and exit
      --dpi=<res>:   Resolution per inch (default: 128)
      --png, --ppm:  Select the output format (default: png)
      --fg=<color>:  Foreground color (default: black, ie '000000')
      --bg=<color>:  Background color (default: white, ie 'ffffff')
      --latex=<exe>: Specify the executable for latex (default: latex)

    The colors are hexadecimal strings, eg 'faf0e6'.

The changes to PreviewLoader.cpp break the preview of lilypond-book
and japanese files, but they will be handled in the next commits.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39657 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-11 18:22:43 +00:00
Julien Rioux
675f233f34 Some clean up of the lyxpreview code.
Move some common variables to lyxpreview_tools. Otherwise,
add a few variable names, making it easier to track things.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39656 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-11 18:22:29 +00:00
Julien Rioux
2dfa11904f Stylictic-only changes to lyxpreview.
Whitespace and line endings only, in preparation for some serious work.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39655 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-11 18:22:12 +00:00
Jürgen Spitzmüller
014a1a36ed revive Ctrl-space in mathed.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39649 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-10 05:35:54 +00:00
Julien Rioux
9571f12801 * configure.py : Fixup r39643, srcdir is a string containing the basepath to configure.py
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39645 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-08 12:11:16 +00:00
Julien Rioux
5891c139da * configure.py : Fix the detection of tex2lyx when running in-place (#6986).
Remove the hack with os.environ and instead directly search for
../src/tex2lyx/tex2lyx relative to where configure.py is found.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39643 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-07 23:59:23 +00:00
Julien Rioux
deb9736929 * configure.py : Fix the rc entry when tex2lyx is not found (#3308).
We still define the tex2lyx converter but we emit a warning.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39642 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-07 23:59:14 +00:00
Julien Rioux
ba17c0315e * configure.py : Fix the gnumeric converters.
They were tied to undefined formats ods and xls. The actual
    internal names for these formats are oocalc and excel.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39641 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-07 23:57:07 +00:00
Julien Rioux
e1b4e5edaa * configure.py : Remove unnecessary code in xhtml viewer detection.
This code seems unnecessary since not_found = "auto" is set in
    checkViewer, and thus "auto" is used as the viewer when no viewers
    are found, and a lyxrc entry is added anyway. The "auto" string is
    special-cased in the code, where we attempt to automatically
    determine the viewer from the OS.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39640 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-07 23:56:59 +00:00
Julien Rioux
89cb89c78c * configure.py : Fix the detection of splitindex (#7579)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39639 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-07 23:56:47 +00:00
Julien Rioux
e887f51468 * configure.py : Fix the detection of htmltolatex (#6339)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39638 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-07 23:56:38 +00:00
Julien Rioux
d75b83e293 * configure.py : Check for java and perl interpreters.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39637 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-07 23:56:28 +00:00
Uwe Stöhr
4fbe32b0fd sweave.module: more precise description text
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39610 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-06 03:14:51 +00:00
Uwe Stöhr
52c55a2174 - Customization.lyx: add new possible font types uuline, strikeout and uwave
- German Customization.lyx: lot of refactoring

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39573 a592a061-630c-0410-9148-cb99ea01b6c8
2011-08-31 16:04:18 +00:00
Uwe Stöhr
1a60740e42 - English Additional.lyx: some updates
- German Additional.lyx: some corrections and some LaTeX warnings fixed

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39571 a592a061-630c-0410-9148-cb99ea01b6c8
2011-08-31 14:22:23 +00:00
Enrico Forestieri
2ed034ea22 Fix bug #7586 (Temporary file chkconfig.ltx in user directory not deleted if configure fails)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39562 a592a061-630c-0410-9148-cb99ea01b6c8
2011-08-29 16:44:29 +00:00
Enrico Forestieri
8e812f44af Avoid code duplication.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39561 a592a061-630c-0410-9148-cb99ea01b6c8
2011-08-29 16:23:58 +00:00
Uwe Stöhr
f5a03ab601 InsetSpace support for
- \negmedspace and \negthickspace outside of math
- \enspace, \hspace*, \hspace*{\fill} and \hfill inside math
(fileformat change)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39557 a592a061-630c-0410-9148-cb99ea01b6c8
2011-08-29 14:07:30 +00:00
Enrico Forestieri
1126e3dfd8 Fix bug #7718 (Configure fails if shell autorun commands are enabled in the registry)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39554 a592a061-630c-0410-9148-cb99ea01b6c8
2011-08-28 22:57:58 +00:00
Enrico Forestieri
3d82ff41ec Close stdin of the command spawn by subprocess.Popen, otherwise the
command hangs if something goes wrong. Also allow any kind of line endings.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39553 a592a061-630c-0410-9148-cb99ea01b6c8
2011-08-28 22:29:38 +00:00
Uwe Stöhr
6df33aba97 - tufte-book.layout: fix a lyX warning about uninitialized counter
- tufte example files: add important notes that float placements options are not allowed and remove unreferenced labels

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39549 a592a061-630c-0410-9148-cb99ea01b6c8
2011-08-28 16:49:16 +00:00
Uwe Stöhr
563dd1fb3a - EmbeddedObjects.lyx: fix a nasty caption formatting bug spotted by Ignacio
- Spanish EmbeddedObjects.lyx: some fixes by Ignacio

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39547 a592a061-630c-0410-9148-cb99ea01b6c8
2011-08-28 13:37:30 +00:00
Uwe Stöhr
7ba7ce4006 new module and example file for chemical risk and safety statements; requires the package rsphrase which is bundled with the package mhchem that we already support
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39545 a592a061-630c-0410-9148-cb99ea01b6c8
2011-08-28 03:59:16 +00:00
Uwe Stöhr
826bf6b950 initials.module: safer preamble call, no string changed, necessary to be able to compile the EmbeddedObjects manual also if the package lettrine is not installed
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39543 a592a061-630c-0410-9148-cb99ea01b6c8
2011-08-28 03:36:34 +00:00
Uwe Stöhr
f363b83dbc - Spanish documentation files: translations by Ignacio
- English EmbeddedObjects.lyx: fix a typo spotted by Ignacio
- EmbeddedObjects.lyx: make the file compilable also if the LaTeX-package lettrine is not installed

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39542 a592a061-630c-0410-9148-cb99ea01b6c8
2011-08-28 03:36:23 +00:00
Uwe Stöhr
2b3533153a - German UserGuide.lyx: remove some fixed path that would make the document uncompilable
- Spanish UserGuide.lyx: some tweaks

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39539 a592a061-630c-0410-9148-cb99ea01b6c8
2011-08-28 01:15:22 +00:00
Jürgen Spitzmüller
6a3ff009db Issue the math space dialog (not the text one) when in math (bug 7746).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39536 a592a061-630c-0410-9148-cb99ea01b6c8
2011-08-27 10:45:59 +00:00
Julien Rioux
9657ffd77f revert part of the last commit that should not have been
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39534 a592a061-630c-0410-9148-cb99ea01b6c8
2011-08-26 23:46:52 +00:00
Julien Rioux
0243eed665 configure.py : subprocess, second try (check_output requires
python 2.7 and throws unwanted exceptions when the process
return value is not 0

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39533 a592a061-630c-0410-9148-cb99ea01b6c8
2011-08-26 23:29:37 +00:00
Richard Heck
9d8c3d018b Revert "The call to cmdOutput can throw an exception, so we need to be careful".
This will make reverting the previous commit easier.

This reverts commit 82ab1aef334d8573cc3e861e2620d9b4c59f88fe.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39532 a592a061-630c-0410-9148-cb99ea01b6c8
2011-08-26 23:13:34 +00:00
Richard Heck
b87297b8a0 Fix infinite loop reported on the list, which revealed another, which
revealed another. So fix a bunch of such things.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39530 a592a061-630c-0410-9148-cb99ea01b6c8
2011-08-26 23:06:19 +00:00
Richard Heck
1700d0c747 The call to cmdOutput can throw an exception, so we need to be careful
here, lest configure.py abort.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39529 a592a061-630c-0410-9148-cb99ea01b6c8
2011-08-26 23:06:15 +00:00
Uwe Stöhr
1766f01397 lilypond.lyx: some tweaks; Julien, having you at least in a note as author is our common way because it has the advantage that people can contact you directly if there are problems (you are listed in the credits)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39527 a592a061-630c-0410-9148-cb99ea01b6c8
2011-08-26 21:38:28 +00:00
Julien Rioux
f51dffd231 configure.py : replace os.popen with subprocess.Popen
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39526 a592a061-630c-0410-9148-cb99ea01b6c8
2011-08-26 17:11:50 +00:00