From f817c9010f8016d5e9c19ec3b167e7d485538eb3 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sat, 8 Jan 2005 09:42:51 +0000 Subject: [PATCH] * scm/output-svg.scm: * scm/output-gnome.scm: s/bigcheese/emmentaler. * lily/score-engraver.cc (MUSIC_FONT): Use emmentaler20. --- ChangeLog | 7 +++++++ lily/score-engraver.cc | 2 +- scm/output-gnome.scm | 12 ++++++------ scm/output-svg.scm | 14 +++++++------- 4 files changed, 21 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9078c35e0f..50f3846903 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-01-08 Jan Nieuwenhuizen + + * scm/output-svg.scm: + * scm/output-gnome.scm: s/bigcheese/emmentaler. + + * lily/score-engraver.cc (MUSIC_FONT): Use emmentaler20. + 2005-01-07 Jan Nieuwenhuizen * lily/general-scheme.cc (LY_DEFINE): Use snprintf (WAS: sprintf). diff --git a/lily/score-engraver.cc b/lily/score-engraver.cc index d44f9d3588..bcc697c2f7 100644 --- a/lily/score-engraver.cc +++ b/lily/score-engraver.cc @@ -92,7 +92,7 @@ Score_engraver::finish () recurse_over_translators (context (), &Translator::finalize, UP); } -#define MUSIC_FONT "bigcheese20" +#define MUSIC_FONT "emmentaler20" /* use start/finish? diff --git a/scm/output-gnome.scm b/scm/output-gnome.scm index 15fdff495f..2251f26ca1 100644 --- a/scm/output-gnome.scm +++ b/scm/output-gnome.scm @@ -136,15 +136,15 @@ lilypond -fgnome input/simple-song.ly (let ((encoding (ly:font-encoding font)) (family (font-family font))) (or (memq encoding '(fetaMusic fetaBraces)) - (string=? (substring family 0 (min (string-length family) 9)) - "bigcheese")))) + (string=? (substring family 0 (min (string-length family) 10)) + "emmentaler")))) ;; FIXME (define-public (otf-name-mangling font family) - ;; Hmm, family is bigcheese20/26? - (if (string=? (substring family 0 (min (string-length family) 9)) - "bigcheese") - (string-append "LilyPond " (substring family 9)) + ;; Hmm, family is emmentaler20/26? + (if (string=? (substring family 0 (min (string-length family) 10)) + "emmentaler") + (string-append "LilyPond " (substring family 10)) (if (string=? family "aybabtu") "LilyPondBraces" family))) diff --git a/scm/output-svg.scm b/scm/output-svg.scm index c1d4ea4cbb..1f47b74264 100644 --- a/scm/output-svg.scm +++ b/scm/output-svg.scm @@ -114,19 +114,19 @@ ;; FIXME (define-public (otf-name-mangling font family) - ;; Hmm, family is bigcheese20/26? - (if (string=? (substring family 0 (min (string-length family) 9)) - "bigcheese") + ;; Hmm, family is emmentaler20/26? + (if (string=? (substring family 0 (min (string-length family) 10)) + "emmentaler") "LilyPond" (if (string=? family "aybabtu") "LilyPondBraces" family))) (define-public (otf-style-mangling font family) - ;; Hmm, family is bigcheese20/26? - (if (string=? (substring family 0 (min (string-length family) 9)) - "bigcheese") - (substring family 9) + ;; Hmm, family is emmentaler20/26? + (if (string=? (substring family 0 (min (string-length family) 10)) + "emmentaler") + (substring family 10) "Regular")) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -- 2.39.2