Commit Graph

5642 Commits

Author SHA1 Message Date
Georg Baum
f8c5c51460 Fix special case of bug #7811: Clash of bbding and marvosym packages if \Cross is used.
The clash can however still happen if those packages are both loaded for other symbols.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39885 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-18 19:54:16 +00:00
Georg Baum
6954c542fb Generalize the esintoramsmath requirement:
Now you can also require a|b|c, and if any of the features is already used,
no other one will be loaded. The first feature wins if none is already used.
This is required for a part of bug #7811.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39884 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-18 19:32:02 +00:00
Georg Baum
6304d72255 more work on spaces
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39876 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-17 18:54:13 +00:00
Uwe Stöhr
fc8ba5776e Math.lyx: correct name of a term as discussed on the list
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39867 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-15 20:47:49 +00:00
Tommaso Cucinotta
c5496cbf5d Remove conflict for menu shortcut.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39862 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-15 13:27:00 +00:00
Uwe Stöhr
7a209305b0 - UserGuide.lyx: update sec. C.2-C.4
- German UserGuide.lyx: some translations

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39859 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-15 03:28:31 +00:00
Uwe Stöhr
b28143d1e9 - UserGuide.lyx: updated sec. C.1
- de.po: change a translation to the most commonly used word

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39845 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-14 03:07:47 +00:00
Uwe Stöhr
6a25a18aea - documentation files: port today's changes to trunk
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39843 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-13 23:15:52 +00:00
Uwe Stöhr
38be92aafc - UserGuide.lyx: some corrections in Appendix A
- German UserGuide.lyx: many translations

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39840 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-13 02:13:51 +00:00
Uwe Stöhr
30295b32b7 Math.lyx: add note that the package mathdots must be installed for a complete output
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39838 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-12 16:08:33 +00:00
Uwe Stöhr
6fba3dd229 chkconfig.ltx: add the packages used in our documentation files (the docs should be compilable also without them, but then the PDF output would not contain all sections). This way we assure that at least on Windows all used LaTeX-packages are installed while installing LyX.
Richard, OK for branch too?

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39836 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-12 16:07:19 +00:00
Uwe Stöhr
d5ddca54c3 - UserGuide.lyx: updated some sections
- German UserGuide.lyx: some translations and 2 updated images

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39834 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-12 05:33:31 +00:00
Tommaso Cucinotta
164ae1584a Added Export As... dialog, exploiting the new destination path that can
be specified when exporting.
This fixes #3402.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39805 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-06 13:47:42 +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
Uwe Stöhr
c221e445fe - Additional.lyx: minor tweaks
- German Additional.lyx: update to English version, translation of section 8 which hopefully fixes #7748

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39792 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-01 01:29:47 +00:00
Tommaso Cucinotta
341d1890e1 Make export to XHTML work when there are included ODG pictures,
or any other graphic format that:
- is exportable to EPS
- could not be explicitly exported to PNG yet (i.e., source to PNG was not reachable on the converters graph)
Now, adding the EPS to PNG conversion explicitly allows LyX to find the conversion path.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39786 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-29 14:04:02 +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
Uwe Stöhr
5adac980ce - UserGuide.lyx: some stylistic changes
- German UserGuide.lyx: lots of translation

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39767 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-25 21:51:56 +00:00
Uwe Stöhr
adaed4a14d powerdot-example.lyx: add warning about incompatibilities with enumitem that are now fixed in the latest powerdot version
(patch by Jean-Pierre)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39765 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-25 21:40:10 +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
Uwe Stöhr
c10b375239 svglobal3.layout, svcommon.inc: fix some parser warnings
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39725 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-22 02:22:53 +00:00
Uwe Stöhr
d0b6ed1a1a Additional.lyx: remove some unused references to squash LaTeX warnings
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39724 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-21 22:37:24 +00:00
Uwe Stöhr
fa987d1394 libreoffice2eps.py: add missing things from r39707
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39712 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-20 03:12:37 +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
1024e43069 Added OpenOffice drawing file-format.
Now you can:
-) include in LyX OpenOffice drawings (.odg or old .sxd files)
-) preview them on the screen
-) view them in the final .ps/.pdf output
-) edit them externally via libreoffice, ooffice, oodraw or soffice (whatever is detected).


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39706 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-19 00:29:29 +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
Julien Rioux
d285793c07 Revert guiName to Spreadsheet (was part of r39675).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39703 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-18 23:18:44 +00:00
Julien Rioux
816331765f * configure.py : Detect java and perl scripts in a general way.
Issues #6339 and #7579 were fixed by specific code targeting those
RC entries. This commit fixes the detection of java and perl scripts
in a general way. As a result:

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

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

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


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

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

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

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

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

Preference lyxrc file format incremented to 2.

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

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

    Also, add another sanity check.

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

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

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

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

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

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

Fix for the japanese preview still to come.

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

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

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

    The colors are hexadecimal strings, eg 'faf0e6'.

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

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

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

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39655 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-11 18:22:12 +00:00