Commit Graph

451 Commits

Author SHA1 Message Date
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
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
Richard Heck
18a015081b Update prefs2prefs again. Thanks Vincent.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37255 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-18 19:35:54 +00:00
Richard Heck
bc176dc904 Add conversion of \language_use_babel.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37254 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-18 16:50:43 +00:00
Richard Heck
8f207c5736 Thinko.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37251 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-18 15:40:07 +00:00
Richard Heck
054dfe3c00 Improve the prefs2prefs scripts a bit.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37250 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-18 15:37:20 +00:00
Richard Heck
dfb67984f2 Conversion routines for preference files.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37233 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-16 20:28:43 +00:00
Richard Heck
f97bc9b9e7 A little more work on prefs2prefs.
More to come, Pavel!



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37225 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-16 03:59:43 +00:00
Richard Heck
49436e4c2d Add NoCounter layout tag. When working on output of equation numbers, I
noticed that article, for example, still has a counter "chapter". This
surprised me.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37193 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-12 22:53:41 +00:00
Jean-Marc Lasgouttes
425f46bea5 * add an extra parameter to lyxsweave.py that tells the document directory
and use it to be able to read data files in there (bug #6623). It is probably possible to use sweave hooks instead of the module preamble. Moreover, I want to investigate the use of prefix.string argument of sweave to make sure that the output files end up in the tmp dir.
  * be more subtle in the way to change default encoding to handle the case where a data file that is read does not use the same encoding as the .rnw file.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36850 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-12 21:25:57 +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
Enrico Forestieri
4feb6cf62b Fix instant preview on windows when dvipng is not available.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36545 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-28 01:22:36 +00:00
Pavel Sanda
c393abbe12 Fix lilypond support, patch from Julien Rioux, bug #6940.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35978 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-01 21:01:48 +00:00
Richard Heck
76ffbd136a Add script that writes the bbl file in place of the bibliography.
Part of #4624.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35971 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-01 20:21:02 +00:00
Jean-Marc Lasgouttes
9ebd4405cf Make sweave process files with the correct encoding (#6625).
The required the introduction of the new converter token $$e, that holds
the iconv name of the latex file encoding.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35772 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-22 07:51:39 +00:00
Jean-Marc Lasgouttes
be8cf7c98c Introduce helper script for Sweave. The first benefit is that
Sweave.sty path is hardcoded if LaTeX cannot find it.

More to come.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35750 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-21 17:02:05 +00:00
Richard Heck
85904c550d Add ResetsFont tag to InsetLayout, toward fixing bug #5657.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35626 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-13 15:54:39 +00:00
Richard Heck
d4634167cc Get rid of "CharStyle:", "Custom:", and "Element:" prefixes, per a
suggestion of JMarc's. Docs to follow.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35608 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-12 14:46:17 +00:00
Pavel Sanda
e7dd1bf9dd Add lilypond-book module and add support for instant preview.
Patch by Julien Rioux.
http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg162042.html



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35472 a592a061-630c-0410-9148-cb99ea01b6c8
2010-09-21 16:34:30 +00:00
Richard Heck
f3d5390d8b Conversion for tabular-feature.
I believe this completes the LFUN conversions, at least if RELEASE_NOTES
is complete in this respect.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35436 a592a061-630c-0410-9148-cb99ea01b6c8
2010-09-18 15:16:04 +00:00
Richard Heck
1e8dc000d8 Conversion for paragraph-spacing.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35435 a592a061-630c-0410-9148-cb99ea01b6c8
2010-09-18 15:13:13 +00:00
Richard Heck
036aef6f26 Conversion for toc-insert.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35434 a592a061-630c-0410-9148-cb99ea01b6c8
2010-09-18 14:57:59 +00:00
Richard Heck
59155540e3 Conversion for line-insert.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35433 a592a061-630c-0410-9148-cb99ea01b6c8
2010-09-18 14:56:25 +00:00
Richard Heck
d8f9626fef Conversion for all-insets-toggle.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35432 a592a061-630c-0410-9148-cb99ea01b6c8
2010-09-18 14:42:38 +00:00
Richard Heck
e1ed2d861e Conversions for notes-mutate and argument-insert, plus a little cleanup.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35431 a592a061-630c-0410-9148-cb99ea01b6c8
2010-09-18 14:27:12 +00:00
Richard Heck
851d01721f A go at creating a prefs2prefs framework. There's a main file, prefs2prefs.py, and two subsidiary files,
prefs2prefs_lfuns.py and prefs2prefs_prefs.py. I've organized it this way because, in many ways, these are
 the same task. It's very line-by-line, unlike lyx2lyx and layout2layout, where things can be more "global". 
So we read the file, line by line, and give a bunch of converter functions a chance to see if they want to 
modify that line.

The converter functions are all in the subsidiary files. (Only the lfun one has anything in it now.) They 
take a line as argument and return a list: (Bool, NewLine), where the Bool says if we've modified anything 
and the NewLine is the new line, if so.

The format of the existing files is format 0, and we'll introduce new format numbers as we proceed, 
just as with layout2layout. So the conversion from format 0 to format 1 will be huge; others will 
generally be simple.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35426 a592a061-630c-0410-9148-cb99ea01b6c8
2010-09-17 14:44:38 +00:00
Enrico Forestieri
d0d7db958c Replace the deprecated os.popen3 with the subprocess module.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35162 a592a061-630c-0410-9148-cb99ea01b6c8
2010-08-19 07:00:41 +00:00
Jean-Marc Lasgouttes
6aa26820fd Introduce new tag ParbreakIsNewline in Layout and InsetLayout (not yet used)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35110 a592a061-630c-0410-9148-cb99ea01b6c8
2010-08-09 21:20:29 +00:00
Richard Heck
b0097bcddb Introduce a new "RequiredArgs" tag for layouts. This functions much as
the OptionalArgs tag does and is implemented by the now misnamed
InsetOptArgs, except that its content gets wrapped in "{}" rather than
"[]". Required arguments do not actually have to be provided, but they
are always output. 

This will allow e.g. beamer's Block environment to be implemented
without ERT.

Documentation to follow.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34591 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-04 21:50:08 +00:00
Pavel Sanda
eb4786c80d New version of bash_completion from Cengiz Günay.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34067 a592a061-630c-0410-9148-cb99ea01b6c8
2010-04-06 12:01:24 +00:00
Pavel Sanda
e7c91f1967 Next patch from Cengiz
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34008 a592a061-630c-0410-9148-cb99ea01b6c8
2010-04-01 16:50:29 +00:00
Pavel Sanda
543571fd03 Move command line arg --batch to -batch.
Things are still bit inconsistent due to the existence of
additional -- switches, but the correct fix is not so easy.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34005 a592a061-630c-0410-9148-cb99ea01b6c8
2010-04-01 15:18:38 +00:00
Pavel Sanda
f151e820ce Fix bug #4753, thanks Cengiz Gunay.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34001 a592a061-630c-0410-9148-cb99ea01b6c8
2010-04-01 09:40:33 +00:00
Richard Heck
f1912e1c33 Read the citation formats from a file, rather than hardcoding them. This
allows for layout- or module-level customization of the display in the
citation dialog and of the XHTML bibliography output.

There is more of this to come, by the way. The next step is to allow
macros. That will make it easier to deal with translation issues, which
ought to be the final step.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33920 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-29 18:37:25 +00:00
Richard Heck
4cd5bcefe9 Introduce a RefPrefix tag for Style, InsetLayout, and Float, that
indicates what prefix to use when constructing formatted references.
Documentation to follow.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33784 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-17 12:23:24 +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
Richard Heck
abc81b5c07 Rework and partially revert r33631.
This patch introduces a "ListCommand" tag for Float layout. This tag
defines the command used to generate a list of such floats, in the cases
where float.sty is not used (i.e., where NeedsFloatPkg is true). We were
previously hardcoding the commands \listoftables and \listoffigures. But
in other cases, such as achemso.layout, which defines lists of schemes,
charts, etc, we could not output such lists.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33633 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-05 22:58:29 +00:00
Richard Heck
b64e2d4103 Change the LaTeXBuiltin tag to a NeedsFloatPkg tag. Discussion on the
list revealed that the former is confusing to people. The latter
indicates more clearly what the tag does.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33626 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-05 17:24:38 +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
8168e27362 * new InsetLayout tag to disallow spell checking. This actually brings Inset::allowSpellCheck() to use.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33467 a592a061-630c-0410-9148-cb99ea01b6c8
2010-02-13 15:44:17 +00:00
Richard Heck
c2ac70552c Introduce a "formatted counter" for use with formatted reference during
XHTML output.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33113 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-20 20:33:36 +00:00
Richard Heck
1832a388c5 Collect the title for XHTML output, and use it.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33097 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-19 19:43:15 +00:00
Richard Heck
c4aa7b9c7d Comment.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33029 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-14 14:05:50 +00:00
Richard Heck
4221b1a7f4 Whoops again.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32994 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-12 19:42:16 +00:00
Richard Heck
c3a05da0e5 Whoops.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32993 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-12 19:39:49 +00:00
Richard Heck
fdbd6064e9 New layout tag for specifying the style used for TOCs, etc, in XHTML
output.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32991 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-12 19:38:31 +00:00
Richard Heck
d6fe6cba94 Done now.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32848 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-07 17:32:42 +00:00
Richard Heck
08b63ad3c6 Enhance LyX by fixing bug 5587. We add a new ContentAsLabel tag to
InsetLayout, per Jurgen's suggestion, so that insets can be told to
display an abbreviated form of their content when closed.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32575 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-18 00:29:22 +00:00
Richard Heck
f1d54dd07c Formatting for layout2layout.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32370 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-05 22:56:16 +00:00
Richard Heck
da47b99f39 Whoops.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32278 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-01 14:36:48 +00:00
Richard Heck
9929f89856 Fix bug 5842: Add InPreamble tag for layouts.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32277 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-01 14:34:05 +00:00
Richard Heck
22eab2f2c9 Some configure.py fixes from Guenter.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31985 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-14 19:16:53 +00:00
Richard Heck
8042139ea5 Some renaming, from Guenter.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31970 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-13 16:12:04 +00:00
Richard Heck
9afbd6d68d Update layout format.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31774 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-27 19:03:30 +00:00
Richard Heck
923dc53431 Fix a typo and clarify the logic around the return value. Note that this
would allow us to do something after copying, if we should later want to
do that.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31703 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-24 12:31:59 +00:00
Uwe Stöhr
adaeffec5a ext_copy.py: fix #6234 for trunk
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31698 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-24 00:55:28 +00:00
Richard Heck
40c9f9d9eb Fix bug 6140. Patch due to gmatht.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31018 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-13 19:17:41 +00:00
Richard Heck
1f8bf874aa IfStyle and IfCounter tags for layout. Docs to follow.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30989 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-12 14:50:01 +00:00
Pavel Sanda
fe1e5203c0 Fix bug #6056. Recognize Graphicsmagick too.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30935 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-09 14:38:49 +00:00
Enrico Forestieri
e31e71a7a9 Fix bug #6030: LyX does not take into account BOM in user layout files.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30213 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-21 18:23:10 +00:00
Richard Heck
583e62836c And this.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30181 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-19 13:11:06 +00:00
Richard Heck
3d022e92b4 Forgot these.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30180 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-19 13:10:36 +00:00
Richard Heck
2fe18f567a Forgot this, too.
Documentation is Customization.lyx will follow, once this stabilizes.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29973 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-05 20:07:16 +00:00
Richard Heck
aa2b14afce Forgot to update the layout format when transferring from branch.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29964 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-05 19:05:48 +00:00
Jean-Marc Lasgouttes
864773d7d9 Allow literate documents other than noweb to work out of the box. Currently
only sweave is supported (for building documentation, not programs).

Layout files allow a new OutputFormat tag 

Modules can be conditionned on a feature of the type from->to, indicating that
it should be possible to convert from format 'from' to format 'to'.

Layout format incremented to 15.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29874 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-28 08:59:25 +00:00
Richard Heck
ac93172e78 Typo.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29872 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-28 02:00:04 +00:00
Pavel Sanda
86e73ee668 Add comment
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29745 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-19 23:34:12 +00:00
Georg Baum
9aad4bc27f Better fix for bug 1476 (following an idea by Jean-Marc).
Don't go into an endless loop if layout2layout cannot produce the desired file format.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28529 a592a061-630c-0410-9148-cb99ea01b6c8
2009-02-17 20:25:56 +00:00
Richard Heck
5ee35ace6f Introduce the InToc tag for InsetLayout.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28377 a592a061-630c-0410-9148-cb99ea01b6c8
2009-02-06 17:54:33 +00:00
Georg Baum
cd27d171d5 Partial fix of bug 1476:
Implement infrastructure to add translations to layout files and translate one .inc file.
Some others are missing.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28356 a592a061-630c-0410-9148-cb99ea01b6c8
2009-02-04 20:06:50 +00:00
Richard Heck
9dfac74265 This patch introduces ProvidesModule and ExcludesModule layout tags.
See http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg145129.html.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27041 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-23 00:27:03 +00:00
Richard Heck
b0c6099330 Fix bug 5330, round 1.
The bug is that older layout files with lines like:
	Input amsmaths.inc
fail in 1.6, since that file no longer exists. This commit adds some 
layout2layout that will scan for such includes and add lines like
	UseModule theorems-ams
corresponding to the input lines. The downside to this commit is that
UseModule only becomes available on 25 July 2008, whereas the files
were removed in January.

My intention is to try to deal with these intermediate cases as well.
But I'm not sure that will ultimately work very well, so this will do
until I can figure that out.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26800 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-07 15:45:08 +00:00
Richard Heck
d841355b7e Fix bug 5316 properly. The fix is to make the routine that reads a counter
update an existing counter rather than overwrite it.

This turns out to be more complicated than it might seem. There are two 
large parts to the patch. One moves the counter read routine out of TextClass
and into the Counter and Counters classes. The other changes the syntax of 
counters from:
	Counter
		Name whatever
	....
to:
	Counter whatever
	....
This allows us to get the name of the counter right away, so we can decide
whether it is an old one or a new one. So the layout format had to be 
changed (again), with corresponding layout2layout code.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26779 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-06 14:37:28 +00:00
Richard Heck
63644744fd Whitespace and comment cleanup.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26777 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-06 12:16:17 +00:00
Richard Heck
7c61874c70 Forgot this bit from last commit.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26758 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-05 19:39:09 +00:00
José Matox
7a7eede980 Replace condition with an exception (code more robust) and add comment the reason
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26450 a592a061-630c-0410-9148-cb99ea01b6c8
2008-09-18 18:21:41 +00:00
Richard Heck
805d18d818 Another fix for csv2lyx. This one looks like a generic bug, though
one that may have been triggered by an older version of python. The
problem is that the sniffer call could fail, and then dialect is
undefined. 


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26447 a592a061-630c-0410-9148-cb99ea01b6c8
2008-09-18 17:37:06 +00:00
Richard Heck
74b225d428 Cosmetics.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26446 a592a061-630c-0410-9148-cb99ea01b6c8
2008-09-18 17:03:06 +00:00
Richard Heck
8d94611a02 The line_num member was only introduced with python 2.5, so we'll
do this a different way.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26445 a592a061-630c-0410-9148-cb99ea01b6c8
2008-09-18 16:57:56 +00:00
Jürgen Spitzmüller
a2906cb877 ** proper implementation of pLaTeX by Tetsuya Makimura and me, fixes many remaining problems and bugs with language "japanese" (bugs 4863, 4290, 4700 and partially 4697) **
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26200 a592a061-630c-0410-9148-cb99ea01b6c8
2008-08-18 17:26:09 +00:00
Richard Heck
5d95df6e39 Add CopyStyle tag for InsetLayout, per request of Steve Litt.
Update documentation for new tag.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25933 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-28 15:14:37 +00:00
Richard Heck
56a35c2c61 Add UseModule tag for layout files. This allows the AMS files, in particular, to "require" the
theorems-ams module, which is what most users will want. A later commit will allow users also
to "exclude" this module, in case they wanted to do that.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25880 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-25 15:51:27 +00:00
Enrico Forestieri
bc1b6917c0 According to Pavel:
http://studio.imagemagick.org/pipermail/magick-developers/2008-July/002997.html
the -flatten option is necessary starting from IM 6.3.5


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25762 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-21 10:54:12 +00:00
Enrico Forestieri
37bc93583e Also take into account version number components >= 10 (but less than 256).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25761 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-21 10:31:26 +00:00
Enrico Forestieri
9c87e40ace Correct check for IM version
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25760 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-21 09:55:40 +00:00
Enrico Forestieri
ca34131b4b Tailor version numbers according to IM ChangeLogs:
2006-03-31  6.2.6-8 Chris Madison  <madisonblu@hotma...>
   * 'convert existing-image.png -background' no longer generates a fault.
   * -define pdf:use-cropbox=true actually works now.
   * Slight mods to magick/xwindow.c to compile under BEOS (path provided by
     henrimoi@hotma...).
   * #000000 improperly set the opacity channel (bug report and patch from
     digipete@shaw....).


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25759 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-21 09:33:59 +00:00
Enrico Forestieri
b706a1ade5 As ImageMagick output is different for different versions, and different (even
incompatible) options are to be used to obtain the same result, it is better
to query the version and accordingly use the needed options (bug 4749).


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25758 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-21 08:53:06 +00:00
Pavel Sanda
b8f7bc90c6 Fix bug http://bugzilla.lyx.org/show_bug.cgi?id=4749 .
New versions of Imagemagick do not antialias ppm images used for 
screen presentation of pictures.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25475 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-07 15:09:44 +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
Abdelrazak Younes
71acc7ea52 fig2pdftex: Fix for windows
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25252 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-15 07:31:42 +00:00
José Matox
81ca2da2d4 escape backslashes when importing the cells
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24862 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-20 11:20:33 +00:00
Uwe Stöhr
0beb0c1a6d csv2lyx.py: I haven't contributed something to the actual file version
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24824 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-18 20:43:04 +00:00
José Matox
b1faf53669 Update file to the last version discussed on bugzilla and on the devel list
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24821 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-18 19:26:05 +00:00
Uwe Stöhr
58220e118d csv2lyx.py: new csv2lyx version by Hartmut and José
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24818 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-18 19:08:23 +00:00
Jürgen Spitzmüller
2c796e8fcb * csv2lyx:
- make output more closely to format 276. This also prevents lyx2lyx from choking
	  while importing a csv file into 1.6.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24626 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-06 05:54:19 +00:00
Jürgen Spitzmüller
42aaa245db * Hartmut's csv2lyx script
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24620 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-05 17:08:21 +00:00
Jürgen Spitzmüller
6f18b79871 * lib/scripts/TeXFiles.py:
- fix typo spotted by Hartmut.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24260 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-15 14:04:40 +00:00
Richard Heck
2567314e44 Add some history to layout2layout.py.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23918 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-24 13:21:26 +00:00
Richard Heck
d252730dff New AddToPreamble tag for layout files. This tag will ADD some information to the document premable rather than completely over-write it, as the Preamble tag does.
Increment layout format to 7.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23916 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-24 13:11:16 +00:00
Richard Heck
3112bed419 Fix layout2layout.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22459 a592a061-630c-0410-9148-cb99ea01b6c8
2008-01-10 03:59:39 +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
Martin Vermeer
a921f1b7ae layout2layout, changeover to version 5
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19723 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-22 14:36:07 +00:00
Richard Heck
7982ee6cef Fix bug 4094: HTML export issue with FAT32 on Linux.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19298 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-04 03:04:23 +00:00
Uwe Stöhr
c48221aea8 doc/doc_toc.py: - fix the input encoding of the TOC.lyx files
- set Python file encoding to utf-8
scripts/ext_copy.py: - set Python file encoding to utf-8

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18943 a592a061-630c-0410-9148-cb99ea01b6c8
2007-06-29 19:13:57 +00:00
Richard Heck
954be90e11 Make HTML export work.
The key is the new copier script lib/scripts/ext_copy.py. Usage:
 ext_copy.py [-e ext1,ext2,...] <from file> <to file>
Given a <from file> and <to file>, it will copy all files in the directory 
in which from_file is found that have the extensions given in the -e option, 
or all files in that directory if no such argument is given. So, for example, 
we can do:
  python ext_copy.py -e png,html,css /path/from/file.html /path/to/file.html
and all html, png, and css files in /path/from/ will be copied to the 
(possibly new) directory /path/to/file.html.LyXconv/. The -t option determines 
the extension added to the output filename passed to the script ($$o, in the
copier definition), the default being "LyXconv". If just . is given, then no 
extension is added.

Other changes:
* configure.py: added appropriate copier definitions for html and wordhtml
formats, as well as for the Program pseudo-format.
* lib/Makefile.am and development/scons/scons_manifest.py: add ext_copy.py.
* lib/doc/Customization.lyx: update documentation.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18791 a592a061-630c-0410-9148-cb99ea01b6c8
2007-06-15 17:02:35 +00:00
Georg Baum
1a11354ae6 fix typo
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17922 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-23 18:10:24 +00:00
Jean-Marc Lasgouttes
04efe3c40a New framework for declaring generic features in textclasses.
* src/LaTeXFeatures.C (mustProvide): new method; returns true when
	isRequired is true and the feature is not provided by the
	textclass. 
	(getPackages, getLyXSGMLEntities): use mustProvide when relevant.

	* src/bufferparams.C (getEngine):
	* src/buffer.C (validate): adapt to change below.

	* src/lyxtextclass.C (read): replace tags ProvidesNatbib,
	ProvidesMakeidx, ProvidesUrl and ProvidesAmsmath by a generic
	"Provides".
	(provides): take a string as argument.
	
	* lib/scripts/layout2layout.py (convert): convert "ProvidesXxx" tags
	to "Provides xxx".

	* lib/layouts/*: update to format 4.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17740 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-06 09:02:23 +00:00
Enrico Forestieri
b343446bd4 Fix bug 3400
* lib/scripts/convertDefault.py: Use the cropbox option when the
	source format is pdf and convert supports it.

	* lib/configure.py: Don't define a PDF->PNG converter in order to
	avoid the EPS->PDF->PNG route when converting EPS to a loadable
	format.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17668 a592a061-630c-0410-9148-cb99ea01b6c8
2007-03-31 18:21:54 +00:00
Georg Baum
c27dce2b16 support direct conversion from format 1 to format 3
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17531 a592a061-630c-0410-9148-cb99ea01b6c8
2007-03-24 12:39:45 +00:00
Enrico Forestieri
1b21743511 Fix bug 3220
* src/insets/ExternalSupport.C
	(updateExternal): Avoid computing crc of a directory as this leads
	to a crash on Cygwin.

	* lib/configure.py:
	Use a python script to get the current date in order to avoid
	a stalling condition with the date command on Win32.

	* lib/scripts/date.py:
	New python script.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17168 a592a061-630c-0410-9148-cb99ea01b6c8
2007-02-13 19:09:54 +00:00
Enrico Forestieri
f44bc0a0d1 Remove uncompatible option from convertDefault.py as it makes unusable
the figure inset on Solaris.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17021 a592a061-630c-0410-9148-cb99ea01b6c8
2007-02-02 01:39:52 +00:00
Abdelrazak Younes
500a5f959f The caption inset patch by Georg, Martin and myself.
* buffer.C: increase LyX format to 257.

* lyxtextclass.C: increase FORMAT format to 3.

* buffer_funcs.C: 
  - setCaptionLabels(): new recursive function
  - setCaptions(): new function
  - updateLabels(): call setCaptions() for each paragraph.

* InsetCaption:
  - add a virtual destructor
  - overload InsetText' getStatus() and wide().
  - setLabel(): only set the new private member label_.
  - metrics(): don't set label here and correct for title metrics.
  - draw(): don't set label here
  - latex(): fix optional argument.
  - plaintext(): implement!

* InsetText:
  - add a virtual destructor
  - add virtual to getStatus() and wide().

*  output_latex.[Ch]: move latexOptArgInsets() out of anon namespace.

* text3.C: enable LFUN_CAPTION_INSERT


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16948 a592a061-630c-0410-9148-cb99ea01b6c8
2007-01-30 13:23:21 +00:00
Enrico Forestieri
b9aa557b35 Fix encoding of converters path and arguments
* src/converter.C
	(Converters::convert): Convert command to be executed to the proper
	encoding. Use from_utf8 instead of from_ascii in order to avoid
	assertions when displaying an alert.

	* src/support/docstring.[Ch]
	(to_filesystem8bit): new conversion function.

	* lib/scripts/fig2pstex.py
	* lib/scripts/fig2pdftex.py:
	Modified to reflect the changes above.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16803 a592a061-630c-0410-9148-cb99ea01b6c8
2007-01-22 02:58:47 +00:00
Uwe Stöhr
31ea73d0d7 fix bug 2418
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16741 a592a061-630c-0410-9148-cb99ea01b6c8
2007-01-18 01:03:23 +00:00
Enrico Forestieri
e0a7b67497 Partially revert changeset 16635.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16636 a592a061-630c-0410-9148-cb99ea01b6c8
2007-01-10 04:24:36 +00:00
Enrico Forestieri
cff50172f3 Fix encoding of filenames in python scripts
* lib/scripts/fig2pstex.py
	* lib/scripts/fig2pdftex.py
	* lib/scripts/fig_copy.py
	* lib/scripts/fen2ascii.py:
	convert filenames from utf8 to the default locale encoding.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16635 a592a061-630c-0410-9148-cb99ea01b6c8
2007-01-10 03:42:06 +00:00
Martin Vermeer
e656777a92 * layout2layout.py
(convert): remove spurious tabs



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15599 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-29 11:41:15 +00:00
Jean-Marc Lasgouttes
debd34424f remove remaining references to fig_copy.sh
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14579 a592a061-630c-0410-9148-cb99ea01b6c8
2006-08-08 21:12:50 +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
Bo Peng
da915923fd Change the encoding of some python scripts from ISO-8859-15 to ISO-8859-1
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14477 a592a061-630c-0410-9148-cb99ea01b6c8
2006-07-17 19:37:24 +00:00
Angus Leeming
0edeef83b7 Fix humiliating typo and update the link to the licence page on the web.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14361 a592a061-630c-0410-9148-cb99ea01b6c8
2006-07-07 15:58:57 +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