*** empty log message ***

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

diff --git a/Documentation/user/notation.itely b/Documentation/user/notation.itely
index 236dcdbf55ad740ffe1078db4583c44f7d768c7d..772940bfeaf0c01244f493949e9610bc32de2ab2 100644 (file)
--- a/Documentation/user/notation.itely
+++ b/Documentation/user/notation.itely
@@ -1353,8 +1353,9 @@ c4 c1
 @node Controlling formatting of prefatory matter
 @subsection Controlling formatting of prefatory matter
 
-TODO: Somebody needs to explain this example, but I don't know what
-they're trying to do, so it won't be me.  -gp
+@c  This section will be moved to somewhere else soon.
+This example demonstrates how to place prefactory matter
+(such as the clef and key signature) at the end of a line.
 
 @lilypond[quote,verbatim]
 \transpose c c' {
@@ -2278,6 +2279,7 @@ c\fermata c^\fermata c_\fermata
 @cindex accent
 @cindex marcato
 @cindex staccatissimo
+@cindex espressivo
 @cindex fermata
 @cindex stopped
 @cindex staccato
@@ -2512,7 +2514,7 @@ If you want to end a note with a grace, use the @code{\afterGrace}
 command. It takes two arguments: the main note, and the grace notes
 following the main note. 
 
-@lilypond[raggedright, verbatim,relative=2]
+@lilypond[raggedright, verbatim,relative=2,fragment]
 c1 \afterGrace d1 { c16[ d] } c4   
 @end lilypond
 
@@ -2722,6 +2724,9 @@ a'2\< a a a\!\mf
 
 @cindex diminuendo
 
+To create new dynamic marks or text that should be aligned
+with dynamics, see @ref{New dynamic marks}.
+
 
 @refcommands
 
@@ -5175,8 +5180,8 @@ names, for example
 
 @lilypond[quote,fragment,verbatim,raggedright]
 \set Staff.instrument = \markup {
-  \column < "Clarinetti"
-            { "in B" \smaller \flat } > }
+  \column { "Clarinetti"
+            \line { "in B" \smaller \flat } } }
 c''1
 @end lilypond
 
@@ -5944,24 +5949,24 @@ select ancient accidentals.   Supported styles are
 {
   \fatText
   s^\markup {
-    \column <
+    \column {
       "vaticana"
-      { " " \musicglyph #"accidentals-vaticana-1"
-      " " \musicglyph #"accidentals-vaticana0" }
-    >
-    \column <
+      \line { " " \musicglyph #"accidentals-vaticana-1"
+        " " \musicglyph #"accidentals-vaticana0" }
+    }
+    \column {
       "medicaea"
-      { " " \musicglyph #"accidentals-medicaea-1" }
-    >
-    \column <
+      \line { " " \musicglyph #"accidentals-medicaea-1" }
+    }
+    \column {
       "hufnagel"
-      { " " \musicglyph #"accidentals-hufnagel-1" }
-    >
-    \column <
+      \line { " " \musicglyph #"accidentals-hufnagel-1" }
+    }
+    \column {
       "mensural"
-      { " " \musicglyph #"accidentals-mensural-1"
-      " " \musicglyph #"accidentals-mensural1" }
-    >
+      \line { " " \musicglyph #"accidentals-mensural-1"
+        " " \musicglyph #"accidentals-mensural1" }
+    }
   }
 }
 \layout {
@@ -6458,22 +6463,22 @@ supported are @code{vaticana}, @code{medicaea}, @code{hufnagel}, and
 
 @lilypond[quote,raggedright,fragment]
 \new Lyrics \lyricmode {
-  \markup { \column <
+  \markup { \column {
     \typewriter "vaticana"
-    { " " \musicglyph #"custodes-vaticana-u0" }
-  > }
-  \markup { \column <
+    \line { " " \musicglyph #"custodes-vaticana-u0" }
+  } }
+  \markup { \column {
     \typewriter "medicaea"
-    { " " \musicglyph #"custodes-medicaea-u0" }
-  >}
-  \markup { \column <
+    \line { " " \musicglyph #"custodes-medicaea-u0" }
+  }}
+  \markup { \column {
     \typewriter "hufnagel"
-    { " " \musicglyph #"custodes-hufnagel-u0" }
-  >}
-  \markup { \column <
+    \line { " " \musicglyph #"custodes-hufnagel-u0" }
+  }}
+  \markup { \column {
     \typewriter "mensural"
-    { " " \musicglyph #"custodes-mensural-u0" }
-  >}
+    \line { " " \musicglyph #"custodes-mensural-u0" }
+  }}
 }
 @end lilypond
 
@@ -7756,9 +7761,9 @@ created with a markup text.  This markup text is inserted in the
 % create 2/4 + 5/8
 tsMarkup =\markup {
   \number {
-    \column < "2" "4" >
+    \column { "2" "4" }
     \musicglyph #"scripts-stopped"
-    \bracket \column < "5" "8" >
+    \bracket \column { "5" "8" }
   }
 }