Commit Graph

28855 Commits

Author SHA1 Message Date
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
Jürgen Spitzmüller
ce42708bc4 * de.po: some corrections.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39689 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-16 09:07:48 +00:00
Kornel Benko
244a6fc235 * sk.po
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39686 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-16 08:41:44 +00:00
Richard Heck
dcf7d30b4d Better label for index list.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39682 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-15 21:48:45 +00:00
Richard Heck
c239ac6590 Typo.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39681 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-15 21:48:23 +00:00
Richard Heck
3788b960f8 Get default font color and background color working for XHTML export.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39679 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-15 21:22:56 +00:00
Tommaso Cucinotta
eff76bd3ab Added -E option to specify export format and destination file-name (and export folder).
Addressing #4501.
See also http://comments.gmane.org/gmane.editors.lyx.devel/138329


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39678 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-15 01:07:49 +00:00
Kornel Benko
200b8428b8 * sk.po
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39676 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-14 08:11:52 +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
b794fc078a File filters for InsetExternal were also missing a description.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39674 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-13 21:49:52 +00:00
Julien Rioux
26568ce1e2 Fix the file filters for InsetInclude.
Add an empty filter for listings and verbatim includes. This will
display as the standard string "All files (*)".

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39673 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-13 20:43:06 +00:00
Julien Rioux
78c80996cd Fix the display of file filters in the import file dialog.
- Correctly interpret whether a file description is available.
    This description is later displayed in the file filters in the
    import dialog (and other dialogs using this qt helper).

  - Fix the regex so that "LaTeX (plain) (*.tex)" is correctly parsed
    into a description "LaTeX (plain) " and its corresponding filter.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39672 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-13 20:42:55 +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
Richard Heck
9ffc42d216 Whitespace.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39669 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-13 12:39:43 +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
82edf5907a Don't allow newline characters in preference (#5840).
Set a validator on QLineEdit widgets. The validator removes any
    \n and \r characters, thus preventing users from copy-pasting
    newline characters into these fields, and subsequently saving
    them, inadvertantly, to the preference file.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39664 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-12 14:22:05 +00:00
Julien Rioux
bab818a784 Mark settings as changed when the Nomenclature line is edited.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39663 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-12 14:22:01 +00:00
Julien Rioux
1fd9e5c991 Fix the tab ordering of GuiPrefs components.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39662 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-12 14:19:57 +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
Richard Heck
796bcb8c25 Implement GuiNomenclature::initialiseParams(), thus restoring the
ability to take the symbol from an explicit or implicit selection.

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

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

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

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

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39640 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-07 23:56:59 +00:00
Julien Rioux
89cb89c78c * configure.py : Fix the detection of splitindex (#7579)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39639 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-07 23:56:47 +00:00
Julien Rioux
e887f51468 * configure.py : Fix the detection of htmltolatex (#6339)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39638 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-07 23:56:38 +00:00
Julien Rioux
d75b83e293 * configure.py : Check for java and perl interpreters.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39637 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-07 23:56:28 +00:00
Enrico Forestieri
9dd9258488 Update it.po
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39636 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-07 22:30:10 +00:00
Richard Heck
c2d8526437 Fix bug #7721. We don't need to do anything here other than output
our paragraphs.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39634 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-07 22:25:25 +00:00
Richard Heck
6269145281 Remove unused code.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39632 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-07 21:47:36 +00:00
Enrico Forestieri
3fd8b88154 Make InsetInfo output a path matching the LaTeX compiler.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39629 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-07 08:14:10 +00:00
Enrico Forestieri
93b6b6fc04 Leave alone the header and add the include where it is needed.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39628 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-07 08:05:44 +00:00
Jürgen Spitzmüller
86bb8ce15f * de.po: some corrections.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39626 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-07 06:27:54 +00:00
Kornel Benko
9be1040dda * sk.po
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39616 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-06 11:40:42 +00:00
Uwe Stöhr
3758bb1630 installer: fix a typo for Dutch
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39614 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-06 03:47:50 +00:00
Uwe Stöhr
4fbe32b0fd sweave.module: more precise description text
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39610 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-06 03:14:51 +00:00
Stephan Witt
a15074152e include Qt translations for our private bundle
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39592 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-05 18:24:54 +00:00