Commit Graph

483 Commits

Author SHA1 Message Date
Enrico Forestieri
c9b553fd2f Use pdftocairo (if available) for instant preview.
If pdftocairo is detected, it is used for generating bitmaps in the
legacy method route in preference to ghostscript. This is justified
by the fact that the conversion is 4 to 5 times faster and the
quality of the generated images is superior.
2015-04-27 21:37:26 +02:00
Enrico Forestieri
691fdea346 Try hard to obtain an instant preview.
When the dvipng route is selected and latex fails, the lyxpreview2bitmap.py
script simply bails out. The failure may be due to using a specific pdf
only feature in ERT (for example, the inclusion of a pdf image).
In this case the procedure may succeed simply trying to use pdflatex
and the legacy conversion method.
2015-04-27 17:28:39 +02:00
Enrico Forestieri
890b9a53cb Fix bug #7850 (Preview of inline math misaligned) 2015-04-26 19:08:16 +02:00
Juergen Spitzmueller
897b2e73a1 New (Inset)Layout tag PassThruChars 2015-04-20 18:13:49 +02:00
Georg Baum
88c274eee7 Let imagemagick detect file format (bug #2332)
Imagemagick detects the inut file format based on contents. Therefore it does
not make sense that we prefix the to be converted file name with the extension
(assuming that the file extension matches the imagemagick format name). This
breaks formats where the extension used by LyX does not match the imagemagick
format name.
2015-03-22 10:22:31 +01:00
Georg Baum
70afbc82ac Add low-res pdf export as suggested by James
As discussed on the list, but I did not need to create two new pdf formats
since any given document either uses TeX fonts or not. For the same reason
I also added an additional converter to PDF (cropped).
2015-02-11 22:24:04 +01:00
Georg Baum
eb121f9993 Replace hardcoded hack with InsetLayout tag 2015-01-11 20:01:19 +01:00
Juergen Spitzmueller
cfeddb9293 Add ObsoletedBy tag to InsetLayout
Fixes: #9000.
2014-12-08 09:08:45 +01:00
Juergen Spitzmueller
a25569ebb3 Add a layout tag ForceOwnlines that assures an inset is started and terminated by a line break in the LaTeX output.
Fixes: #8875.
2014-12-01 14:56:47 +01:00
Georg Baum
f110ef2f41 Convert updatelayouts.sh to python
This makes the script usable on windows and speeds it up by an order of
magnitude, since no new process needs to be forked for each layout file.
It also does not conevrt .old files again.
2014-11-16 12:43:52 +01:00
Jean-Marc Lasgouttes
45eb314a86 Get rid of rtl_support preference
This variable was introduced to guard against any bad consequence of the then-new right-to-left
languages support. Let's be bold and get rid of it altogether!

Now right to left support is always enabled.
2014-07-09 21:11:08 +02:00
Jean-Marc Lasgouttes
9d5c947110 Remove LyXRC option force_paint_single_char
It was not honored anymore.
2014-07-08 23:12:09 +02:00
Georg Baum
953a4d13d9 Add missing bits of layout file format update
This is needed so that the new format number is actually used. Since the
conversion is a noop I did not update the layout files (more updates will
come).
2014-05-29 21:25:08 +02:00
Juergen Spitzmueller
20bcaec061 Add layout tag that determines if/when a paragraph can be indented.
Fixes: #7327, #7458, #8670
2014-05-29 14:10:32 +02:00
Enrico Forestieri
c668ebf611 Fix bugs #8546 and #9055, and introduce new separator inset.
The algorithm used for breaking a paragraph in LaTeX export is changed
for avoiding spurious blank lines causing too much vertical space.
This change is tied to the introduction of a new inset (with two
different specializations) helping in either outputing LaTeX paragraph
breaks or separating environments in LyX. Both of the above goals were
previously achieved by the ---Separator--- layout and can now be
accomplished by the new inset in a more natural way. As an example,
after leaving an environment by hitting the Return key for two times,
a third return automatically inserts a parbreak inset, which is
equivalent to the old separator layout, i.e., it also introduces a
blank line in the output. If this blank line is not wanted, the
parbreak separator can be changed to a plain separator by a right
click of the mouse. Of course, an environment can still be separated
by the following one by using the Alt+P+Return shortcut (or the
corresponding menu key), but now the plain separator inset is used
instead of the old separator layout, such that no blank line occurs in
the LaTeX output.

Old documents are converted such that the LaTeX output remains unchanged.
As a result of this conversion, the old separator layout is replaced by
the new parbreak inset, which may also appear in places where the old
algorithm was introducing blank lines while the new one is not.
Note that not all blank lines were actually affecting the LaTeX output,
because a blank line is simply ignored by the TeX engine when it occurs
in the so called "vertical mode" (e.g., after an alignment environment).
The old ---Separator--- layout is now gone and old layout files using it
are also automatically converted.

Round trip conversions between old and new format should leave a document
unchanged. This means that the new behavior about paragraph breaking is
not "carried back" to the old format. Indeed, this would need introducing
special LaTeX commands in ERT that would accumulate in roundtrip
conversions, horribly cluttering the document. So, when converting a
modified document to old formats, the LaTeX output may slightly differ in
vertical spacing if the document is processed by an old version of LyX.
In other words, forward compatibility is guaranteed, but not backwards.
2014-05-10 23:25:11 +02:00
Richard Heck
7e1541dd49 Fix failure to detect quoted flex insets in conversion to layout
48. Also, simplify this code.
2014-04-25 17:18:29 -04:00
Richard Heck
4540e6c2ef Patch from Enrico fixing a problem with the lyxpak.py script when
"Add Bibliography to TOC" is used. Fixes #9044.
2014-04-21 11:51:58 -04:00
Richard Heck
64e0c5589c Return an error if LaTeX is unable to compile the file. 2014-04-21 11:51:57 -04:00
Scott Kostyshak
23a28e78a8 Bump RC format for commit 214f7ed2 2014-03-19 21:56:31 -04:00
Richard Heck
1c76460858 A a copule comments reminding us where preference formats should
be updated.
2014-03-19 11:05:34 -04:00
Scott Kostyshak
eb53788f3a csv2lyx: use universal newlines when reading CSVs
Patch from Dustin J. Mitchell.
2014-02-16 00:07:43 -05:00
Jean-Marc Lasgouttes
e7a1cce551 Rename some LFUN names to match their text name
Also, rename copy-label-as-reference to label-copy-as-reference and update LFUNs.lyx accordingly.
2014-02-13 13:50:33 +01:00
Georg Baum
6b49b6b129 Fix conflicting inset font defaults (bug #8874)
This makes the defaults of Inset::inheritFont() and Inset::resetFontEdit()
compatible. There is no user visible change except for the Chunk inset which
does not produce invalid LaTeX after editing operations anymore.
This is the safe version for 2.1.0, for later there are still open questions:
- All insets with ResetsFont true should be audited: Is this really needed,
  or do they show similar editing problems as the Chunk inset?
- Does inheritFont() need to be customizable in the layout file as well?
- Is resetFontEdit() != !inheritFont() needed at all?
I did not use change tracking for the docs, since I updated all existing
translations.
2014-02-10 22:06:32 +01:00
Richard Heck
f9de88c53c Remove the shebang line from our python scripts, per Jose's suggestion.
Fedora ships these chmod 644 and has never seen a problem. The advantage
to doing this is that it better controls what version of python we are
using to launch the script, and it will reveal if we're somehow somewhere
not controlling that properly.
2014-01-28 12:52:16 -05:00
Richard Heck
5d94d1b3bf Use "#!/usr/bin/env python", as elsewhere. 2014-01-26 11:38:41 -05:00
Juergen Spitzmueller
c9ea13ee99 Bump RC format for commit 8f287f5ffa 2013-06-02 12:06:01 +02:00
Richard Heck
2374229cc6 Introduce InitialValue tag for counters. Fixes bug #8707. 2013-06-01 17:42:08 -04:00
Uwe Stöhr
2f38fe8649 csv2lyx.py: update for fileformat 413 (LyX 2.0.x) 2013-05-31 02:02:28 +02:00
Stephan Witt
75c631df7f On Mac, moving down a paragraph should place the cursor at the end of the current paragraph
(unless it's already there, in which case it should move to the end of the next paragraph).
Change the preference setting name (mac_like_word_movement to mac_like_cursor_movement)
to better reflect its function.

Patch and description from Bennett Helm
2013-05-25 18:02:21 +02:00
Richard Heck
1230372566 Add support for package options in layout files. E.g.:
PackageOption tipa safe will load tipa with the
 "safe" option, if we load it.
2013-05-23 09:34:40 -04:00
Georg Baum
7bdc34a987 Implement forced local layouts
These should be used if any new style needs to be introduced in the stable
2.1 series: If the ForceLocal flag of the style is set, it will always be
written to the document header, so that even older 2.1 versions can read
and correctly output the document.
2013-05-15 07:19:49 +02:00
Vincent van Ravesteijn
147dcb4cb9 Make the use of system's theme icons configurable
A lyxrc variable is added and a checkbox is added to the LyX->preferences
dialog.
2013-05-14 17:26:06 +02:00
Richard Heck
4968ce4627 This probably doesn't matter, but the reason for bug #8666 traces,
ultimately, to the layout conversion for format 2.
2013-05-10 13:47:03 -04:00
Georg Baum
8c8e19bb1c Work around gnuhtml2latex encoding bug
gnuhtml2latex does not handle encodings at all. Therefore the result is not
imported correctly by tex2lyx if the HTML file is encoded in anything else
than ascii or latin1 (the default of tex2lyx). The simple wrapper script
loads inputenc if needed. It may not be possible to compile the result with
LaTeX, (e.gif utf8 is used), but for running tex2lyx it will work just fine.
2013-04-12 21:35:50 +02:00
Kornel Benko
f9e41a159e prefs2prefs: While handling converters, make sure
the entry is really '\converter' and not e.g. '\converter_cache_maxage'
2013-03-23 15:31:21 +01:00
Richard Heck
6eb0b47a8a Fix a couple problems with new prefs2prefs material. 2013-03-23 09:35:26 -04:00
Georg Baum
cb5dd33475 Split pdf format as discussed on the list
Previously, the format used for included pdf files was the same as for
document export via ps2pdf. This caused unwanted conversion routes, e.g.
export via odt->pdf instead of dvi->ps->pdf.
I renamed the format for included graphics and not for exported documents,
since otherwise the command line syntax for export would change. This would
require more adaptions for the users, since with the chosen solution the
custom converters are almost always changed correctly in prefs2prefs(),
so that only custom external templates need manual adjustement.
2013-03-21 20:13:02 +01:00
Georg Baum
eb53c60a8f Complete the NoInsetLayout format change 2013-02-21 21:57:59 +01:00
Richard Heck
06cac41193 Add "NoInsetLayout" tag for Uwe. Fixes bug #8545. 2013-02-12 10:13:41 -05:00
Richard Heck
d6709df3d7 Layout changes for changes to LabelType:
LabelType Counter --> LabelType Static
	LabelType Top_Environment --> LabelType Above
	LabelType Centered_Top_Environment --> LabelType Centered
2013-02-09 13:44:06 -05:00
Jean-Marc Lasgouttes
c48bdf845c Handle encoding correctly with knitr>=1.0 (#8504)
Knitr now has a parameter to indicate the encoding of the file. With this patch,it is used when possible (from Yihui Xie).
2013-01-21 09:53:26 +01:00
Julien Rioux
10b2ef1af5 lyxpreview: Allow to find python scripts.
In particular, lilypond-book is just a python script. On windows,
we need to call the python interpreter, using the full path to
the script while being wary of spaces in the path.
2012-12-31 17:16:11 +01:00
Juergen Spitzmueller
c246076ed5 Fix the 'caption inset mess' (bug #4647) 2012-12-30 18:29:02 +01:00
Juergen Spitzmueller
b0aa0db10a Bump layout format 2012-12-22 11:39:04 +01:00
Richard Heck
945c0e4127 Fix lyx2lyx bug: We need to check for quoted names before we check
for unquoted ones. Otherwise, a quoted name with no spaces gets
treated as if it were an unquoted name.
2012-12-10 11:09:50 -05:00
Richard Heck
72c2a72afd Fix bug reported on user list: the path variable here was undefined,
causing a failure when running outside the user tree. This was my
fault: when I refactored this routine, I failed to note that this
variable was now undefined.
2012-11-27 20:50:09 -05:00
Juergen Spitzmueller
98e8dfeffc layout2layout for the new argument syntax 2012-11-20 11:49:02 +01:00
Enrico Forestieri
f6fde4b553 Fix bug #8379: LyX Archive fails to include BibTeX files 2012-10-20 18:27:35 +02:00
Richard Heck
cb20125e1d Add comment. 2012-10-12 09:54:49 -04:00
Richard Heck
b5e2fd7bb7 Fix layout2layout conversion for format 40. This is a big ugly,
I'm afraid, but it's going to be. We skip all comment lines at
the start of the script, but what we want to convert here is in
those comment lines. My previous attempt to deal with this issue
produced an invalid file.
2012-10-12 09:50:47 -04:00
Richard Heck
ddd0ff971a Convert old pre-category layouts to new categorized layouts.
Unfortunately, this doesn't quite work the way one might like. It
is fine for manually converting one's own layouts to the new format,
but it doesn't work if you just start LyX, since the category info
is written at configuration time, not at run time, and chkconfig.ltx
does not run layout2layout.
2012-10-10 13:54:26 -04:00
Richard Heck
98656dd15b Bump layout format to 40, in preparation for conversion of layout
categories.
2012-10-10 13:22:54 -04:00
Scott Kostyshak
f7928f48a6 More elegant knitr support and bug fix
Implement a more simple and elegant integration of the R package knitr. Now,
lyxknitr.R does not need to move or copy files at all.

This also fixes a bug: when /tmp was on a different file system (e.g.
encrypted home), lyxknitr.R failed to move files to /tmp because it relied on
R's 'file.rename' function, which in turn relied on the rename function in
<stdio.h>, which was failing with the EXDEV errno.

Patch from Yihui Xie.
2012-10-06 21:01:34 -04:00
Tommaso Cucinotta
ad827243fc Adding preferences format update as due to commit 4985015 (new close_buffer_with_last_view option). 2012-10-01 22:30:13 +01:00
Pavel Sanda
a982bdc5fa Attempt to bump prefs2prefs_lfuns.py. 2012-09-29 20:04:56 +02:00
Juergen Spitzmueller
4df9eb36a0 Remove annoying warning 2012-09-25 17:01:23 +02:00
Scott Kostyshak
8dc4c965a5 Update of the bash completion script
The -dbg options are updated and support is added for
-E, --export-to, -n, --no-remote, -r, --remote,
-f, and --force-overwrite.
2012-09-25 01:14:09 -04:00
Juergen Spitzmueller
769afefb15 documentation 2012-08-08 10:07:31 +02:00
Juergen Spitzmueller
a18af62087 Complete default_language rc removal 2012-08-08 09:31:46 +02:00
Richard Heck
c9d2794d93 Prettify the prefs2prefs file a bit. 2012-05-22 09:02:12 -04:00
Richard Heck
aeca5e6f0d Typo. 2012-05-22 08:58:55 -04:00
Richard Heck
abbc07026b Add commit to prefs2prefs. 2012-05-22 08:57:25 -04:00
Richard Heck
288c1e0faa Add "nice" flag for converters, addressing final problem with bug #4624. 2012-05-22 08:56:05 -04:00
Richard Heck
a7c3567452 Fix typo. 2012-05-22 08:14:33 -04:00
Enrico Forestieri
fbcf2486d8 Fix bug #8164: lyxpak.py fails to include filenames with spaces
People love embedding spaces in filenames, so account for that.
2012-05-20 16:32:47 +02:00
Pavel Sanda
dce6c8875c Allow Insetlayout for Branch inset (#8106).
http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg173659.html
2012-04-19 11:56:32 +02:00
Richard Heck
12ba6a19d0 Add some comments to include_bib.py about how to set up the converter. 2012-04-17 16:58:28 -04:00
Georg Baum
a2e8cb758b Translations for listings insets
The listings inset and include inset of type listings use two english terms
that are not localized yet: "Listing" for the caption and "Listings" for the
list of listings (not supported natively by LyX yet). The existing layout
translation mechanism has been extended to translate these terms as well:

1) Support [[stuff]] context in lib/layouttranslations
2) Support BabelPreamble and LangPreamble in InsetLayout
3) Use a InsetLayout for InsetInclude of type listings
4) Define BabelPreamble and LangPreamble in the layouts for InsetInclude
   and InsetListings
2012-04-10 20:21:01 +02:00
Richard Heck
a71e831d23 Clean up the include_bib script a bit. 2012-03-26 12:06:04 -04:00
Julien Rioux
1e947e3a18 Move the citation engine machinery to layouts.
Add a new layout syntax CiteEngine to define the citation commands
available for a given citation engine.

Also extend the CiteFormat syntax to allow more customization. This
mechanism, previously used to produce bibliography entries in the
citation GUI based on the BibTeX entrytype, is now also used to
produce the textual labels for citation insets in the buffer view.

Thus citation styles are almost completely customizable by modules.
Modules for the basic, jurabib and natbib engines are implemented.

Layout format incremented to 37.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40820 a592a061-630c-0410-9148-cb99ea01b6c8
2012-03-01 00:41:30 +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
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
Jean-Marc Lasgouttes
7335b3193b Add support for R package knitr (a Sweave alternative)
This fixes #7887.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40674 a592a061-630c-0410-9148-cb99ea01b6c8
2012-01-25 22:26:31 +00:00
Kornel Benko
b64014229f Do not py-compile also on cmake build
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40648 a592a061-630c-0410-9148-cb99ea01b6c8
2012-01-22 13:05:37 +00:00
Georg Baum
0293746521 keywords in preferences are case insensitive
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40646 a592a061-630c-0410-9148-cb99ea01b6c8
2012-01-22 10:40:56 +00:00
Julien Rioux
06dab7972b Remove unused libreoffice2eps.py script.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40596 a592a061-630c-0410-9148-cb99ea01b6c8
2012-01-10 13:54:48 +00:00
Julien Rioux
ec1e52ca91 Add gswin64c as possible executable in legacy_lyxpreview2ppm.py (#7938).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40595 a592a061-630c-0410-9148-cb99ea01b6c8
2012-01-10 13:50:11 +00:00
Enrico Forestieri
5003431903 Fix bug #7933 (lyx2lyx error while running lyxpak.py)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40544 a592a061-630c-0410-9148-cb99ea01b6c8
2011-12-24 11:54:30 +00:00
Abdelrazak Younes
7f14df4af4 increment lyxrc version following r40515.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40516 a592a061-630c-0410-9148-cb99ea01b6c8
2011-12-18 11:51:26 +00:00
Richard Heck
f066a041e9 Comments.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40415 a592a061-630c-0410-9148-cb99ea01b6c8
2011-12-07 15:05:21 +00:00
Richard Heck
157319b3f6 New layout tags specifically for CSS information.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40411 a592a061-630c-0410-9148-cb99ea01b6c8
2011-12-06 22:38:46 +00:00
Jean-Marc Lasgouttes
4f176ef89b Fix #7876: Problems with special characters when using sweave with xetex
When R version is >= 2.13.1, Sweave handles natively encodings. Therefore, we have to remove our own kludge.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40135 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-04 22:39:30 +00:00
Vincent van Ravesteijn
5014b38cb7 Add a preference option to specify the default length unit (cm or in).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40030 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-27 11:52:11 +00:00
Vincent van Ravesteijn
269695aa5f Remove the prefence default_papersize
- This preference was used for specifying the papersize to xdvi, dvipdfm,
  dvips. However, I can't seem to see any effect on the result.

- The papersize should instead be defined in the document settings.

- The global papersize default was misused to also change the tex
  output by specifying the papersize as if it was specified in the
  document settings. This caused the same lyx document to be outputted
  differently on different pcs.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40028 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-27 11:48:16 +00:00
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
Julien Rioux
2645d57d89 * lyxpreview_tool.py : Allow to look for commands with arguments.
For example, find_exe(["bibtex -min-crossrefs=7"]) should search for
bibtex and if it is found, return the string "bibtex -min-crossrefs=7".

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39794 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-03 16:35:25 +00:00
Enrico Forestieri
e75302bbce Fix another thinko from r38243.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39773 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-27 07:28:12 +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
Enrico Forestieri
a55f54b903 Let lyxpreview2bitmap.py also work on Windows when the PyWin extension modules
are not installed.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39741 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-24 01:27:40 +00:00
Tommaso Cucinotta
71ebf846bb Adding the script missing from last commit.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39707 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-19 00:37:15 +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
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
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
Jean-Marc Lasgouttes
7fc83acb5e Add possibility to export the R code from a sweave-enabled document
(patch from yihui, part of #7555)
http://www.lyx.org/trac/ticket/7555#comment:18

This adds the new format "R/S code" with extension .R and a converter from .Rnw.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39509 a592a061-630c-0410-9148-cb99ea01b6c8
2011-08-23 10:33:42 +00:00
Jean-Marc Lasgouttes
c9d9bde0b2 Sweave support cleanup (patch from yihui, see #7555)
http://www.lyx.org/trac/ticket/7555

This part is a simple cleanup:

 * rename variables to start with a dot
 * reset encoding after running sweave
 * improve on-screen display of code chunks



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39506 a592a061-630c-0410-9148-cb99ea01b6c8
2011-08-23 09:52:21 +00:00
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