* flower

[lilypond.git] / lily / font-metric.cc

diff --git a/lily/font-metric.cc b/lily/font-metric.cc
index 73743ab5b23172a8a97197ada23fb9857a45498c..a08589fe815261380fb99e3efc72c2d74a46f001 100644 (file)
--- a/lily/font-metric.cc
+++ b/lily/font-metric.cc
@@ -1,11 +1,11 @@
-/*   
+/*
   font-metric.cc -- implement Font_metric
-  
+
   source file of the GNU LilyPond music typesetter
-  
+
   (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
-    Mats Bengtsson <matsb@s3.kth.se> (the ugly TeX parsing in text_dimension)
+  Mats Bengtsson <matsb@s3.kth.se> (the ugly TeX parsing in text_dimension)
 */
 
 #include "font-metric.hh"
@@ -28,24 +28,22 @@ Font_metric::design_size () const
   return 1.0 * point_constant;
 }
 
-
 Stencil
 Font_metric::find_by_name (String s) const
 {
   s.substitute_char ('-', "M");
   int idx = name_to_index (s);
   Box b;
-  
+
   SCM expr = SCM_EOL;
   if (idx >= 0)
     {
       expr = scm_list_3 (ly_symbol2scm ("named-glyph"),
                         self_scm (),
-                        scm_makfrom0str (s.to_str0 ())
-                        );
+                        scm_makfrom0str (s.to_str0 ()));
       b = get_indexed_char (idx);
     }
-  
+
   Stencil q (b, expr);
   return q;
 }
@@ -61,7 +59,6 @@ Font_metric::Font_metric (Font_metric const &)
 {
 }
 
-
 Font_metric::~Font_metric ()
 {
 }
@@ -72,13 +69,13 @@ Font_metric::count () const
   return 0;
 }
 
-Box 
+Box
 Font_metric::get_ascii_char (int) const
 {
   return Box (Interval (0, 0), Interval (0, 0));
 }
 
-Box 
+Box
 Font_metric::get_indexed_char (int k) const
 {
   return get_ascii_char (k);
@@ -104,7 +101,7 @@ Font_metric::derived_mark () const
 SCM
 Font_metric::mark_smob (SCM s)
 {
-  Font_metric *m = (Font_metric*) SCM_CELL_WORD_1 (s);
+  Font_metric *m = (Font_metric *) SCM_CELL_WORD_1 (s);
   m->derived_mark ();
   return m->description_;
 }
@@ -121,14 +118,11 @@ Font_metric::print_smob (SCM s, SCM port, scm_print_state *)
   return 1;
 }
 
-
-
 IMPLEMENT_SMOBS (Font_metric);
 IMPLEMENT_DEFAULT_EQUAL_P (Font_metric);
 IMPLEMENT_TYPE_P (Font_metric, "ly:font-metric?");
 
-
-SCM 
+SCM
 Font_metric::font_file_name () const
 {
   return scm_car (description_);
@@ -143,7 +137,6 @@ Font_metric::font_name () const
 
 #include "afm.hh"
 
-
 int
 Font_metric::index_to_ascii (int i) const
 {
@@ -174,7 +167,6 @@ Font_metric::get_indexed_char_stencil (int code) const
   return Stencil (b, at);
 }
 
-
 Offset
 Font_metric::attachment_point (String) const
 {
@@ -193,7 +185,7 @@ Font_metric::text_stencil (String str) const
   SCM lst = scm_list_3 (ly_symbol2scm ("text"),
                        this->self_scm (),
                        scm_makfrom0str (str.to_str0 ()));
-  
+
   Box b = text_dimension (str);
   return Stencil (b, lst);
 }