From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Sun, 10 Oct 2004 11:53:34 +0000 (+0000)
Subject: Merge fix.
X-Git-Tag: release/2.3.22~12
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=515fb7f83e12364c02948c3d077c52b605a96b9a;p=lilypond.git

Merge fix.
---

diff --git a/ChangeLog b/ChangeLog
index 965336cb99..b027bd9079 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-10-10  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+	* scm/framework-tex.scm: Merge fix.
+
 2004-10-09  Jan Nieuwenhuizen  <janneke@gnu.org>
 
 	The grand \paper -> \layout, \bookpaper -> \paper renaming.
diff --git a/input/regression/staff-mixed-size.ly b/input/regression/staff-mixed-size.ly
index 12a07075df..de5f81ebc9 100644
--- a/input/regression/staff-mixed-size.ly
+++ b/input/regression/staff-mixed-size.ly
@@ -27,7 +27,7 @@ large on smaller staves."
   >>
 
   \layout {
-    #(paper-set-staff-size 6)
+    #(layout-set-staff-size 6)
     raggedright = ##t
   }
 }
diff --git a/input/test/title-markup.ly b/input/test/title-markup.ly
index 1a6279c70a..a5d36ca7b7 100644
--- a/input/test/title-markup.ly
+++ b/input/test/title-markup.ly
@@ -95,7 +95,7 @@ spaceTest = \markup { "two space chars" }
 	    c2-\sizeTest c2-\spaceTest
 	}
 	\layout {
-	    #(paper-set-staff-size (* 11.0 pt)) 
+	    #(layout-set-staff-size (* 11.0 pt)) 
 	}
     }
     
diff --git a/scm/framework-tex.scm b/scm/framework-tex.scm
index eb7e867cb9..38c085a48e 100644
--- a/scm/framework-tex.scm
+++ b/scm/framework-tex.scm
@@ -281,15 +281,14 @@
      )))
 
 (define-public (convert-to-ps book name)
-  (let*
-      ((bookpaper  (ly:paper-book-book-paper book))
-       (papersize (ly:output-def-lookup bookpaper 'papersizename))
-       (landscape? (eq? #t (ly:output-def-lookup bookpaper 'landscape)))
-       (cmd (string-append "dvips -t " papersize
-			   (if landscape? " -t landscape " " ") 
-			   "  -u+ec-mftrace.map -u+lilypond.map -Ppdf "
-			   (basename name ".tex"))))
-
+  (let* ((paper (ly:paper-book-paper book))
+	 (papersize (ly:output-def-lookup paper 'papersizename))
+	 (landscape? (eq? #t (ly:output-def-lookup paper 'landscape)))
+	 (cmd (string-append "dvips -t " papersize
+			     (if landscape? " -t landscape " " ") 
+			     "  -u+ec-mftrace.map -u+lilypond.map -Ppdf "
+			     (basename name ".tex"))))
+    
     (display (format #f (_ "Invoking ~S") cmd) (current-error-port))
     (newline (current-error-port))
     (system cmd)))
diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index a8163a0c5e..9c32f628a4 100644
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -2219,6 +2219,7 @@ conversions.append (((2, 3, 18),
 def conv (str):
 	str = re.sub (r'\\paper', r'\\layout', str)
 	str = re.sub (r'\\bookpaper', r'\\paper', str)
+	str = re.sub (r'paper-set-staff-size', r'layout-set-staff-size', str)
 	return str
 
 conversions.append (((2, 3, 22),