lilypond-1.1.50

diff --git a/buildscripts/lilypond.sh b/buildscripts/lilypond.sh
new file mode 100644 (file)
index 0000000..e3d8e70
--- /dev/null
+++ b/buildscripts/lilypond.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+# via scm wrapper
+
+foo=lilypond.$$
+trap "rm $foo" 1 2 15
+touch lilypond.$$
+
+$LILYPONDPREFIX/lily/out/lilypond -f scm $*
+scm=`find . -maxdepth 1 -cnewer $foo -and -name '*.scm'`
+for i in $scm; do
+       dir=`dirname $i`
+       base=`basename $i .scm`
+       file=$dir/$base.tex
+       rm -f $file
+       guile -s $i > $file
+done
+rm -f $scm
+rm $foo

diff --git a/lily/bar.cc b/lily/bar.cc
index ac4f39243c2d5da43b75e1a8c381484c64c97e7d..dd4e90efb81164966c4406a0ba3d8e9460e672a0 100644 (file)
--- a/lily/bar.cc
+++ b/lily/bar.cc
@@ -56,7 +56,7 @@ static char const *bar_breaks[][3] ={
   {":|", ":|:", "|:"},
   {"|", "|", ""},
   {"", "|s", "|"},
-  {"", "|:", "|:"},
+  {"|", "|:", "|:"},
   {"|.", "|.", ""},
   {":|", ":|", ""},
   {"||", "||", ""},

diff --git a/lily/paper-stream.cc b/lily/paper-stream.cc
index ef1616a382eb5ce74d800284da1445ee8235b863..01023778241cdb0687a866060585d4faaa703bf4 100644 (file)
--- a/lily/paper-stream.cc
+++ b/lily/paper-stream.cc
@@ -105,6 +105,7 @@ Paper_stream::operator << (Scalar s)
 void
 Paper_stream::break_line ()
 {
+  // aaargh
   *os << "%\n";
   *os << to_str (' ', nest_level);
   line_len_i_ = 0;

diff --git a/ly/paper16.ly b/ly/paper16.ly
index e439ab17b3486116dd288571ea0e6763ee0cc28e..cb2f9f3cf14db92386844bb8de88d1c8ceb2a5dc 100644 (file)
--- a/ly/paper16.ly
+++ b/ly/paper16.ly
@@ -25,8 +25,8 @@ paper_sixteen = \paper {
         arithmetic_multiplier = 4.8\pt;
        texsetting = "\\input lilyponddefs \\musixsixteendefs ";
        pssetting = "(lilyponddefs.ps) findlibfile {exch pop //systemdict /run get exec} { /undefinedfilename signalerror } ifelse\n";
-       scmsetting = "(display \"(lilyponddefs.ps) findlibfile {exch pop //systemdict /run get exec} { /undefinedfilename signalerror } ifelse\");\n";
-       scmsetting = "(display \"\\\\input lilyponddefs \\\\musixsixteendefs\");\n";
+       scmsetting = "\"(lilyponddefs.ps) findlibfile {exch pop //systemdict /run get exec} { /undefinedfilename signalerror } ifelse\";\n";
+       scmsetting = "\"\\\\input lilyponddefs \\\\musixsixteendefs\";\n";
 
        0 = \font "feta16" 
        -1 = \font "feta13"

diff --git a/ly/paper20.ly b/ly/paper20.ly
index 90bebc6d7d3fd015a9893b89a603ea4aa8a0f83f..86df45795e6a769aec590abc77966769e0b39b33 100644 (file)
--- a/ly/paper20.ly
+++ b/ly/paper20.ly
@@ -33,8 +33,8 @@ paper_twenty = \paper {
        texsetting = "\\input lilyponddefs \\musixtwentydefs ";
        pssetting = "(lilyponddefs.ps) findlibfile {exch pop //systemdict /run get exec} { /undefinedfilename signalerror } ifelse\n";
        % urg, debugging only
-       scmsetting = "(display \"(lilyponddefs.ps) findlibfile {exch pop //systemdict /run get exec} { /undefinedfilename signalerror } ifelse\");\n";
-       scmsetting = "(display \"\\\\input lilyponddefs \\\\musixtwentydefs\");\n";
+       scmsetting = "\"(lilyponddefs.ps) findlibfile {exch pop //systemdict /run get exec} { /undefinedfilename signalerror } ifelse\";\n";
+       scmsetting = "\"\\\\input lilyponddefs \\\\musixtwentydefs\";\n";
 
        -2 = \font "feta13"
        -1 = \font "feta16"