From 5d558a51540e3358c6cfe4fcd20ac3bdce2a277d Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Wed, 27 Mar 2002 00:48:21 +0000
Subject: [PATCH] lilypond-1.3.125

---
 input/test/rhythmic-staff.ly  | 6 ++++--
 lily/text-spanner-engraver.cc | 4 +++-
 lily/text-spanner.cc          | 2 ++
 lily/translator-group.cc      | 2 +-
 scm/clef.scm                  | 5 ++---
 scripts/ly2dvi.py             | 3 +++
 6 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/input/test/rhythmic-staff.ly b/input/test/rhythmic-staff.ly
index 44a5c6d184..313e700e07 100644
--- a/input/test/rhythmic-staff.ly
+++ b/input/test/rhythmic-staff.ly
@@ -1,7 +1,9 @@
+
 \score{
   \context RhythmicStaff {
     \notes\relative c''{ 
-      \clef percussion;
+      \property RhythmicStaff.clefGlyph = #"clefs-percussion"
+	\property RhythmicStaff.clefPosition = #0
       \time 4/4; 
       r4 r g2 | r4 g r2 | g1:32 | r1 |
     }
@@ -9,7 +11,7 @@
   \paper{
     \translator{
       \RhythmicStaffContext
-      \consists "Clef_engraver"; % Doesn't work!?
+      \consists "Clef_engraver";
     }
   }
 }
diff --git a/lily/text-spanner-engraver.cc b/lily/text-spanner-engraver.cc
index 69b6056406..4f339eb92c 100644
--- a/lily/text-spanner-engraver.cc
+++ b/lily/text-spanner-engraver.cc
@@ -86,7 +86,6 @@ Text_spanner_engraver::try_music (Music *m)
 void
 Text_spanner_engraver::create_grobs ()
 {
-  /////
   if (req_drul_[STOP])
     {
       if (!span_)
@@ -103,6 +102,7 @@ Text_spanner_engraver::create_grobs ()
 	  finished_ = span_;
 	  span_ = 0;
 	  current_req_ = 0;
+	  req_drul_[STOP] = 0;
 	}
     }
 
@@ -126,7 +126,9 @@ Text_spanner_engraver::create_grobs ()
 	  Side_position::set_axis (span_, Y_AXIS);
 	  Grob *e = unsmob_grob (get_property ("currentMusicalColumn"));
 	  span_->set_bound (LEFT, e);
+	  
 	  announce_grob (span_, req_drul_[START]);
+	  req_drul_[START] = 0;
 	}
     }
 }
diff --git a/lily/text-spanner.cc b/lily/text-spanner.cc
index 22d400cc6b..ba1e420fc1 100644
--- a/lily/text-spanner.cc
+++ b/lily/text-spanner.cc
@@ -1,4 +1,5 @@
 /*
+
   text-spanner.cc -- implement Text_spanner
 
   source file of the GNU LilyPond music typesetter
@@ -47,6 +48,7 @@ Text_spanner::brew_molecule (SCM smob)
   Direction d = LEFT;
   do
     {
+      extra_off [d]=0;
       Item *b = spanner->get_bound (d);
       broken[d] = b->break_status_dir () != CENTER;
 
diff --git a/lily/translator-group.cc b/lily/translator-group.cc
index 367e6d1277..1ae75fc8b9 100644
--- a/lily/translator-group.cc
+++ b/lily/translator-group.cc
@@ -459,7 +459,7 @@ void
 add_trans_scm_funcs ()
 {
   scm_make_gsubr ("ly-get-trans-property", 2, 0, 0, (Scheme_function_unknown)ly_get_trans_property);
-  scm_make_gsubr ("ly-get-trans-property", 3, 0, 0, (Scheme_function_unknown)ly_get_trans_property);
+  scm_make_gsubr ("ly-set-trans-property", 3, 0, 0, (Scheme_function_unknown)ly_set_trans_property);
 }
 
 ADD_SCM_INIT_FUNC(trans_scm, add_trans_scm_funcs);
diff --git a/scm/clef.scm b/scm/clef.scm
index e3c3215e1f..d9eecfb6b9 100644
--- a/scm/clef.scm
+++ b/scm/clef.scm
@@ -89,11 +89,10 @@
 	   (iterator-ctor . ,Property_iterator::constructor)
 	   (value . ,(caddr e))
 	   )
-	  ,(if (not (equal? oct 0))
-	       `((symbol . clefOctavation)
+	  ((symbol . clefOctavation)
 		 (iterator-ctor . ,Property_iterator::constructor)
 		 (value . ,oct)
-	       ))
+	       )
 	  )
 	(begin
 	  (ly-warn (string-append "Unknown clef type `" cl "'\nSee scm/lily.scm for supported clefs"))
diff --git a/scripts/ly2dvi.py b/scripts/ly2dvi.py
index 00ce2e48af..f0c91aad99 100644
--- a/scripts/ly2dvi.py
+++ b/scripts/ly2dvi.py
@@ -337,6 +337,9 @@ class TeXOutput:
 
         outfile=this.__base + '.dvi'
         if Props.get('output') != '':
+	    if not os.path.exists(Props.get('output')):
+		    os.mkdir(Props.get('output'))
+
             outfile = os.path.join(Props.get('output'), outfile )
             
         this.write(r"""
-- 
2.39.5