X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstem.cc;h=8ba6f2b6c9cdba33022481ba5b0113d4abdecfbe;hb=340e67d20b80de85f4740d834707b230558a528b;hp=c66712fb2495dac98aeec001dfb1acf6d3e40ba2;hpb=085d664639efb22f5252d101b151f7cc8f9f86f5;p=lilypond.git

diff --git a/lily/stem.cc b/lily/stem.cc
index c66712fb24..8ba6f2b6c9 100644
--- a/lily/stem.cc
+++ b/lily/stem.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1996--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 
   TODO: This is way too hairy
@@ -229,11 +229,10 @@ Stem::is_normal_stem (Grob *me)
 
 MAKE_SCHEME_CALLBACK (Stem, pure_height, 3)
 SCM
-Stem::pure_height (SCM smob, SCM start, SCM end)
+Stem::pure_height (SCM smob,
+		   SCM /* start */,
+		   SCM /* end */)
 {
-  (void) start;
-  (void) end;
-
   Grob *me = unsmob_grob (smob);
   Interval iv;
 
@@ -628,8 +627,13 @@ Stem::calc_flag (SCM smob)
       string stroke_style = ly_scm2string (stroke_style_scm);
       if (!stroke_style.empty ())
         {
-          string font_char = to_string (dir) + stroke_style;
+          string font_char = flag_style + to_string (dir) + stroke_style;
           Stencil stroke = fm->find_by_name ("flags." + font_char);
+          if (stroke.is_empty ())
+            {
+              font_char = to_string (dir) + stroke_style;
+              stroke = fm->find_by_name ("flags." + font_char);
+            }
           if (stroke.is_empty ())
             me->warning (_f ("flag stroke `%s' not found", font_char));
           else
@@ -1047,6 +1051,8 @@ ADD_INTERFACE (Stem,
 	       "avoid-note-head "
 	       "beam "
 	       "beaming "
+	       "beamlet-default-length "
+	       "beamlet-max-length-proportion "
 	       "default-direction "
 	       "details "
 	       "direction "