(text_font_alist_chain): rename function,

and use text-font-defaults.

diff --git a/lily/font-interface.cc b/lily/font-interface.cc
index 4923cdeb3eddffb2c88b189a5c2322af7e44bf8a..a85bd4db7414c3ebd450cd597dfd9d63c5888d01 100644 (file)
--- a/lily/font-interface.cc
+++ b/lily/font-interface.cc
@@ -54,4 +54,4 @@ ADD_INTERFACE (Font_interface, "font-interface",
               "Any symbol that is typeset through fixed sets of glyphs, "
               " (ie. fonts)",
               "font-magnification font font-series font-shape "
-              "font-family font-name font-size");
+              "font-family font-encoding font-name font-size");

diff --git a/scm/chord-ignatzek-names.scm b/scm/chord-ignatzek-names.scm
index 26fa220e8f78068ecc6ccd73b0ebaba9692562bd..a3bbe590d976ba62e5274f6ab436e7e01a5c557f 100644 (file)
--- a/scm/chord-ignatzek-names.scm
+++ b/scm/chord-ignatzek-names.scm
@@ -238,7 +238,7 @@ work than classifying the pitches."
        (root (car in-pitches))
        (pitches (map (lambda (x) (ly:pitch-diff x root)) (cdr in-pitches)))
        (exceptions (ly:context-property context 'chordNameExceptions))
-       (exception (assoc-get-default pitches exceptions #f))
+       (exception (assoc-get pitches exceptions))
        (prefixes '())
        (suffixes '())
        (add-steps '())

diff --git a/scm/define-grob-properties.scm b/scm/define-grob-properties.scm
index 8c96d894ca343036e9af0f2a07074d8da3a005e0..78b1b33603fdc393b75234cb31c634d85dd8b9ee 100644 (file)
--- a/scm/define-grob-properties.scm
+++ b/scm/define-grob-properties.scm
@@ -212,7 +212,9 @@ typeset on a Stem. Valid options include @code{()} and
 flag.")
      (stroke-style ,string? "set to \"grace\" to turn stroke through flag on.")
      (flag-width-function ,procedure? "Procedure that computes the width of a half-beam (a non-connecting beam.).")
-     (font-family ,symbol? "The font family is the broadest category for selecting a font. Options include: @code{music}, @code{roman}, etc... ")
+     (font-family ,symbol? "The font family is the broadest category for selecting text fonts. Options include: @code{sans}, @code{roman} ")
+     (font-encoding ,symbol? "The font encoding is the broadest category for selecting a font. Options include: @code{music}, @code{number}, @code{text},
+@code{math}, @code{braces}, @code{dynamic}")
      (font-name ,string? "Specifies a file name (without extension) of
 the font to load.  This setting override selection using
 @code{font-family}, @code{font-series} and @code{font-shape}.")

diff --git a/scm/define-markup-commands.scm b/scm/define-markup-commands.scm
index c42aef7c319817003ab649b02561b1adbcc982f1..cef3198fb6e0daf943e8919d85d79f6500189016 100644 (file)
--- a/scm/define-markup-commands.scm
+++ b/scm/define-markup-commands.scm
@@ -265,10 +265,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 . music))
                                   props))
    glyph-name))
 
@@ -330,7 +327,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 . music)) props)))
          (stemlen (max 3 (- log 1)))
          (headgl (ly:find-glyph-by-name
                   font