* lily/mark-engraver.cc: remove properties.

* scm/define-context-properties.scm
(all-user-translation-properties): remove align symbol properties
for barnumber/reh. mark.

* lily/mark-engraver.cc (acknowledge_break_alignment): new function.

diff --git a/ChangeLog b/ChangeLog
index 79995b22966478d797ff2f924c84355e2dacf2f0..ca2ee7c3599994a01531f9a9dbe1bc0db18295b2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2006-03-20  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * lily/mark-engraver.cc: remove properties.
+
+       * scm/define-context-properties.scm
+       (all-user-translation-properties): remove align symbol properties
+       for barnumber/reh. mark.
+
        * lily/break-align-interface.cc (self_align_callback): new
        interface, new function. Look at complete alignment. This handles
        tunable break alignments in case break-align-symbols are missing.

diff --git a/Documentation/topdocs/NEWS.tely b/Documentation/topdocs/NEWS.tely
index 1be49ddc7d1c82b599f0496826d03ed06203755e..c490e54ec9b1c8bf6c65af17b2964defc1f11a4f 100644 (file)
--- a/Documentation/topdocs/NEWS.tely
+++ b/Documentation/topdocs/NEWS.tely
@@ -1,3 +1,4 @@
+\version "2.7.40"
 \input texinfo @c -*- coding: utf-8; mode: texinfo; -*-
 @setfilename NEWS.info
 @settitle NEWS
@@ -344,11 +345,11 @@ setting the @code{rehearsalMarkAlignSymbol} property,
   c1
   \key cis \major
   \clef alto
-  \set Score.rehearsalMarkAlignSymbol = #'key-signature
+  \override Score.RehearsalMark #'break-align-symbol =  #'key-signature
   \mark "on-key"
   cis
  \key ces \major
-  \set Score.rehearsalMarkAlignSymbol = #'clef
+  \override Score.RehearsalMark #'break-align-symbol =  #'clef
   \clef treble
   \mark "on clef"
   ces

diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc
index 244404334eecc62d5ded9fb9838e7ac31148e67c..cb2ac141d9e975ec9a18e3f5677394b407a77fd2 100644 (file)
--- a/lily/mark-engraver.cc
+++ b/lily/mark-engraver.cc
@@ -170,7 +170,12 @@ ADD_TRANSLATOR (Mark_engraver,
                "to a different context, "
                "@ref{Staff_collecting_engraver} must move along, otherwise all marks"
                "end up on the same Y-location",
+               
                /* create */ "RehearsalMark",
                /* accept */ "mark-event",
-               /* read */ "rehearsalMark rehearsalMarkAlignSymbol markFormatter stavesFound",
+               /* read */
+               "markFormatter "
+               "rehearsalMark "
+               "stavesFound ",
+               
                /* write */ "");

diff --git a/scm/define-context-properties.scm b/scm/define-context-properties.scm
index dc440e4bb2b55b93d4fe57ccb2befd67a7002542..5a86c38dd900e37c85227b3f4911483530366909 100644 (file)
--- a/scm/define-context-properties.scm
+++ b/scm/define-context-properties.scm
@@ -101,7 +101,6 @@ 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
@@ -329,8 +328,6 @@ The list of contains entries with start times, music objects and
 whether they are processed in this context.")
 
      (rehearsalMark ,integer? "The last rehearsal mark printed.")
-     (rehearsalMarkAlignSymbol ,symbol? "Which @code{break-align-symbol} to put the mark on?  Example values:  @code{clef}, @code{key-signature}.")
-     
      (repeatCommands ,list? "This property is read to find any command of the form @code{(volta . @var{x})}, where @var{x} is a string or @code{#f}")
      (restNumberThreshold ,number?
                          "If a multimeasure rest has more measures