X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstem.cc;h=1f8b21e85f51fec72fa86c818b24417dcde43298;hb=a7d64135a632c7563c1475705802fe23424303f5;hp=c66712fb2495dac98aeec001dfb1acf6d3e40ba2;hpb=fe0606d0a18a65234db75c7424860d656db5e6a8;p=lilypond.git

diff --git a/lily/stem.cc b/lily/stem.cc
index c66712fb24..1f8b21e85f 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--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 
   TODO: This is way too hairy
@@ -628,8 +628,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