From 123c5ad348d0e8003e4d063f748774c2b08c1ad1 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Fri, 28 Jan 2005 22:29:08 +0000 Subject: [PATCH] * 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. --- ChangeLog | 8 ++++++++ buildscripts/lys-to-tely.py | 2 +- lily/instrument-name-engraver.cc | 2 +- mf/feta-schrift.mf | 4 ++-- scm/framework-ps.scm | 12 +++++++----- scm/part-combiner.scm | 6 ++++-- scripts/lilypond-book.py | 4 ++-- 7 files changed, 25 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index c7e30c55d2..308549b3ca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2005-01-28 Han-Wen Nienhuys + * 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 1fd82e4cd2..defb546683 100644 --- a/buildscripts/lys-to-tely.py +++ b/buildscripts/lys-to-tely.py @@ -83,7 +83,7 @@ if files: s = r""" @ifhtml @html - + @end html @end ifhtml """ % n diff --git a/lily/instrument-name-engraver.cc b/lily/instrument-name-engraver.cc index 3d151bd30a..2152b2a0ac 100644 --- 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 (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 30945bd06f..69b7f60742 100644 --- 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 7b32617fd2..c5b12885cc 100644 --- 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 989b3c2884..65ce520d21 100644 --- 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 5aec278f0e..4617ce5ae6 100644 --- 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) -- 2.39.5