From: Han-Wen Nienhuys Date: Tue, 23 Sep 2003 21:55:07 +0000 (+0000) Subject: (process_acknowledged_grobs): X-Git-Tag: release/1.9.10~1 X-Git-Url: https://git.donarmstrong.com/lilypond.git?a=commitdiff_plain;h=2bc57b3209e89d4beb3b669757c7f24193014a0b;p=lilypond.git (process_acknowledged_grobs): set note head as cause of note-column. --- diff --git a/ChangeLog b/ChangeLog index d1a2c3c864..7340db9c6a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,18 @@ +2003-09-23 Han-Wen Nienhuys + + * lily/rhythmic-column-engraver.cc (process_acknowledged_grobs): + set note head as cause of note-column. + 2003-09-23 Jan Nieuwenhuizen * Documentation/topdocs/INSTALL.texi: Update emacs mode. 2003-09-23 Han-Wen Nienhuys + * mf/GNUmakefile (pfa_warning): instruct + + * stepmake/aclocal.m4: typo. + * Documentation/user/cheatsheet.itely: more verbose examples. * input/regression/clefs.ly: remove bogus docstring. diff --git a/Documentation/topdocs/NEWS.texi b/Documentation/topdocs/NEWS.texi index bae8da8d13..be8ab195b0 100644 --- a/Documentation/topdocs/NEWS.texi +++ b/Documentation/topdocs/NEWS.texi @@ -10,8 +10,7 @@ @itemize @item -@c dotted or dashed? -Crescendos can now be drawn dotted or stippled. +Crescendos can now be drawn dotted or dashed. @item Quarter tones are now supported. They are entered by suffixing @@ -81,11 +80,11 @@ we see two versions of a piece of music, one for the full score, and one with cue notes for the instrumental part: @example -< \tag #'part < +<< \tag #'part << @{ c4 f2 g4 @} % in the part, we have cue-notes - \\ R1 > + \\ R1 >> \tag #'score R1 % in the score: only a rest -> +>> @end example The same can be applied to articulations, texts, etc.: they are diff --git a/Documentation/user/preface.itely b/Documentation/user/preface.itely index 91b7c6bc22..6e5647a982 100644 --- a/Documentation/user/preface.itely +++ b/Documentation/user/preface.itely @@ -27,7 +27,8 @@ typography features for coming versions, Due to other personal circumstances, Jan was not able to do more than packaging for Cygwin. The good news is that we now have a nearly -fool-proof installation for Windows. He will be back in 2.1. +fool-proof installation for Windows. He will be back for serious +hacking in 2.1. Han-Wen and Jan diff --git a/THANKS b/THANKS index 6cdc412042..04754f44af 100644 --- a/THANKS +++ b/THANKS @@ -9,6 +9,7 @@ Jan Nieuwenhuizen CONTRIBUTORS +Mats Bengtsson Heikki Junes Juergen Reuter diff --git a/configure.in b/configure.in index 74559b2711..e960c1ade9 100644 --- a/configure.in +++ b/configure.in @@ -62,7 +62,8 @@ STEPMAKE_GUILE(OPTIONAL) # perl for help2man. STEPMAKE_PERL(OPTIONAL) # mftrace for generating pfa's, pfb's -STEPMAKE_PROGS(MFTRACE, mftrace, REQUIRED, 1.0.17) +STEPMAKE_PROGS(MFTRACE, mftrace, OPTIONAL, 1.0.17) + # new makeinfo for multi-page website docs STEPMAKE_PROGS(MAKEINFO, makeinfo, OPTIONAL, 4.6) diff --git a/lily/rhythmic-column-engraver.cc b/lily/rhythmic-column-engraver.cc index 8246749c06..998717c663 100644 --- a/lily/rhythmic-column-engraver.cc +++ b/lily/rhythmic-column-engraver.cc @@ -85,24 +85,20 @@ Rhythmic_column_engraver::process_acknowledged_grobs () if (!note_column_) { note_column_ = new Item (get_property ("NoteColumn")); - announce_grob(note_column_, SCM_EOL); + announce_grob(note_column_, rheads_[0]->self_scm ()); + spacing_ = new Item (get_property ("NoteSpacing")); + spacing_->set_grob_property ("left-items", gh_cons (note_column_->self_scm (), SCM_EOL)); - spacing_ = new Item (get_property ("NoteSpacing")); - spacing_->set_grob_property ("left-items", gh_cons (note_column_->self_scm (), SCM_EOL)); - /* - Should insert a cause. Collision warnings go into the void. - - */ - announce_grob(spacing_, SCM_EOL); + announce_grob (spacing_, SCM_EOL); - if (last_spacing_) - { - Pointer_group_interface::add_grob (last_spacing_, - ly_symbol2scm ("right-items" ), - note_column_); - } + if (last_spacing_) + { + Pointer_group_interface::add_grob (last_spacing_, + ly_symbol2scm ("right-items" ), + note_column_); + } } diff --git a/lily/translator-group.cc b/lily/translator-group.cc index ac4e97eb2a..74f86d0e41 100644 --- a/lily/translator-group.cc +++ b/lily/translator-group.cc @@ -341,6 +341,10 @@ Translator_group::execute_pushpop_property (SCM prop, SCM eltprop, SCM val) { SCM prev = internal_get_property (prop); + /* + TODO: should have scm_equal_something () for reverting + autobeam properties. + */ SCM newprops= SCM_EOL ; while (gh_pair_p (prev) && ly_caar (prev) != eltprop) { diff --git a/mf/GNUmakefile b/mf/GNUmakefile index df8e190139..18b22ad08e 100644 --- a/mf/GNUmakefile +++ b/mf/GNUmakefile @@ -69,7 +69,25 @@ INSTALLATION_OUT_FILES5=$(outdir)/lilypond.map export MFINPUTS:=.:$(MFINPUTS) -default: $(ALL_GEN_FILES) +default: pfa_warning $(ALL_GEN_FILES) + + +pfa_warning: +ifneq ($(basename $(MFTRACE)),mftrace) + @echo "" + @echo "ERROR: mftrace not found" + @echo "" + @echo "For obtaining PFA fonts, either install mftrace " + @echo "(see http://www.xs4all.nl/~hanwen/mftrace/ )," + @echo "or try one of the following commands in this directory: " + @echo "" + @echo " make get-pfa " + @echo " make get-rpm-pfa " + @echo " make get-deb-pfa " + @echo "" + @echo "These commands will try to download the files from the internet." + @false +endif debian-mirror=http://ftp.us.debian.org @@ -77,7 +95,7 @@ debian-package =lilypond_$(TOPLEVEL_VERSION)-1_i386.deb $(outdir)/$(debian-package): wget -P $(outdir) $(debian-mirror)/debian/pool/main/l/lilypond/$(debian-package) -get-debian-pfa: $(outdir)/$(debian-package) +get-deb-pfa: $(outdir)/$(debian-package) rm -rf $(outdir)/./usr ar p $< data.tar.gz | \ tar -C $(outdir) -zvxf - '*.pfa' @@ -97,6 +115,7 @@ get-rpm-pfa: $(outdir)/$(redhat-package) # change this dependency get-pfa: get-rpm-pfa + ## ## todo: this also depends on .tfm, FIXME. $(outdir)/%.afm $(outdir)/%.enc $(outdir)/%.tex $(outdir)/%.dep: $(outdir)/%.log $(outdir)/%.tfm diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4 index cfb197ce2e..f37985eba6 100644 --- a/stepmake/aclocal.m4 +++ b/stepmake/aclocal.m4 @@ -314,7 +314,7 @@ AC_DEFUN(STEPMAKE_END, [ if test -n "$OPTIONAL$REQUIRED$UNSUPPORTED"; then echo echo "See INSTALL.txt for more information on how to build $PACKAGE_NAME" - if [ -f config.cache ] ; then + if test -f config.cache ; then echo "Remove config.cache before rerunning ./configure" fi fi