patch::: 1.5.19.jcn1

1.5.19.jcn1
===========

* Bugfix: sketch.scm: use primitive-eval.

* Remove modules directory (again?).

1.5.19
======

diff --git a/CHANGES b/CHANGES
index e9710f65b3b4888993fb32ade25a5fda461dbdaf..fdd4c8dcf38f7e1b145923c1687efe82d733b063 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,13 @@
+1.5.19.jcn1
+===========
+
+* Bugfix: sketch.scm: use primitive-eval.
+
+* Remove modules directory (again?).
+
+1.5.19
+======
+
 1.5.18.jcn1
 ===========
 

diff --git a/GNUmakefile.in b/GNUmakefile.in
index c6d7264a0cd8d4ecdec809991b487451aa096054..8f23ce20a6af9df1e60ec0009b1e46b3e7d16399 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -10,7 +10,7 @@ depth = .
 # 
 SUBDIRS = buildscripts scripts flower lily \
        mf ly tex ps scm \
-       modules python po make intl \
+       python po make intl \
        debian $(builddir)/stepmake \
        Documentation input \
        mutopia ports

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

diff --git a/modules/GNUmakefile b/modules/GNUmakefile
index 61cfea23e503734383843eb542840dffed698bce..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/modules/GNUmakefile
+++ b/modules/GNUmakefile
@@ -1,16 +0,0 @@
-depth = ..
-
-# Hmm, name dir midi too, then?
-NAME=midi
-
-
-# compile fucks up on without autoconf -I flag.
-STEPMAKE_TEMPLATES=c install python-module
-
-INSTALLATION_FILES=$(outdir)/midi.so
-INSTALLATION_DIR=$(datadir)/python
-
-# do nothing; module ins't used yet.
-
-include $(depth)/make/stepmake.make
-

diff --git a/scm/sketch.scm b/scm/sketch.scm
index ab2e8751ca52528e08fd2044c97dda988d709643..898a646d3915ac7d7801bcf3925471684c80fe1e 100644 (file)
--- a/scm/sketch.scm
+++ b/scm/sketch.scm
@@ -12,11 +12,26 @@
   )
 
 
+;; hmm, global is global
+(define (filled-rectangle a b c d)
+  (string-append
+   (sk-numbers->string
+    (quote ,(map  mul-scale (list a 0 0 b c d))))
+   "\n"))
+
+(define global-x 0.0)
+(define global-y 0.0)
+(define global-s "")
+(define breapth 0.0)
+(define width 0.0)
+(define depth 0.0)
+(define height 0.0)
+
+(define output-scale 1.0)
+(define (mul-scale  x) (* output-scale x))
+
+
 (define (sketch-scm action-name)
-  (define global-x 0.0)
-  (define global-y 0.0)
-  (define output-scale 1.0)
-  (define (mul-scale  x) (* output-scale x))
   
   ;; alist containing fontname -> fontcommand assoc (both strings)
   (define font-alist '())
@@ -30,6 +45,12 @@
      (make-string 1 (integer->char (+ 65 i)))))
     
 
+  (define (filled-rectangle a b c d)
+    (string-append
+     (sk-numbers->string
+      (map  mul-scale (map primitive-eval (list a 0 0 b c d))))
+     "\n"))
+
   (define (select-font name-mag-pair)
     (let*
        (
@@ -150,11 +171,16 @@ layer('Layer 1',1,1,0,0,(0,0,0))
     (string-append
      (ly-number->string (* d  (/ 72.27 72))) " " s ))
 
+  ;;  urg?
   (define (placebox x y s)
+    (display "placebox: ")
+    (display x)
+    (display ", ")
+    (display y)
+    (newline)
     (set! global-x (+ x 0))
     (set! global-y (+ y 100))
-    (eval s)
-    )
+    (primitive-eval global-s))
 
   (define (bezier-sandwich l thick)
     '(string-append 
@@ -168,16 +194,20 @@ layer('Layer 1',1,1,0,0,(0,0,0))
      )
   
   (define (filledbox breapth width depth height)
-    `(string-append
-      "lw(1)\nr("
-      (sk-numbers->string (quote ,(map  mul-scale (list (+ breapth width)
-                                                0 0 
-                                                (- (+ breapth depth))
-                                                global-x
-                                                (+ global-y height)))))
-                   ")\n")
-    )
-
+    
+    (set! global-s
+         (list
+          filled-rectangle
+          (+ breapth width)
+          (- (+ breapth depth))
+          'global-x
+          (+ 'global-y height))))
+  
+  ;  (set! breapth breapth)
+  ;  (set! width width)
+  ;  (set! depth depth)
+  ;  (set! height height))
+  
   (define (stem x y z w) (filledbox x y z w))