From: jj v. a. <we...@ma...> - 2005-08-22 01:21:58
|
Log Message: ----------- Moves configuration of gif2png and friends to global.conf. Individual paths, and/or arguments to the conversion statements can be adjusted. To make use of this change, update global.conf and pg/macros/dangerousmacros.pl This should close bug 813. At some time, the scripts should be removed from the bin directory. Modified Files: -------------- webwork-modperl/conf: global.conf.dist Revision Data ------------- Index: global.conf.dist =================================================================== RCS file: /webwork/cvs/system/webwork-modperl/conf/global.conf.dist,v retrieving revision 1.127 retrieving revision 1.128 diff -Lconf/global.conf.dist -Lconf/global.conf.dist -u -r1.127 -r1.128 --- conf/global.conf.dist +++ conf/global.conf.dist @@ -59,6 +59,29 @@ $externalPrograms{tar} = "/usr/bin/tar"; +# Basic image manipulation utilities +# Most sites only need to configure the first line +$externalPrograms{netpbm} = "/usr/bin/"; # Really a prefix, rather than a program +$externalPrograms{giftopnm} = $externalPrograms{netpbm}.'giftopnm'; +$externalPrograms{ppmtopgm} = $externalPrograms{netpbm}.'ppmtopgm'; +$externalPrograms{pnmtops} = $externalPrograms{netpbm}.'pnmtops'; +$externalPrograms{pnmtopng} = $externalPrograms{netpbm}.'pnmtopng'; +$externalPrograms{pngtopnm} = $externalPrograms{netpbm}.'pngtopnm'; + +# The following lines are the external scripts gif2eps, etc. +# The source file is input with cat, and the output is redirected to +# the desired file. + +$externalPrograms{gif2eps} = "$externalPrograms{giftopnm} | $externalPrograms{ppmtopgm}| $externalPrograms{pnmtops} -noturn 2>/dev/null"; +$externalPrograms{png2eps} = "$externalPrograms{pngtopnm} | $externalPrograms{ppmtopgm} | $externalPrograms{pnmtops} -noturn 2>/dev/null"; +$externalPrograms{gif2png} = "$externalPrograms{giftopnm} | $externalPrograms{pnmtopng}"; + +# Note on these conversions: +# we used to use `pnmdepth 1' instead of ppmtopgm as it creates a +# monochrome image (1 bit) rather than a greyscale image (8 bits). +# However, this was causing improper display of some sort in PDFs. + + ################################################################################ # Mail settings ################################################################################ @@ -389,15 +412,6 @@ $courseFiles{logs}{login_log} = "$courseDirs{logs}/login.log"; ################################################################################ -# More paths to external programs -################################################################################ - -# These image conversion utilities are included in the WeBWorK distribution. -$externalPrograms{gif2eps} = "$webworkDirs{bin}/gif2eps"; -$externalPrograms{png2eps} = "$webworkDirs{bin}/png2eps"; -$externalPrograms{gif2png} = "$webworkDirs{bin}/gif2png"; - -################################################################################ # Site defaults (FIXME: what other things could be "site defaults"?) ################################################################################ |