Implement underline markup command, and add a regression test for it.

diff --git a/input/regression/markup-commands.ly b/input/regression/markup-commands.ly
index 1005cd1fa9406726a85e845bb2d9c51e9a122ca7..01df789911fffe5ea2332ebb68c2cda46fd02fa4 100644 (file)
--- a/input/regression/markup-commands.ly
+++ b/input/regression/markup-commands.ly
@@ -31,7 +31,7 @@ blah.")
       }
 
       draw-line: \draw-line #'(5 . 3)
-      
+      \underline "underlined"
     }
   }
 }

diff --git a/scm/define-markup-commands.scm b/scm/define-markup-commands.scm
index 210ada37cf9b32b58ce10e51805cb25e9d27a130..e04b79963cc91a688994b8470fb60c00c1284fc0 100644 (file)
--- a/scm/define-markup-commands.scm
+++ b/scm/define-markup-commands.scm
@@ -117,6 +117,22 @@ the PDF backend."
      (cons (+ (- half) (car yext))
           (+ half (cdr yext))))))
 
+(define-builtin-markup-command (underline layout props arg) (markup?)
+  "Underline @var{arg}.  Looks at @code{thickness} to determine line
+thickness and y offset."
+  (let* ((th (*
+             (ly:output-def-lookup layout 'line-thickness)
+             (chain-assoc-get 'thickness props 1)))
+        (m (interpret-markup layout props arg))
+        (x (cdr (ly:stencil-extent m X)))
+        (y (* th -2))
+        (line (ly:make-stencil
+               `(draw-line ,th 0 ,y ,x ,y)
+               (cons (min x 0) (max x 0))
+               (cons th th)))
+        (s (ly:stencil-add m line)))
+    s))
+
 (define-builtin-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