From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Sat, 19 Jul 2008 19:40:22 +0000 (-0300)
Subject: Cosmetic changes to font files.
X-Git-Tag: release/2.11.53-1~7^2~3
X-Git-Url: https://git.donarmstrong.com/lilypond.git?a=commitdiff_plain;h=15986e5345edd20f0707950f4640cbbd79ced98b;p=lilypond.git

Cosmetic changes to font files.
---

diff --git a/lily/all-font-metrics-scheme.cc b/lily/all-font-metrics-scheme.cc
index a3b19e468d..685ec537e6 100644
--- a/lily/all-font-metrics-scheme.cc
+++ b/lily/all-font-metrics-scheme.cc
@@ -28,7 +28,8 @@ LY_DEFINE (ly_font_load, "ly:font-load", 1, 0, 0,
 {
   LY_ASSERT_TYPE (scm_is_string, name, 1);
   
-  Font_metric *fm = all_fonts_global->find_font (ly_scm2string (name));
+  string name_str = ly_scm2string (name);
+  Font_metric *fm = all_fonts_global->find_font (name_str);
 
   return fm->self_scm ();
 }
diff --git a/lily/all-font-metrics.cc b/lily/all-font-metrics.cc
index 8a1143a537..3792b353db 100644
--- a/lily/all-font-metrics.cc
+++ b/lily/all-font-metrics.cc
@@ -104,7 +104,6 @@ Open_type_font *
 All_font_metrics::find_otf (string name)
 {
   SCM sname = ly_symbol2scm (name.c_str ());
-  SCM name_string = ly_string2scm (name);
   SCM val;
   if (!otf_dict_->try_retrieve (sname, &val))
     {
@@ -124,6 +123,7 @@ All_font_metrics::find_otf (string name)
 	progress_indication ("]");
 
       unsmob_metrics (val)->file_name_ = file_name;
+      SCM name_string = ly_string2scm (name);
       unsmob_metrics (val)->description_ = scm_cons (name_string,
 						     scm_from_double (1.0));
       otf_dict_->set (sname, val);
diff --git a/lily/output-def-scheme.cc b/lily/output-def-scheme.cc
index 91a7933d00..56e7725675 100644
--- a/lily/output-def-scheme.cc
+++ b/lily/output-def-scheme.cc
@@ -135,7 +135,6 @@ LY_DEFINE (ly_paper_get_number, "ly:paper-get-number", 2, 0, 0,
 	   (SCM layout_smob, SCM name),
 	   "Return the layout variable @var{name}.")
 {
- 
   LY_ASSERT_SMOB (Output_def, layout_smob, 1);
   Output_def *layout = unsmob_output_def (layout_smob);
   return scm_from_double (layout->get_dimension (name));