texinfo/doc texinfo.tex,1.32,1.33

[karl]

Update of /cvsroot/texinfo/texinfo/doc
In directory sheep:/tmp/cvs-serv15234

Modified Files:
        texinfo.tex 
Log Message:
More hyphenation exceptions.
(\author, \quotation): implement @author inside
@quotation, for attribution purposes.


Index: texinfo.tex
===================================================================
RCS file: /cvsroot/texinfo/texinfo/doc/texinfo.tex,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** texinfo.tex 15 Feb 2004 17:33:40 -0000      1.32
--- texinfo.tex 19 Feb 2004 17:07:46 -0000      1.33
***************
*** 4,8 ****
  \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
  %
! \def\texinfoversion{2004-02-15.09}
  %
  % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
--- 4,8 ----
  \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
  %
! \def\texinfoversion{2004-02-19.09}
  %
  % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
***************
*** 176,184 ****
  % Hyphenation fixes.
  \hyphenation{
!   Flor-i-da Ghost-script Ghost-view Mac-OS Ra-dha-krish-nan
!   ap-pen-dix bit-map data-base data-bases eshell fall-ing half-way
!   long-est mini-buf-fer mini-buf-fers over-view par-a-digm
!   rec-tan-gu-lar ro-bot-ics se-vere-ly set-up spa-ces strong-est
!   time-stamp which-ever white-space wide-spread wrap-around
  }
  
--- 176,185 ----
  % Hyphenation fixes.
  \hyphenation{
!   Flor-i-da Ghost-script Ghost-view Mac-OS ap-pen-dix bit-map bit-maps
!   data-base data-bases eshell fall-ing half-way long-est man-u-script
!   man-u-scripts mini-buf-fer mini-buf-fers over-view par-a-digm
!   par-a-digms rec-tan-gu-lar ro-bot-ics se-vere-ly set-up spa-ces
!   stand-alone strong-est time-stamp time-stamps which-ever white-space
!   wide-spread wrap-around
  }
  
***************
*** 2036,2044 ****
  
  % @author should come last, but may come many times.
  \parseargdef\author{%
    \def\temp{\quotation}%
    \ifx\thisenv\temp
!     This edition of the manual is dedicated to Karl Berry who should
!     really make affiliations work.
    \else
      \checkenv\titlepage
--- 2037,2046 ----
  
  % @author should come last, but may come many times.
+ % It can also be used inside @quotation.
+ % 
  \parseargdef\author{%
    \def\temp{\quotation}%
    \ifx\thisenv\temp
!     \def\quotationauthor{#1}% printed in \Equotation.
    \else
      \checkenv\titlepage
***************
*** 4834,4838 ****
  
  % @quotation does normal linebreaking (hence we can't use \nonfillstart)
! % and narrows the margins.
  %
  \envdef\quotation{%
--- 4836,4842 ----
  
  % @quotation does normal linebreaking (hence we can't use \nonfillstart)
! % and narrows the margins.  We keep \parskip nonzero in general, since
! % we're doing normal filling.  So, when using \aboveenvbreak and
! % \afterenvbreak, temporarily make \parskip 0.
  %
  \envdef\quotation{%
***************
*** 4851,4856 ****
  
  % We have retained a nonzero parskip for the environment, since we're
! % doing normal filling. So to avoid extra space below the environment...
! \def\Equotation{\parskip = 0pt \afterenvbreak}
  
  % If we're given an argument, typeset it in bold with a colon after.
--- 4855,4868 ----
  
  % We have retained a nonzero parskip for the environment, since we're
! % doing normal filling.
! % 
! \def\Equotation{%
!   \par
!   \ifx\quotationauthor\undefined\else
!     % indent a bit.
!     \leftline{\kern 2\leftskip \sl ---\quotationauthor}%
!   \fi
!   {\parskip=0pt \afterenvbreak}%
! }
  
  % If we're given an argument, typeset it in bold with a colon after.
***************
*** 5301,5313 ****
  }
  
! % Print arguments in slanted typewriter, prevent hyphenation at `-' chars.
  % 
  \def\defunargs#1{%
!   % use sl by default (not ttsl), inconsistently with using tt for the
!   % name.  This is because literal text is sometimes needed in the
!   % argument list (groff manual), and ttsl and tt are not very
!   % distinguishable.
    % tt for the names.
    \df \sl \hyphenchar\font=0
    % On the other hand, if an argument has two dashes (for instance), we
    % want a way to get ttsl.  Let's try @var for that.
--- 5313,5326 ----
  }
  
! % Print arguments in slanted roman (not ttsl), inconsistently with using
! % tt for the name.  This is because literal text is sometimes needed in
! % the argument list (groff manual), and ttsl and tt are not very
! % distinguishable.  Prevent hyphenation at `-' chars.
  % 
  \def\defunargs#1{%
!   % use sl by default (not ttsl), 
    % tt for the names.
    \df \sl \hyphenchar\font=0
+   %
    % On the other hand, if an argument has two dashes (for instance), we
    % want a way to get ttsl.  Let's try @var for that.