* scripts/lilypond.py: Remove LaTeX titling kludge. Remove page

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

diff --git a/scm/define-markup-commands.scm b/scm/define-markup-commands.scm
index e94ddd68ef1fde344f26f0a6ba7c88eef283a245..913772b64537a18c1a9214e4f8e46d6a4fe9dd3a 100644 (file)
--- a/scm/define-markup-commands.scm
+++ b/scm/define-markup-commands.scm
@@ -11,19 +11,19 @@
 ;;     syntax, description and example. 
 
 
-(def-markup-command (word paper props str) (string?)
-  "A single word."
-  (interpret-markup paper props str))
   
 (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-word-markup str)))
+    (interpret-markup paper props str))
 
-; todo: use font recoding.
-;                    (make-line-markup
-;                     (map make-word-markup (string-tokenize 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 ""))
@@ -51,9 +51,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)))
   
@@ -163,8 +163,8 @@ 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 ``più @b{f}'', the
-normal words (like ``più'') 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-encoding 'dynamic props) arg))