CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/04/18 13:27:48
Modified files:
. : ChangeLog
lily : music-output.cc paper-score.cc score-scheme.cc
scm : define-markup-commands.scm
Added files:
lily : paper-score-scheme.cc
Log message:
* lily/paper-score-scheme.cc (LY_DEFINE): new file.
(LY_DEFINE): ly:paper-score-paper-systems: new function
* lily/score-scheme.cc (LY_DEFINE): require music argument.
* lily/score.cc (default_rendering): use Music_output too.
* 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.3459&tr2=1.3460&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/paper-score-scheme.cc?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/music-output.cc.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/paper-score.cc.diff?tr1=1.83&tr2=1.84&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/score-scheme.cc.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/define-markup-commands.scm.diff?tr1=1.85&tr2=1.86&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3459 lilypond/ChangeLog:1.3460
--- lilypond/ChangeLog:1.3459 Mon Apr 18 12:53:17 2005
+++ lilypond/ChangeLog Mon Apr 18 13:27:48 2005
@@ -1,5 +1,10 @@
2005-04-18 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+ * lily/paper-score-scheme.cc (LY_DEFINE): new file.
+ (LY_DEFINE): ly:paper-score-paper-systems: new function
+
+ * lily/score-scheme.cc (LY_DEFINE): require music argument.
+
* lily/score.cc (default_rendering): use Music_output too.
* input/test/chord-names-languages.ly (Module): rename file.
Index: lilypond/lily/music-output.cc
diff -u lilypond/lily/music-output.cc:1.2 lilypond/lily/music-output.cc:1.3
--- lilypond/lily/music-output.cc:1.2 Mon Apr 18 00:36:45 2005
+++ lilypond/lily/music-output.cc Mon Apr 18 13:27:48 2005
@@ -32,7 +32,7 @@
IMPLEMENT_SMOBS (Music_output);
IMPLEMENT_DEFAULT_EQUAL_P (Music_output);
-IMPLEMENT_TYPE_P (Music_output, "ly:score?");
+IMPLEMENT_TYPE_P (Music_output, "ly:music-output?");
SCM
Music_output::mark_smob (SCM s)
Index: lilypond/lily/paper-score.cc
diff -u lilypond/lily/paper-score.cc:1.83 lilypond/lily/paper-score.cc:1.84
--- lilypond/lily/paper-score.cc:1.83 Mon Apr 18 12:10:37 2005
+++ lilypond/lily/paper-score.cc Mon Apr 18 13:27:48 2005
@@ -74,8 +74,8 @@
{
if (be_verbose_global)
message (_f ("Element count %d (spanners %d) ",
- system_->element_count (),
- system_->spanner_count ()));
+ system_->element_count (),
+ system_->spanner_count ()));
message (_ ("Preprocessing graphical objects...") + " ");
Index: lilypond/lily/score-scheme.cc
diff -u lilypond/lily/score-scheme.cc:1.7 lilypond/lily/score-scheme.cc:1.8
--- lilypond/lily/score-scheme.cc:1.7 Mon Apr 18 00:36:45 2005
+++ lilypond/lily/score-scheme.cc Mon Apr 18 13:27:48 2005
@@ -14,15 +14,17 @@
LY_DEFINE (ly_music_scorify, "ly:music-scorify",
2, 0, 0,
(SCM music, SCM parser),
- "Return MUSIC with TEXTS encapsulated in SCORE.")
+ "Return @var{music} with @var{texts} encapsulated in @var{score}.")
{
-#if 0
- SCM_ASSERT_TYPE (ly_c_music_p (music), music, SCM_ARG1, __FUNCTION__,
"music");
-#endif
+ Music *mus = unsmob_music (music);
+ SCM_ASSERT_TYPE (mus, music, SCM_ARG1, __FUNCTION__, "music");
+
Score *score = new Score;
score->set_music (music, parser);
- scm_gc_unprotect_object (score->self_scm ());
- return score->self_scm ();
+
+ SCM self = score->self_scm ();
+ scm_gc_unprotect_object (self);
+ return self;
}
LY_DEFINE (ly_score_embedded_format, "ly:score-embedded-format",
@@ -50,7 +52,7 @@
score_def = sc->defs_[i];
if (!score_def)
- return scm_c_make_vector (0, SCM_EOL);
+ return SCM_BOOL_F;
score_def = score_def->clone ();
SCM prot = score_def->self_scm ();
@@ -62,8 +64,8 @@
SCM context = ly_run_translator (sc->get_music (), score_def->self_scm (),
key);
- SCM lines = ly_format_output (context);
+ SCM output = ly_format_output (context);
scm_remember_upto_here_1 (prot);
- return lines;
+ return output;
}
Index: lilypond/scm/define-markup-commands.scm
diff -u lilypond/scm/define-markup-commands.scm:1.85
lilypond/scm/define-markup-commands.scm:1.86
--- lilypond/scm/define-markup-commands.scm:1.85 Sat Apr 16 14:55:31 2005
+++ lilypond/scm/define-markup-commands.scm Mon Apr 18 13:27:48 2005
@@ -103,14 +103,14 @@
(def-markup-command (score layout props score) (ly:score?)
"Inline an image of music."
- (let* ((systems (ly:score-embedded-format score layout)))
+ (let* ((output (ly:score-embedded-format score layout)))
- (if (= (vector-length systems) 0)
+ (if (ly:music-output? output)
+ (ly:paper-system-stencil
+ (vector-ref (ly:paper-score-paper-systems output) 0))
(begin
(ly:warning (_"no systems found in \\score markup, does it have a
\\layout block?"))
- empty-markup)
- (let* ((stencil (ly:paper-system-stencil (vector-ref systems 0))))
- (ly:stencil-aligned-to stencil Y CENTER)))))
+ empty-stencil))))
(def-markup-command (simple layout props str) (string?)
"A simple text string; @code{\\markup @{ foo @}} is equivalent with
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
