Merge fix.

diff --git a/ChangeLog b/ChangeLog
index 965336cb9925ac9a597335481ede2329d1a66504..b027bd9079c91c2ed806820d53aa932b5fbc3d6f 100644 (file)
--- 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 12a07075dfe494faeff65aa7fc5eadc3c5162926..de5f81ebc907f57f2c941a4ad3aec946e8c55392 100644 (file)
--- 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 1a6279c70a03099ccd39979dea055f78d6989971..a5d36ca7b737f892962d5c0bf876a6050720cb09 100644 (file)
--- 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 eb7e867cb9ef2d6181c97b57ce69cac0a01ab382..38c085a48edf60c25df89dc8d1a62cb280529680 100644 (file)
--- 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 a8163a0c5e6580e63cc55ec78c7386df6bad3230..9c32f628a4a644213036b36a55bf6659193b61bc 100644 (file)
--- 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),