X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fall-font-metrics-scheme.cc;h=b29ea4bf4bfc48c885b72d7f7aefff50901752e6;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=4336e281d2a8fa70e6a4b1b60b14065098e30db9;hpb=86f3188675e6eda2358b841876d77c30f631e845;p=lilypond.git

diff --git a/lily/all-font-metrics-scheme.cc b/lily/all-font-metrics-scheme.cc
index 4336e281d2..b29ea4bf4b 100644
--- a/lily/all-font-metrics-scheme.cc
+++ b/lily/all-font-metrics-scheme.cc
@@ -1,8 +1,8 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2007--2010 Han-Wen Nienhuys <hanwen@lilypond.org>
-  
+  Copyright (C) 2007--2015 Han-Wen Nienhuys <hanwen@lilypond.org>
+
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -20,34 +20,37 @@
 
 #include "all-font-metrics.hh"
 #include "main.hh"
+#include "protected-scm.hh"
+
+All_font_metrics *all_fonts_global = 0;
+Protected_scm all_fonts_global_scm;
 
 LY_DEFINE (ly_reset_all_fonts, "ly:reset-all-fonts", 0, 0, 0,
-	   (),
-	   "Forget all about previously loaded fonts.")
+           (),
+           "Forget all about previously loaded fonts.")
 {
-  delete all_fonts_global;
   all_fonts_global = new All_font_metrics (global_path.to_string ());
+  all_fonts_global_scm = all_fonts_global->unprotect ();
 
   return SCM_UNSPECIFIED;
 }
 
-
 LY_DEFINE (ly_system_font_load, "ly:system-font-load", 1, 0, 0,
-	   (SCM 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 Emmentaler-Brace 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.")
+           (SCM 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 Emmentaler-Brace 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);
-  
+
   string name_str = ly_scm2string (name);
   Font_metric *fm = all_fonts_global->find_font (name_str);