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

use ps2pdf13 for ps->pdf converter; do not display the list of programs we are about to check; simplify code.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10054 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2005-06-13 09:33:23 +00:00
parent e533e83f06
commit 0b142fc766
2 changed files with 26 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/ChangeLog
View File

@ -1,3 +1,8 @@
2005-06-10 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* configure.m4: use ps2pdf13 for ps->pdf converter; do not display
the list of programs we are about to check; simplify code.
2005-06-01 Jean-Marc Lasgouttes <lasgouttes@lyx.org> 2005-06-01 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* configure.m4: fix shortcut for text format. * configure.m4: fix shortcut for text format.

63
lib/configure.m4
View File

@ -29,7 +29,7 @@ dnl
define(SEARCH_PROG,[dnl define(SEARCH_PROG,[dnl
changequote([,])dnl changequote([,])dnl
MSG_CHECKING($1) MSG_CHECKING($1)
MSG_RESULT(($3)) MSG_RESULT()
$2= $2=
for ac_prog in $3 for ac_prog in $3
do do
@ -249,8 +249,7 @@ 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" GRACE_VIEWER="$GRACE_EDITOR"
SEARCH_PROG([for a FEN viewer and editor], FEN_EDITOR, xboard) SEARCH_PROG([for a FEN viewer and editor], FEN_EDITOR, "xboard -lpf \$\$i -mode EditPosition")
test "$FEN" = "xboard" && FEN_EDITOR="xboard -lpf \$\$i -mode EditPosition"
FEN_VIEWER="$FEN_EDITOR" FEN_VIEWER="$FEN_EDITOR"
SEARCH_PROG([for a raster image viewer], RASTERIMAGE_VIEWER, xv kview gimp) SEARCH_PROG([for a raster image viewer], RASTERIMAGE_VIEWER, xv kview gimp)
@ -262,46 +261,33 @@ SEARCH_PROG([for a text editor], TEXT_EDITOR, xemacs gvim kedit kwrite kate nedi
# Search for an installed reLyX or a ready-to-install one # Search for an installed reLyX or a ready-to-install one
save_PATH=${PATH} save_PATH=${PATH}
PATH=${PATH}:./reLyX/ PATH=${PATH}:./reLyX/
SEARCH_PROG([for a LaTeX -> LyX converter],tex_to_lyx_command,reLyX) SEARCH_PROG([for a LaTeX -> LyX converter],tex_to_lyx_command, "reLyX -f \$\$i")
PATH=${save_PATH} 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,"` tex_to_lyx_command=`echo $tex_to_lyx_command | sed "s,reLyX,reLyX$version_suffix,"`
SEARCH_PROG([for a Noweb -> LyX converter],literate_to_lyx_command,noweb2lyx) SEARCH_PROG([for a Noweb -> LyX converter],literate_to_lyx_command,"noweb2lyx \$\$i \$\$o")
test $literate_to_lyx_command = "noweb2lyx" && literate_to_lyx_command="noweb2lyx \$\$i \$\$o"
literate_to_lyx_command=`echo $literate_to_lyx_command | sed "s,noweb2lyx,noweb2lyx$version_suffix,"` literate_to_lyx_command=`echo $literate_to_lyx_command | sed "s,noweb2lyx,noweb2lyx$version_suffix,"`
# Search something to process a literate document # Search something to process a literate document
SEARCH_PROG([for a Noweb -> LaTeX converter],literate_to_tex_command,noweave) SEARCH_PROG([for a Noweb -> LaTeX converter],literate_to_tex_command,"noweave -delay -index \$\$i > \$\$o")
test $literate_to_tex_command = "noweave" && literate_to_tex_command="noweave -delay -index \$\$i > \$\$o"
SEARCH_PROG([for a HTML -> Latex converter],html_to_latex_command,html2latex) SEARCH_PROG([for a HTML -> Latex converter],html_to_latex_command, "html2latex \$\$i")
test $html_to_latex_command = "html2latex" && html_to_latex_command="html2latex \$\$i"
SEARCH_PROG([for a MSWord -> Latex converter],word_to_latex_command,wvCleanLatex word2x) SEARCH_PROG([for a MSWord -> Latex converter],word_to_latex_command, "wvCleanLatex \$\$i \$\$o" "wvCleanLatex \$\$i \$\$o")
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 Image converter],image_command,convert) SEARCH_PROG([for Image converter],image_command, "convert \$\$i \$\$o")
test $image_command = "convert" && image_command="convert \$\$i \$\$o"
SEARCH_PROG([for an OpenOffice.org -> Latex converter],sxw_to_latex_command,w2l) SEARCH_PROG([for an OpenOffice.org -> Latex converter],sxw_to_latex_command, "w2l -clean \$\$i")
test "$sxw_to_latex_command" = "w2l" && sxw_to_latex_command="w2l -clean \$\$i"
# oolatex is the original name, SuSE has oolatex.sh # oolatex is the original name, SuSE has oolatex.sh
SEARCH_PROG([for an Latex -> OpenOffice.org converter],latex_to_sxw_command,oolatex oolatex.sh) SEARCH_PROG([for an Latex -> OpenOffice.org converter],latex_to_sxw_command, "oolatex \$\$i" "oolatex.sh \$\$i")
test "$latex_to_sxw_command" != "none" && latex_to_sxw_command="$latex_to_sxw_command \$\$i"
# Search something to preview postscript # Search something to preview postscript
SEARCH_PROG([for a Postscript previewer],GHOSTVIEW,gsview32 gv ghostview kghostview) SEARCH_PROG([for a Postscript previewer],PS_VIEWER,gsview32 gv "ghostview -swap" kghostview)
case $GHOSTVIEW in EPS_VIEWER=$PS_VIEWER
ghostview) PS_VIEWER="$GHOSTVIEW -swap" ;;
*) PS_VIEWER="$GHOSTVIEW";;
esac
EPS_VIEWER=$GHOSTVIEW
# Search for a program to preview pdf # Search for a program to preview pdf
SEARCH_PROG([for a PDF preview],PDF_VIEWER, acrobat acrord32 gsview32 acroread gv ghostview xpdf kpdf kghostview) SEARCH_PROG([for a PDF previewer],PDF_VIEWER, acrobat acrord32 gsview32 acroread gv ghostview xpdf kpdf kghostview)
# Search something to preview dvi # Search something to preview dvi
SEARCH_PROG([for a DVI previewer],DVI_VIEWER, xdvi windvi yap kdvi) SEARCH_PROG([for a DVI previewer],DVI_VIEWER, xdvi windvi yap kdvi)
@ -310,16 +296,13 @@ SEARCH_PROG([for a DVI previewer],DVI_VIEWER, xdvi windvi yap kdvi)
SEARCH_PROG([for a HTML previewer],HTML_VIEWER, "mozilla file://\$\$p\$\$i" netscape) SEARCH_PROG([for a HTML previewer],HTML_VIEWER, "mozilla file://\$\$p\$\$i" netscape)
# Search for a program to convert ps to pdf # Search for a program to convert ps to pdf
SEARCH_PROG([for a PS to PDF converter],ps_to_pdf_command,ps2pdf) SEARCH_PROG([for a PS to PDF converter],ps_to_pdf_command, "ps2pdf13 \$\$i")
test $ps_to_pdf_command = "ps2pdf" && ps_to_pdf_command="ps2pdf -dCompatibilityLevel=1.3 \$\$i"
# Search for a program to convert dvi to ps # Search for a program to convert dvi to ps
SEARCH_PROG([for a DVI to PS converter],dvi_to_ps_command,dvips) SEARCH_PROG([for a DVI to PS converter],dvi_to_ps_command, "dvips -o \$\$o \$\$i")
test $dvi_to_ps_command = "dvips" && dvi_to_ps_command="dvips -o \$\$o \$\$i"
# Search for a program to convert dvi to pdf # Search for a program to convert dvi to pdf
SEARCH_PROG([for a DVI to PDF converter],dvi_to_pdf_command,dvipdfm) SEARCH_PROG([for a DVI to PDF converter],dvi_to_pdf_command, "dvipdfm \$\$i")
test $dvi_to_pdf_command = "dvipdfm" && dvi_to_pdf_command="dvipdfm \$\$i"
# We have a script to convert previewlyx to ppm or to png # We have a script to convert previewlyx to ppm or to png
lyxpreview_to_bitmap_command='python $$s/scripts/lyxpreview2bitmap.py' lyxpreview_to_bitmap_command='python $$s/scripts/lyxpreview2bitmap.py'
@ -360,8 +343,7 @@ dnl fax_command="none"
dnl fi dnl fi
# Search a GUI Fax program # Search a GUI Fax program
SEARCH_PROG([for a fax program], fax_command, kdeprintfax ksendfax) SEARCH_PROG([for a fax program], fax_command, "kdeprintfax \$\$i" "ksendfax \$\$i")
test $fax_command != "none" && fax_command="$fax_command \$\$i"
# Search for LinuxDoc support # Search for LinuxDoc support
SEARCH_PROG([for SGML-tools 1.x (LinuxDoc)], LINUXDOC, sgml2lyx) SEARCH_PROG([for SGML-tools 1.x (LinuxDoc)], LINUXDOC, sgml2lyx)
@ -419,13 +401,10 @@ case $prog in
esac esac
LYXRC_VAR(\print_spool_printerprefix, $print_spool_printerprefix) LYXRC_VAR(\print_spool_printerprefix, $print_spool_printerprefix)
SEARCH_PROG([for a LaTeX -> HTML converter], TOHTML, tth latex2html hevea) SEARCH_PROG([for a LaTeX -> HTML converter], latex_to_html_command,dnl
latex_to_html_command=$TOHTML "tth -t -e2 -L\$\$b < \$\$i > \$\$o" dnl
case $TOHTML in "latex2html -no_subdir -split 0 -show_section_numbers \$\$i" dnl
tth) latex_to_html_command="tth -t -e2 -L\$\$b < \$\$i > \$\$o";; "hevea -s \$\$i")
latex2html) latex_to_html_command="latex2html -no_subdir -split 0 -show_section_numbers \$\$i";;
hevea) latex_to_html_command="hevea -s \$\$i";;
esac
#### Explore the LaTeX configuration #### Explore the LaTeX configuration
MSG_CHECKING(LaTeX configuration) MSG_CHECKING(LaTeX configuration)