From 9ba46ce134bf5906d21bf2ac52a0a3536eabc692 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Fri, 21 Oct 2005 14:07:47 +0000 Subject: [PATCH] * lily/grob-property.cc: remove add_to_list_property(). * lily/grob-property.cc (del_property): new function. --- ChangeLog | 4 ++++ Documentation/user/changing-defaults.itely | 4 ++-- Documentation/user/introduction.itely | 2 +- lily/grob-property.cc | 2 +- ly/bagpipe.ly | 8 ++++---- ly/gregorian-init.ly | 10 +++++----- ly/property-init.ly | 15 ++++++--------- 7 files changed, 23 insertions(+), 22 deletions(-) diff --git a/ChangeLog b/ChangeLog index fe8aebfeeb..1577a55b8c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2005-10-21 Han-Wen Nienhuys + * lily/grob.cc: remove is_empty() + + * lily/grob-property.cc: remove add_to_list_property(). + * scripts/convert-ly.py (datadir): add prefix switching hack to .py too. diff --git a/Documentation/user/changing-defaults.itely b/Documentation/user/changing-defaults.itely index 152a55ba5c..4f31678d7f 100644 --- a/Documentation/user/changing-defaults.itely +++ b/Documentation/user/changing-defaults.itely @@ -1147,8 +1147,8 @@ does not amount to much. The initialization file (self-alignment-X . 0) (self-alignment-Y . 0) (script-priority . 100) - (callbacks . ((stencil . ,Text_interface::print) - (direction . ,Script_interface::calc_direction))) + (stencil . ,Text_interface::print) + (direction . ,Script_interface::calc_direction) (font-encoding . fetaNumber) (font-size . -5) ; don't overlap when next to heads. (meta . ((class . Item) diff --git a/Documentation/user/introduction.itely b/Documentation/user/introduction.itely index b0dbe6824a..f1a8a491ea 100644 --- a/Documentation/user/introduction.itely +++ b/Documentation/user/introduction.itely @@ -319,7 +319,7 @@ fragment. (if (and (memq 'note-head-interface interfaces) (memq pos '(-2 -3 -5))) (begin - (ly:grob-set-callback! grob 'stencil Text_interface::print) + (ly:grob-set-property! grob 'stencil Text_interface::print) (ly:grob-set-property! grob 'font-family 'roman) (ly:grob-set-property! grob 'text diff --git a/lily/grob-property.cc b/lily/grob-property.cc index ac452e36b2..9e217b33be 100644 --- a/lily/grob-property.cc +++ b/lily/grob-property.cc @@ -117,7 +117,7 @@ Grob::internal_get_property (SCM sym) const #ifndef NDEBUG #include "protected-scm.hh" Protected_scm grob_property_callback_stack = SCM_EOL; -bool debug_property_callbacks = 1; +bool debug_property_callbacks = 0; #endif SCM diff --git a/ly/bagpipe.ly b/ly/bagpipe.ly index f471084022..1982279800 100755 --- a/ly/bagpipe.ly +++ b/ly/bagpipe.ly @@ -6,10 +6,10 @@ Sven Axelsson, the Murray Pipes & Drums of Gothenburg (http://www.murrays.nu) - $Id: bagpipe.ly,v 1.7 2005/10/17 00:48:17 hanwen Exp $ + $Id: bagpipe.ly,v 1.8 2005/10/21 14:07:47 hanwen Exp $ %} -\version "2.7.13" +\version "2.7.14" % Notes of the scale of the Great Highland Bagpipe. Extra high notes for bombarde. % Flat notes used mainly in some modern music. @@ -38,14 +38,14 @@ pitchnames = \pitchnamesBagpipe hideKeySignature = { % We normally don't want to show the key signature. - \override Staff.KeySignature #'callbacks #'stencil = ##f + \override Staff.KeySignature #'stencil = ##f \set Staff.extraNatural = ##f \key d \major #(set-accidental-style 'forget) } showKeySignature = { % Show the key signature e.g. for BMW compatibility. - \override Staff.KeySignature #'callbacks #'stencil = #'Key_signature_interface::print + \override Staff.KeySignature #'stencil = #'Key_signature_interface::print \set Staff.extraNatural = ##f \key d \major #(set-accidental-style 'forget) diff --git a/ly/gregorian-init.ly b/ly/gregorian-init.ly index a2014824e3..2ee5aba35f 100644 --- a/ly/gregorian-init.ly +++ b/ly/gregorian-init.ly @@ -1,4 +1,4 @@ -\version "2.7.13" +\version "2.7.14" %%%%%%%% %%%%%%%% shortcuts common for all styles of gregorian chant notation @@ -56,7 +56,7 @@ caesura = { \breathe } divisioMinima = { - \once \override BreathingSign #'callbacks #'stencil = #Breathing_sign::divisio_minima + \once \override BreathingSign #'stencil = #Breathing_sign::divisio_minima % Workaround: add padding. Correct fix would be spacing engine handle this. \once \override BreathingSign #'extra-X-extent = #'(-1.0 . 0) @@ -64,7 +64,7 @@ divisioMinima = { \breathe } divisioMaior = { - \once \override BreathingSign #'callbacks #'stencil = #Breathing_sign::divisio_maior + \once \override BreathingSign #'stencil = #Breathing_sign::divisio_maior \once \override BreathingSign #'Y-offset-callbacks = #'() % Workaround: add padding. Correct fix would be spacing engine handle this. @@ -73,7 +73,7 @@ divisioMaior = { \breathe } divisioMaxima = { - \once \override BreathingSign #'callbacks #'stencil = #Breathing_sign::divisio_maxima + \once \override BreathingSign #'stencil = #Breathing_sign::divisio_maxima \once \override BreathingSign #'Y-offset-callbacks = #'() % Workaround: add padding. Correct fix would be spacing engine handle this. @@ -82,7 +82,7 @@ divisioMaxima = { \breathe } finalis = { - \once \override BreathingSign #'callbacks #'stencil = #Breathing_sign::finalis + \once \override BreathingSign #'stencil = #Breathing_sign::finalis \once \override BreathingSign #'Y-offset-callbacks = #'() % Workaround: add padding. Correct fix would be spacing engine handle this. diff --git a/ly/property-init.ly b/ly/property-init.ly index 4300896507..e8bdb855d9 100644 --- a/ly/property-init.ly +++ b/ly/property-init.ly @@ -1,6 +1,6 @@ % property-init.ly -\version "2.7.13" +\version "2.7.14" stemUp = \override Stem #'direction = #UP stemDown = \override Stem #'direction = #DOWN @@ -52,7 +52,7 @@ tieSolid = { } setEasyHeads = \sequential { - \override NoteHead #'callbacks #'stencil = #Note_head::brew_ez_stencil + \override NoteHead #'stencil = #Note_head::brew_ez_stencil \override NoteHead #'font-size = #-7 \override NoteHead #'font-family = #'sans \override NoteHead #'font-series = #'bold @@ -139,22 +139,19 @@ hideStaffSwitch = \set followVoice = ##f arpeggio = #(make-music 'ArpeggioEvent) arpeggioUp = \sequential { - \revert Arpeggio #'callbacks % stencil - + \revert Arpeggio #'stencil \override Arpeggio #'arpeggio-direction = #UP } arpeggioDown = \sequential { - \revert Arpeggio #'callbacks % stencil - + \revert Arpeggio #'stencil \override Arpeggio #'arpeggio-direction = #DOWN } arpeggioNeutral = \sequential { - \revert Arpeggio #'callbacks % stencil - + \revert Arpeggio #'stencil \revert Arpeggio #'arpeggio-direction } arpeggioBracket = \sequential { - \override Arpeggio #'callbacks #'stencil = #Arpeggio::brew_chord_bracket + \override Arpeggio #'stencil = #Arpeggio::brew_chord_bracket } glissando = #(make-music 'GlissandoEvent) -- 2.39.2