(allfiles): look for .ly rather

than .ly.txt.

diff --git a/ChangeLog b/ChangeLog
index 1076287bea4b939e25df71c44637b95ed2654b07..fd75a16554f9cdcee7b70ca9211baf3ad00a359d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-08-22  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
+       * buildscripts/mutopia-index.py (allfiles): look for .ly rather
+       than .ly.txt.
+
        * scm/page.scm (make-page-stencil): don't rely on extents of
        page-stencil. This fixes spurious space around .EPS files produced
        with the EPS backend.

diff --git a/buildscripts/mutopia-index.py b/buildscripts/mutopia-index.py
index 82f5bf007fb4709cd6c07aabf6caef1dcb53dba6..4908f0a9d8d4b73af8df11c906732253db4042c4 100644 (file)
--- a/buildscripts/mutopia-index.py
+++ b/buildscripts/mutopia-index.py
@@ -196,7 +196,7 @@ if not dirs:
 allfiles = []
 
 for d in dirs:
-    allfiles = allfiles + find ('*.ly.txt', d)
+    allfiles = allfiles + find ('*.ly', d)
 
 gen_list (allfiles, outfile)
 

diff --git a/lily/stencil.cc b/lily/stencil.cc
index dd3bb2626ea93f5559672a062c1a6769dc3726f0..294894d5f196a45e5e07e059d33e8bf0957a93e6 100644 (file)
--- a/lily/stencil.cc
+++ b/lily/stencil.cc
@@ -201,7 +201,6 @@ Stencil::moved_to_edge (Axis a, Direction d, Stencil const &s,
     {
       programming_error ("Stencil::moved_to_edge: adding empty stencil.");
       his_extent = 0.0;
-      //      SCM_ASSERT_TYPE (0, s.expr (), SCM_ARG1, __FUNCTION__, "non-empty stencil");
     }
   else
     his_extent = i[-d];