* Documentation/topdocs/NEWS.tely (Top): elucidate GS problem.

* scm/output-ps.scm (white-text): reinstate white-text

diff --git a/ChangeLog b/ChangeLog
index 49822590118afc811b2b911ecf2f55d347b986e8..0c2d3641670f216503297916dc894c7324041b85 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-03-01  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * Documentation/topdocs/NEWS.tely (Top): elucidate GS problem.
+
+       * scm/output-ps.scm (white-text): reinstate white-text
+

 2005-03-01  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * scm/output-ps.scm (offset-add): Remove.
 2005-03-01  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * scm/output-ps.scm (offset-add): Remove.


@@ -16,6 +22,9 @@
 
 2005-03-01  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
 
 2005-03-01  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 

+       * lily/slash-repeat-engraver.cc (try_music): always make slashes
+       if body length smaller than measure length.
+

        * scm/define-markup-commands.scm (with-url): oops. use Y extent
        for Y.
 
        * scm/define-markup-commands.scm (with-url): oops. use Y extent
        for Y.
 

diff --git a/Documentation/topdocs/NEWS.tely b/Documentation/topdocs/NEWS.tely
index e26bb67dd85a25dceb4552016f1c0760b4ca3015..143f92aaeb5dbc49a1e3174ddff7159772706eab 100644 (file)
--- a/Documentation/topdocs/NEWS.tely
+++ b/Documentation/topdocs/NEWS.tely
@@ -69,9 +69,8 @@ Individual objects may be assigned colors, for example,
 The PostScript backend is now used by default.  This backend requires
 less machinery to run, and gives more consistent results.
 
 The PostScript backend is now used by default.  This backend requires
 less machinery to run, and gives more consistent results.
 

-Please use GhostScript 8.x, as earlier versions expose bugs in PDF
-handling.
-@c what is PDF handling?
+GhostScript 8.x is required for PDF output.  Earlier versions may hang
+while converting PostScript to PDF. 

 
 @item
 Separator slashes may be inserted between systems in a score. For an
 
 @item
 Separator slashes may be inserted between systems in a score. For an

diff --git a/lily/slash-repeat-engraver.cc b/lily/slash-repeat-engraver.cc
index f6b3e8f1a981b8f30c5b910ee2a8c219e047df76..7c6111877f0ec7ba78c4c024b01a2c5e1de31d33 100644 (file)
--- a/lily/slash-repeat-engraver.cc
+++ b/lily/slash-repeat-engraver.cc
@@ -68,17 +68,16 @@ Slash_repeat_engraver::try_music (Music * m)
       == Percent_repeat_iterator::constructor_proc)
     {
       body_length_ = Repeated_music::body_get_length (m);
       == Percent_repeat_iterator::constructor_proc)
     {
       body_length_ = Repeated_music::body_get_length (m);

-      int count =   Repeated_music::repeat_count (m);
+      int count = Repeated_music::repeat_count (m);

       
       Moment now = now_mom ();
       start_mom_ = now;
       stop_mom_ = start_mom_ + Moment (count) * body_length_;
       next_moment_ = start_mom_ + body_length_;
 
       
       Moment now = now_mom ();
       start_mom_ = now;
       stop_mom_ = start_mom_ + Moment (count) * body_length_;
       next_moment_ = start_mom_ + body_length_;
 

-      Moment meas_len = robust_scm2moment (m->get_property ("measureLength"), Moment (0));
-      if (body_length_ < meas_len 
-         && meas_len.main_part_.mod_rat (body_length_.main_part_)
-         == Moment (Rational (0, 0)))
+      Moment meas_length
+       = robust_scm2moment (get_property ("measureLength"), Moment (0));
+      if (body_length_ < meas_length )

        {
          repeat_ = m;
        }
        {
          repeat_ = m;
        }

diff --git a/scm/output-ps.scm b/scm/output-ps.scm
index b8a4a9bf71cee5a5fef6bd9bb611b346c91874d2..1c725c717370b7ba87255af3ac08624a819eb155 100644 (file)
--- a/scm/output-ps.scm
+++ b/scm/output-ps.scm
@@ -310,18 +310,12 @@
    (ly:numbers->string
     (list x y radius)) " draw_white_dot"))
 
    (ly:numbers->string
     (list x y radius)) " draw_white_dot"))
 

-;; FIXME: BARF helvetica?

 (define (white-text scale s)
   (let ((mystring (string-append
                   "(" s  ") " (number->string scale)
                   " /Helvetica-Bold "
                   " draw_white_text")))
     mystring
 (define (white-text scale s)
   (let ((mystring (string-append
                   "(" s  ") " (number->string scale)
                   " /Helvetica-Bold "
                   " draw_white_text")))
     mystring

-
-    ;; FIXME
-    (ly:warn "FIXME: white-text broken for Han-Wen's $HOME install of GS 8.x")
-    
-    ""

     ))
 
 (define (zigzag-line centre? zzw zzh thick dx dy)
     ))
 
 (define (zigzag-line centre? zzw zzh thick dx dy)