patch::: 1.3.9.hwn2

[lilypond.git] / lily / stem-engraver.cc

diff --git a/lily/stem-engraver.cc b/lily/stem-engraver.cc
index e21c8c901234ad7525f1562925f10900852ba323..dd5ddb1c8a04bb99b6977f5b2b8e165842b2ba2c 100644 (file)
--- a/lily/stem-engraver.cc
+++ b/lily/stem-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "stem-engraver.hh"
@@ -12,7 +12,9 @@
 #include "musical-request.hh"
 #include "duration-convert.hh"
 #include "misc.hh"
-#include "abbrev.hh"
+#include "stem-tremolo.hh"
+#include "staff-info.hh"
+#include "translator-group.hh"
 
 Stem_engraver::Stem_engraver()
 {
@@ -20,38 +22,39 @@ Stem_engraver::Stem_engraver()
   stem_p_ = 0;
   abbrev_p_ = 0;
   default_abbrev_i_ = 16;
-  dir_ = CENTER;
+  rhythmic_req_l_ =0;
 }
 
 void
 Stem_engraver::do_creation_processing ()
 {
-  Scalar prop = get_property ("abbrev");
-  if (prop.isnum_b ()) 
+  SCM prop = get_property ("abbrev", 0);
+  if (gh_number_p(prop)) 
     {
-      default_abbrev_i_  = prop;
+      default_abbrev_i_  = gh_scm2int (prop);
     }
 }
 
 void
 Stem_engraver::acknowledge_element(Score_element_info i)
 {
-  if (i.elem_l_->is_type_b (Rhythmic_head::static_name()))
+  if (Rhythmic_head * h = dynamic_cast<Rhythmic_head *> (i.elem_l_))
     {
-      Rhythmic_head *h  = (Rhythmic_head*) dynamic_cast <Item *> (i.elem_l_);
+      if (h->stem_l_)
+       return;
+      
+      Rhythmic_req * r = dynamic_cast <Rhythmic_req *> (i.req_l_);
+      int duration_log = r->duration_.durlog_i_;      
       if (!stem_p_) 
        {
-         Rhythmic_req * r = dynamic_cast <Rhythmic_req *> (i.req_l_);
          stem_p_ = new Stem;
-         int durlog_i = r->duration_.durlog_i_;
-         stem_p_->flag_i_ = durlog_i;
+         stem_p_->flag_i_ = duration_log;
 
-         
          if (abbrev_req_l_)
            {
              /*
                suggests typing of:
-                  c8:16 c: c: c:
+               c8:16 c: c: c:
                hmm, which isn't so bad?
              */
              int t = abbrev_req_l_->type_i_;
@@ -62,15 +65,21 @@ Stem_engraver::acknowledge_element(Score_element_info i)
 
              if (t)
                {
-                 abbrev_p_ = new Abbreviation;
+                 abbrev_p_ = new Stem_tremolo;
                  announce_element (Score_element_info (abbrev_p_, abbrev_req_l_));
-                 abbrev_p_->abbrev_flags_i_ =intlog2 (t) - (durlog_i>? 2);
+                 abbrev_p_->abbrev_flags_i_ =intlog2 (t) - (duration_log>? 2);
                }
            }
 
          // must give the request, to preserve the rhythmic info.
          announce_element (Score_element_info (stem_p_, r));
        }
+
+      if (stem_p_->flag_i_ != duration_log)
+       {
+         r->warning (_f ("Adding note head to incompatible stem (type = %d)", 1 <<  stem_p_->flag_i_));
+       }
+
       stem_p_->add_head (h);
     }
 }
@@ -84,16 +93,31 @@ Stem_engraver::do_pre_move_processing()
       typeset_element (abbrev_p_);
       abbrev_p_ = 0;
     }
+
   if (stem_p_)
     {
-      Scalar prop = get_property ("ydirection");
-      dir_ = prop.isnum_b () ? (Direction)int(prop) : CENTER;
-      if (dir_)
+      Translator_group* which;
+      SCM prop = get_property ("stemLeftBeamCount", &which);
+      if (gh_number_p(prop))
        {
-         stem_p_->dir_ = dir_;
-         stem_p_->dir_forced_b_ = true;
+         stem_p_->beams_i_drul_[LEFT] = gh_scm2int (prop);
+         ((Translator_group*)which)->set_property ("stemLeftBeamCount", SCM_UNDEFINED);
+       }
+      prop = get_property ("stemRightBeamCount", &which);
+      if (gh_number_p(prop))
+       {
+         stem_p_->beams_i_drul_[RIGHT] = gh_scm2int (prop);
+         ((Translator_group*)which)->set_property ("stemRightBeamCount", SCM_UNDEFINED);
        }
 
+      // UGH. Should mark non-forced instead.
+      SCM dir = stem_p_->get_elt_property ("direction");
+      if (gh_number_p (dir) && gh_int2scm (dir))
+       {
+         stem_p_->set_elt_property ("dir-forced", SCM_BOOL_T);   
+       }
+
+
       typeset_element(stem_p_);
       stem_p_ = 0;
     }
@@ -101,20 +125,16 @@ Stem_engraver::do_pre_move_processing()
 }
 
 bool
-Stem_engraver::do_try_request (Request* r)
+Stem_engraver::do_try_music (Music* r)
 {
-  Musical_req* mus_l = dynamic_cast <Musical_req *> (r);
-  if (!mus_l)
-    return false;
-  
-  Abbreviation_req* a = dynamic_cast <Abbreviation_req *> (mus_l);
-  if (!a)
-    return false;
-
-  abbrev_req_l_ = a;
-
-  return true;
+  if (Tremolo_req* a = dynamic_cast <Tremolo_req *> (r))
+    {
+      abbrev_req_l_ = a;
+      return true;
+    }
+  return false;
 }
 
-IMPLEMENT_IS_TYPE_B1(Stem_engraver, Engraver);
+
 ADD_THIS_TRANSLATOR(Stem_engraver);
+