admin.texinfo, install.texinfo: Set edition to "b7-1"

user-guide.texinfo: Set edition to "b7-1".  Fix the hoffset and
	voffsets for the included man page poscript files so that the images
	are lined up correctly (at least using MIT's dvips).

Makefile (user-guide): Make sure the kpasswd man page's postscript is
	built.  Add new target "clean-temp-ps" which cleans up the temporary
	postscript files.

man2ps: Changes to make man2ps more portable.  Remove bash specific
	constructs, and replace with calls to expr.  Since the arguments to
	"troff" require groff, just try to run groff explicitly (someone can
	always edit the ROFF and ROFF_OPTIONS at the top of the script).  Try
	to automatically detect whether csplit or gcsplit should be used, by
	grovelling through the user's path.

texinfo.tex: Check in version of texinfo.tex that has Jeff's magic
	doubleleft arrow hack.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9055 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 4ee411f5dd99f812787366d0edfb39b00448a525..59f0d37eb37e97fae2f09ee3989f993733336758 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,27 @@
+Fri Sep  6 19:59:12 1996  Theodore Y. Ts'o  <tytso@mit.edu>
+
+       * admin.texinfo, install.texinfo: Set edition to "b7-1".
+
+       * user-guide.texinfo: Set edition to "b7-1".  Fix the hoffset and
+               voffsets for the included man page poscript files so that
+               the images are lined up correctly (at least using MIT's
+               dvips).
+
+       * Makefile (user-guide): Make sure the kpasswd man page's
+               postscript is built.  Add new target "clean-temp-ps" which
+               cleans up the temporary postscript files.
+
+       * man2ps: Changes to make man2ps more portable.  Remove bash
+               specific constructs, and replace with calls to expr.
+               Since the arguments to "troff" require groff, just try to
+               run groff explicitly (someone can always edit the ROFF and
+               ROFF_OPTIONS at the top of the script).  Try to
+               automatically detect whether csplit or gcsplit should be
+               used, by grovelling through the user's path.
+
+       * texinfo.tex: Check in version of texinfo.tex that has Jeff's 
+               magic doubleleft arrow hack.
+
 Fri Sep  6 12:59:43 1996  Jeff Bigler  <jcb@viola.cygnus.com>
        
        * install.texinfo: new name for cyg-install.texinfo

diff --git a/doc/Makefile b/doc/Makefile
index 78f1be9689ec18ec6d8384e3e0466479bb743991..191a4c7b36033bd6e4571750cc71df9692c20dd1 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -7,7 +7,8 @@ RM=rm -f
 TAR=tar -chvf
 GZIP=gzip -9
 MANPS=./man2ps
-all:: admin-guide-full install-guide-full user-guide-full
+
+all:: admin-guide-full install-guide-full user-guide-full clean-temp-ps
 
 admin-guide-full:: admin-guide admin-guide-info admin-guide-html
 
@@ -37,7 +38,7 @@ user-guide-full:: user-guide user-guide-info user-guide-html
 
 user-guide::
        $(DVI) user-guide.texinfo
-       $(MANPS) $(SRCDIR)/appl/gssftp/ftp/ftp.M $(SRCDIR)/clients/kdestroy/kdestroy.M $(SRCDIR)/clients/kinit/kinit.M $(SRCDIR)/clients/klist/klist.M $(SRCDIR)/clients/ksu/ksu.M $(SRCDIR)/appl/bsd/rcp.M $(SRCDIR)/appl/bsd/rlogin.M $(SRCDIR)/appl/bsd/rsh.M $(SRCDIR)/appl/telnet/telnet/telnet.1
+       $(MANPS) $(SRCDIR)/appl/gssftp/ftp/ftp.M $(SRCDIR)/clients/kdestroy/kdestroy.M $(SRCDIR)/clients/kinit/kinit.M $(SRCDIR)/clients/klist/klist.M $(SRCDIR)/clients/ksu/ksu.M $(SRCDIR)/appl/bsd/rcp.M $(SRCDIR)/appl/bsd/rlogin.M $(SRCDIR)/appl/bsd/rsh.M $(SRCDIR)/appl/telnet/telnet/telnet.1 $(SRCDIR)/kadmin/passwd/kpasswd.M
        $(DVIPS) user-guide
 
 user-guide-info::
@@ -62,6 +63,10 @@ clean-backup::
 clean-tarfiles::
        $(RM) *.tar *.tar.gz *.tgz
 
+clean-temp-ps::
+       $(RM) ftp?.ps kinit?.ps klist?.ps kdestroy?.ps ksu?.ps rlogin?.ps \
+               rcp?.ps rsh?.ps telnet?.ps kpasswd?.ps
+
 tgz::
        $(TAR) krb5-docs.tar admin.texinfo build.texinfo copyright.texinfo definitions.texinfo document-list.texinfo glossary.texinfo install.texinfo texinfo.tex user-guide.texinfo *-guide.ps *.info *.info-? *.html
        $(GZIP) krb5-docs.tar

diff --git a/doc/admin.texinfo b/doc/admin.texinfo
index 49d993b3d569aad8dad03eba398533fd3f3e9eec..801a2a75056eed440b96c70ce2cc87ed5b6c607f 100644 (file)
--- a/doc/admin.texinfo
+++ b/doc/admin.texinfo
@@ -15,7 +15,7 @@
 @end iftex
 
 @include definitions.texinfo
-@set EDITION b6-1
+@set EDITION b7-1
 
 @finalout                               @c don't print black warning boxes
 

diff --git a/doc/install.texinfo b/doc/install.texinfo
index a4e302b903d771e88bce635ae52a19640eabef99..edd6a937ccd82c7ea2b6183d0fd24ec4b48de731 100644 (file)
--- a/doc/install.texinfo
+++ b/doc/install.texinfo
@@ -17,7 +17,7 @@
 @end iftex
 
 @include definitions.texinfo
-@set EDITION b6-1
+@set EDITION b7-1
 
 @finalout                               @c don't print black warning boxes
 

diff --git a/doc/man2ps b/doc/man2ps
index a42260fc1ca72c28512404fdc325427ec83250a1..abeab6159972edcc95b9b2dbe3d766a050872325 100644 (file)
--- a/doc/man2ps
+++ b/doc/man2ps
@@ -2,6 +2,22 @@
 
 com=`basename $0`
 files=$*
+ROFF=groff
+ROFF_FLAGS="-C -man -Tps"
+CSPLIT=
+
+IFS="${IFS=    }"; save_ifs="$IFS"; IFS="${IFS}:"
+for i in $PATH; do
+  if [ -f $i/gcsplit ]; then
+       CSPLIT=$i/gcsplit
+       break
+  fi
+  if [ -f $i/csplit ]; then
+       CSPLIT=$i/csplit
+       break
+  fi
+done
+IFS="$save_ifs"
 
 if [ "$files" = "" ]; then
     echo "\aUsage: $com file [file2 ...]"
@@ -11,15 +27,15 @@ fi
 for file in $files
 do
     filename=`basename $file | awk -F. '{print $1}'`
-    troff -C -man -Tps $filename | grops -g > $filename.ps
+    eval $ROFF $ROFF_FLAGS $file > $filename.ps
 
     pages=`grep '%%Pages\:' $filename.ps | awk '{print $2}'`
-    pp=$(($pages - 1))
+    pp=`expr $pages - 1`
 
     echo $filename': '$pages' pages'
 
-    if [ -e csplit ]; then
-        csplit -k $filename.ps /Page:/ \{$pp\}
+    if [ "$CSPLIT"x != x ]; then
+        $CSPLIT -k $filename.ps /Page:/ \{$pp\}
 
         counter=0
 
@@ -34,7 +50,7 @@ do
                 echo 'end' >> $filename$counter.ps
                 echo '%%EOF' >> $filename$counter.ps
             fi
-            counter=$(($counter + 1))
+            counter=`expr $counter + 1`
         done
 
         rm $filename.ps $filename'0.ps' xx*

diff --git a/doc/texinfo.tex b/doc/texinfo.tex
index e544dc602a527484e8c7a3dea5af552d96c78ec2..991508d547ce662cdecfe413a4024cd447265369 100644 (file)
--- a/doc/texinfo.tex
+++ b/doc/texinfo.tex
@@ -2353,6 +2353,7 @@ July\or August\or September\or October\or November\or December\fi
 \let\rawbackslash=\relax%
 \let\frenchspacing=\relax%
 \def\result{\realbackslash result}
+\def\doubleleftarrow{\realbackslash doubleleftarrow}
 \def\equiv{\realbackslash equiv}
 \def\expansion{\realbackslash expansion}
 \def\print{\realbackslash print}
@@ -3011,6 +3012,7 @@ July\or August\or September\or October\or November\or December\fi
 \def\point{$\star$}
 
 \def\result{\leavevmode\raise.15ex\hbox to 1em{\hfil$\Rightarrow$\hfil}}
+\def\doubleleftarrow{\leavevmode\raise.15ex\hbox to 1em{\hfil$\Leftarrow$\hfil}}
 \def\expansion{\leavevmode\raise.1ex\hbox to 1em{\hfil$\mapsto$\hfil}}
 \def\print{\leavevmode\lower.1ex\hbox to 1em{\hfil$\dashv$\hfil}}
 

diff --git a/doc/user-guide.texinfo b/doc/user-guide.texinfo
index 614ea56d1ad4fb834c33c05c924a67f503685341..ca79c7567d819d38cd172491f16aaff6cb713266 100644 (file)
--- a/doc/user-guide.texinfo
+++ b/doc/user-guide.texinfo
@@ -14,7 +14,7 @@
 @end iftex
 
 @include definitions.texinfo
-@set EDITION b6-1
+@set EDITION b7-1
 
 @finalout                               @c don't print black warning boxes
 
@@ -1411,11 +1411,11 @@ M-x manual-entry @emph{command}
 @section kinit Reference
 
 @iftex
-@special{psfile=kinit1.ps voffset=-1115 hoffset=-40}
+@special{psfile=kinit1.ps voffset=-550 hoffset=-40}
 @centerline{Reference Manual for @code{kinit}}
 @page
 
-@special{psfile=kinit2.ps voffset=-1115 hoffset=-40}
+@special{psfile=kinit2.ps voffset=-550 hoffset=-40}
 @centerline{Reference Manual for @code{kinit}}
 @page
 @end iftex
@@ -1427,7 +1427,7 @@ Type @kbd{M-x manual-entry kinit} to read this manual page.
 @section klist Reference
 
 @iftex
-@special{psfile=klist1.ps voffset=-1115 hoffset=-40}
+@special{psfile=klist1.ps voffset=-550 hoffset=-40}
 @centerline{Reference Manual for @code{klist}}
 @page
 @end iftex
@@ -1451,7 +1451,7 @@ Type @kbd{M-x manual-entry kdestroy} to read this manual page.
 @section kpasswd Reference
 
 @iftex
-@special{psfile=kpasswd1.ps voffset=-1115 hoffset=-40}
+@special{psfile=kpasswd1.ps voffset=-550 hoffset=-40}
 @centerline{Reference Manual for @code{kpasswd}}
 @page
 @end iftex
@@ -1463,43 +1463,43 @@ Type @kbd{M-x manual-entry kpasswd} to read this manual page.
 @section telnet Reference
 
 @iftex
-@special{psfile=telnet1.ps voffset=-1115 hoffset=-40}
+@special{psfile=telnet1.ps voffset=-550 hoffset=-40}
 @centerline{Reference Manual for @code{telnet}}
 @page
 
-@special{psfile=telnet2.ps voffset=-1115 hoffset=-40}
+@special{psfile=telnet2.ps voffset=-550 hoffset=-40}
 @centerline{Reference Manual for @code{telnet}}
 @page
 
-@special{psfile=telnet3.ps voffset=-1115 hoffset=-40}
+@special{psfile=telnet3.ps voffset=-550 hoffset=-40}
 @centerline{Reference Manual for @code{telnet}}
 @page
 
-@special{psfile=telnet4.ps voffset=-1115 hoffset=-40}
+@special{psfile=telnet4.ps voffset=-550 hoffset=-40}
 @centerline{Reference Manual for @code{telnet}}
 @page
 
-@special{psfile=telnet5.ps voffset=-1115 hoffset=-40}
+@special{psfile=telnet5.ps voffset=-550 hoffset=-40}
 @centerline{Reference Manual for @code{telnet}}
 @page
 
-@special{psfile=telnet6.ps voffset=-1115 hoffset=-40}
+@special{psfile=telnet6.ps voffset=-550 hoffset=-40}
 @centerline{Reference Manual for @code{telnet}}
 @page
 
-@special{psfile=telnet7.ps voffset=-1115 hoffset=-40}
+@special{psfile=telnet7.ps voffset=-550 hoffset=-40}
 @centerline{Reference Manual for @code{telnet}}
 @page
 
-@special{psfile=telnet8.ps voffset=-1115 hoffset=-40}
+@special{psfile=telnet8.ps voffset=-550 hoffset=-40}
 @centerline{Reference Manual for @code{telnet}}
 @page
 
-@special{psfile=telnet9.ps voffset=-1115 hoffset=-40}
+@special{psfile=telnet9.ps voffset=-550 hoffset=-40}
 @centerline{Reference Manual for @code{telnet}}
 @page
 
-@special{psfile=telnet10.ps voffset=-1115 hoffset=-40}
+@special{psfile=telnet10.ps voffset=-550 hoffset=-40}
 @centerline{Reference Manual for @code{telnet}}
 @page
 @end iftex
@@ -1511,11 +1511,11 @@ Type @kbd{M-x manual-entry telnet} to read this manual page.
 @section rlogin Reference
 
 @iftex
-@special{psfile=rlogin1.ps voffset=-1115 hoffset=-40}
+@special{psfile=rlogin1.ps voffset=-550 hoffset=-40}
 @centerline{Reference Manual for @code{rlogin}}
 @page
 
-@special{psfile=rlogin2.ps voffset=-1115 hoffset=-40}
+@special{psfile=rlogin2.ps voffset=-550 hoffset=-40}
 @centerline{Reference Manual for @code{rlogin}}
 @page
 @end iftex
@@ -1527,35 +1527,35 @@ Type @kbd{M-x manual-entry rlogin} to read this manual page.
 @section FTP Reference
 
 @iftex
-@special{psfile=ftp1.ps voffset=-1115 hoffset=-40}
+@special{psfile=ftp1.ps voffset=-550 hoffset=-40}
 @centerline{Reference Manual for @code{FTP}}
 @page
 
-@special{psfile=ftp2.ps voffset=-1115 hoffset=-40}
+@special{psfile=ftp2.ps voffset=-550 hoffset=-40}
 @centerline{Reference Manual for @code{FTP}}
 @page
 
-@special{psfile=ftp3.ps voffset=-1115 hoffset=-40}
+@special{psfile=ftp3.ps voffset=-550 hoffset=-40}
 @centerline{Reference Manual for @code{FTP}}
 @page
 
-@special{psfile=ftp4.ps voffset=-1115 hoffset=-40}
+@special{psfile=ftp4.ps voffset=-550 hoffset=-40}
 @centerline{Reference Manual for @code{FTP}}
 @page
 
-@special{psfile=ftp5.ps voffset=-1115 hoffset=-40}
+@special{psfile=ftp5.ps voffset=-550 hoffset=-40}
 @centerline{Reference Manual for @code{FTP}}
 @page
 
-@special{psfile=ftp6.ps voffset=-1115 hoffset=-40}
+@special{psfile=ftp6.ps voffset=-550 hoffset=-40}
 @centerline{Reference Manual for @code{FTP}}
 @page
 
-@special{psfile=ftp7.ps voffset=-1115 hoffset=-40}
+@special{psfile=ftp7.ps voffset=-550 hoffset=-40}
 @centerline{Reference Manual for @code{FTP}}
 @page
 
-@special{psfile=ftp8.ps voffset=-1115 hoffset=-40}
+@special{psfile=ftp8.ps voffset=-550 hoffset=-40}
 @centerline{Reference Manual for @code{FTP}}
 @page
 @end iftex
@@ -1567,11 +1567,11 @@ Type @kbd{M-x manual-entry FTP} to read this manual page.
 @section rsh Reference
 
 @iftex
-@special{psfile=rsh1.ps voffset=-1115 hoffset=-40}
+@special{psfile=rsh1.ps voffset=-550 hoffset=-40}
 @centerline{Reference Manual for @code{rsh}}
 @page
 
-@special{psfile=rsh2.ps voffset=-1115 hoffset=-40}
+@special{psfile=rsh2.ps voffset=-550 hoffset=-40}
 @centerline{Reference Manual for @code{rsh}}
 @page
 @end iftex
@@ -1583,11 +1583,11 @@ Type @kbd{M-x manual-entry rsh} to read this manual page.
 @section rcp Reference
 
 @iftex
-@special{psfile=rcp1.ps voffset=-1115 hoffset=-40}
+@special{psfile=rcp1.ps voffset=-550 hoffset=-40}
 @centerline{Reference Manual for @code{rcp}}
 @page
 
-@special{psfile=rcp2.ps voffset=-1115 hoffset=-40}
+@special{psfile=rcp2.ps voffset=-550 hoffset=-40}
 @centerline{Reference Manual for @code{rcp}}
 @page
 @end iftex
@@ -1599,23 +1599,23 @@ Type @kbd{M-x manual-entry rcp} to read this manual page.
 @section ksu Reference
 
 @iftex
-@special{psfile=ksu1.ps voffset=-1115 hoffset=-40}
+@special{psfile=ksu1.ps voffset=-550 hoffset=-40}
 @centerline{Reference Manual for @code{ksu}}
 @page
 
-@special{psfile=ksu2.ps voffset=-1115 hoffset=-40}
+@special{psfile=ksu2.ps voffset=-550 hoffset=-40}
 @centerline{Reference Manual for @code{ksu}}
 @page
 
-@special{psfile=ksu3.ps voffset=-1115 hoffset=-40}
+@special{psfile=ksu3.ps voffset=-550 hoffset=-40}
 @centerline{Reference Manual for @code{ksu}}
 @page
 
-@special{psfile=ksu4.ps voffset=-1115 hoffset=-40}
+@special{psfile=ksu4.ps voffset=-550 hoffset=-40}
 @centerline{Reference Manual for @code{ksu}}
 @page
 
-@special{psfile=ksu5.ps voffset=-1115 hoffset=-40}
+@special{psfile=ksu5.ps voffset=-550 hoffset=-40}
 @centerline{Reference Manual for @code{ksu}}
 @page
 @end iftex