lilypond-1.3.9

diff --git a/Documentation/faq.texi b/Documentation/faq.texi
index b8dbb3078733437846b97c937f21c8c4292b1709..a400368adbe5ccc3e5e5c3aa1801775152f7e9c9 100644 (file)
--- a/Documentation/faq.texi
+++ b/Documentation/faq.texi
@@ -100,8 +100,9 @@ which looks like @file{/usr/}
  
 @end example 
 
-@file{~/usr/src/bin/} is in the variable PATH, and contains symbolic
-links to the compiled executables.
+@file{~/usr/bin/} is in the variable PATH, and contains symbolic links
+to the compiled executables. Unpacked sources, releases and patches are
+in subdirectories under @file{~/usr/src/}.
 
 @subsubsection Is there an emacs mode?
 
@@ -225,7 +226,7 @@ staves (lyric and melodic), otherwise they will end up in the same
 staff/lyricline
 @example 
        
-       \score @{
+4      \score @{
                < \melodic \type Staff = "treble" \trebleMelody
                  \lyric \type Lyrics = "tlyrics" \trebtext
                  \type Staff = "bass" \melodic \bassMelody        

diff --git a/lily/align-note-column-engraver.cc b/lily/align-note-column-engraver.cc
index efb3abd9bf80d6edf52c90940c2b9ba4eb6f500a..11bcefe65238f1f66281ca731bf50795a124ea3a 100644 (file)
--- a/lily/align-note-column-engraver.cc
+++ b/lily/align-note-column-engraver.cc
@@ -53,7 +53,7 @@ Align_note_column_engraver::do_removal_processing ()
   SCM al = get_property ("graceAlignPosition", 0);
   if (isdir_b (al))
     {
-      align_item_p_->notehead_align_dir_ = to_dir (al);
+      align_item_p_->set_direction (to_dir (al));
     }
   
   typeset_element (align_item_p_);

diff --git a/lily/bar-script-engraver.cc b/lily/bar-script-engraver.cc
index 243efae34e02f2db046ab116d8f984bde06f83b0..1e82d91657cd52f4ebbfc160645218eb21acb15c 100644 (file)
--- a/lily/bar-script-engraver.cc
+++ b/lily/bar-script-engraver.cc
@@ -55,7 +55,7 @@ Bar_script_engraver::attach_script_to_item (Item *i)
       if (!text_p_->parent_l(other_axis))
        text_p_->set_parent (i,other_axis);
 
-      Staff_sidify (text_p_).add_support (i);
+      Side_position_interface (text_p_).add_support (i);
 
       /*
        How do we make sure that text_p_ has a dependency from
@@ -129,7 +129,7 @@ Bar_script_engraver::create_items (Request *rq)
   
   text_p_ = new Text_item;
   text_p_->set_elt_property ("breakable", SCM_BOOL_T); // ugh
-  Staff_sidify staffside(text_p_);
+  Side_position_interface staffside(text_p_);
   staffside.set_axis (axis_);
 
   SCM prop = get_property (type_ + "Direction", 0);

diff --git a/lily/dot-column.cc b/lily/dot-column.cc
index 3d3f73f41045137a1988edd53d669a849791c8fc..5ca15e946ddbe9421f454531c694b404735c5e71 100644 (file)
--- a/lily/dot-column.cc
+++ b/lily/dot-column.cc
@@ -51,7 +51,7 @@ Dot_column::do_pre_processing ()
 
 Dot_column::Dot_column ()
 {
-  notehead_align_dir_ = RIGHT;
+  set_direction (RIGHT);
   set_axes(X_AXIS,X_AXIS);
 }
 

diff --git a/lily/include/note-head-side.hh b/lily/include/note-head-side.hh
index 201acbacd13c4516c82bf26f3c157a87839e0e77..1c0eed80db4b5473b701984784b8439c8d951e7b 100644 (file)
--- a/lily/include/note-head-side.hh
+++ b/lily/include/note-head-side.hh
@@ -11,26 +11,21 @@
 #define NOTE_HEAD_SIDE_HH
 
 #include "item.hh"
+#include "directional-element.hh"
 
 /**
    be next to noteheads.
 
    UGH. another reduplication of Staff_side
    */
-class Note_head_side: public virtual Item
+class Note_head_side: public virtual Item, public virtual Directional_element
 {
-  Link_array<Item> support_l_arr_;
 public:
-  // naming to avoid conflict with Align_element
-  Direction notehead_align_dir_;
 
   Note_head_side ();
   bool supported_b () const;
   void add_support (Item*);
   VIRTUAL_COPY_CONS (Score_element);
-protected:
-  virtual void do_substitute_element_pointer (Score_element*,Score_element*);
-  virtual void do_pre_processing();    
 };
 
 

diff --git a/lily/include/staff-side.hh b/lily/include/staff-side.hh
index 382d0d6cf36ec8f7bb8c20e9b4694c704d2a2c38..690cf1d3bc0e6dc0276dcf1d0f775196f0a64f24 100644 (file)
--- a/lily/include/staff-side.hh
+++ b/lily/include/staff-side.hh
@@ -16,20 +16,21 @@
 #include "staff-symbol-referencer.hh"
 #include "directional-element.hh"
 
-struct Staff_sidify
+struct Side_position_interface
 {
   Score_element * elt_l_;
 public:
-  Staff_sidify (Score_element*);
-  static Real position_self (Dimension_cache const *);
-
+  Side_position_interface (Score_element*);
+  static Real side_position (Dimension_cache const *);
+  static Real self_alignment (Dimension_cache const *);
+  static Real aligned_side (Dimension_cache const *);  
+  
   void set_axis (Axis);
   Axis get_axis () const;
   
-  bool is_staff_side_b ();
+  bool supported_b () const;
+  bool is_staff_side_b () const;
   void add_support (Score_element*);
-  Real aligned_position (Dimension_cache const*);
-
   
   Direction get_direction () const;
   void set_direction (Direction);

diff --git a/lily/script-column-engraver.cc b/lily/script-column-engraver.cc
index e144890ea4b672cdb304cc48a045d70e5f56ffab..b39e2b0524f45ac47e2daa7d0bcff5e217cb4332 100644 (file)
--- a/lily/script-column-engraver.cc
+++ b/lily/script-column-engraver.cc
@@ -60,9 +60,9 @@ Script_column_engraver::acknowledge_element( Score_element_info inf)
   if (!thing)
     return;
   
-  if (Staff_sidify (thing).is_staff_side_b ())
+  if (Side_position_interface (thing).is_staff_side_b ())
     {
-      if (!thing->breakable_b () && Staff_sidify (thing).get_axis () == Y_AXIS)
+      if (!thing->breakable_b () && Side_position_interface (thing).get_axis () == Y_AXIS)
        {
          script_l_arr_.push (thing);
        }

diff --git a/lily/script-column.cc b/lily/script-column.cc
index 720b7f0a11ca268ab7cf505854b81a3f9760a156..19983c4f93f3a4936f1a575547408963be3256cb 100644 (file)
--- a/lily/script-column.cc
+++ b/lily/script-column.cc
@@ -39,7 +39,7 @@ Script_column::do_pre_processing ()
 
   for (int i=0; i < staff_sided_item_l_arr_.size (); i++)
     {
-      Staff_sidify st (staff_sided_item_l_arr_[i]);
+      Side_position_interface st (staff_sided_item_l_arr_[i]);
       arrs[st.get_direction ()].push (staff_sided_item_l_arr_[i]);
     }
 
@@ -52,7 +52,7 @@ Script_column::do_pre_processing ()
     Item * last = 0;
     for (int i=0; i < arr.size (); i++)
       {
-       Staff_sidify s (arr[i]);
+       Side_position_interface s (arr[i]);
        if (last)
          {
            s.add_support (last);

diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc
index c0fb5ab1509756de5e3b2617640a95c580ae65e5..718845c75577dedb6cdeec3b720f85f76876174a 100644 (file)
--- a/lily/text-engraver.cc
+++ b/lily/text-engraver.cc
@@ -54,7 +54,7 @@ Text_engraver::acknowledge_element (Score_element_info i)
     {
       for (int i=0; i < texts_.size (); i++)
        {
-         Staff_sidify st (texts_[i]);
+         Side_position_interface st (texts_[i]);
          st.add_support (n);
          if (st.get_axis( ) == X_AXIS
              && !texts_[i]->parent_l (Y_AXIS))
@@ -65,7 +65,7 @@ Text_engraver::acknowledge_element (Score_element_info i)
     {
       for (int i=0; i < texts_.size (); i++)
        {
-         Staff_sidify st(texts_[i]);
+         Side_position_interface st(texts_[i]);
          st.add_support (n);
        }
     }
@@ -79,7 +79,7 @@ Text_engraver::do_process_requests ()
       Text_script_req * r = reqs_[i];
 
       Text_item *text = new Text_item;
-      Staff_sidify stafy (text);
+      Side_position_interface stafy (text);
 
       SCM axisprop = get_property ("scriptHorizontal",0);
       if (gh_boolean_p (axisprop) && gh_scm2bool (axisprop))