s/ly:font-load/ly:system-font-load/.

Clarify documentation w.r.t. system fonts.

Remove code for TeX support which is no longer supported.

diff --git a/input/manual/font-table.ly b/input/manual/font-table.ly
index c2fa775f5b7da588da34330395423746c37ee91f..7c62a4ad28669519cb15b8fc9a3dcf25c8c4bfbc 100644 (file)
--- a/input/manual/font-table.ly
+++ b/input/manual/font-table.ly
@@ -57,4 +57,4 @@
 
 \markuplines \override-lines #'(word-space . 4)
              \doc-chars #(delete ".notdef"
-                          (ly:otf-glyph-list (ly:font-load "emmentaler-20")))
+                          (ly:otf-glyph-list (ly:system-font-load "emmentaler-20")))

diff --git a/lily/all-font-metrics-scheme.cc b/lily/all-font-metrics-scheme.cc
index 685ec537e6ef8c005dcd30efcfa6a70466342be5..5ddc156b11c63716a0a1ee5d19923c129c2e5090 100644 (file)
--- a/lily/all-font-metrics-scheme.cc
+++ b/lily/all-font-metrics-scheme.cc
@@ -22,9 +22,19 @@ LY_DEFINE (ly_reset_all_fonts, "ly:reset-all-fonts", 0, 0, 0,
 }
 
 
-LY_DEFINE (ly_font_load, "ly:font-load", 1, 0, 0,
+LY_DEFINE (ly_system_font_load, "ly:system-font-load", 1, 0, 0,
           (SCM name),
-          "Load the font @var{name}.")
+          "Load the OpenType system font @file{@var{name}.otf}."
+          "  Fonts loaded with this command must contain three"
+          " additional SFNT font tables called @code{LILC},"
+          " @code{LILF}, and @code{LILY}, needed for typesetting"
+          " musical elements.  Currently, only the Emmentaler and"
+          " the Aybabtu fonts fulfill these requirements.\n"
+          "\n"
+          "Note that only @code{ly:font-get-glyph} and derived"
+          " code (like @code{\\lookup}) can access glyphs from"
+          " the system fonts; text strings are handled exclusively"
+          " via the Pango interface.")
 {
   LY_ASSERT_TYPE (scm_is_string, name, 1);
   
@@ -33,5 +43,3 @@ LY_DEFINE (ly_font_load, "ly:font-load", 1, 0, 0,
 
   return fm->self_scm ();
 }
-
-

diff --git a/lily/font-metric-scheme.cc b/lily/font-metric-scheme.cc
index b06d419b99e4342e52d5ca8b7f4bdd55ba3cfbc2..d6479f03d084f9ad5ce94f0fd8b85bf368a1abb3 100644 (file)
--- a/lily/font-metric-scheme.cc
+++ b/lily/font-metric-scheme.cc
@@ -16,7 +16,13 @@ LY_DEFINE (ly_font_get_glyph, "ly:font-get-glyph",
           2, 0, 0,
           (SCM font, SCM name),
           "Return a stencil from @var{font} for the glyph named @var{name}."
-          " If the glyph is not available, return an empty stencil.")
+          "  If the glyph is not available, return an empty stencil.\n"
+          "\n"
+          "Note that this command can only be used to access glyphs from"
+          " fonts loaded with @code{ly:system-font-load}; currently, this"
+          " means either the Emmentaler or Aybabtu fonts, corresponding"
+          " to the font encodings @code{fetaMusic} and @code{fetaBraces},"
+          " respectively.")
 {
   Font_metric *fm = unsmob_metrics (font);
   LY_ASSERT_SMOB (Font_metric, font, 1);
@@ -32,7 +38,13 @@ LY_DEFINE (ly_get_glyph, "ly:get-glyph",
           2, 0, 0,
           (SCM font, SCM index),
           "Retrieve a stencil for the glyph numbered @var{index}"
-          " in @var{font}.")
+          " in @var{font}.\n"
+          "\n"
+          "Note that this command can only be used to access glyphs from"
+          " fonts loaded with @code{ly:system-font-load}; currently, this"
+          " means either the Emmentaler or Aybabtu fonts, corresponding"
+          " to the font encodings @code{fetaMusic} and @code{fetaBraces},"
+          " respectively.")
 {
   Font_metric *fm = unsmob_metrics (font);
   LY_ASSERT_SMOB (Font_metric, font, 1);
@@ -44,7 +56,13 @@ LY_DEFINE (ly_get_glyph, "ly:get-glyph",
 LY_DEFINE (ly_font_glyph_name_to_index, "ly:font-glyph-name-to-index",
           2, 0, 0,
           (SCM font, SCM name),
-          "Return the index for @var{name} in @var{font}.")
+          "Return the index for @var{name} in @var{font}.\n"
+          "\n"
+          "Note that this command can only be used to access glyphs from"
+          " fonts loaded with @code{ly:system-font-load}; currently, this"
+          " means either the Emmentaler or Aybabtu fonts, corresponding"
+          " to the font encodings @code{fetaMusic} and @code{fetaBraces},"
+          " respectively.")
 {
   Font_metric *fm = unsmob_metrics (font);
   LY_ASSERT_SMOB (Font_metric, font, 1);
@@ -56,7 +74,13 @@ LY_DEFINE (ly_font_glyph_name_to_index, "ly:font-glyph-name-to-index",
 LY_DEFINE (ly_font_index_to_charcode, "ly:font-index-to-charcode",
           2, 0, 0,
           (SCM font, SCM index),
-          "Return the character code for @var{index} in @var{font}.")
+          "Return the character code for @var{index} in @var{font}.\n"
+          "\n"
+          "Note that this command can only be used to access glyphs from"
+          " fonts loaded with @code{ly:system-font-load}; currently, this"
+          " means either the Emmentaler or Aybabtu fonts, corresponding"
+          " to the font encodings @code{fetaMusic} and @code{fetaBraces},"
+          " respectively.")
 {
   Font_metric *fm = unsmob_metrics (font);
   LY_ASSERT_SMOB (Font_metric, font, 1);
@@ -68,7 +92,13 @@ LY_DEFINE (ly_font_index_to_charcode, "ly:font-index-to-charcode",
 LY_DEFINE (ly_font_glyph_name_to_charcode, "ly:font-glyph-name-to-charcode",
           2, 0, 0,
           (SCM font, SCM name),
-          "Return the character code for glyph @var{name} in @var{font}.")
+          "Return the character code for glyph @var{name} in @var{font}.\n"
+          "\n"
+          "Note that this command can only be used to access glyphs from"
+          " fonts loaded with @code{ly:system-font-load}; currently, this"
+          " means either the Emmentaler or Aybabtu fonts, corresponding"
+          " to the font encodings @code{fetaMusic} and @code{fetaBraces},"
+          " respectively.")
 {
   Font_metric *fm = unsmob_metrics (font);
   LY_ASSERT_SMOB (Font_metric, font, 1);

diff --git a/lily/include/all-font-metrics.hh b/lily/include/all-font-metrics.hh
index 073b839d9a1ff874cd9b0f880a665468f82f9d32..5f275853865c8f04b08cc608fb9cc3e460fa5f49 100644 (file)
--- a/lily/include/all-font-metrics.hh
+++ b/lily/include/all-font-metrics.hh
@@ -20,7 +20,8 @@
 
 
 /*
-   Interface to all .afm files living in the filesystem.
+   Interface to all fonts (both system fonts and fonts loaded
+   via Pango).
 */
 class All_font_metrics
 {
@@ -55,4 +56,3 @@ extern All_font_metrics *all_fonts_global;
 SCM ly_reset_all_fonts ();
 
 #endif /* ALL_FONTS_HH */
-

diff --git a/scm/font.scm b/scm/font.scm
index 65ee3fec13c6c751b24e03785130eeb77822ebd7..103390097614d45e88a178ec0442e6d515bcd4da 100644 (file)
--- a/scm/font.scm
+++ b/scm/font.scm
@@ -41,11 +41,9 @@
        )))
 
 (define-method (display (node <Font-tree-node>) port)
-
   (map
    (lambda (x)
      (display x port))
-
    (list
     "Font_node {\nqual: "
     (font-qualifier node)
@@ -61,7 +59,6 @@
    (hash-table->alist (font-children node)))
   (display "} }\n"))
 
-
 (define default-qualifier-order
   '(font-encoding font-family font-shape font-series))
 
@@ -93,8 +90,6 @@
         (new-fprops (assoc-delete q fprops))
         (child (hashq-ref (slot-ref node 'children)
                           v #f)))
-
-
     (if (not child)
        (begin
          (set! child (make-node new-fprops size-family))
@@ -102,11 +97,9 @@
     (if (pair? new-fprops)
        (add-font child new-fprops size-family))))
 
-
 (define-method (add-font (node <Font-tree-leaf>) fprops size-family)
   (throw "must add to node, not leaf"))
 
-
 (define-method (g-lookup-font (node <Font-tree-node>) alist-chain)
   (let* ((qual (font-qualifier node))
         (def (font-default node))
@@ -117,41 +110,36 @@
        (g-lookup-font desired-child alist-chain)
        (g-lookup-font (hashq-ref (font-children node) def) alist-chain))))
 
-
 (define-method (g-lookup-font (node <Font-tree-leaf>) alist-chain)
   node)
 
-;; two step call  is handy for debugging.
+;; two step call is handy for debugging.
 (define (lookup-font node alist-chain)
   (g-lookup-font node alist-chain))
 
-;; Each size family is a vector of fonts, loaded with a delay.  The
-;; vector should be sorted according to ascending design size.
+
+;; Ugh.  Currently, we load the PFB Feta fonts for `fetaDynamic' with
+;; Pango.  This should be changed to load the Emmentaler fonts instead
+;; (with Pango too), but then we need support for a `font-style'
+;; property which isn't implemented yet.
 (define feta-alphabet-size-vector
-  (if (defined? 'ly:kpathsea-find-file)
-      `#(,(delay  (ly:font-load "feta-alphabet11"))
-        ,(delay  (ly:font-load "feta-alphabet13"))
-        ,(delay  (ly:font-load "feta-alphabet14"))
-        ,(delay  (ly:font-load "feta-alphabet16"))
-        ,(delay  (ly:font-load "feta-alphabet18"))
-        ,(delay  (ly:font-load "feta-alphabet20"))
-        ,(delay  (ly:font-load "feta-alphabet23"))
-        ,(delay  (ly:font-load "feta-alphabet26")))
-      (list->vector
-       (map (lambda (tup)
-             (cons (ly:pt (cdr tup))
-                   (format "feta-alphabet~a ~a"
-                           (car tup)
-                           (ly:pt (cdr tup)))))
-           '((11 . 11.22)
-             (13 . 12.60)
-             (14 .  14.14)
-             (16 . 15.87)
-             (18 . 17.82)
-             (20 . 20)
-             (23 . 22.45)
-             (26 . 25.20))))))
+  (list->vector
+   (map (lambda (tup)
+         (cons (ly:pt (cdr tup))
+               (format "feta-alphabet~a ~a"
+                       (car tup)
+                       (ly:pt (cdr tup)))))
+       '((11 . 11.22)
+         (13 . 12.60)
+         (14 .  14.14)
+         (16 . 15.87)
+         (18 . 17.82)
+         (20 . 20)
+         (23 . 22.45)
+         (26 . 25.20)))))
 
+;; Each size family is a vector of fonts, loaded with a delay.  The
+;; vector should be sorted according to ascending design size.
 (define-public (add-music-fonts node factor)
   (for-each
    (lambda (x)
@@ -159,149 +147,19 @@
               (list (cons 'font-encoding (car x)))
               (cons (* factor (cadr x))
                     (caddr x))))
-   `((fetaDynamic ,(ly:pt 20.0)  ,feta-alphabet-size-vector)
-     (fetaNumber ,(ly:pt 20.0)  ,feta-alphabet-size-vector)
+   `((fetaDynamic ,(ly:pt 20.0) ,feta-alphabet-size-vector)
+     (fetaNumber ,(ly:pt 20.0) ,feta-alphabet-size-vector)
      (fetaMusic ,(ly:pt 20.0)
-               #(,(delay  (ly:font-load "emmentaler-11"))
-                 ,(delay  (ly:font-load "emmentaler-13"))                
-                 ,(delay  (ly:font-load "emmentaler-14"))
-                 ,(delay  (ly:font-load "emmentaler-16"))                
-                 ,(delay  (ly:font-load "emmentaler-18"))
-                 ,(delay  (ly:font-load "emmentaler-20"))                
-                 ,(delay  (ly:font-load "emmentaler-23"))                
-                 ,(delay  (ly:font-load "emmentaler-26"))))
-
-     (fetaBraces ,(ly:pt 20.0) #(,(delay
-                           (ly:font-load "aybabtu")))))))
-
-(define-public (add-cmr-fonts node factor)
-  (add-font node '((font-encoding . TeX-math))
-           `(,(* factor 10) . #(,(delay (ly:font-load "msam10")))))
-  (for-each
-   (lambda (x)
-     (add-font node `((font-encoding . TeX-text)
-                     (font-series . ,(vector-ref (car x) 2))
-                     (font-shape . ,(vector-ref (car x) 1))
-                     (font-family . ,(vector-ref (car x) 0)))
-              (cons (* factor (cadr x))
-                    (cddr x))))
-   `((#(roman upright medium) 
-      . (,(ly:pt 10.0) . #(,(delay (ly:font-load "cmr6"))
-                 ,(delay (ly:font-load "cmr8")) 
-                 ,(delay (ly:font-load "cmr10"))
-                 ,(delay (ly:font-load "cmr17")))))
-     (#(roman upright bold) 
-      . (,(ly:pt 10.0) . #(,(delay (ly:font-load "cmbx6"))
-                 ,(delay (ly:font-load "cmbx8"))
-                 ,(delay (ly:font-load "cmbx10"))
-                 ,(delay (ly:font-load "cmbx12")))))
-     (#(roman italic medium) 
-      . (,(ly:pt 10.0) . #(,(delay (ly:font-load "cmti7"))
-                 ,(delay (ly:font-load "cmti10"))
-                 ,(delay (ly:font-load "cmti12")))))
-     (#(roman italic bold) 
-      . (,(ly:pt 10.0) . #(,(delay (ly:font-load "cmbxti8"))
-                 ,(delay (ly:font-load "cmbxti10"))
-                 ,(delay (ly:font-load "cmbxti14")))))
-     (#(roman caps medium) 
-      . (,(ly:pt 10.0) . #(,(delay (ly:font-load "cmcsc10")))))
-     (#(roman upright bold-narrow ) 
-      . (,(ly:pt 10.0) . #(,(delay (ly:font-load "cmb10")))))
-     (#(sans upright medium) 
-      . (,(ly:pt 10.0)  . #(,(delay (ly:font-load "cmss8"))
-                  ,(delay (ly:font-load "cmss10"))
-                  ,(delay (ly:font-load "cmss12"))
-                  ,(delay (ly:font-load "cmss17")))))
-     (#(typewriter upright medium) 
-      . (,(ly:pt 10.0) . #(,(delay (ly:font-load "cmtt8"))
-                 ,(delay (ly:font-load "cmtt10"))
-                 ,(delay (ly:font-load "cmtt12"))))))))
-
-;; Debian lmodern font support.
-(define-public (add-cork-lm-fonts node factor)
-  (for-each
-   (lambda (x)
-     (add-font node `((font-encoding . cork-lm)
-                     (font-series . ,(vector-ref (car x) 2))
-                     (font-shape . ,(vector-ref (car x) 1))
-                     (font-family . ,(vector-ref (car x) 0)))
-              (cons (* factor (cadr x)) (cddr x))))
-   `((#(roman upright medium) 
-      . (,(ly:pt 10.0) . #(,(delay (ly:font-load "lmr6"))
-                 ,(delay (ly:font-load "lmr8"))
-                 ,(delay (ly:font-load "lmr10"))
-                 ,(delay (ly:font-load "lmr17")))))
-     (#(roman upright bold) 
-      . (,(ly:pt 10.0) . #(,(delay (ly:font-load "lmbx6"))
-                 ,(delay (ly:font-load "lmbx8"))
-                 ,(delay (ly:font-load "lmbx10"))
-                 ,(delay (ly:font-load "lmbx12")))))
-     (#(roman italic medium) 
-      . (,(ly:pt 10.0) . #(,(delay (ly:font-load "lmri7"))
-                 ,(delay (ly:font-load "lmri10"))
-                 ,(delay (ly:font-load "lmri12")))))
-     (#(roman italic bold)
-      . (,(ly:pt 10.0) . #(,(delay (ly:font-load "lmbxi10")))))
-     (#(roman caps medium)
-      . (,(ly:pt 10.0) . #(,(delay (ly:font-load "lmcsc10")))))
-     (#(roman upright bold-narrow ) 
-      . (,(ly:pt 10.0) . #(,(delay (ly:font-load "lmb10")))))
-     (#(sans upright medium) 
-      . (,(ly:pt 10.0)  . #(,(delay (ly:font-load "lmss8"))
-                  ,(delay (ly:font-load "lmss10"))
-                  ,(delay (ly:font-load "lmss12"))
-                  ,(delay (ly:font-load "lmss17")))))
-     (#(sans upright bold) 
-      . (,(ly:pt 10.0)  . #(,(delay (ly:font-load "lmssbx10")))))
-
-     (#(typewriter upright medium) 
-      . (,(ly:pt 10.0) . #(,(delay (ly:font-load "lmtt8"))
-                 ,(delay (ly:font-load "lmtt10"))
-                 ,(delay (ly:font-load "lmtt12"))))))))
-
-;; ec-fonts-mftraced font support.
-(define-public (add-ec-fonts node factor)
-  (for-each
-   (lambda (x) (add-font node
-                        `((font-encoding . Extended-TeX-Font-Encoding---Latin)
-                          (font-series . ,(vector-ref (car x) 2))
-                          (font-shape . ,(vector-ref (car x) 1))
-                          (font-family . ,(vector-ref (car x) 0)))
-                        (cons (* factor (cadr x)) (cddr x))))
-
-   `((#(roman upright medium) 
-      . (,(ly:pt 10.0) . #(,(delay (ly:font-load "ecrm6"))
-                 ,(delay (ly:font-load "ecrm8"))
-                 ,(delay (ly:font-load "ecrm10"))
-                 ,(delay (ly:font-load "ecrm17")))))
-     (#(roman upright bold) 
-      . (,(ly:pt 10.0) . #(,(delay (ly:font-load "ecbx6"))
-                 ,(delay (ly:font-load "ecbx8"))
-                 ,(delay (ly:font-load "ecbx10"))
-                 ,(delay (ly:font-load "ecbx12")))))
-     (#(roman italic medium) 
-      . (,(ly:pt 10.0) . #(,(delay (ly:font-load "ecti7"))
-                 ,(delay (ly:font-load "ecti10"))
-                 ,(delay (ly:font-load "ecti12")))))
-     (#(roman italic bold) 
-      . (,(ly:pt 10.0) . #(,(delay (ly:font-load "ecbi8"))
-                 ,(delay (ly:font-load "ecbi10"))
-                 ,(delay (ly:font-load "ecbi14")))))
-     (#(roman caps medium) 
-      . (,(ly:pt 10.0) . #(,(delay (ly:font-load "eccc10")))))
-     (#(roman slanted-caps medium) 
-      . (,(ly:pt 10.0) . #(,(delay (ly:font-load "ecsc10")))))
-     (#(roman upright bold-narrow ) 
-      . (,(ly:pt 10.0) . #(,(delay (ly:font-load "ecrb10")))))
-     (#(sans upright medium) 
-      . (,(ly:pt 10.0)  . #(,(delay (ly:font-load "ecss8"))
-                  ,(delay (ly:font-load "ecss10"))
-                  ,(delay (ly:font-load "ecss12"))
-                  ,(delay (ly:font-load "ecss17")))))
-     (#(typewriter upright medium) 
-      . (,(ly:pt 10.0) . #(,(delay (ly:font-load "ectt8"))
-                 ,(delay (ly:font-load "ectt10"))
-                 ,(delay (ly:font-load "ectt12"))))))))
+               #(,(delay (ly:system-font-load "emmentaler-11"))
+                 ,(delay (ly:system-font-load "emmentaler-13"))                  
+                 ,(delay (ly:system-font-load "emmentaler-14"))
+                 ,(delay (ly:system-font-load "emmentaler-16"))                  
+                 ,(delay (ly:system-font-load "emmentaler-18"))
+                 ,(delay (ly:system-font-load "emmentaler-20"))                  
+                 ,(delay (ly:system-font-load "emmentaler-23"))                  
+                 ,(delay (ly:system-font-load "emmentaler-26"))))
+     (fetaBraces ,(ly:pt 20.0)
+                #(,(delay (ly:system-font-load "aybabtu")))))))
 
 (define-public (add-pango-fonts node lily-family family factor)
   (define (add-node shape series)
@@ -311,7 +169,6 @@
                (font-series . ,series)
                (font-encoding . latin1) ;; ugh.
                )
-             
              `(,(ly:pt (* factor 11.0))
                . #(,(cons
                     (ly:pt 12)
@@ -327,24 +184,6 @@
   (add-node 'italic 'normal)
   (add-node 'italic 'bold))
 
-(define-public (make-cmr-tree factor)
-  (let*
-      ((n (make-font-tree-node 'font-encoding 'fetaMusic))
-       (module (resolve-module '(scm kpathsea)))
-       (find (eval 'ly:kpathsea-find-file module))
-       )
-    (add-music-fonts n factor)
-    (add-cmr-fonts n factor)
-    
-    (if (find "lmr10.pfb")
-       (add-cork-lm-fonts n factor))
-    (if (find "ecrm10.pfa")
-       (add-ec-fonts n factor))
-    n))
-
-
-
-
 (define-public (make-pango-font-tree roman-str sans-str typewrite-str factor)
   (let ((n (make-font-tree-node 'font-encoding 'fetaMusic)))
     (add-music-fonts n factor)
@@ -353,7 +192,6 @@
     (add-pango-fonts n 'typewriter typewrite-str factor)
     n))
 
-
 (define-public (make-century-schoolbook-tree factor)
   (make-pango-font-tree
     "Century Schoolbook L"