Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
31f47fba
Commit
31f47fba
authored
Nov 11, 2012
by
Paul Eggert
Browse files
* texinfo.tex: Merge from gnulib.
parent
12cc4337
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
32 additions
and
9 deletions
+32
-9
doc/misc/ChangeLog
doc/misc/ChangeLog
+4
-0
doc/misc/texinfo.tex
doc/misc/texinfo.tex
+28
-9
No files found.
doc/misc/ChangeLog
View file @
31f47fba
2012-11-12 Paul Eggert <eggert@cs.ucla.edu>
* texinfo.tex: Merge from gnulib.
2012-11-10 Chong Yidong <cyd@gnu.org>
* url.texi (Introduction): Move url-configuration-directory to
...
...
doc/misc/texinfo.tex
View file @
31f47fba
...
...
@@ -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
.1
6
}
\def\texinfoversion
{
2012-
11-08
.1
1
}
%
% 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 @verbatim...@end verbatim and @verb{<char>...<char>}
% If we want to allow any <char> as delimiter,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment