* scm/part-combiner.scm (analyse-spanner-states): trigger on

crescendo-end as well. (decr maybe ended with Stop cresc.). Fixes:
partcombine-diminuendo.ly

* scm/script.scm (default-script-alist): swap portato symbols.

* lily/instrument-name-engraver.cc (acknowledge_grob): typo.

* scm/framework-ps.scm (output-classic-framework): dump a
-systems.texi too
(output-classic-framework): dump multiple systems on an "infinite"
page EPS including fonts.

* scripts/lilypond-book.py (Lilypond_snippet.ly_is_outdated): use
.eps files for both texi and tex formats. Use PNG coming from
lilypond.

diff --git a/ChangeLog b/ChangeLog
index c7e30c55d218a6ca1dbf27bbbc9d207df1598257..308549b3ca154057b29c5d8876667ed2546685af 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2005-01-28  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * scm/part-combiner.scm (analyse-spanner-states): trigger on
+       crescendo-end as well. (decr maybe ended with Stop cresc.). Fixes:
+       partcombine-diminuendo.ly
+
+       * scm/script.scm (default-script-alist): swap portato symbols.
+
+       * lily/instrument-name-engraver.cc (acknowledge_grob): typo.
+
        * lily/paper-outputter-scheme.cc (LY_DEFINE):
        ly:outputter-port. New function.
 

diff --git a/buildscripts/lys-to-tely.py b/buildscripts/lys-to-tely.py
index 1fd82e4cd2331586eb9f5e91fd14c658a1959d1f..defb546683afc23b326889eccb0bbdd8ae794688 100644 (file)
--- a/buildscripts/lys-to-tely.py
+++ b/buildscripts/lys-to-tely.py
@@ -83,7 +83,7 @@ if files:
                s = r"""
 @ifhtml
 @html
-<A NAME="%s">
+<A NAME="%s"></A>
 @end html
 @end ifhtml
 """ % n

diff --git a/lily/instrument-name-engraver.cc b/lily/instrument-name-engraver.cc
index 3d151bd30a4b8677677a0869d3b1bc05c1d4f254..2152b2a0ac2349bd797a89b06ae9deab22d435f5 100644 (file)
--- a/lily/instrument-name-engraver.cc
+++ b/lily/instrument-name-engraver.cc
@@ -91,7 +91,7 @@ Instrument_name_engraver::acknowledge_grob (Grob_info i)
    */
   if (dynamic_cast<Spanner*> (i.grob_)
       && (i.grob_->internal_has_interface (ly_symbol2scm ("dynamic-interface"))
-         || i.grob_->internal_has_interface (ly_symbol2scm ("pedal-interface")))
+         || i.grob_->internal_has_interface (ly_symbol2scm ("piano-pedal-interface")))
          )
     return;
 

diff --git a/mf/feta-schrift.mf b/mf/feta-schrift.mf
index 30945bd06f013f91d59bd376a509ecdd2da37df8..69b7f60742351ccc64ff28cbb27b665937fcd488 100644 (file)
--- a/mf/feta-schrift.mf
+++ b/mf/feta-schrift.mf
@@ -460,12 +460,12 @@ def draw_portato =
 enddef;
 
 
-fet_beginchar ("portato/tenuto with staccato", "dportato");
+fet_beginchar ("portato/tenuto with staccato", "uportato");
        draw_portato;
 fet_endchar;
 
 
-fet_beginchar ("portato/tenuto with staccato", "uportato");
+fet_beginchar ("portato/tenuto with staccato", "dportato");
        draw_portato;
        y_mirror_char
 fet_endchar;

diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index 7b32617fd2b6fdb9910e9f5bb3fa2bf6f5c380ba..c5b12885ccde1939814402ed1a9161f045def670 100644 (file)
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -383,20 +383,22 @@
          )))
 
   (let* ((lines (ly:paper-book-systems book))
-        (tex-system-port (open-output-file (format "~a-systems.tex" basename)))
-        (texi-system-port (open-output-file (format "~a-systems.texi" basename)))
+        (tex-system-name (format "~a-systems.tex" basename))
+        (texi-system-name (format "~a-systems.texi" basename))
+        (tex-system-port (open-output-file tex-system-name))
+        (texi-system-port (open-output-file texi-system-name))
         (last-line (car (last-pair lines)))
         (pages (ly:paper-book-pages book))
         )
 
+    (display (format "Writing ~a\n" tex-system-name))
+    (display (format "Writing ~a\n" texi-system-name))
     (dump-lines lines 1)
     (for-each (lambda (c)
                (display (format "\\includegraphics{~a-~a.eps}%\n"
                                 basename (1+ c)) tex-system-port)
                (display (format "@image{~a-~a}%\n"
-                                basename (1+ c)) texi-system-port)
-
-               )
+                                basename (1+ c)) texi-system-port))
              (iota (length lines)))
 
     (display "@c eof" texi-system-port)

diff --git a/scm/part-combiner.scm b/scm/part-combiner.scm
index 989b3c2884de405bedb9bc3da16df8821dd3cfb7..65ce520d21fcf91c4d5dd3dc4ea54b39fff205df 100644 (file)
--- a/scm/part-combiner.scm
+++ b/scm/part-combiner.scm
@@ -127,7 +127,9 @@ Voice-state objects
          active))
 
     (define (analyse-absdyn-end active ev)
-      (if (equal? (ly:music-property ev 'name) 'AbsoluteDynamicEvent)
+      (if (or (equal? (ly:music-property ev 'name) 'AbsoluteDynamicEvent)
+             (and (equal? (ly:music-property ev 'name) 'CrescendoEvent)
+                  (equal? STOP (ly:music-property ev 'span-direction))))
          (assoc-remove! (assoc-remove! active 'cresc) 'decr)
          active))
     
@@ -428,7 +430,7 @@ the mark when there are no spanners active."
 
     (analyse-spanner-states voice-state-vec1)
     (analyse-spanner-states voice-state-vec2)
-    (if #f
+    (if #t
        (begin
          (display voice-state-vec1)
          (display "***\n")

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index 5aec278f0eba5a8c6a6af8c0c6ea1ed27c3b475c..4617ce5ae681b7a3b6596d18f6590c64be5472ac 100644 (file)
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -490,6 +490,7 @@ output = {
 @iftex
 @include %(base)s-systems.texi
 @end iftex
+
 @ifnottex
 @image{%(base)s,,,[image of music],%(ext)s}
 @end ifnottex
@@ -857,7 +858,6 @@ class Lilypond_snippet (Snippet):
                     and os.path.exists (system_file)\
                     and os.stat (system_file)[stat.ST_SIZE] \
                     and re.match ('% eof', open (system_file).readlines ()[-1])
-
                if ok and (use_hash_p \
                           or self.ly () == open (ly_file).read ()):
                        # TODO: Do something smart with target formats
@@ -927,7 +927,7 @@ class Lilypond_snippet (Snippet):
                return str
 
        def output_info (self):
-               str = self.output_print_filename (HTML)
+               str = ''
                for image in self.get_images ():
                        (base, ext) = os.path.splitext (image)