*** empty log message ***

diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely
index b8f2f282d0fd3e89e36a32d98b8a88a660e41f06..4cf6d11816f32e2b0033059bb4dee84908d67382 100644 (file)
--- 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
        <c' e g c>\arpeggio
 @end lilypond
 

diff --git a/VERSION b/VERSION
index 0fca4aaab54ab214c361d58cebd34d8b087203d6..10726fa34fa022c7f51f33ba7cba68fdb4dab699 100644 (file)
--- 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 61b7da3e7b03149692928215aa64b7969e3566f9..e77d3dcab4e2205f2ccc8aa4f70076f490755dcb 100644 (file)
--- 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 bfafd7746a17a2c5efbc2ef810e75e47a9e9575c..17c527f21e08f7822039ec0b650932b11e7cbf95 100644 (file)
--- 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 65beee7e9dddd68da6198745078d44c45e0380be..2ccd995b032719214d7a04767cd76da265c01e97 100644 (file)
--- 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 d2b2885ed47d453d6d2bea43851db1681bd7f734..49b4cfa20990366c1b6915de4df9d9490818f730 100644 (file)
--- 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 7bf9198c255166ad5a998b2cfb9efdf0c98989d2..3d98fc25115bef5206c1458e4f7be91792ef00c5 100644 (file)
--- 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 efbcdd87488da98aff998fd65b112f8346072f5c..f1c27d6e20314c3aea728a868ed82ba5352fbd03 100644 (file)
--- 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 38f10b8b583cd573a8155cd4d0dc2fe0c21933cf..b282616743e827f5238dee231cb398fe09ee0d78 100644 (file)
--- 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))