X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=inline;f=scm%2Fdefine-markup-commands.scm;h=9b5c5c5c82ac75bfb74b7994ff06b40c7a2ee9cf;hb=f36f744d1fb9ee7bc4303a5faff1a96c7f92e23d;hp=804c59570c31786e272be80e4e56fe456b7e5550;hpb=75f68149b32175cf9025c25c86f1e7bd5648d0c0;p=lilypond.git

diff --git a/scm/define-markup-commands.scm b/scm/define-markup-commands.scm
index 804c59570c..9b5c5c5c82 100644
--- a/scm/define-markup-commands.scm
+++ b/scm/define-markup-commands.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 2000--2007  Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; (c) 2000--2009  Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;                  Jan Nieuwenhuizen <janneke@gnu.org>
 
 
@@ -42,22 +42,16 @@ A simple line.
                thickness))
         (x (car dest))
         (y (cdr dest)))
-    (ly:make-stencil
-     `(draw-line
-       ,th
-       0 0
-       ,x ,y)
-     (cons (min x 0) (max x 0))
-     (cons (min y 0) (max y 0)))))
-
-(define-builtin-markup-command (draw-circle layout props radius thickness fill)
+    (make-line-stencil th 0 0 x y)))
+
+(define-builtin-markup-command (draw-circle layout props radius thickness filled)
   (number? number? boolean?)
   graphic
   ()
   "
 @cindex drawing circles within text
 
-A circle of radius @var{radius}, thickness @var{thickness} and
+A circle of radius @var{radius} and thickness @var{thickness},
 optionally filled.
 
 @lilypond[verbatim,quote]
@@ -67,7 +61,7 @@ optionally filled.
   \\draw-circle #2 #0 ##t
 }
 @end lilypond"
-  (make-circle-stencil radius thickness fill))
+  (make-circle-stencil radius thickness filled))
 
 (define-builtin-markup-command (triangle layout props filled)
   (boolean?)
@@ -112,7 +106,11 @@ Draw a circle around @var{arg}.  Use @code{thickness},
 thickness and padding around the markup.
 
 @lilypond[verbatim,quote]
-\\markup \\circle { Hi }
+\\markup {
+  \\circle {
+    Hi
+  }
+}
 @end lilypond"
   (let ((th (* (ly:output-def-lookup layout 'line-thickness)
                thickness))
@@ -133,7 +131,9 @@ the PDF backend.
 @lilypond[verbatim,quote]
 \\markup {
   \\with-url #\"http://lilypond.org/web/\" {
-    LilyPond ... \\italic { music notation for everyone }
+    LilyPond ... \\italic {
+      music notation for everyone
+    }
   }
 }
 @end lilypond"
@@ -154,7 +154,9 @@ the PDF backend.
 
 Create a beam with the specified parameters.
 @lilypond[verbatim,quote]
-\\markup \\beam #5 #1 #2
+\\markup {
+  \\beam #5 #1 #2
+}
 @end lilypond"
   (let* ((y (* slope width))
 	 (yext (cons (min 0 y) (max 0 y)))
@@ -180,11 +182,16 @@ Create a beam with the specified parameters.
 @cindex underlining text
 
 Underline @var{arg}.  Looks at @code{thickness} to determine line
-thickness and y offset.
+thickness and y-offset.
 
 @lilypond[verbatim,quote]
-\\markup \\override #'(thickness . 2) \\underline {
-  CONTENTS
+\\markup {
+  default
+  \\hspace #2
+  \\override #'(thickness . 2)
+  \\underline {
+    underline
+  }
 }
 @end lilypond"
   (let* ((thick (* (ly:output-def-lookup layout 'line-thickness)
@@ -193,10 +200,7 @@ thickness and y offset.
          (x1 (car (ly:stencil-extent markup X)))
          (x2 (cdr (ly:stencil-extent markup X)))
          (y (* thick -2))
-         (line (ly:make-stencil
-                `(draw-line ,thick ,x1 ,y ,x2 ,y)
-                (cons (min x1 0) (max x2 0))
-                (cons thick thick))))
+         (line (make-line-stencil thick x1 y x2 y)))
     (ly:stencil-add markup line)))
 
 (define-builtin-markup-command (box layout props arg)
@@ -240,7 +244,7 @@ Draw a box with rounded corners of dimensions @var{xext} and
 @end verbatim
 creates a box extending horizontally from -0.3 to 1.8 and
 vertically from -0.3 up to 1.8, with corners formed from a
-circle of diameter@tie{}0 (i.e. sharp corners).
+circle of diameter@tie{}0 (i.e., sharp corners).
 
 @lilypond[verbatim,quote]
 \\markup {
@@ -261,15 +265,19 @@ circle of diameter@tie{}0 (i.e. sharp corners).
    (corner-radius 1)
    (font-size 0)
    (box-padding 0.5))
-  "@cindex enclosing text in a bow with rounded corners
+  "@cindex enclosing text in a box with rounded corners
    @cindex drawing boxes with rounded corners around text
 Draw a box with rounded corners around @var{arg}.  Looks at @code{thickness},
 @code{box-padding} and @code{font-size} properties to determine line
 thickness and padding around the markup; the @code{corner-radius} property
-makes possible to define another shape for the corners (default is 1).
+makes it possible to define another shape for the corners (default is 1).
 
-@lilypond[quote,verbatim,fragment,relative=2]
-c^\\markup \\rounded-box { Overtura }
+@lilypond[quote,verbatim,relative=2]
+c4^\\markup {
+  \\rounded-box {
+    Overtura
+  }
+}
 c,8. c16 c4 r
 @end lilypond" 
   (let ((th (* (ly:output-def-lookup layout 'line-thickness)
@@ -286,7 +294,18 @@ c,8. c16 c4 r
   "
 @cindex rotating text
 
-Rotate object with @var{ang} degrees around its center."
+Rotate object with @var{ang} degrees around its center.
+
+@lilypond[verbatim,quote]
+\\markup {
+  default
+  \\hspace #2
+  \\rotate #45
+  \\line {
+    rotated 45°
+  }
+}
+@end lilypond"
   (let* ((stil (interpret-markup layout props arg)))
     (ly:stencil-rotate stil ang 0 0)))
 
@@ -297,10 +316,18 @@ Rotate object with @var{ang} degrees around its center."
   "
 @cindex adding a white background to text
 
-Provide a white background for @var{arg}."
+Provide a white background for @var{arg}.
+
+@lilypond[verbatim,quote]
+\\markup {
+  \\combine
+    \\filled-box #'(-1 . 10) #'(-3 . 4) #1
+    \\whiteout whiteout
+}
+@end lilypond"
   (stencil-whiteout (interpret-markup layout props arg)))
 
-(define-builtin-markup-command (pad-markup layout props padding arg)
+(define-builtin-markup-command (pad-markup layout props amount arg)
   (number? markup?)
   align
   ()
@@ -308,7 +335,21 @@ Provide a white background for @var{arg}."
 @cindex padding text
 @cindex putting space around text
 
-Add space around a markup object."
+Add space around a markup object.
+
+@lilypond[verbatim,quote]
+\\markup {
+  \\box {
+    default
+  }
+  \\hspace #2
+  \\box {
+    \\pad-markup #1 {
+      padded
+    }
+  }
+}
+@end lilypond"
   (let*
       ((stil (interpret-markup layout props arg))
        (xext (ly:stencil-extent stil X))
@@ -316,8 +357,8 @@ Add space around a markup object."
 
     (ly:make-stencil
      (ly:stencil-expr stil)
-     (interval-widen xext padding)
-     (interval-widen yext padding))))
+     (interval-widen xext amount)
+     (interval-widen yext amount))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; space
@@ -345,15 +386,7 @@ Create a box of the same height as the space in the current font."
   "
 @cindex creating horizontal spaces in text
 
-This produces an invisible object taking horizontal space.  For example,
-
-@example 
-\\markup @{ A \\hspace #2.0 B @}
-@end example
-
-@noindent
-puts extra space between A and@tie{}B, on top of the space that is
-normally inserted before elements on a line.
+Create an invisible object taking up horizontal space @var{amount}.
 
 @lilypond[verbatim,quote]
 \\markup {
@@ -380,7 +413,13 @@ normally inserted before elements on a line.
   "
 @cindex importing stencils into text
 
-Use a stencil as markup."
+Use a stencil as markup.
+
+@lilypond[verbatim,quote]
+\\markup {
+  \\stencil #(make-circle-stencil 2 0 #t)
+}
+@end lilypond"
   stil)
 
 (define bbox-regexp
@@ -427,30 +466,8 @@ Inline an EPS image.  The image is scaled along @var{axis} to
   ()
   "
 @cindex inserting PostScript directly into text
-
 This inserts @var{str} directly into the output as a PostScript
-command string.  Due to technicalities of the output backends,
-different scales should be used for the @TeX{} and PostScript backend,
-selected with @code{-f}. 
-
-For the @TeX{} backend, the following string prints a rotated text
-
-@example
-0 0 moveto /ecrm10 findfont 
-1.75 scalefont setfont 90 rotate (hello) show
-@end example
-
-@noindent
-The magical constant 1.75 scales from LilyPond units (staff spaces) to
-@TeX{} dimensions.
-
-For the postscript backend, use the following
-
-@example
-gsave /ecrm10 findfont 
- 10.0 output-scale div 
- scalefont setfont 90 rotate (hello) show grestore 
-@end example
+command string.
 
 @lilypond[verbatim,quote]
 eyeglassesps = #\"
@@ -478,7 +495,10 @@ eyeglasses = \\markup {
   \\postscript #eyeglassesps
 }
 
-\\relative c'' { c2^\\eyeglasses a_\\eyeglasses }
+\\relative c'' {
+  c2^\\eyeglasses
+  a2_\\eyeglasses
+}
 @end lilypond"
   ;; FIXME
   (ly:make-stencil
@@ -559,7 +579,9 @@ Inline an image of music.
 An empty markup with extents of a single point.
 
 @lilypond[verbatim,quote]
-\\markup \\null
+\\markup {
+  \\null
+}
 @end lilypond"
   point-stencil)
 
@@ -577,6 +599,9 @@ An empty markup with extents of a single point.
 A simple text string; @code{\\markup @{ foo @}} is equivalent with
 @code{\\markup @{ \\simple #\"foo\" @}}.
 
+Note: for creating standard text markup or defining new markup commands,
+the use of @code{\\simple} is unnecessary.
+
 @lilypond[verbatim,quote]
 \\markup {
   \\simple #\"simple\"
@@ -596,7 +621,9 @@ A simple text string; @code{\\markup @{ foo @}} is equivalent with
 Like simple-markup, but use tie characters for @q{~} tilde symbols.
 
 @lilypond[verbatim,quote]
-\\markup \\tied-lyric #\"Lasciate~i monti\"
+\\markup {
+  \\tied-lyric #\"Lasciate~i monti\"
+}
 @end lilypond"
   (if (string-contains str "~")
       (let*
@@ -646,7 +673,7 @@ Like simple-markup, but use tie characters for @q{~} tilde symbols.
 	(/ (+ (car text-widths) (car (cdr text-widths))) 2))
      (get-fill-space word-count line-width (cdr text-widths))))))
 
-(define-builtin-markup-command (fill-line layout props markups)
+(define-builtin-markup-command (fill-line layout props args)
   (markup-list?)
   align
   ((text-direction RIGHT)
@@ -657,19 +684,23 @@ The markups are spaced or flushed to fill the entire line.
 If there are no arguments, return an empty stencil.
 
 @lilypond[verbatim,quote]
-\\markup \\column {
-  \\fill-line {
-    Words evenly spaced across the page
-  }
-  \\null
-  \\fill-line {
-    \\line { Text markups }
-    \\line \\italic { evenly spaced }
-    \\line { across the page }
+\\markup {
+  \\column {
+    \\fill-line {
+      Words evenly spaced across the page
+    }
+    \\null
+    \\fill-line {
+      \\line { Text markups }
+      \\line {
+        \\italic { evenly spaced }
+      }
+      \\line { across the page }
+    }
   }
 }
 @end lilypond"
-  (let* ((orig-stencils (interpret-markup-list layout props markups))
+  (let* ((orig-stencils (interpret-markup-list layout props args))
 	 (stencils
 	  (map (lambda (stc)
 		 (if (ly:stencil-empty? stc)
@@ -724,11 +755,13 @@ If there are no arguments, return an empty stencil.
   ((word-space)
    (text-direction RIGHT))
   "Put @var{args} in a horizontal line.  The property @code{word-space}
-determines the space between each markup in @var{args}.
+determines the space between markups in @var{args}.
 
 @lilypond[verbatim,quote]
-\\markup \\line {
-  A simple line of text
+\\markup {
+  \\line {
+    one two three
+  }
 }
 @end lilypond"
   (let ((stencils (interpret-markup-list layout props args)))
@@ -746,17 +779,17 @@ determines the space between each markup in @var{args}.
 @cindex concatenating text
 @cindex ligatures in text
 
-Concatenate @var{args} in a horizontal line, without spaces inbetween.
+Concatenate @var{args} in a horizontal line, without spaces in between.
 Strings and simple markups are concatenated on the input level, allowing
 ligatures.  For example, @code{\\concat @{ \"f\" \\simple #\"i\" @}} is
 equivalent to @code{\"fi\"}.
 
 @lilypond[verbatim,quote]
-\\markup \\bold {
-  au
+\\markup {
   \\concat {
-    Mouv
-    \\super t
+    one
+    two
+    three
   }
 }
 @end lilypond"
@@ -855,9 +888,20 @@ equivalent to @code{\"fi\"}.
   "
 @cindex justifying text
 
-Like wordwrap, but with lines stretched to justify the margins.
+Like @code{\\wordwrap}, but with lines stretched to justify the margins.
 Use @code{\\override #'(line-width . @var{X})} to set the line width;
-@var{X}@tie{}is the number of staff spaces."
+@var{X}@tie{}is the number of staff spaces.
+
+@lilypond[verbatim,quote]
+\\markup {
+  \\justify {
+    Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed
+    do eiusmod tempor incididunt ut labore et dolore magna aliqua.
+    Ut enim ad minim veniam, quis nostrud exercitation ullamco
+    laboris nisi ut aliquip ex ea commodo consequat.
+  }
+}
+@end lilypond"
   (stack-lines DOWN 0.0 baseline-skip
                (wordwrap-internal-markup-list layout props #t args)))
 
@@ -867,7 +911,18 @@ Use @code{\\override #'(line-width . @var{X})} to set the line width;
   ((baseline-skip)
    wordwrap-internal-markup-list)
   "Simple wordwrap.  Use @code{\\override #'(line-width . @var{X})} to set
-the line width, where @var{X} is the number of staff spaces."
+the line width, where @var{X} is the number of staff spaces.
+
+@lilypond[verbatim,quote]
+\\markup {
+  \\wordwrap {
+    Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed
+    do eiusmod tempor incididunt ut labore et dolore magna aliqua.
+    Ut enim ad minim veniam, quis nostrud exercitation ullamco
+    laboris nisi ut aliquip ex ea commodo consequat.
+  }
+}
+@end lilypond"
   (stack-lines DOWN 0.0 baseline-skip
 	       (wordwrap-internal-markup-list layout props #f args)))
 
@@ -903,7 +958,24 @@ the line width, where @var{X} is the number of staff spaces."
   align
   ((baseline-skip)
    wordwrap-string-internal-markup-list)
-  "Wordwrap a string.  Paragraphs may be separated with double newlines."
+  "Wordwrap a string.  Paragraphs may be separated with double newlines.
+  
+@lilypond[verbatim,quote]
+\\markup {
+  \\override #'(line-width . 40)
+  \\wordwrap-string #\"Lorem ipsum dolor sit amet, consectetur
+      adipisicing elit, sed do eiusmod tempor incididunt ut labore
+      et dolore magna aliqua.
+
+
+      Ut enim ad minim veniam, quis nostrud exercitation ullamco
+      laboris nisi ut aliquip ex ea commodo consequat.
+
+
+      Excepteur sint occaecat cupidatat non proident, sunt in culpa
+      qui officia deserunt mollit anim id est laborum\"
+}
+@end lilypond"
   (stack-lines DOWN 0.0 baseline-skip
                (wordwrap-string-internal-markup-list layout props #f arg)))
 
@@ -912,7 +984,24 @@ the line width, where @var{X} is the number of staff spaces."
   align
   ((baseline-skip)
    wordwrap-string-internal-markup-list)
-  "Justify a string.  Paragraphs may be separated with double newlines"
+  "Justify a string.  Paragraphs may be separated with double newlines
+  
+@lilypond[verbatim,quote]
+\\markup {
+  \\override #'(line-width . 40)
+  \\justify-string #\"Lorem ipsum dolor sit amet, consectetur
+      adipisicing elit, sed do eiusmod tempor incididunt ut labore
+      et dolore magna aliqua.
+
+
+      Ut enim ad minim veniam, quis nostrud exercitation ullamco
+      laboris nisi ut aliquip ex ea commodo consequat.
+
+
+      Excepteur sint occaecat cupidatat non proident, sunt in culpa
+      qui officia deserunt mollit anim id est laborum\"
+}
+@end lilypond"
   (stack-lines DOWN 0.0 baseline-skip
                (wordwrap-string-internal-markup-list layout props #t arg)))
 
@@ -920,7 +1009,31 @@ the line width, where @var{X} is the number of staff spaces."
   (symbol?)
   align
   ()
-  "Wordwrap the data which has been assigned to @var{symbol}."
+  "Wordwrap the data which has been assigned to @var{symbol}.
+  
+@lilypond[verbatim,quote]
+\\header {
+  title = \"My title\"
+  description = \"Lorem ipsum dolor sit amet, consectetur adipisicing
+    elit, sed do eiusmod tempor incididunt ut labore et dolore magna
+    aliqua.  Ut enim ad minim veniam, quis nostrud exercitation ullamco
+    laboris nisi ut aliquip ex ea commodo consequat.\"
+}
+
+\\paper {
+  bookTitleMarkup = \\markup {
+    \\column {
+      \\fill-line { \\fromproperty #'header:title }
+      \\null
+      \\wordwrap-field #'header:descr
+    }
+  }
+}
+
+\\markup {
+  \\null
+}
+@end lilypond"
   (let* ((m (chain-assoc-get symbol props)))
     (if (string? m)
         (wordwrap-string-markup layout props m)
@@ -930,13 +1043,37 @@ the line width, where @var{X} is the number of staff spaces."
   (symbol?)
   align
   ()
-  "Justify the data which has been assigned to @var{symbol}."
+  "Justify the data which has been assigned to @var{symbol}.
+  
+@lilypond[verbatim,quote]
+\\header {
+  title = \"My title\"
+  description = \"Lorem ipsum dolor sit amet, consectetur adipisicing
+    elit, sed do eiusmod tempor incididunt ut labore et dolore magna
+    aliqua.  Ut enim ad minim veniam, quis nostrud exercitation ullamco
+    laboris nisi ut aliquip ex ea commodo consequat.\"
+}
+
+\\paper {
+  bookTitleMarkup = \\markup {
+    \\column {
+      \\fill-line { \\fromproperty #'header:title }
+      \\null
+      \\justify-field #'header:description
+    }
+  }
+}
+
+\\markup {
+  \\null
+}
+@end lilypond"
   (let* ((m (chain-assoc-get symbol props)))
     (if (string? m)
         (justify-string-markup layout props m)
         empty-stencil)))
 
-(define-builtin-markup-command (combine layout props m1 m2)
+(define-builtin-markup-command (combine layout props arg1 arg2)
   (markup? markup?)
   align
   ()
@@ -944,17 +1081,25 @@ the line width, where @var{X} is the number of staff spaces."
 @cindex merging text
 
 Print two markups on top of each other.
+
+Note: @code{\\combine} cannot take a list of markups enclosed in
+curly braces as an argument; the follow example will not compile:
+
+@example
+\\combine @{ a list @}
+@end example
+
 @lilypond[verbatim,quote]
 \\markup {
   \\fontsize #5
   \\override #'(thickness . 2)
   \\combine
-  \\draw-line #'(0 . 4)
-  \\arrow-head #Y #DOWN ##f
+    \\draw-line #'(0 . 4)
+    \\arrow-head #Y #DOWN ##f
 }
 @end lilypond"
-  (let* ((s1 (interpret-markup layout props m1))
-	 (s2 (interpret-markup layout props m2)))
+  (let* ((s1 (interpret-markup layout props arg1))
+	 (s2 (interpret-markup layout props arg2)))
     (ly:stencil-add s1 s2)))
 
 ;;
@@ -968,14 +1113,16 @@ Print two markups on top of each other.
 @cindex stacking text in a column
 
 Stack the markups in @var{args} vertically.  The property
-@code{baseline-skip} determines the space between each
-markup in @var{args}.
+@code{baseline-skip} determines the space between markups
+in @var{args}.
 
 @lilypond[verbatim,quote]
-\\markup \\column {
-  one
-  two
-  three
+\\markup {
+  \\column {
+    one
+    two
+    three
+  }
 }
 @end lilypond"
   (let ((arg-stencils (interpret-markup-list layout props args)))
@@ -990,14 +1137,26 @@ markup in @var{args}.
   "
 @cindex changing direction of text columns
 
-Make a column of args, going up or down, depending on the setting
-of the @code{#'direction} layout property.
+Make a column of @var{args}, going up or down, depending on the
+setting of the @code{direction} layout property.
 
 @lilypond[verbatim,quote]
 \\markup {
-  \\override #'(direction . 1)
-  \\dir-column { going up }
-  \\dir-column { going down }
+  \\override #`(direction . ,UP) {
+    \\dir-column {
+      going up
+    }
+  }
+  \\hspace #1
+  \\dir-column {
+    going down
+  }
+  \\hspace #1
+  \\override #'(direction . 1) {
+    \\dir-column {
+      going up
+    }
+  }
 }
 @end lilypond"
   (stack-lines (if (number? direction) direction -1)
@@ -1005,7 +1164,13 @@ of the @code{#'direction} layout property.
                baseline-skip
                (interpret-markup-list layout props args)))
 
-(define-builtin-markup-command (center-align layout props args)
+(define (general-column align-dir baseline mols)
+  "Stack @var{mols} vertically, aligned to  @var{align-dir} horizontally."
+  
+  (let* ((aligned-mols (map (lambda (x) (ly:stencil-aligned-to x X align-dir)) mols)))
+    (stack-lines -1 0.0 baseline aligned-mols)))
+
+(define-builtin-markup-command (center-column layout props args)
   (markup-list?)
   align
   ((baseline-skip))
@@ -1015,15 +1180,55 @@ of the @code{#'direction} layout property.
 Put @code{args} in a centered column.
 
 @lilypond[verbatim,quote]
-\\markup \\center-align {
-  one
-  two
-  three
+\\markup {
+  \\center-column {
+    one
+    two
+    three
+  }
 }
 @end lilypond"
-  (let* ((mols (interpret-markup-list layout props args))
-         (cmols (map (lambda (x) (ly:stencil-aligned-to x X CENTER)) mols)))
-    (stack-lines -1 0.0 baseline-skip cmols)))
+  (general-column CENTER baseline-skip (interpret-markup-list layout props args)))
+
+(define-builtin-markup-command (left-column layout props args)
+  (markup-list?)
+  align
+  ((baseline-skip))
+ "
+@cindex text columns, left-aligned 
+
+Put @code{args} in a left-aligned column.
+
+@lilypond[verbatim,quote]
+\\markup {
+  \\left-column {
+    one
+    two
+    three
+  }
+}
+@end lilypond"
+  (general-column LEFT baseline-skip (interpret-markup-list layout props args)))
+
+(define-builtin-markup-command (right-column layout props args)
+  (markup-list?)
+  align
+  ((baseline-skip))
+ "
+@cindex text columns, right-aligned
+
+Put @code{args} in a right-aligned column.
+
+@lilypond[verbatim,quote]
+\\markup {
+  \\right-column {
+    one
+    two
+    three
+  }
+}
+@end lilypond"
+  (general-column RIGHT baseline-skip (interpret-markup-list layout props args)))
 
 (define-builtin-markup-command (vcenter layout props arg)
   (markup?)
@@ -1036,16 +1241,16 @@ Align @code{arg} to its Y@tie{}center.
 
 @lilypond[verbatim,quote]
 \\markup {
-  \\arrow-head #X #RIGHT ##f
+  one
   \\vcenter
-  Centered
-  \\arrow-head #X #LEFT ##f
+  two
+  three
 }
 @end lilypond"
   (let* ((mol (interpret-markup layout props arg)))
     (ly:stencil-aligned-to mol Y CENTER)))
 
-(define-builtin-markup-command (hcenter layout props arg)
+(define-builtin-markup-command (center-align layout props arg)
   (markup?)
   align
   ()
@@ -1055,10 +1260,13 @@ Align @code{arg} to its Y@tie{}center.
 Align @code{arg} to its X@tie{}center.
 
 @lilypond[verbatim,quote]
-\\markup \\column {
-  ↓
-  \\hcenter
-  centered
+\\markup {
+  \\column {
+    one
+    \\center-align
+    two
+    three
+  }
 }
 @end lilypond"
   (let* ((mol (interpret-markup layout props arg)))
@@ -1074,10 +1282,13 @@ Align @code{arg} to its X@tie{}center.
 Align @var{arg} on its right edge.
 
 @lilypond[verbatim,quote]
-\\markup \\column {
-  ↓
-  \\right-align
-  right-aligned
+\\markup {
+  \\column {
+    one
+    \\right-align
+    two
+    three
+  }
 }
 @end lilypond"
   (let* ((m (interpret-markup layout props arg)))
@@ -1093,10 +1304,13 @@ Align @var{arg} on its right edge.
 Align @var{arg} on its left edge.
 
 @lilypond[verbatim,quote]
-\\markup \\column {
-  ↓
-  \\left-align
-  left-aligned
+\\markup {
+  \\column {
+    one
+    \\left-align
+    two
+    three
+  }
 }
 @end lilypond"
   (let* ((m (interpret-markup layout props arg)))
@@ -1109,7 +1323,37 @@ Align @var{arg} on its left edge.
   "
 @cindex controlling general text alignment
 
-Align @var{arg} in @var{axis} direction to the @var{dir} side."
+Align @var{arg} in @var{axis} direction to the @var{dir} side.
+
+@lilypond[verbatim,quote]
+\\markup {
+  \\column {
+    one
+    \\general-align #X #LEFT
+    two
+    three
+    \\null
+    one
+    \\general-align #X #CENTER
+    two
+    three
+    \\null
+    \\line {
+      one
+      \\general-align #Y #UP
+      two
+      three
+    }
+    \\null
+    \\line {
+      one
+      \\general-align #Y #3.2
+      two
+      three
+    }
+  }
+}
+@end lilypond"
   (let* ((m (interpret-markup layout props arg)))
     (ly:stencil-aligned-to m axis dir)))
 
@@ -1125,19 +1369,28 @@ left-aligned, while @code{+1} is right.  Values in between interpolate
 alignment accordingly.
 
 @lilypond[verbatim,quote]
-\\markup \\column {
-  ↓
-  \\halign #LEFT
-  Left
-  ↓
-  \\halign #CENTER
-  Center
-  ↓
-  \\halign #RIGHT
-  Right
-  ↓
-  \\halign #1.2
-  \\line { Arbitrary alignment }
+\\markup {
+  \\column {
+    one
+    \\halign #LEFT
+    two
+    three
+    \\null
+    one
+    \\halign #CENTER
+    two
+    three
+    \\null
+    one
+    \\halign #RIGHT
+    two
+    three
+    \\null
+    one
+    \\halign #-5
+    two
+    three
+  }
 }
 @end lilypond"
   (let* ((m (interpret-markup layout props arg)))
@@ -1158,7 +1411,21 @@ Set the dimensions of @var{arg} to @var{x} and@tie{}@var{y}."
   (number? markup?)
   align
   ()
-  "Add padding @var{amount} all around @var{arg}."  
+  "Add padding @var{amount} all around @var{arg}.
+  
+@lilypond[verbatim,quote]
+\\markup {
+  \\box {
+    default
+  }
+  \\hspace #2
+  \\box {
+    \\pad-around #0.5 {
+      padded
+    }
+  }
+}
+@end lilypond"
   (let* ((m (interpret-markup layout props arg))
          (x (ly:stencil-extent m X))
          (y (ly:stencil-extent m Y)))
@@ -1173,7 +1440,21 @@ Set the dimensions of @var{arg} to @var{x} and@tie{}@var{y}."
   "
 @cindex padding text horizontally
 
-Add padding @var{amount} around @var{arg} in the X@tie{}direction."
+Add padding @var{amount} around @var{arg} in the X@tie{}direction.
+
+@lilypond[verbatim,quote]
+\\markup {
+  \\box {
+    default
+  }
+  \\hspace #4
+  \\box {
+    \\pad-x #2 {
+      padded
+    }
+  }
+}
+@end lilypond"
   (let* ((m (interpret-markup layout props arg))
          (x (ly:stencil-extent m X))
          (y (ly:stencil-extent m Y)))
@@ -1181,8 +1462,8 @@ Add padding @var{amount} around @var{arg} in the X@tie{}direction."
                      (interval-widen x amount)
                      y)))
 
-(define-builtin-markup-command (put-adjacent layout props arg1 axis dir arg2)
-  (markup? integer? ly:dir? markup?)
+(define-builtin-markup-command (put-adjacent layout props axis dir arg1 arg2)
+  (integer? ly:dir? markup? markup?)
   align
   ()
   "Put @var{arg2} next to @var{arg1}, without moving @var{arg1}."
@@ -1194,7 +1475,15 @@ Add padding @var{amount} around @var{arg} in the X@tie{}direction."
   (markup?)
   other
   ()
-  "Make the argument transparent."
+  "Make @var{arg} transparent.
+  
+@lilypond[verbatim,quote]
+\\markup {
+  \\transparent {
+    invisible text
+  }
+}
+@end lilypond"
   (let* ((m (interpret-markup layout props arg))
          (x (ly:stencil-extent m X))
          (y (ly:stencil-extent m Y)))
@@ -1204,7 +1493,21 @@ Add padding @var{amount} around @var{arg} in the X@tie{}direction."
   (number-pair? number-pair? markup?)
   align
   ()
-  "Make @var{arg} take at least @var{x-ext}, @var{y-ext} space."
+  "Make @var{arg} take at least @var{x-ext}, @var{y-ext} space.
+
+@lilypond[verbatim,quote]
+\\markup {
+  \\box {
+    default
+  }
+  \\hspace #4
+  \\box {
+    \\pad-to-box #'(0 . 10) #'(0 . 3) {
+      padded
+    }
+  }
+}
+@end lilypond"
   (let* ((m (interpret-markup layout props arg))
          (x (ly:stencil-extent m X))
          (y (ly:stencil-extent m Y)))
@@ -1217,12 +1520,32 @@ Add padding @var{amount} around @var{arg} in the X@tie{}direction."
   align
   ()
   "Center @var{arg} horizontally within a box of extending
-@var{length}/2 to the left and right."
+@var{length}/2 to the left and right.
+
+@lilypond[quote,verbatim]
+\\new StaffGroup <<
+  \\new Staff {
+    \\set Staff.instrumentName = \\markup {
+      \\hcenter-in #12
+      Oboe
+    }
+    c''1
+  }
+  \\new Staff {
+    \\set Staff.instrumentName = \\markup {
+      \\hcenter-in #12
+      Bassoon
+    }
+    \\clef tenor
+    c'1
+  }
+>>
+@end lilypond"
   (interpret-markup layout props
                     (make-pad-to-box-markup
                      (cons (/ length -2) (/ length 2))
                      '(0 . 0)
-                     (make-hcenter-markup arg))))
+                     (make-center-align-markup arg))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; property
@@ -1234,7 +1557,21 @@ Add padding @var{amount} around @var{arg} in the X@tie{}direction."
   ()
   "Read the @var{symbol} from property settings, and produce a stencil
 from the markup contained within.  If @var{symbol} is not defined, it
-returns an empty markup."
+returns an empty markup.
+
+@lilypond[verbatim,quote]
+\\header {
+  myTitle = \"myTitle\"
+  title = \\markup {
+    from
+    \\italic
+    \\fromproperty #'header:myTitle
+  }
+}
+\\markup {
+  \\null
+}
+@end lilypond"
   (let ((m (chain-assoc-get symbol props)))
     (if (markup? m)
         (interpret-markup layout props m)
@@ -1259,13 +1596,28 @@ returns an empty markup."
   "
 @cindex overriding properties within text markup
 
-Add the first argument in to the property list.  Properties may be
-any sort of property supported by @rinternals{font-interface} and
-@rinternals{text-interface}, for example
+Add the argument @var{new-prop} to the property list.  Properties
+may be any property supported by @rinternals{font-interface},
+@rinternals{text-interface} and
+@rinternals{instrument-specific-markup-interface}.
 
-@example
-\\override #'(font-family . married) \"bla\"
-@end example"
+@lilypond[verbatim,quote]
+\\markup {
+  \\line {
+    \\column {
+      default
+      baseline-skip
+    }
+    \\hspace #2
+    \\override #'(baseline-skip . 4) {
+      \\column {
+        increased
+        baseline-skip
+      }
+    }
+  }
+}
+@end lilypond"
   (interpret-markup layout (cons (list new-prop) props) arg))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -1276,10 +1628,12 @@ any sort of property supported by @rinternals{font-interface} and
   (string?)
   other
   ()
-  "Read the contents of a file, and include it verbatim.
+  "Read the contents of file @var{name}, and include it verbatim.
 
 @lilypond[verbatim,quote]
-\\markup \\verbatim-file #\"simple.ly\"
+\\markup {
+  \\verbatim-file #\"simple.ly\"
+}
 @end lilypond"
   (interpret-markup layout props
                     (if  (ly:get-option 'safe)
@@ -1293,32 +1647,23 @@ any sort of property supported by @rinternals{font-interface} and
 ;; fonts.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(define-builtin-markup-command (bigger layout props arg)
-  (markup?)
-  font
-  ()
-  "Increase the font size relative to current setting.
-
-@lilypond[verbatim,quote]
-\\markup \\bigger {
-  Voici venir les temps où vibrant sur sa tige
-}
-@end lilypond"
-  (interpret-markup layout props
-   `(,fontsize-markup 1 ,arg)))
 
 (define-builtin-markup-command (smaller layout props arg)
   (markup?)
   font
   ()
-  "Decrease the font size relative to current setting.
+  "Decrease the font size relative to the current setting.
   
 @lilypond[verbatim,quote]
-\\markup \\fontsize #3 {
-  some large text
-  \\hspace #2
-  \\smaller {
-    a bit smaller
+\\markup {
+  \\fontsize #3.5 {
+    some large text
+    \\hspace #2
+    \\smaller {
+      a bit smaller
+    }
+    \\hspace #2
+    more large text
   }
 }
 @end lilypond"
@@ -1329,7 +1674,7 @@ any sort of property supported by @rinternals{font-interface} and
   (markup?)
   font
   ()
-  "Copy of the @code{\\bigger} command.
+  "Increase the font size relative to the current setting.
 
 @lilypond[verbatim,quote]
 \\markup {
@@ -1339,32 +1684,69 @@ any sort of property supported by @rinternals{font-interface} and
   larger
 }
 @end lilypond"
-  (interpret-markup layout props (make-bigger-markup arg)))
+  (interpret-markup layout props
+   `(,fontsize-markup 1 ,arg)))
 
 (define-builtin-markup-command (finger layout props arg)
   (markup?)
   font
   ()
-  "Set the argument as small numbers.
+  "Set @var{arg} as small numbers.
+
 @lilypond[verbatim,quote]
-\\markup \\finger {
-  1 2 3 4 5
+\\markup {
+  \\finger {
+    1 2 3 4 5
+  }
 }
 @end lilypond"
   (interpret-markup layout
                     (cons '((font-size . -5) (font-encoding . fetaNumber)) props)
                     arg))
 
+(define-builtin-markup-command (abs-fontsize layout props size arg)
+  (number? markup?)
+  font
+  ()
+  "Use @var{size} as the absolute font size to display @var{arg}.
+Adjusts @code{baseline-skip} and @code{word-space} accordingly.
+
+@lilypond[verbatim,quote]
+\\markup {
+  default text font size
+  \\hspace #2
+  \\abs-fontsize #16 { text font size 16 }
+  \\hspace #2
+  \\abs-fontsize #12 { text font size 12 }
+}
+@end lilypond"
+  (let* ((ref-size (ly:output-def-lookup layout 'text-font-size 12))
+	 (text-props (list (ly:output-def-lookup layout 'text-font-defaults)))
+	 (ref-word-space (chain-assoc-get 'word-space text-props 0.6))
+	 (ref-baseline (chain-assoc-get 'baseline-skip text-props 3))
+	 (magnification (/ size ref-size)))
+    (interpret-markup layout
+		      (cons `((baseline-skip . ,(* magnification ref-baseline))
+			      (word-space . ,(* magnification ref-word-space))
+			      (font-size . ,(magnification->font-size magnification)))
+			    props)
+		      arg)))
+
 (define-builtin-markup-command (fontsize layout props increment arg)
   (number? markup?)
   font
   ((font-size 0)
    (word-space 1)
    (baseline-skip 2))
-  "Add @var{increment} to the font-size.  Adjust baseline skip accordingly.
+  "Add @var{increment} to the font-size.  Adjusts @code{baseline-skip}
+accordingly.
+
 @lilypond[verbatim,quote]
-\\markup \\fontsize #-1.5 {
-  Valse mélancolique et langoureux vertige!
+\\markup {
+  default
+  \\hspace #2
+  \\fontsize #-1.5
+  smaller
 }
 @end lilypond"
   (let ((entries (list
@@ -1411,8 +1793,11 @@ Use @code{\\fontsize} otherwise.
   "Switch to bold font-series.
   
 @lilypond[verbatim,quote]
-\\markup \\bold {
-  Chaque fleur s'évapore ainsi qu'un encensoir
+\\markup {
+  default
+  \\hspace #2
+  \\bold
+  bold
 }
 @end lilypond"
   (interpret-markup layout (prepend-alist-chain 'font-series 'bold props) arg))
@@ -1421,7 +1806,7 @@ Use @code{\\fontsize} otherwise.
   (markup?)
   font
   ()
-  "Switch to the sans serif family.
+  "Switch to the sans serif font family.
   
 @lilypond[verbatim,quote]
 \\markup {
@@ -1439,12 +1824,14 @@ Use @code{\\fontsize} otherwise.
   font
   ()
   "Set font family to @code{number}, which yields the font used for
-time signatures and fingerings.  This font only contains numbers and
-some punctuation.  It doesn't have any letters.
+time signatures and fingerings.  This font contains numbers and
+some punctuation; it has no letters.
 
 @lilypond[verbatim,quote]
-\\markup \\number {
-  0 1 2 3 4 5 6 7 8 9 . ,
+\\markup {
+  \\number {
+    0 1 2 3 4 5 6 7 8 9 . ,
+  }
 }
 @end lilypond"
   (interpret-markup layout (prepend-alist-chain 'font-encoding 'fetaNumber props) arg))
@@ -1456,14 +1843,16 @@ some punctuation.  It doesn't have any letters.
   "Set font family to @code{roman}.
   
 @lilypond[verbatim,quote]
-\\markup \\sans \\bold {
-  bold sans serif
-  \\hspace #2
-  \\roman {
-    text in roman font family
+\\markup {
+  \\sans \\bold {
+    sans serif, bold
+    \\hspace #2
+    \\roman {
+      text in roman font family
+    }
+    \\hspace #2
+    return to sans
   }
-  \\hspace #2
-  return to sans
 }
 @end lilypond"
   (interpret-markup layout (prepend-alist-chain 'font-family 'roman props) arg))
@@ -1507,14 +1896,16 @@ some punctuation.  It doesn't have any letters.
   "Set font size to default.
   
 @lilypond[verbatim,quote]
-\\markup \\teeny {
-  this is very small
-  \\hspace #1
-  \\normalsize {
-    revert to normal size
+\\markup {
+  \\teeny {
+    this is very small
+    \\hspace #2
+    \\normalsize {
+      normal size
+    }
+    \\hspace #2
+    teeny again
   }
-  \\hspace #1
-  teeny again
 }
 @end lilypond"
   (interpret-markup layout (prepend-alist-chain 'font-size 0 props) arg))
@@ -1571,11 +1962,14 @@ some punctuation.  It doesn't have any letters.
   (markup?)
   font
   ()
-  "Set @code{font-shape} to @code{caps}"
+  "Set @code{font-shape} to @code{caps}
+  
+Note: @code{\\fontCaps} requires the installation and selection of
+fonts which support the @code{caps} font shape."
   (interpret-markup layout (prepend-alist-chain 'font-shape 'caps props) arg))
 
 ;; Poor man's caps
-(define-builtin-markup-command (smallCaps layout props text)
+(define-builtin-markup-command (smallCaps layout props arg)
   (markup?)
   font
   ()
@@ -1619,9 +2013,9 @@ Note: @code{\\smallCaps} does not support accented characters.
 					    currents current-is-lower)
 					 prev-result)))))))
   (interpret-markup layout props
-    (if (string? text)
-	(make-small-caps (string->list text) (list) #f (list))
-	text)))
+    (if (string? arg)
+	(make-small-caps (string->list arg) (list) #f (list))
+	arg)))
 
 (define-builtin-markup-command (caps layout props arg)
   (markup?)
@@ -1630,8 +2024,12 @@ Note: @code{\\smallCaps} does not support accented characters.
   "Copy of the @code{\\smallCaps} command.
 
 @lilypond[verbatim,quote]
-\\markup \\caps {
-  Les sons et les parfums tournent dans l'air du soir
+\\markup {
+  default
+  \\hspace #2
+  \\caps {
+    Text in small caps
+  }
 }
 @end lilypond"
   (interpret-markup layout props (make-smallCaps-markup arg)))
@@ -1645,7 +2043,11 @@ Note: @code{\\smallCaps} does not support accented characters.
 @q{pi@`{u}@tie{}@b{f}}, the normal words (like @q{pi@`{u}}) should be
 done in a different font.  The recommended font for this is bold and italic.
 @lilypond[verbatim,quote]
-\\markup \\dynamic { sfzp }
+\\markup {
+  \\dynamic {
+    sfzp
+  }
+}
 @end lilypond"
   (interpret-markup
    layout (prepend-alist-chain 'font-encoding 'fetaDynamic props) arg))
@@ -1657,12 +2059,14 @@ done in a different font.  The recommended font for this is bold and italic.
   "Use a text font instead of music symbol or music alphabet font.
   
 @lilypond[verbatim,quote]
-\\markup \\number {
-  1, 2,
-  \\text {
-    three, four,
+\\markup {
+  \\number {
+    1, 2,
+    \\text {
+      three, four,
+    }
+    5
   }
-  5
 }
 @end lilypond"
 
@@ -1677,8 +2081,11 @@ done in a different font.  The recommended font for this is bold and italic.
   "Use italic @code{font-shape} for @var{arg}.
 
 @lilypond[verbatim,quote]
-\\markup \\italic {
-  scherzando e leggiero
+\\markup {
+  default
+  \\hspace #2
+  \\italic
+  italic
 }
 @end lilypond"
   (interpret-markup layout (prepend-alist-chain 'font-shape 'italic props) arg))
@@ -1704,17 +2111,20 @@ done in a different font.  The recommended font for this is bold and italic.
   (markup?)
   font
   ()
-  "Set font shape to @code{upright}.  This is the opposite of @code{italic}.
+  "Set @code{font-shape} to @code{upright}.  This is the opposite
+of @code{italic}.
 
 @lilypond[verbatim,quote]
-\\markup \\italic {
-  italic text
-  \\hspace #2
-  \\upright {
-    upright text
+\\markup {
+  \\italic {
+    italic text
+    \\hspace #2
+    \\upright {
+      upright text
+    }
+    \\hspace #2
+    italic again
   }
-  \\hspace #2
-  italic again
 }
 @end lilypond"
   (interpret-markup
@@ -1724,17 +2134,19 @@ done in a different font.  The recommended font for this is bold and italic.
   (markup?)
   font
   ()
-  "Switch to medium font series (in contrast to bold).
+  "Switch to medium font-series (in contrast to bold).
 
 @lilypond[verbatim,quote]
-\\markup \\bold {
-  some bold text
-  \\hspace #2
-  \\medium {
-    medium font series
+\\markup {
+  \\bold {
+    some bold text
+    \\hspace #2
+    \\medium {
+      medium font series
+    }
+    \\hspace #2
+    bold again
   }
-  \\hspace #2
-  bold again
 }
 @end lilypond"
   (interpret-markup layout (prepend-alist-chain 'font-series 'medium props)
@@ -1748,14 +2160,16 @@ done in a different font.  The recommended font for this is bold and italic.
 normal text font, no matter what font was used earlier.
 
 @lilypond[verbatim,quote]
-\\markup \\huge \\bold \\sans \\caps {
-  Some text with font overrides
-  \\hspace #2
-  \\normal-text {
-    Default text, same font-size
+\\markup {
+  \\huge \\bold \\sans \\caps {
+    Some text with font overrides
+    \\hspace #2
+    \\normal-text {
+      Default text, same font-size
+    }
+    \\hspace #2
+    More text as before
   }
-  \\hspace #2
-  More text
 }
 @end lilypond"
   ;; ugh - latin1
@@ -1776,7 +2190,9 @@ normal text font, no matter what font was used earlier.
   "Draw a double sharp symbol.
 
 @lilypond[verbatim,quote]
-\\markup { \\doublesharp }
+\\markup {
+  \\doublesharp
+}
 @end lilypond"
   (interpret-markup layout props (markup #:musicglyph (assoc-get 1 standard-alteration-glyph-name-alist ""))))
 
@@ -1787,7 +2203,9 @@ normal text font, no matter what font was used earlier.
   "Draw a 3/2 sharp symbol.
 
 @lilypond[verbatim,quote]
-\\markup { \\sesquisharp }
+\\markup {
+  \\sesquisharp
+}
 @end lilypond"
   (interpret-markup layout props (markup #:musicglyph (assoc-get 3/4 standard-alteration-glyph-name-alist ""))))					 
 
@@ -1798,7 +2216,9 @@ normal text font, no matter what font was used earlier.
   "Draw a sharp symbol.
 
 @lilypond[verbatim,quote]
-\\markup { \\sharp }
+\\markup {
+  \\sharp
+}
 @end lilypond"
   (interpret-markup layout props (markup #:musicglyph (assoc-get 1/2 standard-alteration-glyph-name-alist ""))))
 
@@ -1806,10 +2226,12 @@ normal text font, no matter what font was used earlier.
   ()
   music
   ()
-  "Draw a semi sharp symbol.
+  "Draw a semisharp symbol.
 
 @lilypond[verbatim,quote]
-\\markup { \\semisharp }
+\\markup {
+  \\semisharp
+}
 @end lilypond"
   (interpret-markup layout props (markup #:musicglyph (assoc-get 1/4 standard-alteration-glyph-name-alist ""))))
 
@@ -1820,7 +2242,9 @@ normal text font, no matter what font was used earlier.
   "Draw a natural symbol.
 
 @lilypond[verbatim,quote]
-\\markup { \\natural }
+\\markup {
+  \\natural
+}
 @end lilypond"
   (interpret-markup layout props (markup #:musicglyph (assoc-get 0 standard-alteration-glyph-name-alist ""))))
 
@@ -1831,7 +2255,9 @@ normal text font, no matter what font was used earlier.
   "Draw a semiflat symbol.
 
 @lilypond[verbatim,quote]
-\\markup { \\semiflat }
+\\markup {
+  \\semiflat
+}
 @end lilypond"
   (interpret-markup layout props (markup #:musicglyph (assoc-get -1/4 standard-alteration-glyph-name-alist ""))))
 
@@ -1842,7 +2268,9 @@ normal text font, no matter what font was used earlier.
   "Draw a flat symbol.
 
 @lilypond[verbatim,quote]
-\\markup { \\flat }
+\\markup {
+  \\flat
+}
 @end lilypond"
   (interpret-markup layout props (markup #:musicglyph (assoc-get -1/2 standard-alteration-glyph-name-alist ""))))
 
@@ -1853,7 +2281,9 @@ normal text font, no matter what font was used earlier.
   "Draw a 3/2 flat symbol.
 
 @lilypond[verbatim,quote]
-\\markup { \\sesquiflat }
+\\markup {
+  \\sesquiflat
+}
 @end lilypond"
   (interpret-markup layout props (markup #:musicglyph (assoc-get -3/4 standard-alteration-glyph-name-alist ""))))
 
@@ -1864,7 +2294,9 @@ normal text font, no matter what font was used earlier.
   "Draw a double flat symbol.
 
 @lilypond[verbatim,quote]
-\\markup { \\doubleflat }
+\\markup {
+  \\doubleflat
+}
 @end lilypond"
   (interpret-markup layout props (markup #:musicglyph (assoc-get -1 standard-alteration-glyph-name-alist ""))))
 
@@ -1875,7 +2307,20 @@ normal text font, no matter what font was used earlier.
   "
 @cindex coloring text
 
-Draw @var{arg} in color specified by @var{color}."
+Draw @var{arg} in color specified by @var{color}.
+
+@lilypond[verbatim,quote]
+\\markup {
+  \\with-color #red
+  red
+  \\hspace #2
+  \\with-color #green
+  green
+  \\hspace #2
+  \\with-color #blue
+  blue
+}
+@end lilypond"
   (let ((stil (interpret-markup layout props arg)))
     (ly:make-stencil (list 'color color (ly:stencil-expr stil))
 		     (ly:stencil-extent stil X)
@@ -1885,7 +2330,7 @@ Draw @var{arg} in color specified by @var{color}."
 ;; glyphs
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(define-builtin-markup-command (arrow-head layout props axis direction filled)
+(define-builtin-markup-command (arrow-head layout props axis dir filled)
   (integer? ly:dir? boolean?)
   graphic
   ()
@@ -1893,13 +2338,14 @@ Draw @var{arg} in color specified by @var{color}."
 Use the filled head if @var{filled} is specified.
 @lilypond[verbatim,quote]
 \\markup {
-  \\fontsize #5
-  \\general-align #Y #DOWN {
-    \\arrow-head #Y #UP ##t
-    \\arrow-head #Y #DOWN ##f
-    \\hspace #2
-    \\arrow-head #X #RIGHT ##f
-    \\arrow-head #X #LEFT ##f
+  \\fontsize #5 {
+    \\general-align #Y #DOWN {
+      \\arrow-head #Y #UP ##t
+      \\arrow-head #Y #DOWN ##f
+      \\hspace #2
+      \\arrow-head #X #RIGHT ##f
+      \\arrow-head #X #LEFT ##f
+    }
   }
 }
 @end lilypond"
@@ -1909,7 +2355,7 @@ Use the filled head if @var{filled} is specified.
 			 "close"
 			 "open")
 		     axis
-		     direction)))
+		     dir)))
     (ly:font-get-glyph
      (ly:paper-get-font layout (cons '((font-encoding . fetaMusic))
 				     props))
@@ -1950,11 +2396,13 @@ the possible glyphs.
   "Lookup a glyph by name.
   
 @lilypond[verbatim,quote]
-\\markup \\override #'(font-encoding . fetaBraces) {
-  \\lookup #\"brace200\"
-  \\hspace #2
-  \\rotate #180
-  \\lookup #\"brace180\"
+\\markup {
+  \\override #'(font-encoding . fetaBraces) {
+    \\lookup #\"brace200\"
+    \\hspace #2
+    \\rotate #180
+    \\lookup #\"brace180\"
+  }
 }
 @end lilypond"
   (ly:font-get-glyph (ly:paper-get-font layout props)
@@ -1964,8 +2412,14 @@ the possible glyphs.
   (integer?)
   other
   ()
-  "Produce a single character.  For example, @code{\\char #65} produces the 
-letter @q{A}."
+  "Produce a single character.  Characters encoded in hexadecimal
+format require the prefix @code{#x}.
+
+@lilypond[verbatim,quote]
+\\markup {
+  \\char #65 \\char ##x00a9
+}
+@end lilypond"
   (ly:text-interface::interpret-markup layout props (ly:wide-char->utf-8 num)))
 
 (define number->mark-letter-vector (make-vector 25 #\A))
@@ -2025,7 +2479,6 @@ and continue with double letters.
      (number->markletter-string number->mark-alphabet-vector num)))
 
 (define-public (horizontal-slash-interval num forward number-interval mag)
-  (ly:message "Mag step: ~a" mag)
   (if forward
     (cond ;((= num 6) (interval-widen number-interval (* mag 0.5)))
           ;((= num 5) (interval-widen number-interval (* mag 0.5)))
@@ -2071,13 +2524,10 @@ and continue with double letters.
          (num-y (interval-widen (cons center center) (abs dy)))
          (is-sane (and (interval-sane? num-x) (interval-sane? num-y)))
          (slash-stencil (if is-sane
-                            (ly:make-stencil
-                             `(draw-line ,thickness
-                                         ,(car num-x) ,(- (interval-center num-y) dy)
-                                         ,(cdr num-x) ,(+ (interval-center num-y) dy))
-                             num-x num-y)
+                            (make-line-stencil thickness 
+                                         (car num-x) (- (interval-center num-y) dy)
+                                         (cdr num-x) (+ (interval-center num-y) dy))
                             #f)))
-(ly:message "Num: ~a, X-interval: ~a" num num-x)
     (if (ly:stencil? slash-stencil)
       (begin
         ; for some numbers we need to shift the slash/backslash up or down to make
@@ -2108,7 +2558,7 @@ figured bass notation.
 }
 @end lilypond"
   (slashed-digit-internal layout props num #t font-size thickness))
-
+
 (define-builtin-markup-command (backslashed-digit layout props num)
   (integer?)
   other
@@ -2128,7 +2578,7 @@ figured bass notation.
 }
 @end lilypond"
   (slashed-digit-internal layout props num #f font-size thickness))
-
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; the note command.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -2144,12 +2594,12 @@ figured bass notation.
 @cindex notes within text by log and dot-count
 
 Construct a note symbol, with stem.  By using fractional values for
-@var{dir}, you can obtain longer or shorter stems.
+@var{dir}, longer or shorter stems can be obtained.
 
 @lilypond[verbatim,quote]
 \\markup {
   \\note-by-number #3 #0 #DOWN
-  \\hspace #1
+  \\hspace #2
   \\note-by-number #1 #2 #0.8
 }
 @end lilypond"
@@ -2259,15 +2709,16 @@ a shortened down stem.
 
 @lilypond[verbatim,quote]
 \\markup {
-  \\override #'(style . cross)
-  \\note #\"4..\" #UP
-  \\hspace #1
+  \\override #'(style . cross) {
+    \\note #\"4..\" #UP
+  }
+  \\hspace #2
   \\note #\"breve\" #0
 }
 @end lilypond"
   (let ((parsed (parse-simple-duration duration)))
     (note-by-number-markup layout props (car parsed) (cadr parsed) dir)))
-
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; translating.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -2280,20 +2731,39 @@ a shortened down stem.
 @cindex lowering text
 
 Lower @var{arg} by the distance @var{amount}.
-A negative @var{amount} indicates raising; see also @code{\\raise}."
+A negative @var{amount} indicates raising; see also @code{\\raise}.
+
+@lilypond[verbatim,quote]
+\\markup {
+  one
+  \\lower #3
+  two
+  three
+}
+@end lilypond"
   (ly:stencil-translate-axis (interpret-markup layout props arg)
 			     (- amount) Y))
 
 (define-builtin-markup-command (translate-scaled layout props offset arg)
   (number-pair? markup?)
-  other
+  align
   ((font-size 0))
   "
 @cindex translating text
 @cindex scaling text
 
 Translate @var{arg} by @var{offset}, scaling the offset by the
-@code{font-size}."
+@code{font-size}.
+
+@lilypond[verbatim,quote]
+\\markup {
+  \\fontsize #5 {
+    * \\translate #'(2 . 3) translate
+    \\hspace #2
+    * \\translate-scaled #'(2 . 3) translate-scaled
+  }
+}
+@end lilypond"
   (let* ((factor (magstep font-size))
          (scaled (cons (* factor (car offset))
                        (* factor (cdr offset)))))
@@ -2321,7 +2791,13 @@ positions it next to the staff cancels any shift made with
 and/or @code{extra-offset} properties.
 
 @lilypond[verbatim,quote]
-\\markup { C \\small \\raise #1.0 \\bold 9/7+ }
+\\markup {
+  C
+  \\small
+  \\bold
+  \\raise #1.0
+  9/7+
+}
 @end lilypond"
   (ly:stencil-translate-axis (interpret-markup layout props arg) amount Y))
 
@@ -2390,8 +2866,7 @@ Set @var{arg} in superscript with a normal font size.
   "  
 @cindex superscript text
 
-Raising and lowering texts can be done with @code{\\super} and
-@code{\\sub}:
+Set @var{arg} in superscript.
 
 @lilypond[verbatim,quote]
 \\markup {
@@ -2418,17 +2893,17 @@ Raising and lowering texts can be done with @code{\\super} and
   "
 @cindex translating text
   
-This translates an object.  Its first argument is a cons of numbers.
-
-@example
-A \\translate #(cons 2 -3) @{ B C @} D
-@end example
+Translate @var{arg} relative to its surroundings.  @var{offset}
+is a pair of numbers representing the displacement in the X and Y axis.
 
-This moves @q{B C} 2@tie{}spaces to the right, and 3 down, relative to its
-surroundings.  This command cannot be used to move isolated scripts
-vertically, for the same reason that @code{\\raise} cannot be used for
-that."
-  (ly:stencil-translate (interpret-markup  layout props arg)
+@lilypond[verbatim,quote]
+\\markup {
+  *
+  \\translate #'(2 . 3)
+  \\line { translated two spaces right, three up }
+}
+@end lilypond"
+  (ly:stencil-translate (interpret-markup layout props arg)
 			offset))
 
 (define-builtin-markup-command (sub layout props arg)
@@ -2442,10 +2917,14 @@ that."
 Set @var{arg} in subscript.
 
 @lilypond[verbatim,quote]
-\\markup \\concat {
-  H
-  \\sub 2
-  O
+\\markup {
+  \\concat {
+    H
+    \\sub {
+      2
+    }
+    O
+  }
 }
 @end lilypond"
   (ly:stencil-translate-axis
@@ -2463,7 +2942,7 @@ Set @var{arg} in subscript.
   "
 @cindex setting subscript in standard font size
 
-Set @var{arg} in subscript, in a normal font size.
+Set @var{arg} in subscript with a normal font size.
 
 @lilypond[verbatim,quote]
 \\markup {
@@ -2492,8 +2971,12 @@ Set @var{arg} in subscript, in a normal font size.
 Draw horizontal brackets around @var{arg}.
 
 @lilypond[verbatim,quote]
-\\markup \\hbracket \\line {
-  one two three
+\\markup {
+  \\hbracket {
+    \\line {
+      one two three
+    }
+  }
 }
 @end lilypond"
   (let ((th 0.1) ;; todo: take from GROB.
@@ -2510,7 +2993,11 @@ Draw horizontal brackets around @var{arg}.
 Draw vertical brackets around @var{arg}.
 
 @lilypond[verbatim,quote]
-\\markup \\bracket \\note #\"2.\" #UP
+\\markup {
+  \\bracket {
+    \\note #\"2.\" #UP
+  }
+}
 @end lilypond"
   (let ((th 0.1) ;; todo: take from GROB.
         (m (interpret-markup layout props arg)))
@@ -2554,25 +3041,25 @@ when @var{label} is not found."
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (define-public (space-lines baseline stils)
-  (let space-stil ((prev-stil #f)
-		   (stils stils)
+  (let space-stil ((stils stils)
 		   (result (list)))
-    (cond ((null? stils)
-	   (reverse! result))
-	  ((not prev-stil)
-	   (space-stil (car stils) (cdr stils) (list (car stils))))
-	  (else
-	   (let* ((stil (car stils))
-		  (dy (max (- baseline
-			      (+ (- (interval-bound (ly:stencil-extent prev-stil Y) DOWN))
-				 (interval-bound (ly:stencil-extent stil Y) UP)))
-			   0.0))
-		  (new-stil (ly:make-stencil
-			     (ly:stencil-expr stil)
-			     (ly:stencil-extent stil X)
-			     (cons (interval-bound (ly:stencil-extent stil Y) DOWN)
-				   (+ (interval-bound (ly:stencil-extent stil Y) UP) dy)))))
-	     (space-stil stil (cdr stils) (cons new-stil result)))))))
+    (if (null? stils)
+	(reverse! result)
+	(let* ((stil (car stils))
+	       (dy-top (max (- (/ baseline 1.5)
+			       (interval-bound (ly:stencil-extent stil Y) UP))
+			    0.0))
+	       (dy-bottom (max (+ (/ baseline 3.0)
+				  (interval-bound (ly:stencil-extent stil Y) DOWN))
+			       0.0))
+	       (new-stil (ly:make-stencil
+			  (ly:stencil-expr stil)
+			  (ly:stencil-extent stil X)
+			  (cons (- (interval-bound (ly:stencil-extent stil Y) DOWN)
+				   dy-bottom)
+				(+ (interval-bound (ly:stencil-extent stil Y) UP)
+				   dy-top)))))
+	  (space-stil (cdr stils) (cons new-stil result))))))
 
 (define-builtin-markup-list-command (justified-lines layout props args)
   (markup-list?)