From: Nicolas Sceaux <nicolas.sceaux@free.fr>
Date: Mon, 1 Jan 2007 11:57:18 +0000 (+0100)
Subject: Merge branch 'master' of git://git.sv.gnu.org/lilypond
X-Git-Tag: release/2.11.10-1~79^2~4
X-Git-Url: https://git.donarmstrong.com/?p=lilypond.git;a=commitdiff_plain;h=ba3045ce76cd37a4e11fd775fa04ce4b7586ad77

Merge branch 'master' of git://git.sv.gnu.org/lilypond
---

ba3045ce76cd37a4e11fd775fa04ce4b7586ad77
diff --cc scm/define-markup-commands.scm
index 191b24422f,10d48d5e8a..436d2c2378
--- a/scm/define-markup-commands.scm
+++ b/scm/define-markup-commands.scm
@@@ -1029,44 -1029,45 +1029,45 @@@ recommend font for this is bold and ita
  ;; symbols.
  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
  
 -(define-markup-command (doublesharp layout props) ()
 +(define-builtin-markup-command (doublesharp layout props) ()
    "Draw a double sharp symbol."
  
-   (interpret-markup layout props (markup #:musicglyph "accidentals.4")))
+   (interpret-markup layout props (markup #:musicglyph (assoc-get 1 standard-alteration-glyph-name-alist ""))))
  
 -(define-markup-command (sesquisharp layout props) ()
 +(define-builtin-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 (assoc-get 3/4 standard-alteration-glyph-name-alist ""))))
+ 					 
  
 -(define-markup-command (sharp layout props) ()
 +(define-builtin-markup-command (sharp layout props) ()
    "Draw a sharp symbol."
-   (interpret-markup layout props (markup #:musicglyph "accidentals.2")))
+   (interpret-markup layout props (markup #:musicglyph (assoc-get 1/2 standard-alteration-glyph-name-alist ""))))
  
 -(define-markup-command (semisharp layout props) ()
 +(define-builtin-markup-command (semisharp layout props) ()
    "Draw a semi sharp symbol."
-   (interpret-markup layout props (markup #:musicglyph "accidentals.1")))
+   (interpret-markup layout props (markup #:musicglyph (assoc-get 1/4 standard-alteration-glyph-name-alist ""))))
  
 -(define-markup-command (natural layout props) ()
 +(define-builtin-markup-command (natural layout props) ()
    "Draw a natural symbol."
-   (interpret-markup layout props (markup #:musicglyph "accidentals.0")))
+   (interpret-markup layout props (markup #:musicglyph (assoc-get 0 standard-alteration-glyph-name-alist ""))))
  
 -(define-markup-command (semiflat layout props) ()
 +(define-builtin-markup-command (semiflat layout props) ()
    "Draw a semiflat."
-   (interpret-markup layout props (markup #:musicglyph "accidentals.M1")))
+   (interpret-markup layout props (markup #:musicglyph (assoc-get -1/4 standard-alteration-glyph-name-alist ""))))
  
 -(define-markup-command (flat layout props) ()
 +(define-builtin-markup-command (flat layout props) ()
    "Draw a flat symbol."
-   (interpret-markup layout props (markup #:musicglyph "accidentals.M2")))
+   (interpret-markup layout props (markup #:musicglyph (assoc-get -1/2 standard-alteration-glyph-name-alist ""))))
  
 -(define-markup-command (sesquiflat layout props) ()
 +(define-builtin-markup-command (sesquiflat layout props) ()
    "Draw a 3/2 flat symbol."
-   (interpret-markup layout props (markup #:musicglyph "accidentals.M3")))
+   (interpret-markup layout props (markup #:musicglyph (assoc-get -3/4 standard-alteration-glyph-name-alist ""))))
  
 -(define-markup-command (doubleflat layout props) ()
 +(define-builtin-markup-command (doubleflat layout props) ()
    "Draw a double flat symbol."
-   (interpret-markup layout props (markup #:musicglyph "accidentals.M4")))
+   (interpret-markup layout props (markup #:musicglyph (assoc-get -1 standard-alteration-glyph-name-alist ""))))
  
 -(define-markup-command (with-color layout props color arg) (color? markup?)
 +(define-builtin-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)))
@@@ -1096,9 -1097,9 +1097,9 @@@
  				     props))
       name)))
  
 -(define-markup-command (musicglyph layout props glyph-name) (string?)
 +(define-builtin-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.
+ #\"accidentals.natural\"} 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))