X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Fconfigure.m4;h=addc8a8d40678dab47126a380a300f99c52f00fd;hb=98c966c64594611e469313314abd1e59524adb4a;hp=431589569c5be37da5d2fbc582afa837aa493b43;hpb=358c483572b2d9fe3ba4ab511fd89af94ad27ce5;p=lyx.git

diff --git a/lib/configure.m4 b/lib/configure.m4
index 431589569c..addc8a8d40 100644
--- a/lib/configure.m4
+++ b/lib/configure.m4
@@ -172,7 +172,7 @@ fi
 
 #### Create the build directories if necessary
 for dir in bind clipart doc examples help images kbd layouts reLyX \
-    scripts templates ui ; do
+    scripts templates ui xfonts; do
   test ! -d $dir && mkdir $dir
 done
 
@@ -355,7 +355,7 @@ esac
 #### Search for image conversion ####
 SEARCH_PROG([for an Image -> EPS converter], TOEPS, convert pnmtops)
 case $TOEPS in
-	convert) gif_to_eps="convert GIF:\$\$i EPS:\$\$o" png_to_eps="convert PNG:\$\$i EPS:\$\$o" jpg_to_eps="convert JPG:\$\$i EPS:\$\$o";;
+	convert) bmp_to_eps="convert BMP:\$\$i EPS:\$\$o" fits_to_eps="convert FITS:\$\$i EPS:\$\$o" gif_to_eps="convert GIF:\$\$i EPS:\$\$o" jpg_to_eps="convert JPG:\$\$i EPS:\$\$o" pbm_to_eps="convert PBM:\$\$i EPS:\$\$o" pgm_to_eps="convert PGM:\$\$i EPS:\$\$o" png_to_eps="convert PNG:\$\$i EPS:\$\$o" ppm_to_eps="convert PPM:\$\$i EPS:\$\$o" sgi_to_eps="convert SGI:\$\$i EPS:\$\$o" xbm_to_eps="convert XBM:\$\$i EPS:\$\$o" xwd_to_eps="convert XWD:\$\$i EPS:\$\$o" ;;
 	pnmtops) gif_to_eps="giftopnm \$\$i | pnmtops > \$\$o" png_to_eps="pngtopnm \$\$i | pnmtops >\$\$o" jpg_to_eps="jpegtopnm \$\$i | pnmtops >\$\$o";;
 esac
 
@@ -372,6 +372,7 @@ if test "$TOXPM" = "convert"; then
 	jpg_to_xpm="convert JPG:\$\$i XPM:\$\$o"
 	png_to_xpm="convert PNG:\$\$i XPM:\$\$o"
 	ps_to_xpm="convert PS:\$\$i XPM:\$\$o" 
+	xbm_to_xpm="convert XBM:\$\$i XPM:\$\$o" 
 fi
 
 SEARCH_PROG([For an EPS -> PDF converter], EPSTOPDF, epstopdf)
@@ -412,7 +413,7 @@ fi
 
 # Do we have all the files we need? Useful if latex did not run
 changequote([,])dnl
-echo creating textclass.lst 
+echo "creating textclass.lst" 
 PROVIDE_DEFAULT_FILE(textclass.lst,dnl
 [# This file declares layouts and their associated definition files
 # (include dir. relative to the place where this file is).
@@ -427,7 +428,7 @@ letter	letter	letter])
 
 PROVIDE_DEFAULT_FILE(chkconfig.sed,[s/@.*@/???/g])
 
-echo creating packages.lst
+echo "creating packages.lst"
 PROVIDE_DEFAULT_FILE(packages.lst,dnl
 [# This file should contain the list of LaTeX packages that have been
 # recognized by LyX. Unfortunately, since configure could not find
@@ -436,12 +437,12 @@ PROVIDE_DEFAULT_FILE(packages.lst,dnl
 ])
 changequote(,)dnl
 
-echo creating doc/LaTeXConfig.lyx
+echo "creating doc/LaTeXConfig.lyx"
 echo "s/@chk_linuxdoc@/$chk_linuxdoc/g" >> chkconfig.sed
 echo "s/@chk_docbook@/$chk_docbook/g" >> chkconfig.sed
 sed -f chkconfig.sed ${srcdir}/doc/LaTeXConfig.lyx.in >doc/LaTeXConfig.lyx
 
-echo creating $outfile
+echo "creating $outfile"
 cat >$outfile <<EOF
 # This file has been automatically generated by LyX' lib/configure
 # script. It contains default settings that have been determined by
@@ -452,11 +453,14 @@ cat >$outfile <<EOF
 \\Format text	  txt	ASCII		A
 \\Format textparagraph txt ASCII(paragraphs)	""
 \\Format docbook  sgml	DocBook		B
+\\Format bmp      bmp	BMP		""
 \\Format dvi	  dvi	DVI		D
 \\Format eps	  eps	EPS		""
-\\Format epsi     epsi  EPSI    ""
+\\Format epsi     epsi  EPSI 		""
 \\Format fax	  ""	Fax		""
+\\Format fits     fits	FITS		""
 \\Format gif      gif	GIF		""
+\\Format grace    agr	GRACE		""
 \\Format html	  html	HTML		H
 \\Format jpg      jpg	JPEG		""
 \\Format latex	  tex	LaTeX		L
@@ -466,10 +470,18 @@ cat >$outfile <<EOF
 \\Format pdf	  pdf	PDF		P
 \\Format pdf2	  pdf  "PDF (pdflatex)"	F
 \\Format pdf3	  pdf  "PDF (dvipdfm)"	m
+\\Format pbm	  pbm	PBM		""
+\\Format pgm	  pgm	PGM		""
 \\Format png	  png	PNG		""
+\\Format ppm	  ppm	PPM		""
 \\Format ps	  ps	Postscript	t
 \\Format program  ""	Program		""
+\\Format sgi      sgi	SGI		""
+\\Format tgif     tgif	TGIF		""
+\\Format tiff     tif	TIFF		""
+\\Format xbm      xbm   XBM             ""
 \\Format xpm      xpm   XPM             ""
+\\Format xwd      xwd	XWD		""
 \\Format word	  doc	Word		W
 
 \\converter latex dvi "$latex_to_dvi" "latex"
@@ -492,9 +504,24 @@ cat >$outfile <<EOF
 \\converter html latex "$html_to_latex_command" ""
 \\converter word latex "$word_to_latex_command" ""
 
+\\converter agr  eps "xmgrace -hardcopy -printfile \$\$o -hdevice EPS \$\$i" ""
+\\converter bmp  eps "$bmp_to_eps" ""
+\\converter fits  eps "$fits_to_eps" ""
 \\converter gif  eps "$gif_to_eps" ""
-\\converter png  eps "$png_to_eps" ""
 \\converter jpg  eps "$jpg_to_eps" ""
+\\converter pbm  eps "$pbm_to_eps" ""
+\\converter pgm  eps "$pgm_to_eps" ""
+\\converter png  eps "$png_to_eps" ""
+\\converter ppm  eps "$ppm_to_eps" ""
+\\converter sgi  eps "$sgi_to_eps" ""
+\\converter tgif eps "tgif -print -eps \$\$i" ""
+\\converter tiff eps "tiff2ps \$\$i > \$\$o" ""
+\\converter xbm  eps "$xbm_to_eps" ""
+\\converter xwd  eps "$xwd_to_eps" ""
+
+\\converter tgif xpm "tgif -print -stdout -xpm \$\$i > \$\$o" ""
+\\converter tgif png "tgif -print -stdout -png \$\$i > \$\$o" ""
+\\converter tgif pdf "tgif -print -stdout -pdf \$\$i > \$\$o" ""
 
 \\converter gif  png "$gif_to_png" ""
 \\converter eps  png "$eps_to_png" ""
@@ -506,6 +533,8 @@ cat >$outfile <<EOF
 \\converter epsi xpm "$eps_to_xpm" ""
 \\converter jpg  xpm "$jpg_to_xpm" ""
 \\converter png  xpm "$png_to_xpm" ""
+\\converter ps  xpm "$ps_to_xpm" ""
+\\converter xbm  xpm "$xbm_to_xpm" ""
  
 \\converter eps  pdf "$eps_to_pdf" ""
 \\converter epsi pdf "$eps_to_pdf" ""
@@ -517,14 +546,46 @@ cat >$outfile <<EOF
 \\viewer eps "$GHOSTVIEW"
 
 $rc_entries
-dnl \\fax_command "$fax_command"
 \\font_encoding "$chk_fontenc"
 EOF
 
+######## X FONTS
+# create a fonts.dir file to make X fonts available to LyX
+echo "checking for TeX fonts"
+
+fontlist="cmex10 cmmi10 cmr10 cmsy10 eufm10 msam10 msbm10"
+rm -f xfonts/fonts.dir xfonts/fonts.scale xfonts/tmpfonts
+
+num=0
+touch xfonts/tmpfonts
+for font in $fontlist ; do
+  MSG_CHECKING([for $font])
+  result=no
+  for ext in pfb pfa ttf ; do
+    if filepath=`kpsewhich $font.$ext` ; then
+      result="yes ($ext)"
+      rm -f xfonts/$font.$ext
+      ln -s $filepath xfonts 2>/dev/null
+      echo "$font.$ext -unknown-$font-medium-r-normal--0-0-0-0-p-0-adobe-fontspecific" >>xfonts/tmpfonts
+      num=`expr $num + 1`
+      break
+    fi
+  done
+  MSG_RESULT($result)
+done
+
+if test ! $num = 0 ; then
+  echo $num >xfonts/fonts.scale
+  cat xfonts/tmpfonts >>xfonts/fonts.scale
+  cp xfonts/fonts.scale xfonts/fonts.dir
+fi
+rm -f xfonts/tmpfonts
+
+
 # Remove superfluous files if we are not writing in the main lib
 # directory 
 for file in $outfile textclass.lst packages.lst \
-            doc/LaTeXConfig.lyx ; do
+            doc/LaTeXConfig.lyx xfonts/fonts.dir ; do
   # we rename the file first, so that we avoid comparing a file with itself
   mv $file $file.new
   if test -r $srcdir/$file && diff $file.new $srcdir/$file >/dev/null 2>/dev/null ;