2005-06-30  Stepan Kasal  <address@hidden>

	* doc/texinfo.tex (\nonarrowing): Now a tri-state flag.
	(\nonfillstart, \quotation): Respect it.

Index: doc/texinfo.tex
===================================================================
RCS file: /cvsroot/texinfo/texinfo/doc/texinfo.tex,v
retrieving revision 1.191
diff -u -r1.191 texinfo.tex
--- doc/texinfo.tex	30 Jun 2005 15:19:17 -0000	1.191
+++ doc/texinfo.tex	30 Jun 2005 15:47:41 -0000
@@ -4935,6 +4935,9 @@
 \let\afterenvbreak = \aboveenvbreak
 
 % \nonarrowing is a flag.  If "set", @lisp etc don't narrow margins.
+% If it's set to "p", it'll remain set for all embedded environments,
+% if set to "t", the next environment will clear it, so that its
+% subenvironments are again allowed to do their narrowing.
 \let\nonarrowing=\relax
 
 % @cartouche ... @end cartouche: draw rectangle w/rounded corners around
@@ -4971,7 +4974,7 @@
 				% each corner char, and rule thickness
   \normbskip=\baselineskip \normpskip=\parskip \normlskip=\lineskip
   % Flag to tell @lisp, etc., not to narrow margin.
-  \let\nonarrowing=\comment
+  \let\nonarrowing=p%
   \vbox\bgroup
       \baselineskip=0pt\parskip=0pt\lineskip=0pt
       \carttop
@@ -5011,11 +5014,13 @@
   \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
+  \else
+    \if t\nonarowing
+      \let\nonarrowing = \relax
+    \fi
   \fi
   \let\exdent=\nofillexdent
 }
@@ -5115,7 +5120,7 @@
     \advance\leftskip by \lispnarrowing
     \advance\rightskip by \lispnarrowing
     \exdentamount = \lispnarrowing
-    \let\nonarrowing = \relax
+    % \nonarrowing cannot be t, so there is no need to reset it.
   \fi
   \parsearg\quotationlabel
 }