From 792e9ccc487e10cc29cb3f4787b28b8b7e76ccc2 Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Wed, 27 Mar 2002 02:07:21 +0000
Subject: [PATCH] lilypond-1.5.46

---
 Documentation/topdocs/INSTALL.texi  |  2 +-
 Documentation/user/appendices.itely |  2 +-
 buildscripts/lilypond-login.sh      | 11 ++++++-----
 buildscripts/lilypond-profile.sh    |  8 +++++---
 mf/GNUmakefile                      |  2 +-
 scm/ps.scm                          |  9 ++++++++-
 6 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi
index 91cf161cce..67ad977ab9 100644
--- a/Documentation/topdocs/INSTALL.texi
+++ b/Documentation/topdocs/INSTALL.texi
@@ -172,7 +172,7 @@ configure something like:
 @end example
 
 
-@item pktrace, [OPTIONAL], needed for generating PostScript Type1
+@item pktrace 1.0 or newer, [OPTIONAL], needed for generating PostScript Type1
 fonts. Get it from  @uref{http://www.cs.uu.nl/~hanwen/pktrace/}.  You
 will need to install some additional packages to get pktrace to work.
 
diff --git a/Documentation/user/appendices.itely b/Documentation/user/appendices.itely
index dd424a003b..f09c9738e1 100644
--- a/Documentation/user/appendices.itely
+++ b/Documentation/user/appendices.itely
@@ -208,5 +208,5 @@ The following symbols are available in the Feta font and may be
 accessed directly using text markup such as 
 @code{g^#'(music "scripts-segno")}, see @ref{Text markup}.
 
-@lilypondfile{feta16.ly}
+@lilypondfile{feta16list.ly}
 
diff --git a/buildscripts/lilypond-login.sh b/buildscripts/lilypond-login.sh
index 67a8f34671..9e7278f681 100644
--- a/buildscripts/lilypond-login.sh
+++ b/buildscripts/lilypond-login.sh
@@ -12,11 +12,6 @@
 # strange shell, this C
 set datadir="@datadir@"
 
-if ( $?GS_FONTPATH ) then
-       setenv GS_FONTPATH "$datadir/fonts/afm:$datadir/fonts/type1:$GS_FONTPATH"
- else
-       setenv GS_FONTPATH "$datadir/fonts/afm:$datadir/fonts/type1"
- endif
  if ( $?GS_LIB ) then
        setenv GS_LIB "$datadir/ps:$GS_LIB"
  else
@@ -36,5 +31,11 @@ set noglob
 setenv TEXMF "{$datadir,"`kpsexpand  \$TEXMF`"}"
 unset noglob
 
+# Add all available TeX Type1 fonts (including Feta) to Ghostscript:
+if ( $?GS_FONTPATH ) then
+       setenv GS_FONTPATH `kpsewhich -expand-path=\$T1FONTS`:$GS_FONTPATH"
+ else
+       setenv GS_FONTPATH `kpsewhich -expand-path=\$T1FONTS`
+ endif
 
 
diff --git a/buildscripts/lilypond-profile.sh b/buildscripts/lilypond-profile.sh
index 11464f2ba5..1e03ea439a 100644
--- a/buildscripts/lilypond-profile.sh
+++ b/buildscripts/lilypond-profile.sh
@@ -9,9 +9,6 @@
 
 datadir=`echo "@datadir@" | sed 's!//!/!g'`
 
-# For direct ps output fonts
-GS_FONTPATH="$datadir/fonts/afm:$datadir/fonts/type1:"${GS_FONTPATH:=""}
-
 # For direct ps output: ps/lilyponddefs.ps
 GS_LIB="$datadir/ps:"${GS_LIB:=""}
 
@@ -28,6 +25,11 @@ TEXMF="{$datadir,"`kpsexpand  \\$TEXMF`"}"
 # LILYPONDPREFIX="$datadir"
 # export LILYPONDPREFIX
 
+# For direct ps output fonts. Add all available TeX Type1 fonts
+GS_FONTPATH=`kpsewhich -expand-path=\$T1FONTS`:${GS_FONTPATH:=""}
+
+
+
 export GS_LIB GS_FONTPATH TEXMF
 
  	
diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index ab77ff12b9..5a667fe1f8 100644
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -75,7 +75,7 @@ $(outdir)/lilypond.map:
 ##
 ## todo: this also depends on .tfm, FIXME.
 $(outdir)/%.afm  $(outdir)/%.tex $(outdir)/%.dep: $(outdir)/%.log 
-	$(PYTHON) $(buildscript-dir)/mf-to-table.py --package=$(topdir) --outdir=$(outdir) --dep $(outdir)/$(<F:.log=.dep)  --afm $(outdir)/$(<F:.log=.afm) --tex $(outdir)/$(<F:.log=.tex) --ly $(outdir)/$(<F:.log=.ly) $<
+	$(PYTHON) $(buildscript-dir)/mf-to-table.py --package=$(topdir) --outdir=$(outdir) --dep $(outdir)/$(<F:.log=.dep)  --afm $(outdir)/$(<F:.log=.afm) --tex $(outdir)/$(<F:.log=.tex) --ly $(outdir)/$(<F:.log=list.ly) $<
 
 local-clean:
 	rm -f mfplain.mem mfplain.log 
diff --git a/scm/ps.scm b/scm/ps.scm
index b7c1072b8f..dbc58a79c2 100644
--- a/scm/ps.scm
+++ b/scm/ps.scm
@@ -90,12 +90,19 @@
   (string-append
    "/" command
    " { /"
-   (car name-mag)
+   (capitalize-font-name (car name-mag))
    " findfont "
    "20 " (ly-number->string (cdr name-mag)) " mul "
    "output-scale div scalefont setfont } bind def "
    "\n"))
 
+;; Ugh, the Bluesky type1 fonts for computer modern use capitalized 
+;; postscript font names.
+(define (capitalize-font-name name)
+  (if (equal? (substring name 0 2) "cm")
+      (string-upcase name)
+      name))
+
 (define (beam width slope thick)
   (string-append
    (numbers->string (list slope width thick)) " draw_beam" ))
-- 
2.39.5