X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-markup-commands.scm;h=17d6be097dfba9e8396c4f35afedd43a6d25f8a9;hb=ec09bc9bd0802b6f55ae19b6dae4bd5d4b997365;hp=8c0d58cb62cdc1d3a3d232085505933daf93f087;hpb=e904008e0f0b56f7cacd330a72c2b56ec6906a93;p=lilypond.git

diff --git a/scm/define-markup-commands.scm b/scm/define-markup-commands.scm
index 8c0d58cb62..17d6be097d 100644
--- a/scm/define-markup-commands.scm
+++ b/scm/define-markup-commands.scm
@@ -12,12 +12,17 @@
 
 (use-modules (ice-9 regex))
 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; utility functions
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
 (define-public empty-stencil (ly:make-stencil '() '(1 . -1) '(1 . -1)))
 (define-public point-stencil (ly:make-stencil "" '(0 . 0) '(0 . 0)))
 
-(def-markup-command (stencil layout props stil) (ly:stencil?)
-  "Stencil as markup"
-  stil)
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; geometric shapes
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (def-markup-command (draw-circle layout props radius thickness fill)
   (number? number? boolean?)
@@ -25,6 +30,27 @@
 optionally filled."
   (make-circle-stencil radius thickness fill))
 
+(def-markup-command (triangle layout props filled) (boolean?)
+  "A triangle, filled or not"
+  (let*
+      ((th (chain-assoc-get 'thickness props  0.1))
+       (size (chain-assoc-get 'font-size props 0))
+       (ex (* (magstep size)
+	      0.8
+	      (chain-assoc-get 'baseline-skip props 2))))
+
+    (ly:make-stencil
+     `(polygon '(0.0 0.0
+		     ,ex 0.0
+		     ,(* 0.5 ex)
+		     ,(* 0.86 ex))
+	   ,th
+	   ,filled)
+
+     (cons 0 ex)
+     (cons 0 (* .86 ex))
+     )))
+
 (def-markup-command (circle layout props arg) (markup?)
   "Draw a circle around @var{arg}.  Use @code{thickness},
 @code{circle-padding} and @code{font-size} properties to determine line
@@ -48,6 +74,105 @@ the PDF backend."
     (ly:stencil-add (ly:make-stencil url-expr xextent yextent) stil)))
 
 
+(def-markup-command (beam layout props width slope thickness)
+  (number? number? number?)
+  "Create a beam with the specified parameters."
+  (let* ((y (* slope width))
+	 (yext (cons (min 0 y) (max 0 y)))
+	 (half (/ thickness 2)))
+
+    (ly:make-stencil
+     `(polygon ',(list 
+		  0 (/ thickness -2)
+		    width (+ (* width slope)  (/ thickness -2))
+		    width (+ (* width slope)  (/ thickness 2))
+		    0 (/ thickness 2))
+	       ,(ly:output-def-lookup layout 'blotdiameter)
+	       #t)
+     (cons 0 width)
+     (cons (+ (- half) (car yext))
+	   (+ half (cdr yext))))))
+
+(def-markup-command (box layout props arg) (markup?)
+  "Draw a box round @var{arg}.  Looks at @code{thickness},
+@code{box-padding} and @code{font-size} properties to determine line
+thickness and padding around the markup."
+  (let* ((th (chain-assoc-get 'thickness props  0.1))
+	 (size (chain-assoc-get 'font-size props 0))
+	 (pad (* (magstep size)
+		 (chain-assoc-get 'box-padding props 0.2)))
+	 (m (interpret-markup layout props arg)))
+    (box-stencil m th pad)))
+
+(def-markup-command (filled-box layout props xext yext blot)
+  (number-pair? number-pair? number?)
+  "Draw a box with rounded corners of dimensions @var{xext} and @var{yext}."
+  (ly:round-filled-box
+   xext yext blot))
+
+(def-markup-command (whiteout layout props arg) (markup?)
+  "Provide a white underground for @var{arg}"
+  (let* ((stil (interpret-markup layout props
+				 (make-with-color-markup black arg)))
+	 (white
+	  (interpret-markup layout props
+			    (make-with-color-markup
+			     white
+			     (make-filled-box-markup
+			      (ly:stencil-extent stil X)
+			      (ly:stencil-extent stil Y)
+			      0.0)))))
+
+    (ly:stencil-add white stil)))
+
+(def-markup-command (pad-markup layout props padding arg) (number? markup?)
+  "Add space around a markup object."
+
+  (let*
+      ((stil (interpret-markup layout props arg))
+       (xext (ly:stencil-extent stil X))
+       (yext (ly:stencil-extent stil Y)))
+
+    (ly:make-stencil
+     (ly:stencil-expr stil)
+     (interval-widen xext padding)
+     (interval-widen yext padding))))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; space
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;;FIXME: is this working? 
+(def-markup-command (strut layout props) ()
+  "Create a box of the same height as the space in the current font."
+  (let ((m (Text_interface::interpret_markup layout props " ")))
+    (ly:make-stencil (ly:stencil-expr m)
+		     (ly:stencil-extent m X)
+		     '(1000 . -1000))))
+
+
+;; todo: fix negative space
+(def-markup-command (hspace layout props amount) (number?)
+  "This produces a invisible object taking horizontal space.
+@example 
+\\markup @{ A \\hspace #2.0 B @} 
+@end example
+will put extra space between A and B, on top of the space that is
+normally inserted before elements on a line.
+"
+  (if (> amount 0)
+      (ly:make-stencil "" (cons 0 amount) '(-1 . 1))
+      (ly:make-stencil "" (cons amount amount) '(-1 . 1))))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; importing graphics.
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(def-markup-command (stencil layout props stil) (ly:stencil?)
+  "Stencil as markup"
+  stil)
+
 (define bbox-regexp
   (make-regexp "%%BoundingBox: ([0-9-]+) ([0-9-]+) ([0-9-]+) ([0-9-]+)"))
 
@@ -76,7 +201,7 @@ one staff-space."
 	    (if bbox
 		(map (lambda (x) (/ x 10)) bbox)
 		(begin
-		  (ly:warn (_ "Could not find bounding box of `~a'")
+		  (ly:warn (_ "can't find bounding box of `~a'")
 			   file-name)
 		  '()))))
 	
@@ -101,35 +226,6 @@ one staff-space."
 	    
 	    (ly:make-stencil "" '(0 . 0) '(0 . 0))))))  
 
-(def-markup-command (score layout props score) (ly:score?)
-  "Inline an image of music."
-  (let* ((output (ly:score-embedded-format score layout)))
-
-    (if (ly:music-output? output)
-	(ly:paper-system-stencil
-	 (vector-ref (ly:paper-score-paper-systems output) 0))
-	(begin
-	  (ly:warning (_"no systems found in \\score markup, does it have a \\layout block?"))
-	  empty-stencil))))
-
-(def-markup-command (simple layout props str) (string?)
-  "A simple text string; @code{\\markup @{ foo @}} is equivalent with
-@code{\\markup @{ \\simple #\"foo\" @}}."
-  (interpret-markup layout props str))
-
-(def-markup-command (encoded-simple layout props sym str) (symbol? string?)
-  "A text string, encoded with encoding @var{sym}. See
-@usermanref{Text encoding} for more information."
-  (Text_interface::interpret_string layout props sym str))
-
-
-;; TODO: use font recoding.
-;;		      (make-line-markup
-;;		       (map make-word-markup (string-tokenize str)))))
-
-(define-public empty-markup
-  (make-simple-markup ""))
-
 
 (def-markup-command (postscript layout props str) (string?)
   "This inserts @var{str} directly into the output as a PostScript
@@ -164,15 +260,70 @@ gsave /ecrm10 findfont
    (list 'embedded-ps str)
    '(0 . 0) '(0 . 0)))
 
-;;(def-markup-command (fill-line layout props line-width markups)
-;;  (number? markup-list?)
-;; no parser tag -- should make number? markuk-list? thingy
+
+(def-markup-command (score layout props score) (ly:score?)
+  "Inline an image of music."
+  (let* ((output (ly:score-embedded-format score layout)))
+
+    (if (ly:music-output? output)
+	(ly:paper-system-stencil
+	 (vector-ref (ly:paper-score-paper-systems output) 0))
+	(begin
+	  (ly:warning (_"no systems found in \\score markup, does it have a \\layout block?"))
+	  empty-stencil))))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; basic formatting.
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(def-markup-command (simple layout props str) (string?)
+  "A simple text string; @code{\\markup @{ foo @}} is equivalent with
+@code{\\markup @{ \\simple #\"foo\" @}}."
+  (interpret-markup layout props str))
+
+
+;; TODO: use font recoding.
+;;		      (make-line-markup
+;;		       (map make-word-markup (string-tokenize str)))))
+
+(define-public empty-markup
+  (make-simple-markup ""))
+
+;; helper for justifying lines.
+(define (get-fill-space word-count line-width text-widths)
+  "Calculate the necessary paddings between each two adjacent texts.
+	The lengths of all texts are stored in @var{text-widths}.
+	The normal formula for the padding between texts a and b is:
+	padding = line-width/(word-count - 1) - (length(a) + length(b))/2
+	The first and last padding have to be calculated specially using the
+	whole length of the first or last text.
+	Return a list of paddings.
+"
+  (cond
+   ((null? text-widths) '())
+   
+   ;; special case first padding
+   ((= (length text-widths) word-count)
+    (cons 
+     (- (- (/ line-width (1- word-count)) (car text-widths))
+	(/ (car (cdr text-widths)) 2))
+     (get-fill-space word-count line-width (cdr text-widths))))
+   ;; special case last padding
+   ((= (length text-widths) 2)
+    (list (- (/ line-width (1- word-count))
+	     (+ (/ (car text-widths) 2) (car (cdr text-widths)))) 0))
+   (else
+    (cons 
+     (- (/ line-width (1- word-count))
+	(/ (+ (car text-widths) (car (cdr text-widths))) 2))
+     (get-fill-space word-count line-width (cdr text-widths))))))
+
 (def-markup-command (fill-line layout props markups)
   (markup-list?)
   "Put @var{markups} in a horizontal line of width @var{line-width}.
    The markups are spaced/flushed to fill the entire line.
-   If there are no arguments, return an empty stencil.
-"
+   If there are no arguments, return an empty stencil."
+ 
   (let* ((orig-stencils
 	  (map (lambda (x) (interpret-markup layout props x))
 	       markups))
@@ -181,13 +332,13 @@ gsave /ecrm10 findfont
 		 (if (ly:stencil-empty? stc)
 		     point-stencil
 		     stc)) orig-stencils))
-     (text-widths
-     	(map (lambda (stc)
-     		(if (ly:stencil-empty? stc)
-     			0.0
-				(interval-length (ly:stencil-extent stc X))))
-			stencils))
-     (text-width (apply + text-widths))
+	 (text-widths
+	  (map (lambda (stc)
+		 (if (ly:stencil-empty? stc)
+		     0.0
+		     (interval-length (ly:stencil-extent stc X))))
+	       stencils))
+	 (text-width (apply + text-widths))
 	 (word-count (length stencils))
 	 (word-space (chain-assoc-get 'word-space props))
 	 (line-width (chain-assoc-get 'linewidth props))
@@ -220,44 +371,236 @@ gsave /ecrm10 findfont
 	empty-stencil
 	(stack-stencils-padding-list X RIGHT fill-space-normal line-stencils))))
 	
-(define (get-fill-space word-count line-width text-widths)
-	"Calculate the necessary paddings between each two adjacent texts.
-	The lengths of all texts are stored in @var{text-widths}.
-	The normal formula for the padding between texts a and b is:
-	padding = line-width/(word-count - 1) - (length(a) + length(b))/2
-	The first and last padding have to be calculated specially using the
-	whole length of the first or last text.
-	Return a list of paddings.
-"
-	(cond
-	 ;; special case first padding
-	 ((= (length text-widths) word-count)
-	  (cons 
-	   (- (- (/ line-width (1- word-count)) (car text-widths))
-	      (/ (car (cdr text-widths)) 2))
-	   (get-fill-space word-count line-width (cdr text-widths))))
-	 ;; special case last padding
-	 ((= (length text-widths) 2)
-	  (list (- (/ line-width (1- word-count))
-		   (+ (/ (car text-widths) 2) (car (cdr text-widths)))) 0))
-	 (else
-	  (cons 
-	   (- (/ line-width (1- word-count))
-	      (/ (+ (car text-widths) (car (cdr text-widths))) 2))
-	   (get-fill-space word-count line-width (cdr text-widths))))))
-
-(define (font-markup qualifier value)
-  (lambda (layout props arg)
-    (interpret-markup layout (prepend-alist-chain qualifier value props) arg)))
-
 (def-markup-command (line layout props args) (markup-list?)
   "Put @var{args} in a horizontal line.  The property @code{word-space}
 determines the space between each markup in @var{args}."
+  (let*
+      ((stencils (map (lambda (m) (interpret-markup layout props m)) args))
+       (space    (chain-assoc-get 'word-space props)))
+
   (stack-stencil-line
-   (chain-assoc-get 'word-space props)
+   space
+   (remove ly:stencil-empty? stencils))))
+
+
+(define (wordwrap-stencils stencils
+			   justify base-space line-width 
+			   )
+  
+  "Perform simple wordwrap, return stencil of each line."
+  (define space (if justify
+		    
+		    ;; justify only stretches lines.
+		    (* 0.7 base-space)
+		    base-space))
+       
+  (define (take-list width space stencils
+		     accumulator accumulated-width)
+    "Return (head-list . tail) pair, with head-list fitting into width"
+    (if (null? stencils)
+	(cons accumulator stencils)
+	(let*
+	    ((first (car stencils))
+	     (first-wid (cdr (ly:stencil-extent (car stencils) X)))
+	     (newwid (+ space first-wid accumulated-width))
+	     )
+
+	  (if
+	   (or (null? accumulator)
+	       (< newwid width))
+
+	   (take-list width space
+		      (cdr stencils)
+		      (cons first accumulator)
+		      newwid)
+	     (cons accumulator stencils))
+	   )))
+
+    (let loop
+	((lines '())
+	 (todo stencils))
+
+      (let*
+	  ((line-break (take-list line-width space todo
+				 '() 0.0))
+	   (line-stencils (car line-break))
+	   (space-left (- line-width (apply + (map (lambda (x) (cdr (ly:stencil-extent x X)))
+					      line-stencils))))
+
+	   (line-word-space (cond
+			     ((not justify) space)
+
+			     ;; don't stretch last line of paragraph.
+			     ;; hmmm . bug - will overstretch the last line in some case. 
+			     ((null? (cdr line-break))
+			      base-space)
+			     ((null? line-stencils) 0.0)
+			     ((null? (cdr line-stencils)) 0.0)
+			     (else (/ space-left (1- (length line-stencils))))))
+
+	   (line (stack-stencil-line
+		  line-word-space
+		  (reverse line-stencils))))
+
+	(if (pair? (cdr line-break))
+	    (loop (cons line lines)
+		  (cdr line-break))
+
+	    (reverse (cons line lines))
+	    ))
+
+      ))
+
+
+(define (wordwrap-markups layout props args justify)
+  (let*
+      ((baseline-skip (chain-assoc-get 'baseline-skip props))
+       (line-width (chain-assoc-get 'linewidth props))
+       (word-space (chain-assoc-get 'word-space props))
+       (lines (wordwrap-stencils
+	       (remove ly:stencil-empty?
+		       (map (lambda (m) (interpret-markup layout props m)) args))
+	       justify word-space  line-width)
+	       ))
+
+    (stack-lines DOWN 0.0 baseline-skip lines)))
+
+(def-markup-command (justify layout props args) (markup-list?)
+  "Like wordwrap, but with lines stretched to justify the margins.
+Use @code{\\override #'(linewidth . X)} to set linewidth, where X
+is the number of staff spaces."
+
+  (wordwrap-markups layout props args #t))
+
+(def-markup-command (wordwrap layout props args) (markup-list?)
+  "Simple wordwrap.  Use @code{\\override #'(linewidth . X)} to set
+linewidth, where X is the number of staff spaces."
+
+  (wordwrap-markups layout props args #f))
+
+(define (wordwrap-string layout props justify arg) 
+  (let*
+      ((baseline-skip (chain-assoc-get 'baseline-skip props))
+       (line-width (chain-assoc-get 'linewidth props))
+       (word-space (chain-assoc-get 'word-space props))
+       (para-strings (regexp-split arg "\n[ \t\n]*\n[ \t\n]*"))
+       
+       (list-para-words (map (lambda (str)
+			       (regexp-split str "[ \t\n]+"))
+			     para-strings))
+       (para-lines (map (lambda (words)
+			  (let*
+			      ((stencils
+				(remove
+				 ly:stencil-empty? (map 
+				      (lambda (x)
+					(interpret-markup layout props x))
+				      words)))
+			       (lines (wordwrap-stencils stencils
+							 justify word-space line-width)))
+
+			    lines))
+			
+			list-para-words)))
+
+    (stack-lines DOWN 0.0 baseline-skip (apply append para-lines))))
+
+
+(def-markup-command (wordwrap-string layout props arg) (string?)
+  "Wordwrap a string. Paragraphs may be separated with double newlines"
+  (wordwrap-string layout props  #f arg))
+  
+(def-markup-command (justify-string layout props arg) (string?)
+  "Justify a string. Paragraphs may be separated with double newlines"
+  (wordwrap-string layout props #t arg))
+
+
+(def-markup-command (wordwrap-field layout props symbol) (symbol?)
+   (let* ((m (chain-assoc-get symbol props)))
+     (if (string? m)
+      (interpret-markup layout props
+       (list wordwrap-string-markup m))
+      (ly:make-stencil '()  '(1 . -1) '(1 . -1)))))
+
+(def-markup-command (justify-field layout props symbol) (symbol?)
+   (let* ((m (chain-assoc-get symbol props)))
+     (if (string? m)
+      (interpret-markup layout props
+       (list justify-string-markup m))
+      (ly:make-stencil '()  '(1 . -1) '(1 . -1)))))
+
+
+
+(def-markup-command (combine layout props m1 m2) (markup? markup?)
+  "Print two markups on top of each other."
+  (let* ((s1 (interpret-markup layout props m1))
+	 (s2 (interpret-markup layout props m2)))
+    (ly:stencil-add s1 s2)))
+
+;;
+;; TODO: should extract baseline-skip from each argument somehow..
+;; 
+(def-markup-command (column layout props args) (markup-list?)
+  "Stack the markups in @var{args} vertically.  The property
+@code{baseline-skip} determines the space between each markup in @var{args}."
+  (stack-lines
+   -1 0.0 (chain-assoc-get 'baseline-skip props)
    (remove ly:stencil-empty?
 	   (map (lambda (m) (interpret-markup layout props m)) args))))
 
+(def-markup-command (dir-column layout props args) (markup-list?)
+  "Make a column of args, going up or down, depending on the setting
+of the @code{#'direction} layout property."
+  (let* ((dir (chain-assoc-get 'direction props)))
+    (stack-lines
+     (if (number? dir) dir -1)
+     0.0
+     (chain-assoc-get 'baseline-skip props)
+     (map (lambda (x) (interpret-markup layout props x)) args))))
+
+(def-markup-command (center-align layout props args) (markup-list?)
+  "Put @code{args} in a centered column. "
+  (let* ((mols (map (lambda (x) (interpret-markup layout props x)) args))
+         (cmols (map (lambda (x) (ly:stencil-aligned-to x X CENTER)) mols)))
+    (stack-lines -1 0.0 (chain-assoc-get 'baseline-skip props) cmols)))
+
+(def-markup-command (vcenter layout props arg) (markup?)
+  "Align @code{arg} to its Y center. "
+  (let* ((mol (interpret-markup layout props arg)))
+    (ly:stencil-aligned-to mol Y CENTER)))
+
+(def-markup-command (hcenter layout props arg) (markup?)
+  "Align @code{arg} to its X center. "
+  (let* ((mol (interpret-markup layout props arg)))
+    (ly:stencil-aligned-to mol X CENTER)))
+
+(def-markup-command (right-align layout props arg) (markup?)
+  "Align @var{arg} on its right edge. "
+  (let* ((m (interpret-markup layout props arg)))
+    (ly:stencil-aligned-to m X RIGHT)))
+
+(def-markup-command (left-align layout props arg) (markup?)
+  "Align @var{arg} on its left edge. "
+  (let* ((m (interpret-markup layout props arg)))
+    (ly:stencil-aligned-to m X LEFT)))
+
+(def-markup-command (general-align layout props axis dir arg)  (integer? number? markup?)
+  "Align @var{arg} in @var{axis} direction to the @var{dir} side."
+  (let* ((m (interpret-markup layout props arg)))
+    (ly:stencil-aligned-to m axis dir)))
+
+(def-markup-command (halign layout props dir arg) (number? markup?)
+  "Set horizontal alignment. If @var{dir} is @code{-1}, then it is
+left-aligned, while @code{+1} is right. Values in between interpolate
+alignment accordingly."
+  (let* ((m (interpret-markup layout props arg)))
+    (ly:stencil-aligned-to m X dir)))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; property
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
 (def-markup-command (fromproperty layout props symbol) (symbol?)
   "Read the @var{symbol} from property settings, and produce a stencil
   from the markup contained within. If @var{symbol} is not defined, it
@@ -278,11 +621,35 @@ determines the space between each markup in @var{args}."
     (interpret-markup layout props (list anonymous-with-signature arg))))
 
 
-(def-markup-command (combine layout props m1 m2) (markup? markup?)
-  "Print two markups on top of each other."
-  (let* ((s1 (interpret-markup layout props m1))
-	 (s2 (interpret-markup layout props m2)))
-    (ly:stencil-add s1 s2)))
+
+(def-markup-command (override layout props new-prop arg) (pair? markup?)
+  "Add the first argument in to the property list.  Properties may be
+any sort of property supported by @internalsref{font-interface} and
+@internalsref{text-interface}, for example
+
+@verbatim
+\\override #'(font-family . married) \"bla\"
+@end verbatim
+
+"
+  (interpret-markup layout (cons (list new-prop) props) arg))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; fonts.
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+
+(def-markup-command (bigger layout props arg) (markup?)
+  "Increase the font size relative to current setting"
+  (interpret-markup layout props
+   `(,fontsize-markup 1 ,arg)))
+
+(def-markup-command (smaller layout props arg) (markup?)
+  "Decrease the font size relative to current setting"
+  (interpret-markup layout props
+   `(,fontsize-markup -1 ,arg)))
+
+(def-markup-command larger (markup?) bigger-markup)
 
 (def-markup-command (finger layout props arg) (markup?)
   "Set the argument as small numbers."
@@ -290,20 +657,21 @@ determines the space between each markup in @var{args}."
                     (cons '((font-size . -5) (font-encoding . fetaNumber)) props)
                     arg))
 
-(def-markup-command (fontsize layout props mag arg) (number? markup?)
-  "Set the relative font size, e.g.
-@example
-A \\fontsize #2 @{ B C @} D
-@end example
 
+(def-markup-command (fontsize layout props increment arg) (number? markup?)
+  "Add @var{increment} to the font-size. Adjust baseline skip accordingly."
+
+  (let* ((fs (chain-assoc-get 'font-size props 0))
+	 (bs (chain-assoc-get 'baseline-skip props 2)) 
+         (entries (list
+		   (cons 'baseline-skip (* bs (magstep increment)))
+		   (cons 'font-size (+ fs increment )))))
+
+    (interpret-markup layout (cons entries props) arg)))
+  
 
-This will enlarge the B and the C by two steps.
-"
-  (interpret-markup
-   layout 
-   (prepend-alist-chain 'font-size mag props)
-   arg))
 
+;; FIXME -> should convert to font-size.
 (def-markup-command (magnify layout props sz arg) (number? markup?)
   "Set the font magnification for the its argument. In the following
 example, the middle A will be 10% larger:
@@ -364,10 +732,6 @@ some punctuation. It doesn't have any letters.  "
   "Set @code{font-shape} to @code{caps}."
   (interpret-markup layout (prepend-alist-chain 'font-shape 'caps props) arg))
 
-;(def-markup-command (latin-i layout props arg) (markup?)
-;  "TEST latin1 encoding."
-;  (interpret-markup layout (prepend-alist-chain 'font-shape 'latin1 props) arg))
-
 (def-markup-command (dynamic layout props arg) (markup?)
   "Use the dynamic font.  This font only contains @b{s}, @b{f}, @b{m},
 @b{z}, @b{p}, and @b{r}.  When producing phrases, like ``pi@`{u} @b{f}'', the
@@ -376,6 +740,14 @@ recommend font for this is bold and italic"
   (interpret-markup
    layout (prepend-alist-chain 'font-encoding 'fetaDynamic props) arg))
 
+(def-markup-command (text layout props arg) (markup?)
+  "Use a text font instead of music symbol or music alphabet font."  
+
+  ;; ugh - latin1
+  (interpret-markup layout (prepend-alist-chain 'font-encoding 'latin1 props)
+		    arg))
+
+
 (def-markup-command (italic layout props arg) (markup?)
   "Use italic @code{font-shape} for @var{arg}. "
   (interpret-markup layout (prepend-alist-chain 'font-shape 'italic props) arg))
@@ -390,10 +762,16 @@ recommend font for this is bold and italic"
   (interpret-markup
    layout (prepend-alist-chain 'font-shape 'upright props) arg))
 
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; symbols.
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
 (def-markup-command (doublesharp layout props) ()
   "Draw a double sharp symbol."
 
   (interpret-markup layout props (markup #:musicglyph "accidentals.4")))
+
 (def-markup-command (sesquisharp layout props) ()
   "Draw a 3/2 sharp symbol."
   (interpret-markup layout props (markup #:musicglyph "accidentals.3")))
@@ -433,66 +811,28 @@ recommend font for this is bold and italic"
 
     (ly:make-stencil (list 'color color (ly:stencil-expr stil))
 		     (ly:stencil-extent stil X)
-		     (ly:stencil-extent stil Y))))
-
-;;
-;; TODO: should extract baseline-skip from each argument somehow..
-;; 
-(def-markup-command (column layout props args) (markup-list?)
-  "Stack the markups in @var{args} vertically.  The property
-@code{baseline-skip} determines the space between each markup in @var{args}."
-  (stack-lines
-   -1 0.0 (chain-assoc-get 'baseline-skip props)
-   (remove ly:stencil-empty?
-	   (map (lambda (m) (interpret-markup layout props m)) args))))
-
-(def-markup-command (dir-column layout props args) (markup-list?)
-  "Make a column of args, going up or down, depending on the setting
-of the @code{#'direction} layout property."
-  (let* ((dir (chain-assoc-get 'direction props)))
-    (stack-lines
-     (if (number? dir) dir -1)
-     0.0
-     (chain-assoc-get 'baseline-skip props)
-     (map (lambda (x) (interpret-markup layout props x)) args))))
-
-(def-markup-command (center-align layout props args) (markup-list?)
-  "Put @code{args} in a centered column. "
-  (let* ((mols (map (lambda (x) (interpret-markup layout props x)) args))
-         (cmols (map (lambda (x) (ly:stencil-aligned-to x X CENTER)) mols)))
-    (stack-lines -1 0.0 (chain-assoc-get 'baseline-skip props) cmols)))
-
-(def-markup-command (vcenter layout props arg) (markup?)
-  "Align @code{arg} to its Y center. "
-  (let* ((mol (interpret-markup layout props arg)))
-    (ly:stencil-aligned-to mol Y CENTER)))
-
-(def-markup-command (hcenter layout props arg) (markup?)
-  "Align @code{arg} to its X center. "
-  (let* ((mol (interpret-markup layout props arg)))
-    (ly:stencil-aligned-to mol X CENTER)))
-
-(def-markup-command (right-align layout props arg) (markup?)
-  "Align @var{arg} on its right edge. "
-  (let* ((m (interpret-markup layout props arg)))
-    (ly:stencil-aligned-to m X RIGHT)))
+		     (ly:stencil-extent stil Y))))
 
-(def-markup-command (left-align layout props arg) (markup?)
-  "Align @var{arg} on its left edge. "
-  (let* ((m (interpret-markup layout props arg)))
-    (ly:stencil-aligned-to m X LEFT)))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; glyphs
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(def-markup-command (general-align layout props axis dir arg)  (integer? number? markup?)
-  "Align @var{arg} in @var{axis} direction to the @var{dir} side."
-  (let* ((m (interpret-markup layout props arg)))
-    (ly:stencil-aligned-to m axis dir)))
 
-(def-markup-command (halign layout props dir arg) (number? markup?)
-  "Set horizontal alignment. If @var{dir} is @code{-1}, then it is
-left-aligned, while @code{+1} is right. Values in between interpolate
-alignment accordingly."
-  (let* ((m (interpret-markup layout props arg)))
-    (ly:stencil-aligned-to m X dir)))
+(def-markup-command (arrow-head layout props axis direction filled)
+  (integer? ly:dir? boolean?)
+  "produce an arrow head in specified direction and axis. Use the filled head if @var{filled} is  specified."
+  (let*
+      ((name (format "arrowheads.~a.~a~a"
+		     (if filled
+			 "close"
+			 "open")
+		     axis
+		     direction)))
+    (ly:font-get-glyph
+     (ly:paper-get-font layout (cons '((font-encoding . fetaMusic))
+				     props))
+     name)))
 
 (def-markup-command (musicglyph layout props glyph-name) (string?)
   "This is converted to a musical symbol, e.g. @code{\\musicglyph
@@ -513,67 +853,46 @@ See @usermanref{The Feta font} for  a complete listing of the possible glyphs."
 letter 'A'."
   (ly:get-glyph (ly:paper-get-font layout props) num))
 
-(def-markup-command (raise layout props amount arg) (number? markup?)
-  "
-This  raises  @var{arg}, by the distance @var{amount}.
-A negative @var{amount} indicates lowering:
-@c
-@lilypond[verbatim,fragment,relative=1]
- c1^\\markup { C \\small \\raise #1.0 \\bold { \"9/7+\" }}
-@end lilypond
-The argument to @code{\\raise} is the vertical displacement amount,
-measured in (global) staff spaces.  @code{\\raise} and @code{\\super}
-raise objects in relation to their surrounding markups.
 
-If the text object itself is positioned above or below the staff, then
-@code{\\raise} cannot be used to move it, since the mechanism that
-positions it next to the staff cancels any shift made with
-@code{\\raise}. For vertical positioning, use the @code{padding}
-and/or @code{extra-offset} properties. "
-  (ly:stencil-translate-axis (interpret-markup layout props arg)
-			     amount Y))
+(define number->mark-letter-vector (make-vector 25 #\A))
 
-(def-markup-command (fraction layout props arg1 arg2) (markup? markup?)
-  "Make a fraction of two markups."
-  (let* ((m1 (interpret-markup layout props arg1))
-         (m2 (interpret-markup layout props arg2)))
-    (set! m1 (ly:stencil-aligned-to m1 X CENTER))
-    (set! m2 (ly:stencil-aligned-to m2 X CENTER))
-    (let* ((x1 (ly:stencil-extent m1 X))
-           (x2 (ly:stencil-extent m2 X))
-           (line (ly:round-filled-box (interval-union x1 x2) '(-0.05 . 0.05) 0.0))
-           ;; should stack mols separately, to maintain LINE on baseline
-           (stack (stack-lines -1 0.2 0.6 (list m1 line m2))))
-      (set! stack
-	    (ly:stencil-aligned-to stack Y CENTER))
-      (set! stack
-	    (ly:stencil-aligned-to stack X LEFT))
-      ;; should have EX dimension
-      ;; empirical anyway
-      (ly:stencil-translate-axis stack 0.75 Y))))
+(do ((i 0 (1+ i))
+     (j 0 (1+ j)))
+    ((>= i 26))
+  (if (= i (- (char->integer #\I) (char->integer #\A)))
+      (set! i (1+ i)))
+  (vector-set! number->mark-letter-vector j
+               (integer->char (+ i (char->integer #\A)))))
+
+(define number->mark-alphabet-vector (list->vector
+  (map (lambda (i) (integer->char (+ i (char->integer #\A)))) (iota 26))))
 
+(define (number->markletter-string vec n)
+  "Double letters for big marks."
+  (let* ((lst (vector-length vec)))
+    
+    (if (>= n lst)
+	(string-append (number->markletter-string vec (1- (quotient n lst)))
+		       (number->markletter-string vec (remainder n lst)))
+	(make-string 1 (vector-ref vec n)))))
 
+(def-markup-command (markletter layout props num) (integer?)
+  "Make a markup letter for @var{num}.  The letters start with A to Z
+ (skipping I), and continues with double letters."
+  (Text_interface::interpret_markup layout props
+    (number->markletter-string number->mark-letter-vector num)))
 
-(def-markup-command (filled-box layout props xext yext blot)
-  (number-pair? number-pair? number?)
-  "Draw a box with rounded corners of dimensions @var{xext} and @var{yext}."
-  (ly:round-filled-box
-   xext yext blot))
+(def-markup-command (markalphabet layout props num) (integer?)
+   "Make a markup letter for @var{num}.  The letters start with A to Z
+ and continues with double letters."
+   (Text_interface::interpret_markup layout props
+     (number->markletter-string number->mark-alphabet-vector num)))
 
-(def-markup-command (whiteout layout props arg) (markup?)
-  "Provide a white underground for @var{arg}"
-  (let* ((stil (interpret-markup layout props
-				 (make-with-color-markup black arg)))
-	 (white
-	  (interpret-markup layout props
-			    (make-with-color-markup
-			     white
-			     (make-filled-box-markup
-			      (ly:stencil-extent stil X)
-			      (ly:stencil-extent stil Y)
-			      0.0)))))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; the note command.
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-    (ly:stencil-add white stil)))
 
 ;; TODO: better syntax.
 
@@ -658,6 +977,62 @@ a shortened down stem."
   (let ((parsed (parse-simple-duration duration)))
     (note-by-number-markup layout props (car parsed) (cadr parsed) dir)))
 
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; translating.
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(def-markup-command (lower layout props amount arg) (number? markup?)
+  "
+Lower @var{arg}, by the distance @var{amount}.
+A negative @var{amount} indicates raising, see also @code{\raise}.
+"
+  (ly:stencil-translate-axis (interpret-markup layout props arg)
+			     (- amount) Y))
+
+
+(def-markup-command (raise layout props amount arg) (number? markup?)
+  "
+Raise @var{arg}, by the distance @var{amount}.
+A negative @var{amount} indicates lowering, see also @code{\\lower}.
+@c
+@lilypond[verbatim,fragment,relative=1]
+ c1^\\markup { C \\small \\raise #1.0 \\bold { \"9/7+\" }}
+@end lilypond
+The argument to @code{\\raise} is the vertical displacement amount,
+measured in (global) staff spaces.  @code{\\raise} and @code{\\super}
+raise objects in relation to their surrounding markups.
+
+If the text object itself is positioned above or below the staff, then
+@code{\\raise} cannot be used to move it, since the mechanism that
+positions it next to the staff cancels any shift made with
+@code{\\raise}. For vertical positioning, use the @code{padding}
+and/or @code{extra-offset} properties. "
+  (ly:stencil-translate-axis (interpret-markup layout props arg) amount Y))
+
+(def-markup-command (fraction layout props arg1 arg2) (markup? markup?)
+  "Make a fraction of two markups."
+  (let* ((m1 (interpret-markup layout props arg1))
+         (m2 (interpret-markup layout props arg2)))
+    (set! m1 (ly:stencil-aligned-to m1 X CENTER))
+    (set! m2 (ly:stencil-aligned-to m2 X CENTER))
+    (let* ((x1 (ly:stencil-extent m1 X))
+           (x2 (ly:stencil-extent m2 X))
+           (line (ly:round-filled-box (interval-union x1 x2) '(-0.05 . 0.05) 0.0))
+           ;; should stack mols separately, to maintain LINE on baseline
+           (stack (stack-lines -1 0.2 0.6 (list m1 line m2))))
+      (set! stack
+	    (ly:stencil-aligned-to stack Y CENTER))
+      (set! stack
+	    (ly:stencil-aligned-to stack X LEFT))
+      ;; should have EX dimension
+      ;; empirical anyway
+      (ly:stencil-translate-axis stack 0.75 Y))))
+
+
+
+
+
 (def-markup-command (normal-size-super layout props arg) (markup?)
   "Set @var{arg} in superscript with a normal font size."
   (ly:stencil-translate-axis
@@ -714,28 +1089,16 @@ that.
    (* -0.5 (chain-assoc-get 'baseline-skip props))
    Y))
 
-(def-markup-command (beam layout props width slope thickness)
-  (number? number? number?)
-  "Create a beam with the specified parameters."
-  (let* ((y (* slope width))
-	 (yext (cons (min 0 y) (max 0 y)))
-	 (half (/ thickness 2)))
-
-    (ly:make-stencil
-     (list 'beam width
-	   slope
-	   thickness
-	   (ly:output-def-lookup layout 'blotdiameter))
-     (cons 0 width)
-     (cons (+ (- half) (car yext))
-	   (+ half (cdr yext))))))
-
 (def-markup-command (normal-size-sub layout props arg) (markup?)
   "Set @var{arg} in subscript, in a normal font size."
   (ly:stencil-translate-axis
    (interpret-markup layout props arg)
    (* -0.5 (chain-assoc-get 'baseline-skip props))
    Y))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; brackets.
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (def-markup-command (hbracket layout props arg) (markup?)
   "Draw horizontal brackets around @var{arg}."  
@@ -749,108 +1112,6 @@ that.
         (m (interpret-markup layout props arg)))
     (bracketify-stencil m Y th (* 2.5 th) th)))
 
-;; todo: fix negative space
-(def-markup-command (hspace layout props amount) (number?)
-  "This produces a invisible object taking horizontal space.
-@example 
-\\markup @{ A \\hspace #2.0 B @} 
-@end example
-will put extra space between A and B, on top of the space that is
-normally inserted before elements on a line.
-"
-  (if (> amount 0)
-      (ly:make-stencil "" (cons 0 amount) '(-1 . 1))
-      (ly:make-stencil "" (cons amount amount) '(-1 . 1))))
-
-(def-markup-command (override layout props new-prop arg) (pair? markup?)
-  "Add the first argument in to the property list.  Properties may be
-any sort of property supported by @internalsref{font-interface} and
-@internalsref{text-interface}, for example
-
-@verbatim
-\\override #'(font-family . married) \"bla\"
-@end verbatim
-
-"
-  (interpret-markup layout (cons (list new-prop) props) arg))
-
-
-(def-markup-command (fontsize layout props increment arg) (number? markup?)
-  "Add @var{increment} to the font-size. Adjust baseline skip accordingly."
-
-  (let* ((fs (chain-assoc-get 'font-size props 0))
-	 (bs (chain-assoc-get 'baseline-skip props 2)) 
-         (entries (list
-		   (cons 'baseline-skip (* bs (magstep increment)))
-		   (cons 'font-size (+ fs increment )))))
-
-    (interpret-markup layout (cons entries props) arg)))
-  
-(def-markup-command (bigger layout props arg) (markup?)
-  "Increase the font size relative to current setting"
-  (interpret-markup layout props
-   `(,fontsize-markup 1 ,arg)))
-
-(def-markup-command (smaller layout props arg) (markup?)
-  "Decrease the font size relative to current setting"
-  (interpret-markup layout props
-   `(,fontsize-markup -1 ,arg)))
-
-(def-markup-command larger (markup?) bigger-markup)
-
-(def-markup-command (box layout props arg) (markup?)
-  "Draw a box round @var{arg}.  Looks at @code{thickness},
-@code{box-padding} and @code{font-size} properties to determine line
-thickness and padding around the markup."
-  (let* ((th (chain-assoc-get 'thickness props  0.1))
-	 (size (chain-assoc-get 'font-size props 0))
-	 (pad (* (magstep size)
-		 (chain-assoc-get 'box-padding props 0.2)))
-	 (m (interpret-markup layout props arg)))
-    (box-stencil m th pad)))
-
-;;FIXME: is this working? 
-(def-markup-command (strut layout props) ()
-  "Create a box of the same height as the space in the current font."
-  (let ((m (Text_interface::interpret_markup layout props " ")))
-    (ly:make-stencil (ly:stencil-expr m)
-		     (ly:stencil-extent m X)
-		     '(1000 . -1000))))
-
-(define number->mark-letter-vector (make-vector 25 #\A))
-
-(do ((i 0 (1+ i))
-     (j 0 (1+ j)))
-    ((>= i 26))
-  (if (= i (- (char->integer #\I) (char->integer #\A)))
-      (set! i (1+ i)))
-  (vector-set! number->mark-letter-vector j
-               (integer->char (+ i (char->integer #\A)))))
-
-(define number->mark-alphabet-vector (list->vector
-  (map (lambda (i) (integer->char (+ i (char->integer #\A)))) (iota 26))))
-
-(define (number->markletter-string vec n)
-  "Double letters for big marks."
-  (let* ((lst (vector-length vec)))
-    
-    (if (>= n lst)
-	(string-append (number->markletter-string vec (1- (quotient n lst)))
-		       (number->markletter-string vec (remainder n lst)))
-	(make-string 1 (vector-ref vec n)))))
-
-(def-markup-command (markletter layout props num) (integer?)
-  "Make a markup letter for @var{num}.  The letters start with A to Z
- (skipping I), and continues with double letters."
-  (Text_interface::interpret_markup layout props
-    (number->markletter-string number->mark-letter-vector num)))
-
-(def-markup-command (markalphabet layout props num) (integer?)
-   "Make a markup letter for @var{num}.  The letters start with A to Z
- and continues with double letters."
-   (Text_interface::interpret_markup layout props
-     (number->markletter-string number->mark-alphabet-vector num)))
-
 (def-markup-command (bracketed-y-column layout props indices args)
   (list? markup-list?)
   "Make a column of the markups in @var{args}, putting brackets around
@@ -863,12 +1124,13 @@ the elements marked in @var{indices}, which is a list of numbers."
      (apply min (map (lambda (x) (car (ly:stencil-extent x axis))) ss))
      (apply max (map (lambda (x) (cdr (ly:stencil-extent x axis))) ss))))
   
-  (define (stack-stencils stencils bskip last-stencil)
+
+  (define (stack-stencils-vertically stencils bskip last-stencil)
     (cond
      ((null? stencils) '())
      ((not (ly:stencil? last-stencil))
       (cons (car stencils)
-	    (stack-stencils (cdr stencils) bskip (car stencils))))
+	    (stack-stencils-vertically (cdr stencils) bskip (car stencils))))
      (else
       (let* ((orig (car stencils))
 	     (dir (chain-assoc-get 'direction  props DOWN))
@@ -876,7 +1138,7 @@ the elements marked in @var{indices}, which is a list of numbers."
 					    orig
 					    0.1 bskip)))
 
-	(cons new (stack-stencils (cdr stencils) bskip new))))))
+	(cons new (stack-stencils-vertically (cdr stencils) bskip new))))))
 
   (define (make-brackets stencils indices acc)
     (if (and stencils
@@ -911,7 +1173,7 @@ the elements marked in @var{indices}, which is a list of numbers."
 		  x)) args))
 	 (leading
 	  (chain-assoc-get 'baseline-skip props))
-	 (stacked (stack-stencils
+	 (stacked (stack-stencils-vertically
 		   (remove ly:stencil-empty? stencils) 1.25 #f))
 	 (brackets (make-brackets stacked indices '())))