From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Sun, 24 Nov 2002 17:42:45 +0000 (+0000)
Subject: * buildscripts/make-font-dir.py:
X-Git-Tag: release/1.7.9~21
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=60864c1476995691f1fe7f9e1ab3a534e74d66ad;p=lilypond.git

* buildscripts/make-font-dir.py:
* mf/GNUmakefile: Make sodipodi font map.

* scm/sodipodi.scm: Add more output functions.
---

diff --git a/ChangeLog b/ChangeLog
index 81e0da51e9..77265a0462 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2002-11-24  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+	* buildscripts/make-font-dir.py: 
+	* mf/GNUmakefile: Make sodipodi font map.
+
 	* scm/sodipodi.scm: Add more output functions.
 
 	* mf/feta-nummer.mf: 
diff --git a/buildscripts/make-font-dir.py b/buildscripts/make-font-dir.py
index 59939b2dbe..2b704308a4 100644
--- a/buildscripts/make-font-dir.py
+++ b/buildscripts/make-font-dir.py
@@ -133,11 +133,15 @@ ls =  sys.stdin.readline ()
 ls = string.split (ls)
 
 sketch_p = 0
-if len (ls) and ls[0] == 'sketch':
+sketch_p = 0
+if len (ls) and ls[0] == 'sodipodi':
+	ls = ls[1:]
+	sodipodi_p = 1
+elif len (ls) and ls[0] == 'sketch':
 	ls = ls[1:]
 	sketch_p = 1
 
-if not sketch_p:
+if not (sketch_p or sodipodi_p):
 	print len(ls)
 	
 for filename in ls:
@@ -222,10 +226,16 @@ for filename in ls:
 		
 	family_name = string.join (string.split (fontinfo['FamilyName'],
 							'-'), ' ')
-	if not sketch_p:
-		print filename + ' -' + string.join (fontinfo.get_X11 (), '-')
-		
-	else:
+
+	if sodipodi_p:
+		print string.join ((os.path.abspath (filename),
+				    fontinfo.FamilyName,
+				    fontinfo.FamilyName,''
+				    ),
+				   
+				   ',')
+				   
+	elif sketch_p:
 		# Sketch's lilypond.sfd map:
 		s = string.join ([fontinfo.FontName,
 				  fontinfo.family,
@@ -244,3 +254,5 @@ for filename in ls:
 				  fontinfo.name],
 				 ',')
 		print s
+	else:
+		print filename + ' -' + string.join (fontinfo.get_X11 (), '-')
diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index 933b4140c7..ce0405733e 100644
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -87,7 +87,7 @@ default: $(ALL_GEN_FILES)
 $(outdir)/%.afm  $(outdir)/%.enc  $(outdir)/%.tex $(outdir)/%.dep: $(outdir)/%.log $(outdir)/%.tfm
 	$(PYTHON) $(buildscript-dir)/mf-to-table.py --package=$(topdir) --outdir=$(outdir) --dep $(outdir)/$(<F:.log=.dep)  --afm $(outdir)/$(<F:.log=.afm)  --enc $(outdir)/$(<F:.log=.enc) --tex $(outdir)/$(<F:.log=.tex) --ly $(outdir)/$(<F:.log=list.ly) $<
 
-fontdir: $(addprefix $(outdir)/, lilypond.map lilypond.sfd fonts.scale fonts.dir)
+fontdir: $(addprefix $(outdir)/, lilypond.map lilypond.sfd private-fonts fonts.scale fonts.dir)
 
 ## Urg
 mapentry=$(1) $(shell fgrep FontName $(outdir)/$(1).afm | sed -e 's/FontName *//') <$(1).pfaX
@@ -115,6 +115,10 @@ $(outdir)/lilypond.sfd:
 #	cd $(outdir) && echo sketch $(FETA_MF_FILES:.mf=.pfa) | $(PYTHON) $(topdir)/buildscripts/make-font-dir.py  > $(@F)
 	cd $(outdir) && echo sketch *.pfa | $(PYTHON) $(topdir)/buildscripts/make-font-dir.py  > $(@F)
 
+# Sodipodi map file
+SODIPODI_FONTS = parmesan20 feta-braces0 feta-nummer10 feta20
+$(outdir)/private-fonts:
+	cd $(outdir) && echo sodipodi $(SODIPODI_FONTS:%=%.pfa) | $(PYTHON) $(topdir)/buildscripts/make-font-dir.py  > $(@F)
 
 local-clean:
 	rm -f mfplain.mem mfplain.log 
diff --git a/scm/sodipodi.scm b/scm/sodipodi.scm
index b062660d4f..0c76e146c4 100644
--- a/scm/sodipodi.scm
+++ b/scm/sodipodi.scm
@@ -7,13 +7,10 @@
 ;;;; NOTE:
 ;;;;
 ;;;; * Get mftrace 1.0.12 or newer
-
+;;;;
 ;;;; * Get sodipodi-cvs from 2002-11-23 or newer
 ;;;;
-;;;; * Put in your ~/.sodipodi/private-fonts:
-;;;;     mf/out/parmesan20.pfa,LilyPond Parmesan,LilyPond,
-;;;;     mf/out/feta-nummer10.pfa,LilyPond Nummer,LilyPond,
-;;;;     mf/out/feta20.pfa,LilyPond Feta,LilyPond,
+;;;; * Link/copy mf/out/private-fonts to ~/.sodipodi/private-fonts 
 
 
 
@@ -255,7 +252,7 @@
 		  "font-family:LilyPond-Feta;font-size:13;"))
     ("feta-nummer10" . ,(string-append
 			 font-cruft
-			 "font-family:LilyPond-Feta-nummer;font-size:13;"))
+			 "font-family:LilyPond-Feta-nummer;font-size:10;"))
     ("feta20" . ,(string-append
 		  font-cruft
 		  "font-family:LilyPond-Feta;font-size:20;"))