From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Wed, 27 Nov 2002 08:48:35 +0000 (+0000)
Subject: (run_dvips): Use ly.read_pipe () instead of
X-Git-Tag: release/1.7.9~13
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=0a036d00af13dffb6be716bef48ae4cefc21e80b;p=lilypond.git

(run_dvips): Use ly.read_pipe () instead of
os.popen.read ().
---

diff --git a/ChangeLog b/ChangeLog
index 38b675de5e..ed8ae59f1b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-11-27  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+	* scripts/ly2dvi.py (run_dvips): Use ly.read_pipe () instead of
+	os.popen.read ().
+
 2002-11-27  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
 	* scripts/ly2dvi.py (include_path): print warning if failing anything.
diff --git a/scm/sodipodi.scm b/scm/sodipodi.scm
index ff99968291..9f299d78e4 100644
--- a/scm/sodipodi.scm
+++ b/scm/sodipodi.scm
@@ -284,26 +284,26 @@
   (roundfilledbox breapth width depth height line-thickness))
 
 (define font-cruft
-  "fill:black;stroke:none;font-style:normal;font-weight:normal;text-anchor:start;writing-mode:lr;")
+  "fill:black;stroke:none;text-anchor:start;writing-mode:lr;font-weight:normal;")
 
 ;; FIXME
 (define font-alist
   `(  
     ("cmr8" . ,(string-append
 		  font-cruft
-		  "font-family:cmr;font-size:8;"))
+		  "font-family:cmr;font-style:normal;font-size:8;"))
     ("feta13" . ,(string-append
 		  font-cruft
-		  "font-family:LilyPond-Feta;font-size:13;"))
+		  "font-family:LilyPond-Feta;font-style:-Feta;font-size:13;"))
     ("feta-nummer10" . ,(string-append
 			 font-cruft
-			 "font-family:LilyPond-Feta-nummer;font-size:10;"))
+			 "font-family:LilyPond-feta-nummer;font-style:-feta-nummer;font-size:10;"))
     ("feta20" . ,(string-append
 		  font-cruft
-		  "font-family:LilyPond-Feta;font-size:20;"))
+		  "font-family:LilyPond-feta;font-style:-feta;font-size:20;"))
     ("parmesan20" . ,(string-append
 		      font-cruft
-		      "font-family:LilyPond-Parmesan;font-size:20;"))))
+		      "font-family:LilyPond-Parmesan;font-style:-Parmesan;font-size:20;"))))
 
 (define (get-font name-mag-pair)
   ;; name-mag-pair: (quote ("feta20" . 0.569055118110236))"feta20"(quote ("feta20" . 0.569055118110236))
diff --git a/scripts/ly2dvi.py b/scripts/ly2dvi.py
index ab2e5b0422..4389ea7963 100644
--- a/scripts/ly2dvi.py
+++ b/scripts/ly2dvi.py
@@ -532,7 +532,7 @@ None.
 
 
 	if 'PDF' in targets:
-		where = os.popen ('kpsewhich feta20.pfa').read()
+		where = ly.read_pipe ('kpsewhich feta20.pfa')
 
 		pfa_file  = None
 		if where: