From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Sun, 13 Apr 2003 09:17:47 +0000 (+0000)
Subject: * scm/pdf.scm (use-modules): Include lily.
X-Git-Tag: release/1.7.17~31
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=d0c9c3590e371751a38be4860327bd98df612eea;p=lilypond.git

* 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 7e5cc517fe..9540db5ead 100644
--- 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 07c5b145f0..4b20a8888d 100644
--- 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 3a287439ce..19303795ef 100644
--- 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")