patch::: 1.1.0.uu2.jcn1: kleinedebug patch

pl 0.uu2.jcn2
	- dropped stepmake/aclocal.m4
	- removed silly -lguile (BLA_LIBS, EXTRA_LIBS ??)
	- added debugging output format: -fscm

---

diff --git a/NEWS b/NEWS
index 773427906bb4cf36b1f78709f631b6ca0dfb305d..577495b1952a893b56584164edbfe90d0a3fe5bd 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,14 @@
---- ../lilypond-1.1.0.uu2/NEWS Thu Oct 29 00:59:19 1998
+--- ../lilypond-1.1.0.uu2.jcn1/NEWS    Fri Oct 30 17:01:27 1998
+++ b/NEWS      Fri Oct 30 18:15:48 1998
+@@ -1,3 +1,8 @@
+pl 0.uu2.jcn2
+       - dropped stepmake/aclocal.m4
+       - removed silly -lguile (BLA_LIBS, EXTRA_LIBS ??)
+       - added debugging output format: -fscm
+
+ pl 0.uu2.jcn1
+       - ly2dvi.py -I fix
+       - too annoying buildscripts, scripts -> bin--- ../lilypond-1.1.0.uu2/NEWS       Thu Oct 29 00:59:19 1998
 ++ b/NEWS      Fri Oct 30 17:01:27 1998
 @@ -1,3 +1,8 @@
 pl 0.uu2.jcn1

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

diff --git a/init/paper20.ly b/init/paper20.ly
index cf6e0dbe95a727b9c6f2117c1a9883ac89c43336..226cfb6a7414adfa7e84d1ab4fb259c1adfaed1d 100644 (file)
--- a/init/paper20.ly
+++ b/init/paper20.ly
@@ -19,6 +19,8 @@ paper_twenty = \paper {
         arithmetic_multiplier = 6.\pt;
        texsetting = "\\input lilyponddefs \\musixtwentydefs ";
        pssetting = "(lilyponddefs.ps) findlibfile {exch pop //systemdict /run get exec} { /undefinedfilename signalerror } ifelse\n";
+       % urg, debugging only
+       scmsetting = "(lilyponddefs.ps) findlibfile {exch pop //systemdict /run get exec} { /undefinedfilename signalerror } ifelse\n";
 
        -2 = \symboltables { \table_thirteen }  
        -1 = \symboltables { \table_sixteen }

diff --git a/lily/GNUmakefile b/lily/GNUmakefile
index e8691e9ac2e151ee5923767bca8a6d0b51140b61..cf4db4c84a3a529f325b1a939547f2ca5233fc9d 100644 (file)
--- a/lily/GNUmakefile
+++ b/lily/GNUmakefile
@@ -8,9 +8,6 @@ SUBDIRS = include
 
 MODULE_LIBS=$(depth)/lib $(depth)/flower
 
-EXTRA_LIBES=-lguile            #ugh
-BLA_LIBES=-lguile              #ugh
-
 STEPMAKE_TEMPLATES= c++ executable 
 
 include $(depth)/make/stepmake.make 

diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc
index 9e2b0978a6af3742b2754520dc6283401f30e793..ade5ef13fc8464819d496cbe0fcadc0d2f792a04 100644 (file)
--- a/lily/paper-outputter.cc
+++ b/lily/paper-outputter.cc
@@ -137,6 +137,15 @@ Paper_outputter::output_scheme (SCM scm)
       gh_display (scm); gh_newline ();
     }
 #endif
+  // urg; temporary hack to debug scheme error #unknown
+  if (String (output_global_ch) == "scm")
+    {
+//      char* c = gh_scm2newstr (scm, NULL);
+//      *outstream_l_ << c << "\n";
+//      free (c);
+       gh_display (scm); gh_newline ();
+      return;
+    }
   SCM str_scm = gh_call1 (ly_eval (scm), gh_eval_str (o.ch_l ()));
   char* c = gh_scm2newstr (str_scm, NULL);
 #ifndef NPRINT

diff --git a/stepmake/stepmake/executable-vars.make b/stepmake/stepmake/executable-vars.make
index fb32b06344fb8d676c2af8af94a494c7c78f5690..0448ee8fc63866a6d6d0853720a24c2c85a7e9ff 100644 (file)
--- a/stepmake/stepmake/executable-vars.make
+++ b/stepmake/stepmake/executable-vars.make
@@ -2,4 +2,4 @@
 LDFLAGS = $(ILDFLAGS) $(USER_LDFLAGS) $(EXTRA_LDFLAGS) $(MODULE_LDFLAGS) $($(PACKAGE)_LDFLAGS)
 
 MODULE_LIBES=$(addsuffix /$(outdir)/library.a, $(MODULE_LIBS))
-LOADLIBES = $(MODULE_LIBES) $($(PACKAGE)_LIBES) $(EXTRA_LIBES) $(BLA_LIBES)#u8gh
+LOADLIBES = $(MODULE_LIBES) $($(PACKAGE)_LIBES) $(EXTRA_LIBES)