patch::: 1.5.23.jcn2

* Rewrote new conditional guile >= 1.5 compilation switches, to keep
  code clean from conditionals and have a concentrated sets of
  compatitility fixes for old guile versions.

* Fixes for guile 1.4, including embedded ps.

diff --git a/CHANGES b/CHANGES
index c3a86f2e5761dfee25a258cad27567859742c55e..0d14dd62f31a744e4a3ac32503a8276c146f0238 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,11 @@
 1.5.23.jcn1
 ===========
 
-* Fixes for guile 1.4.
+* Rewrote new conditional guile >= 1.5 compilation switches, to keep
+  code clean from conditionals and have a concentrated sets of
+  compatitility fixes for old guile versions.
+
+* Fixes for guile 1.4, including embedded ps.
 
 1.5.23
 ======

diff --git a/VERSION b/VERSION
index b3f6bc031ae8ec0410aa59a947db73b2ac2037e5..67692397a302c3052aa7fd99a5833cb297d6b7d9 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=5
 PATCH_LEVEL=23
-MY_PATCH_LEVEL=jcn1
+MY_PATCH_LEVEL=jcn2
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/input/test/hara-kiri.ly b/input/test/hara-kiri.ly
index 0058297c1c828f2ea4da3ae6c72a36a724e5aa63..a9f08fd5334642584f0b80fad87b07d6d87e1363 100644 (file)
--- 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 2fb4f54cb32a6b96a61d733a71d8e8624e45f726..55aafc98c7d8cdea7102233ab888d2544626ce58 100644 (file)
--- 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 e01fd24b30ba7330910da96325600344533ee96f..a42715549180c18e07902fbcd6b479572fe0a00a 100644 (file)
--- 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 6af36d6ab7a897bb502b69a484f47c814c7f2d15..77ee7d379edf37af463332bb720c0523774a3c58 100644 (file)
--- 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 76eb7755968c7c59f4b0573f99313465f91434e0..30ec4a4ce0844002fc1808de573c5851659fbcdd 100644 (file)
--- a/scm/sketch.scm
+++ b/scm/sketch.scm
@@ -31,8 +31,12 @@
 
 
 ;; guile < 1.4 compatibility for eval
-(define (ly-eval e m)
-  (eval-in-module e m))
+(if (or (equal? (minor-version) "4")
+       (equal? (minor-version) "3.4"))
+    (define (ly-eval e m)
+      (eval-in-module e m))
+    (define (ly-eval e m)
+      (eval e m)))
 
 (define-module (scm sketch))
 (debug-enable 'backtrace)

diff --git a/scm/tex.scm b/scm/tex.scm
index 072ed76ecede1241b2d85a716b866b3747798f5a..123f7dc4480605389de42f2ea8170cb380b5f4cd 100644 (file)
--- 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"))