From c2389d605aaaf3b3e8c416428d4b4088e4b049ca Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Mon, 17 Oct 2005 00:50:45 +0000 Subject: [PATCH] *** empty log message *** --- Documentation/user/instrument-notation.itely | 2 +- lily/span-arpeggio-engraver.cc | 2 +- ly/bagpipe.ly | 8 ++++---- ly/gregorian-init.ly | 12 ++++++------ ly/property-init.ly | 15 +++++++++------ scm/define-grobs.scm | 2 +- scm/document-translation.scm | 2 +- 7 files changed, 23 insertions(+), 20 deletions(-) diff --git a/Documentation/user/instrument-notation.itely b/Documentation/user/instrument-notation.itely index 97cedfa03f..bed34c62f5 100644 --- a/Documentation/user/instrument-notation.itely +++ b/Documentation/user/instrument-notation.itely @@ -881,7 +881,7 @@ the @code{LyricHyphen} grob. An -- ti -- cons -- ti -- tu -- tion -- nel -- le -- \override LyricHyphen #'minimum-length = #0.7 - \override LyricHyphen #'spacing-procedure = + \override LyricHyphen #'callbacks #'springs-and-rods = #Hyphen_spanner::set_spacing_rods men -- taire -- ment. ouf~! } diff --git a/lily/span-arpeggio-engraver.cc b/lily/span-arpeggio-engraver.cc index 72cdfbad85..3c036fd47d 100644 --- a/lily/span-arpeggio-engraver.cc +++ b/lily/span-arpeggio-engraver.cc @@ -85,7 +85,7 @@ Span_arpeggio_engraver::stop_translation_timestep () we can't kill the children, since we don't want to the previous note to bump into the span arpeggio; so we make it transparent. */ - arpeggios_[j]->set_property ("print-function", SCM_EOL); + arpeggios_[j]->set_callback (ly_symbol2scm ("stencil"), SCM_EOL); } span_arpeggio_ = 0; diff --git a/ly/bagpipe.ly b/ly/bagpipe.ly index 16f6304d35..f471084022 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.6 2005/08/23 03:04:09 gpercival Exp $ + $Id: bagpipe.ly,v 1.7 2005/10/17 00:48:17 hanwen Exp $ %} -\version "2.6.0" +\version "2.7.13" % 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 #'print-function = ##f + \override Staff.KeySignature #'callbacks #'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 #'print-function = #'Key_signature_interface::print + \override Staff.KeySignature #'callbacks #'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 efab48580d..a2014824e3 100644 --- a/ly/gregorian-init.ly +++ b/ly/gregorian-init.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" %%%%%%%% %%%%%%%% shortcuts common for all styles of gregorian chant notation @@ -56,7 +56,7 @@ caesura = { \breathe } divisioMinima = { - \once \override BreathingSign #'print-function = #Breathing_sign::divisio_minima + \once \override BreathingSign #'callbacks #'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 #'print-function = #Breathing_sign::divisio_maior + \once \override BreathingSign #'callbacks #'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 #'print-function = #Breathing_sign::divisio_maxima + \once \override BreathingSign #'callbacks #'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 #'print-function = #Breathing_sign::finalis + \once \override BreathingSign #'callbacks #'stencil = #Breathing_sign::finalis \once \override BreathingSign #'Y-offset-callbacks = #'() % Workaround: add padding. Correct fix would be spacing engine handle this. @@ -138,7 +138,7 @@ ligature = #(def-music-function %#(define (add-staccato m) % (add-script m "staccato")) % -% % \applymusic #(lambda (x) (music-map add-staccato x)) { c c } +% % \applyMusic #(lambda (x) (music-map add-staccato x)) { c c } % % % \climacus { x y z ... }: % % \[ \virga x \inclinatum y \inclinatum z ... \] diff --git a/ly/property-init.ly b/ly/property-init.ly index 3f1c8eb754..4300896507 100644 --- a/ly/property-init.ly +++ b/ly/property-init.ly @@ -1,6 +1,6 @@ % property-init.ly -\version "2.6.0" +\version "2.7.13" stemUp = \override Stem #'direction = #UP stemDown = \override Stem #'direction = #DOWN @@ -52,7 +52,7 @@ tieSolid = { } setEasyHeads = \sequential { - \override NoteHead #'print-function = #Note_head::brew_ez_stencil + \override NoteHead #'callbacks #'stencil = #Note_head::brew_ez_stencil \override NoteHead #'font-size = #-7 \override NoteHead #'font-family = #'sans \override NoteHead #'font-series = #'bold @@ -139,19 +139,22 @@ hideStaffSwitch = \set followVoice = ##f arpeggio = #(make-music 'ArpeggioEvent) arpeggioUp = \sequential { - \revert Arpeggio #'print-function + \revert Arpeggio #'callbacks % stencil + \override Arpeggio #'arpeggio-direction = #UP } arpeggioDown = \sequential { - \revert Arpeggio #'print-function + \revert Arpeggio #'callbacks % stencil + \override Arpeggio #'arpeggio-direction = #DOWN } arpeggioNeutral = \sequential { - \revert Arpeggio #'print-function + \revert Arpeggio #'callbacks % stencil + \revert Arpeggio #'arpeggio-direction } arpeggioBracket = \sequential { - \override Arpeggio #'print-function = #Arpeggio::brew_chord_bracket + \override Arpeggio #'callbacks #'stencil = #Arpeggio::brew_chord_bracket } glissando = #(make-music 'GlissandoEvent) diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm index 51f22fe34b..e13a5c5768 100644 --- a/scm/define-grobs.scm +++ b/scm/define-grobs.scm @@ -874,7 +874,7 @@ (MeasureGrouping . ( (Y-offset-callbacks . (,Side_position_interface::aligned_side)) - (callbacks . (stencil . ,Measure_grouping::print)) + (callbacks . ((stencil . ,Measure_grouping::print))) (padding . 2) (direction . 1) (thickness . 1) diff --git a/scm/document-translation.scm b/scm/document-translation.scm index fdf04014c0..eed1c618bd 100644 --- a/scm/document-translation.scm +++ b/scm/document-translation.scm @@ -134,7 +134,7 @@ "") "\n"))) - ((equal? (object-property sym 'is-grob?) #t) "") + ((equal? (object-property context-sym 'is-grob?) #t) "") ((equal? tag 'assign) (format "@item Set translator property @code{~a} to @code{~a}" context-sym -- 2.39.2