X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Fconfigure.m4;h=0068529700869b72b1c60c37fa7e9d97adff6f07;hb=014b9da9e54c37228bd3b8ea9a5b093dede94491;hp=5628f246cdfab2c33b2287eea3d488dd8d9bde24;hpb=7771334a116ea15dcee49d0179afc9c26fda3c8d;p=lyx.git diff --git a/lib/configure.m4 b/lib/configure.m4 index 5628f246cd..0068529700 100644 --- a/lib/configure.m4 +++ b/lib/configure.m4 @@ -29,7 +29,7 @@ dnl define(SEARCH_PROG,[dnl changequote([,])dnl MSG_CHECKING($1) -MSG_RESULT(($3)) +MSG_RESULT() $2= for ac_prog in $3 do @@ -38,14 +38,15 @@ set dummy $ac_prog ; ac_word=$[2] if test -n "$ac_word"; then MSG_CHECKING([for \"$ac_word\"],[+]) IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. + save_PATH=$PATH ; PATH=:$PATH + for ac_dir in ${PATH} ; do if test -x [$ac_dir/$ac_word]; then $2="$ac_prog" break fi done IFS="$ac_save_ifs" + PATH=$save_PATH if test -n "[$]$2"; then ac_result=yes @@ -167,13 +168,14 @@ ac_prog=[$]0 changequote(,)dnl srcdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'` srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` -test "x$srcdir" = "x$ac_prog" && srcdir=. -if test ! -r ${srcdir}/chkconfig.ltx ; then +test "x${srcdir}" = "x$ac_prog" && srcdir=. +if test ! -r "${srcdir}"/chkconfig.ltx ; then echo "configure: error: cannot find chkconfig.ltx script" exit 1 fi #### Adjust PATH for Win32 (Cygwin) +use_cygwin_path_fix='' case `uname -s` in CYGWIN*) tmpfname="/tmp/x$$.ltx"; @@ -188,15 +190,17 @@ case `uname -s` in echo "configure: cygwin detected; path correction" srcdir=`cygpath -w "${srcdir}" | tr '\\\\' /` echo "srcdir=${srcdir}" + use_cygwin_path_fix='true' else echo "configure: cygwin detected; path correction is not needed" + use_cygwin_path_fix='false' fi ;; esac #### Create the build directories if necessary -for dir in bind clipart doc examples help images kbd layouts reLyX \ - scripts templates ui xfonts; do +for dir in bind clipart doc examples images kbd layouts \ + scripts templates ui ; do test ! -d $dir && mkdir $dir done @@ -237,65 +241,85 @@ fi test $latex_to_dvi != "none" && latex_to_dvi="$latex_to_dvi \$\$i" test $latex_to_pdf != "none" && latex_to_pdf="$latex_to_pdf \$\$i" -# Search for an installed reLyX or a ready-to-install one -save_PATH=${PATH} -PATH=${PATH}:./reLyX/ -SEARCH_PROG([for a LaTeX -> LyX converter],tex_to_lyx_command,reLyX) -PATH=${save_PATH} -test $tex_to_lyx_command = "reLyX" && tex_to_lyx_command="reLyX -f \$\$i" -tex_to_lyx_command=`echo $tex_to_lyx_command | sed "s,reLyX,reLyX$version_suffix,"` +SEARCH_PROG([for a Tgif viewer and editor], TGIF_EDITOR, tgif) +TGIF_VIEWER="$TGIF_EDITOR" -SEARCH_PROG([for a Noweb -> LyX converter],literate_to_lyx_command,noweb2lyx) -test $literate_to_lyx_command = "noweb2lyx" && literate_to_lyx_command="noweb2lyx \$\$i \$\$o" +SEARCH_PROG([for a FIG viewer and editor], FIG_EDITOR, xfig) +FIG_VIEWER="$FIG_EDITOR" + +SEARCH_PROG([for a Grace viewer and editor], GRACE_EDITOR, xmgrace) +GRACE_VIEWER="$GRACE_EDITOR" + +SEARCH_PROG([for a FEN viewer and editor], FEN_EDITOR, "xboard -lpf \$\$i -mode EditPosition") +FEN_VIEWER="$FEN_EDITOR" + +SEARCH_PROG([for a raster image viewer], RASTERIMAGE_VIEWER, xv kview gimp) + +SEARCH_PROG([for a raster image editor], RASTERIMAGE_EDITOR, gimp) + +SEARCH_PROG([for a text editor], TEXT_EDITOR, xemacs gvim kedit kwrite kate nedit gedit notepad) + +# Search for an installed tex2lyx or a ready-to-install one +SEARCH_PROG([for a LaTeX -> LyX converter],tex_to_lyx_command, "$PWD/../src/tex2lyx/tex2lyx -f \$\$i \$\$o" "tex2lyx$version_suffix -f \$\$i \$\$o") + +SEARCH_PROG([for a Noweb -> LyX converter],literate_to_lyx_command,"noweb2lyx \$\$i \$\$o") literate_to_lyx_command=`echo $literate_to_lyx_command | sed "s,noweb2lyx,noweb2lyx$version_suffix,"` # Search something to process a literate document -SEARCH_PROG([for a Noweb -> LaTeX converter],literate_to_tex_command,noweave) -test $literate_to_tex_command = "noweave" && literate_to_tex_command="noweave -delay -index \$\$i > \$\$o" +SEARCH_PROG([for a Noweb -> LaTeX converter],literate_to_tex_command,"noweave -delay -index \$\$i > \$\$o") -SEARCH_PROG([for a HTML -> Latex converter],html_to_latex_command,html2latex) -test $html_to_latex_command = "html2latex" && html_to_latex_command="html2latex \$\$i" +SEARCH_PROG([for an HTML -> LaTeX converter],html_to_latex_command, "html2latex \$\$i") -SEARCH_PROG([for a MSWord -> Latex converter],word_to_latex_command,wvCleanLatex word2x) -test "$word_to_latex_command" = "wvCleanLatex" && word_to_latex_command="wvCleanLatex \$\$i \$\$o" -test "$word_to_latex_command" = "word2x" && word_to_latex_command="word2x -f latex \$\$i" +SEARCH_PROG([for an MS Word -> LaTeX converter],word_to_latex_command, "wvCleanLatex \$\$i \$\$o") -SEARCH_PROG([for Image converter],image_command,convert) -test $image_command = "convert" && image_command="convert \$\$i \$\$o" +# tex4ht generates HTML output that is well-suited for MS Word +SEARCH_PROG([for a LaTeX -> MS Word converter],latex_to_word_command, "htlatex") +test "$latex_to_word_command" = "htlatex" && latex_to_word_command="htlatex \$\$i 'html,word' 'symbol/!' '-cvalidate'" -# Search for a Postscript interpreter -LYXRC_PROG([for a Postscript interpreter], \ps_command, gs) + + +SEARCH_PROG([for Image converter],image_command, "convert \$\$i \$\$o") + +SEARCH_PROG([for an OpenOffice.org -> LaTeX converter],sxw_to_latex_command, "w2l -clean \$\$i") + +# oolatex is the original name, SuSE has oolatex.sh +SEARCH_PROG([for a LaTeX -> OpenOffice.org converter],latex_to_sxw_command, "oolatex \$\$i" "oolatex.sh \$\$i") # Search something to preview postscript -SEARCH_PROG([for a Postscript previewer],GHOSTVIEW,gv ghostview) +SEARCH_PROG([for a Postscript previewer],PS_VIEWER,gsview32 gv "ghostview -swap" kghostview) +EPS_VIEWER=$PS_VIEWER # Search for a program to preview pdf -SEARCH_PROG([for a PDF preview],PDF_VIEWER,acroread gv ghostview xpdf) +SEARCH_PROG([for a PDF previewer],PDF_VIEWER, acrobat acrord32 gsview32 acroread gv ghostview xpdf kpdf kghostview) # Search something to preview dvi -SEARCH_PROG([for a DVI previewer],DVI_VIEWER, xdvi windvi yap) +SEARCH_PROG([for a DVI previewer],DVI_VIEWER, xdvi windvi yap kdvi) # Search something to preview html SEARCH_PROG([for a HTML previewer],HTML_VIEWER, "mozilla file://\$\$p\$\$i" netscape) # Search for a program to convert ps to pdf -SEARCH_PROG([for a PS to PDF converter],ps_to_pdf_command,ps2pdf) -test $ps_to_pdf_command = "ps2pdf" && ps_to_pdf_command="ps2pdf -dCompatibilityLevel=1.3 \$\$i" +SEARCH_PROG([for a PS to PDF converter],ps_to_pdf_command, "ps2pdf13 \$\$i") # Search for a program to convert dvi to ps -SEARCH_PROG([for a DVI to PS converter],dvi_to_ps_command,dvips) -test $dvi_to_ps_command = "dvips" && dvi_to_ps_command="dvips -o \$\$o \$\$i" +SEARCH_PROG([for a DVI to PS converter],dvi_to_ps_command, "dvips -o \$\$o \$\$i") # Search for a program to convert dvi to pdf -SEARCH_PROG([for a DVI to PDF converter],dvi_to_pdf_command,dvipdfm) -test $dvi_to_pdf_command = "dvipdfm" && dvi_to_pdf_command="dvipdfm \$\$i" +SEARCH_PROG([for a DVI to PDF converter],dvi_to_pdf_command, "dvipdfm \$\$i") -# We have a script to convert previewlyx to ppm -lyxpreview_to_bitmap_command='$$s/lyxpreview2bitmap.sh' +# We have a script to convert previewlyx to ppm or to png +lyxpreview_to_bitmap_command='python $$s/scripts/lyxpreview2bitmap.py' + +# Search for 'dvipng'. Only enable the conversion from lyxpreview -> png +# if dvipng is found. +SEARCH_PROG([for dvipng],DVIPNG,dvipng) + +test "$DVIPNG" = "dvipng" && \ + lyxpreview_to_png_command=$lyxpreview_to_bitmap_command # Search a *roff program (used to translate tables in ASCII export) LYXRC_PROG([for a *roff formatter], \ascii_roff_command, dnl - 'groff -t -Tlatin1 $$FName' nroff,dnl + "groff -t -Tlatin1 \$\$FName" nroff,dnl test "$prog" = "nroff" && prog='tbl $$FName | nroff') # Search the ChkTeX program @@ -303,7 +327,7 @@ LYXRC_PROG([for ChkTeX], \chktex_command,dnl "chktex -n1 -n3 -n6 -n9 -n22 -n25 -n30 -n38") # Search for a spellchecker -LYXRC_PROG([for a spell-checker], \spell_command, ispell) +LYXRC_PROG([for a spellchecker], \spell_command, ispell) # Search for computer algebra systems SEARCH_PROG([for Octave],OCTAVE,octave) @@ -322,15 +346,17 @@ dnl fax_command="none" dnl fi # Search a GUI Fax program -SEARCH_PROG([for a fax program], fax_command, kdeprintfax ksendfax) -test $fax_command != "none" && fax_command="$fax_command \$\$i" +SEARCH_PROG([for a fax program], fax_command, "kdeprintfax \$\$i" "ksendfax \$\$i") # Search for LinuxDoc support SEARCH_PROG([for SGML-tools 1.x (LinuxDoc)], LINUXDOC, sgml2lyx) -chk_linuxdoc=no if test $LINUXDOC != none; then chk_linuxdoc=yes + bool_linuxdoc=true linuxdoc_cmd="\\def\\haslinuxdoc{yes}" +else + chk_linuxdoc=no + bool_linuxdoc=false fi case $LINUXDOC in @@ -348,10 +374,13 @@ esac # Search for DocBook support SEARCH_PROG([for SGML-tools 2.x (DocBook) or db2x scripts], DOCBOOK, sgmltools db2dvi) -chk_docbook=no if test $DOCBOOK != none; then chk_docbook=yes + bool_docbook=true docbook_cmd="\\def\\hasdocbook{yes}" +else + chk_docbook=no + bool_docbook=false fi case $DOCBOOK in @@ -375,13 +404,11 @@ case $prog in esac LYXRC_VAR(\print_spool_printerprefix, $print_spool_printerprefix) -SEARCH_PROG([for a LaTeX -> HTML converter], TOHTML, tth latex2html hevea) -latex_to_html_command=$TOHTML -case $TOHTML in - tth) latex_to_html_command="tth -t -e2 -L\$\$b < \$\$i > \$\$o";; - latex2html) latex_to_html_command="latex2html -no_subdir -split 0 -show_section_numbers \$\$i";; - hevea) latex_to_html_command="hevea -s \$\$i";; -esac +SEARCH_PROG([for a LaTeX -> HTML converter], latex_to_html_command,dnl + "htlatex \$\$i" dnl + "tth -t -e2 -L\$\$b < \$\$i > \$\$o" dnl + "latex2html -no_subdir -split 0 -show_section_numbers \$\$i" dnl + "hevea -s \$\$i") #### Explore the LaTeX configuration MSG_CHECKING(LaTeX configuration) @@ -389,41 +416,110 @@ MSG_CHECKING(LaTeX configuration) rm -f textclass.lst packages.lst chkconfig.sed if test ${lyx_check_config} = no ; then MSG_RESULT(default values) + MSG_CHECKING(list of textclasses,+) + cat >textclass.lst <> textclass.lst + fi + fi ;; + esac + done + MSG_RESULT(done) else MSG_RESULT(auto) rm -f wrap_chkconfig.ltx chkconfig.vars chkconfig.classes chklayouts.tex + if test ! -r "chkconfig.ltx" ; then + cp "${srcdir}"/chkconfig.ltx . + rmcopy=true + fi cat >wrap_chkconfig.ltx < chklayouts.tex + done > chklayouts.tex + ${LATEX} wrap_chkconfig.ltx 2>/dev/null | grep '^\+' changequote([,])dnl - [eval] ${LATEX} wrap_chkconfig.ltx 2>/dev/null | grep '^\+' [eval] `cat chkconfig.vars | sed 's/-/_/g'` changequote(,)dnl + test -n "${rmcopy}" && rm -f chkconfig.ltx fi # Do we have all the files we need? Useful if latex did not run changequote([,])dnl -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). -# It contains only default values, since chkconfig.ltx could not be run -# for some reason. Run ./configure if you need to update it after a -# configuration change. -article article article false]) PROVIDE_DEFAULT_FILE(chkconfig.sed,[s/@.*@/???/g]) @@ -439,7 +535,33 @@ changequote(,)dnl 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 + +if test `uname -s | grep 'MINGW'` ; then + # Before running chkconfig.sed, remove the trailing '\r' + # characters that can bugger up various versions of sed. + tr -d '\r' < chkconfig.sed > chkconfig2.sed + mv -f chkconfig2.sed chkconfig.sed +fi + +sed -f chkconfig.sed "${srcdir}"/doc/LaTeXConfig.lyx.in >doc/LaTeXConfig.lyx + +### Let's check whether spaces are allowed in TeX file names +MSG_CHECKING(whether TeX allows spaces in file names) +if test ${lyx_check_config} = no ; then + tex_allows_spaces=false +else + fname="a b" + rm -f "$fname".tex + echo "\\message{working^^J}" >"$fname".tex + if ${LATEX} "$fname" /dev/null ; then + MSG_RESULT(yes) + tex_allows_spaces=true + else + MSG_RESULT(no) + tex_allows_spaces=false + fi + rm -f "$fname".* texput.log +fi echo "creating $outfile" cat >$outfile <$outfile < \$\$o" "" -\\converter docbook dvi "$docbook_to_dvi_command" "" -\\converter docbook html "$docbook_to_html_command" "" -\\converter dvi pdf3 "$dvi_to_pdf_command" "" -\\converter dvi ps "$dvi_to_ps_command" "" -\\converter fen asciichess "python \$\$s/fen2ascii.py \$\$i \$\$o" "" -\\converter fig pdftex "sh \$\$s/fig2pdftex.sh \$\$i \$\$o" "" -\\converter fig pstex "sh \$\$s/fig2pstex.sh \$\$i \$\$o" "" -\\converter html latex "$html_to_latex_command" "" -\\converter latex html "$latex_to_html_command" "originaldir,needaux" -\\converter latex dvi "$latex_to_dvi" "latex" -\\converter latex lyx "$tex_to_lyx_command" "" -\\converter latex pdf2 "$latex_to_pdf" "latex" -\\converter linuxdoc dvi "$linuxdoc_to_dvi_command" "" -\\converter linuxdoc html "$linuxdoc_to_html_command" "" -\\converter linuxdoc latex "$linuxdoc_to_latex_command" "" -\\converter linuxdoc lyx "$linuxdoc_to_lyx_command" "" -\\converter literate latex "$literate_to_tex_command" "" -\\converter literate lyx "$literate_to_lyx_command" "" -\\converter lyxpreview ppm "$lyxpreview_to_bitmap_command" "" -\\converter ps fax "$fax_command" "" -\\converter ps pdf "$ps_to_pdf_command" "" -\\converter word latex "$word_to_latex_command" "" - -\\viewer dvi "$DVI_VIEWER" -\\viewer html "$HTML_VIEWER" -\\viewer pdf "$PDF_VIEWER" -\\viewer pdf2 "$PDF_VIEWER" -\\viewer pdf3 "$PDF_VIEWER" -\\viewer ps "$GHOSTVIEW -swap" -\\viewer eps "$GHOSTVIEW" - -$rc_entries -\\font_encoding "$chk_fontenc" +\\Format asciichess asc "Plain text (chess output)" "" "" "$TEXT_EDITOR" +\\Format asciiimage asc "Plain text (image)" "" "" "$TEXT_EDITOR" +\\Format asciixfig asc "Plain text (Xfig output)" "" "" "$TEXT_EDITOR" +\\Format agr agr Grace "" "$GRACE_VIEWER" "$GRACE_EDITOR" +\\Format bmp bmp BMP "" "$RASTERIMAGE_VIEWER" "$RASTERIMAGE_EDITOR" +\\Format date "" "date command" "" "" "" +\\Format dateout tmp "date (output)" "" "" "$TEXT_EDITOR" +\\Format docbook sgml DocBook B "" "$TEXT_EDITOR" +\\Format docbook-xml xml "Docbook (XML)" "" "" "$TEXT_EDITOR" +\\Format dvi dvi DVI D "$DVI_VIEWER" "" +\\Format eps eps EPS "" "$EPS_VIEWER" "" +\\Format fax "" Fax "" "" "" +\\Format fen fen FEN "" "$FEN_VIEWER" "$FEN_EDITOR" +\\Format fig fig FIG "" "$FIG_VIEWER" "$FIG_EDITOR" +\\Format gif gif GIF "" "$RASTERIMAGE_VIEWER" "$RASTERIMAGE_EDITOR" +\\Format html html HTML H "$HTML_VIEWER" "" +\\Format jpg jpg JPEG "" "$RASTERIMAGE_VIEWER" "$RASTERIMAGE_EDITOR" +\\Format latex tex LaTeX L "" "$TEXT_EDITOR" +\\Format linuxdoc sgml LinuxDoc x "" "$TEXT_EDITOR" +\\Format lyx lyx LyX "" "lyx" "lyx" +\\Format lyxpreview lyxpreview "LyX Preview" "" "" "" +\\Format literate nw NoWeb N "" "$TEXT_EDITOR" +\\Format pbm pbm PBM "" "$RASTERIMAGE_VIEWER" "$RASTERIMAGE_EDITOR" +\\Format pdf pdf "PDF (ps2pdf)" P "$PDF_VIEWER" "" +\\Format pdf2 pdf "PDF (pdflatex)" F "$PDF_VIEWER" "" +\\Format pdf3 pdf "PDF (dvipdfm)" m "$PDF_VIEWER" "" +\\Format pdftex pdftex_t PDFTEX "" "" "" +\\Format pgm pgm PGM "" "$RASTERIMAGE_VIEWER" "$RASTERIMAGE_EDITOR" +\\Format png png PNG "" "$RASTERIMAGE_VIEWER" "$RASTERIMAGE_EDITOR" +\\Format ppm ppm PPM "" "$RASTERIMAGE_VIEWER" "$RASTERIMAGE_EDITOR" +\\Format program "" Program "" "" "" +\\Format ps ps Postscript t "$PS_VIEWER" "" +\\Format pstex pstex_t PSTEX "" "" "" +\\Format tgif obj Tgif "" "$TGIF_VIEWER" "$TGIF_EDITOR" +\\Format sxw sxw "OpenOffice.Org Writer" O "" "" +\\Format text txt "Plain text" a "" "$TEXT_EDITOR" +\\Format textparagraph txt "Plain text (paragraphs)" "" "" "$TEXT_EDITOR" +\\Format tiff tif TIFF "" "$RASTERIMAGE_VIEWER" "$RASTERIMAGE_EDITOR" +\\Format word doc "MS Word" W "" "" +\\Format wordhtml html "MS Word (HTML)" "" "" "" +\\Format xbm xbm XBM "" "$RASTERIMAGE_VIEWER" "$RASTERIMAGE_EDITOR" +\\Format xpm xpm XPM "" "$RASTERIMAGE_VIEWER" "$RASTERIMAGE_EDITOR" + +\\converter date dateout "date +%d-%m-%Y > \$\$o" "" +\\converter docbook docbook-xml "cp \$\$i \$\$o" "xml" +\\converter docbook dvi "$docbook_to_dvi_command" "" +\\converter docbook html "$docbook_to_html_command" "" +\\converter dvi pdf3 "$dvi_to_pdf_command" "" +\\converter dvi ps "$dvi_to_ps_command" "" +\\converter fen asciichess "python \$\$s/scripts/fen2ascii.py \$\$i \$\$o" "" +\\converter fig pdftex "sh \$\$s/scripts/fig2pdftex.sh \$\$i \$\$o" "" +\\converter fig pstex "sh \$\$s/scripts/fig2pstex.sh \$\$i \$\$o" "" +\\converter html latex "$html_to_latex_command" "" +\\converter latex html "$latex_to_html_command" "originaldir,needaux" +\\converter latex dvi "$latex_to_dvi" "latex" +\\converter latex lyx "$tex_to_lyx_command" "" +\\converter latex pdf2 "$latex_to_pdf" "latex" +\\converter latex sxw "$latex_to_sxw_command" "latex" +\\converter latex wordhtml "$latex_to_word_command" "" +\\converter linuxdoc dvi "$linuxdoc_to_dvi_command" "" +\\converter linuxdoc html "$linuxdoc_to_html_command" "" +\\converter linuxdoc latex "$linuxdoc_to_latex_command" "" +\\converter linuxdoc lyx "$linuxdoc_to_lyx_command" "" +\\converter literate latex "$literate_to_tex_command" "" +\\converter literate lyx "$literate_to_lyx_command" "" +\\converter lyxpreview png "$lyxpreview_to_png_command" "" +\\converter lyxpreview ppm "$lyxpreview_to_bitmap_command" "" +\\converter ps fax "$fax_command" "" +\\converter ps pdf "$ps_to_pdf_command" "" +\\converter sxw latex "$sxw_to_latex_command" "" +\\converter word latex "$word_to_latex_command" "" EOF ### the graphic converter part with the predefined ones -#### Search for tne nonstandard converting progs +#### Search for the nonstandard converting progs # -SEARCH_PROG([for an FIG -> EPS/PPM converter], FIG2DEV, fig2dev) +SEARCH_PROG([for a FIG -> EPS/PPM/PNG converter], FIG2DEV, fig2dev) if test "$FIG2DEV" = "fig2dev"; then cat >>$outfile < PS converter], TIFF2PS, tiff2ps) +SEARCH_PROG([for a TIFF -> PS converter], TIFF2PS, tiff2ps) if test "$TIFF2PS" = "tiff2ps"; then cat >>$outfile < \$\$o" "" +\\converter tiff eps "tiff2ps \$\$i > \$\$o" "" EOF fi -SEARCH_PROG([for an TGIF -> EPS/PPM converter], TGIF, tgif) +SEARCH_PROG([for a Tgif -> EPS/PDF converter], TGIF, tgif) if test "$TGIF" = "tgif"; then cat >>$outfile < \$\$o" "" -\\converter tgif png "tgif -stdout -print -color -xpm \$\$i | xpmtoppm | pnmtopng > \$\$o" "" +\\converter tgif eps "tgif -stdout -print -color -eps \$\$i > \$\$o" "" +\\converter tgif pdf "tgif -stdout -print -color -pdf \$\$i > \$\$o" "" EOF fi SEARCH_PROG([for an EPS -> PDF converter], EPSTOPDF, epstopdf) if test "$EPSTOPDF" = "epstopdf"; then cat >>$outfile < Image converter], GRACE, gracebat) if test "$GRACE" = "gracebat"; then cat >>$outfile </dev/null" "" -\\converter agr png "gracebat -hardcopy -printfile \$\$o -hdevice PNG \$\$i 2>/dev/null" "" -\\converter agr jpg "gracebat -hardcopy -printfile \$\$o -hdevice JPEG \$\$i 2>/dev/null" "" -\\converter agr ppm "gracebat -hardcopy -printfile \$\$o -hdevice PNM \$\$i 2>/dev/null" "" +\\converter agr eps "gracebat -hardcopy -printfile \$\$o -hdevice EPS \$\$i 2>/dev/null" "" +\\converter agr png "gracebat -hardcopy -printfile \$\$o -hdevice PNG \$\$i 2>/dev/null" "" +\\converter agr jpg "gracebat -hardcopy -printfile \$\$o -hdevice JPEG \$\$i 2>/dev/null" "" +\\converter agr ppm "gracebat -hardcopy -printfile \$\$o -hdevice PNM \$\$i 2>/dev/null" "" EOF fi -######## 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 wasy10" -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 +cat >>$outfile <xfonts/fonts.scale - cat xfonts/tmpfonts >>xfonts/fonts.scale - cp xfonts/fonts.scale xfonts/fonts.dir - # create a resource list file for Display Postscript - (cd xfonts ; rm -f PSres.upr ; makepsres -q) || true -fi -rm -f xfonts/tmpfonts +\\copier fig "sh \$\$s/scripts/fig_copy.sh \$\$i \$\$o" +\\copier pstex "python \$\$s/scripts/tex_copy.py \$\$i \$\$o \$\$l" +\\copier pdftex "python \$\$s/scripts/tex_copy.py \$\$i \$\$o \$\$l" +$rc_entries +\\font_encoding "$chk_fontenc" +\\tex_allows_spaces $tex_allows_spaces +EOF + +if [ "x$use_cygwin_path_fix" != "x" ] +then + echo "\\cygwin_path_fix_needed $use_cygwin_path_fix" >> $outfile +fi # Remove superfluous files if we are not writing in the main lib # directory for file in $outfile textclass.lst packages.lst \ - doc/LaTeXConfig.lyx xfonts/fonts.dir ; do + doc/LaTeXConfig.lyx ; 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 ; + if test -r "${srcdir}"/$file && diff $file.new "${srcdir}"/$file >/dev/null 2>/dev/null ; then echo "removing $file, which is identical to the system global version" rm -f $file.new @@ -619,10 +719,6 @@ for file in $outfile textclass.lst packages.lst \ mv $file.new $file fi done -if test ! -r xfonts/fonts.dir ; then - echo "removing font links" - rm -f xfonts/*.pfb xfonts/fonts.scale -fi # Final clean-up if test $lyx_keep_temps = no ; then