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 4a180017c8a686702cb5e16a7597104fc5fe8d56..e8cdce201b8b22f61da402a6186e716497214d87 100644 (file)
--- 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 0a0af3f544b349603f5afb960cbe2c8f3cded09f..a1633f68514398a3285fb94416a542286c84ff36 100644 (file)
--- 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 a07fef4d7a6a434eea9c69302b1375a8e512b6b3..bfacbce46464c6bf1696d257c22118f4440abe7d 100644 (file)
--- 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 b25930520d8b5bb54d4f55278ea8c7b5bf32a24f..3a67da91836d9eb87c9ba9d02d920e10954b2c7c 100644 (file)
--- 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 70069f75c49f2594f7b0b9e58ac94b849cbc025e..6d0477533b070c177441a62c5b13b801931a5deb 100644 (file)
--- 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%
 }