From aeb2de649b6409561db9d4530ef6c1eef56f0445 Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Fri, 12 Sep 2003 09:34:32 +0000
Subject: [PATCH] (sarabandeA): octave fixes.

---
 ChangeLog                                        | 13 +++++++++++++
 input/mutopia/J.S.Bach/baerenreiter-sarabande.ly | 14 ++++----------
 lily/lexer.ll                                    | 12 ++++++------
 3 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 45952eb896..bf4ad56a15 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2003-09-12  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+
+	* input/mutopia/J.S.Bach/baerenreiter-sarabande.ly (sarabandeA):
+	octave fixes.
+
+2003-09-10  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+
+	* lily/lexer.ll: add \r to the rules for newlines; this fixes
+	problems on older Mac editors.
+
+	* configure.in: release 1.9.5
+	
 2003-09-12  Juergen Reuter  <reuter@ipd.uka.de>
 
 	* mf/parmesan-clefs.mf: more set_char_box() fixes and code cleanup
@@ -23,6 +35,7 @@
 	shortened to avoid almost-collision with staff line; code cleanup;
 	other custodes: fixed char boxes; code cleanup
 
+>>>>>>> 1.1333
 2003-09-09  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
 	* scripts/lilypond.py (global_latex_preamble): only set
diff --git a/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly b/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly
index fb1018520e..b875d75a03 100644
--- a/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly
+++ b/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly
@@ -2,10 +2,7 @@
 
 % #(ly:set-point-and-click 'line-column)
 
-forcedBreak = \notes { }
-%%forcedBreak = \notes { \break }
 forcedLastBreak = \notes { \break }
-%%forcedLastBreak = \notes { }
 
 %% We want this to perfectly match the Baerenreiter spacing.
 %% If we're not using 6 systems, there's definately a problem.
@@ -68,10 +65,10 @@ sarabandeA =  \context Voice \notes \relative c {
     { <a, f>4 a2 <a d,>4.  } >> |
 
   %%7
-  g8 bes16(a) c(bes) a(g) d'8 f, |
+  g'8 bes16(a) c(bes) a(g) d'8 f, |
   <<  e4.\trill
     \\ <c, g'>4 >>
-  d8[ c bes]
+  d'8[ c bes]
 
   %%9
   << { f'8 g16(a) a4. g16(f)  |
@@ -79,10 +76,9 @@ sarabandeA =  \context Voice \notes \relative c {
     \\
     { a,4 <bes d >4. r8 bes4 <g f'>2  }
   >> |
-  \forcedBreak
 
   %% 11
-  e,8[ f] c,[ g'] f'[ e] |
+  e'8[ f] c,[ g'] f'[ e] |
   f4 f,2 |
   << {  a'4 a4.\trill bes8 
        c bes16 a } \\
@@ -92,7 +88,6 @@ sarabandeA =  \context Voice \notes \relative c {
   bes[ g']
   a,[ fis']
   es'[ d] |
-  \forcedBreak
   
   %%16
   < bes d, g, >4.\trill a8[ g f!] |
@@ -100,7 +95,6 @@ sarabandeA =  \context Voice \notes \relative c {
   d, as g es' f g |
   cis,[ bes'] a[ g16 f] e!8[ f16 d] |
   cis8 e16 a a,8. g'16 f8(e) |
-  \forcedBreak
   
   %%21
   << { d e16(f) f4. e16(d) |
@@ -121,7 +115,7 @@ sarabandeA =  \context Voice \notes \relative c {
     { f,4 fis4. s8 |
       <d g,>4 gis4.   } >>
   \voiceOne
-  d16(cis  d) f,
+  d'16(cis  d) f,
   a,8[ e']
   \oneVoice
   d'[ cis] |
diff --git a/lily/lexer.ll b/lily/lexer.ll
index fe914c85fa..c658e7bf8a 100644
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -132,7 +132,7 @@ BLACK		[^ \n\t\f\r]
 RESTNAME	[rs]
 NOTECOMMAND	\\{A}+
 MARKUPCOMMAND	\\({A}|[-_])+
-LYRICS		({AA}|{TEX})[^0-9 \t\n\f]*
+LYRICS		({AA}|{TEX})[^0-9 \t\n\r\f]*
 ESCAPED		[nt\\'"]
 EXTENDER	__
 HYPHEN		--
@@ -147,13 +147,13 @@ HYPHEN		--
   "%{"	{
 	yy_push_state (longcomment);
   }
-  %[^{\n].*\n	{
+  %[^{\n\r].*[\n\r]	{
   }
-  %[^{\n]	{ // backup rule
+  %[^{\n\r]	{ // backup rule
   }
-  %\n	{
+  %[\n\r]	{
   }
-  %[^{\n].*	{
+  %[^{\n\r].*	{
   }
   {WHITE}+ 	{
 
@@ -508,7 +508,7 @@ HYPHEN		--
 	[{}]	{
 		return YYText()[0];
 	}
-	[^#{}"\\ \t\n\f]+ {
+	[^#{}"\\ \t\n\r\f]+ {
 		String s (YYText ()); 
 
 		char c = s[s.length () - 1];
-- 
2.39.5