>From 720134e89a6e2f25b2bc0859382180e181e03989 Mon Sep 17 00:00:00 2001
From: Michael Welsh Duggan <address@hidden(none)>
Date: Fri, 8 Dec 2006 19:11:17 -0500
Subject: [PATCH] Various code cleanups

---
 lily/breathing-sign.cc     |    5 -----
 lily/include/ly-smobs.icc  |    7 ++++---
 lily/ottava-engraver.cc    |    2 +-
 mf/parmesan-accidentals.mf |    2 +-
 mf/parmesan-flags.mf       |    2 +-
 mf/parmesan-generic.mf     |    3 +--
 mf/parmesan-timesig.mf     |    2 +-
 7 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/lily/breathing-sign.cc b/lily/breathing-sign.cc
index d0acbce..d243f89 100644
--- a/lily/breathing-sign.cc
+++ b/lily/breathing-sign.cc
@@ -41,14 +41,9 @@ Breathing_sign::divisio_minima (SCM smob)
 {
   Grob *me = unsmob_grob (smob);
   Real staff_space = Staff_symbol_referencer::staff_space (me);
-  Real staff_size;
 
   Real thickness = Staff_symbol_referencer::line_thickness (me);
   thickness *= robust_scm2double (me->get_property ("thickness"), 1.0);
-  if (Staff_symbol_referencer::get_staff_symbol (me))
-    staff_size = (Staff_symbol_referencer::line_count (me) - 1) * staff_space;
-  else
-    staff_size = 0.0;
 
   Real blotdiameter = me->layout ()->get_dimension (ly_symbol2scm ("blot-diameter"));
 
diff --git a/lily/include/ly-smobs.icc b/lily/include/ly-smobs.icc
index 99c09fc..b62a425 100644
--- a/lily/include/ly-smobs.icc
+++ b/lily/include/ly-smobs.icc
@@ -96,9 +96,10 @@
       This is local. We don't assign to self_scm_ directly, to assure	\
       that S isn't GC-ed from under us.					\
 									\
-									We don't use smobbed_self () to ensure that mark_smob () doesn't have to \
-									deal half-initialized objects: scm_done_malloc ( ) might trigger GC. \
-									the warning in smobs.hh is just to be doubleplus goodly sure \
+      We don't use smobbed_self () to ensure that mark_smob () doesn't  \
+      have to deal half-initialized objects: scm_done_malloc ( ) might  \
+      trigger GC.the warning in smobs.hh is just to be doubleplus       \
+      goodly sure                                                       \
     */									\
     SCM s;								\
     SCM_NEWSMOB (s, CL::smob_tag_, this);				\
diff --git a/lily/ottava-engraver.cc b/lily/ottava-engraver.cc
index 6afa928..556a349 100644
--- a/lily/ottava-engraver.cc
+++ b/lily/ottava-engraver.cc
@@ -1,5 +1,5 @@
 /*
-  text-spanner-engraver.cc -- implement Ottava_spanner_engraver
+  ottova-engraver.cc -- implement Ottava_spanner_engraver
 
   source file of the GNU LilyPond music typesetter
 
diff --git a/mf/parmesan-accidentals.mf b/mf/parmesan-accidentals.mf
index c9f8fba..c09ae5a 100644
--- a/mf/parmesan-accidentals.mf
+++ b/mf/parmesan-accidentals.mf
@@ -1,4 +1,4 @@
-% -*-Fundamental-*-
+% -%-Fundamental-%- -*-Metafont-*-
 % parmesan-accidentals.mf -- implement ancient accidentals
 % 
 % source file of LilyPond's pretty-but-neat music font
diff --git a/mf/parmesan-flags.mf b/mf/parmesan-flags.mf
index 1202080..2ee63a0 100644
--- a/mf/parmesan-flags.mf
+++ b/mf/parmesan-flags.mf
@@ -1,4 +1,4 @@
-% -*-Fundamental-*-
+% -%-Fundamental-%- -*-Metafont-*-
 % parmesan-flags.mf -- implement ancient flags
 % 
 % source file of LilyPond's pretty-but-neat music font
diff --git a/mf/parmesan-generic.mf b/mf/parmesan-generic.mf
index 0ed8a62..7114bc6 100644
--- a/mf/parmesan-generic.mf
+++ b/mf/parmesan-generic.mf
@@ -1,5 +1,4 @@
-
-% -*-Fundamental-*-
+% -%-Fundamental-%- -*-Metafont-*-
 % parmesan-generic.mf --  implement generic stuff: include lots of files,
 % but don't set dims.
 %
diff --git a/mf/parmesan-timesig.mf b/mf/parmesan-timesig.mf
index 6aa68ab..d02840b 100644
--- a/mf/parmesan-timesig.mf
+++ b/mf/parmesan-timesig.mf
@@ -1,4 +1,4 @@
-% -*-Fundamental-*-
+% -%-Fundamental-%- -*-Metafont-*-
 % parmesan-timesig.mf -- implement ancient time signatures
 % 
 % source file of LilyPond's pretty-but-neat music font
-- 
1.4.4.2