lilypond-1.1.52

diff --git a/lily/include/lookup.hh b/lily/include/lookup.hh
index e1b827e5237ca2c3c426d0ed5ba27910e0db8ce1..58a7e34ccb98eb13c3ea8e33c8b9ce5827b3f9e0 100644 (file)
--- a/lily/include/lookup.hh
+++ b/lily/include/lookup.hh
@@ -37,7 +37,6 @@ public:
   Molecule ledger_line (Interval) const;
   Molecule fill (Box b) const;
   Molecule filledbox (Box b) const;  
-  Molecule flag (int, Direction) const;
   Molecule hairpin (Real width, Real height, bool decresc, bool continued) const;
   Molecule tuplet_bracket (Real dy, Real dx, Real thick,Real interline, Direction dir) const;
   Molecule rest (int, bool outside, String) const;

diff --git a/lily/include/stem.hh b/lily/include/stem.hh
index 04dd3f1ce1ab197c2978cbaa80018da0a4fbfa8f..9f8fb0a7e371979b9d8824bab7aa99f137c448e1 100644 (file)
--- a/lily/include/stem.hh
+++ b/lily/include/stem.hh
@@ -100,6 +100,7 @@ public:
   Interval_t<int> head_positions() const;
 
 protected:
+  Molecule flag () const;
   virtual void do_substitute_element_pointer (Score_element*,Score_element*);
   virtual void do_pre_processing();
   virtual Interval do_width() const;

diff --git a/lily/lookup.cc b/lily/lookup.cc
index b28cc21c592d154fae7f6ac0d277f6c8d1aa427c..0aedf8c2190e593e77b0c0b87d126d13254310cd 100644 (file)
--- a/lily/lookup.cc
+++ b/lily/lookup.cc
@@ -156,9 +156,9 @@ Lookup::simple_bar (String type, Real h, Paper_def* paper_l) const
 Molecule
 Lookup::bar (String str, Real h, Paper_def *paper_l) const
 {
-  if (str == "[")
+  if (str == "bracket")
     return staff_bracket (h);
-  else if (str == "{")
+  else if (str == "brace")
     return staff_brace (h);
   
   Real kern = paper_l->get_var ("bar_kern");
@@ -309,13 +309,6 @@ Lookup::fill (Box b) const
   return m;
 }
 
-Molecule
-Lookup::flag (int j, Direction d) const
-{
-  char c = (d == UP) ? 'u' : 'd';
-  return  afm_find (String ("flags-") + to_str (c) + to_str (j));
-}
-
 Molecule
 Lookup::rest (int j, bool o, String style) const
 {

diff --git a/ly/engraver.ly b/ly/engraver.ly
index 4be101d52dd77032e9acad07b56dd87b7e8c4bce..dce0e249ebdeaa732a594507befcfe1cd5d8560e 100644 (file)
--- a/ly/engraver.ly
+++ b/ly/engraver.ly
@@ -19,21 +19,7 @@ StaffContext=\translator {
        \consists "Rest_collision_engraver";
        \consistsend "Axis_group_engraver";
 
-%{
-       Uncomment to get bar numbers on single staff systems:
-       
-       The Bar_number_engraver puts a number over a staff created
-       at the same level of hierarchy.  This why you have to add it
-       here separately if you want to have numbers on single staff
-       systems: The Bar_number_engraver in Score_engraver will only
-       put numbers on bars that are Score ("system") wide.  Such
-       bars are only created when the toplevel system has multiple
-       children-staffs.
 
-%}
-%{
-       \consists "Bar_number_engraver";
-%}
 
 %{
        The Staff_margin_engraver puts the name of the instrument
@@ -93,7 +79,6 @@ VoiceContext = \translator {
        \type "Engraver_group_engraver";
        \consists "Dynamic_engraver";   % must come before text_engraver.
        \name Voice ;
-       beamAuto = "1";
        \consists "Local_key_engraver";
        
        \consists "Breathing_sign_engraver";
@@ -101,6 +86,7 @@ VoiceContext = \translator {
        \consists "Dot_column_engraver";
        \consists "Stem_engraver";
        \consists "Beam_engraver";
+       beamAuto = "1";
        \consists "Auto_beam_engraver";
        \include "auto-beam-settings.ly";
 %      \consists "Abbreviation_beam_engraver";
@@ -125,18 +111,25 @@ GraceContext=\translator {
        \type "Grace_engraver_group";
        \name "Grace";
        \consists "Note_heads_engraver";
+       \consists "Local_key_engraver";
        \consists "Stem_engraver";
        \consists "Slur_engraver";
        \consists "Timing_engraver";    %UGH.
        \consists "Beam_engraver";
+       beamAuto = "1";
+       \consists "Auto_beam_engraver";
+       \include "auto-beam-settings.ly";
        \consists "Align_note_column_engraver";
        \consists "Font_size_engraver";
        \consists "Rhythmic_column_engraver";
-       
+
+       stemStyle = "grace";
+       weAreGraceContext = "1";
        fontSize = "-1";
        stemLength = "6.0";
        verticalDirection = "1";
 };
+
 \translator{\GraceContext}
 \translator {\VoiceContext}