* gnus-vers.el (gnus-revision-number): Increment to 08.
+2001-09-28 Katsumi Yamaoka <yamaoka@jpl.org>
+
+ * lisp/gnus-vers.el (gnus-revision-number): Increment to 08.
+
+2001-09-27 14:00:00 ShengHuo ZHU <zsh@cs.rochester.edu>
+
+ * aclocal.m4 (GNUS_CHECK_FONTS): Typo. Use /dev/null as latex input.
+
+2001-09-27 09:00:00 ShengHuo ZHU <zsh@cs.rochester.edu>
+
+ * aclocal.m4, configure.in: Check commercial fonts.
+
2001-09-27 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/message.el (message-find-invisible-regions): Look for the
dnl Apparently, if you run a shell window in Emacs, it sets the EMACS
dnl environment variable to 't'. Lets undo the damage.
- test x$EMACS = xt && EMACS=
+ test "$EMACS" = t && EMACS=
dnl Ignore cache.
unset ac_cv_prog_EMACS; unset ac_cv_prog_XEMACS;
AC_ARG_WITH(emacs,
[ --with-emacs=EMACS compile with EMACS [EMACS=emacs, mule...]],
- [if test x$withval = xyes -o x$withval = x; then
+ [if test "$withval" = yes -o -z "$withval"; then
AC_CHECK_PROGS(EMACS, emacs xemacs mule, emacs)
else
AC_CHECK_PROG(EMACS, $withval, $withval, emacs)
fi])
AC_ARG_WITH(xemacs,
[ --with-xemacs=XEMACS compile with XEMACS [XEMACS=xemacs]],
- [if test x$withval = xyes -o x$withval = x; then
+ [if test "$withval" = yes -o -z "$withval"; then
AC_CHECK_PROG(XEMACS, xemacs, xemacs, xemacs)
else
AC_CHECK_PROG(XEMACS, $withval, $withval, xemacs)
fi
EMACS=$XEMACS],
[XEMACS=xemacs
- test x$EMACS = x &&\
- AC_CHECK_PROGS(EMACS, emacs xemacs mule, emacs)])
+ test -z "$EMACS" && AC_CHECK_PROGS(EMACS, emacs xemacs mule, emacs)])
AC_SUBST(EMACS)
AC_SUBST(XEMACS)])
AC_DEFUN(AC_PATH_LISPDIR, [
AC_CHECK_EMACS_FLAVOR
- if test "$prefix" = "NONE"; then
+ if test "$prefix" = NONE; then
AC_MSG_CHECKING([prefix for your Emacs])
AC_EMACS_LISP(prefix,(expand-file-name \"..\" invocation-directory),"noecho")
prefix=${EMACS_cv_SYS_prefix}
if test -z "$lispdir"; then
dnl Set default value
theprefix=$prefix
- if test "x$theprefix" = "xNONE"; then
+ if test "$theprefix" = NONE; then
theprefix=$ac_default_prefix
fi
lispdir="\$(datadir)/${EMACS_FLAVOR}/site-lisp/${GNUS_PRODUCT_NAME}"
fi
library=`echo $1 | tr _ -`
AC_EMACS_LISP($1,(progn (fmakunbound (quote $2)) (condition-case nil (progn (require (quote $library)) (fboundp (quote $2))) (error (prog1 nil (message \"$library not found\"))))),"noecho")
-if test "${EMACS_cv_SYS_$1}" = "nil"; then
+if test "${EMACS_cv_SYS_$1}" = nil; then
EMACS_cv_SYS_$1=no
fi
-if test "${EMACS_cv_SYS_$1}" = "t"; then
+if test "${EMACS_cv_SYS_$1}" = t; then
EMACS_cv_SYS_$1=yes
fi
HAVE_$1=${EMACS_cv_SYS_$1}
AC_CACHE_VAL(EMACS_cv_ACCEPTABLE_W3,[
AC_EMACS_CHECK_LIB(w3_forms, w3-form-encode-xwfu,"noecho")
-if test "${HAVE_w3_forms}" = "yes"; then
+if test "${HAVE_w3_forms}" = yes; then
EMACS_cv_ACCEPTABLE_W3=yes
else
EMACS_cv_ACCEPTABLE_W3=
fi
-if test "x${EMACS_cv_ACCEPTABLE_W3}" = "xyes"; then
+if test "${EMACS_cv_ACCEPTABLE_W3}" = yes; then
AC_EMACS_LISP(w3_dir,(file-name-directory (locate-library \"w3-forms\")),"noecho")
EMACS_cv_ACCEPTABLE_W3=$EMACS_cv_SYS_w3_dir
fi
AC_ARG_WITH(w3,[ --with-w3=DIR Specify where to find the w3 package], [ EMACS_cv_ACCEPTABLE_W3=`( cd $withval && pwd || echo "$withval" ) 2> /dev/null` ])
W3=${EMACS_cv_ACCEPTABLE_W3}
AC_SUBST(W3)
- if test "x${EMACS_cv_ACCEPTABLE_W3}" = "x"; then
+ if test -z "${EMACS_cv_ACCEPTABLE_W3}"; then
AC_MSG_RESULT(not found)
else
AC_MSG_RESULT(${W3})
AC_CACHE_VAL(EMACS_cv_ACCEPTABLE_URL,[
AC_EMACS_CHECK_LIB(url, url-retrieve, "noecho")
-if test "${HAVE_url}" = "yes"; then
+if test "${HAVE_url}" = yes; then
EMACS_cv_ACCEPTABLE_URL=yes
else
EMACS_cv_ACCEPTABLE_URL=
fi
-if test "x${EMACS_cv_ACCEPTABLE_URL}" = "xyes"; then
+if test "${EMACS_cv_ACCEPTABLE_URL}" = yes; then
AC_EMACS_LISP(url_dir,(file-name-directory (locate-library \"url\")),"noecho")
EMACS_cv_ACCEPTABLE_URL=$EMACS_cv_SYS_url_dir
fi
AC_ARG_WITH(url,[ --with-url=DIR Specify where to find the url package], [ EMACS_cv_ACCEPTABLE_URL=`( cd $withval && pwd || echo "$withval" ) 2> /dev/null` ])
URL=${EMACS_cv_ACCEPTABLE_URL}
AC_SUBST(URL)
- if test "x${EMACS_cv_ACCEPTABLE_URL}" = "x"; then
+ if test -z "${EMACS_cv_ACCEPTABLE_URL}"; then
AC_MSG_RESULT(not found)
else
AC_MSG_RESULT("${URL}")
fi
])
+dnl
+dnl Perform checking available fonts: Adobe Bembo, Adobe Futura and
+dnl Bitstream Courier.
+dnl
+
+AC_DEFUN(GNUS_CHECK_FONTS, [
+test "$LATEX" = t && LATEX=
+test "$LATEX" || AC_PATH_PROGS(LATEX, latex, no)
+AC_MSG_CHECKING(for available fonts)
+AC_ARG_WITH(fonts,[ --with-fonts Assume all fonts required are available],[USE_FONTS="$withval"])
+WITH_FONTS_bembo='%'
+WITHOUT_FONTS_bembo=
+WITH_FONTS_pfu='%'
+WITHOUT_FONTS_pfu=
+WITH_FONTS_bcr='%'
+WITHOUT_FONTS_bcr=
+if test -z "${USE_FONTS}"; then
+ if test "${LATEX}" = no; then
+ :
+ else
+ OUTPUT=./conftest-$$
+ echo '\nonstopmode\documentclass{article}\usepackage{bembo}\begin{document}\end{document}' > ${OUTPUT}
+ if ${LATEX} ${OUTPUT} </dev/null >& AC_FD_CC 2>&1 ; then
+ if test -z "${USE_FONTS}"; then
+ USE_FONTS="Adobe Bembo"
+ else
+ USE_FONTS="${USE_FONTS}, Adobe Bembo"
+ fi
+ WITH_FONTS_bembo=
+ WITHOUT_FONTS_bembo='%'
+ fi
+ echo '\nonstopmode\documentclass{article}\begin{document}{\fontfamily{pfu}\fontsize{10pt}{10}\selectfont test}\end{document}' > ${OUTPUT}
+ if retval=`${LATEX} ${OUTPUT} </dev/null 2>& AC_FD_CC`; then
+ if echo "$retval" | grep 'Some font shapes were not available' >& AC_FD_CC 2>&1 ; then
+ :
+ else
+ if test -z "${USE_FONTS}"; then
+ USE_FONTS="Adobe Futura"
+ else
+ USE_FONTS="${USE_FONTS}, Adobe Futura"
+ fi
+ WITH_FONTS_pfu=
+ WITHOUT_FONTS_pfu='%'
+ fi
+ fi
+ echo '\nonstopmode\documentclass{article}\begin{document}{\fontfamily{bcr}\fontsize{10pt}{10}\selectfont test}\end{document}' > ${OUTPUT}
+ if retval=`${LATEX} ${OUTPUT} </dev/null 2>& AC_FD_CC`; then
+ if echo "$retval" | grep 'Some font shapes were not available' >& AC_FD_CC 2>&1 ; then
+ :
+ else
+ if test -z "${USE_FONTS}"; then
+ USE_FONTS="Bitstream Courier"
+ else
+ USE_FONTS="${USE_FONTS}, Bitstream Courier"
+ fi
+ WITH_FONTS_bcr=
+ WITHOUT_FONTS_bcr='%'
+ fi
+ fi
+ rm -f ${OUTPUT} ${OUTPUT}.aux ${OUTPUT}.log ${OUTPUT}.dvi
+ fi
+elif test "${USE_FONTS}" = yes ; then
+ WITH_FONTS_bembo=
+ WITHOUT_FONTS_bembo='%'
+ WITH_FONTS_pfu=
+ WITHOUT_FONTS_pfu='%'
+ WITH_FONTS_bcr=
+ WITHOUT_FONTS_bcr='%'
+fi
+AC_SUBST(WITH_FONTS_bembo)
+AC_SUBST(WITHOUT_FONTS_bembo)
+AC_SUBST(WITH_FONTS_pfu)
+AC_SUBST(WITHOUT_FONTS_pfu)
+AC_SUBST(WITH_FONTS_bcr)
+AC_SUBST(WITHOUT_FONTS_bcr)
+if test -z "${USE_FONTS}" ; then
+ USE_FONTS=no
+fi
+USE_FONTS=`echo "${USE_FONTS}" | sed 's/,\([[^,]]*\)$/ and\1/'`
+AC_MSG_RESULT("${USE_FONTS}")
+if test "${USE_FONTS}" = yes ; then
+ USE_FONTS='Set in Adobe Bembo, Adobe Futura and Bitstream Courier.'
+elif test "${USE_FONTS}" = no ; then
+ USE_FONTS=''
+else
+ USE_FONTS="Set in ${USE_FONTS}."
+fi
+AC_SUBST(USE_FONTS)
+])
+
AC_DEFUN(AC_EXAMINE_PACKAGEDIR,
[dnl Examine PACKAGEDIR.
AC_EMACS_LISP(PACKAGEDIR,
AC_MSG_CHECKING([where the XEmacs package is])
AC_ARG_WITH(packagedir,
[ --with-packagedir=DIR package DIR for XEmacs],
- [if test x$withval != xyes -a x$withval != x; then
+ [if test "$withval" != yes -a -n "$withval"; then
PACKAGEDIR=$withval
else
AC_EXAMINE_PACKAGEDIR
fi],
AC_EXAMINE_PACKAGEDIR)
- if test x$PACKAGEDIR = x; then
+ if test -z "$PACKAGEDIR"; then
AC_MSG_RESULT(not found)
else
AC_MSG_RESULT($PACKAGEDIR)
AC_ARG_WITH(addpath,
[ --with-addpath=PATH search Emacs-Lisp libraries with PATH
use colons to separate directory names],
- [if test x$withval != xyes -a x$withval != x; then
+ [if test "$withval" != yes -a -n "$withval"; then
AC_MSG_CHECKING([where to find the additional elisp libraries])
ADDITIONAL_LOAD_PATH=$withval
AC_MSG_RESULT($ADDITIONAL_LOAD_PATH)
ac_help="$ac_help
--with-w3=DIR Specify where to find the w3 package"
ac_help="$ac_help
+ --with-fonts Assume all fonts required are available"
+ac_help="$ac_help
--with-packagedir=DIR package DIR for XEmacs"
ac_help="$ac_help
--with-addpath=PATH search Emacs-Lisp libraries with PATH
echo "$ac_t""${GNUS_PRODUCT_NAME}" 1>&6
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:554: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:556: checking whether ${MAKE-make} sets \${MAKE}" >&5
set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh.
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:611: checking for a BSD compatible install" >&5
+echo "configure:613: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then
if eval "test \"\${ac_cv_path_install+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
# Extract the first word of "makeinfo", so it can be a program name with args.
set dummy makeinfo; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:670: checking for $ac_word" >&5
+echo "configure:672: checking for $ac_word" >&5
if eval "test \"\${ac_cv_prog_MAKEINFO+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
fi
- test x$EMACS = xt && EMACS=
+ test "$EMACS" = t && EMACS=
unset ac_cv_prog_EMACS; unset ac_cv_prog_XEMACS;
# Check whether --with-emacs or --without-emacs was given.
if test "${with_emacs+set}" = set; then
withval="$with_emacs"
- if test x$withval = xyes -o x$withval = x; then
+ if test "$withval" = yes -o -z "$withval"; then
for ac_prog in emacs xemacs mule
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:711: checking for $ac_word" >&5
+echo "configure:713: checking for $ac_word" >&5
if eval "test \"\${ac_cv_prog_EMACS+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
# Extract the first word of "$withval", so it can be a program name with args.
set dummy $withval; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:745: checking for $ac_word" >&5
+echo "configure:747: checking for $ac_word" >&5
if eval "test \"\${ac_cv_prog_EMACS+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
# Check whether --with-xemacs or --without-xemacs was given.
if test "${with_xemacs+set}" = set; then
withval="$with_xemacs"
- if test x$withval = xyes -o x$withval = x; then
+ if test "$withval" = yes -o -z "$withval"; then
# Extract the first word of "xemacs", so it can be a program name with args.
set dummy xemacs; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:782: checking for $ac_word" >&5
+echo "configure:784: checking for $ac_word" >&5
if eval "test \"\${ac_cv_prog_XEMACS+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
# Extract the first word of "$withval", so it can be a program name with args.
set dummy $withval; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:813: checking for $ac_word" >&5
+echo "configure:815: checking for $ac_word" >&5
if eval "test \"\${ac_cv_prog_XEMACS+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
EMACS=$XEMACS
else
XEMACS=xemacs
- test x$EMACS = x &&\
- for ac_prog in emacs xemacs mule
+ test -z "$EMACS" && for ac_prog in emacs xemacs mule
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:850: checking for $ac_word" >&5
+echo "configure:851: checking for $ac_word" >&5
if eval "test \"\${ac_cv_prog_EMACS+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
echo $ac_n "checking what a flavor does $EMACS have""... $ac_c" 1>&6
-echo "configure:886: checking what a flavor does $EMACS have" >&5
+echo "configure:887: checking what a flavor does $EMACS have" >&5
unset EMACS_cv_SYS_flavor;
(t \"FSF Emacs\"))"
if test -z ""noecho""; then
echo $ac_n "checking for flavor""... $ac_c" 1>&6
-echo "configure:896: checking for flavor" >&5
+echo "configure:897: checking for flavor" >&5
fi
if eval "test \"\${EMACS_cv_SYS_flavor+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
EMACS_FLAVOR=emacs;;
esac
echo "$ac_t""$EMACS_cv_SYS_flavor" 1>&6
- if test "$prefix" = "NONE"; then
+ if test "$prefix" = NONE; then
echo $ac_n "checking prefix for your Emacs""... $ac_c" 1>&6
-echo "configure:928: checking prefix for your Emacs" >&5
+echo "configure:929: checking prefix for your Emacs" >&5
elisp="(expand-file-name \"..\" invocation-directory)"
if test -z ""noecho""; then
echo $ac_n "checking for prefix""... $ac_c" 1>&6
-echo "configure:933: checking for prefix" >&5
+echo "configure:934: checking for prefix" >&5
fi
if eval "test \"\${EMACS_cv_SYS_prefix+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
fi
echo $ac_n "checking where lisp files should go""... $ac_c" 1>&6
-echo "configure:964: checking where lisp files should go" >&5
+echo "configure:965: checking where lisp files should go" >&5
if test -z "$lispdir"; then
theprefix=$prefix
- if test "x$theprefix" = "xNONE"; then
+ if test "$theprefix" = NONE; then
theprefix=$ac_default_prefix
fi
lispdir="\$(datadir)/${EMACS_FLAVOR}/site-lisp/${GNUS_PRODUCT_NAME}"
fi
echo $ac_n "checking where etc files should go""... $ac_c" 1>&6
-echo "configure:995: checking where etc files should go" >&5
+echo "configure:996: checking where etc files should go" >&5
if test -z "$etcdir"; then
etcdir="\$(lispdir)/../etc"
fi
echo $ac_n "checking for acceptable URL version""... $ac_c" 1>&6
-echo "configure:1004: checking for acceptable URL version" >&5
+echo "configure:1005: checking for acceptable URL version" >&5
unset EMACS_cv_ACCEPTABLE_URL;
unset EMACS_cv_SYS_url_dir;
if test -z ""noecho""; then
echo $ac_n "checking for url-retrieve in url""... $ac_c" 1>&6
-echo "configure:1017: checking for url-retrieve in url" >&5
+echo "configure:1018: checking for url-retrieve in url" >&5
fi
library=`echo url | tr _ -`
elisp="(progn (fmakunbound (quote url-retrieve)) (condition-case nil (progn (require (quote $library)) (fboundp (quote url-retrieve))) (error (prog1 nil (message \"$library not found\")))))"
if test -z ""noecho""; then
echo $ac_n "checking for url""... $ac_c" 1>&6
-echo "configure:1024: checking for url" >&5
+echo "configure:1025: checking for url" >&5
fi
if eval "test \"\${EMACS_cv_SYS_url+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
echo "$ac_t""$url" 1>&6
fi
-if test "${EMACS_cv_SYS_url}" = "nil"; then
+if test "${EMACS_cv_SYS_url}" = nil; then
EMACS_cv_SYS_url=no
fi
-if test "${EMACS_cv_SYS_url}" = "t"; then
+if test "${EMACS_cv_SYS_url}" = t; then
EMACS_cv_SYS_url=yes
fi
HAVE_url=${EMACS_cv_SYS_url}
echo "$ac_t""$HAVE_url" 1>&6
fi
-if test "${HAVE_url}" = "yes"; then
+if test "${HAVE_url}" = yes; then
EMACS_cv_ACCEPTABLE_URL=yes
else
EMACS_cv_ACCEPTABLE_URL=
fi
-if test "x${EMACS_cv_ACCEPTABLE_URL}" = "xyes"; then
+if test "${EMACS_cv_ACCEPTABLE_URL}" = yes; then
elisp="(file-name-directory (locate-library \"url\"))"
if test -z ""noecho""; then
echo $ac_n "checking for url_dir""... $ac_c" 1>&6
-echo "configure:1068: checking for url_dir" >&5
+echo "configure:1069: checking for url_dir" >&5
fi
if eval "test \"\${EMACS_cv_SYS_url_dir+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
URL=${EMACS_cv_ACCEPTABLE_URL}
- if test "x${EMACS_cv_ACCEPTABLE_URL}" = "x"; then
+ if test -z "${EMACS_cv_ACCEPTABLE_URL}"; then
echo "$ac_t""not found" 1>&6
else
echo "$ac_t"""${URL}"" 1>&6
echo $ac_n "checking for acceptable W3 version""... $ac_c" 1>&6
-echo "configure:1110: checking for acceptable W3 version" >&5
+echo "configure:1111: checking for acceptable W3 version" >&5
unset EMACS_cv_ACCEPTABLE_W3;
unset EMACS_cv_SYS_w3_dir;
if test -z ""noecho""; then
echo $ac_n "checking for w3-form-encode-xwfu in w3_forms""... $ac_c" 1>&6
-echo "configure:1123: checking for w3-form-encode-xwfu in w3_forms" >&5
+echo "configure:1124: checking for w3-form-encode-xwfu in w3_forms" >&5
fi
library=`echo w3_forms | tr _ -`
elisp="(progn (fmakunbound (quote w3-form-encode-xwfu)) (condition-case nil (progn (require (quote $library)) (fboundp (quote w3-form-encode-xwfu))) (error (prog1 nil (message \"$library not found\")))))"
if test -z ""noecho""; then
echo $ac_n "checking for w3_forms""... $ac_c" 1>&6
-echo "configure:1130: checking for w3_forms" >&5
+echo "configure:1131: checking for w3_forms" >&5
fi
if eval "test \"\${EMACS_cv_SYS_w3_forms+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
echo "$ac_t""$w3_forms" 1>&6
fi
-if test "${EMACS_cv_SYS_w3_forms}" = "nil"; then
+if test "${EMACS_cv_SYS_w3_forms}" = nil; then
EMACS_cv_SYS_w3_forms=no
fi
-if test "${EMACS_cv_SYS_w3_forms}" = "t"; then
+if test "${EMACS_cv_SYS_w3_forms}" = t; then
EMACS_cv_SYS_w3_forms=yes
fi
HAVE_w3_forms=${EMACS_cv_SYS_w3_forms}
echo "$ac_t""$HAVE_w3_forms" 1>&6
fi
-if test "${HAVE_w3_forms}" = "yes"; then
+if test "${HAVE_w3_forms}" = yes; then
EMACS_cv_ACCEPTABLE_W3=yes
else
EMACS_cv_ACCEPTABLE_W3=
fi
-if test "x${EMACS_cv_ACCEPTABLE_W3}" = "xyes"; then
+if test "${EMACS_cv_ACCEPTABLE_W3}" = yes; then
elisp="(file-name-directory (locate-library \"w3-forms\"))"
if test -z ""noecho""; then
echo $ac_n "checking for w3_dir""... $ac_c" 1>&6
-echo "configure:1174: checking for w3_dir" >&5
+echo "configure:1175: checking for w3_dir" >&5
fi
if eval "test \"\${EMACS_cv_SYS_w3_dir+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
W3=${EMACS_cv_ACCEPTABLE_W3}
- if test "x${EMACS_cv_ACCEPTABLE_W3}" = "x"; then
+ if test -z "${EMACS_cv_ACCEPTABLE_W3}"; then
echo "$ac_t""not found" 1>&6
else
echo "$ac_t""${W3}" 1>&6
fi
+
+test "$LATEX" = t && LATEX=
+test "$LATEX" || for ac_prog in latex
+do
+# Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:1222: checking for $ac_word" >&5
+if eval "test \"\${ac_cv_path_LATEX+set}\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ case "$LATEX" in
+ /*)
+ ac_cv_path_LATEX="$LATEX" # Let the user override the test with a path.
+ ;;
+ ?:/*)
+ ac_cv_path_LATEX="$LATEX" # Let the user override the test with a dos path.
+ ;;
+ *)
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
+ ac_dummy="$PATH"
+ for ac_dir in $ac_dummy; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+ ac_cv_path_LATEX="$ac_dir/$ac_word"
+ break
+ fi
+ done
+ IFS="$ac_save_ifs"
+ ;;
+esac
+fi
+LATEX="$ac_cv_path_LATEX"
+if test -n "$LATEX"; then
+ echo "$ac_t""$LATEX" 1>&6
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+test -n "$LATEX" && break
+done
+test -n "$LATEX" || LATEX="no"
+
+echo $ac_n "checking for available fonts""... $ac_c" 1>&6
+echo "configure:1259: checking for available fonts" >&5
+# Check whether --with-fonts or --without-fonts was given.
+if test "${with_fonts+set}" = set; then
+ withval="$with_fonts"
+ USE_FONTS="$withval"
+fi
+
+WITH_FONTS_bembo='%'
+WITHOUT_FONTS_bembo=
+WITH_FONTS_pfu='%'
+WITHOUT_FONTS_pfu=
+WITH_FONTS_bcr='%'
+WITHOUT_FONTS_bcr=
+if test -z "${USE_FONTS}"; then
+ if test "${LATEX}" = no; then
+ :
+ else
+ OUTPUT=./conftest-$$
+ echo '\nonstopmode\documentclass{article}\usepackage{bembo}\begin{document}\end{document}' > ${OUTPUT}
+ if ${LATEX} ${OUTPUT} </dev/null >& 5 2>&1 ; then
+ if test -z "${USE_FONTS}"; then
+ USE_FONTS="Adobe Bembo"
+ else
+ USE_FONTS="${USE_FONTS}, Adobe Bembo"
+ fi
+ WITH_FONTS_bembo=
+ WITHOUT_FONTS_bembo='%'
+ fi
+ echo '\nonstopmode\documentclass{article}\begin{document}{\fontfamily{pfu}\fontsize{10pt}{10}\selectfont test}\end{document}' > ${OUTPUT}
+ if retval=`${LATEX} ${OUTPUT} </dev/null 2>& 5`; then
+ if echo "$retval" | grep 'Some font shapes were not available' >& 5 2>&1 ; then
+ :
+ else
+ if test -z "${USE_FONTS}"; then
+ USE_FONTS="Adobe Futura"
+ else
+ USE_FONTS="${USE_FONTS}, Adobe Futura"
+ fi
+ WITH_FONTS_pfu=
+ WITHOUT_FONTS_pfu='%'
+ fi
+ fi
+ echo '\nonstopmode\documentclass{article}\begin{document}{\fontfamily{bcr}\fontsize{10pt}{10}\selectfont test}\end{document}' > ${OUTPUT}
+ if retval=`${LATEX} ${OUTPUT} </dev/null 2>& 5`; then
+ if echo "$retval" | grep 'Some font shapes were not available' >& 5 2>&1 ; then
+ :
+ else
+ if test -z "${USE_FONTS}"; then
+ USE_FONTS="Bitstream Courier"
+ else
+ USE_FONTS="${USE_FONTS}, Bitstream Courier"
+ fi
+ WITH_FONTS_bcr=
+ WITHOUT_FONTS_bcr='%'
+ fi
+ fi
+ rm -f ${OUTPUT} ${OUTPUT}.aux ${OUTPUT}.log ${OUTPUT}.dvi
+ fi
+elif test "${USE_FONTS}" = yes ; then
+ WITH_FONTS_bembo=
+ WITHOUT_FONTS_bembo='%'
+ WITH_FONTS_pfu=
+ WITHOUT_FONTS_pfu='%'
+ WITH_FONTS_bcr=
+ WITHOUT_FONTS_bcr='%'
+fi
+
+
+
+
+
+
+if test -z "${USE_FONTS}" ; then
+ USE_FONTS=no
+fi
+USE_FONTS=`echo "${USE_FONTS}" | sed 's/,\([^,]*\)$/ and\1/'`
+echo "$ac_t"""${USE_FONTS}"" 1>&6
+if test "${USE_FONTS}" = yes ; then
+ USE_FONTS='Set in Adobe Bembo, Adobe Futura and Bitstream Courier.'
+elif test "${USE_FONTS}" = no ; then
+ USE_FONTS=''
+else
+ USE_FONTS="Set in ${USE_FONTS}."
+fi
+
+
if test ${EMACS_FLAVOR} = xemacs; then
echo $ac_n "checking where the XEmacs package is""... $ac_c" 1>&6
-echo "configure:1216: checking where the XEmacs package is" >&5
+echo "configure:1347: checking where the XEmacs package is" >&5
# Check whether --with-packagedir or --without-packagedir was given.
if test "${with_packagedir+set}" = set; then
withval="$with_packagedir"
- if test x$withval != xyes -a x$withval != x; then
+ if test "$withval" != yes -a -n "$withval"; then
PACKAGEDIR=$withval
else
(or package-dir \"\"))"
if test -z ""noecho""; then
echo $ac_n "checking for PACKAGEDIR""... $ac_c" 1>&6
-echo "configure:1239: checking for PACKAGEDIR" >&5
+echo "configure:1370: checking for PACKAGEDIR" >&5
fi
if eval "test \"\${EMACS_cv_SYS_PACKAGEDIR+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
(or package-dir \"\"))"
if test -z ""noecho""; then
echo $ac_n "checking for PACKAGEDIR""... $ac_c" 1>&6
-echo "configure:1278: checking for PACKAGEDIR" >&5
+echo "configure:1409: checking for PACKAGEDIR" >&5
fi
if eval "test \"\${EMACS_cv_SYS_PACKAGEDIR+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
fi
- if test x$PACKAGEDIR = x; then
+ if test -z "$PACKAGEDIR"; then
echo "$ac_t""not found" 1>&6
else
echo "$ac_t""$PACKAGEDIR" 1>&6
# Check whether --with-addpath or --without-addpath was given.
if test "${with_addpath+set}" = set; then
withval="$with_addpath"
- if test x$withval != xyes -a x$withval != x; then
+ if test "$withval" != yes -a -n "$withval"; then
echo $ac_n "checking where to find the additional elisp libraries""... $ac_c" 1>&6
-echo "configure:1315: checking where to find the additional elisp libraries" >&5
+echo "configure:1446: checking where to find the additional elisp libraries" >&5
ADDITIONAL_LOAD_PATH=$withval
echo "$ac_t""$ADDITIONAL_LOAD_PATH" 1>&6
fi
ac_given_srcdir=$srcdir
ac_given_INSTALL="$INSTALL"
-trap 'rm -fr `echo "Makefile lisp/Makefile texi/Makefile etc/Makefile texi/ps/Makefile \
- lisp/dgnuspath.el" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "Makefile etc/Makefile lisp/Makefile texi/Makefile \
+ texi/gnusconfig.tex texi/ps/Makefile lisp/dgnuspath.el" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
EOF
cat >> $CONFIG_STATUS <<EOF
s%@URL@%$URL%g
s%@HAVE_w3_forms@%$HAVE_w3_forms%g
s%@W3@%$W3%g
+s%@LATEX@%$LATEX%g
+s%@WITH_FONTS_bembo@%$WITH_FONTS_bembo%g
+s%@WITHOUT_FONTS_bembo@%$WITHOUT_FONTS_bembo%g
+s%@WITH_FONTS_pfu@%$WITH_FONTS_pfu%g
+s%@WITHOUT_FONTS_pfu@%$WITHOUT_FONTS_pfu%g
+s%@WITH_FONTS_bcr@%$WITH_FONTS_bcr%g
+s%@WITHOUT_FONTS_bcr@%$WITHOUT_FONTS_bcr%g
+s%@USE_FONTS@%$USE_FONTS%g
s%@PACKAGEDIR@%$PACKAGEDIR%g
s%@ADDITIONAL_LOAD_PATH@%$ADDITIONAL_LOAD_PATH%g
cat >> $CONFIG_STATUS <<EOF
-CONFIG_FILES=\${CONFIG_FILES-"Makefile lisp/Makefile texi/Makefile etc/Makefile texi/ps/Makefile \
- lisp/dgnuspath.el"}
+CONFIG_FILES=\${CONFIG_FILES-"Makefile etc/Makefile lisp/Makefile texi/Makefile \
+ texi/gnusconfig.tex texi/ps/Makefile lisp/dgnuspath.el"}
EOF
cat >> $CONFIG_STATUS <<\EOF
for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
AC_PATH_ETCDIR
AC_CHECK_URL
AC_CHECK_W3
+GNUS_CHECK_FONTS
AC_PATH_PACKAGEDIR
AC_ADD_LOAD_PATH
-AC_OUTPUT(Makefile lisp/Makefile texi/Makefile etc/Makefile texi/ps/Makefile \
- lisp/dgnuspath.el)
+AC_OUTPUT(Makefile etc/Makefile lisp/Makefile texi/Makefile \
+ texi/gnusconfig.tex texi/ps/Makefile lisp/dgnuspath.el)
+2001-09-27 Simon Josefsson <jas@extundo.com>
+
+ * gnus-topic.el (gnus-topic-mode-map): Add catchup.
+ (gnus-topic-catchup-articles): New function. Suggested by Robin
+ S. Socha <robin-dated-1001857693.185e29@socha.net>.
+
+2001-09-27 11:00:00 ShengHuo ZHU <zsh@cs.rochester.edu>
+ From Gerd M\e,Av\e(Bllmann <gerd@gnu.org>.
+
+ * gnus-ems.el (gnus-article-display-xface): Insert xface after
+ previous ones.
+
+2001-09-27 07:00:00 ShengHuo ZHU <zsh@cs.rochester.edu>
+ From Daiki Ueno <ueno@unixuser.org>
+
+ * gnus-sum.el (gnus-summary-show-article): The arglist of
+ detect-coding-region is incompatible.
+
2001-09-26 18:00:00 ShengHuo ZHU <zsh@cs.rochester.edu>
From Katsuhiro Hermit Endo <hermit@koka-in.org>
(when image
(goto-char (point-min))
(re-search-forward "^From:" nil 'move)
+ (while (get-text-property (point) 'display)
+ (goto-char (next-single-property-change (point) 'display)))
(insert-image image))))))
(defun-maybe assoc-ignore-case (key alist)
"View as charset: "
(save-excursion
(set-buffer gnus-article-buffer)
- (detect-coding-region (point) (point-max) t)))))
+ (let ((coding-systems
+ (detect-coding-region (point) (point-max))))
+ (or (car-safe coding-systems)
+ coding-systems))))))
(gnus-newsgroup-ignored-charsets 'gnus-all))
(gnus-summary-select-article nil 'force)
(let ((deps gnus-newsgroup-dependencies)
"\r" gnus-topic-select-group
" " gnus-topic-read-group
"\C-c\C-x" gnus-topic-expire-articles
+ "c" gnus-topic-catchup-articles
"\C-k" gnus-topic-kill-group
"\C-y" gnus-topic-yank-group
"\M-g" gnus-topic-get-new-news-this-topic
(gnus-group-expire-articles nil))
(gnus-message 5 "Expiring groups in %s...done" topic))))
+(defun gnus-topic-catchup-articles (topic)
+ "Catchup this topic or group.
+Also see `gnus-group-catchup'."
+ (interactive (list (gnus-group-topic-name)))
+ (if (not topic)
+ (call-interactively 'gnus-group-catchup-current)
+ (save-excursion
+ (let ((gnus-group-marked
+ (mapcar (lambda (entry) (car (nth 2 entry)))
+ (gnus-topic-find-groups topic gnus-level-killed t))))
+ (gnus-group-catchup-current)))))
+
(defun gnus-topic-read-group (&optional all no-article group)
"Read news in this newsgroup.
If the prefix argument ALL is non-nil, already read articles become
(require 'product)
(provide 'gnus-vers)
-(defconst gnus-revision-number "07"
+(defconst gnus-revision-number "08"
"Revision number for this version of gnus.")
;; Product information of this gnus.
+2001-09-27 18:00:00 ShengHuo ZHU <zsh@cs.rochester.edu>
+
+ * Makefile.in: Illustrated manual.
+ * gnus.texi: Put message.texi and emacs-mime.texi in the
+ illustrated manual.
+ * texi2latex.el: Ditto.
+
+2001-09-27 13:00:00 ShengHuo ZHU <zsh@cs.rochester.edu>
+
+ * gnus.texi: Remove the extra white-space.
+
+2001-09-27 10:00:00 ShengHuo ZHU <zsh@cs.rochester.edu>
+
+ * gnusconfig.tex.in: New.
+ * gnus.texi: Use it.
+ * pagestyle.sty: Don't set verbatim font.
+ * postamble.tex: Set in ...
+ * bembo.sty: Removed.
+ * Makefile.in (gnusconfig.tex): Check gnusconfig.tex.in.
+ (LATEX): Use configure.
+
2001-09-26 00:00:00 ShengHuo ZHU <zsh@cs.rochester.edu>
* gnus.texi (Limiting): Addition.
EMACSCOMP=$(EMACS) -batch -q -no-site-file
EMACSINFO=$(EMACSCOMP) -l $(srcdir)/infohack.el -f batch-makeinfo
PDFLATEX=pdflatex
-LATEX=latex
+LATEX=@LATEX@
DVIPS=dvips
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
latex: gnus.latexi gnus-faq.latexi
-gnus.latexi gnus-faq.latexi: $(srcdir)/gnus.texi $(srcdir)/gnus-faq.texi texi2latex.elc
+gnus.latexi gnus-faq.latexi message.latexi emacs-mime.latexi: $(srcdir)/gnus.texi $(srcdir)/gnus-faq.texi $(srcdir)/message.texi $(srcdir)/emacs-mime.texi texi2latex.elc
srcdir=$(srcdir) $(EMACSCOMP) -l ./texi2latex.elc -f latexi-translate
.latexi.dvi-x:
+ make gnusconfig.tex
make tmps
rm -f gnus.aux
- egrep -v "label.*Index|chapter.*Index" $< > gnus.tmplatexi1
- TEXINPUTS=$(srcdir):$$TEXINPUTS $(LATEX) gnus.tmplatexi1
+ cp $< gnus.tmplatexi
+ TEXINPUTS=$(srcdir):$$TEXINPUTS $(LATEX) gnus.tmplatexi
$(srcdir)/splitindex
makeindex -o gnus.kind gnus.kidx
makeindex -o gnus.cind gnus.cidx
makeindex -o gnus.gind gnus.gidx
sed 's/\\char 5E\\relax {}/\\symbol{"5E}/' < gnus.kind > gnus.tmpkind
mv gnus.tmpkind gnus.kind
- egrep -v "end\{document\}" gnus.tmplatexi1 > gnus.tmplatexi
+ egrep -v "end\{document\}" $< > gnus.tmplatexi
cat $(srcdir)/postamble.tex >> gnus.tmplatexi
TEXINPUTS=$(srcdir):$$TEXINPUTS $(LATEX) gnus.tmplatexi
TEXINPUTS=$(srcdir):$$TEXINPUTS $(LATEX) gnus.tmplatexi
mv gnus.dvi $@
.latexi.pdf-x:
+ make gnusconfig.tex
make tmps
cd ps; make pdf
rm -f gnus.aux
- egrep -v "label.*Index|chapter.*Index" $< > gnus.tmplatexi1
- TEXINPUTS=$(srcdir):$$TEXINPUTS $(PDFLATEX) gnus.tmplatexi1
+ cp $< gnus.tmplatexi
+ TEXINPUTS=$(srcdir):$$TEXINPUTS $(PDFLATEX) gnus.tmplatexi
$(srcdir)/splitindex
makeindex -o gnus.kind gnus.kidx
makeindex -o gnus.cind gnus.cidx
makeindex -o gnus.gind gnus.gidx
sed 's/\\char 5E\\relax {}/\\symbol{"5E}/' < gnus.kind > gnus.tmpkind
mv gnus.tmpkind gnus.kind
- egrep -v "end\{document\}" gnus.tmplatexi1 > gnus.tmplatexi
+ egrep -v "end\{document\}" $< > gnus.tmplatexi
cat $(srcdir)/postamble.tex >> gnus.tmplatexi
TEXINPUTS=$(srcdir):$$TEXINPUTS $(PDFLATEX) gnus.tmplatexi
TEXINPUTS=$(srcdir):$$TEXINPUTS $(PDFLATEX) gnus.tmplatexi
cd .. \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+gnusconfig.tex: $(srcdir)/gnusconfig.tex.in ../config.status
+ cd .. \
+ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
\usepackage[latin1]{inputenc}
\usepackage{pagestyle}
\usepackage{epsfig}
-\usepackage{bembo}
\usepackage{pixidx}
+\input{gnusconfig.tex}
\makeindex
\begin{document}
\newcommand{\gnuskindex}[1]{\index{#1}}
\newcommand{\gnusindex}[1]{\index{#1}}
-\newcommand{\gnustt}[1]{{\fontfamily{pfu}\fontsize{10pt}{10}\selectfont #1}}
+\newcommand{\gnustt}[1]{{\gnusselectttfont{}#1}}
\newcommand{\gnuscode}[1]{\gnustt{#1}}
-\newcommand{\gnussamp}[1]{``{\fontencoding{OT1}\fontfamily{pfu}\fontsize{10pt}{10}\selectfont #1}''}
+\newcommand{\gnussamp}[1]{``{\fontencoding{OT1}\gnusselectttfont{}#1}''}
\newcommand{\gnuslisp}[1]{\gnustt{#1}}
\newcommand{\gnuskbd}[1]{`\gnustt{#1}'}
\newcommand{\gnusfile}[1]{`\gnustt{#1}'}
Gnus will try to decay scores once a day. If you haven't run Gnus for
four days, Gnus will decay the scores four times, for instance.
+@iftex
+@iflatex
+@chapter Message
+@include message.texi
+@chapter Emacs MIME
+@include emacs-mime.texi
+@end iflatex
+@end iftex
@node Various
@chapter Various
@end table
-
@node The End
@chapter The End
--- /dev/null
+@WITH_FONTS_bembo@\usepackage{bembo}
+@WITH_FONTS_pfu@\newcommand{\gnusselectttfont}{\fontfamily{pfu}\fontsize{10pt}{10}\selectfont}
+@WITH_FONTS_bcr@\def\verbatim@font{\fontfamily{bcr}\fontsize{10pt}{10}\selectfont}
+@WITHOUT_FONTS_pfu@\newcommand{\gnusselectttfont}{\fontfamily{cmtt}\fontsize{10pt}{10}\selectfont\hyphenchar\font45}
+
+\newcommand{\gnususefonts}{@USE_FONTS@}
+
+%%% Local Variables:
+%%% mode: latex
+%%% TeX-master: t
+%%% End:
newsgroups the article has been posted to will be inserted there. If
this variable is @code{nil}, no such courtesy message will be added.
The default value is @samp{"The following message is a courtesy copy of
-an article\nthat has been posted to %s as well.\n\n"}.
+an article\\nthat has been posted to %s as well.\\n\\n"}.
@end table
-\def\verbatim@font{\fontencoding{OT1}\fontfamily{pcr}\fontsize{10pt}{10}\selectfont}
\catcode `\÷ = \active
\def ÷{\penalty10000\hskip0.001pt-\penalty\hyphenpenalty\hskip0.001pt\relax}
\def \newpagestyle#1#2#3{\@namedef{ps@#1}{\def\@oddhead{#2}\def\@oddfoot{#3}%
- \let\@evenhead\@oddhead \let\@evenfoot\@oddfoot}}
+ \let\@evenhead\@oddhead \let\@evenfoot\@oddfoot}}
\def \newdoublepagestyle#1#2#3#4#5{\@namedef{ps@#1}{\def\@evenhead{#2}%
- \def\@oddhead{#3}%
- \def\@evenfoot{#4}%
- \def\@oddfoot{#5}}}
+ \def\@oddhead{#3}%
+ \def\@evenfoot{#4}%
+ \def\@oddfoot{#5}}}
\newlength{\headtextwidth}
\setlength{\headtextwidth}{\textwidth}
\ifodd\c@page
\dp\@tempboxa \z@
\box\@tempboxa \mbox{} \\
- \ifx \@oddhead\@empty\else
+ \ifx \@oddhead\@empty\else
% \rule{\headotextwidth}{0.5pt}
\fi
\else
- \hskip -2.2cm
+ \hskip -2.2cm
\dp\@tempboxa \z@
\box\@tempboxa \mbox{}
- \\\mbox{}
- \vskip 2pt
- \hskip -2.0cm
- \ifx \@oddhead\@empty\else
+ \\\mbox{}
+ \vskip 2pt
+ \hskip -2.0cm
+ \ifx \@oddhead\@empty\else
% \rule{\headetextwidth}{0.5pt}
\fi
\fi
\setcounter{tocdepth}{3}
\setcounter{secnumdepth}{3}
-\def\verbatim@font{\fontfamily{bcr}\fontsize{10pt}{10}\selectfont}
\marginpar[\vspace*{-2.5cm}\epsfig{figure=ps/larsi,height=2cm}]{\vspace*{-2.2cm}\epsfig{figure=ps/larsi,height=2.5cm}}
-Graphics by Luis Fernandes. Set in Adobe Bembo, Adobe Futura and
-Bitstream Courier.
+Graphics by Luis Fernandes. \gnususefonts{}
\clearpage
\mbox{}
install:
-new-herd-section.ps: $(srcdir)/../herds/new-herd-section.gif $(srcdir)/../herds/convol11.pnm
- giftopnm $< | pnmscale 4 | pnmconvol $(srcdir)/../herds/convol11.pnm |\
+new-herd-section.ps: $(srcdir)/../herds/new-herd-section.png $(srcdir)/../herds/convol11.pnm
+ pngtopnm $< | pnmscale 4 | pnmconvol $(srcdir)/../herds/convol11.pnm |\
ppmtopgm | pnmdepth 255 | \
pnmtops -noturn -width 100 -height 100 > $@ || rm -f $@
-%.ps: $(srcdir)/../herds/%.gif $(srcdir)/../herds/convol5.pnm
- giftopnm $< | pnmcrop -white | pnmmargin -white 9 | pnmscale 2 | \
+%.ps: $(srcdir)/../herds/%.png $(srcdir)/../herds/convol5.pnm
+ pngtopnm $< | pnmcrop -white | pnmmargin -white 9 | pnmscale 2 | \
pnmconvol $(srcdir)/../herds/convol5.pnm | ppmtopgm | \
pnmdepth 255 | pnmtops -width 100 -height 100 -noturn > $@ || rm -f $@
-%.ps: $(srcdir)/../screen/%.gif
- giftopnm $< | pnmmargin -black 1 | ppmtopgm | \
+%.ps: $(srcdir)/../screen/%.png
+ pngtopnm $< | pnmmargin -black 1 | ppmtopgm | \
pnmtops -width 100 -height 100 -noturn > $@ || rm -f $@
-larsi.ps: $(srcdir)/../misc/larsi.gif
- giftopnm $< | ppmtopgm | pnmtops -noturn > $@ || rm -f $@
+larsi.ps: $(srcdir)/../misc/larsi.png
+ pngtopnm $< | ppmtopgm | pnmtops -noturn > $@ || rm -f $@
september.ps: $(srcdir)/../misc/eseptember.tif
tifftopnm $< | pnmscale 4 | ppmtopgm | \
picons-%.ps: $(srcdir)/../picons/%.xbm
xbmtopbm $< | pnmtops -noturn > $@ || rm -f $@
-picons-%.ps: $(srcdir)/../picons/%.gif
- giftopnm $< | ppmtopgm | pnmtops -noturn > $@ || rm -f $@
+picons-%.ps: $(srcdir)/../picons/%.png
+ pngtopnm $< | ppmtopgm | pnmtops -noturn > $@ || rm -f $@
-xface-%.ps: $(srcdir)/../xface/%.gif
- giftopnm $< | ppmtopgm | pnmtops -noturn > $@ || rm -f $@
+xface-%.ps: $(srcdir)/../xface/%.png
+ pngtopnm $< | ppmtopgm | pnmtops -noturn > $@ || rm -f $@
%.ps: $(srcdir)/../smilies/%.tif
tifftopnm $< | ppmtopgm | pnmtops > $@ || rm -f $@
+++ /dev/null
-#FIG 3.1
-Landscape
-Center
-Inches
-1200 2
-2 5 0 1 -1 -1 0 0 -1 0.000 0 0 -1 0 0 5
- 0 group.gif
- 2175 1200 6750 1200 6750 6600 2175 6600 2175 1200
"Translate."
(interactive)
(latexi-translate-file "gnus")
- (latexi-translate-file "gnus-faq"))
+ (latexi-translate-file "gnus-faq")
+ (latexi-translate-file "message" t)
+ (latexi-translate-file "emacs-mime" t))
-(defun latexi-translate-file (file)
+(defun latexi-translate-file (file &optional as-a-chapter)
"Translate file a LaTeX file."
(let ((item-string "")
(item-stack nil)
"ifnottex" "direntry"))
(latexi-discard-until command))
((member command '("subsection" "subsubsection"))
- (latexi-switch-line command arg))
+ (if as-a-chapter
+ (latexi-switch-line (format "sub%s" command) arg)
+ (latexi-switch-line command arg)))
((member command '("chapter"))
- (latexi-switch-line
- (format
- "gnus%s{\\epsfig{figure=ps/new-herd-%d,scale=.5}}"
- command (incf chapter))
- arg))
+ (if (string-match "Index" arg)
+ (latexi-strip-line)
+ (if as-a-chapter
+ (latexi-switch-line "gnussection" arg)
+ (latexi-switch-line
+ (format
+ "gnus%s{%s}" command
+ (if (> (incf chapter) 10)
+ ""
+ (format "\\epsfig{figure=ps/new-herd-%d,scale=.5}"
+ chapter)))
+ arg))))
((member command '("section"))
- (latexi-switch-line (format "gnus%s" command) arg))
+ (if as-a-chapter
+ (latexi-switch-line "subsection" arg)
+ (latexi-switch-line (format "gnus%s" command) arg)))
((member command '("cindex" "findex" "kindex" "vindex"))
(latexi-index-command command arg))
((member command '("*"))
(replace-match "" t t))
((equal command "node")
(latexi-strip-line)
- (insert (format "\\label{%s}\n" arg)))
+ (unless (string-match "Index" arg)
+ (insert (format "\\label{%s}\n" arg))))
((equal command "contents")
(latexi-strip-line)
;;(insert (format "\\tableofcontents\n" arg))
(insert "duppat{}"))
((equal command "settitle")
(latexi-strip-line)
- (insert (format "\\newcommand{\\gnustitlename}{%s}\n" arg)))
+ (if (not as-a-chapter)
+ (insert
+ (format "\\newcommand{\\gnustitlename}{%s}\n" arg))))
((equal command "title")
(latexi-strip-line)
(insert (format "\\gnustitlename{%s}\n" arg)))
(delete-char 1))
((equal command "include")
(latexi-strip-line)
- (insert "\\input{gnus-faq.latexi}\n"))
+ (string-match "\\.texi" arg)
+ (insert (format "\\input{%s.latexi}\n"
+ (substring arg 0 (match-beginning 0)))))
((equal command "noindent")
(latexi-strip-line)
(insert "\\noindent\n"))
projects / elisp / gnus.git- / commitdiff
