/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1997--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
LilyPond is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
input_location_ = SCM_EOL;
smobify_self ();
- input_location_ = make_input (Input ());
+ input_location_ = Input ().smobbed_copy ();
}
Book::Book (Book const &s)
+ : Smob<Book> ()
{
paper_ = 0;
header_ = SCM_EOL;
paper_->unprotect ();
}
- input_location_ = make_input (*s.origin ());
+ input_location_ = s.origin ()->smobbed_copy ();
header_ = ly_make_module (false);
if (ly_is_module (s.header_))
SCM
-Book::mark_smob (SCM s)
+Book::mark_smob ()
{
- Book *book = (Book *) SCM_CELL_WORD_1 (s);
+ if (paper_)
+ scm_gc_mark (paper_->self_scm ());
+ scm_gc_mark (scores_);
+ scm_gc_mark (bookparts_);
+ scm_gc_mark (input_location_);
- if (book->paper_)
- scm_gc_mark (book->paper_->self_scm ());
- scm_gc_mark (book->scores_);
- scm_gc_mark (book->bookparts_);
- scm_gc_mark (book->input_location_);
-
- return book->header_;
-}
-
-int
-Book::print_smob (SCM, SCM p, scm_print_state *)
-{
- scm_puts ("#<Book>", p);
- return 1;
+ return header_;
}
void
}
}
else if (Text_interface::is_markup_list (scm_car (s))
- || Page_marker::unsmob (scm_car (s)))
+ || Page_marker::is_smob (scm_car (s)))
output_paper_book->add_score (scm_car (s));
else
assert (0);