(EXTRA_DIST_FILES): Add SConstruct.

diff --git a/ChangeLog b/ChangeLog
index 0dcbb76c6d6fa6b0aca957cebe00ee59ba0208bc..d5e24b708163cb53635145a8d40d37e6cb1ede43 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-07-19  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * GNUmakefile.in (EXTRA_DIST_FILES): Add SConstruct.
+
 2004-07-18  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
        * make/ly-vars.make (EXTRA_DIST_FILES): 

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 7160e393a660bd0340954f536ae3488aee36501a..d4e8ae5ebe62b639d6bdf303e5be9b3fa9b6500d 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -23,8 +23,8 @@ README_FILES = ChangeLog  COPYING DEDICATION ROADMAP THANKS
 README_TXT_FILES = AUTHORS.txt README.txt INSTALL.txt NEWS.txt
 IN_FILES := $(wildcard *.in)
 PATCH_FILES = emacsclient.patch server.el.patch darwin.patch
-EXTRA_DIST_FILES = VERSION .cvsignore $(README_FILES) $(SCRIPTS) $(IN_FILES) \
-  $(PATCH_FILES) 
+EXTRA_DIST_FILES = VERSION .cvsignore SConstruct \
+  $(README_FILES) $(SCRIPTS) $(IN_FILES) $(PATCH_FILES)
 NON_ESSENTIAL_DIST_FILES = $(README_TXT_FILES)
 INSTALLATION_DIR=$(local_lilypond_datadir)
 INSTALLATION_FILES=$(config_make) VERSION

diff --git a/lily/slur-quanting.cc b/lily/slur-quanting.cc
index ba4c56b8e59710e319ce9dc91d3137e5e2b19e49..74b18ce611a459f3e9a1276f5130346ba47b80c3 100644 (file)
--- a/lily/slur-quanting.cc
+++ b/lily/slur-quanting.cc
@@ -73,7 +73,7 @@ struct Slur_score_parameters
   - better scoring.
   - short-cut: try a smaller region first.
   - collisions with accidentals
-  - collisions with scripts (staccato!)
+  - collisions with articulations (staccato, portato, sforzato, ...)
   - 
 */
 struct Encompass_info