* lily/vaticana-ligature-engraver.cc (need_extra_space): renamed

[lilypond.git] / Documentation / user / instrument-notation.itely

diff --git a/Documentation/user/instrument-notation.itely b/Documentation/user/instrument-notation.itely
index 7bb12094a347bcac0841eae6abd6eaf6fec1f919..88accd1769f8c32190e8191cb6fd170847260d45 100644 (file)
--- a/Documentation/user/instrument-notation.itely
+++ b/Documentation/user/instrument-notation.itely
@@ -116,12 +116,6 @@ quality output, staff switches should be specified manually.
 
 @code{\autochange} cannot be inside @code{\times}.
 
-Internally, the @code{\partcombine} interprets both arguments as
-@code{Voice}s named @code{one} and @code{two}, and then decides when
-the parts can be combined.  Consequently, if the arguments switch to
-differently named @internalsref{Voice} contexts, the events in those
-will be ignored.
-
 
 @node Manual staff switches
 @subsection Manual staff switches
@@ -599,7 +593,7 @@ The predefined variables @code{\germanChords},
 set these variables.  The effect is
 demonstrated here,
 
-@lilypondfile[raggedright]{chord-names-german.ly}
+@lilypondfile[raggedright]{chord-names-languages.ly}
 
 There are also two other chord name schemes implemented: an alternate
 Jazz chord notation, and a systematic scheme called Banter chords.  The
@@ -2688,6 +2682,15 @@ be collected and printed in front of it.
 
 Augmentum dots within ligatures are not handled correctly.
 
+The syntax still uses the deprecated infix style @code{\[ music expr
+\]}.  For consistency reasons, it will eventually be changed to
+postfix style @code{note\[ ... note\]}.  Alternatively, the file
+@file{gregorian@/-init@/.ly} can be included; it provides a scheme
+function
+@example
+\ligature @var{music expr}
+@end example
+with the same effect and is believed to be stable.
 
 @menu
 * White mensural ligatures::    
@@ -2733,9 +2736,13 @@ For example,
 \override NoteHead #'style = #'neomensural
 \override Staff.TimeSignature #'style = #'neomensural
 \clef "petrucci-g"
-\[ g\longa c\breve a\breve f\breve d'\longa \]
+\[ c'\maxima g \]
+s4
+\[ d\longa c\breve f e d \]
+s4
+\[ c'\maxima d'\longa \]
 s4
-\[ e1 f1 a\breve g\longa \]
+\[ e'1 a g\breve \]
 @end example
 @lilypond[quote,raggedright]
 \score {
@@ -2745,9 +2752,13 @@ s4
     \override NoteHead #'style = #'neomensural
     \override Staff.TimeSignature #'style = #'neomensural
     \clef "petrucci-g"
-    \[ g\longa c\breve a\breve f\breve d'\longa \]
+    \[ c'\maxima g \]
     s4
-    \[ e1 f1 a\breve g\longa \]
+    \[ d\longa c\breve f e d \]
+    s4
+    \[ c'\maxima d'\longa \]
+    s4
+    \[ e'1 a g\breve \]
   }
   \layout {
     \context {
@@ -2770,16 +2781,20 @@ to the following
   \override NoteHead #'style = #'neomensural
   \override Staff.TimeSignature #'style = #'neomensural
   \clef "petrucci-g"
-  \[ g\longa c\breve a\breve f\breve d'\longa \]
+  \[ c'\maxima g \]
+  s4
+  \[ d\longa c\breve f e d \]
+  s4
+  \[ c'\maxima d'\longa \]
   s4
-  \[ e1 f1 a\breve g\longa \]
+  \[ e'1 a g\breve \]
 }
 @end lilypond
 
 @refbugs
 
-The implementation is experimental.  It may output strange warnings,
-incorrect results, and might even crash on more complex ligatures.
+The invisible rests (@code{s4}) in the example are used to compensate
+for the poor horizontal spacing.
 
 @node Gregorian square neumes ligatures
 @subsubsection Gregorian square neumes ligatures