texinfo update (Fri Jul 1 02:52:02 EDT 2005)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/ChangeLog,v
retrieving revision 1.515
retrieving revision 1.516
diff -c -r1.515 -r1.516
*** ChangeLog   30 Jun 2005 15:19:17 -0000      1.515
--- ChangeLog   1 Jul 2005 06:26:47 -0000       1.516
***************
*** 1,3 ****
--- 1,9 ----
+ 2005-07-01  Stepan Kasal  <address@hidden>
+ 
+       * doc/texinfo.tex (\nonarrowing): Update the description.
+       (\cartouche): Set \nonarrowing to "t", not \comment.
+       (\nonfillstart, \quotation): Reset \nonarrowing.
+ 
  2005-06-30  Stepan Kasal  <address@hidden>
  
        * doc/texinfo.tex (\setupverbatim): Use \nonarrowing to declare that
Index: doc/texinfo.tex
===================================================================
RCS file: /cvsroot/texinfo/texinfo/doc/texinfo.tex,v
retrieving revision 1.191
retrieving revision 1.192
diff -c -r1.191 -r1.192
*** doc/texinfo.tex     30 Jun 2005 15:19:17 -0000      1.191
--- doc/texinfo.tex     1 Jul 2005 06:26:47 -0000       1.192
***************
*** 4934,4940 ****
  
  \let\afterenvbreak = \aboveenvbreak
  
! % \nonarrowing is a flag.  If "set", @lisp etc don't narrow margins.
  \let\nonarrowing=\relax
  
  % @cartouche ... @end cartouche: draw rectangle w/rounded corners around
--- 4934,4941 ----
  
  \let\afterenvbreak = \aboveenvbreak
  
! % \nonarrowing is a flag.  If "set", @lisp etc don't narrow margins; it will
! % also clear it, so that its embedded environments do the narrowing again.
  \let\nonarrowing=\relax
  
  % @cartouche ... @end cartouche: draw rectangle w/rounded corners around
***************
*** 4971,4977 ****
                                % each corner char, and rule thickness
    \normbskip=\baselineskip \normpskip=\parskip \normlskip=\lineskip
    % Flag to tell @lisp, etc., not to narrow margin.
!   \let\nonarrowing=\comment
    \vbox\bgroup
        \baselineskip=0pt\parskip=0pt\lineskip=0pt
        \carttop
--- 4972,4978 ----
                                % each corner char, and rule thickness
    \normbskip=\baselineskip \normpskip=\parskip \normlskip=\lineskip
    % Flag to tell @lisp, etc., not to narrow margin.
!   \let\nonarrowing = t%
    \vbox\bgroup
        \baselineskip=0pt\parskip=0pt\lineskip=0pt
        \carttop
***************
*** 5011,5021 ****
    \parskip = 0pt
    \parindent = 0pt
    \emergencystretch = 0pt % don't try to avoid overfull boxes
-   % @cartouche defines \nonarrowing to inhibit narrowing
-   % at next level down.
    \ifx\nonarrowing\relax
      \advance \leftskip by \lispnarrowing
      \exdentamount=\lispnarrowing
    \fi
    \let\exdent=\nofillexdent
  }
--- 5012,5022 ----
    \parskip = 0pt
    \parindent = 0pt
    \emergencystretch = 0pt % don't try to avoid overfull boxes
    \ifx\nonarrowing\relax
      \advance \leftskip by \lispnarrowing
      \exdentamount=\lispnarrowing
+   \else
+     \let\nonarrowing = \relax
    \fi
    \let\exdent=\nofillexdent
  }
***************
*** 5115,5120 ****
--- 5116,5122 ----
      \advance\leftskip by \lispnarrowing
      \advance\rightskip by \lispnarrowing
      \exdentamount = \lispnarrowing
+   \else
      \let\nonarrowing = \relax
    \fi
    \parsearg\quotationlabel
P ChangeLog
P doc/texinfo.tex