CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/07/19 15:03:22
Modified files:
. : ChangeLog
input/regression: alignment-order.ly
lily : context-def.cc context.cc
vertical-align-engraver.cc
lily/include : context.hh
Log message:
(measure_position): measure_position() is now a
normal function.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3895&tr2=1.3896&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/input/regression/alignment-order.ly.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/context-def.cc.diff?tr1=1.42&tr2=1.43&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/context.cc.diff?tr1=1.59&tr2=1.60&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/vertical-align-engraver.cc.diff?tr1=1.64&tr2=1.65&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/include/context.hh.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3895 lilypond/ChangeLog:1.3896
--- lilypond/ChangeLog:1.3895 Tue Jul 19 14:06:34 2005
+++ lilypond/ChangeLog Tue Jul 19 15:03:20 2005
@@ -98,7 +98,7 @@
recurse_down_engravers ()
* lily/note-head.cc (internal_print): only call
- glyph-name-procedure if style != default. 3 % speed increase
(wtk2-fugue1).
+ glyph-name-procedure if style != default.
2005-07-16 Graham Percival <[EMAIL PROTECTED]>
Index: lilypond/input/regression/alignment-order.ly
diff -u lilypond/input/regression/alignment-order.ly:1.3
lilypond/input/regression/alignment-order.ly:1.4
--- lilypond/input/regression/alignment-order.ly:1.3 Sun Jun 26 22:39:13 2005
+++ lilypond/input/regression/alignment-order.ly Tue Jul 19 15:03:22 2005
@@ -21,7 +21,10 @@
}
\new Staff {
\set Staff.alignAboveContext = #"3"
- c8^"this" d_"staff" e^"above" d_"last" e^"staff" f
+ \times 4/6 {
+ \override TextScript #'padding = #3
+ c8^"this" d_"staff" e^"above" d_"last" e^"staff" f
+ }
}
>> }
>>
Index: lilypond/lily/context-def.cc
diff -u lilypond/lily/context-def.cc:1.42 lilypond/lily/context-def.cc:1.43
--- lilypond/lily/context-def.cc:1.42 Mon Jul 18 23:37:24 2005
+++ lilypond/lily/context-def.cc Tue Jul 19 15:03:22 2005
@@ -343,7 +343,7 @@
g->simple_trans_list_ = trans_list;
- context->implementation_ = g->self_scm ();
+ context->implementation_ = g;
if (dynamic_cast<Engraver *> (g))
g->simple_trans_list_ = filter_performers (g->simple_trans_list_);
else if (dynamic_cast<Performer *> (g))
Index: lilypond/lily/context.cc
diff -u lilypond/lily/context.cc:1.59 lilypond/lily/context.cc:1.60
--- lilypond/lily/context.cc:1.59 Mon Jul 18 23:37:24 2005
+++ lilypond/lily/context.cc Tue Jul 19 15:03:22 2005
@@ -94,7 +94,7 @@
init_ = false;
aliases_ = SCM_EOL;
iterator_count_ = 0;
- implementation_ = SCM_EOL;
+ implementation_ = 0;
properties_scm_ = SCM_EOL;
accepts_list_ = SCM_EOL;
context_list_ = SCM_EOL;
@@ -516,7 +516,8 @@
scm_gc_mark (me->definition_);
scm_gc_mark (me->properties_scm_);
scm_gc_mark (me->accepts_list_);
- scm_gc_mark (me->implementation_);
+ if (me->implementation_)
+ scm_gc_mark (me->implementation_->self_scm ());
return me->properties_scm_;
}
@@ -561,7 +562,7 @@
Translator_group *
Context::implementation () const
{
- return dynamic_cast<Translator_group *> (unsmob_translator_group
(implementation_));
+ return implementation_;
}
void
Index: lilypond/lily/include/context.hh
diff -u lilypond/lily/include/context.hh:1.24
lilypond/lily/include/context.hh:1.25
--- lilypond/lily/include/context.hh:1.24 Mon Jul 18 23:37:25 2005
+++ lilypond/lily/include/context.hh Tue Jul 19 15:03:22 2005
@@ -40,7 +40,7 @@
SCM context_list_;
SCM accepts_list_;
SCM aliases_;
- SCM implementation_;
+ Translator_group *implementation_;
String id_string_;
friend class Context_def;
Index: lilypond/lily/vertical-align-engraver.cc
diff -u lilypond/lily/vertical-align-engraver.cc:1.64
lilypond/lily/vertical-align-engraver.cc:1.65
--- lilypond/lily/vertical-align-engraver.cc:1.64 Mon Jul 18 23:37:25 2005
+++ lilypond/lily/vertical-align-engraver.cc Tue Jul 19 15:03:22 2005
@@ -128,10 +128,12 @@
if (arr[i] == before_grob)
{
arr.insert (added, i);
+ break ;
}
else if (arr[i] == after_grob)
{
arr.insert (added, i + 1);
+ break ;
}
}
}
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
