Generated by (address unknown), From = lilypond-1.5.35, To = lilypond-1.5.35.mb1 usage cd lilypond-source-dir; patch -E -p1 < lilypond-1.5.35.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.35/ChangeLog ./ChangeLog --- ../lilypond-1.5.35/ChangeLog Thu Feb 28 21:36:40 2002 +++ ./ChangeLog Fri Mar 1 22:39:27 2002 @@ -1,3 +1,14 @@ +2002-03-01 Mats Bengtsson + + * buildscripts/mf-to-table.py (postfixes): Output also .ly file + documenting the font. (Doesn't work for parmesan at the moment) + + * Documentation/user/appendices.itely (The Feta font): Add list of + Feta font symbols with names. + + * mf/GNUmakefile ($(outdir)/lilypond.map): Generate lilypond.map + automatically + 2002-02-28 Han-Wen Nienhuys * VERSION (PATCH_LEVEL): 1.5.35 released. diff -purN ../lilypond-1.5.35/Documentation/user/appendices.itely ./Documentation/user/appendices.itely --- ../lilypond-1.5.35/Documentation/user/appendices.itely Mon Apr 9 00:26:48 2001 +++ ./Documentation/user/appendices.itely Fri Mar 1 22:38:47 2002 @@ -6,6 +6,7 @@ * American Chords :: * Jazz chords:: * MIDI instruments:: +* The Feta font:: @end menu @node Lyrics mode definition @@ -200,3 +201,12 @@ scheme = \chords { "viola" "lead 5 (charang)" "gunshot" "cello" "lead 6 (voice)" @end example + address@hidden The Feta font address@hidden The Feta font +The following symbols are available in the Feta font and may be +accessed directly using text markup such as address@hidden'(music "scripts-segno")}, see @ref{Text markup}. + address@hidden + diff -purN ../lilypond-1.5.35/VERSION ./VERSION --- ../lilypond-1.5.35/VERSION Thu Feb 28 21:33:19 2002 +++ ./VERSION Fri Mar 1 22:39:41 2002 @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=5 PATCH_LEVEL=35 -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.35/buildscripts/mf-to-table.py ./buildscripts/mf-to-table.py --- ../lilypond-1.5.35/buildscripts/mf-to-table.py Mon Feb 25 01:48:27 2002 +++ ./buildscripts/mf-to-table.py Fri Mar 1 22:38:47 2002 @@ -122,6 +122,34 @@ def write_tex_defs (file, global_info, c for m in charmetrics: file.write (r'''\def\%s%s{\char%d}%s''' % (nm, m['tex'], m['code'],'\n')) +def write_fontlist (file, global_info, charmetrics): + nm = global_info['FontFamily'] + file.write (r""" +% Lilypond file to list all font symbols and the corresponding names +% Automatically generated by mf-to-table.py +\score{\notes{\fatText +""") + for m in charmetrics: + escapedname=re.sub('_','\\\\\\\\_', m['name']) + file.write ('s^#\'(lines (music \"%s\") \"%s\")\n' % (m['name'], escapedname)) + file.write (r""" +} + \paper{ + \translator{ + \ScoreContext + \remove "Bar_number_engraver" + TextScript \override #'extra-extent-X = #'(-1 . 1) + } + \translator{ + \StaffContext + \remove "Clef_engraver" + \remove "Key_engraver" + \remove "Time_signature_engraver" + \remove "Staff_symbol_engraver" + } + } +} +""") def write_deps (file, deps, targets): for t in targets: @@ -149,12 +177,13 @@ Options: (options, files) = getopt.getopt( sys.argv[1:], 'a:d:hl:o:p:t:', - ['afm=', 'outdir=', 'dep=', 'tex=', 'debug', 'help', 'package=']) + ['afm=', 'outdir=', 'dep=', 'tex=', 'ly=', 'debug', 'help', 'package=']) texfile_nm = '' depfile_nm = '' afmfile_nm = '' +lyfile_nm = '' outdir_prefix = '.' for opt in options: @@ -166,6 +195,8 @@ for opt in options: outdir_prefix = a elif o == '--tex' or o == '-t': texfile_nm = a + elif o == '--ly' or o == '-': + lyfile_nm = a elif o== '--help' or o == '-h': help() elif o=='--afm' or o == '-a': @@ -190,5 +221,8 @@ for filenm in files: write_afm_metric (afm, g,m) write_tex_defs (open (texfile_nm, 'w'), g, m) write_deps (open (depfile_nm, 'wb'), deps, [base + '.dvi', texfile_nm, afmfile_nm]) + if lyfile_nm != '': + write_fontlist(open (lyfile_nm, 'w'), g, m) + diff -purN ../lilypond-1.5.35/make/lilypond-vars.make ./make/lilypond-vars.make --- ../lilypond-1.5.35/make/lilypond-vars.make Tue Feb 26 20:28:12 2002 +++ ./make/lilypond-vars.make Fri Mar 1 22:38:47 2002 @@ -40,7 +40,7 @@ ABC2LY = $(script-dir)/abc2ly.py CONVERT_LY = $(script-dir)/convert-ly.py LILYPOND = $(depth)/$(builddir)/lily/$(outconfbase)/lilypond LILYPOND_BOOK = $(script-dir)/lilypond-book.py -LILYPOND_BOOK_INCLUDES = -I $(pwd) -I $(outdir) -I$(input-dir) -I $(input-dir)/tricks/ -I $(input-dir)/regression/ -I $(input-dir)/test/ -I $(input-dir)/tutorial/ +LILYPOND_BOOK_INCLUDES = -I $(pwd) -I $(outdir) -I$(input-dir) -I $(input-dir)/tricks/ -I $(input-dir)/regression/ -I $(input-dir)/test/ -I $(input-dir)/tutorial/ -I $(topdir)/mf/out LY2DVI = $(script-dir)/ly2dvi.py LYS_TO_TELY = $(buildscript-dir)/lys-to-tely.py PS_TO_GIFS = $(buildscript-dir)/ps-to-gifs.sh diff -purN ../lilypond-1.5.35/mf/GNUmakefile ./mf/GNUmakefile --- ../lilypond-1.5.35/mf/GNUmakefile Mon Feb 25 00:29:30 2002 +++ ./mf/GNUmakefile Fri Mar 1 22:38:47 2002 @@ -8,7 +8,7 @@ include $(depth)/make/stepmake.make AF_FILES = $(wildcard *.af) -EXTRA_DIST_FILES += README feta.tex lilypond.map +EXTRA_DIST_FILES += README feta.tex # don't try to make fonts from test files TEST_FILES = $(wildcard *test*.mf) @@ -57,7 +57,7 @@ ifdef MAKE_PFA_FILES PFA_FILES = $(addprefix $(outdir)/, $(FONT_FILES:.mf=.pfa)) ALL_GEN_FILES += $(PFA_FILES) INSTALLATION_OUT_DIR4=$(datadir)/pfa -INSTALLATION_OUT_FILES4=$(PFA_FILES) lilypond.map +INSTALLATION_OUT_FILES4=$(PFA_FILES) pfa: $(PFA_FILES) endif @@ -66,10 +66,13 @@ export MFINPUTS:=.:$(MFINPUTS) default: $(ALL_GEN_FILES) +$(outdir)/lilypond.map: + echo $(FONT_FILES:.mf=) | awk -v RS=' ' '{print $$1 " TeX-" $$1 " <" $$1 ".pfa"}' > $@ + ## ## 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)/$(