release: 1.1.54

[lilypond.git] / Documentation / tex / refman.yo

diff --git a/Documentation/tex/refman.yo b/Documentation/tex/refman.yo
index 8b1259b003f21d79313417efefff4dd741efdd06..6328f112b1bc315a7362e5d6e7d920536a5cb874 100644 (file)
--- a/Documentation/tex/refman.yo
+++ b/Documentation/tex/refman.yo
@@ -231,7 +231,7 @@ to an identifier whose name is the same as the name of a keyword.  The
 following words are keywords:
 verb(accepts         duration      midi          relative      textscript 
 alternative     font          mm            remove        time       
-bar             grouping      musicalpitch  repeat        times      
+bar                   musicalpitch  repeat        times      
 cadenza         header        name          scm           translator 
 chordmodifiers  in            notenames     scmfile       transpose  
 chords          include       notes         score         type       
@@ -575,12 +575,13 @@ mudela()(
           c''-\open  c''-\flageolet  c''-\reverseturn 
           c''-\trill
           c''-\prall c''-\mordent c''-\prallprall  c''-\prallmordent
-          c''-\upprall c''-\downprall c''-\thumb }
+          c''-\upprall c''-\downprall c''-\thumb c''-\segno c''-\wheel}
   \context Lyrics \lyrics{  
         accent__ marcato__ staccatissimo__ fermata stopped__
         staccato__ tenuto__ upbow downbow__ lheel__ rheel__ ltoe
         rtoe__ turn__ open__ flageolet reverseturn__ trill__ prall__
-        mordent prallprall__ prallmordent__ uprall__ downprall thumb }
+        mordent prallprall__ prallmordent__ uprall__ downprall thumb 
+       segno wheel}
   >
   \paper{ linewidth = 5.875\in;          
           indent = 0.0;        }
@@ -882,6 +883,21 @@ mudela(verbatim)(\score{
      foo1 __  bar2. __ _4 baz1 __ }
 > })
      
+If you want to have hyphens centred between syllables (rather than attached
+to the end of the first syllable) you can use the special code(--) lyric as
+separate word between syllables. This will result in a hyphen whose length
+varies depending on the space between syllables, and centred between the
+syllables. For example: 
+mudela(verbatim)(\score{
+  <  \notes \transpose c'' {c d e c | c d e c | e f g'2 | 
+                              e'4 f g'2 \bar "|."; }
+     \context Lyrics \lyrics { 
+              DOEXPAND(Fr\)`e4 -- re Ja -- que DOEXPAND(Fr\)`e -- re Ja -- que
+              Dor -- mez vous?2 Dor4 -- mez vous?2  }
+  >
+})
+
+ 
 
 
 sect(Time)  
@@ -908,14 +924,6 @@ In order to help with error checking, you can insert bar markers in
 your music by typing code(|).  Whenever LilyPond encounters a code(|)
 that doesn't fall at a measure boundary, she prints a warning message.
 
-Rhythmic grouping is  a concept closely associated with this. 
-A default grouping is selected for the chosen time signature.  
-The default consists of combinations of 2 and 3 beats with as many
-groups of 3 as possible, and the groups of 3 coming first.  For
-example, 4/4 is divided into 2+2 and 8/8 is divided into 3+3+2.  This
-default grouping can be changed using the \grouping keyword which
-takes a list of durations to specify the grouping. 
-
 
 COMMENT(
 sect(Composition: forming bigger structures)
@@ -1139,11 +1147,6 @@ var(dotcount).
 dit(code(\font) var(string)) Internal keyword.  Used within
 code(\paper) to specify the font.
 
-dit(code(\grouping) var(durationseq)code(;))  Sets  the  metric structure of
-the measure.  Each argument specifies the duration of one metric unit.
-For example, code(\duration 16*5;) specifies a grouping of five beats
-together in 5/16 time.  The default grouping is to have as many groups
-of 3 as possible followed by groups of two.  
 
 dit(code(\header) code({) var(key1) = var(val1); var(key2) = var(val2); ... code(}))
 Specifies information about the music.  A header should appear at the
@@ -1590,6 +1593,9 @@ above or below the clef instead of on the bar line.
 dit(code(barNumberScriptPadding)) Sets extra space between the bar
 number and the bar it labels.
 
+dit(code(barSize)) Specify the height of the bar lines if it should be
+different than the staff height.
+
 dit(code(markHangOnClef)) Set to 1 to cause marks to appear by clefs
 instead of by bar lines.
 
@@ -1608,6 +1614,9 @@ overridden, possibly many measures later.
 dit(code(staffLineLeading)) Specifies the distance (in points) between lines
 of the staff.  
 
+dit(code(numberOfStaffLines)) Specifies the number of staff lines. The
+default is 5. 
+
 dit(code(postBreakPadding)) Extra space in points to be added after
 the clef, time signature and key signature on the staff.
 
@@ -1936,8 +1945,6 @@ arithmetic_basicspace.  The smallest space is the one following the
 shortest note in the measure.  Typically arithmetic_basicspace is set
 to the width of a quarter note head.
 
-dit(code(barsize)) Specify height of bars.  This value may need to be
-adjusted if you change the number of lines in the staff.
 dit(code(beam_dir_algorithm)) Specify algorithm for determining
 whether beams go up or down.  It is real valued.  If set to 2.0 then
 majority selection is used.  If set to 3.0, then mean selection is