patch::: 1.3.154.jcn1

1.3.154.jcn1

diff --git a/CHANGES b/CHANGES
index 712cfb3ae9591d11eac477f244c76f96833d4f63..34e8f6be1dafe4a69107af83dbe38f5721c384ae 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,15 @@
-1.3.153.hwn1
+1.3.154.jcn1
 ============
 
+* Don't set LILYPONDPREFIX in login scripts.
+
+* Bugfixes ly2dvi: footer placements and headsep (Mark Hindley).
+
+* Small tweak for braces look.
+
+1.3.154
+=======
+
 * More brace bugfixes. 
 
 * Revert: simplified TFM and PK logic in ly_init_kpath (). Find feta

diff --git a/VERSION b/VERSION
index cdf1553b9dee9870d6851ee38fce1a4617f0b527..5f2294a9f9bd1504c92d8739969587b199ac3bbc 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=154
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=jcn1
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/buildscripts/lilypond-login.sh b/buildscripts/lilypond-login.sh
index b22b28146dd2d47a86c34dd685d8a7efc6c963f0..2bd2c005bb3243b74f8f6d0aa1fd0ab0dbb687d7 100755 (executable)
--- a/buildscripts/lilypond-login.sh
+++ b/buildscripts/lilypond-login.sh
@@ -10,10 +10,8 @@ set datadir="@datadir@"
 setenv GS_FONTPATH "$datadir/afm:@datadir@/pfa:$GS_FONTPATH"
 setenv GS_LIB "$datadir/ps:$GS_LIB"
 
-setenv LILYPONDPREFIX "$datadir"
-
 # bit silly. for ly2dvi, overrules compiled-in datadir...
-# setenv LILYPONDPREFIX "@datadir@"
+# setenv LILYPONDPREFIX "$datadir"
 
 # include an empty path component for the system wide includes.
 if ($?MFINPUTS) then

diff --git a/buildscripts/lilypond-profile.sh b/buildscripts/lilypond-profile.sh
index bde5816bdd9cc66d0756397793868932657f4aae..576a30b9fe4b26c3e8d318aa753fa1876b943012 100755 (executable)
--- a/buildscripts/lilypond-profile.sh
+++ b/buildscripts/lilypond-profile.sh
@@ -27,9 +27,8 @@ GS_LIB="$datadir/ps"
 MFINPUTS="$datadir/mf:"${MFINPUTS:=":"}
 TEXINPUTS="$datadir/tex:$datadir/ps:"${TEXINPUTS:=":"}
 TFMFONTS="$datadir/tfm:"${TFMFONTS:=":"}
-LILYPONDPREFIX="$datadir"
 
-export MFINPUTS TEXINPUTS TFMFONTS GS_LIB GS_FONTPATH LILYPONDPREFIX
+export MFINPUTS TEXINPUTS TFMFONTS GS_LIB GS_FONTPATH
 
        
 

diff --git a/mf/feta-beugel.mf b/mf/feta-beugel.mf
index 608ecd5b4ff0bb4b033e71f4d315d8d7fc93ef5a..94218544ca856d03618b84cc982f6c823d5acd5a 100644 (file)
--- a/mf/feta-beugel.mf
+++ b/mf/feta-beugel.mf
@@ -49,7 +49,6 @@ enddef;
 
 
 
-% l is the increment.
 save stafflinethickness;
 save increment;
 
@@ -71,12 +70,12 @@ for i := 0 step 1 until font_count:
     y := min (y + increment, infinity/hppp - 1);
 
     % x should be about one staff space, taking brace to have
-    % default height of 3 staffs, this yields height / 3 / 4
+    % default height of 3 staffs, this yields height / 3 / 4 = 12
+    % but 15 looks better
     x := y / 15;
-    % l should be about one stafflinethickness
 
     increment := x / 10;
-    stafflinethickness :=  min (0.5pt#, y/120 );
+    stafflinethickness :=  min (0.5pt#, y/150);
     if i = font_count:
       draw_brace (y, x, stafflinethickness);
     fi

diff --git a/scripts/ly2dvi.py b/scripts/ly2dvi.py
index 017088970d16a6c151b45cf933c78c4a2241787a..9fbb072fef7a7f52a1760cce679670c4790a9a86 100644 (file)
--- a/scripts/ly2dvi.py
+++ b/scripts/ly2dvi.py
@@ -463,7 +463,7 @@ def one_latex_definition (defn, first):
        else:
                s = s + '\\def\\mustmakelilypondpiecetitle{}\n'
                
-       s = s + '\\input %s' % defn[0]
+       s = s + '\\input %s\n' % defn[0] # The final \n seems important here. It ensures that the footers and taglines end up on the right page.
        return s
 
 
@@ -521,7 +521,7 @@ lily output file in TFILES after that, and return the Latex file constructed.  '
                linewidth = '597'
        else:
                linewidth = maxlw
-       s = s + '\geometry{width=%spt%s,headheight=2mm,headsep=0pt,footskip=2mm,%s}\n' % (linewidth, textheight, orientation)
+       s = s + '\geometry{width=%spt%s,headheight=2mm,footskip=2mm,%s}\n' % (linewidth, textheight, orientation)
 
        if extra['latexoptions']:
                s = s + '\geometry{twosideshift=4mm}\n'
@@ -561,7 +561,15 @@ lily output file in TFILES after that, and return the Latex file constructed.  '
 %% this again. -- jcn
 % the \mbox{} helps latex if people do stupid things in tagline
 \makeatletter
-\renewcommand{\@oddfoot}{\parbox{\textwidth}{\mbox{}\makelilypondtagline}}%
+\if@twoside
+  \ifodd\thepage
+   \renewcommand{\@oddfoot}{\parbox{\textwidth}{\mbox{}\makelilypondtagline}}%
+  \else
+   \renewcommand{\@evenfoot}{\parbox{\textwidth}{\mbox{}\makelilypondtagline}}%
+  \fi
+ \else
+  \renewcommand{\@thefoot}{\parbox{\textwidth}{\mbox{}\makelilypondtagline}}%
+\fi
 \makeatother
 '''
        s = s + '\\end{document}'

diff --git a/scripts/update-lily.py b/scripts/update-lily.py
index 38f65981f2b34277b4557bcef8882c11cb7edee8..3f3a4f1c9f4def05263f1b27508c67a14ebc67fe 100644 (file)
--- a/scripts/update-lily.py
+++ b/scripts/update-lily.py
@@ -74,6 +74,8 @@ ln -s %n-%v %n
 url = 'file:/home/ftp/pub/gnu/LilyPond/development/lilypond-*.tar.gz'
 url = 'ftp://appel.lilypond.org/pub/gnu/LilyPond/development/lilypond-*.tar.gz'
 url = 'ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/development/lilypond-*.tar.gz'
+#arg
+url = 'ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/v1.3/lilypond-*.tar.gz'
 
 remove_previous_p = 0