CVSROOT: /cvsroot/lilypond Module name: lilypond Branch: lilypond_2_6 Changes by: Jan Nieuwenhuizen <[EMAIL PROTECTED]> 05/08/11 13:02:02
Modified files: scm : framework-ps.scm define-grobs.scm . : ChangeLog Log message: CVSWeb URLs: http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/framework-ps.scm.diff?only_with_tag=lilypond_2_6&tr1=1.125.2.2&tr2=1.125.2.3&r1=text&r2=text http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/define-grobs.scm.diff?only_with_tag=lilypond_2_6&tr1=1.206.2.1&tr2=1.206.2.2&r1=text&r2=text http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?only_with_tag=lilypond_2_6&tr1=1.3836.2.23&tr2=1.3836.2.24&r1=text&r2=text Patches: Index: lilypond/ChangeLog diff -u lilypond/ChangeLog:1.3836.2.23 lilypond/ChangeLog:1.3836.2.24 --- lilypond/ChangeLog:1.3836.2.23 Wed Aug 10 08:18:48 2005 +++ lilypond/ChangeLog Thu Aug 11 13:02:02 2005 @@ -1,3 +1,8 @@ +2005-08-10 Jan Nieuwenhuizen <[EMAIL PROTECTED]> + + * scm/framework-ps.scm (output-framework): Backport-bugfix: use + 2.6 interface of paper-outputter. + 2005-08-10 Mats Bengtsson <[EMAIL PROTECTED]> * scm/define-markup-commands.scm (normal-text): Added 2 new Index: lilypond/scm/define-grobs.scm diff -u lilypond/scm/define-grobs.scm:1.206.2.1 lilypond/scm/define-grobs.scm:1.206.2.2 --- lilypond/scm/define-grobs.scm:1.206.2.1 Wed Jul 20 22:35:34 2005 +++ lilypond/scm/define-grobs.scm Thu Aug 11 13:02:02 2005 @@ -387,6 +387,7 @@ (X-offset-callbacks . (,Self_alignment_interface::aligned_on_self)) (self-alignment-X . 0) (no-spacing-rods . #t) + (slur-padding . 0.5) (script-priority . 100) (font-series . bold) (font-encoding . fetaDynamic) @@ -402,6 +403,7 @@ ; (font-series . bold) (font-shape . italic) (style . dashed-line) + (slur-padding . 0.5) ; need to blend with dynamic texts. (font-size . 1) @@ -421,6 +423,7 @@ (Y-offset-callbacks . (,Side_position_interface::aligned_side)) (staff-padding . 0.1) (padding . 0.6) + (slur-padding . 0.5) (minimum-space . 1.2) (direction . -1) @@ -455,6 +458,7 @@ ; sync with TextScript (?) (padding . 0.5) + (slur-padding . 0.5) (staff-padding . 0.5) (self-alignment-X . 0) (self-alignment-Y . 0) @@ -963,6 +967,7 @@ ;; This value is sensitive: if too large, staccato dots will move a ;; space a away. (padding . 0.20) + (slur-padding . 0.5) (staff-padding . 0.25) ;; (script-priority . 0) priorities for scripts, see script.scm (X-offset-callbacks . (,Self_alignment_interface::centered_on_parent)) @@ -1226,6 +1231,7 @@ ; sync with Fingering ? (padding . 0.5) + (slur-padding . 0.5) (staff-padding . 0.5) (script-priority . 200) ;; todo: add X self alignment? Index: lilypond/scm/framework-ps.scm diff -u lilypond/scm/framework-ps.scm:1.125.2.2 lilypond/scm/framework-ps.scm:1.125.2.3 --- lilypond/scm/framework-ps.scm:1.125.2.2 Sun Aug 7 07:19:12 2005 +++ lilypond/scm/framework-ps.scm Thu Aug 11 13:02:02 2005 @@ -407,12 +407,7 @@ (define-public (output-framework basename book scopes fields) (let* ((filename (format "~a.ps" basename)) - (outputter (ly:make-paper-outputter - ;; FIXME: better wrap open/open-file, - ;; content-mangling is always bad. - ;; MINGW hack: need to have "b"inary for embedding CFFs - (open-file filename "wb") - "ps")) + (outputter (ly:make-paper-outputter filename "ps")) (paper (ly:paper-book-paper book)) (pages (ly:paper-book-pages book)) (landscape? (eq? (ly:output-def-lookup paper 'landscape) #t)) @@ -455,12 +450,7 @@ (max (1+ (car box)) (caddr box)) (max (1+ (cadr box)) (cadddr box))))) - (let* ((outputter (ly:make-paper-outputter - ;; FIXME: better wrap open/open-file, - ;; content-mangling is always bad. - ;; MINGW hack: need to have "b"inary for embedding CFFs - (open-file (format "~a.eps" filename) "wb") - "ps")) + (let* ((outputter (ly:make-paper-outputter (format "~a.eps" filename) "ps")) (port (ly:outputter-port outputter)) (xext (ly:stencil-extent dump-me X)) (yext (ly:stencil-extent dump-me Y)) _______________________________________________ Lilypond-cvs mailing list Lilypond-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/lilypond-cvs