From 9e996be61a0c43717b824a27ed92c9f2d986ec0e Mon Sep 17 00:00:00 2001
From: Patrick McCarty <pnorcks@gmail.com>
Date: Mon, 22 Mar 2010 15:33:23 -0700
Subject: [PATCH 1/1] Font_metric API: code consistency.

---
 lily/font-metric.cc                  | 2 +-
 lily/include/font-metric.hh          | 2 +-
 lily/include/modified-font-metric.hh | 2 +-
 lily/include/pango-font.hh           | 2 +-
 lily/modified-font-metric.cc         | 2 +-
 lily/open-type-font.cc               | 3 +--
 lily/pango-font.cc                   | 2 +-
 7 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/lily/font-metric.cc b/lily/font-metric.cc
index 691ed2b5e5..b2ff830696 100644
--- a/lily/font-metric.cc
+++ b/lily/font-metric.cc
@@ -157,7 +157,7 @@ Font_metric::sub_fonts () const
 }
 
 Stencil
-Font_metric::text_stencil (Output_def* state,
+Font_metric::text_stencil (Output_def *state,
                            string, bool) const
 {
   (void) state;
diff --git a/lily/include/font-metric.hh b/lily/include/font-metric.hh
index 21433d2403..c55693987a 100644
--- a/lily/include/font-metric.hh
+++ b/lily/include/font-metric.hh
@@ -40,7 +40,7 @@ public:
 
   // Return stencil for given string. output_state may be modified to
   // record the font.
-  virtual Stencil text_stencil (Output_def* output_state,
+  virtual Stencil text_stencil (Output_def *output_state,
                                 string text, bool music) const;
 
   virtual string font_name () const;
diff --git a/lily/include/modified-font-metric.hh b/lily/include/modified-font-metric.hh
index 93c7634848..9d67ea4526 100644
--- a/lily/include/modified-font-metric.hh
+++ b/lily/include/modified-font-metric.hh
@@ -26,7 +26,7 @@
 struct Modified_font_metric : public Font_metric
 {
 public:
-  Stencil text_stencil (Output_def* output_state, string, bool) const;
+  Stencil text_stencil (Output_def *output_state, string, bool) const;
 
   static SCM make_scaled_font_metric (Font_metric *fm, Real magnification);
   size_t count () const;
diff --git a/lily/include/pango-font.hh b/lily/include/pango-font.hh
index 8f6e5496f4..d3cc8d4c45 100644
--- a/lily/include/pango-font.hh
+++ b/lily/include/pango-font.hh
@@ -52,7 +52,7 @@ public:
 
   Stencil pango_item_string_stencil (PangoGlyphItem const *) const;
 
-  virtual Stencil text_stencil (Output_def* output_state,
+  virtual Stencil text_stencil (Output_def *output_state,
                                 string text, bool music) const;
   virtual void derived_mark () const;
 };
diff --git a/lily/modified-font-metric.cc b/lily/modified-font-metric.cc
index 2ba488d396..7fb724425f 100644
--- a/lily/modified-font-metric.cc
+++ b/lily/modified-font-metric.cc
@@ -99,7 +99,7 @@ Modified_font_metric::derived_mark () const
 }
 
 Stencil
-Modified_font_metric::text_stencil (Output_def* state,
+Modified_font_metric::text_stencil (Output_def *state,
                                     string text, bool feta) const
 {
   Box b;
diff --git a/lily/open-type-font.cc b/lily/open-type-font.cc
index 48529ef269..de3228dbf4 100644
--- a/lily/open-type-font.cc
+++ b/lily/open-type-font.cc
@@ -241,7 +241,7 @@ Open_type_font::name_to_index (string nm) const
 size_t
 Open_type_font::index_to_charcode (size_t i) const
 {
-  return index_to_charcode_map_.at(i);
+  return index_to_charcode_map_.at (i);
 }
 
 size_t
@@ -296,7 +296,6 @@ Open_type_font::font_name () const
   return FT_Get_Postscript_Name (face_);
 }
 
-
 SCM
 Open_type_font::glyph_list () const
 {
diff --git a/lily/pango-font.cc b/lily/pango-font.cc
index 0587badadb..ac361794e7 100644
--- a/lily/pango-font.cc
+++ b/lily/pango-font.cc
@@ -300,7 +300,7 @@ Pango_font::physical_font_tab () const
 extern bool music_strings_to_paths;
 
 Stencil
-Pango_font::text_stencil (Output_def* state,
+Pango_font::text_stencil (Output_def *state,
 			  string str, bool music_string) const
 {
   /*
-- 
2.39.2