*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 7b7efdb143429ab2a000e9fa2885e07c0e7a2934..0dcbb76c6d6fa6b0aca957cebe00ee59ba0208bc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2004-07-18  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+       * make/ly-vars.make (EXTRA_DIST_FILES): 
+
+       * Documentation/user/notation.itely (Slurs): document ^ and _ for
+       slurs.
+
+       * input/regression/slur-script.ly: new file.
+
        * lily/accidental-engraver.cc (process_acknowledged_grobs):
        make accidental appear to come from note head engraver.
 

diff --git a/Documentation/topdocs/NEWS.texi b/Documentation/topdocs/NEWS.texi
index a32e0884de70478bbc3f51fe1830db8519a9e9fa..218a487421b93057c477e24e6a93d1c7f75c23ff 100644 (file)
--- a/Documentation/topdocs/NEWS.texi
+++ b/Documentation/topdocs/NEWS.texi
@@ -11,7 +11,7 @@
 @item Slur formatting has been rewritten. The new slur code
 works similar to the Beam formatter: scores are assigned for all
 esthetic components of a slur. A large number of combinations for
-begin and end points is then tried out.  They will now also take into
+begin and end points is then tried out.  Slurs will now also take into
 account collisions with staff lines, scripts (like staccato and
 accent) and accidentals.
 

diff --git a/lily/include/new-slur.hh b/lily/include/new-slur.hh
new file mode 100644 (file)
index 0000000..f587ab7
--- /dev/null
+++ b/lily/include/new-slur.hh
@@ -0,0 +1,35 @@
+/* 
+  new-slur.hh -- declare New_slur
+  
+  source file of the GNU LilyPond music typesetter
+  
+  (c) 2004 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  
+*/
+
+#ifndef NEW_SLUR_HH
+#define NEW_SLUR_HH
+
+#include "lily-proto.hh"
+#include "lily-guile.hh"
+
+#define DEBUG_SLUR_QUANTING 1
+
+class New_slur
+{
+public:
+  static void add_column (Grob *me, Grob *col);
+  static void add_extra_encompass (Grob *me, Grob *col);
+  DECLARE_SCHEME_CALLBACK (print, (SCM));
+  DECLARE_SCHEME_CALLBACK (after_line_breaking, (SCM));
+  DECLARE_SCHEME_CALLBACK (height, (SCM,SCM));
+
+  static void set_interface (Grob *);
+  static bool  has_interface (Grob *);
+  static Bezier get_curve (Grob*me);
+};
+
+
+
+#endif /* NEW_SLUR_HH */
+

diff --git a/make/ly-vars.make b/make/ly-vars.make
index 7fe835f7ad946e306142a5ebdadb2a7eb0111376..eb5fca7d8ced3419981b05118f64fd13e4a71d78 100644 (file)
--- a/make/ly-vars.make
+++ b/make/ly-vars.make
@@ -14,6 +14,6 @@ LYINC_FILES := $(wildcard *.lyinc)
 
 TEXINFO_SOURCES += $(TELY_FILES) $(ITELY_FILES) $(ITEXI_FILES)
 
-EXTRA_DIST_FILES += $(TELY_FILES) $(LY_FILES) $(ITEXI_FILES) $(ITELY_FILES) $(LYINC_FILES)
+EXTRA_DIST_FILES +=$(TELY_FILES) $(LY_FILES) $(ITEXI_FILES) $(ITELY_FILES) $(LYINC_FILES)
 
 DVIPS_FLAGS= -u+ec-mftrace.map -u +lilypond.map  -Ppdf

diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index a592a8ab0d08cd772fcd7369a6b524c053ddbe71..a91e4276c735b9c2434848c144b499f72457a217 100644 (file)
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -401,7 +401,7 @@ class yy_flex_lexer: public yyFlexLexer
     fi
     AC_LANG_POP(C++)
 ])
-
+  
 
 AC_DEFUN(STEPMAKE_GCC, [
     if test "$GCC" = "yes"; then

diff --git a/stepmake/stepmake/generic-vars.make b/stepmake/stepmake/generic-vars.make
index f1e29c02d7bf4dafec7dbd441ea76afe27c52287..d228d5f9f2301f70b866a3b5bbfcd9b75ea48823 100644 (file)
--- a/stepmake/stepmake/generic-vars.make
+++ b/stepmake/stepmake/generic-vars.make
@@ -90,7 +90,7 @@ M4 = m4
 #replace to do stripping of certain objects
 STRIPDEBUG=true 
 
-DIST_FILES=$(EXTRA_DIST_FILES) GNUmakefile $(ALL_SOURCES)
+DIST_FILES=$(EXTRA_DIST_FILES) GNUmakefile $(ALL_SOURCES)  $(wildcard SConscript)
 DOCDIR=$(depth)/$(outdir)
 
 STRIP=strip --strip-debug