From 6b06e1bfac338d5ae9fce023f80c49f1e213e70c Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sun, 18 Jul 2004 22:08:06 +0000 Subject: [PATCH] *** empty log message *** --- ChangeLog | 7 ++++++ Documentation/topdocs/NEWS.texi | 2 +- lily/include/new-slur.hh | 35 +++++++++++++++++++++++++++++ make/ly-vars.make | 2 +- stepmake/aclocal.m4 | 2 +- stepmake/stepmake/generic-vars.make | 2 +- 6 files changed, 46 insertions(+), 4 deletions(-) create mode 100644 lily/include/new-slur.hh diff --git a/ChangeLog b/ChangeLog index 7b7efdb143..0dcbb76c6d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2004-07-18 Han-Wen Nienhuys + * 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 a32e0884de..218a487421 100644 --- 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 index 0000000000..f587ab7d2b --- /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 + +*/ + +#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 7fe835f7ad..eb5fca7d8c 100644 --- 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 a592a8ab0d..a91e4276c7 100644 --- 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 f1e29c02d7..d228d5f9f2 100644 --- 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 -- 2.39.5