* lily/tuplet-bracket.cc (make_bracket): make sure that gap is

always smaller than bracket size.
(make_bracket): oops. Size of the gap was off by factor 2

* lily/parser.yy (post_event): make HYPHEN into postfix event.

* lily/new-lyric-combine-music-iterator.cc (find_context_below):
use is_alias() iso. == . This fixes lyrics on
GregorianTranscriptions.

diff --git a/ChangeLog b/ChangeLog
index 687ea79baf5fbbca5018babce906de6b5c356f97..9e4b1f79578d93bd22ef7669b3f7872320f9f8ba 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2004-02-02  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+       * lily/tuplet-bracket.cc (make_bracket): make sure that gap is
+       always smaller than bracket size.
+       (make_bracket): oops. Size of the gap was off by factor 2
+
        * input/test/text-rotate.ly: new file.
 
        * scm/new-markup.scm (markup): a macro that provides a

diff --git a/lily/new-lyric-combine-music-iterator.cc b/lily/new-lyric-combine-music-iterator.cc
index 1e8356d6dd5884eb01f236bffc9da28b0ab3327b..e7c2e84696ca45fcfc8b69fca5a09b902a518554 100644 (file)
--- a/lily/new-lyric-combine-music-iterator.cc
+++ b/lily/new-lyric-combine-music-iterator.cc
@@ -71,9 +71,8 @@ New_lyric_combine_music_iterator::start_new_syllable ()
   if (!b)
     return false;
 
-  /* FIXME: this is wrong use of construct_children () */
   if (!lyrics_context_)
-    construct_children ();
+    return false;
   
   if (!to_boolean (lyrics_context_->get_property ("ignoreMelismata")))
     {
@@ -167,10 +166,12 @@ New_lyric_combine_music_iterator::construct_children ()
   if (lyric_iter_)
     lyrics_context_ = find_context_below (lyric_iter_->report_to (),
                                          "LyricsVoice", "");
-  
-  if (music_context_ && !lyrics_context_)
-    lyrics_context_ = music_context_
-      ->find_create_translator (ly_symbol2scm ("LyricsVoice"), "", SCM_EOL);
+
+  /*
+    We do not create a LyricsVoice context, because the user might
+    create one with a different name, and then we will not find that
+    one.
+   */
 }
 
 void

diff --git a/lily/parser.yy b/lily/parser.yy
index 72d4de1ed3c9441053307cf18f42f33a0578cb7f..277365e90f129bb802b8f3068480533d3ec4f2bf 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -1665,7 +1665,6 @@ pitch_also_in_chords:
        | steno_tonic_pitch
        ;
 
-
 close_event:
        '('     {
                Music * s= MY_MAKE_MUSIC("SlurEvent");

diff --git a/lily/tuplet-bracket.cc b/lily/tuplet-bracket.cc
index 351eed8fef81070122bef1aec3c34ea7945effa0..352331c630840a6b648f5a210a144f0407e826f8 100644 (file)
--- a/lily/tuplet-bracket.cc
+++ b/lily/tuplet-bracket.cc
@@ -258,7 +258,16 @@ Tuplet_bracket::make_bracket (Grob *me,    // for line properties.
   Direction d = LEFT;
   do {
     straight_corners[d] += - d * shorten[d] /length * dz;
-    gap_corners[d] = (dz * 0.5) + d * gap / length * dz;
+  } while (flip (&d) != LEFT);
+
+  /*
+    UGH: the shortening factor is magic.
+   */
+  gap = gap <?
+    (0.66 * (straight_corners[RIGHT] - straight_corners[LEFT]).length ());
+  
+  do {
+    gap_corners[d] = (dz * 0.5) + d * 0.5 * gap / length * dz;
   } while (flip (&d) != LEFT);
 
   Drul_array<Offset> flare_corners = straight_corners;

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 3f2340989dc573bb8a6c755d36f9e822f45b5045..a3da4407dc3b585eeaf5a187291a68e11bff0dce 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -1174,7 +1174,7 @@
 
     (TupletBracket
      . (
-       (gap . 2.0)
+       (gap . 1.0)
        (padding . 1.1)
        (thickness . 1.6)
        (edge-height . (0.7 . 0.7))