From ed609b7d233969a459ff1464e2bb511a4e4ea005 Mon Sep 17 00:00:00 2001 From: fred Date: Wed, 27 Mar 2002 02:04:26 +0000 Subject: [PATCH] lilypond-1.5.24 --- CHANGES | 11 ++++++++++- input/test/hara-kiri.ly | 8 ++++++-- lily/include/lily-guile.hh | 4 ++++ lily/lily-guile.cc | 5 ----- scm/ps.scm | 9 +++------ scm/sketch.scm | 16 ++++++++-------- scm/tex.scm | 18 ++++++++++++------ 7 files changed, 43 insertions(+), 28 deletions(-) diff --git a/CHANGES b/CHANGES index 5c34ea703f..5f42581186 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,12 @@ +1.5.23 +====== + +* Bugfix: be anal about slur dimensions. + +* Bugfix: insert extra margin around pixmaps. + +* lilypond-book: magnification option for EPS + 1.5.22.jcn1 =========== @@ -108,7 +117,7 @@ abc2ly fixes: - Hmm, then find that + Sketch accesses characters by name, ie, the - name characters have in default text fonts. Luckily, textrace +clefs name characters have in default text fonts. Luckily, textrace mangles the feta names too. Sadly, textrace chooses different names for characters > 128. diff --git a/input/test/hara-kiri.ly b/input/test/hara-kiri.ly index 0058297c1c..a9f08fd533 100644 --- a/input/test/hara-kiri.ly +++ b/input/test/hara-kiri.ly @@ -56,12 +56,16 @@ zager = \context Staff = zager \notes \relative c'' { } zoger = \context Staff = zoger \notes \relative c'' { + % Hmm + \property Staff.HaraKiriVerticalGroup \override + #'items-worth-living = #'(#t #t) + + \clef treble \property Staff.instrument = #"Zoger" \property Staff.instr = #"Zog." c4^"zog" d e f \skip 1*2 - \translator Staff=zager \stemDown c2 g2 @@ -85,7 +89,7 @@ zagers = \context GrandStaff < > > \paper{ - linewidth = 80.0\mm + linewidth = 100.0\mm \translator { \HaraKiriStaffContext } %uh? \translator { \OrchestralScoreContext } diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh index 2fb4f54cb3..55aafc98c7 100644 --- a/lily/include/lily-guile.hh +++ b/lily/include/lily-guile.hh @@ -51,6 +51,10 @@ #define fix_guile_1_4_scm_primitive_eval(form) scm_eval_3 (form, 1, SCM_EOL) #define scm_primitive_eval(form) fix_guile_1_4_scm_primitive_eval (form) +#define scm_current_module() (SCM)0 +#define scm_set_current_module(x) (void)x +#define scm_c_resolve_module(x) (SCM)0 + #define scm_c_define_gsubr scm_make_gsubr #define scm_c_eval_string(str) gh_eval_str ((char*)str) #define scm_c_memq scm_sloppy_memq diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc index e01fd24b30..a427155491 100644 --- a/lily/lily-guile.cc +++ b/lily/lily-guile.cc @@ -266,11 +266,8 @@ init_lily_guile (String p ) // todo: junk this. We should make real modules iso. just loading files. prepend_load_path (p + "/scm/"); - -#if GUILE_MINOR_VERSION >= 5 SCM last_mod = scm_current_module (); scm_set_current_module (scm_c_resolve_module ("guile")); -#endif init_cxx_function_smobs (); for (int i=scm_init_funcs_->size () ; i--;) @@ -280,9 +277,7 @@ init_lily_guile (String p ) progress_indication ("\n"); read_lily_scm_file ("lily.scm"); -#if GUILE_MINOR_VERSION >= 5 scm_set_current_module (last_mod); -#endif } unsigned int ly_scm_hash (SCM s) diff --git a/scm/ps.scm b/scm/ps.scm index 6af36d6ab7..77ee7d379e 100644 --- a/scm/ps.scm +++ b/scm/ps.scm @@ -16,14 +16,11 @@ (if (or (equal? (minor-version) "4") (equal? (minor-version) "3.4")) - (define-public (ps-output-expression expr port) - (display (eval-in-module expr this-module) port ) - ) + (define-public (ps-output-expression expr) + (display (eval-in-module expr this-module))) (define-public (ps-output-expression expr port) - (display (eval expr this-module) port ) - ) - ) + (display (eval expr this-module) port))) (use-modules diff --git a/scm/sketch.scm b/scm/sketch.scm index c5417abeab..80c76752e3 100644 --- a/scm/sketch.scm +++ b/scm/sketch.scm @@ -1,3 +1,4 @@ + ;;; sketch.scm -- implement Scheme output routines for Sketch ;;; ;;; source file of the GNU LilyPond music typesetter @@ -18,7 +19,6 @@ ;; elif symbol == 'char': ;; out.write ('moveto( %f %f); char(%d)' % (x,y,rest)) - ;; (define (dispatch x y expr) ;; (let ((keyword (car expr))) ;; (cond @@ -30,13 +30,13 @@ -(define-module (scm sketch) - :export (sketch-output-expression) - :no-backtrace) +(define-module (scm sketch) ) +; :export (sketch-output-expression) +; :no-backtrace (define this-module (current-module)) -(define (sketch-output-expression expr port) +(define-public (sketch-output-expression expr port) (display (dispatch expr) port)) (use-modules @@ -52,10 +52,10 @@ ((eq? keyword 'placebox) (dispatch-x-y (cadr expr) (+ 150 (caddr expr)) (cadddr expr))) (else - (apply (eval keyword this-module) (cdr expr)))))) + (apply (ly-eval keyword this-module) (cdr expr)))))) (define (dispatch-x-y x y expr) - (apply (eval (car expr) this-module) (append (list x y) (cdr expr)))) + (apply (ly-eval (car expr) this-module) (append (list x y) (cdr expr)))) @@ -117,7 +117,7 @@ (define (fontify x y name-mag-pair exp) (string-append (select-font name-mag-pair) - (apply (eval (car exp) this-module) + (apply (ly-eval (car exp) this-module) (append (list x y) (cdr exp))))) ;; (if (string? exp) exp ""))) diff --git a/scm/tex.scm b/scm/tex.scm index 072ed76ece..123f7dc448 100644 --- a/scm/tex.scm +++ b/scm/tex.scm @@ -125,12 +125,18 @@ "" ) -(define (embedded-ps expr) - (let - ((os (open-output-string))) - (ps-output-expression expr os) - (string-append "\\embeddedps{" (get-output-string os) "}") - )) +(if (or (equal? (minor-version) "4") + (equal? (minor-version) "3.4")) + (define (embedded-ps expr) + (let ((ps-string + (with-output-to-string + (lambda () (ps-output-expression expr))))) + (string-append "\\embeddedps{" ps-string "}"))) + (define (embedded-ps expr) + (let + ((os (open-output-string))) + (ps-output-expression expr os) + (string-append "\\embeddedps{" (get-output-string os) "}")))) (define (comment s) (string-append "% " s "\n")) -- 2.39.5