anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-19 22:40:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Baruchs latest graphics patch

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2382 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Asger Ottar Alstrup 2001-07-29 10:50:07 +00:00
parent 80dda8f6b2
commit d1063993ce
5 changed files with 82 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/ChangeLog
View File

@ -1,3 +1,7 @@
2001-07-29 Baruch Even <baruch@lyx.org>
* configure.m4: Added conversion from EPS to PDF using epstopdf.
2001-07-26 John Levon <moz@compsoc.man.ac.uk>
* bind/cua.bind:

57
lib/configure vendored
View File

@ -1091,7 +1091,7 @@ case $TOEPS in
pnmtops) gif_to_eps="giftopnm \$\$i | pnmtops > \$\$o" png_to_eps="pngtopnm \$\$i | pnmtops >\$\$o" jpg_to_eps="jpegtopnm \$\$i | pnmtops >\$\$o";;
esac
echo $ac_n "checking for a GIF -> PNG converter""... $ac_c"
echo $ac_n "checking for a Image -> PNG converter""... $ac_c"
echo "$ac_t""(convert pnmtopng)"
TOPNG=
for ac_prog in convert pnmtopng
@ -1130,6 +1130,44 @@ case $TOPNG in
pnmtopng) gif_to_png="giftopnm \$\$i | pnmtopng >\$\$o" eps_to_png="pstopnm \$\$i| pnmtopng >\$\$o" jpg_to_png="jpegtopnm \$\$i | pnmtopng >\$\$o";;
esac
echo $ac_n "checking For an EPS -> PDF converter""... $ac_c"
echo "$ac_t""(epstopdf)"
EPSTOPDF=
for ac_prog in epstopdf
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog ; ac_word=$2
if test -n "$ac_word"; then
echo $ac_n "+checking for \"$ac_word\"""... $ac_c"
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
for ac_dir in $PATH; do
test -z "$ac_dir" && ac_dir=.
if test -x $ac_dir/$ac_word; then
EPSTOPDF="$ac_prog"
break
fi
done
IFS="$ac_save_ifs"
if test -n "$EPSTOPDF"; then
ac_result=yes
else
ac_result=no
fi
echo "$ac_t""$ac_result"
test -n "$EPSTOPDF" && break
fi
done
if test -z "$EPSTOPDF" ; then
EPSTOPDF=none
fi
case $EPSTOPDF in
epstopdf) eps_to_pdf="epstopdf --outfile=\$\$o \$\$i";;
esac
#### Explore the LaTeX configuration
echo $ac_n "checking LaTeX configuration""... $ac_c"
# First, remove the files that we want to re-create
@ -1218,6 +1256,7 @@ cat >lyxrc.defaults <<EOF
\\Format docbook sgml DocBook B
\\Format dvi dvi DVI D
\\Format eps eps EPS ""
\\Format epsi epsi EPSI ""
\\Format fax "" Fax ""
\\Format gif gif GIF ""
\\Format html html HTML H
@ -1254,13 +1293,17 @@ cat >lyxrc.defaults <<EOF
\\converter html latex "$html_to_latex_command" ""
\\converter word latex "$word_to_latex_command" ""
\\converter gif eps "$gif_to_eps" ""
\\converter png eps "$png_to_eps" ""
\\converter jpg eps "$jpg_to_eps" ""
\\converter gif eps "$gif_to_eps" ""
\\converter png eps "$png_to_eps" ""
\\converter jpg eps "$jpg_to_eps" ""
\\converter gif png "$gif_to_png" ""
\\converter eps png "$eps_to_png" ""
\\converter jpg png "$jpg_to_png" ""
\\converter gif png "$gif_to_png" ""
\\converter eps png "$eps_to_png" ""
\\converter epsi png "$eps_to_png" ""
\\converter jpg png "$jpg_to_png" ""
\\converter eps pdf "$eps_to_pdf" ""
\\converter epsi pdf "$eps_to_pdf" ""
\\viewer dvi "$DVI_VIEWER"
\\viewer html "$HTML_VIEWER"

24
lib/configure.m4
View File

@ -338,12 +338,17 @@ case $TOEPS in
pnmtops) gif_to_eps="giftopnm \$\$i | pnmtops > \$\$o" png_to_eps="pngtopnm \$\$i | pnmtops >\$\$o" jpg_to_eps="jpegtopnm \$\$i | pnmtops >\$\$o";;
esac
SEARCH_PROG([for a GIF -> PNG converter], TOPNG, convert pnmtopng)
SEARCH_PROG([for a Image -> PNG converter], TOPNG, convert pnmtopng)
case $TOPNG in
convert) gif_to_png="convert GIF:\$\$i PNG:\$\$o" eps_to_png="convert EPS:\$\$i PNG:\$\$o" jpg_to_png="convert JPG:\$\$i PNG:\$\$o";;
pnmtopng) gif_to_png="giftopnm \$\$i | pnmtopng >\$\$o" eps_to_png="pstopnm \$\$i| pnmtopng >\$\$o" jpg_to_png="jpegtopnm \$\$i | pnmtopng >\$\$o";;
esac
SEARCH_PROG([For an EPS -> PDF converter], EPSTOPDF, epstopdf)
case $EPSTOPDF in
epstopdf) eps_to_pdf="epstopdf --outfile=\$\$o \$\$i";;
esac
#### Explore the LaTeX configuration
MSG_CHECKING(LaTeX configuration)
# First, remove the files that we want to re-create
@ -420,6 +425,7 @@ cat >lyxrc.defaults <<EOF
\\Format docbook sgml DocBook B
\\Format dvi dvi DVI D
\\Format eps eps EPS ""
\\Format epsi epsi EPSI ""
\\Format fax "" Fax ""
\\Format gif gif GIF ""
\\Format html html HTML H
@ -456,13 +462,17 @@ cat >lyxrc.defaults <<EOF
\\converter html latex "$html_to_latex_command" ""
\\converter word latex "$word_to_latex_command" ""
\\converter gif eps "$gif_to_eps" ""
\\converter png eps "$png_to_eps" ""
\\converter jpg eps "$jpg_to_eps" ""
\\converter gif eps "$gif_to_eps" ""
\\converter png eps "$png_to_eps" ""
\\converter jpg eps "$jpg_to_eps" ""
\\converter gif png "$gif_to_png" ""
\\converter eps png "$eps_to_png" ""
\\converter jpg png "$jpg_to_png" ""
\\converter gif png "$gif_to_png" ""
\\converter eps png "$eps_to_png" ""
\\converter epsi png "$eps_to_png" ""
\\converter jpg png "$jpg_to_png" ""
\\converter eps pdf "$eps_to_pdf" ""
\\converter epsi pdf "$eps_to_pdf" ""
\\viewer dvi "$DVI_VIEWER"
\\viewer html "$HTML_VIEWER"

8
src/ChangeLog
View File

@ -1,3 +1,11 @@
2001-07-30 Baruch Even <baruch@lyx.org>
* buffer.C (readInset): Stop auto-converting InsetFig to InsetGraphics.
2001-07-29 Baruch Even <baruch@lyx.org>
* buffer.C (readInset): Changed GRAPHICS to Graphics.
2001-07-27 Lars Gullik Bjønnes <larsbj@birdstep.com>
* ParameterStruct.h (endif): add a default constructor to make

6
src/buffer.C
View File

@ -1454,9 +1454,9 @@ void Buffer::readInset(LyXLex & lex, Paragraph *& par,
} else if (tmptok == "Formula") {
inset = new InsetFormula;
} else if (tmptok == "Figure") { // Backward compatibility
//inset = new InsetFig(100, 100, *this);
inset = new InsetGraphics;
} else if (tmptok == "GRAPHICS") {
inset = new InsetFig(100, 100, *this);
//inset = new InsetGraphics;
} else if (tmptok == "Graphics") {
inset = new InsetGraphics;
} else if (tmptok == "Info") {// backwards compatibility
inset = new InsetNote(this,