Commit 31f47fba authored by Paul Eggert's avatar Paul Eggert
Browse files

* texinfo.tex: Merge from gnulib.

parent 12cc4337
2012-11-12 Paul Eggert <eggert@cs.ucla.edu>
* texinfo.tex: Merge from gnulib.
2012-11-10 Chong Yidong <cyd@gnu.org> 2012-11-10 Chong Yidong <cyd@gnu.org>
* url.texi (Introduction): Move url-configuration-directory to * url.texi (Introduction): Move url-configuration-directory to
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
% Load plain if necessary, i.e., if running under initex. % Load plain if necessary, i.e., if running under initex.
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
% %
\def\texinfoversion{2012-09-12.16} \def\texinfoversion{2012-11-08.11}
% %
% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
...@@ -6559,16 +6559,9 @@ ...@@ -6559,16 +6559,9 @@
\makedispenvdef{quotation}{\quotationstart} \makedispenvdef{quotation}{\quotationstart}
% %
\def\quotationstart{% \def\quotationstart{%
{\parskip=0pt \aboveenvbreak}% because \aboveenvbreak inserts \parskip \indentedblockstart % same as \indentedblock, but increase right margin too.
\parindent=0pt
%
% @cartouche defines \nonarrowing to inhibit narrowing at next level down.
\ifx\nonarrowing\relax \ifx\nonarrowing\relax
\advance\leftskip by \lispnarrowing
\advance\rightskip by \lispnarrowing \advance\rightskip by \lispnarrowing
\exdentamount = \lispnarrowing
\else
\let\nonarrowing = \relax
\fi \fi
\parsearg\quotationlabel \parsearg\quotationlabel
} }
...@@ -6594,6 +6587,32 @@ ...@@ -6594,6 +6587,32 @@
\fi \fi
} }
% @indentedblock is like @quotation, but indents only on the left and
% has no optional argument.
%
\makedispenvdef{indentedblock}{\indentedblockstart}
%
\def\indentedblockstart{%
{\parskip=0pt \aboveenvbreak}% because \aboveenvbreak inserts \parskip
\parindent=0pt
%
% @cartouche defines \nonarrowing to inhibit narrowing at next level down.
\ifx\nonarrowing\relax
\advance\leftskip by \lispnarrowing
\exdentamount = \lispnarrowing
\else
\let\nonarrowing = \relax
\fi
}
% Keep a nonzero parskip for the environment, since we're doing normal filling.
%
\def\Eindentedblock{%
\par
{\parskip=0pt \afterenvbreak}%
}
\def\Esmallindentedblock{\Eindentedblock}
% LaTeX-like @verbatim...@end verbatim and @verb{<char>...<char>} % LaTeX-like @verbatim...@end verbatim and @verb{<char>...<char>}
% If we want to allow any <char> as delimiter, % If we want to allow any <char> as delimiter,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment