* scm/part-combiner.scm (determine-split-list): switch off

debugging info.

* scm/backend-library.scm (postscript->png): explicitly use ps2png.py
if available.

diff --git a/ChangeLog b/ChangeLog
index c37a20d98275c5300ca258405fa21125f39d0491..e2889aa3b62b96ed0936661b730b3fb5e6b4aed3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2005-03-28  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * scm/part-combiner.scm (determine-split-list): switch off
+       debugging info.
+
+       * scm/backend-library.scm (postscript->png): explicitly use ps2png.py
+       if available.
+
        * scm/define-context-properties.scm
        (all-user-translation-properties): add stringNumberOrientations.
 

diff --git a/input/test/bar-lines.ly b/input/test/bar-lines.ly
index cb77cf90d4e3ca8f1b2e59b0d6dd7ca51beae1ff..3b78f1cc08fe22c3fcbfafed45a92b900958ca63 100644 (file)
--- a/input/test/bar-lines.ly
+++ b/input/test/bar-lines.ly
@@ -10,7 +10,7 @@
 \layout { raggedright = ##t }
 
 \relative {
-    \override Score.Mark #'padding = #3
+    \override Score.RehearsalMark #'padding = #3
     
     c4 \bar "|" \mark \markup {  \simple #"|" }
     c \bar "|:" \mark \markup {  \simple #"|:" }

diff --git a/scm/backend-library.scm b/scm/backend-library.scm
index 0f0ee521862d775fba515b8af7f806dfc39a6eec..ca2b984d88e905218ce9be412b1cddbdf479428a 100644 (file)
--- a/scm/backend-library.scm
+++ b/scm/backend-library.scm
@@ -45,12 +45,19 @@
     (ly:system cmd)))
 
 (define-public (postscript->png resolution papersizename name)
-  (let ((cmd (format #f
-             "ps2png --resolution=~S --papersize=~a~a '~a'"
-             resolution
-             (sanitize-command-option papersizename)
-             (if (ly:get-option 'verbose) " --verbose " "")
-             name)))
+  (let* ((prefix (getenv "LILYPONDPREFIX"))
+        (ps2png-source (if prefix
+                          (format "~a/scripts/ps2png.py" prefix)
+                          "ps2png"))
+        (cmd (format #f
+                     "~a --resolution=~S --papersize=~a~a '~a'"
+                     (if (file-exists? ps2png-source)
+                         (format "python ~a" ps2png-source)
+                         "ps2png")
+                     resolution
+                     (sanitize-command-option papersizename)
+                     (if (ly:get-option 'verbose) " --verbose " "")
+                     name)))
     ;; Do not try to guess the name of the png file
     (format (current-error-port) (_ "Converting to `~a'...") "png")
     (ly:system cmd)))

diff --git a/scm/part-combiner.scm b/scm/part-combiner.scm
index 9e59dc2ad55d31afb29c10163604d9fdfea4edf7..c4ee06a550632052dfea1add74c8b6e923b69da8 100644 (file)
--- a/scm/part-combiner.scm
+++ b/scm/part-combiner.scm
@@ -430,7 +430,7 @@ the mark when there are no spanners active."
 
     (analyse-spanner-states voice-state-vec1)
     (analyse-spanner-states voice-state-vec2)
-    (if #t
+    (if #f
        (begin
          (display voice-state-vec1)
          (display "***\n")