* Documentation/topdocs/INSTALL.texi (Top): update versions.

* lily/note-collision.cc (get_clash_groups): only consider when
Note_column::dir <> CENTER. Backportme.

* scripts/lilypond-book.py (get_option_parser): init output_name
to ''. Backportme.

diff --git a/ChangeLog b/ChangeLog
index 65d6f2fae3d3a50cd467e647febdf08f52f23140..8c871723e340f7a191977ebfc6a4ec270a745f92 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-03-28  Han-Wen Nienhuys  <hanwen@lilypond.org>
+
+       * Documentation/topdocs/INSTALL.texi (Top): update versions.
+
+       * lily/note-collision.cc (get_clash_groups): only consider when
+       Note_column::dir <> CENTER. Backportme.
+
+       * scripts/lilypond-book.py (get_option_parser): init output_name
+       to ''. Backportme.
+
 2006-03-24  Graham Percival  <gpermus@gmail.com>
 
        * Documentation/topdocs/NEWS.tely: add @end itemize
@@ -12,6 +22,8 @@
 
 2006-03-23  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
+       * mf/GNUmakefile: don't install .enc files.
+
        * Documentation/topdocs/NEWS.tely: clear for 2.9 cycle.
 
        * VERSION (PATCH_LEVEL): bump to 2.9.0

diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi
index 3b1e0904abd464a6eef7678e2b83dc12c14dcd76..0e0d56893577186964b68a8ea7bac78133748ab5 100644 (file)
--- a/Documentation/topdocs/INSTALL.texi
+++ b/Documentation/topdocs/INSTALL.texi
@@ -70,7 +70,7 @@ FOO-devel, libFOO-dev or FOO-dev package too.
 
 @itemize
 
-@item @uref{http://fontforge.sf.net/,FontForge} 20050624 or newer.
+@item @uref{http://fontforge.sf.net/,FontForge} 20060125 or newer.
 
 @item New Century Schoolbook fonts, as PFB files. These are shipped
 with X11 and Ghostscript, and are named @file{c059033l.pfb}
@@ -83,17 +83,16 @@ You will need to install some additional packages to get mftrace to
 work.
 
 @item @uref{http://www.gnu.org/software/guile/guile.html,GUILE}
-(version 1.6.5 or newer).  If you are installing binary packages, you
+(version 1.6.7 or newer).  If you are installing binary packages, you
 may need to install guile-devel or guile-dev or libguile-dev too.
 
 @item @uref{ftp://ftp.gnu.org/gnu/texinfo/,Texinfo} (version 4.8 or newer).
 
 @item
- @uref{http://gcc.gnu.org/, The GNU c++ compiler} (version 3.3 or
-newer).  EGCS and 2.x are known to cause crashes.
+ @uref{http://gcc.gnu.org/, The GNU c++ compiler} (version 4.x or
+newer). 
 
-@item @uref{http://www.python.org,Python} (version 2.1 or newer except
-for Cygwin/Mingw where version 2.3 or newer is needed).
+@item @uref{http://www.python.org,Python} (version 2.3 or newer)
 
 @item @uref{ftp://ftp.gnu.org/gnu/make/,GNU Make} (version 3.78 or newer).
 

diff --git a/Documentation/topdocs/NEWS.tely b/Documentation/topdocs/NEWS.tely
index 0ec1083944e5d4120af3e2d6c612e131c2a0a38f..1eda748dbf5df9b567ac79c8d263798b24e620f6 100644 (file)
--- a/Documentation/topdocs/NEWS.tely
+++ b/Documentation/topdocs/NEWS.tely
@@ -68,6 +68,7 @@ which scares away people.
 
 @end ignore
 
+@end itemize
 
 @ifhtml
 For older news, go to

diff --git a/lily/note-collision.cc b/lily/note-collision.cc
index a3f18ab0026be756ee22c60280ea201afd0bd428..24a9a532cfdd28492e097cc4e1f5399ea087f539 100644 (file)
--- a/lily/note-collision.cc
+++ b/lily/note-collision.cc
@@ -354,7 +354,14 @@ Note_collision_interface::get_clash_groups (Grob *me)
     {
       Grob *se = elements[i];
       if (Note_column::has_interface (se))
-       clash_groups[Note_column::dir (se)].push_back (se);
+       {
+         if (!Note_column::dir (se))
+           {
+             se->programming_error ("note-column has no direction");
+           }
+         else
+           clash_groups[Note_column::dir (se)].push_back (se);
+       }
     }
 
   Direction d = UP;

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index c09f78335fab66fbfa6ec94e80613e9d16d5f069..ec3c6cae69a3658b5ec973a63de5717735a95a8f 100644 (file)
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -125,10 +125,6 @@ INSTALLATION_OUT_FILES4=$(SVG_FILES)
 INSTALLATION_OUT_DIR5=$(local_lilypond_datadir)/fonts/type1
 INSTALLATION_OUT_FILES5=$(PFA_FILES)
 
-INSTALLATION_OUT_DIR6=$(local_lilypond_datadir)/ps/
-INSTALLATION_OUT_FILES6=$(ENC_FILES)
-
-
 export MFINPUTS:=.:$(MFINPUTS)
 
 

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index ea1f768a02289424536005e0b853670b4ba82641..efe7e5c784cd1087b3453240445b8022bcb7ab3e 100644 (file)
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -158,7 +158,8 @@ def get_option_parser ():
        
        p.add_option ("-o", '--output', help=_('write output to DIR'),
                      metavar="DIR",
-                     action='store', dest='output_name', default=None)
+                     action='store', dest='output_name',
+                     default='')
        p.add_option ('-P', '--process', metavar=_("COMMAND"),
                      help = _ ("process ly_files using COMMAND FILE..."),
                      action='store',