* scripts/lilypond-book.py

(Lilypond_snippet.output_print_filename): backport href fix

* scm/backend-library.scm (search-gs): backport gs searching fix.

diff --git a/ChangeLog b/ChangeLog
index 6f76d32ac2309177dd27c16d4ccfa831ab81a48a..4040821163f75e79957a50a0e95b3c962bb24976 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-04-06  Han-Wen Nienhuys  <hanwen@lilypond.org>
+
+       * scripts/lilypond-book.py
+       (Lilypond_snippet.output_print_filename): backport href fix
+
+       * scm/backend-library.scm (search-gs): backport gs searching fix.
+
 2006-04-06  Werner Lemberg  <wl@gnu.org>
 
        * ly/engraver-init.ly (\Score): Add beam-event to quotedEventTypes

diff --git a/scm/backend-library.scm b/scm/backend-library.scm
index 71275a9ea938de74fe33931a30d6a97e2826c3b9..dd4698500899717d86692135a5d0f359cb73385a 100644 (file)
--- a/scm/backend-library.scm
+++ b/scm/backend-library.scm
@@ -45,7 +45,7 @@
     (helper path names)))
 
 (define-public (search-gs)
-  (search-executable '("gs-nox" "gs-8.15" "gs")))
+  (search-executable '("gs")))
 
 (define-public (postscript->pdf papersizename name)
   (let* ((pdf-name (string-append (basename name ".ps") ".pdf"))

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index 4fbadf98134ed0154b21bc4d2fd840178162f68f..05ba3075435981f9ffb92c1e67a3cacfc423e079 100644 (file)
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -605,7 +605,7 @@ output = {
 
                PRINTFILENAME: '''
 @html
-<a href="%(filename)s">
+<a href="%(base)s">
 @end html
 @file{%(filename)s}
 @html