Merge commit 'origin' into includes

[lilypond.git] / input / regression / tie-chord.ly

diff --git a/input/regression/tie-chord.ly b/input/regression/tie-chord.ly
index c77c51a6bad2764470eacbe59560e3cff43650a5..2688680580f5d32c7bcb9baddc8f84cc05dbf9cf 100644 (file)
--- a/input/regression/tie-chord.ly
+++ b/input/regression/tie-chord.ly
@@ -3,65 +3,101 @@
 
   texidoc = "In chords, ties keep closer to the note head vertically,
 but never collide with heads or stems. Seconds are formatted up/down;
-the rest of the ties are positioned according to their  vertical position."
+the rest of the ties are positioned according to their vertical
+position.
+
+The code does not handle all cases. Sometimes ties will printed on top
+of or very close to each other. This happens in the last chords of
+each system.  "
   
 
 }
 
-\version "2.7.7"
+\version "2.12.0"
 
 \paper {
   indent = #0.0
-  raggedright = ##t
+  ragged-right = ##t
+}
+
+
+
+generateTiePattern
+= #(define-music-function (parser location is-long chords) (boolean? ly:music?)
+
+    "
+
+translate x y z to x~x y~y z~z
+
+" 
+    
+  (define (chord->tied-chord chord)
+    (let*
+       ((ch1 (ly:music-deep-copy chord))
+        (ch2 (ly:music-deep-copy chord))
+        (dur1 (ly:make-duration
+               (if is-long
+                   1 2)))
+        (dur2 (ly:make-duration
+               (if is-long
+                   3 2))))
+
+      (for-each (lambda (e)
+                 (ly:music-set-property! e 'duration dur1))
+               (ly:music-property ch1 'elements))
+
+      (for-each (lambda (e)
+                 (ly:music-set-property! e 'duration dur2))
+               (ly:music-property ch2 'elements))
+      
+      (set! (ly:music-property ch1 'elements)
+           (cons
+            (make-music 'TieEvent)
+            (ly:music-property ch1 'elements)))
+
+      (list ch1 ch2)))
+
+  (make-music 'SequentialMusic 'elements (apply append
+                                               (map chord->tied-chord (ly:music-property  chords 'elements)))))
+
+baseChords =
+\applyMusic #(lambda (mus)
+             (ly:music-property mus 'element))
+\relative c'' {
+  <c e>  
+  <b c e>
+  <a c e>
+  <a b e>
+  <a b e f>
+  <a c d f>
+  <a c e f>
+  <f a e' f>
+  <c e f a> 
+  <c e g a>
+  <f b e a>
 }
 
 testShort =
 {
-   \time 4/4
   \key c \major
-  \relative c'' {
-                               %  c ~ c
-    <c e> ~ <c e>
-    <b c e> ~ <b c e>
-    <a c e> ~ <a c e>
-    <a b e> ~ <a b e>
-    <a b e f> ~ <a b e f> 
-  }
-
-  \relative c' {
-    <c e f a> ~ <c e f a>
-    <c e g a> ~ <c e g a>
-    
-    <a' c d f> ~ <a c d f>  
-    <a c e f> ~ <a c e f>
-    <a b c d e> ~ <a b c d e>
-  }
+  \generateTiePattern ##f \baseChords
 }  
 
 testLong =
 {
-  \time 5/8
   \key c \major
-  \relative c'' {
-    <c e>2 ~ <c e>8
-    <b c e>2 ~ <b c e>8
-    <a c e>2 ~ <a c e>8
-    <a b e>2 ~ <a b e>8
-    <a b e f>2 ~ <a b e f>8
-  }
-
-  \relative c' {
-    <c e f a>2 ~ <c e f a>8
-    <c e g a>2 ~ <c e g a>8
-    <a' c d f>2  ~   <a c d f>8  
-    <a c e f>2  ~   <a c e f>8  
-  }
+  \generateTiePattern ##t \baseChords
 }  
 
 \new Voice
-{ \testShort \break
+{
+  \time 2/4
+
+  \testShort \break
   \transpose c d \testShort \break
+  \time 5/8
   \testLong \break
   \transpose c d \testLong \break
 }
 
+