anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-23 00:11:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
10,188 Commits 30 Branches 171 Tags 681 MiB
b3b65e6f70
Commit Graph

61 Commits

Author SHA1 Message Date
Georg Baum
d17a57a6f3 Fix converters in our scripts directory 
* src/graphics/GraphicsConverter.C
	(build_script): quote filenames in the python script properly
	(build_script):
	(build_script):

	* src/support/filetools.[Ch]
	(quoteName): Add quote_style argument and quoting of python filenames
	(libScriptSearch): Add quote_style argument

	* src/support/filetools.C
	(quote_style): New enum to specify the quoting style


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14978 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-09-11 16:07:49 +00:00
Georg Baum
f0648e2320 Fix bug 2637 
* src/graphics/GraphicsConverter.C
	(Converter::Impl::Impl): Don't call the default converter directly,
	but create a temporary script with build_script() as for the
	configured converters. This makes sure that the file name does not
	need to be passed on the command line anymore.
	(build_script): This cannot fail anymore, so change the return type
	to void
	(build_script): Use build_conversion_command also for the default
	converter. This has the advantage that the special code for moving
	${outfile}.0, ${outfile}.1 is actually used for ImageMagick's convert.
	(build_conversion_command): factored out from build_script


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14657 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-08-13 19:07:43 +00:00
Georg Baum
be1f96045b Fix bug 2637 
* src/graphics/GraphicsCacheItem.C
        (CacheItem::Impl::convertToDisplayFormat): Don't derive the temp
        file name from the original file name. This ensures that it is
        composed of valid characters only.

        * src/graphics/GraphicsConverter.C: remove example script, since it
        will get out of date.
        (build_script): Copy the original file to a temp file before the
        conversion chain starts. This avoids problems with converters that
        can't handle ' in filenames.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14459 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-07-15 11:25:49 +00:00
Georg Baum
f01a63d10b * src/graphics/GraphicsConverter.C 
(build_script): replace unused code for equal formats by an assert


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14400 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-07-09 14:44:37 +00:00
Georg Baum
34e73f7823 * src/graphics/GraphicsConverter.C 
(Converter::Impl::Impl): move block of python code to build_script
	(build_script): adjust formatting


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14393 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-07-09 10:06:58 +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
Georg Baum
f5fbef2d8f * lib/Makefile.am s/convertDefault.sh/convertDefault.py/ 
* src/converter.C
	(Converters::convert): ditto

	* src/graphics/GraphicsConverter.C
	(Converter::Impl::Impl): ditto


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14227 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-06-26 15:13:32 +00:00
Bo Peng
5ea7194a60 Generate python code in GraphicsConverter.C, replace convertDefault.sh by convertDefault.py 
* src/graphics/GraphicsConverter.C: generate python instead of shell scripts
	* src/converter.C: use convertDefault.py
	* lib/scripts/convertDefault.sh: translated to convertDefault.py


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14223 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-06-26 14:17:12 +00:00
Lars Gullik Bjønnes
8c93f63b48 * filetools.[Ch]: Make functions that start with a capital 
letter start with a lower letter.
	* All other .C and .h in the cs: adjust for above change


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13603 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-04-08 22:31:11 +00:00
Lars Gullik Bjønnes
3b9338a3a8 Whitespace cleanup. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13565 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-04-05 23:56:29 +00:00
Georg Baum
0a7ebf229c fix bug 2192 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10758 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-01-19 21:18:25 +00:00
Angus Leeming
fb70c52b05 Whitespace, only whitespace. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9877 a592a061-630c-0410-9148-cb99ea01b6c8
 2005-04-26 11:12:20 +00:00
Angus Leeming
9d3de76fdf Quote graphics conversion commands correctly. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9820 a592a061-630c-0410-9148-cb99ea01b6c8
 2005-04-17 18:41:14 +00:00
Angus Leeming
c9f9ba315c Asger's exchanging of the class and struct keywords. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9502 a592a061-630c-0410-9148-cb99ea01b6c8
 2005-01-19 15:03:31 +00:00
Lars Gullik Bjønnes
9c2ba3c4ff rename tostr.[Ch] to convert.[Ch] 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9448 a592a061-630c-0410-9148-cb99ea01b6c8
 2005-01-06 16:39:35 +00:00
Lars Gullik Bjønnes
6a55be9506 tostr -> convert and some bformat work 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9446 a592a061-630c-0410-9148-cb99ea01b6c8
 2005-01-06 15:40:49 +00:00
Angus Leeming
cc179cc2a2 Quote shell variables in generated graphics conversion script. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9028 a592a061-630c-0410-9148-cb99ea01b6c8
 2004-10-01 14:23:57 +00:00
Lars Gullik Bjønnes
ec94b42f51 Use the preferred calling for Boost.Signal 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9010 a592a061-630c-0410-9148-cb99ea01b6c8
 2004-09-26 14:19:47 +00:00
Lars Gullik Bjønnes
7c15014ec2 change "support/std_sstream.h" to <sstream> 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8849 a592a061-630c-0410-9148-cb99ea01b6c8
 2004-07-24 10:55:30 +00:00
Angus Leeming
fd8e0d71b8 Add a warning message if the file to contain the conversion script 
cannot be opened.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7957 a592a061-630c-0410-9148-cb99ea01b6c8
 2003-10-22 20:39:30 +00:00
Lars Gullik Bjønnes
44cd0fc9a1 The std::string mammoth path. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7862 a592a061-630c-0410-9148-cb99ea01b6c8
 2003-10-06 15:43:21 +00:00
Lars Gullik Bjønnes
cd03e2b7db Get rid of lyxstring, remove usage of STRCONV. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7751 a592a061-630c-0410-9148-cb99ea01b6c8
 2003-09-15 11:00:00 +00:00
Angus Leeming
f239801ae3 Changes due to the removal of using directives from support/std_sstream.h. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7686 a592a061-630c-0410-9148-cb99ea01b6c8
 2003-09-05 18:02:24 +00:00
Angus Leeming
236ea81bc5 Replace LString.h with support/std_string.h, 
Lsstream.h with support/std_sstream.h,
support/LIstream.h with support/std_istream.h,
support/LOstream.h with support/std_ostream.h.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7685 a592a061-630c-0410-9148-cb99ea01b6c8
 2003-09-05 17:23:11 +00:00
Angus Leeming
c9403be3b0 Strip redundant #includes. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7669 a592a061-630c-0410-9148-cb99ea01b6c8
 2003-09-05 03:10:30 +00:00
Angus Leeming
3f50312db5 Be more specific that 'using lyx::support'. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7653 a592a061-630c-0410-9148-cb99ea01b6c8
 2003-09-04 00:29:22 +00:00
Angus Leeming
0be0fcfd59 If I ever see another licence blurb again, it'll be too soon... 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7598 a592a061-630c-0410-9148-cb99ea01b6c8
 2003-08-23 00:17:00 +00:00
Lars Gullik Bjønnes
fe390e9da1 namespace grfx -> lyx::graphics 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7239 a592a061-630c-0410-9148-cb99ea01b6c8
 2003-07-04 08:23:23 +00:00
Lars Gullik Bjønnes
92d522b7f1 introduce namespace lyx::support 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7224 a592a061-630c-0410-9148-cb99ea01b6c8
 2003-06-30 23:56:22 +00:00
Alfredo Braunstein
468df2b583 some header insanity fixed 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7028 a592a061-630c-0410-9148-cb99ea01b6c8
 2003-05-23 13:54:09 +00:00
André Pönitz
dbef37d522 non-templated tostr in separate files 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6955 a592a061-630c-0410-9148-cb99ea01b6c8
 2003-05-13 14:36:24 +00:00
Angus Leeming
e5b431516a The file uses tostr, subst so #include lstrings.h explicitly. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6816 a592a061-630c-0410-9148-cb99ea01b6c8
 2003-04-15 11:52:30 +00:00
Angus Leeming
a6a948feb1 Store an InsetBase & in MailInset. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6420 a592a061-630c-0410-9148-cb99ea01b6c8
 2003-03-10 13:33:39 +00:00
André Pönitz
f566e7c604 Alfredo's patch 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6305 a592a061-630c-0410-9148-cb99ea01b6c8
 2003-02-28 09:49:49 +00:00
Angus Leeming
3ac369b71c Alfredo's forkedcall queue. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6267 a592a061-630c-0410-9148-cb99ea01b6c8
 2003-02-25 18:56:09 +00:00
Lars Gullik Bjønnes
99d1627a47 dont use pragma impementation and interface anymore 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6138 a592a061-630c-0410-9148-cb99ea01b6c8
 2003-02-13 16:53:15 +00:00
Lars Gullik Bjønnes
53274e31ec the string -> char patch 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5725 a592a061-630c-0410-9148-cb99ea01b6c8
 2002-11-27 10:30:28 +00:00
Angus Leeming
e27f7329c9 Don't use "if [ $? -ne 0 ]"; personally, I blame JMarc ;-) 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5693 a592a061-630c-0410-9148-cb99ea01b6c8
 2002-11-21 17:09:22 +00:00
Lars Gullik Bjønnes
6a1167adab STRCONV 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5573 a592a061-630c-0410-9148-cb99ea01b6c8
 2002-11-04 02:12:42 +00:00
Angus Leeming
eb5b07f615 Zombie-killer. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5563 a592a061-630c-0410-9148-cb99ea01b6c8
 2002-10-31 12:42:26 +00:00
Jean-Marc Lasgouttes
0bd9a0a81e fix extension problem for filenames with dots 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5254 a592a061-630c-0410-9148-cb99ea01b6c8
 2002-09-10 16:04:10 +00:00
Angus Leeming
1eb8155fa0 This file is part of LyX, the document processor. 
Licence details can be found in the file COPYING.

and thank God for sed.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5211 a592a061-630c-0410-9148-cb99ea01b6c8
 2002-09-05 15:14:23 +00:00
Angus Leeming
6fac1dc980 Really dull and boring header shit 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5210 a592a061-630c-0410-9148-cb99ea01b6c8
 2002-09-05 14:10:50 +00:00
Angus Leeming
3aa7e91a82 Modify the headers of files in src/graphics as discussed on the list. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5206 a592a061-630c-0410-9148-cb99ea01b6c8
 2002-09-05 11:31:30 +00:00
Angus Leeming
ae50323b0b Martin's convertDefault patch. Remove lyxpreview2xpm cruft. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5192 a592a061-630c-0410-9148-cb99ea01b6c8
 2002-09-03 11:55:22 +00:00
Lars Gullik Bjønnes
c9f673d506 just add a comment 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4881 a592a061-630c-0410-9148-cb99ea01b6c8
 2002-08-06 15:25:50 +00:00
Lars Gullik Bjønnes
3c22b7dc3b 2002-07-22 Lars Gullik Bj�nnes <larsbj@birdstep.com> 
* GraphicsConverter.C (build_script): take a ostream as a more
general argument than ostringstream.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4750 a592a061-630c-0410-9148-cb99ea01b6c8
 2002-07-22 20:50:45 +00:00
Jean-Marc Lasgouttes
af9352a2e7 latest graphics jumbo patch from herbert 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4741 a592a061-630c-0410-9148-cb99ea01b6c8
 2002-07-22 12:36:41 +00:00
André Pönitz
b1fbce7d59 revert $$s change 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4692 a592a061-630c-0410-9148-cb99ea01b6c8
 2002-07-17 17:26:35 +00:00
Angus Leeming
f643df79a8 * Make the graphics files conform strictly to the Pimpl idiom by moving 
the boost::signals into the relevant Impl classes and creating new,
publicly-accessible connect() methods.
* Const-ify all publicly-accessible methods, reflecting the fact that each
class contains only a const pimpl_ member variable.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4687 a592a061-630c-0410-9148-cb99ea01b6c8
 2002-07-17 16:56:42 +00:00