* lily/my-lily-parser.cc (parse_string): delete lexer after use.

[lilypond.git] / scm / define-markup-commands.scm

diff --git a/scm/define-markup-commands.scm b/scm/define-markup-commands.scm
index 6332287c412a676f2c4a71bfdcac26550a10a707..f5114886c8ba52a569d69b56f73cd80e6b59e8a3 100644 (file)
--- a/scm/define-markup-commands.scm
+++ b/scm/define-markup-commands.scm
@@ -11,16 +11,23 @@
 ;;     syntax, description and example. 
 
 
-(def-markup-command (word paper props str) (string?)
-  "A single word."
-  (interpret-markup paper props str))
-  
+(def-markup-command (stencil paper props stil) (ly:stencil?)
+  "Stencil as markup"
+  stil)
+
 (def-markup-command (simple paper props str) (string?)
-  "A simple text-string; @code{\\markup @{ foo @}} is equivalent with
+  "A simple text string; @code{\\markup @{ foo @}} is equivalent with
 @code{\\markup @{ \\simple #\"foo\" @}}."
-    (interpret-markup paper props
-                     (make-line-markup
-                      (map make-word-markup (string-tokenize str)))))
+    (interpret-markup paper props str))
+
+(def-markup-command (encoded-simple paper props sym str) (symbol? string?)
+  "A text string, encoded with encoding @var{sym}. "
+  (Text_item::interpret_string paper
+                              props sym str))
+
+;; TODO: use font recoding.
+;;                   (make-line-markup
+;;                    (map make-word-markup (string-tokenize str)))))
 
 (define-public empty-markup
   (make-simple-markup ""))
@@ -48,9 +55,9 @@
                           (if (= word-count 1) 2 (- word-count 1)))))
        (line-stencils (if (= word-count 1)
                           (map (lambda (x) (interpret-markup paper props x))
-                               (list (make-word-markup "")
+                               (list (make-simple-markup "")
                                      (car markups)
-                                     (make-word-markup "")))
+                                     (make-simple-markup "")))
                                stencils)))
     (stack-stencil-line fill-space line-stencils)))
   
@@ -80,7 +87,7 @@ determines the space between each markup in @var{args}."
                     arg))
 
 (def-markup-command (fontsize paper props mag arg) (number? markup?)
-  "This sets the relative font size, eg.
+  "This sets the relative font size, e.g.
 @example
 A \\fontsize #2 @{ B C @} D
 @end example
@@ -120,7 +127,7 @@ Use @code{\\fontsize} otherwise."
   "Set font family to @code{number}, which yields the font used for
 time signatures and fingerings.  This font only contains numbers and
 some punctuation. It doesn't have any letters.  "
-  (interpret-markup paper (prepend-alist-chain 'font-family 'number props) arg))
+  (interpret-markup paper (prepend-alist-chain 'font-encoding 'fetaNumber props) arg))
 
 (def-markup-command (roman paper props arg) (markup?)
   "Set font family to @code{roman}."
@@ -160,11 +167,11 @@ some punctuation. It doesn't have any letters.  "
 
 (def-markup-command (dynamic paper 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 ``piu @b{f}'', the
-normal words (like ``piu'') should be done in a different font.  The
+@b{z}, @b{p}, and @b{r}.  When producing phrases, like ``pi@`{u} @b{f}'', the
+normal words (like ``pi@`{u}'') should be done in a different font.  The
 recommend font for this is bold and italic"
   (interpret-markup
-   paper (prepend-alist-chain 'font-family 'dynamic props) arg))
+   paper (prepend-alist-chain 'font-encoding 'fetaDynamic props) arg))
 
 (def-markup-command (italic paper props arg) (markup?)
   "Use italic @code{font-shape} for @var{arg}. "
@@ -237,6 +244,12 @@ of the @code{#'direction} layout property."
          (cmols (map (lambda (x) (ly:stencil-align-to! x X CENTER)) mols)))
     (stack-lines -1 0.0 (chain-assoc-get 'baseline-skip props) mols)))
 
+(def-markup-command (vcenter paper props arg) (markup?)
+  "Align @code{arg} to its center. "
+  (let* ((mol (interpret-markup paper props arg)))
+    (ly:stencil-align-to! mol Y CENTER)
+    mol))
+
 (def-markup-command (right-align paper props arg) (markup?)
   (let* ((m (interpret-markup paper props arg)))
     (ly:stencil-align-to! m X RIGHT)
@@ -265,10 +278,7 @@ accordingly."
 See @usermanref{The Feta font} for  a complete listing of the possible glyphs.
 "
   (ly:find-glyph-by-name
-   (ly:paper-get-font paper (cons '((font-name . ())
-                                    (font-shape . *)
-                                    (font-series . *)
-                                    (font-family . music))
+   (ly:paper-get-font paper (cons '((font-encoding . fetaMusic))
                                   props))
    glyph-name))
 
@@ -330,7 +340,7 @@ and/or @code{extra-offset} properties. "
   "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 paper (cons '((font-family .  music)) props)))
+  (let* ((font (ly:paper-get-font paper (cons '((font-encoding . fetaMusic)) props)))
          (stemlen (max 3 (- log 1)))
          (headgl (ly:find-glyph-by-name
                   font
@@ -388,7 +398,7 @@ and/or @code{extra-offset} properties. "
     (lambda (z) (inexact->exact (/ (log z) divisor)))))
 
 (define (parse-simple-duration duration-string)
-  "Parse the `duration-string', eg ''4..'' or ''breve.'', and return a (log dots) list."
+  "Parse the `duration-string', e.g. ''4..'' or ''breve.'', and return a (log dots) list."
   (let ((match (regexp-exec (make-regexp "(breve|longa|maxima|[0-9]+)(\\.*)") duration-string)))
     (if (and match (string=? duration-string (match:substring match 0)))
         (let ((len  (match:substring match 1))
@@ -518,18 +528,14 @@ any sort of property supported by @internalsref{font-interface} and
 (def-markup-command (smaller paper props arg) (markup?)
   "Decrease the font size relative to current setting"
   (let* ((fs (chain-assoc-get 'font-size props 0))
-        ;; FIXME: crasher fix
-         ;; (entry (cons 'font-size (- fs 1))))
-         (entry (cons 'font-size (if (number? fs) (- fs 1) 0))))
+        (entry (cons 'font-size (- fs 1))))
     (interpret-markup paper (cons (list entry) props) arg)))
 
 
 (def-markup-command (bigger paper props arg) (markup?)
   "Increase the font size relative to current setting"
   (let* ((fs (chain-assoc-get 'font-size props 0))
-        ;; FIXME: crasher fix
-         ;; (entry (cons 'font-size (+ fs 1))))
-         (entry (cons 'font-size (if (number? fs) (+ fs 1) 0))))
+         (entry (cons 'font-size (+ fs 1))))
     (interpret-markup paper (cons (list entry) props) arg)))
 
 (def-markup-command larger (markup?)