CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/09/30 21:38:18
Modified files:
. : ChangeLog
lily : collision-engraver.cc
output-property-engraver.cc
ly : engraver-init.ly
scm : define-music-properties.scm output-lib.scm
Log message:
(first-bar-number-invisible): rename from
default-bar-number-visibility
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.4142&tr2=1.4143&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/collision-engraver.cc.diff?tr1=1.55&tr2=1.56&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/output-property-engraver.cc.diff?tr1=1.47&tr2=1.48&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ly/engraver-init.ly.diff?tr1=1.250&tr2=1.251&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/define-music-properties.scm.diff?tr1=1.40&tr2=1.41&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/output-lib.scm.diff?tr1=1.84&tr2=1.85&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.4142 lilypond/ChangeLog:1.4143
--- lilypond/ChangeLog:1.4142 Wed Sep 28 08:11:55 2005
+++ lilypond/ChangeLog Fri Sep 30 21:38:16 2005
@@ -1,3 +1,13 @@
+2005-09-30 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+
+ * scm/output-lib.scm (first-bar-number-invisible): rename from
+ default-bar-number-visibility
+
+2005-09-28 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+
+ * scm/define-music-properties.scm (all-music-properties): remove
+ predicate property.
+
2005-09-28 Heikki Junes <[EMAIL PROTECTED]>
* po/fi.po: refresh.
Index: lilypond/lily/collision-engraver.cc
diff -u lilypond/lily/collision-engraver.cc:1.55
lilypond/lily/collision-engraver.cc:1.56
--- lilypond/lily/collision-engraver.cc:1.55 Sat Aug 13 21:35:23 2005
+++ lilypond/lily/collision-engraver.cc Fri Sep 30 21:38:17 2005
@@ -6,10 +6,9 @@
(c) 1997--2005 Han-Wen Nienhuys <[EMAIL PROTECTED]>
*/
+#include "engraver.hh"
#include "note-column.hh"
#include "note-collision.hh"
-
-#include "engraver.hh"
#include "axis-group-interface.hh"
class Collision_engraver : public Engraver
Index: lilypond/lily/output-property-engraver.cc
diff -u lilypond/lily/output-property-engraver.cc:1.47
lilypond/lily/output-property-engraver.cc:1.48
--- lilypond/lily/output-property-engraver.cc:1.47 Thu Aug 11 12:52:29 2005
+++ lilypond/lily/output-property-engraver.cc Fri Sep 30 21:38:18 2005
@@ -11,6 +11,9 @@
#include "grob.hh"
#include "context.hh"
+#include "translator.icc"
+
+
class Output_property_engraver : public Engraver
{
TRANSLATOR_DECLARATIONS (Output_property_engraver);
@@ -39,31 +42,13 @@
{
for (int i = props_.size (); i--;)
{
- Music * o = props_[i];
- SCM pred = o->get_property ("predicate");
-
- if (ly_is_procedure (pred))
- {
- /*
- should typecheck pred.
- */
- SCM result = scm_call_1 (pred, inf.grob ()->self_scm ());
- if (to_boolean (result))
- {
- SCM sym = o->get_property ("grob-property");
- SCM val = o->get_property ("grob-value");
- inf.grob ()->internal_set_property (sym, val);
- }
- }
- else
- {
- Context * d = inf.context ();
- SCM proc = o->get_property ("procedure");
- scm_call_3 (proc,
- inf.grob ()->self_scm (),
- d->self_scm (),
- context ()->self_scm ());
- }
+ Music *o = props_[i];
+ Context *d = inf.context ();
+ SCM proc = o->get_property ("procedure");
+ scm_call_3 (proc,
+ inf.grob ()->self_scm (),
+ d->self_scm (),
+ context ()->self_scm ());
}
}
@@ -77,12 +62,20 @@
{
}
-#include "translator.icc"
-ADD_ACKNOWLEDGER (Output_property_engraver,grob)
+ADD_ACKNOWLEDGER (Output_property_engraver,grob);
ADD_TRANSLATOR (Output_property_engraver,
-/* doc */ "Interpret Music of Output_property type, and apply a function "
-" to any Graphic objects that satisfies the predicate.",
-/* create */ "",
-/* accept */ "layout-instruction",
-/* read */ "",
-/* write */ "");
+
+ /* doc */
+ "Apply a procedure to any grob acknowledged. ",
+
+ /* create */
+ "",
+
+ /* accept */
+ "layout-instruction",
+
+ /* read */
+ "",
+
+ /* write */
+ "");
Index: lilypond/ly/engraver-init.ly
diff -u lilypond/ly/engraver-init.ly:1.250 lilypond/ly/engraver-init.ly:1.251
--- lilypond/ly/engraver-init.ly:1.250 Mon Sep 26 23:25:59 2005
+++ lilypond/ly/engraver-init.ly Fri Sep 30 21:38:18 2005
@@ -477,7 +477,7 @@
firstClef = ##t
defaultBarType = #"|"
- barNumberVisibility = #default-bar-number-visibility
+ barNumberVisibility = #first-bar-number-invisible
automaticBars = ##t
explicitClefVisibility = #all-visible
Index: lilypond/scm/define-music-properties.scm
diff -u lilypond/scm/define-music-properties.scm:1.40
lilypond/scm/define-music-properties.scm:1.41
--- lilypond/scm/define-music-properties.scm:1.40 Wed Jul 13 18:22:35 2005
+++ lilypond/scm/define-music-properties.scm Fri Sep 30 21:38:18 2005
@@ -73,7 +73,6 @@
It must take a single argument, being the context.")
(property-operations ,list?
"Do these operations for instantiating the context.")
- (predicate ,procedure? "the predicate of a \\outputproperty.")
(quoted-events ,vector? "A vector of with moment/event-list entries.")
(quoted-music-name ,string? "The name of the voice to quote.")
(quoted-voice-direction ,ly:dir? "Should the quoted voice be up-stem or
down-stem?")
Index: lilypond/scm/output-lib.scm
diff -u lilypond/scm/output-lib.scm:1.84 lilypond/scm/output-lib.scm:1.85
--- lilypond/scm/output-lib.scm:1.84 Tue Jul 19 00:04:11 2005
+++ lilypond/scm/output-lib.scm Fri Sep 30 21:38:18 2005
@@ -170,7 +170,7 @@
(let* ((bn (ly:context-property tr 'currentBarNumber)))
(ly:context-set-property! tr 'barNumberVisibility
(modulo-bar-number-visible n (modulo bn n)))))
-(define-public (default-bar-number-visibility barnum) (> barnum 1))
+(define-public (first-bar-number-invisible barnum) (> barnum 1))
;; See documentation of Item::visibility_lambda_
(define-public begin-of-line-visible
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
