[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r110870: * texinfo.tex: Merge from gn
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r110870: * texinfo.tex: Merge from gnulib. |
Date: |
Sun, 11 Nov 2012 19:10:51 -0800 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 110870
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sun 2012-11-11 19:10:51 -0800
message:
* texinfo.tex: Merge from gnulib.
modified:
doc/misc/ChangeLog
doc/misc/texinfo.tex
=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog 2012-11-10 23:13:33 +0000
+++ b/doc/misc/ChangeLog 2012-11-12 03:10:51 +0000
@@ -1,3 +1,7 @@
+2012-11-12 Paul Eggert <address@hidden>
+
+ * texinfo.tex: Merge from gnulib.
+
2012-11-10 Chong Yidong <address@hidden>
* url.texi (Introduction): Move url-configuration-directory to
=== modified file 'doc/misc/texinfo.tex'
--- a/doc/misc/texinfo.tex 2012-09-13 07:28:15 +0000
+++ b/doc/misc/texinfo.tex 2012-11-12 03:10:51 +0000
@@ -3,7 +3,7 @@
% Load plain if necessary, i.e., if running under initex.
\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,
% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -6559,16 +6559,9 @@
\makedispenvdef{quotation}{\quotationstart}
%
\def\quotationstart{%
- {\parskip=0pt \aboveenvbreak}% because \aboveenvbreak inserts \parskip
- \parindent=0pt
- %
- % @cartouche defines \nonarrowing to inhibit narrowing at next level down.
+ \indentedblockstart % same as \indentedblock, but increase right margin too.
\ifx\nonarrowing\relax
- \advance\leftskip by \lispnarrowing
\advance\rightskip by \lispnarrowing
- \exdentamount = \lispnarrowing
- \else
- \let\nonarrowing = \relax
\fi
\parsearg\quotationlabel
}
@@ -6594,6 +6587,32 @@
\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 @address@hidden verbatim and @verb{<char>...<char>}
% If we want to allow any <char> as delimiter,
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r110870: * texinfo.tex: Merge from gnulib.,
Paul Eggert <=