From: Mats Bengtsson <mats.bengtsson@s3.kth.se>
Date: Tue, 7 Mar 2000 20:48:15 +0000 (+0100)
Subject: patch::: 1.3.30.mb1
X-Git-Tag: release/1.3.31~4
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=eb195c4f69ee8574c9e79574b028f183790b5bb0;p=lilypond.git

patch::: 1.3.30.mb1

1.3.30.mb1
=========

* Fixed the page layout, reintroducing space for the header and
  trying to keep piece titles on the same page as the piece.
  The header and footer can now contain several lines.
---

diff --git a/CHANGES b/CHANGES
index 4a180017c8..e8cdce201b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,9 @@
+1.3.30.mb1
+=========
+
+* Fixed the page layout, reintroducing space for the header and
+  trying to keep piece titles on the same page as the piece.
+  The header and footer can now contain several lines.
 
 1.3.29.hwn1
 ===========
diff --git a/VERSION b/VERSION
index 0a0af3f544..a1633f6851 100644
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=30
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=mb1
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.
diff --git a/scripts/ly2dvi.py b/scripts/ly2dvi.py
index a07fef4d7a..bfacbce464 100644
--- a/scripts/ly2dvi.py
+++ b/scripts/ly2dvi.py
@@ -263,15 +263,16 @@ class TeXOutput:
 %%\addtolength{\topmargin}{-1cm} 
 %%\setlength{\textwidth}{%s} 
 %%\setlength{\textheight}{%s} 
-\geometry{width=%spt, left=%spt, height=%spt, top=%spt, nohead} 
+\geometry{width=%spt, left=%spt, height=%spt, top=%spt} 
 \input lilyponddefs 
 \input titledefs 
 %s
 \makeatletter
-\renewcommand{\@oddhead}{\hfil{\small\theheader\quad\textbf{\thepage}}}%%
+\renewcommand{\@oddhead}{\parbox{\textwidth}%%
+    {\mbox{}\small\theheader\hfill\textbf{\thepage}}}%%
 %% UGR.
 %%\renewcommand{\@evenhead}{eve!{\small\mudelainstrument{,}\quad\textbf{\thepage}}\hfil}%%
-\renewcommand{\@oddfoot}{{\thefooter}\hfil}%%
+\renewcommand{\@oddfoot}{\parbox{\textwidth}{\mbox{}\thefooter}}%%
 \begin{document}
 """ % ( program_id(), Props.get('filename'), now, Props.get('papersize'),
         Props.get('language'), Props.get('pagenumber'), linewidth, textheight,
@@ -341,7 +342,7 @@ class TeXOutput:
         this.write(r"""
 %% \vfill\hfill{\mudelatagline}
 \makeatletter
-\renewcommand{\@oddfoot}{\hfil\mudelatagline}%
+\renewcommand{\@oddfoot}{\parbox{\textwidth}{\mbox{}\mudelatagline}}%%
 \makeatother
 \end{document}
 """)
diff --git a/tex/lilyponddefs.tex b/tex/lilyponddefs.tex
index b25930520d..3a67da9183 100644
--- a/tex/lilyponddefs.tex
+++ b/tex/lilyponddefs.tex
@@ -30,8 +30,11 @@
 
 \input feta20.tex
 
+% Attempt to keep lilypiecetitle together with the piece:
+\def\myfilbreak{\par\vfil\penalty200\vfilneg}
+
 % stacked horizontal lines
-\def\interscoreline{\vskip 16pt}
+\def\interscoreline{\vskip 16pt\myfilbreak}
 \def\placebox#1#2#3{%
         \botalign{\hbox{\raise #1\leftalign{\kern #2{}#3}}}}%
 
diff --git a/tex/titledefs.tex b/tex/titledefs.tex
index 70069f75c4..6d0477533b 100644
--- a/tex/titledefs.tex
+++ b/tex/titledefs.tex
@@ -76,9 +76,10 @@
 }
 \def\makelilypiecetitle
 {
-  \bigskip
+  \bigskip\myfilbreak
   {\flushright{\theopus}\par}
   {\flushleft{\large\normalfont\scshape\thepiece}\par}
+  \nopagebreak%
   \global\let\theopus\relax%
   \global\let\thepiece\relax%
 }