From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Fri, 2 Apr 2004 22:35:10 +0000 (+0000)
Subject: * input/regression/repeat-unfold-tremolo.ly: add dotted case.
X-Git-Tag: release/2.3.0~114
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=ae7aed00f38a400d24c498a8779c9aa0c6ba6b0e;p=lilypond.git

* input/regression/repeat-unfold-tremolo.ly: add dotted case.

* scm/music-functions.scm (unfold-repeats): handle dots too.
---

diff --git a/ChangeLog b/ChangeLog
index 5de407876f..a35b4c8016 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2004-04-03  Han-Wen Nienhuys   <hanwen@xs4all.nl>
+
+	* input/regression/repeat-unfold-tremolo.ly: add dotted case.
+
+	* scm/music-functions.scm (unfold-repeats): handle dots too.
+
+2004-04-02  Han-Wen Nienhuys   <hanwen@xs4all.nl>
+
+	* mf/GNUmakefile ($(outdir)/$(redhat-package)): fix URL.
+	(backportme)
+
 2004-04-02  Jan Nieuwenhuizen  <janneke@gnu.org>
 
 	* input/wilhelmus.ly: Use raggedright.  Hack `Een prin -- ce'
diff --git a/THANKS b/THANKS
index a08635f2f3..4b312c610f 100644
--- a/THANKS
+++ b/THANKS
@@ -1,4 +1,23 @@
-Release 2.1
+
+Release 2.3
+***********
+
+
+HEAD HACKERS
+
+Han-Wen Nienhuys
+Jan Nieuwenhuizen
+
+
+CONTRIBUTORS
+
+
+BUG HUNTERS/SUGGESTIONS
+
+Stephen Pollei
+Michael Welsh Duggan
+
+Release 2.2
 ***********
 
 HEAD HACKERS
diff --git a/input/regression/repeat-unfold-tremolo.ly b/input/regression/repeat-unfold-tremolo.ly
index c1a1bde861..ba1bde2268 100644
--- a/input/regression/repeat-unfold-tremolo.ly
+++ b/input/regression/repeat-unfold-tremolo.ly
@@ -1,8 +1,8 @@
 \version "2.2.0"
 \header {
 
-    texidoc = "Unfolding tremolo repeats. Both fragments fill one 2/4
- measure with 32nd notes exactly."
+    texidoc = "Unfolding tremolo repeats. All fragments fill one
+ measure with 16th notes exactly."
 
 }
 
@@ -11,8 +11,17 @@
     \notes{
 	\time 2/4 
 	\apply #unfold-repeats 	
-	{ \repeat tremolo 8 { c'32 e' } |
-	  \repeat tremolo 16 c'32 } | \bar "|."
+	{ \repeat tremolo 4 { c'16 e' } |
+	  \repeat tremolo 8 c'16 } |
+
+	\time 3/4 
+	\apply #unfold-repeats 	
+	{ \repeat tremolo 6 { c'16 e' } |
+	  \repeat tremolo 12 c'16 } | \bar "|."
+	
+	\bar "|."
+
+	
     }
     \paper { raggedright = ##t }  
 }
diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index 753ceb7024..4df0a88138 100644
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -118,7 +118,7 @@ get-deb-pfa: $(outdir)/$(debian-package)
 
 redhat-package=lilypond-$(TOPLEVEL_VERSION)-1.i386.rpm
 $(outdir)/$(redhat-package):
-	wget  --passive-ftp -P $(outdir) http://lilypond.org/download/binaries/RedHat-9/$(redhat-package)
+	wget  --passive-ftp -P $(outdir) http://lilypond.org/download/binaries/Fedora-1/$(redhat-package)
 
 get-rpm-pfa: $(outdir)/$(redhat-package)
 	cd $(outdir) ; rm -rf usr/ # (root alert!) 
diff --git a/scm/music-functions.scm b/scm/music-functions.scm
index 1296589152..a878dfde5f 100644
--- a/scm/music-functions.scm
+++ b/scm/music-functions.scm
@@ -130,22 +130,30 @@
 
 (define-public (unfold-repeats music)
   "
-This function replaces all repeats  with unfold repeats. It was 
-written by Rune Zedeler. "
+This function replaces all repeats  with unfold repeats. "
   
   (let ((es (ly:music-property music 'elements))
 	(e  (ly:music-property music 'element))
 	(n  (ly:music-name music)))
     (if (equal? n "Repeated_music")
-	(let*
-	    ((seq-arg? (memq 'sequential-music
-						   (ly:music-property e 'types))))
+	(begin
 	  
 	  (if (equal? (ly:music-property music 'iterator-ctor)
 		      Chord_tremolo_iterator::constructor)
-	      (begin
+	      (let*
+		  ((seq-arg? (memq 'sequential-music
+				   (ly:music-property e 'types)))
+		   (count  (ly:music-property music 'repeat-count))
+		   (dot-shift (if (= 0 (remainder count 3))
+				  -1 0))
+		   )
+
+		(if (= 0 -1)
+		    (set! count (* 2 (quotient count 3))))
+		
 		(shift-duration-log music (+ (if seq-arg? 1 0)
-					     (ly:intlog2 (ly:music-property music 'repeat-count))) 0)
+					     (ly:intlog2 count)) dot-shift)
+		
 		(if seq-arg?
 		    (ly:music-compress e (ly:make-moment (length (ly:music-property e 'elements)) 1)))
 		))