(Text markup): rewrite manual section.

diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely
index fc3c24dc3b75022148bf2f7e965e45963348139f..caa3b3ca4e929a288bb0ea2f398f25fee121764b 100644 (file)
--- a/Documentation/user/refman.itely
+++ b/Documentation/user/refman.itely
@@ -4810,16 +4810,17 @@ In markup mode you can compose expressions, similar to mathematical
 expressions, XML documents and music expressions.  The braces group
 notes into horizontal lines. Other types of lists also exist: you can
 stack expressions grouped with @code{<<}, and @code{>>} vertically with
-the command @code{\column}. The @code{@{} and @code{@}} produce
-@code{\line} commands:
+the command @code{\column}.
+
 
 @lilypond[verbatim,fragment,relative=1]
  c1^\markup { \column << a b c >> }
  c1^\markup { \line << a b c >> }
 @end lilypond
 
-The markup mechanism is very flexible and extensible. Refer to
-@file{scm/new-markup.scm} for more information.
+The markup mechanism is very flexible and extensible.  Refer to
+@file{scm/new-markup.scm} for more information on extending the markup
+mode.
 
 
 @cindex metronome mark
@@ -4843,6 +4844,8 @@ eighthNote = \markup
 }
 @refbugs
 
+@cindex kerning
+
 LilyPond account for kerning in its text formatting engine, so it spaces
 texts slightly too wide.
 

diff --git a/scm/new-markup.scm b/scm/new-markup.scm
index 1790d56e2f084b2faa125852acf8529a9814fa75..c9c4999751b38ff72565f647d9b2ce60cb57c3d7 100644 (file)
--- a/scm/new-markup.scm
+++ b/scm/new-markup.scm
@@ -261,9 +261,9 @@ for the reader.
       (cons line-markup  'markup-list0)
 
       (cons combine-markup 'markup0-markup1)
-      (cons simple-markup 'markup0)
+      (cons simple-markup 'scm0)
       (cons musicglyph-markup 'scm0)
-
+      
       (cons translate-markup 'scm0-markup1)
       (cons override-markup 'scm0-markup1)
       (cons char-markup 'scm0)