From 8d1022349a3cc2fbffdc40b5fc26f6913a453e7c Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Mon, 28 Mar 2005 19:50:16 +0000
Subject: [PATCH] * scm/part-combiner.scm (determine-split-list): switch off
 debugging info.

* scm/backend-library.scm (postscript->png): explicitly use ps2png.py
if available.
---
 ChangeLog               |  6 ++++++
 input/test/bar-lines.ly |  2 +-
 scm/backend-library.scm | 19 +++++++++++++------
 scm/part-combiner.scm   |  2 +-
 4 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c37a20d982..e2889aa3b6 100644
--- 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 cb77cf90d4..3b78f1cc08 100644
--- 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 0f0ee52186..ca2b984d88 100644
--- 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 9e59dc2ad5..c4ee06a550 100644
--- 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")
-- 
2.39.5