*** empty log message ***

diff --git a/lily/book.cc b/lily/book.cc
index 4b3cce04dbcf676d9eac75a4ac7fb5348ffd8aa1..2e3b263ecd5b84d4059ae4f817faa4c4c31ab499 100644 (file)
--- a/lily/book.cc
+++ b/lily/book.cc
@@ -12,7 +12,6 @@
 
 #include "lilypond-key.hh"
 #include "global-context.hh"
-#include "ly-module.hh"
 #include "main.hh"
 #include "music-iterator.hh"
 #include "music-output.hh"
@@ -117,32 +116,7 @@ Book::process (String outname, Output_def *default_def)
   return paper_book;
 }
 
-LY_DEFINE(ly_make_book, "ly:make-book",
-         2, 0, 1, (SCM paper, SCM header, SCM scores),
-         "Make a \\book of @var{paper} and @var{header} (which may be #f as well)  "
-         "containing @code{\\scores}.")
-{
-  Output_def * odef = unsmob_output_def (paper);
-  SCM_ASSERT_TYPE (odef, paper,
-                  SCM_ARG1, __FUNCTION__, "Output_def");
-
-  Book *book = new Book;
-  book->paper_ = odef;
 
-  if (ly_c_module_p (header))
-    book->header_ = header;
-  
-  for (SCM s = scores; scm_is_pair (s); s = scm_cdr (s))
-    {
-      Score *score = unsmob_score (scm_car (s));
-      if (score)
-       book->scores_.push (score);
-    }
-  
-  SCM x = book->self_scm ();
-  scm_gc_unprotect_object (x);
-  return x;
-}
   
 
 void

diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh
index 8a9a7cc24c93292a54ab7719b8739a1b99cd2f6b..13d50328fd91cd732f8427b8756157f0bf8a7a7d 100644 (file)
--- a/lily/include/lily-guile.hh
+++ b/lily/include/lily-guile.hh
@@ -13,6 +13,7 @@
 
 #include "interval.hh"
 #include "guile-compatibility.hh"
+#include "ly-module.hh"
 
 #ifndef SMOB_FREE_RETURN_VAL
 #define SMOB_FREE_RETURN_VAL(CL) 0

diff --git a/lily/lily-lexer.cc b/lily/lily-lexer.cc
index e7570dff8079059f90fffe9802a39c5ae44f7a14..446600c805175e6635f575d4ad3ba8fb4c31055d 100644 (file)
--- a/lily/lily-lexer.cc
+++ b/lily/lily-lexer.cc
@@ -19,7 +19,6 @@
 #include "source-file.hh"
 #include "main.hh"
 #include "moment.hh"
-#include "ly-module.hh"
 
 static Keyword_ent the_key_tab[] = {
   {"accepts", ACCEPTS},

diff --git a/lily/lily-parser.cc b/lily/lily-parser.cc
index e5eeb5077533ca4a74eae24a1b5f8289ba2f9c86..09781267035ec2fe422cf54c3d09bcd1cdc6854e 100644 (file)
--- a/lily/lily-parser.cc
+++ b/lily/lily-parser.cc
@@ -12,7 +12,6 @@
 #include "book.hh"
 #include "lilypond-key.hh"
 #include "lily-version.hh"
-#include "ly-module.hh"
 #include "main.hh"
 #include "lily-lexer.hh"
 #include "output-def.hh"

diff --git a/lily/ly-module.cc b/lily/ly-module.cc
index c8ccf10d74a7bc914950bcd53d7df8ed6e0da126..c93366727752f06056251fea8f2e6720ff8e704b 100644 (file)
--- a/lily/ly-module.cc
+++ b/lily/ly-module.cc
@@ -6,7 +6,6 @@
   (c) 2002--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include "ly-module.hh"
 #include "warn.hh"
 #include "main.hh"
 #include "string.hh"

diff --git a/lily/music-scheme.cc b/lily/music-scheme.cc
index b4813c5e05061861fd1f406e494df8f749016849..d3d200ad090c90bd9e99f040fb7732817cdfa50c 100644 (file)
--- a/lily/music-scheme.cc
+++ b/lily/music-scheme.cc
@@ -1,5 +1,5 @@
 /*
-  music-scheme.cc --  implement
+  music-scheme.cc -- implement Music bindings
 
   source file of the GNU LilyPond music typesetter
 
@@ -7,6 +7,8 @@
 
 */
 
+#include "duration.hh"
+#include "warn.hh"
 #include "music.hh"
 #include "pitch.hh"
 

diff --git a/lily/output-def.cc b/lily/output-def.cc
index e4614ffe11b842f4b7c6894b4f4e763bb5fb4fa0..d8eecf3f623906944ec805ff6d6902c6832db44c 100644 (file)
--- a/lily/output-def.cc
+++ b/lily/output-def.cc
@@ -12,7 +12,6 @@
 #include "file-path.hh"
 #include "global-context.hh"
 #include "interval.hh"
-#include "ly-module.hh"
 #include "main.hh"
 #include "output-def.hh"
 #include "scm-hash.hh"

diff --git a/lily/paper-book.cc b/lily/paper-book.cc
index 352ee06f0877ca68bd5721a1eb96f7e58fc9f824..503fb02218faf298399fb76419de122f8f95ddf3 100644 (file)
--- a/lily/paper-book.cc
+++ b/lily/paper-book.cc
@@ -8,7 +8,6 @@
 
 #include "paper-book.hh"
 
-#include "ly-module.hh"
 #include "main.hh"
 #include "output-def.hh"
 #include "paper-outputter.hh"

diff --git a/lily/paper-def.cc b/lily/paper-def.cc
index 7b55761d84c3d7825d97c87de05eee1c3e9bcd13..8cfdcba9bfcaa26a58eb2acf70d3a68e203f4ee2 100644 (file)
--- a/lily/paper-def.cc
+++ b/lily/paper-def.cc
@@ -7,7 +7,6 @@
 */
 
 #include "dimensions.hh"
-#include "ly-module.hh"
 #include "output-def.hh"
 #include "modified-font-metric.hh"
 #include "pango-font.hh"

diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc
index 9651f5c806b8e095a116c976279dd7bc75ad1968..7ad559bb13e6d365e2c4f0cf2443327d5c202755 100644 (file)
--- a/lily/paper-outputter.cc
+++ b/lily/paper-outputter.cc
@@ -17,7 +17,6 @@
 #include "font-metric.hh"
 #include "input-smob.hh"
 #include "lily-version.hh"
-#include "ly-module.hh"
 #include "main.hh"
 #include "output-def.hh"
 #include "paper-book.hh"

diff --git a/lily/paper-score.cc b/lily/paper-score.cc
index 4fafe399d6f4225b585fe0491a8e1051b7363700..366dba50cce47cac07770ff34f02356f435d2f76 100644 (file)
--- a/lily/paper-score.cc
+++ b/lily/paper-score.cc
@@ -10,7 +10,6 @@
 
 #include "all-font-metrics.hh"
 #include "gourlay-breaking.hh"
-#include "ly-module.hh"
 #include "main.hh"
 #include "misc.hh"
 #include "output-def.hh"

diff --git a/lily/parse-scm.cc b/lily/parse-scm.cc
index 2f55783edf46ddfdf70a6bd372b1b6ce364b9d21..f40d10abbab8fa3cc3ec6dfa53378e4e4926f395 100644 (file)
--- a/lily/parse-scm.cc
+++ b/lily/parse-scm.cc
@@ -10,7 +10,6 @@
 
 #include <cstdio>
 
-#include "ly-module.hh"
 #include "main.hh"
 #include "paper-book.hh"
 #include "source-file.hh"

diff --git a/lily/parser.yy b/lily/parser.yy
index 8df52ae600edfae4dcbedb734b1f75cf5afe4d1a..10f2108283a5acd2ae9d897baa033ffea80a0407 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -26,7 +26,6 @@ TODO:
 
 
 #include "book.hh"
-
 #include "context-def.hh"
 #include "dimensions.hh"
 #include "event.hh"
@@ -35,7 +34,6 @@ TODO:
 #include "input.hh"
 #include "lily-guile.hh"
 #include "lilypond-input-version.hh"
-#include "ly-module.hh"
 #include "main.hh"
 #include "misc.hh"
 #include "music-list.hh"

diff --git a/lily/score.cc b/lily/score.cc
index 99327e36b2885d0e9c673c054570648fe317a68e..d94bd14b5fa4e0fe2df8f6ecb132cbb8a5e2a4f7 100644 (file)
--- a/lily/score.cc
+++ b/lily/score.cc
@@ -15,7 +15,6 @@
 #include "book.hh"
 #include "cpu-timer.hh"
 #include "global-context.hh"
-#include "ly-module.hh"
 #include "ly-smobs.icc"
 #include "main.hh"
 #include "music-iterator.hh"

diff --git a/lily/text-item.cc b/lily/text-item.cc
index 066789fad871277e3b3c8b938b06eeb9da2cef13..78aecd437f7c4de14a8eec1a80223320f2ad3fe4 100644 (file)
--- a/lily/text-item.cc
+++ b/lily/text-item.cc
@@ -19,7 +19,6 @@
 #include "font-interface.hh"
 #include "output-def.hh"
 #include "modified-font-metric.hh"
-#include "ly-module.hh"
 
 
 MAKE_SCHEME_CALLBACK (Text_interface, interpret_string, 3)