From: Carl Sorensen <c_sorensen@byu.edu>
Date: Sat, 15 May 2010 01:51:57 +0000 (-0600)
Subject: Fix 881, with Neil's suggestion
X-Git-Tag: release/2.13.22-1~1^2~2
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=55d4389e74f830d759176867dae44ed0400c3b68;p=lilypond.git

Fix 881, with Neil's suggestion

Make laisser-vibrez::print a pure function

Add regression test for issue 881
---

diff --git a/input/regression/laissez-vibrer-arpeggio.ly b/input/regression/laissez-vibrer-arpeggio.ly
new file mode 100644
index 0000000000..03fcd8e0fa
--- /dev/null
+++ b/input/regression/laissez-vibrer-arpeggio.ly
@@ -0,0 +1,15 @@
+\header {
+
+  texidoc = "
+l.v. ties should not collide with arpeggio indications.
+"
+}
+
+\version "2.12.1" % regression: 2.10.33 and 2.8.8 are ok
+
+{
+ <e'>\laissezVibrer <f  f'> \arpeggio
+ <e'>\laissezVibrer <g  f'> \arpeggio \mark "Ties should not collide"
+ <e'>\laissezVibrer <a  f'> \arpeggio
+ <e'>\laissezVibrer <b  f'> \arpeggio
+ }
diff --git a/input/regression/laissez-vibrer-ties.ly b/input/regression/laissez-vibrer-ties.ly
index ddb36f1dd7..681fdaf7ef 100644
--- a/input/regression/laissez-vibrer-ties.ly
+++ b/input/regression/laissez-vibrer-ties.ly
@@ -19,7 +19,7 @@ They have fixed size. Their formatting can be tuned with
   <c e g>\laissezVibrer r4
   <c f g>\laissezVibrer r
   <c d f g>\laissezVibrer r
-  <c d f g>4.\laissezVibrer r
+  <c d f g>4.\laissezVibrer r8
 
   <c d e f>4\laissezVibrer r
   \override LaissezVibrerTieColumn #'tie-configuration
diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 4d16567804..7be62f1c82 100644
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -977,7 +977,7 @@
 		    (height-limit . 1.0)))
 	(direction . ,ly:tie::calc-direction)
 	(head-direction . ,LEFT)
-	(stencil  . ,ly:tie::print)
+	(stencil  . ,laissez-vibrer::print)
 	(thickness . 1.0)
 	(meta . ((class . Item)
 		 (interfaces . (semi-tie-interface))))))
@@ -2350,6 +2350,7 @@
    fret-board::calc-stencil
    note-head::brew-ez-stencil
    print-circled-text-callback
+   laissez-vibrer::print
    lyric-text::print
    ly:bar-line::print
    ly:mensural-ligature::brew-ligature-primitive
@@ -2399,6 +2400,7 @@
 (define pure-functions
   (list
    parenthesize-elements
+   laissez-vibrer::print
    ly:rest::y-offset-callback
    ly:staff-symbol-referencer::callback
    ly:staff-symbol::height))
diff --git a/scm/output-lib.scm b/scm/output-lib.scm
index 8e4697dd66..d29e26498c 100644
--- a/scm/output-lib.scm
+++ b/scm/output-lib.scm
@@ -882,3 +882,11 @@ between the two text elements."
 	(begin
 	  (ly:grob-suicide! grob)
 	  (list)))))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;  laissez-vibrer tie
+;;
+;;  needed so we can make laissez-vibrer a pure print
+;;
+(define-public (laissez-vibrer::print grob)
+ (ly:tie::print grob))