patch::: 1.3.128.jcn4

diff --git a/VERSION b/VERSION
index a8c83858118d45db8b783fb9fab34f6be002c082..e98ed0f9d098228c465b0b80b4f2106eb284ffc5 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=128
-MY_PATCH_LEVEL=jcn3
+MY_PATCH_LEVEL=jcn4
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc
index ef3576f881d273694f525a2472376ddd6b9f1b42..158a43edd30ce4c0bc7745c76c17c6ce867f2045 100644 (file)
--- a/lily/dynamic-engraver.cc
+++ b/lily/dynamic-engraver.cc
@@ -315,6 +315,7 @@ Dynamic_engraver::typeset_all ()
   
   if (script_p_)
     {
+      Side_position::add_staff_support (script_p_);
       typeset_grob (script_p_);
       script_p_ = 0;
     }

diff --git a/lily/thread-devnull-engraver.cc b/lily/thread-devnull-engraver.cc
index 398a332600a2f4a090b0462074b8091ce3a97f0d..8a99b90bdb874c09d158d9a895725beaf973bc2f 100644 (file)
--- a/lily/thread-devnull-engraver.cc
+++ b/lily/thread-devnull-engraver.cc
@@ -33,10 +33,10 @@ Thread_devnull_engraver::acknowledge_grob (Grob_info i)
 #endif
 
   if (gh_equal_p (s, ly_symbol2scm ("allways"))
-      || (s = SCM_EOL
+      || (s == SCM_EOL
          && daddy_trans_l_->id_str_.left_str (3) == "two"
          && (to_boolean (get_property ("unison"))
              || to_boolean (get_property ("unisilence")))
          && to_boolean (get_property ("soloADue"))))
-    i.elem_l_->suicide ();
+      i.elem_l_->suicide ();
 }

diff --git a/lily/voice-devnull-engraver.cc b/lily/voice-devnull-engraver.cc
index b3414f531d2475bbd6494aa2b20f625d49305ef0..47d40f5838c0038c2b4f521f6414c51c4f89e5c1 100644 (file)
--- a/lily/voice-devnull-engraver.cc
+++ b/lily/voice-devnull-engraver.cc
@@ -42,8 +42,8 @@ Voice_devnull_engraver::try_music (Music *m)
     return;
 #endif
 
-  if (gh_equal_p (s, ly_symbol2scm ("allways"))
-      || (s == SCM_EOL
+  if (s == ly_symbol2scm ("allways")
+    || (s == SCM_EOL
          && daddy_trans_l_->id_str_.left_str (3) == "two"
          && (to_boolean (get_property ("unison"))
              || to_boolean (get_property ("unisilence")))))
@@ -52,8 +52,7 @@ Voice_devnull_engraver::try_music (Music *m)
        {
          if (Span_req *s = dynamic_cast <Span_req *> (m))
            {
-             if (scm_equal_p (s->get_mus_property ("span-type"),
-                              ly_str02scm ( *p)) == SCM_BOOL_T)
+             if (s->get_mus_property ("span-type") == ly_symbol2scm (*p))
                {
                  return true;
                }
@@ -91,11 +90,12 @@ Voice_devnull_engraver::acknowledge_grob (Grob_info i)
          && daddy_trans_l_->id_str_.left_str (3) == "two"
          && (to_boolean (get_property ("unison"))
              || to_boolean (get_property ("unisilence")))))
-    for (char const **p = junk_interfaces; *p; p++)
-      if (i.elem_l_->has_interface (ly_symbol2scm (*p)))
-       {
-         i.elem_l_->suicide ();
-         return;
-       }
+    
+      for (char const **p = junk_interfaces; *p; p++)
+       if (i.elem_l_->has_interface (ly_symbol2scm (*p)))
+         {
+           i.elem_l_->suicide ();
+           return;
+         }
 }
  

diff --git a/lilypond-mode.el b/lilypond-mode.el
index a2540e91750edc7c6d176e5a8931aa9237974979..15dc21ae6e24dc4aa4317b9b17a509399bfcb961 100644 (file)
--- a/lilypond-mode.el
+++ b/lilypond-mode.el
@@ -340,10 +340,10 @@ command."
 (if LilyPond-mode-map
     ()
   (setq LilyPond-mode-map (make-sparse-keymap))
-  (define-key LilyPond-mode-map "\C-c\C-c" 'LilyPond-command-master)
   (define-key LilyPond-mode-map "\C-c\C-r" 'LilyPond-command-region)
   (define-key LilyPond-mode-map "\C-c\C-b" 'LilyPond-command-buffer)
   (define-key LilyPond-mode-map "\C-c\C-k" 'LilyPond-kill-job)
+  (define-key LilyPond-mode-map "\C-c\C-c" 'LilyPond-command-master)
   )
 
 ;;; Menu Support
@@ -408,7 +408,18 @@ command."
     (funcall LilyPond-command-current)))
 
 (defun LilyPond-mode ()
-  "Major mode for editing LilyPond music files."
+  "Major mode for editing LilyPond music files.
+
+This mode knows about LilyPond keywords and line comments, not about
+indentation or block comments.  It features easy compilation, error
+finding and viewing of a LilyPond source buffer or region.
+
+COMMANDS
+\\{LilyPond-mode-map}
+VARIABLES
+
+LilyPond-command-alist\t\talist from name to command
+LilyPond-xdvi-command\t\tcommand to display dvi files -- bit superfluous"
   (interactive)
   ;; set up local variables
   (kill-all-local-variables)

diff --git a/scm/grob-description.scm b/scm/grob-description.scm
index df810a004842e80041588d9c184598205f2cdf70..79e68d364102767774b19b25921434876a04cda8 100644 (file)
--- a/scm/grob-description.scm
+++ b/scm/grob-description.scm
@@ -178,7 +178,8 @@
        ))
        
        (DynamicLineSpanner . (
-               (axes . ( 1))
+               (axes . (1))
+               (direction . -1)
                (padding . 0.6)
                (minimum-space . 1.2)
                (meta . ,(grob-description "DynamicLineSpanner" dynamic-interface axis-group-interface side-position-interface))