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
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
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_PROG([for a TGIF viewer and editor], TGIF_EDITOR, tgif)
+SEARCH_PROG([for a Tgif viewer and editor], TGIF_EDITOR, tgif)
TGIF_VIEWER="$TGIF_EDITOR"
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)
+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")
SEARCH_PROG([for a text editor], TEXT_EDITOR, xemacs gvim kedit kwrite kate nedit gedit notepad)
-# 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 -f \$\$i")
-PATH=${save_PATH}
-tex_to_lyx_command=`echo $tex_to_lyx_command | sed "s,reLyX,reLyX$version_suffix,"`
+# 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 -delay -index \$\$i > \$\$o")
-SEARCH_PROG([for a HTML -> Latex converter],html_to_latex_command, "html2latex \$\$i")
+SEARCH_PROG([for an HTML -> LaTeX converter],html_to_latex_command, "html2latex \$\$i")
+
+SEARCH_PROG([for an MS Word -> LaTeX converter],word_to_latex_command, "wvCleanLatex \$\$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_PROG([for a MSWord -> Latex converter],word_to_latex_command, "wvCleanLatex \$\$i \$\$o" "wvCleanLatex \$\$i \$\$o")
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")
+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 an Latex -> OpenOffice.org converter],latex_to_sxw_command, "oolatex \$\$i" "oolatex.sh \$\$i")
+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],PS_VIEWER,gsview32 gv "ghostview -swap" kghostview)
"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)
LYXRC_VAR(\print_spool_printerprefix, $print_spool_printerprefix)
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")
MSG_RESULT(auto)
rm -f wrap_chkconfig.ltx chkconfig.vars chkconfig.classes chklayouts.tex
if test ! -r "chkconfig.ltx" ; then
- ln -s "${srcdir}"/chkconfig.ltx .
- rmlink=true
+ cp "${srcdir}"/chkconfig.ltx .
+ rmcopy=true
fi
cat >wrap_chkconfig.ltx <<EOF
${linuxdoc_cmd}
changequote([,])dnl
[eval] `cat chkconfig.vars | sed 's/-/_/g'`
changequote(,)dnl
- test -n "${rmlink}" && rm -f chkconfig.ltx
+ test -n "${rmcopy}" && rm -f chkconfig.ltx
fi
# Do we have all the files we need? Useful if latex did not run
MSG_RESULT(no)
tex_allows_spaces=false
fi
- rm -r "$fname".*
+ rm -f "$fname".* texput.log
fi
echo "creating $outfile"
# override the values given here.
\\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 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 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 XFig "" "$FIG_VIEWER" "$FIG_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 JPG "" "$RASTERIMAGE_VIEWER" "$RASTERIMAGE_EDITOR"
+\\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 program "" Program "" "" ""
\\Format ps ps Postscript t "$PS_VIEWER" ""
\\Format pstex pstex_t PSTEX "" "" ""
-\\Format tgif obj TGIF "" "$TGIF_VIEWER" "$TGIF_EDITOR"
+\\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 Word W "" ""
+\\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 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" ""
### the graphic converter part with the predefined ones
#### 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 <<EOF
\\converter fig eps "fig2dev -L eps \$\$i \$\$o" ""
EOF
fi
-SEARCH_PROG([for an TIFF -> PS converter], TIFF2PS, tiff2ps)
+SEARCH_PROG([for a TIFF -> PS converter], TIFF2PS, tiff2ps)
if test "$TIFF2PS" = "tiff2ps"; then
cat >>$outfile <<EOF
\\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 <<EOF
\\converter tgif eps "tgif -stdout -print -color -eps \$\$i > \$\$o" ""
echo "\\cygwin_path_fix_needed $use_cygwin_path_fix" >> $outfile
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
-
-if test ! $num = 0 ; then
- echo $num >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) 2>/dev/null || true
-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 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 ;
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
projects / lyx.git / blobdiff