From f3c52f850f2ecdb585628df6d322826b0223d5d3 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sun, 2 May 2004 21:59:25 +0000 Subject: [PATCH] *** empty log message *** --- ChangeLog | 16 ++++++++++++++ Documentation/user/introduction.itely | 4 ++-- Documentation/user/lilypond.tely | 2 +- Documentation/user/music-glossary.tely | 8 +++---- VERSION | 2 +- lily/lyric-engraver.cc | 29 +++++++++++++++++++------- lily/stem.cc | 6 +++--- 7 files changed, 48 insertions(+), 19 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5df47f910d..ca596ca6b6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +2004-05-02 Han-Wen Nienhuys + + * Documentation/user/lilypond.tely (Top): update version number. + + * lily/lyric-engraver.cc (get_voice_to_lyrics): go higher when + finding Voice context. + + * Documentation/user/music-glossary.tely (Top): replace table strong + with table samp. + + * lily/stem.cc (get_default_stem_end_position): handle dir==0 + case. This fixes a bugs/tremolo-repeat + + * Documentation/user/introduction.itely (About this manual): fix + URLS. + 2004-04-20 Jan Nieuwenhuizen * scripts/lilypond.py: Handle --set=fontencoding=FONTENC (default: diff --git a/Documentation/user/introduction.itely b/Documentation/user/introduction.itely index d17a0f91f8..cc7615d8e2 100644 --- a/Documentation/user/introduction.itely +++ b/Documentation/user/introduction.itely @@ -756,7 +756,7 @@ have clickable links. @item Templates @ifhtml -(available @uref{../../../input/template/out-www/collated-files.html,here}) +(available @uref{../../../../input/template/out-www/collated-files.html,here}) @end ifhtml After you have gone through the tutorial, you should be able to write @@ -780,7 +780,7 @@ included. @item The regression tests @ifhtml -(available @uref{../../../input/regression/out-www/collated-files.html,here}) +(available @uref{../../../../input/regression/out-www/collated-files.html,here}) @end ifhtml This collection of files tests each notation and engraving feature of diff --git a/Documentation/user/lilypond.tely b/Documentation/user/lilypond.tely index da5e4828e8..fd51d5d70e 100644 --- a/Documentation/user/lilypond.tely +++ b/Documentation/user/lilypond.tely @@ -142,7 +142,7 @@ Copyright 1999--2004 by the authors @top GNU LilyPond --- The music typesetter @c HJJ: Info needs `@top', which is a synonym for `@unnumbered' in TeX. -This is the user manual for GNU LilyPond 2.1.x series. +This is the user manual for GNU LilyPond 2.2 series. @ifhtml (See the bottom of this page for the exact version number). @end ifhtml diff --git a/Documentation/user/music-glossary.tely b/Documentation/user/music-glossary.tely index dfa5b3711a..75cc4ee7d6 100644 --- a/Documentation/user/music-glossary.tely +++ b/Documentation/user/music-glossary.tely @@ -160,7 +160,7 @@ This is an example reference, that points you to the @aref{accent} entry. -@table @strong +@table @samp @c @strong @aitem{A} ES: la, @@ -4192,7 +4192,7 @@ symphony orchestra are flute, oboe, clarinet, saxophone, and bassoon. @page -@table @strong +@table @samp @c @strong @item DURATION NAMES, NOTES AND RESTS @end table @@ -4255,7 +4255,7 @@ sextio@-fj@"arde@-del @tab kuudeskymmenesnelj@"asosa- @tab @page -@table @strong +@table @samp @c strong @item PITCH NAMES @end table @@ -4321,7 +4321,7 @@ ais @tab ais @tab ais @ -@table @strong +@table @samp @c strong @item --------------------- diff --git a/VERSION b/VERSION index 71bf679eed..11ba2ee96b 100644 --- a/VERSION +++ b/VERSION @@ -1,6 +1,6 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=2 MINOR_VERSION=2 -PATCH_LEVEL=0 +PATCH_LEVEL=1 MY_PATCH_LEVEL= diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc index dbb159b8af..d6d6268b30 100644 --- a/lily/lyric-engraver.cc +++ b/lily/lyric-engraver.cc @@ -73,11 +73,11 @@ get_voice_to_lyrics (Context *lyrics) if (Context *c = unsmob_context (avc)) return c; - SCM voice = lyrics->get_property ("associatedVoice"); + SCM voice_name = lyrics->get_property ("associatedVoice"); String nm = lyrics->id_string_; - if (gh_string_p (voice)) - nm = ly_scm2string (voice); + if (gh_string_p (voice_name)) + nm = ly_scm2string (voice_name); else { int idx = nm.index_last ('-'); @@ -85,14 +85,27 @@ get_voice_to_lyrics (Context *lyrics) nm = nm.left_string (idx); } - Context *c = lyrics->find_context_below (ly_symbol2scm ("Voice"), nm); + Context *parent = lyrics; + Context *voice = 0; + while (parent && !voice) + { + voice = parent->find_context_below (ly_symbol2scm ("Voice"), nm); + parent = parent->daddy_context_; + } - if (c) - return c; + if (voice) + return voice; - return lyrics->find_context_below (ly_symbol2scm ("Voice"), ""); -} + parent = lyrics; + voice = 0; + while (parent && !voice) + { + voice = parent->find_context_below (ly_symbol2scm ("Voice"), ""); + parent = parent->daddy_context_; + } + return voice; +} Grob * get_current_note_head (Context * voice) { diff --git a/lily/stem.cc b/lily/stem.cc index be9c8a265b..a0006dba1e 100644 --- a/lily/stem.cc +++ b/lily/stem.cc @@ -314,7 +314,8 @@ Stem::get_default_stem_end_position (Grob*me) /* stems in unnatural (forced) direction should be shortened, according to [Roush & Gourlay] */ - if (dir * head_positions (me)[dir] >= 0) + Interval hp = head_positions (me); + if (dir && dir * hp[dir] >= 0) { SCM sshorten = me->get_property ("stem-shorten"); SCM scm_shorten = gh_pair_p (sshorten) ? @@ -364,8 +365,7 @@ Stem::get_default_stem_end_position (Grob*me) length = length >? (minlen + 1.0); } - Interval hp = head_positions (me); - Real st = hp[dir] + dir * length; + Real st = dir ? hp[dir] + dir * length : 0.0; /* TODO: change name to extend-stems to staff/center/'() -- 2.39.5