lilypond-0.0.66

diff --git a/Documentation/gnu-music.pod b/Documentation/gnu-music.pod
index 994dadac54fe2773bee0362da56b703a39dab53d..f0fe5fc7e5db2db6e93fb9209f31ef3955b4867e 100644 (file)
--- a/Documentation/gnu-music.pod
+++ b/Documentation/gnu-music.pod
@@ -6,7 +6,7 @@ GNU Music project - manifesto
 
 Random ranting about the GNU Music project
 
-=head GOAL
+=head1 GOAL
 
 Provide the users with free software for:
 

diff --git a/NEWS b/NEWS
index a77e57c09e4731f042bc365c44930123d4b9dfd2..cc0f07c3159f89286af350d16f69c68582e7dadd 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,16 @@
+pl 66
+       - make_website --jpeg, --png and --gif
+       - win32 -> windows32
+       - bf: Score_elem::TeXstring assert fail
+       - bf: headswap with stemdown
+       - bf: broken tie
+       - bf: broken slur
+       - bf: accidental dims
+       - bf: measure bar width
+       
+
+******
+may 26
 pl 65
        - bf pathfind /root/file
        - massive Score_elem rewrite:

diff --git a/lily/slur.cc b/lily/slur.cc
index 9b6d75caf10793ce464b7998181fc3c82c33fd94..57f6ab649f43a9cc2203a591fe0de6e59d112afc 100644 (file)
--- a/lily/slur.cc
+++ b/lily/slur.cc
@@ -79,20 +79,29 @@ Slur::do_substitute_dependency(Score_elem*o, Score_elem*n)
 }
 
 
+static int 
+Note_column_compare(Note_column *const&n1 , Note_column* const&n2)
+{
+    return n1->pcol_l_->rank_i() - n2->pcol_l_->rank_i();
+}
+
 void
 Slur::do_post_processing()
 {
+    encompass_arr_.sort(Note_column_compare);
     if (!dir_i_)
        set_default_dir();
     Real inter_f = paper()->internote_f();
-    if (encompass_arr_[0]->stem_l_)
+    
+    if (encompass_arr_[0]->stem_l_) 
         left_pos_i_ = rint(encompass_arr_[0]->stem_l_->height()[dir_i_]/inter_f);
-    else
-        left_pos_i_ = 0;
+    else 
+        left_pos_i_ = rint ( encompass_arr_[0]->head_positions_interval()[dir_i_]);
+    
     if (encompass_arr_.top()->stem_l_)
         right_pos_i_ = rint(encompass_arr_.top()->stem_l_->height()[dir_i_]/inter_f);
-    else
-        right_pos_i_ = 0;
+    else 
+        right_pos_i_ = rint (encompass_arr_.top()->head_positions_interval()[dir_i_]);
 
     left_pos_i_ += dir_i_;
     right_pos_i_ += dir_i_;

diff --git a/make/lilypond.lsm b/make/lilypond.lsm
index 1bb08d53a4d66779ea2ab97c10da94cc0803cc40..4450e5f0fc7bdb5223271b881df63eaec1370adf 100644 (file)
--- a/make/lilypond.lsm
+++ b/make/lilypond.lsm
@@ -2,8 +2,8 @@
 
 Begin3
 Title: LilyPond
-Version: 0.0.65
-Entered-date: 05/23/97
+Version: 0.0.66
+Entered-date: 05/28/97
 Description: LilyPond is a program which converts a music-script (mudela) into
 TeX output, or MIDI to produce multi-staff scores. Features include multiple
 meters, clefs, keys, lyrics, versatile input-language, cadenzas
@@ -13,7 +13,7 @@ Author: hanwen@stack.nl (Han-Wen Nienhuys)
        jan@digicash.com (Jan Nieuwenhuizen)
 Maintained-by: hanwen@stack.nl (Han-Wen Nienhuys)
 Primary-site: pcnov095.win.tue.nl /pub/lilypond/  
-       300k lilypond-0.0.65.tar.gz
+       300k lilypond-0.0.66.tar.gz
 Alternate-site: 
 Original-site: 
 Platform: unix/win32, GNU C++

diff --git a/make/lilypond.spec b/make/lilypond.spec
index 5c296f9cb8d720a265de571144c5bf23e47be78e..6b06b219e6cb5bea6d554eeeb76d3bc29550f720 100644 (file)
--- a/make/lilypond.spec
+++ b/make/lilypond.spec
@@ -1,9 +1,9 @@
 Name: lilypond
-Version: 0.0.65
+Version: 0.0.66
 Release: 1
 Copyright: GPL
 Group: Applications/Publishing
-Source0: pcnov095.win.tue.nl:/pub/lilypond/lilypond-0.0.65.tar.gz
+Source0: pcnov095.win.tue.nl:/pub/lilypond/lilypond-0.0.66.tar.gz
 Summary: A preprocessor to make TeX typeset music.
 URL: http://www.stack.nl/~hanwen/lilypond
 Packager: Han-Wen Nienhuys <hanwen@stack.nl>