From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Wed, 25 Nov 1998 21:52:54 +0000 (+0100)
Subject: patch::: 1.1.8.hwn3
X-Git-Tag: release/1.1.9~2
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=8ffa25ffc2ea8629325e457dca428dd670ebead3;p=lilypond.git

patch::: 1.1.8.hwn3

pl 8.hwn3
	- coriolan corno 1

---
Generated by hanwen@cs.uu.nl using package-diff 0.62,
From = lilypond-1.1.8.hwn2, To = lilypond-1.1.8.hwn3

usage

    cd lilypond-source-dir; patch -E -p1 < lilypond-1.1.8.hwn3.diff

Patches do not contain automatically generated files
or (urg) empty directories,
i.e., you should rerun autoconf, configure
and possibly make outdirs.

--state
1.1.8.hwn2
1.1.8.hwn3
++state
---

diff --git a/NEWS b/NEWS
index 3abc2f98e6..f6d280dee0 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,12 @@
---- ../lilypond-1.1.8.hwn1/NEWS	Sun Nov 22 20:43:39 1998
+--- ../lilypond-1.1.8.hwn2/NEWS	Wed Nov 25 14:00:43 1998
+++ b/NEWS	Wed Nov 25 22:52:54 1998
+@@ -1,3 +1,6 @@
+pl 8.hwn3
+	- coriolan corno 1
+
+ pl 8.hwn2
+ 	- more output revamping.
+ --- ../lilypond-1.1.8.hwn1/NEWS	Sun Nov 22 20:43:39 1998
 ++ b/NEWS	Wed Nov 25 14:00:43 1998
 @@ -1,4 +1,8 @@
 pl 8.hwn2
diff --git a/TODO b/TODO
index 8a2255c065..ab8d77667f 100644
--- a/TODO
+++ b/TODO
@@ -39,10 +39,10 @@ BUGS:
 
 	* The time signature warnings still remain, will be fixed later.
 
-	Summary of minor spelling irregularities:
+ii	Summary of minor spelling irregularities:
 	-  capitalization/use of underscores in property names
 
-	* fix Score.skipBars
+	* fix SkipBars  -> skipBars
 
 	* repeat bars: need distance after ":|" and before "|:"
 
diff --git a/VERSION b/VERSION
index 3982b9e251..c69d99a3b9 100644
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=1
 PATCH_LEVEL=8
-MY_PATCH_LEVEL=hwn2
+MY_PATCH_LEVEL=hwn3
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.
diff --git a/init/lily.scm b/init/lily.scm
index be28d088f9..a0bc2888e7 100644
--- a/init/lily.scm
+++ b/init/lily.scm
@@ -57,8 +57,21 @@
   1)
 
 ;;;;;;;;
-  (define (emptybar h)
-    (string-append ""))
+
+  (define (empty) 
+    "")
+
+  (define (empty1 a)
+    "")
+
+  (define (empty2 a b )
+    "")
+  
+
+(define emptybar empty1)
+(define setdynamic empty1)
+(define settext empty1)
+(define setnumber empty1)
 
 
 ;;;;;;;; TeX
@@ -89,10 +102,7 @@
 
   (define (end-output) 
     "\n\\EndLilyPondOutput")
-
-  (define (empty) 
-    "%\n\\empty%\n")
-
+  
   (define (experimental-on) "\\turnOnExperimentalFeatures")
 
   (define (extender o h)
diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc
index 1652449551..b729e90590 100644
--- a/lily/lily-guile.cc
+++ b/lily/lily-guile.cc
@@ -25,9 +25,7 @@
 SCM
 ly_quote_scm (SCM s)
 {
-  //  return scm_m_quote (s, SCM_UNDEFINED);
   return scm_cons2 (scm_i_quote, s, SCM_EOL);
-  
 }
 
 /*
diff --git a/mutopia/Coriolan/coriolan-part-paper.ly b/mutopia/Coriolan/coriolan-part-paper.ly
index 3499e9627c..9d24ed2e61 100644
--- a/mutopia/Coriolan/coriolan-part-paper.ly
+++ b/mutopia/Coriolan/coriolan-part-paper.ly
@@ -1,4 +1,8 @@
-\paper { 
+\paper {
 	\translator { \OrchestralPartStaffContext }
-	\translator { \ScoreContext skipBars = 1; }
+	\translator { \ScoreContext
+		SkipBars = 1;
+	}
+	castingalgorithm = \Wordwrap;
+	
 }
diff --git a/mutopia/Coriolan/corni-part.ly b/mutopia/Coriolan/corni-part.ly
index f0d3b0ab50..305c4ac1da 100644
--- a/mutopia/Coriolan/corni-part.ly
+++ b/mutopia/Coriolan/corni-part.ly
@@ -17,3 +17,4 @@ copyright =	 "public domain";
 	\midi{ \tempo 4 = 160; }
 }
 
+
diff --git a/mutopia/Coriolan/corno-1.ly b/mutopia/Coriolan/corno-1.ly
index 903812a0e7..e05d0c0ac3 100644
--- a/mutopia/Coriolan/corno-1.ly
+++ b/mutopia/Coriolan/corno-1.ly
@@ -16,7 +16,92 @@ corno1 = \notes \relative c {
 	r2 r4 g4-.\f | R1*6 | r4 g-.\f r2 | R1*2 | 
 	% `a 2
 	r8 f\p_"\ \ \ cresc." f2 e4 | r8 f f2 e4 |
-	f4. e8 f4. e8 | f4. e8 f4. e8 | d,1\ff % ~ |
-	%35
+	f4. e8 f4. e8 | f4. e8 f4. e8 | f1\ff % ~ |
+	f4 ( e f )e
+	e4. r8 	e4. r8 |
+	e4. r8 	e4. r8 |
+	e4. r8  d4. r8 |
+	g4. r8 f4. r8
+	c2 \sf r2
+	c2 \sf r2
+	R1*2
+	e1 \sf c1\sf  g2. g4 \sf g2. g4 \sf g2. g4\sf g2. g4\sf g r4 r2 |
+	r1 g1 ~ g ~ g~ g~ g~ g~ g~ g~ g
+	g2\ff d'2 e1
+	R1*14
+	c2. \ff e4
+	r4 e r e c2. e4 r4 e r e
+	f2. e4 e e e e f2. e4 e e e e |
+	r4 r8 c8 c2\sf
+	r4 r8 c8 c2\sf
+	r4 r8 c8 c2\sf
+	r4 r8 c8 c2\sf			
+	c4 r4 c r |
+	e4 r e r
+	r2 e4 r
+	r2 e4 r |
+	R1*4	
+	e4\f r4 r2 r1
+	e4\f r4 r2
+	R1*3
+	e4\f r8 e e4 r8 e |
+	e4   r8 e e4 r8 e |
+	e4   r8 e g4 r8 g |
+	g4   r8 g8 r2
+	g1 ~ g |
+	g4. g8 g4 r8 g |
+	g4  r8 g8 g4 r8 g8
+	g4\p r4 r2
+	R1*16
+	d4\f r4 r2
+	g4 r r2
+	g4 r8 g g4 r8 g |
+	g4 r8 g g4 r8 g |
+	f4\p r4 r2 |
+	R1*3
+	f4 r e r
+	d r c r
+	g' r f r
+	e r e r
+	d r r2 |
+	r1
+	d4-.\ff r4 r2
+	R1*3
+	f2\sf r2 f2 \sf r2
+	R1*3
+	e2\ff r2 e \sf r2
+	R1*3
+	d2.\ff r4 	d2. r4 |
+	d2. r4  	d2. r4
+	e2. r4		e2. r4
+	e2. r4		e2. r4
+	e4 r4 r2 r1
+	R1*11
+	e2 d2
+	R1*17
+	r4 r8 e,8 e4. e8|
+	r4 r8 e8 e4. e8|
+	r4 r8 e8 e4. e8|
+	r4 r8 e8 e4. e8|
+	r4 r8 e8 e4. e8|
+	r4 r8 e8 e4. e8|
+	f2. e4 d e d e
+	f2. e4 d e d e
+	g2. f4 g f g f 		
+	g2. f4 g f g f 		
+	r4 r8 f f2
+	r4 r8 f f2
+	r4 r8 f f2
+	r4 r8 f f2				
+	f2 e~ | e d~ | d1 ~ d1
+	d4 r4 f r d r e r
+	r1
+	r2 r4 r8 e\f e4 r4 r2
+	r2 r4 r8 e8 e4 r r2
+	R1*3
+	
+	
+
+	
 }