X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-markup-commands.scm;h=0f5392c850fc087135169cd1e3c67b6305c0f9bb;hb=d9fd890ef4a7d067dc8b39fcb7da3e27f948dd83;hp=c8e05e405eafed4213c79ef65fb35d9c96446cc1;hpb=c9284cfe3b1fa3512f19c4e053077339c20d5662;p=lilypond.git

diff --git a/scm/define-markup-commands.scm b/scm/define-markup-commands.scm
index c8e05e405e..0f5392c850 100644
--- a/scm/define-markup-commands.scm
+++ b/scm/define-markup-commands.scm
@@ -2,57 +2,234 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c)  2000--2004  Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 2000--2006  Han-Wen Nienhuys <hanwen@cs.uu.nl>
 ;;;;                  Jan Nieuwenhuizen <janneke@gnu.org>
 
+
 ;;; markup commands
-;;; TODO:
 ;;;  * each markup function should have a doc string with
 ;;     syntax, description and example. 
 
+(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)
 
-(def-markup-command (score layout props score) (ly:score?)
-  "Inline an image of music."
-  (let* ((systems (ly:score-embedded-format score layout)))
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; geometric shapes
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(def-markup-command (draw-circle layout props radius thickness fill)
+  (number? number? boolean?)
+  "A circle of radius @var{radius}, thickness @var{thickness} and
+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
+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 'circle-padding props 0.2)))
+	 (m (interpret-markup layout props arg)))
+    (circle-stencil m th pad)))
+
+(def-markup-command (with-url layout props url arg) (string? markup?)
+  "Add a link to URL @var{url} around @var{arg}. This only works in
+the PDF backend."
+  (let* ((stil (interpret-markup layout props arg))
+	 (xextent (ly:stencil-extent stil X))
+	 (yextent (ly:stencil-extent stil Y))
+	 (old-expr (ly:stencil-expr stil))
+	 (url-expr (list 'url-link url `(quote ,xextent) `(quote ,yextent))))
+    (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))))))
 
-    (if (= 0 (vector-length systems))
-	(begin
-	  (ly:warn "No systems found in \\score markup. Did you forget \\layout?")
-	  empty-markup)
-	(begin
-	  (let* ((stencil (ly:paper-system-stencil  (vector-ref systems 0)))) 
+(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)))
 
-	    (ly:stencil-align-to! stencil Y CENTER)
-	    stencil)))))
+(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
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(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))
+;;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)
+		     '(1000 . -1000)
+		     (ly:stencil-extent m X)
+		     )))
 
-(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: 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))))
 
-;; TODO: use font recoding.
-;;		      (make-line-markup
-;;		       (map make-word-markup (string-tokenize str)))))
 
-(define-public empty-markup
-  (make-simple-markup ""))
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; importing graphics.
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(def-markup-command (stencil layout props stil) (ly:stencil?)
+  "Stencil as markup"
+  stil)
 
+(define bbox-regexp
+  (make-regexp "%%BoundingBox:[ \t]+([0-9-]+)[ \t]+([0-9-]+)[ \t]+([0-9-]+)[ \t]+([0-9-]+)"))
+
+(define (get-postscript-bbox string)
+  "Extract the bbox from STRING, or return #f if not present."
+  (let*
+      ((match (regexp-exec bbox-regexp string)))
+    
+    (if match
+	(map (lambda (x)
+	       (string->number (match:substring match x)))
+	     (cdr (iota 5)))
+	     
+	#f)))
+
+(def-markup-command (epsfile layout props file-name) (string?)
+  "Inline an EPS image. The image is scaled such that 10 PS units is
+one staff-space."
+
+  (if (ly:get-option 'safe)
+      (interpret-markup layout props "not allowed in safe") 
+      (let*
+	  ((contents (ly:gulp-file file-name))
+	   (bbox (get-postscript-bbox contents))
+	   (scaled-bbox
+	    (if bbox
+		(map (lambda (x) (/ x 10)) bbox)
+		(begin
+		  (ly:warning (_ "can't find bounding box of `~a'")
+			   file-name)
+		  '()))))
+	
+
+	(if bbox
+	    
+	    (ly:make-stencil
+	     (list
+	      'embedded-ps
+	      (string-append
+
+	       ; adobe 5002.
+	       "BeginEPSF "
+	       "0.1 0.1 scale "
+	       (format "\n%%BeginDocument: ~a\n" file-name)
+	       contents
+	       "%%EndDocument\n"
+	       "EndEPSF\n"
+	       ))
+	     (cons (list-ref scaled-bbox 0) (list-ref scaled-bbox 2))
+	     (cons (list-ref scaled-bbox 1) (list-ref scaled-bbox 3)))
+	    
+	    (ly:make-stencil "" '(0 . 0) '(0 . 0))))))  
 
-(def-markup-command (postscript layout props str) (string?)
 
+(def-markup-command (postscript layout props str) (string?)
   "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,
@@ -77,25 +254,83 @@ For the postscript backend, use the following
 @verbatim
 gsave /ecrm10 findfont 
  10.0 output-scale div 
- scalefont setfont  90 rotate (hello) show grestore 
+ scalefont setfont 90 rotate (hello) show grestore 
 @end verbatim
 "
   ;; FIXME
-  
   (ly:make-stencil
    (list 'embedded-ps str)
-   '(0 . 0) '(0 . 0)  ))
+   '(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)
+	(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 (null layout props) ()
+  "An empty markup with extents of a single point"
+
+  point-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 line-width markups)
-;;  (number? markup-list?)
-;; no parser tag -- should make number? markuk-list? thingy
 (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))
@@ -103,20 +338,36 @@ gsave /ecrm10 findfont
 	  (map (lambda (stc)
 		 (if (ly:stencil-empty? stc)
 		     point-stencil
-		     stc))  orig-stencils))
-	 (text-width (apply +
-			    (map (lambda (stc)
-				   (if (ly:stencil-empty? stc)
-				       0.0
-				       (interval-length (ly:stencil-extent stc X))))
-				 stencils)))
+		     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-dir (chain-assoc-get 'text-direction props RIGHT))
 	 (word-count (length stencils))
 	 (word-space (chain-assoc-get 'word-space props))
 	 (line-width (chain-assoc-get 'linewidth props))
-	 (fill-space (if (< line-width text-width)
-			 word-space
-			 (/ (- line-width text-width)
-			    (if (= word-count 1) 2 (- word-count 1)))))
+	 (fill-space
+	 	(cond
+			((= word-count 1) 
+				(list
+					(/ (- line-width text-width) 2)
+					(/ (- line-width text-width) 2)))
+			((= word-count 2)
+				(list
+					(- line-width text-width)))
+			(else 
+				(get-fill-space word-count line-width text-widths))))
+	 (fill-space-normal
+	  (map (lambda (x)
+		 (if (< x word-space)
+		     word-space
+		     x))
+	       fill-space))
+					
 	 (line-stencils (if (= word-count 1)
 			    (list
 			     point-stencil
@@ -124,51 +375,412 @@ gsave /ecrm10 findfont
 			     point-stencil)
 			    stencils)))
 
+    (if (= text-dir LEFT)
+	(set! line-stencils (reverse line-stencils)))
+
     (if (null? (remove ly:stencil-empty? orig-stencils))
 	empty-stencil
-	(stack-stencils X RIGHT fill-space line-stencils))))
-
-(define (font-markup qualifier value)
-  (lambda (layout props arg)
-    (interpret-markup layout
-		      (prepend-alist-chain qualifier value props)
-                      arg)))
-
-
+	(stack-stencils-padding-list X
+				     RIGHT fill-space-normal line-stencils))))
+	
 (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}."
-  (stack-stencil-line
-   (chain-assoc-get 'word-space props)
-   (map (lambda (m) (interpret-markup layout props m)) args)))
+  (let*
+      ((stencils (map (lambda (m) (interpret-markup layout props m)) args))
+       (space    (chain-assoc-get 'word-space props))
+       (text-dir (chain-assoc-get 'text-direction props RIGHT)) 
+       )
+
+    (if (= text-dir LEFT)
+	(set! stencils (reverse stencils)))
+    
+
+    (stack-stencil-line
+     space
+     (remove ly:stencil-empty? stencils))))
+
+
+(define (wordwrap-stencils stencils
+			   justify base-space line-width text-dir)
+  
+  "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
+		  (if (= text-dir RIGHT)
+		      (reverse line-stencils)
+		      line-stencils))))
+
+	(if (pair? (cdr line-break))
+	    (loop (cons line lines)
+		  (cdr line-break))
+
+	    (begin
+	      (if (= text-dir LEFT)
+		  (set! line
+			(ly:stencil-translate-axis line
+						   (- line-width (interval-end (ly:stencil-extent line X)))
+						   X)))
+	      (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))
+       (text-dir (chain-assoc-get 'text-direction props RIGHT)) 
+       (lines (wordwrap-stencils
+	       (remove ly:stencil-empty?
+		       (map (lambda (m) (interpret-markup layout props m)) args))
+	       justify word-space line-width
+	       text-dir)
+	       ))
+
+    (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
+		      (string-regexp-substitute "\r" "\n"
+						(string-regexp-substitute "\r\n" "\n" arg))
+		      "\n[ \t\n]*\n[ \t\n]*"))
+       
+       (text-dir (chain-assoc-get 'text-direction props RIGHT)) 
+       (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 text-dir
+							 )))
+
+			    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)))
+
+
+
+(def-markup-command (with-dimensions layout props x y arg) (number-pair? number-pair? markup?)
+  "Set the dimensions of @var{arg} to @var{x} and @var{y}."
+  
+  (let* ((m (interpret-markup layout props arg)))
+    (ly:make-stencil (ly:stencil-expr m) x y)))
+
+
+(def-markup-command (pad-around layout props amount arg) (number? markup?)
+
+  "Add padding @var{amount} all around @var{arg}. "
+  
+  (let*
+      ((m (interpret-markup layout props arg))
+       (x (ly:stencil-extent m X))
+       (y (ly:stencil-extent m Y)))
+    
+       
+    (ly:make-stencil (ly:stencil-expr m)
+		     (interval-widen x amount)
+		     (interval-widen y amount))
+   ))
+
+
+(def-markup-command (pad-x layout props amount arg) (number? markup?)
+
+  "Add padding @var{amount} around @var{arg} in the X-direction. "
+  (let*
+      ((m (interpret-markup layout props arg))
+       (x (ly:stencil-extent m X))
+       (y (ly:stencil-extent m Y)))
+    
+       
+    (ly:make-stencil (ly:stencil-expr m)
+		     (interval-widen x amount)
+		     y)
+   ))
+
+
+(def-markup-command (put-adjacent layout props arg1 axis dir arg2) (markup? integer? ly:dir?  markup?)
+
+  "Put @var{arg2} next to @var{arg1}, without moving @var{arg1}.  "
+  
+  (let* ((m1 (interpret-markup layout props arg1))
+	 (m2 (interpret-markup layout props arg2)))
+
+    (ly:stencil-combine-at-edge m1 axis dir m2 0.0 0.0)
+  ))
+
+(def-markup-command (transparent layout props arg) (markup?)
+  "Make the argument transparent"
+  (let*
+      ((m (interpret-markup layout props arg))
+       (x (ly:stencil-extent m X))
+       (y (ly:stencil-extent m Y)))
+    
+
+    
+    (ly:make-stencil ""
+		     x y)))
+
+
+(def-markup-command (pad-to-box layout props x-ext y-ext arg) (number-pair? number-pair? markup?)
+  "Make @var{arg} take at least @var{x-ext}, @var{y-ext} space"
+
+  (let*
+      ((m (interpret-markup layout props arg))
+       (x (ly:stencil-extent m X))
+       (y (ly:stencil-extent m Y)))
+
+    (ly:make-stencil (ly:stencil-expr m)
+		     (interval-union x-ext x)
+		     (interval-union y-ext y))))
+
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; 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 returns an empty markup"
+  "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"
   (let* ((m (chain-assoc-get symbol props)))
-
     (if (markup? m)
 	(interpret-markup layout props m)
-	(ly:make-stencil '()  '(1 . -1) '(1 . -1) ))))
+	(ly:make-stencil '()  '(1 . -1) '(1 . -1)))))
 
 
 (def-markup-command (on-the-fly layout props procedure arg) (symbol? markup?)
   "Apply the @var{procedure} markup command to
 @var{arg}. @var{procedure} should take a single argument."
   (let* ((anonymous-with-signature (lambda (layout props arg) (procedure layout props arg))))
-
     (set-object-property! anonymous-with-signature
 			  'markup-signature
 			  (list markup?))
-    
     (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))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; files
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(def-markup-command (verbatim-file layout props name) (string?)
+  "Read the contents of a file, and include verbatimly"
+
+  (interpret-markup
+   layout props
+   (if  (ly:get-option 'safe)
+	"Cannot read file in Safe mode"
+	(let*
+	    ((str (ly:gulp-file name))
+	     (lines (string-split str #\n)))
+
+	  (make-typewriter-markup
+	   (make-column-markup lines)))
+	)))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; 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."
@@ -176,22 +788,23 @@ 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?)
-  "This sets 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?)
-  "This sets the font magnification for the its argument. In the following
+  "Set the font magnification for the its argument. In the following
 example, the middle A will be 10% larger:
 @example
 A \\magnify #1.1 @{ A @} A
@@ -199,7 +812,6 @@ A \\magnify #1.1 @{ A @} A
 
 Note: magnification only works if a font-name is explicitly selected.
 Use @code{\\fontsize} otherwise."
-
   (interpret-markup
    layout 
    (prepend-alist-chain 'font-magnification sz props)
@@ -251,10 +863,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
@@ -263,6 +871,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))
@@ -273,115 +889,104 @@ recommend font for this is bold and italic"
    layout (prepend-alist-chain 'font-family 'typewriter props) arg))
 
 (def-markup-command (upright layout props arg) (markup?)
-  "Set font shape to @code{upright}."
+  "Set font shape to @code{upright}.  This is the opposite of @code{italic}."
   (interpret-markup
    layout (prepend-alist-chain 'font-shape 'upright props) arg))
 
+(def-markup-command (medium layout props arg) (markup?)
+  "Switch to medium font-series (in contrast to bold)."
+  (interpret-markup layout (prepend-alist-chain 'font-series 'medium props)
+		    arg))
+
+(def-markup-command (normal-text layout props arg) (markup?)
+  "Set all font related properties (except the size) to get the default normal text font, no matter what font was used earlier."
+  ;; ugh - latin1
+  (interpret-markup layout
+                    (cons '((font-family . roman) (font-shape . upright)
+			    (font-series . medium) (font-encoding . latin1))
+			  props)
+                    arg))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; symbols.
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
 (def-markup-command (doublesharp layout props) ()
   "Draw a double sharp symbol."
 
-  (interpret-markup layout props (markup #:musicglyph "accidentals-4")))
+  (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")))
+  (interpret-markup layout props (markup #:musicglyph "accidentals.3")))
 
 (def-markup-command (sharp layout props) ()
   "Draw a sharp symbol."
-  (interpret-markup layout props (markup #:musicglyph "accidentals-2")))
+  (interpret-markup layout props (markup #:musicglyph "accidentals.2")))
+
 (def-markup-command (semisharp layout props) ()
   "Draw a semi sharp symbol."
-  (interpret-markup layout props (markup #:musicglyph "accidentals-1")))
+  (interpret-markup layout props (markup #:musicglyph "accidentals.1")))
+
 (def-markup-command (natural layout props) ()
   "Draw a natural symbol."
+  (interpret-markup layout props (markup #:musicglyph "accidentals.0")))
 
-  (interpret-markup layout props (markup #:musicglyph "accidentals-0")))
 (def-markup-command (semiflat layout props) ()
   "Draw a semiflat."
-  (interpret-markup layout props (markup #:musicglyph "accidentals--1")))
+  (interpret-markup layout props (markup #:musicglyph "accidentals.M1")))
+
 (def-markup-command (flat layout props) ()
   "Draw a flat symbol."
-  
-  (interpret-markup layout props (markup #:musicglyph "accidentals--2")))
+  (interpret-markup layout props (markup #:musicglyph "accidentals.M2")))
+
 (def-markup-command (sesquiflat layout props) ()
   "Draw a 3/2 flat symbol."
-  
-  (interpret-markup layout props (markup #:musicglyph "accidentals--3")))
+  (interpret-markup layout props (markup #:musicglyph "accidentals.M3")))
+
 (def-markup-command (doubleflat layout props) ()
   "Draw a double flat symbol."
-
-  (interpret-markup layout props (markup #:musicglyph "accidentals--4")))
-
-
-(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-align-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 center. "
-  (let* ((mol (interpret-markup layout props arg)))
-    (ly:stencil-align-to! mol Y CENTER)
-    mol))
-
-(def-markup-command (right-align layout props arg) (markup?)
-  (let* ((m (interpret-markup layout props arg)))
-    (ly:stencil-align-to! m X RIGHT)
-    m))
-
-(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-align-to! m X LEFT)
-    m))
-
-(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-align-to! m axis dir)
-    m))
-
-(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-align-to! m X dir)
-    m))
+  (interpret-markup layout props (markup #:musicglyph "accidentals.M4")))
+
+(def-markup-command (with-color layout props color arg) (color? markup?)
+  "Draw @var{arg} in color specified by @var{color}"
+
+  (let* ((stil (interpret-markup layout props arg)))
+
+    (ly:make-stencil (list 'color color (ly:stencil-expr stil))
+		     (ly:stencil-extent stil X)
+		     (ly:stencil-extent stil Y))))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; glyphs
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+
+(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
-#\"accidentals-0\"} will select the natural sign from the music font.
-See @usermanref{The Feta font} for  a complete listing of the possible glyphs.
-"
+#\"accidentals.0\"} will select the natural sign from the music font.
+See @usermanref{The Feta font} for  a complete listing of the possible glyphs."
   (ly:font-get-glyph
    (ly:paper-get-font layout (cons '((font-encoding . fetaMusic))
 				   props))
    glyph-name))
 
-
 (def-markup-command (lookup layout props glyph-name) (string?)
   "Lookup a glyph by name."
   (ly:font-get-glyph (ly:paper-get-font layout props)
@@ -392,45 +997,86 @@ 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. "
+(define number->mark-letter-vector (make-vector 25 #\A))
 
-  
-  (ly:stencil-translate-axis (interpret-markup layout props arg)
-			     amount 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)))))
 
-(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)))
-    (ly:stencil-align-to! m1 X CENTER)
-    (ly:stencil-align-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))))
-      (ly:stencil-align-to! stack Y CENTER)
-      (ly:stencil-align-to! stack X LEFT)
-      ;; should have EX dimension
-      ;; empirical anyway
-      (ly:stencil-translate-axis stack 0.75 Y))))
+(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 (slashed-digit layout props num) (integer?)
+  "A feta number, with slash. This is for use in the context of
+figured bass notation"
+  (let*
+      ((mag (magstep (chain-assoc-get 'font-size props 0)))
+       (thickness
+	(* mag
+	   (chain-assoc-get 'thickness props 0.16)))
+       (dy (* mag 0.15))
+       (number-stencil (interpret-markup layout
+					 (prepend-alist-chain 'font-encoding 'fetaNumber props)
+					 (number->string num)))
+       (num-x (interval-widen (ly:stencil-extent number-stencil X)
+			      (* mag 0.2)))
+       (num-y (ly:stencil-extent number-stencil Y))
+       (slash-stencil 
+	(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
+	 )))
+
+    (ly:stencil-add number-stencil
+		    (cond
+		     ((= num 5) (ly:stencil-translate slash-stencil
+						      ;;(cons (* mag -0.05) (* mag 0.42))
+						      (cons (* mag -0.00) (* mag -0.07))
+
+						      ))
+		     ((= num 7) (ly:stencil-translate slash-stencil
+						      ;;(cons (* mag -0.05) (* mag 0.42))
+						      (cons (* mag -0.00) (* mag -0.15))
+
+						      ))
+		     
+		     (else slash-stencil)))
+    ))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; the note command.
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 
 ;; TODO: better syntax.
@@ -438,13 +1084,12 @@ and/or @code{extra-offset} properties. "
 (def-markup-command (note-by-number layout props log dot-count dir) (number? number? number?)
   "Construct a note symbol, with stem.  By using fractional values for
 @var{dir}, you can obtain longer or shorter stems."
-  
   (let* ((font (ly:paper-get-font layout (cons '((font-encoding . fetaMusic)) props)))
 	 (size (chain-assoc-get 'font-size props 0))
          (stem-length (* (magstep size) (max 3 (- log 1))))
          (head-glyph (ly:font-get-glyph
 		      font
-		      (string-append "noteheads-s" (number->string (min log 2)))))
+		      (string-append "noteheads.s" (number->string (min log 2)))))
          (stem-thickness 0.13)
          (stemy (* dir stem-length))
          (attachx (if (> dir 0)
@@ -457,18 +1102,18 @@ and/or @code{extra-offset} properties. "
 			   (cons (min stemy attachy)
 				 (max stemy attachy))
 			   (/ stem-thickness 3))))
-         (dot (ly:font-get-glyph font "dots-dot"))
+         (dot (ly:font-get-glyph font "dots.dot"))
          (dotwid (interval-length (ly:stencil-extent dot X)))
          (dots (and (> dot-count 0)
                     (apply ly:stencil-add
                            (map (lambda (x)
                                   (ly:stencil-translate-axis
-                                   dot  (* (+ 1 (* 2 x)) dotwid) X) )
+                                   dot  (* (+ 1 (* 2 x)) dotwid) X))
                                 (iota dot-count 1)))))
          (flaggl (and (> log 2)
                       (ly:stencil-translate
                        (ly:font-get-glyph font
-					  (string-append "flags-"
+					  (string-append "flags."
 							 (if (> dir 0) "u" "d")
 							 (number->string log)))
                        (cons (+ attachx (/ stem-thickness 2)) stemy)))))
@@ -480,19 +1125,18 @@ and/or @code{extra-offset} properties. "
     (if (ly:stencil? dots)
         (set! stem-glyph
               (ly:stencil-add
-               (ly:stencil-translate-axis dots
-					  (+ (if (and (> dir 0) (> log 2))
-						 (* 1.5 dotwid)
-						 0)
-					     ;; huh ? why not necessary?
-					     ;;(cdr (ly:stencil-extent head-glyph X))
-					     dotwid)
-					  X)
+               (ly:stencil-translate-axis
+		dots
+		(+ (if (and (> dir 0) (> log 2))
+		       (* 1.5 dotwid)
+		       0)
+		   ;; huh ? why not necessary?
+		   ;;(cdr (ly:stencil-extent head-glyph X))
+		   dotwid)
+		X)
                stem-glyph)))
     stem-glyph))
 
-(use-modules (ice-9 regex))
-
 (define-public log2 
   (let ((divisor (log 2)))
     (lambda (z) (inexact->exact (/ (log z) divisor)))))
@@ -503,30 +1147,82 @@ and/or @code{extra-offset} properties. "
     (if (and match (string=? duration-string (match:substring match 0)))
         (let ((len  (match:substring match 1))
               (dots (match:substring match 2)))
-          (list (cond ((string=? len "breve")  -1)
-                      ((string=? len "longa")  -2)
+          (list (cond ((string=? len "breve") -1)
+                      ((string=? len "longa") -2)
                       ((string=? len "maxima") -3)
                       (else (log2 (string->number len))))
                 (if dots (string-length dots) 0)))
-        (error "This is not a valid duration string:" duration-string))))
+        (ly:error (_ "not a valid duration string: ~a") duration-string))))
 
 (def-markup-command (note layout props duration dir) (string? number?)
   "This produces a note with a stem pointing in @var{dir} direction, with
 the @var{duration} for the note head type and augmentation dots. For
 example, @code{\\note #\"4.\" #-0.75} creates a dotted quarter note, with
 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 (interpret-markup
-			      layout
-			      props arg)
-			     (* 0.5  (chain-assoc-get 'baseline-skip props))
-			     Y))
+  (ly:stencil-translate-axis
+   (interpret-markup layout props arg)
+   (* 0.5 (chain-assoc-get 'baseline-skip props)) Y))
 
 (def-markup-command (super layout props arg) (markup?)
   "
@@ -546,7 +1242,6 @@ Raising and lowering texts can be done with @code{\\super} and
 @end lilypond
 
 "
-  
   (ly:stencil-translate-axis
    (interpret-markup
     layout
@@ -566,13 +1261,11 @@ vertically, for the same reason that @code{\\raise} cannot be used for
 that.
 
 "
-  
   (ly:stencil-translate (interpret-markup  layout props arg)
 			offset))
 
 (def-markup-command (sub layout props arg) (markup?)
   "Set @var{arg} in subscript."
-  
   (ly:stencil-translate-axis
    (interpret-markup
     layout
@@ -583,11 +1276,14 @@ that.
 
 (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}."  
@@ -601,111 +1297,31 @@ 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 (smaller layout props arg) (markup?)
-  "Decrease the font size relative to current setting"
-  (let* ((fs (chain-assoc-get 'font-size props 0))
-	 (entry (cons 'font-size (- fs 1))))
-    (interpret-markup layout (cons (list entry) props) arg)))
-
-
-(def-markup-command (bigger layout props arg) (markup?)
-  "Increase the font size relative to current setting"
-  (let* ((fs (chain-assoc-get 'font-size props 0))
-         (entry (cons 'font-size (+ fs 1))))
-    (interpret-markup layout (cons (list entry) props) 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} and
-@code{box-padding} properties to determine line thickness and padding
-around the markup."
-  (let ((th (chain-assoc-get 'thickness props  0.1))
-        (pad (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:stencil-set-extent! m X '(1000 . -1000))
-    m))
-
-(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->markletter-string n)
-  "Double letters for big marks."
-  (let* ((lst (vector-length number->mark-letter-vector)))
-    
-    (if (>= n lst)
-	(string-append (number->markletter-string (1- (quotient n lst)))
-		       (number->markletter-string (remainder n lst)))
-	(make-string 1 (vector-ref number->mark-letter-vector 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 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
-the elements marked in @var{indices}, which is a list of numbers."
+the elements marked in @var{indices}, which is a list of numbers.
 
+"
+;;
+;; DROPME? This command is a relic from the old figured bass implementation.
+;;
+  
   (define (sublist lst start stop)
-    (take (drop lst start) (- (1+ stop) start)) )
+    (take (drop lst start) (- (1+ stop) start)))
 
   (define (stencil-list-extent ss axis)
     (cons
      (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 last-stencil)
+     ((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))
@@ -713,7 +1329,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
@@ -748,8 +1364,15 @@ the elements marked in @var{indices}, which is a list of numbers."
 		  x)) args))
 	 (leading
 	  (chain-assoc-get 'baseline-skip props))
-	 (stacked (stack-stencils stencils 1.25 #f))
+	 (stacked (stack-stencils-vertically
+		   (remove ly:stencil-empty? stencils) 1.25 #f))
 	 (brackets (make-brackets stacked indices '())))
 
     (apply ly:stencil-add
 	   (append stacked brackets))))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; size indications arrow
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+