lilypond-1.4.0

diff --git a/CHANGES b/CHANGES
index 712cfb3ae9591d11eac477f244c76f96833d4f63..4bb2139b087e99bd5d22bbcd7170dd167d345db5 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,29 @@
-1.3.153.hwn1
+1.3.154.hwn1
 ============
 
+* RedHat .spec tweaks.
+
+* Bugfix: ly2dvi -o directory/ foo now works.
+
+1.3.153.lec1
+============
+
+* abc2ly fixes:
+  - names in multi-voice music also don't have numbers in them.
+  - No longer using staff_margin_engraver
+
+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
@@ -18,7 +41,7 @@ dvips are stored in outdir.
 * PO updates.
 
 * petite-ouverture-a-danser.ly bugfix, twinkle.ly bugfix
-
+V
 1.3.153
 =======
 

diff --git a/buildscripts/lilypond-login.sh b/buildscripts/lilypond-login.sh
index b22b28146dd2d47a86c34dd685d8a7efc6c963f0..ec2dac64dfd6670dd44b05650ad3da6b62b87ec7 100644 (file)
--- a/buildscripts/lilypond-login.sh
+++ b/buildscripts/lilypond-login.sh
@@ -10,7 +10,7 @@ set datadir="@datadir@"
 setenv GS_FONTPATH "$datadir/afm:@datadir@/pfa:$GS_FONTPATH"
 setenv GS_LIB "$datadir/ps:$GS_LIB"
 
-setenv LILYPONDPREFIX "$datadir"
+# setenv LILYPONDPREFIX "$datadir"
 
 # bit silly. for ly2dvi, overrules compiled-in datadir...
 # setenv LILYPONDPREFIX "@datadir@"

diff --git a/buildscripts/lilypond-profile.sh b/buildscripts/lilypond-profile.sh
index bde5816bdd9cc66d0756397793868932657f4aae..880b6a5d2cb34c6fa3d189a047c495983b853dd7 100644 (file)
--- a/buildscripts/lilypond-profile.sh
+++ b/buildscripts/lilypond-profile.sh
@@ -27,9 +27,11 @@ 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
+# LILYPONDPREFIX="$datadir"
+# export 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..26823c489fa756805da86550272496a041898c84 100644 (file)
--- a/scripts/ly2dvi.py
+++ b/scripts/ly2dvi.py
@@ -135,7 +135,8 @@ if program_version == '@' + 'TOPLEVEL_VERSION' + '@':
 
 
 original_dir = os.getcwd ()
-temp_dir = '%s.dir' % program_name
+temp_dir = os.path.join (original_dir,  '%s.dir' % program_name)
+
 keep_temp_dir_p = 0
 verbose_p = 0
 
@@ -282,7 +283,7 @@ def setup_temp ():
                os.mkdir (temp_dir, 0777)
        except OSError:
                pass
-       
+
        return temp_dir
 
 
@@ -297,6 +298,8 @@ def system (cmd, ignore_error = 0):
         if ( os.name != 'posix' ):
                cmd = re.sub (r'''\\''', r'''\\\\\\''', cmd)
                cmd = "sh -c \'%s\'" % cmd
+
+               
        if verbose_p:
                progress (_ ("Invoking `%s\'") % cmd)
        st = os.system (cmd)
@@ -463,7 +466,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 +524,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 +564,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}'
@@ -720,8 +731,15 @@ if files and files[0] != '-':
 
        files = map (lambda x: strip_extension (x, '.ly'), files)
 
+       (outdir, outbase) = ('','')
        if not output_name:
-               output_name = os.path.basename (files[0])
+               outbase = os.path.basename (files[0])
+               outdir = abspath('.')
+       elif output_name[-1] == os.sep:
+               outdir = abspath (output_name)
+               outbase = os.path.basename (files[0])
+       else:
+               (outdir, outbase) = os.path.split (abspath (output_name))
 
        for i in ('.dvi', '.latex', '.ly', '.ps', '.tex'):
                output_name = strip_extension (output_name, i)
@@ -734,8 +752,6 @@ if files and files[0] != '-':
                dep_prefix = 0
 
        reldir = os.path.dirname (output_name)
-       
-       (outdir, outbase) = os.path.split (abspath (output_name))
        if outdir != '.' and (track_dependencies_p or targets.keys ()):
                mkdir_p (outdir, 0777)
 

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