From: David Kastrup <dak@gnu.org>
Date: Sat, 3 Oct 2015 07:29:16 +0000 (+0200)
Subject: Issue 4626/3: NR: document \= in slur sections
X-Git-Tag: release/2.19.29-1~12
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=21be03e4b893ec2bbea745a713360310931337b9;p=lilypond.git

Issue 4626/3: NR: document \= in slur sections
---

diff --git a/Documentation/learning/common-notation.itely b/Documentation/learning/common-notation.itely
index e5b3a652a3..9ce651fc02 100644
--- a/Documentation/learning/common-notation.itely
+++ b/Documentation/learning/common-notation.itely
@@ -334,9 +334,8 @@ starting note and ending note are marked with @code{(} and
 Music Glossary: @rglos{slur}, @rglos{phrasing}.
 
 Slurs to indicate longer @notation{phrasing} can be entered with
-@code{\(} and @code{\)}.  You can have both @notation{slurs}
-and phrasing slurs at the same time, but you cannot have
-simultaneous slurs or simultaneous phrasing slurs.
+@code{\(} and @code{\)}.  You can have both @notation{slurs} and
+phrasing slurs at the same time.
 
 @lilypond[verbatim,quote]
 \relative { g'4\( g8( a) b( c) b4\) }
diff --git a/Documentation/notation/expressive.itely b/Documentation/notation/expressive.itely
index 52259c6c95..f999363cb4 100644
--- a/Documentation/notation/expressive.itely
+++ b/Documentation/notation/expressive.itely
@@ -714,10 +714,20 @@ Slurs may be manually placed above or below the staff; see
 @cindex slur, phrasing
 @cindex slurs, multiple
 @cindex slurs, simultaneous
+@funindex \=
 
-Simultaneous or overlapping slurs are not permitted, but a phrasing
-slur can overlap a slur.  This permits two slurs to be printed at
-once.  For details, see @ref{Phrasing slurs}.
+Simultaneous or overlapping slurs require special attention.  Most
+occurences of outer slurs actually indicate phrasing, and phrasing
+slurs may overlap a regular slur, see @ref{Phrasing slurs}.  When
+multiple regular slurs are needed in a single @code{Voice},
+matching slur starts and ends need to be labelled by preceding
+them with @code{\=} followed by an identifying number or string.
+
+@lilypond[verbatim,quote]
+\fixed c' {
+  <c~ f\=1( g\=2( >2 <c e\=1) a\=2) >
+}
+@end lilypond
 
 @cindex slur style
 @cindex slur, solid
@@ -878,7 +888,8 @@ may be manually placed above or below the staff; see
 @cindex phrasing slur, simultaneous
 @cindex phrasing slur, multiple
 
-Simultaneous or overlapping phrasing slurs are not permitted.
+Simultaneous or overlapping phrasing slurs are entered using
+@code{\=} as with regular slurs, see @ref{Slurs}.
 
 @funindex phrasingSlurDashed
 @funindex \phrasingSlurDashed