From 5d7c09ae841d7d341603e320b810a9740200c8c1 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sun, 18 Jul 2004 23:27:17 +0000 Subject: [PATCH] release commit --- ChangeLog | 3 ++- make/ly-vars.make | 3 ++- scm/output-lib.scm | 10 ++++++++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index cc116317ba..d137c680b9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,7 +6,8 @@ 2004-07-18 Han-Wen Nienhuys - * make/ly-vars.make (EXTRA_DIST_FILES): + * stepmake/generic-vars.make (EXTRA_DIST_FILES): dist SConscript + files. * Documentation/user/notation.itely (Slurs): document ^ and _ for slurs. diff --git a/make/ly-vars.make b/make/ly-vars.make index eb5fca7d8c..4be6e91ab8 100644 --- a/make/ly-vars.make +++ b/make/ly-vars.make @@ -11,9 +11,10 @@ ITELY_FILES := $(wildcard *.itely) ITEXI_FILES := $(wildcard *.itexi) LY_FILES := $(wildcard *.ly) LYINC_FILES := $(wildcard *.lyinc) +ILY_FILES := $(wildcard *.ily) 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) $(ILY_FILES) DVIPS_FLAGS= -u+ec-mftrace.map -u +lilypond.map -Ppdf diff --git a/scm/output-lib.scm b/scm/output-lib.scm index 731c11df1b..ee90e06bd3 100644 --- a/scm/output-lib.scm +++ b/scm/output-lib.scm @@ -38,7 +38,13 @@ (else ""))) ) - (let* ((slur (Slur::print grob)) + (let* ( + (slur ; (Slur::print grob) + + ;; + ;; FIXME: a hammer is not a slur. + ;; + (ly:make-stencil '() '(0 . 0) '(0 . 0))) (paper (ly:grob-paper grob)) (text (interpret-markup paper @@ -54,7 +60,7 @@ (ly:stencil-align-to! text 0 1) ) - (ly:stencil-combine-at-edge slur 1 1 text -0.6) +; (ly:stencil-combine-at-edge slur 1 1 text -0.6) ) ) ) -- 2.39.2