(set_relocation): set PANGO_PREFIX

diff --git a/ChangeLog b/ChangeLog
index b5190ee3f6953889cbd9504328e500494ead6cbb..74f78cb45ce51d25d62b4b308431b5cefb21d22e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-12-25  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * lily/relocate.cc (set_relocation): set PANGO_PREFIX
+
 2005-12-23  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * lily/melody-engraver.cc (class Melody_engraver): Remove lying

diff --git a/Documentation/topdocs/NEWS.tely b/Documentation/topdocs/NEWS.tely
index 8180151c4048cfe7d00595442dc36eb9fbd83258..5368d931081279e85a798b23c8cf5c490392b425 100644 (file)
--- a/Documentation/topdocs/NEWS.tely
+++ b/Documentation/topdocs/NEWS.tely
@@ -38,7 +38,8 @@ See user manual, \NAME\
 @unnumbered New features in 2.7 since 2.6
 
 @ifhtml
-This document is also available in @uref{NEWS.pdf,PDF}.
+This document is also available in @uref{NEWS.pdf,PDF}. It's part of
+the @uref{../,LilyPond Documentation} 
 @end ifhtml
 
 
@@ -646,7 +647,10 @@ This feature was sponsored by Sven Axelsson.
 
 @ifhtml
 For older news, go to
-@uref{http://lilypond.org/doc/v2.6/Documentation/topdocs/NEWS.html}.
+@uref{http://lilypond.org/doc/v2.6/Documentation/topdocs/NEWS.html},
+or @uref{../,go back} to the Documentation index.
+
+
 @end ifhtml
 
 @bye

diff --git a/lily/relocate.cc b/lily/relocate.cc
index 1530e657269fc587d1b2fbf380bbe290b20131f8..db4b6c6074e82a854874a4a36edff0549f24135a 100644 (file)
--- a/lily/relocate.cc
+++ b/lily/relocate.cc
@@ -46,7 +46,7 @@ set_env_file (char const *key, String value)
   if (is_file (value))
     return sane_putenv (key, value, false);
   else if (be_verbose_global)
-    warning (_f ("no such file: %s", value));
+    warning (_f ("no such file: %s for %s", value, key));
   return -1;
 }
 
@@ -126,7 +126,8 @@ set_relocation (String bindir, String prefix)
                    + to_string ("/guile/%d.%d",
                                 SCM_MAJOR_VERSION, SCM_MINOR_VERSION));
   set_env_file ("PANGO_RC_FILE", sysconfdir + "/pango/pangorc");
-  set_env_file ("PANGO_PREFIX", prefix);
+
+  sane_putenv ("PANGO_PREFIX", prefix);
                
   prepend_env_path ("PATH", bindir);
 }

diff --git a/scm/define-grob-properties.scm b/scm/define-grob-properties.scm
index 82d9a3654d16d1075331a7196127a33b9b7dd736..5ff4515fc3a86ebabd3cbd961f6f6f53748ff769 100644 (file)
--- a/scm/define-grob-properties.scm
+++ b/scm/define-grob-properties.scm
@@ -24,7 +24,7 @@
    `(
      (X-offset ,number? "The horizontal amount that this object is moved relative to its X-parent")
      (Y-offset ,number? "The vertical amount that this object is moved
-relative to its X-parent")
+relative to its Y-parent")
      (accidentals ,list? "List of alteration numbers")
      (after-line-breaking ,boolean? "Dummy property, used to trigger callback for after-line-breaking")
      (alteration-alist ,list? "List of @code{(@var{pitch}