From: yamaoka Date: Fri, 28 Sep 2001 01:55:09 +0000 (+0000) Subject: Synch with Oort Gnus. X-Git-Tag: t-gnus-6_15_4-08-quimby~3 X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=a8771bbeee352e5e3099b3c47ce7da2435a1d445;p=elisp%2Fgnus.git- Synch with Oort Gnus. * gnus-vers.el (gnus-revision-number): Increment to 08. --- diff --git a/ChangeLog b/ChangeLog index 2e7c98c..88a017b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2001-09-28 Katsumi Yamaoka + + * lisp/gnus-vers.el (gnus-revision-number): Increment to 08. + +2001-09-27 14:00:00 ShengHuo ZHU + + * aclocal.m4 (GNUS_CHECK_FONTS): Typo. Use /dev/null as latex input. + +2001-09-27 09:00:00 ShengHuo ZHU + + * aclocal.m4, configure.in: Check commercial fonts. + 2001-09-27 Katsumi Yamaoka * lisp/message.el (message-find-invisible-regions): Look for the diff --git a/aclocal.m4 b/aclocal.m4 index aec56f3..720c918 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -10,29 +10,28 @@ AC_DEFUN(AC_CHECK_EMACS, 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)]) @@ -79,7 +78,7 @@ AC_DEFUN(AC_CHECK_EMACS_FLAVOR, 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} @@ -93,7 +92,7 @@ AC_DEFUN(AC_PATH_LISPDIR, [ 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}" @@ -135,10 +134,10 @@ if test -z "$3"; then 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} @@ -161,13 +160,13 @@ unset EMACS_cv_SYS_w3_forms; 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 @@ -175,7 +174,7 @@ 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}) @@ -195,13 +194,13 @@ unset EMACS_cv_SYS_url; 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 @@ -209,13 +208,103 @@ 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} & 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} & 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} & 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, @@ -240,13 +329,13 @@ AC_DEFUN(AC_PATH_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) @@ -261,7 +350,7 @@ AC_DEFUN(AC_ADD_LOAD_PATH, 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) diff --git a/configure b/configure index bebf1d0..d92eda2 100755 --- a/configure +++ b/configure @@ -25,6 +25,8 @@ ac_help="$ac_help 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 @@ -550,7 +552,7 @@ fi 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 @@ -607,7 +609,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. # 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 @@ -666,7 +668,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' # 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 @@ -694,20 +696,20 @@ 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 @@ -741,7 +743,7 @@ test -n "$EMACS" || EMACS="emacs" # 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 @@ -774,11 +776,11 @@ fi # 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 @@ -809,7 +811,7 @@ fi # 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 @@ -840,13 +842,12 @@ fi 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 @@ -882,7 +883,7 @@ fi 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; @@ -892,7 +893,7 @@ elisp="(cond ((featurep (quote xemacs)) \"XEmacs\")\ (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 @@ -922,14 +923,14 @@ fi 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 @@ -960,10 +961,10 @@ if test "${with_lispdir+set}" = set; then 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}" @@ -991,7 +992,7 @@ if test "${with_etcdir+set}" = set; then 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 @@ -1000,7 +1001,7 @@ echo "configure:995: checking where etc files should go" >&5 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; @@ -1013,14 +1014,14 @@ else 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 @@ -1041,10 +1042,10 @@ if test -z ""noecho""; then 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} @@ -1053,18 +1054,18 @@ if test -z ""noecho""; then 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 @@ -1098,7 +1099,7 @@ fi 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 @@ -1106,7 +1107,7 @@ fi 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; @@ -1119,14 +1120,14 @@ else 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 @@ -1147,10 +1148,10 @@ if test -z ""noecho""; then 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} @@ -1159,18 +1160,18 @@ if test -z ""noecho""; then 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 @@ -1204,19 +1205,149 @@ fi 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} & 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} & 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} & 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 @@ -1235,7 +1366,7 @@ elisp="(let (package-dir)\ (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 @@ -1274,7 +1405,7 @@ elisp="(let (package-dir)\ (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 @@ -1297,7 +1428,7 @@ fi 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 @@ -1309,9 +1440,9 @@ fi # 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 @@ -1433,8 +1564,8 @@ done 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 <> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then diff --git a/configure.in b/configure.in index 512ca81..a2afd77 100644 --- a/configure.in +++ b/configure.in @@ -8,7 +8,8 @@ AC_PATH_LISPDIR 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) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0af586a..5b3609c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,21 @@ +2001-09-27 Simon Josefsson + + * gnus-topic.el (gnus-topic-mode-map): Add catchup. + (gnus-topic-catchup-articles): New function. Suggested by Robin + S. Socha . + +2001-09-27 11:00:00 ShengHuo ZHU + From Gerd M,Av(Bllmann . + + * gnus-ems.el (gnus-article-display-xface): Insert xface after + previous ones. + +2001-09-27 07:00:00 ShengHuo ZHU + From Daiki Ueno + + * gnus-sum.el (gnus-summary-show-article): The arglist of + detect-coding-region is incompatible. + 2001-09-26 18:00:00 ShengHuo ZHU From Katsuhiro Hermit Endo diff --git a/lisp/gnus-ems.el b/lisp/gnus-ems.el index 1682e0f..010c325 100644 --- a/lisp/gnus-ems.el +++ b/lisp/gnus-ems.el @@ -297,6 +297,8 @@ for XEmacs." (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) diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el index 2454b3c..c36e9ea 100644 --- a/lisp/gnus-sum.el +++ b/lisp/gnus-sum.el @@ -7963,7 +7963,10 @@ without any article massaging functions being run." "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) diff --git a/lisp/gnus-topic.el b/lisp/gnus-topic.el index 2267def..ff26e1d 100644 --- a/lisp/gnus-topic.el +++ b/lisp/gnus-topic.el @@ -1001,6 +1001,7 @@ articles in the topic and its subtopics." "\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 @@ -1154,6 +1155,18 @@ If performed over a topic line, toggle folding the 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 diff --git a/lisp/gnus-vers.el b/lisp/gnus-vers.el index 3826ed6..c39fe35 100644 --- a/lisp/gnus-vers.el +++ b/lisp/gnus-vers.el @@ -34,7 +34,7 @@ (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. diff --git a/texi/ChangeLog b/texi/ChangeLog index 2c31adf..a1b321b 100644 --- a/texi/ChangeLog +++ b/texi/ChangeLog @@ -1,3 +1,24 @@ +2001-09-27 18:00:00 ShengHuo ZHU + + * 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 + + * gnus.texi: Remove the extra white-space. + +2001-09-27 10:00:00 ShengHuo ZHU + + * 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 * gnus.texi (Limiting): Addition. diff --git a/texi/Makefile.in b/texi/Makefile.in index 6beaf92..3f73173 100644 --- a/texi/Makefile.in +++ b/texi/Makefile.in @@ -13,7 +13,7 @@ EMACS=@EMACS@ 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@ @@ -106,39 +106,41 @@ texi2latex.elc: texi2latex.el 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 @@ -249,6 +251,10 @@ Makefile: $(srcdir)/Makefile.in ../config.status 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: diff --git a/texi/gnus.texi b/texi/gnus.texi index a42c484..4ff1015 100644 --- a/texi/gnus.texi +++ b/texi/gnus.texi @@ -20,8 +20,8 @@ \usepackage[latin1]{inputenc} \usepackage{pagestyle} \usepackage{epsfig} -\usepackage{bembo} \usepackage{pixidx} +\input{gnusconfig.tex} \makeindex \begin{document} @@ -40,9 +40,9 @@ \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}'} @@ -17901,6 +17901,14 @@ the new score, which should be an integer. 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 @@ -19785,7 +19793,6 @@ group). @end table - @node The End @chapter The End diff --git a/texi/gnusconfig.tex.in b/texi/gnusconfig.tex.in new file mode 100644 index 0000000..61c028c --- /dev/null +++ b/texi/gnusconfig.tex.in @@ -0,0 +1,11 @@ +@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: diff --git a/texi/herds/gnus-herd-bw.gif b/texi/herds/gnus-herd-bw.gif deleted file mode 100644 index 6d965e0..0000000 Binary files a/texi/herds/gnus-herd-bw.gif and /dev/null differ diff --git a/texi/herds/gnus-herd-bw.png b/texi/herds/gnus-herd-bw.png new file mode 100644 index 0000000..8ed5904 Binary files /dev/null and b/texi/herds/gnus-herd-bw.png differ diff --git a/texi/herds/gnus-herd-new.gif b/texi/herds/gnus-herd-new.gif deleted file mode 100644 index 18314b6..0000000 Binary files a/texi/herds/gnus-herd-new.gif and /dev/null differ diff --git a/texi/herds/gnus-herd-new.png b/texi/herds/gnus-herd-new.png new file mode 100644 index 0000000..b0dacd1 Binary files /dev/null and b/texi/herds/gnus-herd-new.png differ diff --git a/texi/herds/new-herd-1.gif b/texi/herds/new-herd-1.gif deleted file mode 100644 index b68815b..0000000 Binary files a/texi/herds/new-herd-1.gif and /dev/null differ diff --git a/texi/herds/new-herd-1.png b/texi/herds/new-herd-1.png new file mode 100644 index 0000000..775d493 Binary files /dev/null and b/texi/herds/new-herd-1.png differ diff --git a/texi/herds/new-herd-10.gif b/texi/herds/new-herd-10.gif deleted file mode 100644 index fc67fd6..0000000 Binary files a/texi/herds/new-herd-10.gif and /dev/null differ diff --git a/texi/herds/new-herd-10.png b/texi/herds/new-herd-10.png new file mode 100644 index 0000000..dc26eb4 Binary files /dev/null and b/texi/herds/new-herd-10.png differ diff --git a/texi/herds/new-herd-2.gif b/texi/herds/new-herd-2.gif deleted file mode 100644 index 525f0e8..0000000 Binary files a/texi/herds/new-herd-2.gif and /dev/null differ diff --git a/texi/herds/new-herd-2.png b/texi/herds/new-herd-2.png new file mode 100644 index 0000000..19b2fbc Binary files /dev/null and b/texi/herds/new-herd-2.png differ diff --git a/texi/herds/new-herd-3.gif b/texi/herds/new-herd-3.gif deleted file mode 100644 index 696a41e..0000000 Binary files a/texi/herds/new-herd-3.gif and /dev/null differ diff --git a/texi/herds/new-herd-3.png b/texi/herds/new-herd-3.png new file mode 100644 index 0000000..1d36d23 Binary files /dev/null and b/texi/herds/new-herd-3.png differ diff --git a/texi/herds/new-herd-4.gif b/texi/herds/new-herd-4.gif deleted file mode 100644 index 02e5775..0000000 Binary files a/texi/herds/new-herd-4.gif and /dev/null differ diff --git a/texi/herds/new-herd-4.png b/texi/herds/new-herd-4.png new file mode 100644 index 0000000..23ccb23 Binary files /dev/null and b/texi/herds/new-herd-4.png differ diff --git a/texi/herds/new-herd-5.gif b/texi/herds/new-herd-5.gif deleted file mode 100644 index 8e065a2..0000000 Binary files a/texi/herds/new-herd-5.gif and /dev/null differ diff --git a/texi/herds/new-herd-5.png b/texi/herds/new-herd-5.png new file mode 100644 index 0000000..aa85f31 Binary files /dev/null and b/texi/herds/new-herd-5.png differ diff --git a/texi/herds/new-herd-6.gif b/texi/herds/new-herd-6.gif deleted file mode 100644 index 4f13195..0000000 Binary files a/texi/herds/new-herd-6.gif and /dev/null differ diff --git a/texi/herds/new-herd-6.png b/texi/herds/new-herd-6.png new file mode 100644 index 0000000..df103ed Binary files /dev/null and b/texi/herds/new-herd-6.png differ diff --git a/texi/herds/new-herd-7.gif b/texi/herds/new-herd-7.gif deleted file mode 100644 index 44d43f1..0000000 Binary files a/texi/herds/new-herd-7.gif and /dev/null differ diff --git a/texi/herds/new-herd-7.png b/texi/herds/new-herd-7.png new file mode 100644 index 0000000..c5e29a7 Binary files /dev/null and b/texi/herds/new-herd-7.png differ diff --git a/texi/herds/new-herd-8.gif b/texi/herds/new-herd-8.gif deleted file mode 100644 index b87a90d..0000000 Binary files a/texi/herds/new-herd-8.gif and /dev/null differ diff --git a/texi/herds/new-herd-8.png b/texi/herds/new-herd-8.png new file mode 100644 index 0000000..94dea5a Binary files /dev/null and b/texi/herds/new-herd-8.png differ diff --git a/texi/herds/new-herd-9.gif b/texi/herds/new-herd-9.gif deleted file mode 100644 index fc67fd6..0000000 Binary files a/texi/herds/new-herd-9.gif and /dev/null differ diff --git a/texi/herds/new-herd-9.png b/texi/herds/new-herd-9.png new file mode 100644 index 0000000..dc26eb4 Binary files /dev/null and b/texi/herds/new-herd-9.png differ diff --git a/texi/herds/new-herd-section.gif b/texi/herds/new-herd-section.gif deleted file mode 100644 index e5f0e7e..0000000 Binary files a/texi/herds/new-herd-section.gif and /dev/null differ diff --git a/texi/herds/new-herd-section.png b/texi/herds/new-herd-section.png new file mode 100644 index 0000000..662a982 Binary files /dev/null and b/texi/herds/new-herd-section.png differ diff --git a/texi/herds/new-herd.gif b/texi/herds/new-herd.gif deleted file mode 100644 index 04f93d5..0000000 Binary files a/texi/herds/new-herd.gif and /dev/null differ diff --git a/texi/herds/new-herd.png b/texi/herds/new-herd.png new file mode 100644 index 0000000..c021e9b Binary files /dev/null and b/texi/herds/new-herd.png differ diff --git a/texi/herds/new-herd2.gif b/texi/herds/new-herd2.gif deleted file mode 100644 index e06771f..0000000 Binary files a/texi/herds/new-herd2.gif and /dev/null differ diff --git a/texi/herds/new-herd2.png b/texi/herds/new-herd2.png new file mode 100644 index 0000000..6e1a8fd Binary files /dev/null and b/texi/herds/new-herd2.png differ diff --git a/texi/message.texi b/texi/message.texi index 3529ef1..a12eb0c 100644 --- a/texi/message.texi +++ b/texi/message.texi @@ -1431,7 +1431,7 @@ the mailed copy. If the string contains the format spec @samp{%s}, the 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 diff --git a/texi/misc/larsi.gif b/texi/misc/larsi.gif deleted file mode 100644 index c81e049..0000000 Binary files a/texi/misc/larsi.gif and /dev/null differ diff --git a/texi/misc/larsi.png b/texi/misc/larsi.png new file mode 100644 index 0000000..d8b5b27 Binary files /dev/null and b/texi/misc/larsi.png differ diff --git a/texi/misc/red.gif b/texi/misc/red.gif deleted file mode 100644 index 41d364a..0000000 Binary files a/texi/misc/red.gif and /dev/null differ diff --git a/texi/misc/red.png b/texi/misc/red.png new file mode 100644 index 0000000..e646e00 Binary files /dev/null and b/texi/misc/red.png differ diff --git a/texi/misc/september.gif b/texi/misc/september.gif deleted file mode 100644 index 38f6123..0000000 Binary files a/texi/misc/september.gif and /dev/null differ diff --git a/texi/misc/september.png b/texi/misc/september.png new file mode 100644 index 0000000..1e5539e Binary files /dev/null and b/texi/misc/september.png differ diff --git a/texi/pagestyle.sty b/texi/pagestyle.sty index ffd4529..d434821 100644 --- a/texi/pagestyle.sty +++ b/texi/pagestyle.sty @@ -1,14 +1,13 @@ -\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} @@ -44,17 +43,17 @@ \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 @@ -82,4 +81,3 @@ \setcounter{tocdepth}{3} \setcounter{secnumdepth}{3} -\def\verbatim@font{\fontfamily{bcr}\fontsize{10pt}{10}\selectfont} diff --git a/texi/picons/att.gif b/texi/picons/att.gif deleted file mode 100644 index 02608d5..0000000 Binary files a/texi/picons/att.gif and /dev/null differ diff --git a/texi/picons/att.png b/texi/picons/att.png new file mode 100644 index 0000000..f0473ee Binary files /dev/null and b/texi/picons/att.png differ diff --git a/texi/picons/berkeley.gif b/texi/picons/berkeley.gif deleted file mode 100644 index babf278..0000000 Binary files a/texi/picons/berkeley.gif and /dev/null differ diff --git a/texi/picons/berkeley.png b/texi/picons/berkeley.png new file mode 100644 index 0000000..e22efcb Binary files /dev/null and b/texi/picons/berkeley.png differ diff --git a/texi/picons/caltech.gif b/texi/picons/caltech.gif deleted file mode 100644 index 92f8f5f..0000000 Binary files a/texi/picons/caltech.gif and /dev/null differ diff --git a/texi/picons/caltech.png b/texi/picons/caltech.png new file mode 100644 index 0000000..68ae3e9 Binary files /dev/null and b/texi/picons/caltech.png differ diff --git a/texi/picons/canada.gif b/texi/picons/canada.gif deleted file mode 100644 index f3e4f40..0000000 Binary files a/texi/picons/canada.gif and /dev/null differ diff --git a/texi/picons/canada.png b/texi/picons/canada.png new file mode 100644 index 0000000..2c747a8 Binary files /dev/null and b/texi/picons/canada.png differ diff --git a/texi/picons/cr.gif b/texi/picons/cr.gif deleted file mode 100644 index 0f4ded0..0000000 Binary files a/texi/picons/cr.gif and /dev/null differ diff --git a/texi/picons/cr.png b/texi/picons/cr.png new file mode 100644 index 0000000..d53d2db Binary files /dev/null and b/texi/picons/cr.png differ diff --git a/texi/picons/laurie.gif b/texi/picons/laurie.gif deleted file mode 100644 index 2a1578a..0000000 Binary files a/texi/picons/laurie.gif and /dev/null differ diff --git a/texi/picons/laurie.png b/texi/picons/laurie.png new file mode 100644 index 0000000..0793f9a Binary files /dev/null and b/texi/picons/laurie.png differ diff --git a/texi/picons/mit.gif b/texi/picons/mit.gif deleted file mode 100644 index 9750799..0000000 Binary files a/texi/picons/mit.gif and /dev/null differ diff --git a/texi/picons/mit.png b/texi/picons/mit.png new file mode 100644 index 0000000..e297591 Binary files /dev/null and b/texi/picons/mit.png differ diff --git a/texi/picons/nasa.gif b/texi/picons/nasa.gif deleted file mode 100644 index bd7ff87..0000000 Binary files a/texi/picons/nasa.gif and /dev/null differ diff --git a/texi/picons/nasa.png b/texi/picons/nasa.png new file mode 100644 index 0000000..1679857 Binary files /dev/null and b/texi/picons/nasa.png differ diff --git a/texi/picons/rms.gif b/texi/picons/rms.gif deleted file mode 100644 index ce04d55..0000000 Binary files a/texi/picons/rms.gif and /dev/null differ diff --git a/texi/picons/rms.png b/texi/picons/rms.png new file mode 100644 index 0000000..10dfc25 Binary files /dev/null and b/texi/picons/rms.png differ diff --git a/texi/picons/stanford.gif b/texi/picons/stanford.gif deleted file mode 100644 index 16a98e8..0000000 Binary files a/texi/picons/stanford.gif and /dev/null differ diff --git a/texi/picons/stanford.png b/texi/picons/stanford.png new file mode 100644 index 0000000..b3f5dec Binary files /dev/null and b/texi/picons/stanford.png differ diff --git a/texi/picons/sun.gif b/texi/picons/sun.gif deleted file mode 100644 index 0af3acf..0000000 Binary files a/texi/picons/sun.gif and /dev/null differ diff --git a/texi/picons/sun.png b/texi/picons/sun.png new file mode 100644 index 0000000..f010f16 Binary files /dev/null and b/texi/picons/sun.png differ diff --git a/texi/picons/ufl.gif b/texi/picons/ufl.gif deleted file mode 100644 index 8ca92af..0000000 Binary files a/texi/picons/ufl.gif and /dev/null differ diff --git a/texi/picons/ufl.png b/texi/picons/ufl.png new file mode 100644 index 0000000..9521710 Binary files /dev/null and b/texi/picons/ufl.png differ diff --git a/texi/picons/uio.gif b/texi/picons/uio.gif deleted file mode 100644 index 8a771a5..0000000 Binary files a/texi/picons/uio.gif and /dev/null differ diff --git a/texi/picons/uio.png b/texi/picons/uio.png new file mode 100644 index 0000000..66ff8b0 Binary files /dev/null and b/texi/picons/uio.png differ diff --git a/texi/picons/unit.gif b/texi/picons/unit.gif deleted file mode 100644 index 7e4efe2..0000000 Binary files a/texi/picons/unit.gif and /dev/null differ diff --git a/texi/picons/unit.png b/texi/picons/unit.png new file mode 100644 index 0000000..1dea18d Binary files /dev/null and b/texi/picons/unit.png differ diff --git a/texi/postamble.tex b/texi/postamble.tex index 6e6d243..f4f6bf3 100644 --- a/texi/postamble.tex +++ b/texi/postamble.tex @@ -33,8 +33,7 @@ not have a cat. \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{} diff --git a/texi/ps/Makefile.in b/texi/ps/Makefile.in index 7aa6e56..e41dabe 100644 --- a/texi/ps/Makefile.in +++ b/texi/ps/Makefile.in @@ -148,23 +148,23 @@ distclean: clean 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 | \ @@ -185,11 +185,11 @@ red.ps: $(srcdir)/../misc/ered.tif 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 $@ diff --git a/texi/screen/group-topic.gif b/texi/screen/group-topic.gif deleted file mode 100644 index 2414969..0000000 Binary files a/texi/screen/group-topic.gif and /dev/null differ diff --git a/texi/screen/group-topic.png b/texi/screen/group-topic.png new file mode 100644 index 0000000..6f4ad01 Binary files /dev/null and b/texi/screen/group-topic.png differ diff --git a/texi/screen/group.gif b/texi/screen/group.gif deleted file mode 100644 index f6aaa1b..0000000 Binary files a/texi/screen/group.gif and /dev/null differ diff --git a/texi/screen/group.png b/texi/screen/group.png new file mode 100644 index 0000000..4b4620f Binary files /dev/null and b/texi/screen/group.png differ diff --git a/texi/screen/server.gif b/texi/screen/server.gif deleted file mode 100644 index 986439e..0000000 Binary files a/texi/screen/server.gif and /dev/null differ diff --git a/texi/screen/server.png b/texi/screen/server.png new file mode 100644 index 0000000..67f2bd4 Binary files /dev/null and b/texi/screen/server.png differ diff --git a/texi/screen/summary-adopt.gif b/texi/screen/summary-adopt.gif deleted file mode 100644 index 075d113..0000000 Binary files a/texi/screen/summary-adopt.gif and /dev/null differ diff --git a/texi/screen/summary-adopt.png b/texi/screen/summary-adopt.png new file mode 100644 index 0000000..54e508f Binary files /dev/null and b/texi/screen/summary-adopt.png differ diff --git a/texi/screen/summary-article-c-ug.gif b/texi/screen/summary-article-c-ug.gif deleted file mode 100644 index a8bd1ac..0000000 Binary files a/texi/screen/summary-article-c-ug.gif and /dev/null differ diff --git a/texi/screen/summary-article-c-ug.png b/texi/screen/summary-article-c-ug.png new file mode 100644 index 0000000..8f224bf Binary files /dev/null and b/texi/screen/summary-article-c-ug.png differ diff --git a/texi/screen/summary-article.gif b/texi/screen/summary-article.gif deleted file mode 100644 index 313b3fa..0000000 Binary files a/texi/screen/summary-article.gif and /dev/null differ diff --git a/texi/screen/summary-article.png b/texi/screen/summary-article.png new file mode 100644 index 0000000..d265dca Binary files /dev/null and b/texi/screen/summary-article.png differ diff --git a/texi/screen/summary-dummy.gif b/texi/screen/summary-dummy.gif deleted file mode 100644 index 2e9d76f..0000000 Binary files a/texi/screen/summary-dummy.gif and /dev/null differ diff --git a/texi/screen/summary-dummy.png b/texi/screen/summary-dummy.png new file mode 100644 index 0000000..308f244 Binary files /dev/null and b/texi/screen/summary-dummy.png differ diff --git a/texi/screen/summary-empty.gif b/texi/screen/summary-empty.gif deleted file mode 100644 index b4991f2..0000000 Binary files a/texi/screen/summary-empty.gif and /dev/null differ diff --git a/texi/screen/summary-empty.png b/texi/screen/summary-empty.png new file mode 100644 index 0000000..2f2ec6a Binary files /dev/null and b/texi/screen/summary-empty.png differ diff --git a/texi/screen/summary-none.gif b/texi/screen/summary-none.gif deleted file mode 100644 index ba1e398..0000000 Binary files a/texi/screen/summary-none.gif and /dev/null differ diff --git a/texi/screen/summary-none.png b/texi/screen/summary-none.png new file mode 100644 index 0000000..9f8f43e Binary files /dev/null and b/texi/screen/summary-none.png differ diff --git a/texi/screen/summary-unthreaded.gif b/texi/screen/summary-unthreaded.gif deleted file mode 100644 index 45537c4..0000000 Binary files a/texi/screen/summary-unthreaded.gif and /dev/null differ diff --git a/texi/screen/summary-unthreaded.png b/texi/screen/summary-unthreaded.png new file mode 100644 index 0000000..2e5ddbb Binary files /dev/null and b/texi/screen/summary-unthreaded.png differ diff --git a/texi/screen/summary.gif b/texi/screen/summary.gif deleted file mode 100644 index 9375ee5..0000000 Binary files a/texi/screen/summary.gif and /dev/null differ diff --git a/texi/screen/summary.png b/texi/screen/summary.png new file mode 100644 index 0000000..7cfcc0e Binary files /dev/null and b/texi/screen/summary.png differ diff --git a/texi/screen/xfig.SAVE b/texi/screen/xfig.SAVE deleted file mode 100644 index f8d3d8a..0000000 --- a/texi/screen/xfig.SAVE +++ /dev/null @@ -1,8 +0,0 @@ -#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 diff --git a/texi/texi2latex.el b/texi/texi2latex.el index 9aae918..bab1b6b 100644 --- a/texi/texi2latex.el +++ b/texi/texi2latex.el @@ -35,9 +35,11 @@ "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) @@ -102,15 +104,26 @@ "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 '("*")) @@ -120,7 +133,8 @@ (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)) @@ -196,7 +210,9 @@ (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))) @@ -213,7 +229,9 @@ (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")) diff --git a/texi/xface/abrahamsen.gif b/texi/xface/abrahamsen.gif deleted file mode 100644 index bf41d8d..0000000 Binary files a/texi/xface/abrahamsen.gif and /dev/null differ diff --git a/texi/xface/abrahamsen.png b/texi/xface/abrahamsen.png new file mode 100644 index 0000000..20a1206 Binary files /dev/null and b/texi/xface/abrahamsen.png differ diff --git a/texi/xface/aichner.gif b/texi/xface/aichner.gif deleted file mode 100644 index 53e5596..0000000 Binary files a/texi/xface/aichner.gif and /dev/null differ diff --git a/texi/xface/aichner.png b/texi/xface/aichner.png new file mode 100644 index 0000000..1636565 Binary files /dev/null and b/texi/xface/aichner.png differ diff --git a/texi/xface/blanks.gif b/texi/xface/blanks.gif deleted file mode 100644 index ad83633..0000000 Binary files a/texi/xface/blanks.gif and /dev/null differ diff --git a/texi/xface/blanks.png b/texi/xface/blanks.png new file mode 100644 index 0000000..0776a29 Binary files /dev/null and b/texi/xface/blanks.png differ diff --git a/texi/xface/cosgriff.gif b/texi/xface/cosgriff.gif deleted file mode 100644 index cd529f8..0000000 Binary files a/texi/xface/cosgriff.gif and /dev/null differ diff --git a/texi/xface/cosgriff.png b/texi/xface/cosgriff.png new file mode 100644 index 0000000..59acc3f Binary files /dev/null and b/texi/xface/cosgriff.png differ diff --git a/texi/xface/drazen.gif b/texi/xface/drazen.gif deleted file mode 100644 index 5c68a8f..0000000 Binary files a/texi/xface/drazen.gif and /dev/null differ diff --git a/texi/xface/drazen.png b/texi/xface/drazen.png new file mode 100644 index 0000000..dffeffe Binary files /dev/null and b/texi/xface/drazen.png differ diff --git a/texi/xface/gertzfield.gif b/texi/xface/gertzfield.gif deleted file mode 100644 index 0dd0f00..0000000 Binary files a/texi/xface/gertzfield.gif and /dev/null differ diff --git a/texi/xface/gertzfield.png b/texi/xface/gertzfield.png new file mode 100644 index 0000000..576789e Binary files /dev/null and b/texi/xface/gertzfield.png differ diff --git a/texi/xface/goldberg.gif b/texi/xface/goldberg.gif deleted file mode 100644 index 5cc39f7..0000000 Binary files a/texi/xface/goldberg.gif and /dev/null differ diff --git a/texi/xface/goldberg.png b/texi/xface/goldberg.png new file mode 100644 index 0000000..e2fe139 Binary files /dev/null and b/texi/xface/goldberg.png differ diff --git a/texi/xface/graf.gif b/texi/xface/graf.gif deleted file mode 100644 index 39df481..0000000 Binary files a/texi/xface/graf.gif and /dev/null differ diff --git a/texi/xface/graf.png b/texi/xface/graf.png new file mode 100644 index 0000000..d2e19d3 Binary files /dev/null and b/texi/xface/graf.png differ diff --git a/texi/xface/hardaker.gif b/texi/xface/hardaker.gif deleted file mode 100644 index cf9852f..0000000 Binary files a/texi/xface/hardaker.gif and /dev/null differ diff --git a/texi/xface/hardaker.png b/texi/xface/hardaker.png new file mode 100644 index 0000000..ac88bd8 Binary files /dev/null and b/texi/xface/hardaker.png differ diff --git a/texi/xface/hedbor.gif b/texi/xface/hedbor.gif deleted file mode 100644 index e330a6f..0000000 Binary files a/texi/xface/hedbor.gif and /dev/null differ diff --git a/texi/xface/hedbor.png b/texi/xface/hedbor.png new file mode 100644 index 0000000..5672039 Binary files /dev/null and b/texi/xface/hedbor.png differ diff --git a/texi/xface/ingrand.gif b/texi/xface/ingrand.gif deleted file mode 100644 index 5499d29..0000000 Binary files a/texi/xface/ingrand.gif and /dev/null differ diff --git a/texi/xface/ingrand.png b/texi/xface/ingrand.png new file mode 100644 index 0000000..2403259 Binary files /dev/null and b/texi/xface/ingrand.png differ diff --git a/texi/xface/kaplan.gif b/texi/xface/kaplan.gif deleted file mode 100644 index 85b8390..0000000 Binary files a/texi/xface/kaplan.gif and /dev/null differ diff --git a/texi/xface/kaplan.png b/texi/xface/kaplan.png new file mode 100644 index 0000000..106bb5e Binary files /dev/null and b/texi/xface/kaplan.png differ diff --git a/texi/xface/karlheg.gif b/texi/xface/karlheg.gif deleted file mode 100644 index cf9e9a9..0000000 Binary files a/texi/xface/karlheg.gif and /dev/null differ diff --git a/texi/xface/karlheg.png b/texi/xface/karlheg.png new file mode 100644 index 0000000..022eb68 Binary files /dev/null and b/texi/xface/karlheg.png differ diff --git a/texi/xface/kleinpaste.gif b/texi/xface/kleinpaste.gif deleted file mode 100644 index aefd481..0000000 Binary files a/texi/xface/kleinpaste.gif and /dev/null differ diff --git a/texi/xface/kleinpaste.png b/texi/xface/kleinpaste.png new file mode 100644 index 0000000..e25e698 Binary files /dev/null and b/texi/xface/kleinpaste.png differ diff --git a/texi/xface/kyle.gif b/texi/xface/kyle.gif deleted file mode 100644 index 3626af8..0000000 Binary files a/texi/xface/kyle.gif and /dev/null differ diff --git a/texi/xface/kyle.png b/texi/xface/kyle.png new file mode 100644 index 0000000..7354ebc Binary files /dev/null and b/texi/xface/kyle.png differ diff --git a/texi/xface/love.gif b/texi/xface/love.gif deleted file mode 100644 index 5fc7681..0000000 Binary files a/texi/xface/love.gif and /dev/null differ diff --git a/texi/xface/love.png b/texi/xface/love.png new file mode 100644 index 0000000..cc28c3b Binary files /dev/null and b/texi/xface/love.png differ diff --git a/texi/xface/moll.gif b/texi/xface/moll.gif deleted file mode 100644 index 6092c60..0000000 Binary files a/texi/xface/moll.gif and /dev/null differ diff --git a/texi/xface/moll.png b/texi/xface/moll.png new file mode 100644 index 0000000..b50e97f Binary files /dev/null and b/texi/xface/moll.png differ diff --git a/texi/xface/niksic.gif b/texi/xface/niksic.gif deleted file mode 100644 index a73c884..0000000 Binary files a/texi/xface/niksic.gif and /dev/null differ diff --git a/texi/xface/niksic.png b/texi/xface/niksic.png new file mode 100644 index 0000000..9e3839a Binary files /dev/null and b/texi/xface/niksic.png differ diff --git a/texi/xface/olsen.gif b/texi/xface/olsen.gif deleted file mode 100644 index a7d489d..0000000 Binary files a/texi/xface/olsen.gif and /dev/null differ diff --git a/texi/xface/olsen.png b/texi/xface/olsen.png new file mode 100644 index 0000000..45df40e Binary files /dev/null and b/texi/xface/olsen.png differ diff --git a/texi/xface/patch.gif b/texi/xface/patch.gif deleted file mode 100644 index 4fc6bdc..0000000 Binary files a/texi/xface/patch.gif and /dev/null differ diff --git a/texi/xface/patch.png b/texi/xface/patch.png new file mode 100644 index 0000000..33af321 Binary files /dev/null and b/texi/xface/patch.png differ diff --git a/texi/xface/petersen.gif b/texi/xface/petersen.gif deleted file mode 100644 index d0c7e2e..0000000 Binary files a/texi/xface/petersen.gif and /dev/null differ diff --git a/texi/xface/petersen.png b/texi/xface/petersen.png new file mode 100644 index 0000000..2a83017 Binary files /dev/null and b/texi/xface/petersen.png differ diff --git a/texi/xface/pjf.gif b/texi/xface/pjf.gif deleted file mode 100644 index 1fac6a5..0000000 Binary files a/texi/xface/pjf.gif and /dev/null differ diff --git a/texi/xface/pjf.png b/texi/xface/pjf.png new file mode 100644 index 0000000..e3d7f09 Binary files /dev/null and b/texi/xface/pjf.png differ diff --git a/texi/xface/riocreux.gif b/texi/xface/riocreux.gif deleted file mode 100644 index 9c8eacf..0000000 Binary files a/texi/xface/riocreux.gif and /dev/null differ diff --git a/texi/xface/riocreux.png b/texi/xface/riocreux.png new file mode 100644 index 0000000..fa4c915 Binary files /dev/null and b/texi/xface/riocreux.png differ diff --git a/texi/xface/schauer.gif b/texi/xface/schauer.gif deleted file mode 100644 index c412e36..0000000 Binary files a/texi/xface/schauer.gif and /dev/null differ diff --git a/texi/xface/schauer.png b/texi/xface/schauer.png new file mode 100644 index 0000000..a776767 Binary files /dev/null and b/texi/xface/schauer.png differ diff --git a/texi/xface/simmonmt.gif b/texi/xface/simmonmt.gif deleted file mode 100644 index e17fcf7..0000000 Binary files a/texi/xface/simmonmt.gif and /dev/null differ diff --git a/texi/xface/simmonmt.png b/texi/xface/simmonmt.png new file mode 100644 index 0000000..b3df919 Binary files /dev/null and b/texi/xface/simmonmt.png differ diff --git a/texi/xface/simmons.gif b/texi/xface/simmons.gif deleted file mode 100644 index 2d77394..0000000 Binary files a/texi/xface/simmons.gif and /dev/null differ diff --git a/texi/xface/simmons.png b/texi/xface/simmons.png new file mode 100644 index 0000000..39e52fd Binary files /dev/null and b/texi/xface/simmons.png differ diff --git a/texi/xface/siu.gif b/texi/xface/siu.gif deleted file mode 100644 index 3df1792..0000000 Binary files a/texi/xface/siu.gif and /dev/null differ diff --git a/texi/xface/siu.png b/texi/xface/siu.png new file mode 100644 index 0000000..d140e31 Binary files /dev/null and b/texi/xface/siu.png differ diff --git a/texi/xface/smb.gif b/texi/xface/smb.gif deleted file mode 100644 index e3c11bc..0000000 Binary files a/texi/xface/smb.gif and /dev/null differ diff --git a/texi/xface/smb.png b/texi/xface/smb.png new file mode 100644 index 0000000..e890698 Binary files /dev/null and b/texi/xface/smb.png differ diff --git a/texi/xface/sobek.gif b/texi/xface/sobek.gif deleted file mode 100644 index 748f83a..0000000 Binary files a/texi/xface/sobek.gif and /dev/null differ diff --git a/texi/xface/sobek.png b/texi/xface/sobek.png new file mode 100644 index 0000000..3c838ef Binary files /dev/null and b/texi/xface/sobek.png differ diff --git a/texi/xface/thomas.gif b/texi/xface/thomas.gif deleted file mode 100644 index f66cc84..0000000 Binary files a/texi/xface/thomas.gif and /dev/null differ diff --git a/texi/xface/thomas.png b/texi/xface/thomas.png new file mode 100644 index 0000000..0c42c8f Binary files /dev/null and b/texi/xface/thomas.png differ diff --git a/texi/xface/valdis.gif b/texi/xface/valdis.gif deleted file mode 100644 index 8b55499..0000000 Binary files a/texi/xface/valdis.gif and /dev/null differ diff --git a/texi/xface/valdis.png b/texi/xface/valdis.png new file mode 100644 index 0000000..715d08d Binary files /dev/null and b/texi/xface/valdis.png differ diff --git a/texi/xface/verna1.gif b/texi/xface/verna1.gif deleted file mode 100644 index 17199d7..0000000 Binary files a/texi/xface/verna1.gif and /dev/null differ diff --git a/texi/xface/verna1.png b/texi/xface/verna1.png new file mode 100644 index 0000000..d84f149 Binary files /dev/null and b/texi/xface/verna1.png differ diff --git a/texi/xface/verna2.gif b/texi/xface/verna2.gif deleted file mode 100644 index b4c1ec0..0000000 Binary files a/texi/xface/verna2.gif and /dev/null differ diff --git a/texi/xface/verna2.png b/texi/xface/verna2.png new file mode 100644 index 0000000..fc2f5e5 Binary files /dev/null and b/texi/xface/verna2.png differ diff --git a/texi/xface/yamaoka.gif b/texi/xface/yamaoka.gif deleted file mode 100644 index 2968cfc..0000000 Binary files a/texi/xface/yamaoka.gif and /dev/null differ diff --git a/texi/xface/yamaoka.png b/texi/xface/yamaoka.png new file mode 100644 index 0000000..f406744 Binary files /dev/null and b/texi/xface/yamaoka.png differ