From: Masamichi Hosoda <trueroad@trueroad.jp>
Date: Tue, 15 Sep 2015 14:39:48 +0000 (+0900)
Subject: Issue 4608: Change scheme function name for default font
X-Git-Tag: release/2.19.28-1~5^2~6
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=9bc1b1d10c48ca88fb3475b398f5afc69bafeabc;p=lilypond.git

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 54f4607628..bac5349608 100644
--- 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 5adf258831..f10809d00a 100644
--- 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 438cf80975..23ec05a70f 100644
--- 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)