Issue 4608: Change scheme function name for default font

This commit changes the function name for default font
because Century Schoolbook is no longer the default font.

diff --git a/input/regression/font-postscript.ly b/input/regression/font-postscript.ly
index 54f4607628980fe2d43a2a914dc27d1984b968f9..bac53496081a445f0013738234a0fa4253c5c5e9 100644 (file)
--- a/input/regression/font-postscript.ly
+++ b/input/regression/font-postscript.ly
@@ -1,7 +1,7 @@
 \header {
   texidoc = "This file demonstrates how to load different (postscript)
 fonts.  The file @file{font.scm} shows how to define the scheme-function
-@code{make-century-schoolbook-tree}."
+@code{make-default-fonts-tree}."
 }
 
 \version "2.16.0"
@@ -12,7 +12,7 @@ fonts.  The file @file{font.scm} shows how to define the scheme-function
       (baseline-skip . 2)
       (word-space . 0.6)))
 
-  #(set! fonts (make-century-schoolbook-tree 1.0))
+  #(set! fonts (make-default-fonts-tree 1.0))
 }
 
 \layout {

diff --git a/scm/font.scm b/scm/font.scm
index 5adf258831ce73c49593b1cecf0b2ed9a0775770..f10809d00aa45ffb2f06b27977635caa467b3470 100644 (file)
--- a/scm/font.scm
+++ b/scm/font.scm
@@ -276,7 +276,7 @@ used.  This is used to select the proper design size for the text fonts.
     (add-pango-fonts n 'typewriter typewrite-str factor)
     n))
 
-(define-public (make-century-schoolbook-tree factor)
+(define-public (make-default-fonts-tree factor)
   (make-pango-font-tree
    "LilyPond Serif"
    "LilyPond Sans Serif"

diff --git a/scm/paper.scm b/scm/paper.scm
index 438cf80975d65f41a63fa0459e44219f6cd6f576..23ec05a70f25715225123160ae71a352d41d6140 100644 (file)
--- a/scm/paper.scm
+++ b/scm/paper.scm
@@ -79,7 +79,7 @@
     (setm! 'text-font-size (* 11 factor))
 
     (setm! 'output-scale ss)
-    (setm! 'fonts (make-century-schoolbook-tree factor))
+    (setm! 'fonts (make-default-fonts-tree factor))
     (setm! 'staff-height staff-height)
     (setm! 'staff-space ss)