From 9c76cf99a80ed4fad6ff73b98d61a5676b2a18c8 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Wed, 11 Feb 2004 01:32:28 +0000 Subject: [PATCH] *** empty log message *** --- Documentation/user/refman.itely | 4 ++-- VERSION | 4 ++-- input/test/bar-number-regular-interval.ly | 2 +- input/test/boxed-molecule.ly | 4 ++-- input/test/time-signature-double.ly | 2 +- lily/ligature-engraver.cc | 2 +- scm/music-functions.scm | 2 +- scm/new-markup.scm | 2 +- scm/output-lib.scm | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely index b8f2f282d0..4cf6d11816 100644 --- a/Documentation/user/refman.itely +++ b/Documentation/user/refman.itely @@ -3197,13 +3197,13 @@ arrowhead to the wiggly line. This can be typeset by setting A square bracket on the left indicates that the player should not arpeggiate the chord. To draw these brackets, set the -@code{molecule-callback} property of @code{Arpeggio} or +@code{print-function} property of @code{Arpeggio} or @code{PianoStaff.Arpeggio} objects to @code{\arpeggioBracket}, and use @code{\arpeggio} statements within the chords as before: @lilypond[fragment,relative,verbatim] \property PianoStaff.Arpeggio \override - #'molecule-callback = \arpeggioBracket + #'print-function = \arpeggioBracket \arpeggio @end lilypond diff --git a/VERSION b/VERSION index 0fca4aaab5..10726fa34f 100644 --- a/VERSION +++ b/VERSION @@ -1,6 +1,6 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=2 MINOR_VERSION=1 -PATCH_LEVEL=20 -MY_PATCH_LEVEL=hwn1 +PATCH_LEVEL=21 +MY_PATCH_LEVEL= diff --git a/input/test/bar-number-regular-interval.ly b/input/test/bar-number-regular-interval.ly index 61b7da3e7b..e77d3dcab4 100644 --- a/input/test/bar-number-regular-interval.ly +++ b/input/test/bar-number-regular-interval.ly @@ -12,7 +12,7 @@ Bar numbers can also be printed at regular intervals. \property Score.BarNumber \override #'break-visibility = #end-of-line-invisible \property Score.barNumberVisibility = #(every-nth-bar-number-visible 4) \property Score.BarNumber \override #'print-function = - #(make-molecule-boxer 0.1 0.25 0.25 Text_item::brew_molecule) + #(make-molecule-boxer 0.1 0.25 0.25 Text_item::print) \property Score.BarNumber \override #'font-size = #2 \repeat unfold 9 { c1 } \bar "|." diff --git a/input/test/boxed-molecule.ly b/input/test/boxed-molecule.ly index bfafd7746a..17c527f21e 100644 --- a/input/test/boxed-molecule.ly +++ b/input/test/boxed-molecule.ly @@ -2,8 +2,8 @@ \version "2.1.21" \header { texidoc = "@cindex Boxed Molecule -You can override the molecule callback to draw a box around -arbitrary grobs. " } + +You can override the print-function to draw a box around arbitrary grobs. " } \score { \notes \relative c'' { diff --git a/input/test/time-signature-double.ly b/input/test/time-signature-double.ly index 65beee7e9d..2ccd995b03 100644 --- a/input/test/time-signature-double.ly +++ b/input/test/time-signature-double.ly @@ -23,7 +23,7 @@ tsMarkup = \score { \notes \relative c' { - \property Staff.TimeSignature \override #'print-function = #Text_item::brew_molecule + \property Staff.TimeSignature \override #'print-function = #Text_item::print_function \property Staff.TimeSignature \override #'text = #tsMarkup diff --git a/lily/ligature-engraver.cc b/lily/ligature-engraver.cc index d2b2885ed4..49b4cfa209 100644 --- a/lily/ligature-engraver.cc +++ b/lily/ligature-engraver.cc @@ -117,7 +117,7 @@ Ligature_engraver::override_molecule_callback () SCM noteHeadProperties = updated_grob_properties (daddy_trans_, ly_symbol2scm ("NoteHead")); SCM value = ly_cdr (scm_sloppy_assq (source_callback, noteHeadProperties)); execute_pushpop_property (daddy_trans_, ly_symbol2scm ("NoteHead"), - atarget_callback, value); + target_callback, value); } /* diff --git a/scm/music-functions.scm b/scm/music-functions.scm index 7bf9198c25..3d98fc2511 100644 --- a/scm/music-functions.scm +++ b/scm/music-functions.scm @@ -777,7 +777,7 @@ Rest can contain a list of beat groupings (if (equal? nm object-name) (begin - (ly:set-grob-property! grob 'print-function Balloon_interface::brew_molecule) + (ly:set-grob-property! grob 'print-function Balloon_interface::print_function) (ly:set-grob-property! grob 'balloon-original-callback cb) (ly:set-grob-property! grob 'balloon-text text) (ly:set-grob-property! grob 'balloon-text-offset off) diff --git a/scm/new-markup.scm b/scm/new-markup.scm index efbcdd8748..f1c27d6e20 100644 --- a/scm/new-markup.scm +++ b/scm/new-markup.scm @@ -362,7 +362,7 @@ Also set markup-signature and markup-keyword object properties." ;; syntax, description and example. ;; -(define-public brew-new-markup-molecule Text_item::brew_molecule) +(define-public brew-new-markup-molecule Text_item::print) (define-public interpret-markup Text_item::interpret_markup) diff --git a/scm/output-lib.scm b/scm/output-lib.scm index 38f10b8b58..b282616743 100644 --- a/scm/output-lib.scm +++ b/scm/output-lib.scm @@ -47,7 +47,7 @@ (else ""))) ) - (let ((slur (Slur::brew_molecule grob)) + (let ((slur (Slur::print grob)) (text (fontify-text (ly:get-default-font grob) letter))) (let ((x (/ (- (cdr (ly:molecule-get-extent slur 0)) -- 2.39.2