From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Thu, 8 Feb 2001 17:32:12 +0000 (+0100)
Subject: patch::: 1.3.128.jcn4
X-Git-Tag: release/1.3.129~1
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=13233115f073866390b6222eda6ae1c64bbe3c87;p=lilypond.git

patch::: 1.3.128.jcn4
---

diff --git a/VERSION b/VERSION
index a8c8385811..e98ed0f9d0 100644
--- 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 ef3576f881..158a43edd3 100644
--- 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 398a332600..8a99b90bdb 100644
--- 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 b3414f531d..47d40f5838 100644
--- 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 a2540e9175..15dc21ae6e 100644
--- 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 df810a0048..79e68d3641 100644
--- 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))