patch::: 1.3.75.mb1

1.3.75.mb1
==========

* stepmake/stepmake/metapost-rules.make: Put all generated files
  in mf/out/.

* Added paper variable interscoreline to determine the score line
  spacing, see input/test/vertical-extent.ly.
  Cleaned up the lilyponddefs.tex inclusion scheme.

diff --git a/CHANGES b/CHANGES
index 0360536b99eb07cd18846d0b58ef47f53bc1930f..1f4dbacfa51dba6c52556cd023a4cba32fe6590f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,13 @@
+1.3.75.mb1
+==========
+
+* stepmake/stepmake/metapost-rules.make: Put all generated files
+  in mf/out/.
+
+* Added paper variable interscoreline to determine the score line
+  spacing, see input/test/vertical-extent.ly.
+  Cleaned up the lilyponddefs.tex inclusion scheme.
+
 1.3.75
 ======
 

diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely
index d385fd0cdc1c14a844ba88a4040277b83ca13b79..2ca219cde254eb44b68dabdfa7cb1fffea63d7c8 100644 (file)
--- a/Documentation/user/refman.itely
+++ b/Documentation/user/refman.itely
@@ -2480,6 +2480,13 @@ Nevertheless, here are some variables you may want to use or change:
     Sets the width of the lines.  If set to -1.0, a single
     unjustified line is produced.
 
+  @item @code{textheight}@indexcode{textheight}  
+    Sets the total height of the music on each page. Only used by
+    ly2dvi.
+
+  @item @code{interscoreline}@indexcode{interscoreline}  
+    Sets the spacing between the score lines. Defaults to 16 pt.
+
   @item @code{output}@indexcode{output}  
     Specifies an alternate name for the the output @file{s}.
     A @file{.tex}, @file{.midi} or @file{.ps} extension will be 

diff --git a/VERSION b/VERSION
index d4f243d7e1aaef13c5e4eb0f983ec494c4c77868..c72cdd40ea96ad744019223636831dcb0bb45be4 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=75
-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/input/test/vertical-extent.ly b/input/test/vertical-extent.ly
index b944b43fe2e47453f93f6fb3c53c208b9598f5c0..b8cf58ed87a6683ee81a231440612bae267035b3 100644 (file)
--- a/input/test/vertical-extent.ly
+++ b/input/test/vertical-extent.ly
@@ -1,7 +1,20 @@
 
 \score {
-\notes \context Staff {
-  \property Staff.StaffVerticalExtent = #'(-15.0 . 15.0)
-  c1 \break c1 
-}
+  \notes  <
+    \context Staff = upper {
+      \property Staff.StaffVerticalExtent = #'(-15.0 . 0.0)
+      \clef alto;
+      c1 \break c1 
+    }
+    \context Staff = lower {
+      \property Staff.StaffVerticalExtent = #'(-0.0 . 15.0)
+      \clef alto;
+      g1 \break g1 
+    }
+  >
+  \paper{
+    interscoreline = 3.0\mm;
+    \translator{\ScoreContext \remove "Bar_number_engraver";}
+    \translator{\StaffContext StaffMinimumVerticalExtent = #'(-2.0 . 2.0)}
+  }
 }

diff --git a/scripts/ly2dvi.py b/scripts/ly2dvi.py
index e5484a52dd89edf422593b66ff4dbf8daa0cd462..0147f1da292b511fa51ae8cdcce67a24ec6eed91 100644 (file)
--- a/scripts/ly2dvi.py
+++ b/scripts/ly2dvi.py
@@ -264,7 +264,6 @@ class TeXOutput:
 %%\headsep0pt
 %% Maybe this is too drastic, but let us give it a try.
 \geometry{width=%spt, textheight=%spt,headheight=2mm,headsep=0pt,footskip=2mm} 
-\input{lilyponddefs}
 \input{titledefs}
 %s
 \makeatletter

diff --git a/stepmake/stepmake/metapost-rules.make b/stepmake/stepmake/metapost-rules.make
index fa6e37233a75481d7996aa3f6436d9c09df2b8a4..34bd4f4b0306da46380d1f69fe60f8d4c2c60f20 100644 (file)
--- a/stepmake/stepmake/metapost-rules.make
+++ b/stepmake/stepmake/metapost-rules.make
@@ -1,12 +1,12 @@
 
 # Don't remove $(outdir)/.log's.  Logs are a target!
 
-$(outdir)/%.0: %.mf mfplain.mem  
-       -$(METAPOST) "&mfplain \mode=lowres; \mag=1.0; nonstopmode; input $<"
+$(outdir)/%.0: %.mf $(outdir)/mfplain.mem  
+       -$(METAPOST) "&$(outdir)/mfplain \mode=lowres; \mag=1.0; nonstopmode; input $<"
 
 mfplain.mem: $(MFPLAIN_MP)
        $(INIMETAPOST)  $(INIMETAPOST_FLAGS) $(MFPLAIN_MP) dump
-
+       mv mfplain.* $(outdir)
 
 $(outdir)/%.pfa: $(outdir)/%.0
        $(PYTHON) $(depth)/buildscripts/ps-to-pfa.py --output $(basename $<).pfa $<

diff --git a/tex/lilyponddefs.tex b/tex/lilyponddefs.tex
index 3a67da91836d9eb87c9ba9d02d920e10954b2c7c..f6bca234e4b9dc038fe6ce0f5bf344da892f6847 100644 (file)
--- a/tex/lilyponddefs.tex
+++ b/tex/lilyponddefs.tex
@@ -34,7 +34,11 @@
 \def\myfilbreak{\par\vfil\penalty200\vfilneg}
 
 % stacked horizontal lines
-\def\interscoreline{\vskip 16pt\myfilbreak}
+\ifundefined{mudelapaperinterscoreline}
+        \def\interscoreline{\vskip 16pt\myfilbreak}
+\else
+        \def\interscoreline{\vskip\mudelapaperinterscoreline pt\myfilbreak}
+\fi
 \def\placebox#1#2#3{%
         \botalign{\hbox{\raise #1\leftalign{\kern #2{}#3}}}}%
 

diff --git a/tex/titledefs.tex b/tex/titledefs.tex
index 6d0477533b070c177441a62c5b13b801931a5deb..b6c9c7570bbd5bace73f3dbd4ce4fcbc6f4d0579 100644 (file)
--- a/tex/titledefs.tex
+++ b/tex/titledefs.tex
@@ -4,9 +4,6 @@
 %
 % Version 0.1
 %
-\input lilyponddefs
-\def\EndLilyPondOutput{\endinput}
-%
 \def\thetitle{}
 \def\thesubtitle{}
 \def\thecomposer{}