CVSROOT:        /cvsroot/lilypond
Module name:    lilypond
Branch:         
Changes by:     Han-Wen Nienhuys <[EMAIL PROTECTED]>    05/07/13 18:42:25

Modified files:
        lily           : context.cc program-option.cc 
Removed files:
        lily/include   : music-constructor.hh 

Log message:
        * lily/include/music-constructor.hh: remove file.
        
        * lily/context.cc (get_grob_key): nop if use_object_keys not set.
        (get_context_key): idem.
        
        * ps/music-drawing-routines.ps: remove draw_beam.
        
        * lily/lookup.cc (beam): use round_filled_polygon() for beam.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/context.cc.diff?tr1=1.57&tr2=1.58&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/program-option.cc.diff?tr1=1.10&tr2=1.11&r1=text&r2=text

Patches:
Index: lilypond/lily/context.cc
diff -u lilypond/lily/context.cc:1.57 lilypond/lily/context.cc:1.58
--- lilypond/lily/context.cc:1.57       Wed Jul 13 18:22:34 2005
+++ lilypond/lily/context.cc    Wed Jul 13 18:42:25 2005
@@ -562,6 +562,9 @@
 void
 Context::clear_key_disambiguations ()
 {
+  if (!use_object_keys)
+    return;
+  
   grob_counts_.clear ();
   context_counts_.clear ();
   for (SCM s = context_list_; scm_is_pair (s); s = scm_cdr (s))
Index: lilypond/lily/program-option.cc
diff -u lilypond/lily/program-option.cc:1.10 
lilypond/lily/program-option.cc:1.11
--- lilypond/lily/program-option.cc:1.10        Wed Jul 13 18:22:34 2005
+++ lilypond/lily/program-option.cc     Wed Jul 13 18:42:25 2005
@@ -68,7 +68,8 @@
     }
   else if (var == ly_symbol2scm ("object-keys"))
     {
-      use_object_keys = scm_from_bool (to_boolean (val));
+      use_object_keys = to_boolean (val);
+      val = scm_from_bool (to_boolean (val));
     }
 }
 


_______________________________________________
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs

Reply via email to