* scm/output-svg.scm:

* scm/output-gnome.scm: s/bigcheese/emmentaler.

* lily/score-engraver.cc (MUSIC_FONT): Use emmentaler20.

diff --git a/ChangeLog b/ChangeLog
index 9078c35e0f568cd3b8637fea37e5e1c720e8e064..50f3846903b0fd229e1086111090fbcbe8b58c66 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-01-08  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * scm/output-svg.scm: 
+       * scm/output-gnome.scm: s/bigcheese/emmentaler.
+
+       * lily/score-engraver.cc (MUSIC_FONT): Use emmentaler20.
+
 2005-01-07  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * lily/general-scheme.cc (LY_DEFINE): Use snprintf (WAS: sprintf).

diff --git a/lily/score-engraver.cc b/lily/score-engraver.cc
index d44f9d3588a24c860113544ac3cd39475d71b966..bcc697c2f764114b7236b521f5aa7e05f5257c24 100644 (file)
--- 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 15fdff495fb4b9d8dff4bfd03dc46b5360dfde62..2251f26ca13b5eed29c1789dfea3c52e67c9777b 100644 (file)
--- 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 c1d4ea4cbb09382f0a65705bf9beb13b922597ce..1f47b74264072b622061d0c9361c896591545ae3 100644 (file)
--- 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"))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;