Commit Graph

41 Commits

Author SHA1 Message Date
Julien Rioux
35b580fb30 lyxpreview: Simplify the color handling.
Let's have this in trunk for testing. The real difference maker
when it comes to color is whether we use dvipng or ghostscript.

For dvipng:

  - The color info is passed as command-line arguments.

  - The tightpage option is not necessary, and since it adds
    ps specials to the output, we shouldn't use it.

For ghostscript:

  - The color info needs to be in the latex file.

  - The foreground color is set for each preview inset.

  - The background color is set by \pagecolor in the preamble,
    which is understood by pdflatex, but ignored in dvips mode.
    Thus dvips is handled with a ps special.

  - The tightpage option is necessary to crop the images.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39797 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-03 16:43:33 +00:00
Julien Rioux
873f0f4297 lyxpreview: Simplify the handling of lilypond-book.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39796 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-03 16:35:29 +00:00
Julien Rioux
13b1277cd2 lyxpreview: Handle bibtex-generated references and bibliography.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39795 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-03 16:35:27 +00:00
Enrico Forestieri
968ab69e88 Fix the following problem with Python 2.4:
Traceback (most recent call last):
  File "/opt/src/lyx-devel/lib/scripts/lyxpreview2bitmap.py", line 535, in ?
    exit(main(sys.argv)[0])
TypeError: 'str' object is not callable



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39769 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-26 15:57:17 +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
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
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
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
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
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
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
Enrico Forestieri
32ea5966c5 Allow previewing images generated through postscript specials which are
not correctly handled by dvipng. When a ps special is detected in the dvi
file, the old good legacy method is used. Patch from Ale.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36685 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-03 17:37:38 +00:00
Jürgen Spitzmüller
61e55ac197 * fix instant preview without dvipng (bug 6579).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33640 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-06 14:53:27 +00:00
Jürgen Spitzmüller
c2ef290547 * enable instant preview with XeTeX (requires preview-latex v.11.86) [bug #5577]
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33554 a592a061-630c-0410-9148-cb99ea01b6c8
2010-02-24 10:47:35 +00:00
Jürgen Spitzmüller
938c761989 * lib/scripts/lyxpreview2bitmap.py:
- do not boil out immediately after a LaTeX error

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25420 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-02 16:07:51 +00:00
Jürgen Spitzmüller
01c71419d9 *** Extend preview scripts to also handle PDF output (bug 2165) ***
* src/PreviewLoader.cpp:
	- add conditions for preview with pdf output

* lib/scripts/legacy_lyxpreview2ppm.py:
	- if no dvi preview file is available, check for a PDF file
	  and process that, if found
	- also produce png output, if requested.

* lib/scripts/lyxpreview2bitmap.py:
	- if no dvi preview file is available, check for a PDF file
	  and process that, if found

*  lib/scripts/lyxpreview_tools.py:
	- move some common functions here

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25419 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-02 14:42:04 +00:00
Uwe Stöhr
1c55d1fc77 configure.py, legacy_lyxpreview2ppm.py, lyxpreview2bitmap.py: check also for "platex" (Japanese variant of "latex"); patch by Koji
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21136 a592a061-630c-0410-9148-cb99ea01b6c8
2007-10-22 23:55:13 +00:00
José Matox
37dc5aeabe Convert python scripts to utf-8.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14565 a592a061-630c-0410-9148-cb99ea01b6c8
2006-08-08 10:42:59 +00:00
Bo Peng
2ae2c0db71 Remove hardcoded option -tt from python scripts
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14478 a592a061-630c-0410-9148-cb99ea01b6c8
2006-07-17 19:41:32 +00:00
Georg Baum
4ae87a3bb8 Call python with the -tt switch to make mixed tab/space indentation an error
* src/support/os.[Ch]
	(python): new function, return the python command

	* lib/lyx2lyx/lyx_1_5.py
	(revert_font_settings): replace tabs with spaces

The rest is simply s/python/python -tt/ and
s/"python"/lyx::support::os::python()/ where appropriate.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14270 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-30 13:54:01 +00:00
Jürgen Spitzmüller
eedb4c6821 * lib/scripts/lyxpreview2bitmap.py: fix frac calculation (bug 2391).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13511 a592a061-630c-0410-9148-cb99ea01b6c8
2006-03-28 10:18:02 +00:00
Jean-Marc Lasgouttes
5bad987680 bug 2167: previews badly placed when ascent or descent is 0
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13273 a592a061-630c-0410-9148-cb99ea01b6c8
2006-02-24 14:24:17 +00:00
Jürgen Spitzmüller
8e96921285 From Enrico Forestieri: fix script to work with recent versions of preview-latex and dvipng (bug 2243).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13263 a592a061-630c-0410-9148-cb99ea01b6c8
2006-02-20 19:29:58 +00:00
Angus Leeming
c302740b9b J�rgen S's fix to bug 1817.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10468 a592a061-630c-0410-9148-cb99ea01b6c8
2005-09-21 09:22:18 +00:00
Angus Leeming
0a1fc13eff Do not quote the name of the executable when spawning an external process.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9921 a592a061-630c-0410-9148-cb99ea01b6c8
2005-05-08 14:11:55 +00:00
José Matox
6b440f84ca Replace os.getenv(x) by os.environ[x] for compatibility with old python versions.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9063 a592a061-630c-0410-9148-cb99ea01b6c8
2004-10-08 09:19:54 +00:00
Angus Leeming
f907db6a82 Move common code into a 'tools' file.
Implementation is as similar as possible to the well-tested code in the
1.3.x tree.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8878 a592a061-630c-0410-9148-cb99ea01b6c8
2004-08-09 11:31:18 +00:00
Angus Leeming
3e34d6f23c Append ".exe" to the name of the searched-for program on Win32.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8765 a592a061-630c-0410-9148-cb99ea01b6c8
2004-05-19 14:56:33 +00:00
Angus Leeming
10759f2112 Fix encoding.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8762 a592a061-630c-0410-9148-cb99ea01b6c8
2004-05-18 12:31:50 +00:00
Angus Leeming
915cd386a0 Squash python warning about unknown file encoding.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8694 a592a061-630c-0410-9148-cb99ea01b6c8
2004-04-26 09:18:09 +00:00
Angus Leeming
a2e688065a Re-enable preview generation using dvips, gs and pnmcrop.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8675 a592a061-630c-0410-9148-cb99ea01b6c8
2004-04-19 18:12:23 +00:00
Angus Leeming
005545f281 Remove cached var from RenderPreview. Changes elsewhere to suit.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8669 a592a061-630c-0410-9148-cb99ea01b6c8
2004-04-19 13:05:36 +00:00
Angus Leeming
8be99f7b3b Rework preview generation to use Jan-��ke Larsson's dvipng.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8655 a592a061-630c-0410-9148-cb99ea01b6c8
2004-04-16 14:34:41 +00:00