CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/04/18 12:10:37
Modified files:
. : ChangeLog
lily : book.cc paper-book.cc paper-score.cc
lily/include : paper-score.hh
Added files:
input/regression: line-arrows.ly
Log message:
* input/regression/line-arrows.ly: new file.
* lily/paper-score.cc (process): run get_paper_systems() only once.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3454&tr2=1.3455&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/input/regression/line-arrows.ly?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/book.cc.diff?tr1=1.39&tr2=1.40&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/paper-book.cc.diff?tr1=1.103&tr2=1.104&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/paper-score.cc.diff?tr1=1.82&tr2=1.83&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/include/paper-score.hh.diff?tr1=1.31&tr2=1.32&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3454 lilypond/ChangeLog:1.3455
--- lilypond/ChangeLog:1.3454 Mon Apr 18 12:06:34 2005
+++ lilypond/ChangeLog Mon Apr 18 12:10:36 2005
@@ -1,5 +1,7 @@
2005-04-18 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+ * input/regression/line-arrows.ly: new file.
+
* lily/paper-score.cc (process): run get_paper_systems() only once.
* lily/line-interface.cc (make_arrow): new function. Patch by
Index: lilypond/lily/book.cc
diff -u lilypond/lily/book.cc:1.39 lilypond/lily/book.cc:1.40
--- lilypond/lily/book.cc:1.39 Mon Apr 18 00:36:45 2005
+++ lilypond/lily/book.cc Mon Apr 18 12:10:37 2005
@@ -121,7 +121,7 @@
}
else if (Paper_score *pscore = dynamic_cast<Paper_score *>
(output))
{
- SCM systems = pscore->get_systems ();
+ SCM systems = pscore->get_paper_systems ();
if (ly_c_module_p (score->header_))
paper_book->add_score (score->header_);
paper_book->add_score (systems);
Index: lilypond/lily/include/paper-score.hh
diff -u lilypond/lily/include/paper-score.hh:1.31
lilypond/lily/include/paper-score.hh:1.32
--- lilypond/lily/include/paper-score.hh:1.31 Mon Apr 18 12:06:36 2005
+++ lilypond/lily/include/paper-score.hh Mon Apr 18 12:10:37 2005
@@ -29,7 +29,7 @@
void typeset_system (System *);
Array<Column_x_positions> calc_breaking ();
- SCM get_systems () const;
+ SCM get_paper_systems () const;
protected:
virtual void process ();
virtual void derived_mark () const;
Index: lilypond/lily/paper-book.cc
diff -u lilypond/lily/paper-book.cc:1.103 lilypond/lily/paper-book.cc:1.104
--- lilypond/lily/paper-book.cc:1.103 Tue Apr 12 22:49:28 2005
+++ lilypond/lily/paper-book.cc Mon Apr 18 12:10:37 2005
@@ -7,7 +7,7 @@
*/
#include "paper-book.hh"
-
+#include "paper-score.hh"
#include "main.hh"
#include "output-def.hh"
#include "paper-score.hh"
@@ -250,8 +250,10 @@
if (header_0_ == SCM_EOL)
header_0_ = header;
}
- else if (scm_is_vector (scm_car (s)))
+ else if (Paper_score *pscore
+ = dynamic_cast<Paper_score *> (unsmob_music_output (scm_car
(s))))
{
+
Stencil title = score_title (header);
if (title.is_empty ())
title = score_title (header_);
@@ -264,7 +266,8 @@
}
header = SCM_EOL;
- SCM system_list = scm_vector_to_list (scm_car (s));
+
+ SCM system_list = scm_vector_to_list (pscore->get_paper_systems ());
system_list = scm_reverse (system_list);
systems_ = scm_append (scm_list_2 (system_list, systems_));
}
Index: lilypond/lily/paper-score.cc
diff -u lilypond/lily/paper-score.cc:1.82 lilypond/lily/paper-score.cc:1.83
--- lilypond/lily/paper-score.cc:1.82 Mon Apr 18 12:06:36 2005
+++ lilypond/lily/paper-score.cc Mon Apr 18 12:10:37 2005
@@ -109,7 +109,7 @@
SCM
-Paper_score::get_systems () const
+Paper_score::get_paper_systems () const
{
return paper_systems_;
}
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
