From 2a876a1f0625e31291b3c6b2d5a65f5b1aec7dde Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Mon, 20 Mar 2006 14:29:57 +0000 Subject: [PATCH] * 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. --- ChangeLog | 6 ++++++ Documentation/topdocs/NEWS.tely | 5 +++-- lily/mark-engraver.cc | 7 ++++++- scm/define-context-properties.scm | 3 --- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 79995b2296..ca2ee7c359 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2006-03-20 Han-Wen Nienhuys + * 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 1be49ddc7d..c490e54ec9 100644 --- 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 244404334e..cb2ac141d9 100644 --- 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 dc440e4bb2..5a86c38dd9 100644 --- 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 -- 2.39.2