Various code cleanups

diff --git a/lily/breathing-sign.cc b/lily/breathing-sign.cc
index d0acbcea05e6f29a8bcb95c7b2a682b5d12ad3c4..d243f89e4bb322c6ccad69e1e351068e6564df2b 100644 (file)
--- 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 99c09fc0435f3e51792fd3966bc507c88235d81d..b62a4259d4277d960b11fd74865e30792626b9f3 100644 (file)
--- 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 6afa928387e49ee6358aefefa26df994a8b7c6e6..556a34903b44e6a0cb196badc57a723a42cbdaf5 100644 (file)
--- 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 c9f8fba0d99b4949bc3c296cb30da9edb28b2ad8..c09ae5ae5f6c31b6ff235f2f0ee37baa075334a9 100644 (file)
--- 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 1202080108dbc23ae014258e2fb3db985621235d..2ee63a0e930a3fa0170caa65835f20230d3da2ed 100644 (file)
--- 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 0ed8a62016f267cecd400b48aa35416f4a588f09..7114bc6837dd04a9dcec261b2c61bc41cbbf6af6 100644 (file)
--- 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 6aa68ab5800a0726d7009b592a067508cf226630..d02840b57ffdd4e2ca0cd682e9811df4f85c4f56 100644 (file)
--- 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