lilypond-1.5.36

diff --git a/Documentation/user/appendices.itely b/Documentation/user/appendices.itely
index 17ab55f4c08450eaf16581bf4817f65760c7f812..dd424a003b26726d9314c1a907fcf65242800d62 100644 (file)
--- a/Documentation/user/appendices.itely
+++ b/Documentation/user/appendices.itely
@@ -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 
+
+@node The Feta font
+@section The Feta font
+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}
+

diff --git a/buildscripts/mf-to-table.py b/buildscripts/mf-to-table.py
index c0ef406baa957baf4afb9c5ef31400805e36e31e..820dc6e6911cfe0bf53bc6c60b5891753ba033eb 100644 (file)
--- a/buildscripts/mf-to-table.py
+++ b/buildscripts/mf-to-table.py
@@ -122,6 +122,34 @@ def write_tex_defs (file, global_info, charmetrics):
        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 --git a/make/lilypond-vars.make b/make/lilypond-vars.make
index 09ce0f151853084630b6fc3d88cddc7e0f896949..9891207728f70e4f386dcaf8a7ebbf5e5bedf317 100644 (file)
--- a/make/lilypond-vars.make
+++ b/make/lilypond-vars.make
@@ -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 --git a/mf/GNUmakefile b/mf/GNUmakefile
index ee62663cfa760e6d36e8f034064e37e102b2b335..15d24e76b23180e1dd16f10eb2bd56099488edfb 100644 (file)
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -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)/$(<F:.log=.dep)  --afm $(outdir)/$(<F:.log=.afm) --tex $(outdir)/$(<F:.log=.tex) $<
+       $(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) $<
 
 local-clean:
        rm -f mfplain.mem mfplain.log