From 7c1ee9ae5133a32f00fe0d2f59b1a6e84baa0bed Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Fri, 7 Jan 2005 12:49:05 +0000 Subject: [PATCH] *** empty log message *** --- lily/book.cc | 26 -------------------------- lily/include/lily-guile.hh | 1 + lily/lily-lexer.cc | 1 - lily/lily-parser.cc | 1 - lily/ly-module.cc | 1 - lily/music-scheme.cc | 4 +++- lily/output-def.cc | 1 - lily/paper-book.cc | 1 - lily/paper-def.cc | 1 - lily/paper-outputter.cc | 1 - lily/paper-score.cc | 1 - lily/parse-scm.cc | 1 - lily/parser.yy | 2 -- lily/score.cc | 1 - lily/text-item.cc | 1 - 15 files changed, 4 insertions(+), 40 deletions(-) diff --git a/lily/book.cc b/lily/book.cc index 4b3cce04db..2e3b263ecd 100644 --- 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 8a9a7cc24c..13d50328fd 100644 --- 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 e7570dff80..446600c805 100644 --- 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 e5eeb50775..0978126703 100644 --- 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 c8ccf10d74..c933667277 100644 --- a/lily/ly-module.cc +++ b/lily/ly-module.cc @@ -6,7 +6,6 @@ (c) 2002--2004 Han-Wen Nienhuys */ -#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 b4813c5e05..d3d200ad09 100644 --- 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 e4614ffe11..d8eecf3f62 100644 --- 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 352ee06f08..503fb02218 100644 --- 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 7b55761d84..8cfdcba9bf 100644 --- 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 9651f5c806..7ad559bb13 100644 --- 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 4fafe399d6..366dba50cc 100644 --- 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 2f55783edf..f40d10abba 100644 --- a/lily/parse-scm.cc +++ b/lily/parse-scm.cc @@ -10,7 +10,6 @@ #include -#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 8df52ae600..10f2108283 100644 --- 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 99327e36b2..d94bd14b5f 100644 --- 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 066789fad8..78aecd437f 100644 --- 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) -- 2.39.5