From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Wed, 11 Feb 2004 01:49:37 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: release/2.1.23~42
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=43211009ef51c3fb6b7486b3915d452f6cc3c175;p=lilypond.git

*** empty log message ***
---

diff --git a/input/regression/balloon.ly b/input/regression/balloon.ly
index 6cf4acc561..3a9bd6154a 100644
--- 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 6b865e24ca..6dd67c9004 100644
--- 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 2c7c1a5e60..13cdd618c6 100644
--- 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 17c527f21e..0d007bde7e 100644
--- 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 1a7ae23662..571889caa2 100644
--- 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 2ccd995b03..35fc4f3cf2 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::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 3d98fc2511..aa7f5e9343 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::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 802e4e82a8..ffc0a93dbf 100644
--- 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,