From: Phil Holmes <mail@philholmes.net>
Date: Thu, 18 Aug 2011 11:38:07 +0000 (+0100)
Subject: Fixes overlapping boxes in docs: issue 1813
X-Git-Tag: release/2.15.9-1~9^2~45
X-Git-Url: https://git.donarmstrong.com/?p=lilypond.git;a=commitdiff_plain;h=f9b28c30a3badc92aaacbb70c56e5114fc1d77ab

Fixes overlapping boxes in docs: issue 1813
---

diff --git a/tex/texinfo.tex b/tex/texinfo.tex
index 91408263bc..caab907e0e 100644
--- a/tex/texinfo.tex
+++ b/tex/texinfo.tex
@@ -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