CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/04/18 12:53:17
Modified files:
. : ChangeLog
lily : score.cc
Log message:
* lily/score.cc (default_rendering): use Music_output too.
* lily/text-spanner.cc: add bound-padding.
* lily/line-interface.cc (make_arrow): new function. Patch by
Jonatan Liljedahl <http://kymatica.com>
(arrows): idem.
* lily/line-spanner.cc (line_stencil): add arrows.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3458&tr2=1.3459&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/score.cc.diff?tr1=1.161&tr2=1.162&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3458 lilypond/ChangeLog:1.3459
--- lilypond/ChangeLog:1.3458 Mon Apr 18 12:37:16 2005
+++ lilypond/ChangeLog Mon Apr 18 12:53:17 2005
@@ -1,5 +1,7 @@
2005-04-18 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+ * lily/score.cc (default_rendering): use Music_output too.
+
* input/test/chord-names-languages.ly (Module): rename file.
* lily/text-spanner.cc: add bound-padding.
Index: lilypond/lily/score.cc
diff -u lilypond/lily/score.cc:1.161 lilypond/lily/score.cc:1.162
--- lilypond/lily/score.cc:1.161 Mon Apr 18 00:36:45 2005
+++ lilypond/lily/score.cc Mon Apr 18 12:53:17 2005
@@ -116,27 +116,25 @@
}
SCM context = ly_run_translator (music, scaled_def, key);
- if (Global_context *g = dynamic_cast<Global_context *>
- (unsmob_context (context)))
+ Music_output *output = unsmob_music_output (ly_format_output (context));
+
+ if (Paper_score *pscore = dynamic_cast<Paper_score*> (output))
{
- SCM systems = ly_format_output (context);
- Music_output *output = g->get_output ();
- if (systems != SCM_UNDEFINED)
- {
- /* ugh, this is strange, Paper_book without a Book object. */
- Paper_book *paper_book = new Paper_book ();
- paper_book->header_ = header;
- paper_book->paper_ = unsmob_output_def (scaled_bookdef);
-
- if (ly_c_module_p (header))
- paper_book->add_score (header);
- paper_book->add_score (systems);
+ /* ugh, this is strange, Paper_book without a Book object. */
+ Paper_book *paper_book = new Paper_book ();
+ paper_book->header_ = header;
+ paper_book->paper_ = unsmob_output_def (scaled_bookdef);
- paper_book->classic_output (ly_scm2string (outname));
- scm_gc_unprotect_object (paper_book->self_scm ());
- }
- scm_gc_unprotect_object (output->self_scm ());
+ if (ly_c_module_p (header))
+ paper_book->add_score (header);
+
+ SCM systems = pscore->get_paper_systems ();
+ paper_book->add_score (systems);
+
+ paper_book->classic_output (ly_scm2string (outname));
+ scm_gc_unprotect_object (paper_book->self_scm ());
}
+ scm_gc_unprotect_object (output->self_scm ());
scm_remember_upto_here_1 (scaled_def);
scm_remember_upto_here_1 (scaled_bookdef);
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
