Add dashed and dotted phrasing slurs

*Add definitions to property-init.ly
*Add regression test
*Update to the documentation

diff --git a/Documentation/user/expressive.itely b/Documentation/user/expressive.itely
index 2376904d93bcc9a43193ea031b702f408afbdd77..1c8730ddbbbf98f70dee38986dfe6770beb7241f 100644 (file)
--- a/Documentation/user/expressive.itely
+++ b/Documentation/user/expressive.itely
@@ -630,6 +630,12 @@ e2) d\)
 @funindex phrasingSlurDown
 @funindex \phrasingSlurNeutral
 @funindex phrasingSlurNeutral
+@funindex phrasingSlurDashed
+@funindex \phrasingSlurDashed
+@funindex \phrasingSlurDotted
+@funindex phrasingSlurDotted
+@funindex \phrasingSlurSolid
+@funindex phrasingSlurSolid
 
 Typographically, a phrasing slur behaves almost exactly like a
 normal slur.  However, they are treated as different objects; a
@@ -652,12 +658,28 @@ c4\( g' c,( b) | c1\)
 
 Simultaneous or overlapping phrasing slurs are not permitted.
 
+Phrasing slurs can be solid, dotted, or dashed.  Solid is the default
+style for phrasing slurs:
+
+@lilypond[verbatim,quote,relative=1]
+c4\( e g2\)
+\phrasingSlurDashed
+g4\( e c2\)
+\phrasingSlurDotted
+c4\( e g2\)
+\phrasingSlurSolid
+g4\( e c2\)
+@end lilypond
+
 
 @predefined
 
 @code{\phrasingSlurUp},
 @code{\phrasingSlurDown},
-@code{\phrasingSlurNeutral}.
+@code{\phrasingSlurNeutral},
+@code{\phrasingSlurDashed},
+@code{\phrasingSlurDotted},
+@code{\phrasingSlurSolid}.
 
 
 @seealso

diff --git a/input/regression/phrasing-slur-dash.ly b/input/regression/phrasing-slur-dash.ly
new file mode 100644 (file)
index 0000000..6fad54b
--- /dev/null
+++ b/input/regression/phrasing-slur-dash.ly
@@ -0,0 +1,24 @@
+\version "2.11.65"
+\header { texidoc = "
+The appearance of phrasing slurs may be changed from solid to dotted or dashed.
+"
+}
+
+\relative c'{
+  c\( d e  c\) |
+  \phrasingSlurDotted
+  c\( d e  c\) |
+  \phrasingSlurDashed
+  c\( d e  c\) |
+  \override PhrasingSlur #'dash-period = #2.0
+  \override PhrasingSlur #'dash-fraction = #0.4
+  c\( d e  c\) |
+  \phrasingSlurSolid
+  c\( d e  c\) |
+}
+
+
+
+
+
+

diff --git a/ly/property-init.ly b/ly/property-init.ly
index c0d43eb980f74b66856e5a2fa8c559320b89e8a4..8f4a2e33660a5c8ebb41b091a18000c6196e53e2 100644 (file)
--- a/ly/property-init.ly
+++ b/ly/property-init.ly
@@ -10,7 +10,6 @@ slurUp = \override Slur #'direction = #UP
 slurDown = \override Slur #'direction = #DOWN
 slurNeutral = \revert Slur #'direction
 
-%% There's also dash, but setting dash period/length should be fixed.
 slurDashed = {
   \override Slur #'dash-period = #0.75
   \override Slur #'dash-fraction = #0.4
@@ -29,6 +28,19 @@ phrasingSlurUp = \override PhrasingSlur #'direction = #UP
 phrasingSlurDown = \override PhrasingSlur #'direction = #DOWN
 phrasingSlurNeutral = \revert PhrasingSlur #'direction
 
+phrasingSlurDashed = {
+  \override PhrasingSlur #'dash-period = #0.75
+  \override PhrasingSlur #'dash-fraction = #0.4
+}
+phrasingSlurDotted = {
+  \override PhrasingSlur #'dash-period = #0.75
+  \override PhrasingSlur #'dash-fraction = #0.1
+}
+phrasingSlurSolid = {
+  \revert PhrasingSlur #'dash-period
+  \revert PhrasingSlur #'dash-fraction
+}
+
 mergeDifferentlyDottedOn = {
   \override Staff.NoteCollision #'merge-differently-dotted = ##t
 }