Commit Graph

161 Commits

Author SHA1 Message Date
Uwe Stöhr
3bfd4a66c2 ext_copy.py: fix #6234 also for branch as José and Richard gave his OK
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@31706 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-24 15:29:34 +00:00
Pavel Sanda
43870f8129 Lets start to shrink 1.6.5 milestone huge list.
Backport bugfix for #6056.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@31309 a592a061-630c-0410-9148-cb99ea01b6c8
2009-09-06 13:19:48 +00:00
Richard Heck
6f9538a463 Fix bug 6140 for branch.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@31019 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-13 19:18:55 +00:00
Enrico Forestieri
56b70e512b Fix bug #6030: LyX does not take into account BOM.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@30215 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-22 06:15:20 +00:00
Jürgen Spitzmüller
fc71962979 revert r30085. Silly me!
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@30086 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-13 10:47:36 +00:00
Jürgen Spitzmüller
5e64a62bb1 * ext_copy.py:
- import warning since we use it.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@30085 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-13 10:44:44 +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