add support for

barNumberAlignSymbol.
add ADD_ACKNOWLEDGER() call for break_aligned. Fixes bar-number-breathe

diff --git a/ChangeLog b/ChangeLog
index 854f5bb89d0415b564523a179c646e8b0fe10aae..65250ca46346aa2f3f14c798bc5673537c22fb9e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2006-03-16  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * lily/bar-number-engraver.cc: add support for
+       barNumberAlignSymbol. 
+       add ADD_ACKNOWLEDGER() call for break_aligned. Fixes bar-number-breathe
+
        * lily/pointer-group-interface.cc (set_ordered): new function. 
        (add_unordered_grob): new function.
 

diff --git a/lily/bar-number-engraver.cc b/lily/bar-number-engraver.cc
index 57ad002f760b865ab83e2cf3f07b1da5b08bdd75..8a57a721357c26f210921bae8dfb2b741100f0e7 100644 (file)
--- a/lily/bar-number-engraver.cc
+++ b/lily/bar-number-engraver.cc
@@ -70,7 +70,7 @@ Bar_number_engraver::acknowledge_break_aligned (Grob_info inf)
   Grob *s = inf.grob ();
   if (text_
       && dynamic_cast<Item *> (s)
-      && s->get_property ("break-align-symbol") == ly_symbol2scm ("left-edge"))
+      && s->get_property ("break-align-symbol") == get_property ("barNumberAlignSymbol"))
     {
       /*
        By default this would land on the Paper_column -- so why
@@ -99,6 +99,9 @@ Bar_number_engraver::create_items ()
   text_ = make_item ("BarNumber", SCM_EOL);
 }
 
+
+ADD_ACKNOWLEDGER(Bar_number_engraver,break_aligned);
+
 ADD_TRANSLATOR (Bar_number_engraver,
                /* doc */ "A bar number is created whenever measurePosition "
                "is zero and when there is a bar line (ie. when @code{whichBar} is set. "
@@ -110,8 +113,9 @@ ADD_TRANSLATOR (Bar_number_engraver,
                /* create */ "BarNumber",
                /* accept */ "",
                /* read */
+               "barNumberAlignSymbol "
                "currentBarNumber "
                "whichBar "
                "stavesFound "
-               "barNumberVisibility",
+               "barNumberVisibility ",
                /* write */ "");

diff --git a/lily/note-spacing.cc b/lily/note-spacing.cc
index fe56b32b459363667b3d82016224874beb341c51..31e249e6ee9075e2b72d361747e5223314901d64 100644 (file)
--- a/lily/note-spacing.cc
+++ b/lily/note-spacing.cc
@@ -111,6 +111,7 @@ Note_spacing::get_spacing (Grob *me, Item *right_col,
 
   /*
     We look at the width of the note head, since smaller heads get less space
+
     eg. a quarter rest gets almost 0.5 ss less horizontal space than a note.
 
     What is sticking out of the note head (eg. a flag), doesn't get

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index 59f8d7c0eb4ffa0a6be05cd40ab75a9142e58995..2ff22a1452476acd8845a328a45ee0fe14c77509 100644 (file)
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -525,6 +525,7 @@ AncientRemoveEmptyStaffContext = \context {
   markFormatter = #format-mark-letters
   rehearsalMark = #1
   rehearsalMarkAlignSymbol = #'staff-bar
+  barNumberAlignSymbol = #'staff-bar
   subdivideBeams = ##f
   allowBeamBreak = ##f
   extraNatural = ##t

diff --git a/scm/define-context-properties.scm b/scm/define-context-properties.scm
index ce5088eb8f60c928cc0529f8c9c128f495479f32..dc440e4bb2b55b93d4fe57ccb2befd67a7002542 100644 (file)
--- a/scm/define-context-properties.scm
+++ b/scm/define-context-properties.scm
@@ -101,6 +101,7 @@ note.")
      (barCheckSynchronize ,boolean? "If true then reset @code{measurePosition}
 when finding a barcheck.")
 
+     (barNumberAlignSymbol ,symbol? "Which break-align-symbol to align the bar number with.")
      (barNumberVisibility ,procedure? "Procedure that takes an int and
 returns whether the corresponding bar number should be printed")
      (bassStaffProperties ,list? "Alist of property settings to apply