From: fred <fred>
Date: Tue, 26 Mar 2002 21:50:41 +0000 (+0000)
Subject: lilypond-1.1.50
X-Git-Tag: release/1.5.59~2393
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=9d58893402d546bb2b8bc615a7f9ee68df1f22dd;p=lilypond.git

lilypond-1.1.50
---

diff --git a/buildscripts/lilypond.sh b/buildscripts/lilypond.sh
new file mode 100644
index 0000000000..e3d8e70b63
--- /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 ac4f39243c..dd4e90efb8 100644
--- 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 ef1616a382..0102377824 100644
--- 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 e439ab17b3..cb2f9f3cf1 100644
--- 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 90bebc6d7d..86df45795e 100644
--- 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"