Generated by (address unknown), >From = lilypond-1.5.45, To = lilypond-1.5.45.mb1 usage cd lilypond-source-dir; patch -E -p1 < lilypond-1.5.45.mb1.diff Patches do not contain automatically generated files or (urg) empty directories, i.e., you should rerun autoconf, configure diff -purN ../lilypond-1.5.45/ChangeLog ./ChangeLog --- ../lilypond-1.5.45/ChangeLog Thu Mar 21 01:55:13 2002 +++ ./ChangeLog Fri Mar 22 22:59:20 2002 @@ -1,3 +1,21 @@ +2002-03-22 Mats Bengtsson + + * scripts/ly2dvi.py: clean up old .*pk font caching code. + + * scm/ps.scm: Use uppercase postscript font names for the standard + TeX fonts. + + * scripts/ly2dvi.py, buildscripts/lilypond-{login,profile}.sh, : + Add all available TeX Type1 fonts, including Feta, to the + Ghostscript font path. + + * Documentation/topdocs/INSTALL.texi (Top): Add required pktrace + version (affects the FontName) in lilypond.map. + + * mf/GNUmakefile, Documentation/user/appendices.itely: Rename font + documentation file to fetaNNlist.ly to avoid name collisions between + lilypond generated .tex file and font .tex macros file. + 2002-03-21 Han-Wen * VERSION: 1.5.45 released diff -purN ../lilypond-1.5.45/Documentation/topdocs/INSTALL.texi ./Documentation/topdocs/INSTALL.texi --- ../lilypond-1.5.45/Documentation/topdocs/INSTALL.texi Thu Mar 14 12:35:35 2002 +++ ./Documentation/topdocs/INSTALL.texi Fri Mar 22 14:16:57 2002 @@ -172,7 +172,7 @@ configure something like: @end example address@hidden pktrace, [OPTIONAL], needed for generating PostScript Type1 address@hidden 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 -purN ../lilypond-1.5.45/Documentation/user/appendices.itely ./Documentation/user/appendices.itely --- ../lilypond-1.5.45/Documentation/user/appendices.itely Fri Mar 1 23:48:40 2002 +++ ./Documentation/user/appendices.itely Fri Mar 22 22:12:36 2002 @@ -208,5 +208,5 @@ The following symbols are available in t accessed directly using text markup such as @code{g^#'(music "scripts-segno")}, see @ref{Text markup}. address@hidden address@hidden diff -purN ../lilypond-1.5.45/VERSION ./VERSION --- ../lilypond-1.5.45/VERSION Thu Mar 21 01:47:37 2002 +++ ./VERSION Fri Mar 22 22:12:36 2002 @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=5 PATCH_LEVEL=45 -MY_PATCH_LEVEL= +MY_PATCH_LEVEL=mb1 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff -purN ../lilypond-1.5.45/buildscripts/lilypond-login.sh ./buildscripts/lilypond-login.sh --- ../lilypond-1.5.45/buildscripts/lilypond-login.sh Sun Mar 17 19:22:19 2002 +++ ./buildscripts/lilypond-login.sh Fri Mar 22 22:27:52 2002 @@ -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 -purN ../lilypond-1.5.45/buildscripts/lilypond-profile.sh ./buildscripts/lilypond-profile.sh --- ../lilypond-1.5.45/buildscripts/lilypond-profile.sh Mon Mar 18 01:11:27 2002 +++ ./buildscripts/lilypond-profile.sh Fri Mar 22 22:28:52 2002 @@ -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:=""} @@ -27,6 +24,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 -purN ../lilypond-1.5.45/mf/GNUmakefile ./mf/GNUmakefile --- ../lilypond-1.5.45/mf/GNUmakefile Wed Mar 20 00:21:51 2002 +++ ./mf/GNUmakefile Fri Mar 22 22:12:36 2002 @@ -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)/$(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 diff -purN ../lilypond-1.5.45/scripts/ly2dvi.py ./scripts/ly2dvi.py --- ../lilypond-1.5.45/scripts/ly2dvi.py Wed Mar 20 00:21:51 2002 +++ ./scripts/ly2dvi.py Fri Mar 22 22:58:14 2002 @@ -9,12 +9,6 @@ # Jan Arne Fagertun (Bourne shell script) # - -# -# TODO: should allow to set a central pk cache directory from the command line. -# TODO: should allow to switch off pk cache. -# - # # Note: gettext work best if we use ' for docstrings and " # for gettextable strings. @@ -343,9 +337,6 @@ fields = layout_fields + extra_fields include_path = ['.'] lily_p = 1 paper_p = 1 -cache_pks_p = 1 - -PK_PATTERN='feta.*\.[0-9]+pk' output_name = '' targets = { @@ -362,11 +353,12 @@ dependency_files = [] kpse = os.popen ('kpsexpand \$TEXMF').read() kpse = re.sub('[ \t\n]+$','', kpse) +type1_paths = os.popen ('kpsewhich -expand-path=\$T1FONTS').read () environment = { ## todo: prevent multiple addition. 'TEXMF' : "{%s,%s}" % (datadir, kpse) , - 'GS_FONTPATH' : datadir + '/afm:' + datadir + '/pfa', + 'GS_FONTPATH' : type1_paths, 'GS_LIB' : datadir + '/ps', } @@ -826,9 +818,6 @@ if files and files[0] != '-': setup_environment () tmpdir = setup_temp () - if cache_pks_p : - os.chdir (outdir) - cp_to_dir (PK_PATTERN, tmpdir) # to be sure, add tmpdir *in front* of inclusion path. #os.environ['TEXINPUTS'] = tmpdir + ':' + os.environ['TEXINPUTS'] @@ -893,9 +882,6 @@ if files and files[0] != '-': elif verbose_p: warning (_ ("can't find file: `%s'") % outname) - if cache_pks_p: - cp_to_dir (PK_PATTERN, outdir) - os.chdir (original_dir) cleanup_temp ()