X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Ftie-chord.ly;h=d830bd01a9d98c4c3a51389ff806e9e264239b22;hb=2fecabf3a5cb332c78b58b02f78c7c64d5c89c19;hp=b2ed3936c4610ae7b9e1029e5eafa9e2aca81b3f;hpb=11613b92019bb42418863f43de92287a64878f14;p=lilypond.git

diff --git a/input/regression/tie-chord.ly b/input/regression/tie-chord.ly
index b2ed3936c4..d830bd01a9 100644
--- a/input/regression/tie-chord.ly
+++ b/input/regression/tie-chord.ly
@@ -1,24 +1,101 @@
+\header {
 
-\version "1.9.2"
-\header{
-texidoc="
-When tieing chords, the outer slurs point outwards, the inner slurs
-point away from the center of the staff.  Override with
-@code{tieVerticalDirection}.
-"
+  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 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.16.0"
+
+\paper {
+  indent = #0.0
+  ragged-right = ##t
 }
 
 
-t =  \notes \relative c' {   <<c e g>> ~ <<c e g>> }
 
-	\score { 
-\notes \context Voice {
-   \t
-   \transpose c g \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))
 
-   \property Voice.TieColumn \override #'direction = #-1
-   \t
+      (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 =
+{
+  \key c \major
+  \generateTiePattern ##f \baseChords
+}  
+
+testLong =
+{
+  \key c \major
+  \generateTiePattern ##t \baseChords
+}  
+
+\new Voice
+{
+  \time 2/4
+
+  \testShort \break
+  \transpose c d \testShort \break
+  \time 5/8
+  \testLong \break
+  \transpose c d \testLong \break
 }
 
+