* scm/pdf.scm (use-modules): Include lily.

* scm/pdftex.scm (start-system): Bugfix: add closing brace (Beernd
Noordkamp).
(use-modules): Include lily.
(lily-def): Bugfix: include tex-val in let.

diff --git a/ChangeLog b/ChangeLog
index 7e5cc517fe91e9ae69520d84e5535a3322c9d14b..9540db5ead26a7bbf372e1db19e3802e00cb70f2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2003-04-13  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * scm/pdf.scm (use-modules): Include lily.
+
+       * scm/pdftex.scm (start-system): Bugfix: add closing brace (Beernd
+       Noordkamp).
+       (use-modules): Include lily.
+       (lily-def): Bugfix: include tex-val in let.
+
 2003-04-12  Heikki Junes <hjunes@cc.hut.fi>
 
        * lilypond-mode.el: sensible error if lilypond.words not found.

diff --git a/scm/pdf.scm b/scm/pdf.scm
index 07c5b145f07f4691cb543d54ef9018105a8e7318..4b20a8888d3a5937b807a0560d4903af91566ab3 100644 (file)
--- a/scm/pdf.scm
+++ b/scm/pdf.scm
@@ -7,15 +7,14 @@
 
 ;currently no font commands; this is a helper for pdftex.scm.
 
-(define-module (scm pdf)
-  )
+(define-module (scm pdf))
 
 
 (define this-module (current-module))
 
 (use-modules
  (guile)
- )
+ (lily))
 
 
 

diff --git a/scm/pdftex.scm b/scm/pdftex.scm
index 3a287439ce2214ae2e55e73091555dc3dad87926..19303795ef54ecc59bd2bee31fdc811f74eb9c02 100644 (file)
--- a/scm/pdftex.scm
+++ b/scm/pdftex.scm
@@ -15,8 +15,9 @@
 (use-modules (scm pdf)
             (guile)
             (ice-9 regex)
-            (ice-9 string-fun)   
-            )
+            (ice-9 string-fun)
+            (lily))
+
 (define font-name-alist  '())
 
 (define this-module (current-module))
@@ -192,13 +193,11 @@
 (define (lily-def key val)
   (let ((tex-key
         (regexp-substitute/global 
-             #f "_" (output-tex-string key) 'pre "X" 'post)
-            
-        ))
+             #f "_" (output-tex-string key) 'pre "X" 'post))
        (tex-val (output-tex-string val)))
     (if (equal? (sans-surrounding-whitespace tex-val) "")
        (string-append "\\let\\" tex-key "\\undefined\n")
-       (string-append "\\def\\" tex-key "{" tex-val "}%\n")))
+       (string-append "\\def\\" tex-key "{" tex-val "}%\n"))))
 
 (define (number->dim x)
   (string-append
@@ -225,7 +224,7 @@
                 "  {\\advance\\scoreshift by -\\lilypondscoreshift}%\n"
                 "\\lybox{"
                 (ly:number->string wd) "}{"
-                (ly:number->string ht) "{%\n"))
+                (ly:number->string ht) "}{%\n"))
 
 (define (stop-system) 
   "}%\n%\n\\interscoreline\n%\n")