release commit

diff --git a/ChangeLog b/ChangeLog
index cc116317ba2d8f1c2c07e44cb613f038642aab7c..d137c680b9873ab3ff5907b161c551b6d09369dc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,7 +6,8 @@
 
 2004-07-18  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
-       * 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 eb5fca7d8ced3419981b05118f64fd13e4a71d78..4be6e91ab89447a14567c5b4302df146e16fa86f 100644 (file)
--- 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 731c11df1b42ad64173ca4e9127eb06c423aae7d..ee90e06bd3631e8e2619e73a26e1a9f6df371c76 100644 (file)
--- 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)
       ) ) )