Am Samstag, 13. November 2004 13:30 schrieb John Spray:
> On Fri, 2004-11-12 at 19:06 +0100, Georg Baum wrote:
> > Is this ok to apply? Do you have better suggestions for the text
viewer and
> > editor? I just added what came to mind (and ignored windows
completely).
>
> If we're nominating text editors: gedit.
Added. Note that our default editor will most likely not be the right one
for many people, but I just want _any_ editor.
I am applying the attached, slightly revised version now (don't check for
ASCII viewer and OpenOffice.org anymore, to avoid having strange entries
in the view menu).
Georg
Index: lib/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/ChangeLog,v
retrieving revision 1.651
diff -u -p -r1.651 ChangeLog
--- lib/ChangeLog 5 Nov 2004 13:28:01 -0000 1.651
+++ lib/ChangeLog 12 Nov 2004 17:26:49 -0000
@@ -1,3 +1,7 @@
+2004-11-15 Georg Baum <[EMAIL PROTECTED]>
+
+ * configure.m4: check for more viewers and editors
+
2004-11-05 Bennett Helm <[EMAIL PROTECTED]>
* bind/mac.bind: use <cmd>-Tab and <cmd>-backtab as shortcuts for
Index: lib/configure.m4
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/configure.m4,v
retrieving revision 1.84
diff -u -p -r1.84 configure.m4
--- lib/configure.m4 1 Nov 2004 08:50:41 -0000 1.84
+++ lib/configure.m4 12 Nov 2004 17:26:50 -0000
@@ -243,14 +243,19 @@ 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)
+GRACE_VIEWER="$GRACE_EDITOR"
+
SEARCH_PROG([for a FEN viewer and editor], FEN_EDITOR, xboard)
test "$FEN" = "xboard" && 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)
+
# Search for an installed reLyX or a ready-to-install one
save_PATH=${PATH}
PATH=${PATH}:./reLyX/
@@ -277,8 +296,15 @@ SEARCH_PROG([for a MSWord -> Latex conve
SEARCH_PROG([for Image converter],image_command,convert)
test $image_command = "convert" && image_command="convert \$\$i \$\$o"
+SEARCH_PROG([for an OpenOffice.org -> Latex converter],sxw_to_latex_command,w2l)
+test "$sxw_to_latex_command" = "w2l" && 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 oolatex.sh)
+test "$latex_to_sxw_command" != "none" && latex_to_sxw_command="$latex_to_sxw_command \$\$i"
+
# Search something to preview postscript
-SEARCH_PROG([for a Postscript previewer],GHOSTVIEW,gsview32 gv ghostview)
+SEARCH_PROG([for a Postscript previewer],GHOSTVIEW,gsview32 gv ghostview kghostview)
case $GHOSTVIEW in
gv|ghostview) PS_VIEWER="$GHOSTVIEW -swap" ;;
*) PS_VIEWER="$GHOSTVIEW";;
@@ -286,10 +315,10 @@ esac
EPS_VIEWER=$GHOSTVIEW
# Search for a program to preview pdf
-SEARCH_PROG([for a PDF preview],PDF_VIEWER, acrobat acrord32 gsview32 acroread gv ghostview xpdf)
+SEARCH_PROG([for a PDF preview],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)
@@ -521,71 +588,74 @@ cat >$outfile <<EOF
# want to customize LyX, make a copy of the file LYXDIR/lyxrc as
# ~/.lyx/lyxrc and edit this file instead. Any setting in lyxrc will
# override the values given here.
-\\Format asciichess asc "ASCII (chess output)" "" "" ""
-\\Format asciiimage asc "ASCII (image)" "" "" ""
-\\Format asciixfig asc "ASCII (xfig output)" "" "" ""
-\\Format agr agr GRACE "" "" ""
+\\Format asciichess asc "ASCII (chess output)" "" "" "$TEXT_EDITOR"
+\\Format asciiimage asc "ASCII (image)" "" "" "$TEXT_EDITOR"
+\\Format asciixfig asc "ASCII (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)" "" "" ""
-\\Format docbook sgml DocBook B "" ""
-\\Format docbook-xml xml "Docbook (xml)" "" "" ""
+\\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 XFig "" "$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 latex tex LaTeX L "" ""
-\\Format linuxdoc sgml LinuxDoc x "" ""
-\\Format lyx lyx LyX "" "" ""
+\\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 "" ""
+\\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 text txt ASCII A "" ""
-\\Format textparagraph txt "ASCII (paragraphs)" "" "" ""
\\Format tgif obj TGIF "" "$TGIF_VIEWER" "$TGIF_EDITOR"
+\\Format sxw sxw "OpenOffice.Org Writer" O "" ""
+\\Format text txt ASCII A "" "$TEXT_EDITOR"
+\\Format textparagraph txt "ASCII (paragraphs)" "" "" "$TEXT_EDITOR"
\\Format tiff tif TIFF "" "$RASTERIMAGE_VIEWER" "$RASTERIMAGE_EDITOR"
\\Format word doc Word W "" ""
\\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/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 latex sxw "$latex_to_sxw_command" "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 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
@@ -604,7 +701,7 @@ fi
SEARCH_PROG([for an TIFF -> PS converter], TIFF2PS, tiff2ps)
if test "$TIFF2PS" = "tiff2ps"; then
cat >>$outfile <<EOF
-\\converter tiff eps "tiff2ps \$\$i > \$\$o" ""
+\\converter tiff eps "tiff2ps \$\$i > \$\$o" ""
EOF
fi
