*** empty log message ***

diff --git a/input/regression/balloon.ly b/input/regression/balloon.ly
index 6cf4acc561e767e4f4bde2a7121dec24bbf4b3f8..3a9bd6154ae7375c16e0fab3b1c606575654ed4f 100644 (file)
--- a/input/regression/balloon.ly
+++ b/input/regression/balloon.ly
@@ -11,8 +11,8 @@ with lines and explanatory text added."
    \relative c'  {
 
        %% by hand:
-       \once\property Voice.Stem \set #'print-function = #Balloon_interface::brew_molecule
-       \once\property Voice.Stem \set #'balloon-original-callback = #Stem::brew_molecule
+       \once\property Voice.Stem \set #'print-function = #Balloon_interface::print
+       \once\property Voice.Stem \set #'balloon-original-callback = #Stem::print
        \once\property Voice.Stem \set #'balloon-text = #"I'm a stem"
        \once\property Voice.Stem \set #'balloon-text-offset = #'(3 . 4)
        \once\property Voice.Stem \set #'balloon-text-props

diff --git a/input/regression/molecule-hacking.ly b/input/regression/molecule-hacking.ly
index 6b865e24ca226b9bb822ea3aeb0f5d4668a0f472..6dd67c9004a3f3a6fa6cbd47791e3358a95e2b6c 100644 (file)
--- a/input/regression/molecule-hacking.ly
+++ b/input/regression/molecule-hacking.ly
@@ -18,7 +18,7 @@ Example usage:
 
   \\property Voice.NoteHead \\override #'print-function
                      =
-                     #(parenthesize-callback Note_head::brew_molecule)
+                     #(parenthesize-callback Note_head::print)
                    
 "
 
@@ -61,12 +61,12 @@ GROB.  The dimensions of the molecule is not affected.
 
                    \property Voice.NoteHead \override #'print-function
                      =
-                     #(parenthesize-callback Note_head::brew_molecule)
+                     #(parenthesize-callback Note_head::print)
                    g bes
                    \property Voice.NoteHead \revert #'print-function
                    \property Voice.Beam \override #'print-function
                      =
-                     #(parenthesize-callback Beam::brew_molecule)
+                     #(parenthesize-callback Beam::print)
 
                    a8 gis8 a2.
                    

diff --git a/input/regression/spacing-folded-clef2.ly b/input/regression/spacing-folded-clef2.ly
index 2c7c1a5e602f5fd5fb4a4367cfe1b7e724c84862..13cdd618c611b54086fa0a341ad299f92fa35e6e 100644 (file)
--- a/input/regression/spacing-folded-clef2.ly
+++ b/input/regression/spacing-folded-clef2.ly
@@ -14,8 +14,8 @@ show where columns are in the score."
        \paper { raggedright = ##t
 
        \translator { \ScoreContext
-         NonMusicalPaperColumn \override #'print-function = #Paper_column::brew_molecule
-         PaperColumn \override #'print-function = #Paper_column::brew_molecule   
+         NonMusicalPaperColumn \override #'print-function = #Paper_column::print
+         PaperColumn \override #'print-function = #Paper_column::print   
          NonMusicalPaperColumn \override #'font-family = #'roman
          PaperColumn \override #'font-family = #'roman   
 

diff --git a/input/test/boxed-molecule.ly b/input/test/boxed-molecule.ly
index 17c527f21e08f7822039ec0b650932b11e7cbf95..0d007bde7e34271b2a176b6655f02a60fc7c700d 100644 (file)
--- a/input/test/boxed-molecule.ly
+++ b/input/test/boxed-molecule.ly
@@ -9,15 +9,15 @@ You can override the print-function to draw a box around arbitrary grobs. " }
  \score { \notes \relative c''  {
 
  \property Voice.TextScript \override #'print-function =
-   #(make-molecule-boxer 0.1 0.3 0.2 brew-new-markup-molecule)
+   #(make-molecule-boxer 0.1 0.3 0.2 Text_item::print)
 
    c'4^"foo"
 
 \property Voice.Stem \override #'print-function =
-   #(make-molecule-boxer 0.05 0.25 0.25 Stem::brew_molecule)
+   #(make-molecule-boxer 0.05 0.25 0.25 Stem::print)
 
 \property Score.RehearsalMark \override #'print-function =
-   #(make-molecule-boxer 0.15 0.3 0.3 brew-new-markup-molecule)
+   #(make-molecule-boxer 0.15 0.3 0.3 Text_item::print)
       c8
 \property Voice.Stem \revert #'print-function
 

diff --git a/input/test/engraver-one-by-one.ly b/input/test/engraver-one-by-one.ly
index 1a7ae23662f0d85ab3676399c31063c385228b56..571889caa21ba86bd05c9603d92520c857ea1043 100644 (file)
--- a/input/test/engraver-one-by-one.ly
+++ b/input/test/engraver-one-by-one.ly
@@ -45,8 +45,6 @@ MyStaffContext=\translator {
 
        \consists "Volta_engraver"
        \consists "Separating_line_group_engraver"      
-       SeparatingGroupSpanner \override #'spacing-procedure
-         =  #Separating_group_spanner::set_spacing_rods_and_seqs
        \consists "Dot_column_engraver"
 
        \consists "Ottava_spanner_engraver"

diff --git a/input/test/time-signature-double.ly b/input/test/time-signature-double.ly
index 2ccd995b032719214d7a04767cd76da265c01e97..35fc4f3cf28d8cb925001b8a9363b168d5e17bf3 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::print_function
+          \property Staff.TimeSignature \override #'print-function = #Text_item::print
           \property Staff.TimeSignature \override #'text = #tsMarkup
           
           

diff --git a/scm/music-functions.scm b/scm/music-functions.scm
index 3d98fc25115bef5206c1458e4f7be91792ef00c5..aa7f5e9343556db1c721eb7db1f31f4caf05345d 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::print_function)
+     (ly:set-grob-property! grob 'print-function Balloon_interface::print)
      (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/scripts/convert-ly.py b/scripts/convert-ly.py
index 802e4e82a8fbe2a4e976ee830ad574b3a7c78964..ffc0a93dbf804ae68815428d8cd930960178fb34 100644 (file)
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -1824,6 +1824,7 @@ conversions.append (((2,1,20), conv, """nonevent-skip -> skip-music""" ))
 def conv (str):
        str = re.sub (r'molecule-callback', 'print-function', str)
        str = re.sub (r'brew_molecule', 'print', str)
+       str = re.sub (r'brew-new-markup-molecule', 'Text_item::print', str)
        return str
 
 conversions.append (((2,1,21), conv, """molecule-callback -> print-function,