* lily/tie-performer.cc (stop_translation_timestep): reset

ties_created_. Fixes: midi-tie.ly, midi-lyrics-barcheck.ly

* lily/chord-tremolo-engraver.cc (stop_translation_timestep):
clear repeat_ directly after setting stem_tremolo_. Fixes:
tremolo-repeat.ly

* input/regression/span-bar-break.ly: new file.

* scm/define-grobs.scm (all-grob-descriptions): remove
break-visibility from SpanBar. Fixes: piano-repeat.ly

diff --git a/ChangeLog b/ChangeLog
index e9eae179a643aa2c2c6e948f44d6649929ed0996..aae8ec07ad8fe489b96fdd8e31b783adfd97f10b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,23 @@
+2004-05-31  Han-Wen Nienhuys   <hanwen@xs4all.nl>
+
+       * lily/tie-performer.cc (stop_translation_timestep): reset
+       ties_created_. Fixes: midi-tie.ly, midi-lyrics-barcheck.ly
+
+       * lily/chord-tremolo-engraver.cc (stop_translation_timestep):
+       clear repeat_ directly after setting stem_tremolo_. Fixes:
+       tremolo-repeat.ly
+
+       * input/regression/span-bar-break.ly: new file.
+
+       * scm/define-grobs.scm (all-grob-descriptions): remove
+       break-visibility from SpanBar. Fixes: piano-repeat.ly
+
 2004-05-30  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
        * python/lilylib.py (make_ps_images): only compute bbox when needed.
 
        * scripts/lilypond-book.py (process_snippets): use lily -f ps
-       files for generating pngs.
+       files for generating pngs. (failed experiment)
 
        * scm/framework-ps.scm (output-classic-framework-ps): dump EPS
        file with PFA fonts included.

diff --git a/input/regression/span-bar-break.ly b/input/regression/span-bar-break.ly
new file mode 100644 (file)
index 0000000..479429d
--- /dev/null
+++ b/input/regression/span-bar-break.ly
@@ -0,0 +1,17 @@
+\version "2.2.0"
+
+\header { texidoc = "At the beginning of a system,
+the @code{|:} repeat barline is drawn between the staves,
+but the @code{:|} is not."
+" }
+
+\score {
+  \notes \new PianoStaff <<
+    \context Staff=up   {
+       \bar "|:" r1
+       \bar ":|" \break r1
+    }
+    \context Staff=down { r r }
+  >>
+  \paper{ raggedright = ##t }
+}

diff --git a/lily/chord-tremolo-engraver.cc b/lily/chord-tremolo-engraver.cc
index 7048eb41c88c28656bf676a22a8327561f9d2eb6..ab2dc0d39a979525dc49c1382fed3a451ca73e35 100644 (file)
--- a/lily/chord-tremolo-engraver.cc
+++ b/lily/chord-tremolo-engraver.cc
@@ -206,9 +206,15 @@ Chord_tremolo_engraver::start_translation_timestep ()
 void
 Chord_tremolo_engraver::stop_translation_timestep ()
 {
-  typeset_beam ();
+  if (stem_tremolo_)
+    {
+      repeat_ = 0;
+      if (beam_)
+       programming_error ("Huh, beam and stem tremolo?");
+      stem_tremolo_ = 0;
+    }
 
-  stem_tremolo_ = 0;
+  typeset_beam ();
 }
 
 

diff --git a/lily/paper-book.cc b/lily/paper-book.cc
index 6c5c02dabb61fcd52fa9f6980b84c970d1f284b7..21abd2737db8d0843a965657e6e636ab21855e73 100644 (file)
--- a/lily/paper-book.cc
+++ b/lily/paper-book.cc
@@ -328,8 +328,11 @@ Paper_book::lines ()
       if (!title.is_empty ())
        lines_ = scm_cons (stencil2line (title, true), lines_);
 
-      SCM line_list = scm_vector_to_list (score_lines_[i].lines_); // guh.
-      lines_ = scm_append (scm_list_2 (scm_reverse (line_list), lines_));
+      if (scm_vector_p (score_lines_[i].lines_) == SCM_BOOL_T)
+       {
+         SCM line_list = scm_vector_to_list (score_lines_[i].lines_); // guh.
+         lines_ = scm_append (scm_list_2 (scm_reverse (line_list), lines_));
+       }
     }
   
   lines_ = scm_reverse (lines_);

diff --git a/lily/span-bar.cc b/lily/span-bar.cc
index b49bde8aa3b06ad78496d4e3371646559aefe331..8e87dc053010055b9d3678d73b468461d45b8c8d 100644 (file)
--- a/lily/span-bar.cc
+++ b/lily/span-bar.cc
@@ -130,8 +130,9 @@ MAKE_SCHEME_CALLBACK (Span_bar,before_line_breaking,1);
 SCM
 Span_bar::before_line_breaking (SCM smob)
 {
-  evaluate_empty (unsmob_grob (smob));
-  evaluate_glyph (unsmob_grob (smob));
+  Grob * g = unsmob_grob (smob);
+  evaluate_empty (g);
+  evaluate_glyph (g);
 
   /* No need to call Bar_line::before_line_breaking (), because the info
      in ELEMENTS already has been procced by

diff --git a/lily/tie-performer.cc b/lily/tie-performer.cc
index a90d4bab1e352bfd239c9cb74ede4726c834a3de..5bcc1987a0df73c47c620bd92e8555e6b218c44e 100644 (file)
--- a/lily/tie-performer.cc
+++ b/lily/tie-performer.cc
@@ -32,8 +32,6 @@ public:
   TRANSLATOR_DECLARATIONS (Tie_performer);
 };
 
-
-
 Tie_performer::Tie_performer ()
 {
   event_ = 0;
@@ -41,7 +39,6 @@ Tie_performer::Tie_performer ()
   ties_created_ = false;
 }
 
-
 bool
 Tie_performer::try_music (Music *mus)
 {
@@ -75,7 +72,7 @@ Tie_performer::acknowledge_audio_element (Audio_element_info inf)
 
          if (right_mus && left_mus
              && ly_c_equal_p (right_mus->get_property ("pitch"),
-                            left_mus->get_property ("pitch")))
+                              left_mus->get_property ("pitch")))
            {
              an->tie_to (th);
              ties_created_ = true;  
@@ -88,7 +85,7 @@ void
 Tie_performer::start_translation_timestep ()
 {
   context ()->set_property ("tieMelismaBusy",
-                             ly_bool2scm (heads_to_tie_.size ()));
+                           ly_bool2scm (heads_to_tie_.size ()));
       
 }
 
@@ -99,6 +96,7 @@ Tie_performer::stop_translation_timestep ()
     {
       heads_to_tie_.clear ();
       last_event_ = 0;
+      ties_created_ = false;
     }
   
   if (event_)

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index b7cdfff34b737c085a8d7d5e9db4e5f3f5a983a5..dff0c8b851b579c32cf1f2da667c07f11e0fb88b 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -868,7 +868,6 @@
        (break-align-symbol . staff-bar)
        (bar-size-procedure . ,Span_bar::get_bar_size) 
        (print-function . ,Span_bar::print)
-       (break-visibility . ,begin-of-line-invisible)
        (X-extent-callback . ,Span_bar::width_callback)
        (Y-extent-callback . ())
        (breakable . #t)