Checking commercial fonts.

diff --git a/ChangeLog b/ChangeLog
index 33879a2..2e1fa78 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-09-27 09:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * aclocal.m4, configure.in: Check commercial fonts.
+
 2001-09-24 19:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * configure.in: Generate texi/ps/Makefile.

diff --git a/aclocal.m4 b/aclocal.m4
index 1c11603..62887f2 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -177,3 +177,100 @@ fi
    AC_SUBST(URL)
    AC_MSG_RESULT("${URL}")
 ])
+
+dnl
+dnl Perform checking commercial fonts: Adobe Bembo and Adobe Futura
+dnl
+AC_DEFUN(GNUS_CHECK_FONTS, [
+test "$LATEX" = t && LATEX=
+test "$LATEX" || AC_PATH_PROGS(LATEX, latex, no)
+AC_MSG_CHECKING(for commercial fonts)
+AC_ARG_WITH(fonts,[  --with-fonts            Use commercial fonts],[USE_FONTS="$withval"])
+if test -z "${WITH_FONTS}"; then
+  if test "${LATEX}" = no; then
+    WITH_FONTS_bembo='%'
+    WITHOUT_FONTS_bembo=
+    WITH_FONTS_pfu='%'
+    WITHOUT_FONTS_pfu=
+    WITH_FONTS_bcr='%'
+    WITHOUT_FONTS_bcr=
+  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='%'
+    else 
+      WITH_FONTS_bembo='%'
+      WITHOUT_FONTS_bembo=
+    fi
+    echo '\nonstopmode\documentclass{article}\begin{document}{\fontfamily{pfu}\fontsize{10pt}{10}\selectfont test}\end{document}' > ${OUTPUT}
+    if ${LATEX} ${OUTPUT} 2>& AC_FD_CC | grep 'Some font shapes were not available' >& AC_FD_CC 2>&1  ; then  
+      WITH_FONTS_pfu='%'
+      WITHOUT_FONTS_pfu=
+    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
+    echo '\nonstopmode\documentclass{article}\begin{document}{\fontfamily{bcr}\fontsize{10pt}{10}\selectfont test}\end{document}' > ${OUTPUT}
+    if ${LATEX} ${OUTPUT} 2>& AC_FD_CC | grep 'Some font shapes were not available' >& AC_FD_CC 2>&1  ; then  
+      WITH_FONTS_bcr='%'
+      WITHOUT_FONTS_bcr=
+    else
+      if test -z "${USE_FONTS}"; then
+       USE_FONTS="Adobe Futura"
+      else
+       USE_FONTS="${USE_FONTS}, Bitstream Courier"
+      fi
+      WITH_FONTS_bcr=
+      WITHOUT_FONTS_bcr='%'
+    fi
+    rm -f ${OUTPUT} ${OUTPUT}.aux ${OUTPUT}.log ${OUTPUT}.dvi
+  fi
+else
+  if test "${USE_FONTS}" = yes ; then
+    WITH_FONTS_bembo=
+    WITHOUT_FONTS_bembo='%'
+    WITH_FONTS_pfu=
+    WITHOUT_FONTS_pfu='%'
+    WITH_FONTS_bcr=
+    WITHOUT_FONTS_bcr='%'
+  else
+    WITH_FONTS_bembo='%'
+    WITHOUT_FONTS_bembo=
+    WITH_FONTS_pfu='%'
+    WITHOUT_FONTS_pfu=
+    WITH_FONTS_bcr='%'
+    WITHOUT_FONTS_bcr=
+  fi
+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)
+])

diff --git a/configure.in b/configure.in
index d302640..5368962 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -22,5 +22,6 @@ AC_PATH_LISPDIR
 AC_PATH_ETCDIR
 AC_CHECK_URL
 AC_CHECK_W3
+GNUS_CHECK_FONTS
 
-AC_OUTPUT(Makefile lisp/Makefile texi/Makefile etc/Makefile texi/ps/Makefile)
+AC_OUTPUT(Makefile etc/Makefile lisp/Makefile texi/Makefile texi/gnusconfig.tex texi/ps/Makefile)

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 2c31adf..af275ce 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,13 @@
+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.

diff --git a/texi/Makefile.in b/texi/Makefile.in
index 4a1a833..acbb1b3 100644 (file)
--- a/texi/Makefile.in
+++ b/texi/Makefile.in
@@ -12,7 +12,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@
@@ -74,7 +74,7 @@ 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: $(srcdir)/gnus.texi $(srcdir)/gnus-faq.texi texi2latex.elc gnusconfig.tex
        srcdir=$(srcdir) $(EMACSCOMP) -l ./texi2latex.elc -f latexi-translate
 
 .latexi.dvi-x:
@@ -201,6 +201,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/bembo.sty b/texi/bembo.sty
deleted file mode 100644 (file)
index e676c3e..0000000
--- a/texi/bembo.sty
+++ /dev/null
@@ -1,32 +0,0 @@
-% -----------------------------------------------------------------
-% Filename: bembo.sty ( Aldine 401 )
-% Created by: tex bbb
-% Created using fontinst v1.335
-% Created for [4allTeX postscript font setup]
-% Created on [1996/04/26]
-% Use phbfonti.sty file (in 4allTeX package)
-% Based on PSNFSS 2.4.1 and 3.x by S. Rahtz
-% Put this file in a TEXINPUT directory.
-% -----------------------------------------------------------------
-% Can be processed by LaTeX209 and LaTeX2e
-\def\fileversion{3q}
-\def\filedate{94/10/22}
-\def\docdate{94/10/22}
-\ifx\ProvidesPackage\undefined
-\immediate\write\sixt@@n{File: bembo.sty NFSS1 fontinst (PhB)}
-\ifx\selectfont\undefined
-\@latexerr{No NFSS1 detected...}\@eha\endinput\fi
-
-\ifx\declare@font\undefined\input{psnfss.sup}\fi
-\def\load@bbb{\postscript@fontdef{Aldine 401 }{bbb}%
-  {bbbr}{bbbri}{bbbb}{bbbbi}{bbbrc}{bbbro}}
-\late@extra@def{bbb}{}{}
-\load@bbb
-\else
-\immediate\write\sixt@@n{File: bembo.sty LaTeX2e fontinst (PhB)}
-\ProvidesPackage{bembo}[\filedate\space\fileversion\space
- LaTeX2e fontinst (PhB)]\fi
-
-\def\rmdefault{bbb}
-\def\switchfont{}
-\endinput

diff --git a/texi/gnus.texi b/texi/gnus.texi
index 9c1d4d9..8c90023 100644 (file)
--- 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}'}

diff --git a/texi/gnusconfig.tex.in b/texi/gnusconfig.tex.in
new file mode 100644 (file)
index 0000000..6bbfaf4
--- /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/pagestyle.sty b/texi/pagestyle.sty
index ffd4529..d434821 100644 (file)
--- 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/postamble.tex b/texi/postamble.tex
index 6e6d243..f4f6bf3 100644 (file)
--- 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{}