From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Wed, 3 Jan 2007 20:39:14 +0000 (+0100)
Subject: coverage fixes.
X-Git-Tag: release/2.11.9-1~49
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=190f20aa82d91374e46f652c5272c216ebd02206;p=lilypond.git

coverage fixes.
---

diff --git a/lily/font-metric.cc b/lily/font-metric.cc
index 03625cc946..a57d905b27 100644
--- a/lily/font-metric.cc
+++ b/lily/font-metric.cc
@@ -187,12 +187,9 @@ Font_metric::word_stencil (string str) const
 Stencil
 Font_metric::text_stencil (string str) const
 {
-  SCM lst = scm_list_3 (ly_symbol2scm ("text"),
-			this->self_scm (),
-			scm_makfrom0str (str.c_str ()));
-
-  Box b = text_dimension (str);
-  return Stencil (b, lst);
+  (void) str;
+  assert (false);
+  return Stencil (Box (), SCM_EOL);
 }
 
 Box
diff --git a/lily/grob-pitch-tuple.cc b/lily/grob-pitch-tuple.cc
deleted file mode 100644
index eb72a367e1..0000000000
--- a/lily/grob-pitch-tuple.cc
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-  grob-pitch-tuple.cc -- implement Grob_pitch_tuple
-
-  source file of the GNU LilyPond music typesetter
-
-  (c) 2001--2006  Han-Wen Nienhuys <hanwen@xs4all.nl>
-*/
-
-#include "grob-pitch-tuple.hh"
-
-#include "music.hh"
-
-int compare (Grob_pitch_tuple const &a, Grob_pitch_tuple const &b)
-{
-  return Grob_pitch_tuple::time_compare (a, b);
-}
-
-Grob_pitch_tuple::Grob_pitch_tuple ()
-{
-  head_ = 0;
-  end_ = 0;
-}
-
-Grob_pitch_tuple::Grob_pitch_tuple (Grob *h, Music *m, Moment mom)
-{
-  head_ = h;
-  pitch_ = *unsmob_pitch (m->get_property ("pitch"));
-  end_ = mom;
-}
-
-/*
-  signed compare, should use pitch<?
-*/
-int
-Grob_pitch_tuple::pitch_compare (Grob_pitch_tuple const &h1,
-				 Grob_pitch_tuple const &h2)
-{
-  return Pitch::compare (h1.pitch_, h2.pitch_);
-}
-
-int
-Grob_pitch_tuple::time_compare (Grob_pitch_tuple const &h1,
-				Grob_pitch_tuple const &h2)
-{
-  return Moment::compare (h1.end_, h2.end_);
-}
diff --git a/lily/hara-kiri-group-spanner.cc b/lily/hara-kiri-group-spanner.cc
index 90a06f145a..061b472126 100644
--- a/lily/hara-kiri-group-spanner.cc
+++ b/lily/hara-kiri-group-spanner.cc
@@ -119,15 +119,6 @@ Hara_kiri_group_spanner::consider_suicide (Grob *me)
   We can't rely on offsets and dimensions of elements in a hara-kiri
   group. Use a callback to make sure that hara-kiri has been done
   before asking for offsets.  */
-MAKE_SCHEME_CALLBACK (Hara_kiri_group_spanner, after_line_breaking, 1);
-SCM
-Hara_kiri_group_spanner::after_line_breaking (SCM smob)
-{
-  Grob *me = unsmob_grob (smob);
-  consider_suicide (me);
-  return SCM_UNSPECIFIED;
-}
-
 MAKE_SCHEME_CALLBACK (Hara_kiri_group_spanner, force_hara_kiri_callback, 1);
 SCM
 Hara_kiri_group_spanner::force_hara_kiri_callback (SCM smob)
diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc
index 8ba98a4a69..11d21765a2 100644
--- a/lily/lily-guile.cc
+++ b/lily/lily-guile.cc
@@ -335,37 +335,6 @@ ly_scm2offsets (SCM s)
   ALIST
 */
 
-/* looks the key up in the cdrs of the alist-keys
-   - ignoring the car and ignoring non-pair keys.
-   Returns first match found, i.e.
-
-   alist = ((1 . 10)
-   ((1 . 2) . 11)
-   ((2 . 1) . 12)
-   ((3 . 0) . 13)
-   ((4 . 1) . 14) )
-
-   I would like (ly_assoc_cdr 1) to return 12 - because it's the first
-   element with the cdr of the key = 1.  In other words (alloc_cdr key)
-   corresponds to call
-
-   (alloc (anything . key))
-*/
-SCM
-ly_assoc_cdr (SCM key, SCM alist)
-{
-  if (scm_is_pair (alist))
-    {
-      SCM trykey = scm_caar (alist);
-      if (scm_is_pair (trykey)
-	  && to_boolean (scm_equal_p (key, scm_cdr (trykey))))
-	return scm_car (alist);
-      return ly_assoc_cdr (key, scm_cdr (alist));
-    }
-  return SCM_BOOL_F;
-}
-
-
 bool
 alist_equal_p (SCM a, SCM b)
 {
diff --git a/lily/lyric-combine-music-iterator.cc b/lily/lyric-combine-music-iterator.cc
index 85e72d3197..61500e8af2 100644
--- a/lily/lyric-combine-music-iterator.cc
+++ b/lily/lyric-combine-music-iterator.cc
@@ -15,6 +15,9 @@
 #include "music-iterator.hh"
 #include "music.hh"
 
+/*
+  Deprecated - junkme.
+ */
 class Lyric_combine_music_iterator : public Music_iterator
 {
 public:
diff --git a/lily/midi-item.cc b/lily/midi-item.cc
index 3fcdb4ca22..82283201eb 100644
--- a/lily/midi-item.cc
+++ b/lily/midi-item.cc
@@ -140,9 +140,6 @@ Midi_instrument::to_string () const
   Byte program_byte = 0;
   bool found = false;
 
-  /*
-    UGH. don't use eval.
-  */
   SCM proc = ly_lily_module_constant ("midi-program");
   SCM program = scm_call_1 (proc, ly_symbol2scm (audio_->str_.c_str ()));
   found = (program != SCM_BOOL_F);
diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc
index 243b14b43f..591f03f84c 100644
--- a/lily/tie-engraver.cc
+++ b/lily/tie-engraver.cc
@@ -9,7 +9,6 @@
 #include "engraver.hh"
 
 #include "context.hh"
-#include "grob-pitch-tuple.hh"
 #include "international.hh"
 #include "item.hh"
 #include "note-head.hh"