lilypond-1.0.12

diff --git a/Documentation/tex/tutorial.yo b/Documentation/tex/tutorial.yo
index 1f0d591e5fb466bbbd0fa21574006dd373361076..a8e7f025e263a8602af0f4b241c836d02f259bf9 100644 (file)
--- a/Documentation/tex/tutorial.yo
+++ b/Documentation/tex/tutorial.yo
@@ -3,8 +3,6 @@ COMMENT(-*-text-*-)
 redef(var)(1)(whenlatex(latexcommand({\normalfont\scshape )ARG1+latexcommand(}))\
     whenhtml(sc(ARG1)))
 
-def(mycode)(1)(tt(ARG1))
-
 COMMENT( This document contains Mudela fragments.  You need at least
 Yodl-1.30.18 to convert this to tex or html.
 
@@ -62,7 +60,10 @@ latexcommand(\def\preexample{\par})
 latexcommand(\def\postexample{\par\medskip})
 latexcommand(\def\file#1{{mycode(#1)}})
 
+COMMENT(urg, texinfo include breaks)
+whenhtml(
 includefile(html-disclaimer.yo-urg)
+)
 
 sect(Introduction)
 label(tutorial:introduction)
@@ -1444,7 +1445,7 @@ mudela(verbatim)(
     >
     \paper {
       linewidth = -1.0;
-      stem_length = 12.0*\internote;
+      stem_length = 6.0*\interline;
     }
   }
 )

diff --git a/aclocal.m4 b/aclocal.m4
index 9400efd8e00172970fa2f0c4c279c4090e66f6d4..9aae46c03267a191383438dfc08167654ed3afa5 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -229,7 +229,7 @@ dnl    fi
     AC_CHECK_PROGS(TAR, tar, error)
     AC_CHECK_PROGS(BASH, bash, /bin/sh)
 
-    AC_PATH_PROG(PYTHON, python, -echo no python)
+    AC_PATH_PROG(PYTHON, ${PYTHON:-python}, -echo no python)
     AC_SUBST(PYTHON)
 
 

diff --git a/buildscripts/ps-to-gifs.sh b/buildscripts/ps-to-gifs.sh
index b342cbc2994e20871b4526e8138f9811f72be2c4..0f4afe0a5ab7177bd0a7916f0e681687fc697f60 100644 (file)
--- a/buildscripts/ps-to-gifs.sh
+++ b/buildscripts/ps-to-gifs.sh
@@ -75,7 +75,7 @@ fi
 rm -f $BASE{.ppm,.$GIF} $BASE-page*{.ppm,.$GIF}
 
 # generate the pixmap at twice the size, then rescale (for antialiasing)
-cat $FILE | gs -sDEVICE=ppmraw $SIZE -sOutputFile="$BASE-page%d.ppm" -r200 -dNOPAUSE - -c quit $FILE
+cat $FILE | gs -sDEVICE=ppmraw $SIZE -sOutputFile="$BASE-page%d.ppm" -r180 -dNOPAUSE - -c quit $FILE
 # quant is soo slow
 # cat $PPMFILE | ppmquant 2 | pnmscale 0.3333 | pnmcrop | $PNMTOGIF $color > $OUTFILE
 PPMS=`ls $BASE*ppm`

diff --git a/config.make.in b/config.make.in
index 1cc983d7c58531a06d853054f26b76685b48fc8b..021262f2525f5269960ad1f67d46b83078779978 100644 (file)
--- a/config.make.in
+++ b/config.make.in
@@ -52,6 +52,7 @@ PATHSEP = @PATHSEP@
 PERL = @PERL@
 PYTHON = @PYTHON@
 TAR= @TAR@
+STRIPROFF = @STRIPROFF@
 TROFF = @TROFF@
 YODL= @YODL@
 YODL2HTML= @YODL2HTML@

diff --git a/lily/plet-spanner.cc b/lily/plet-spanner.cc
index 4ec3c8d623112d468251f2061b0ab4389d9014d1..5b7637f12e103b07a417c55bbb54dcbb5cc3b3d2 100644 (file)
--- a/lily/plet-spanner.cc
+++ b/lily/plet-spanner.cc
@@ -119,7 +119,7 @@ Plet_spanner::do_post_processing ()
   do {
     if (stem_l_drul_[d]->empty_b ())
       {
-       Direction u = d;
+        Direction u = d;
        flip (&u);
        dy_f_drul_[d] = dy_f_drul_[u]; // ughugh \[/3 r8 c8 r8 \]/1
       }