Merge branch 'master' into lilypond/translation

[lilypond.git] / tex / texinfo.tex

diff --git a/tex/texinfo.tex b/tex/texinfo.tex
index 91408263bc9c8ab0ad735c0974872d2f1cf58dc0..23e896c8726b4261089e8dfc25893defb591c4a5 100644 (file)
--- a/tex/texinfo.tex
+++ b/tex/texinfo.tex
@@ -5046,7 +5046,7 @@ end
 \chardef\maxseclevel = 3
 %
 % A numbered section within an unnumbered changes to unnumbered too.
-% To achive this, remember the "biggest" unnum. sec. we are currently in:
+% To achieve this, remember the "biggest" unnum. sec. we are currently in:
 \chardef\unmlevel = \maxseclevel
 %
 % Trace whether the current chapter is an appendix or not:
@@ -6051,6 +6051,12 @@ end
   \normbskip=\baselineskip \normpskip=\parskip \normlskip=\lineskip
   % Flag to tell @lisp, etc., not to narrow margin.
   \let\nonarrowing = t%
+  %
+  % If this cartouche directly follows a sectioning command, we need the
+  % \parskip glue (backspaced over by default) or the cartouche can
+  % collide with the section heading.
+  \ifnum\lastpenalty>10000 \vskip\parskip \fi
+  %
   \vbox\bgroup
       \baselineskip=0pt\parskip=0pt\lineskip=0pt
       \carttop