lilypond-1.3.130

diff --git a/Documentation/user/invoking.itexi b/Documentation/user/invoking.itexi
index 55a3b804067d2f127d76e977da6f7d84624ba054..e5e8dd30e678edf5f39f8f926eab066b86714092 100644 (file)
--- a/Documentation/user/invoking.itexi
+++ b/Documentation/user/invoking.itexi
@@ -17,7 +17,20 @@
 @item -f,--format=
 Output format for sheet music. Choices are tex (for @TeX{}
 output), ps (for PostScript) and scm (for a Scheme
-dump)
+dump).
+
+For processing both the @TeX{} and the PostScript output, you must
+have appropriate environment variables set.  For @TeX{}, you have to
+set @var{MFINPUTS} and @var{TEXINPUTS} to point to the directory
+containing LilyPond metafont and .tex files.  For processing the
+PostScript with Ghostscript, you have to set @var{GS_FONTPATH} to
+point to the directory containing LilyPond @file{pfa} files.
+
+Scripts to do this are included in
+@file{buildscripts/out/lilypond-profile} (for sh shells) and
+@file{buildscripts/out/lilypond-login} (for C-shells), and should
+normally be run as part of your login process.
+
 
 @item -h,--help
 Show a summary of usage.

diff --git a/buildscripts/lilypond-profile.sh b/buildscripts/lilypond-profile.sh
index f2083862dea1dfe89f225c2defb5d81787cd8998..7dbb5dd4673aa41a47e1309c9f2440fddd62997e 100644 (file)
--- a/buildscripts/lilypond-profile.sh
+++ b/buildscripts/lilypond-profile.sh
@@ -11,6 +11,8 @@ LILYPONDPREFIX="@datadir@"
 MFINPUTS="@datadir@/mf:"${MFINPUTS:=":"}
 TEXINPUTS="@datadir@/tex:@datadir@/ps:"${TEXINPUTS:=":"}
 
+
+## gs_lib ??? 
 export LILYINCLUDE LILYPONDPREFIX MFINPUTS TEXINPUTS GS_LIB GS_FONTPATH
 
        

diff --git a/lily/staff-symbol-referencer.cc b/lily/staff-symbol-referencer.cc
index 1341bf9a02625e26e01f8a825ed42430508c05da..da1ae75483d048657b5fa09118f272585406e375 100644 (file)
--- a/lily/staff-symbol-referencer.cc
+++ b/lily/staff-symbol-referencer.cc
@@ -11,7 +11,7 @@
 #include "staff-symbol-referencer.hh"
 #include "staff-symbol.hh"
 #include "paper-def.hh"
-
+ 
 bool
 Staff_symbol_referencer::has_interface (Grob*e)
 {
@@ -29,7 +29,7 @@ Staff_symbol_referencer::line_count (Grob*me)
 bool
 Staff_symbol_referencer::on_staffline (Grob*me)
 {
-  return on_staffline (me, (int) position_f (me));
+  return on_staffline (me, (int) rint (position_f (me)));
 }
 
 bool