| LIBRARIES:
|
|-- ly/ .ly \include files
-|-- mf/ MetaFont sources for Emmentaler and Aybabtu fonts
+|-- mf/ MetaFont sources for Emmentaler fonts
|-- ps/ PostScript library files
|-- scm/ Scheme sources for LilyPond and subroutine files
|-- tex/ TeX and texinfo library files
" additional SFNT font tables called @code{LILC},"
" @code{LILF}, and @code{LILY}, needed for typesetting"
" musical elements. Currently, only the Emmentaler and"
- " the Aybabtu fonts fulfill these requirements.\n"
+ " the Emmentaler-Brace fonts fulfill these requirements.\n"
"\n"
"Note that only @code{ly:font-get-glyph} and derived"
" code (like @code{\\lookup}) can access glyphs from"
"\n"
"Note that this command can only be used to access glyphs from"
" fonts loaded with @code{ly:system-font-load}; currently, this"
- " means either the Emmentaler or Aybabtu fonts, corresponding"
+ " means either the Emmentaler or Emmentaler-Brace "
+ " fonts, corresponding"
" to the font encodings @code{fetaMusic} and @code{fetaBraces},"
" respectively.")
{
"\n"
"Note that this command can only be used to access glyphs from"
" fonts loaded with @code{ly:system-font-load}; currently, this"
- " means either the Emmentaler or Aybabtu fonts, corresponding"
+ " means either the Emmentaler or Emmentaler-Brace fonts, corresponding"
" to the font encodings @code{fetaMusic} and @code{fetaBraces},"
" respectively.")
{
"\n"
"Note that this command can only be used to access glyphs from"
" fonts loaded with @code{ly:system-font-load}; currently, this"
- " means either the Emmentaler or Aybabtu fonts, corresponding"
+ " means either the Emmentaler or Emmentaler-Brace fonts, corresponding"
" to the font encodings @code{fetaMusic} and @code{fetaBraces},"
" respectively.")
{
"\n"
"Note that this command can only be used to access glyphs from"
" fonts loaded with @code{ly:system-font-load}; currently, this"
- " means either the Emmentaler or Aybabtu fonts, corresponding"
+ " means either the Emmentaler or Emmentaler-Brace fonts, corresponding"
" to the font encodings @code{fetaMusic} and @code{fetaBraces},"
" respectively.")
{
"\n"
"Note that this command can only be used to access glyphs from"
" fonts loaded with @code{ly:system-font-load}; currently, this"
- " means either the Emmentaler or Aybabtu fonts, corresponding"
+ " means either the Emmentaler or Emmentaler-Brace fonts, corresponding"
" to the font encodings @code{fetaMusic} and @code{fetaBraces},"
" respectively.")
{
BRACES = a b c d e f g h i
OTF_FILES = $(STAFF_SIZES:%=$(outdir)/emmentaler-%.otf) \
- $(outdir)/aybabtu.otf
+ $(outdir)/emmentaler-brace.otf
PE_SCRIPTS = $(STAFF_SIZES:%=$(outdir)/emmentaler-%.pe)
OTF_TABLES = $(STAFF_SIZES:%=$(outdir)/feta%.otf-table) \
$(BRACES:%=$(outdir)/feta-braces-%.otf-table)
ENC_FILES = $(FETA_MF_FILES:%.mf=$(outdir)/%.enc)
TFM_FILES = $(FETA_MF_FILES:%.mf=$(outdir)/%.tfm)
-$(outdir)/aybabtu.otf-table: $(BRACES:%=$(outdir)/feta-braces-%.otf-table)
+$(outdir)/emmentaler-brace.otf-table: $(BRACES:%=$(outdir)/feta-braces-%.otf-table)
cat $^ > $@
-$(outdir)/aybabtu.otf-gtable: $(BRACES:%=$(outdir)/feta-braces-%.otf-gtable)
+$(outdir)/emmentaler-brace.otf-gtable: $(BRACES:%=$(outdir)/feta-braces-%.otf-gtable)
echo '(design_size . 20)' > $@
$(outdir)/feta%.otf-gtable
cd $(outdir) && $(FONTFORGE) -script $(notdir $(basename ,$@).pe)
-$(outdir)/aybabtu.otf \
-$(outdir)/aybabtu.svg: $(outdir)/aybabtu.pe \
+$(outdir)/emmentaler-brace.otf \
+$(outdir)/emmentaler-brace.svg: $(outdir)/emmentaler-brace.pe \
$(foreach s,$(BRACES),$(outdir)/feta-braces-$(s).pfb) \
- $(outdir)/aybabtu.otf-table $(outdir)/aybabtu.otf-gtable
- cd $(outdir) && $(FONTFORGE) -script aybabtu.pe
+ $(outdir)/emmentaler-brace.otf-table $(outdir)/emmentaler-brace.otf-gtable
+ cd $(outdir) && $(FONTFORGE) -script emmentaler-brace.pe
$(outdir)/%.pfb: $(outdir)/%.log
$(outdir)/parmesan11.lisp \
$(outdir)/feta-alphabet11.lisp
-$(outdir)/aybabtu.otf: $(outdir)/aybabtu.subfonts \
- $(outdir)/aybabtu.fontname \
- $(outdir)/aybabtu.otf-table \
- $(outdir)/aybabtu.otf-gtable \
- $(outdir)/aybabtu.pe
+$(outdir)/emmentaler-brace.otf: $(outdir)/emmentaler-brace.subfonts \
+ $(outdir)/emmentaler-brace.fontname \
+ $(outdir)/emmentaler-brace.otf-table \
+ $(outdir)/emmentaler-brace.otf-gtable \
+ $(outdir)/emmentaler-brace.pe
-$(outdir)/aybabtu.otf \
-$(outdir)/aybabtu.svg: $(BRACES:%=$(outdir)/feta-braces-%.pfb)
+$(outdir)/emmentaler-brace.otf \
+$(outdir)/emmentaler-brace.svg: $(BRACES:%=$(outdir)/feta-braces-%.pfb)
-$(outdir)/aybabtu.fontname:
- echo -n 'aybabtu' > $@
-$(outdir)/aybabtu.subfonts:
+$(outdir)/emmentaler-brace.fontname:
+ echo -n 'emmentaler-brace' > $@
+$(outdir)/emmentaler-brace.subfonts:
echo $(subst .mf,,$(call src-wildcard,feta-braces-[a-z].mf)) > $@
$(PE_SCRIPTS): $(buildscript-dir)/gen-emmentaler-scripts
+++ /dev/null
-#!@FONTFORGE@
-# all your brace are belong to us
-
-Open("feta-braces-b.pfb");
-SelectAll();
-Scale(200, 0, 0);
-Generate("feta-braces-b.scale.pfb");
-
-Open("feta-braces-c.pfb");
-SelectAll();
-Scale(300, 0, 0);
-Generate("feta-braces-c.scale.pfb");
-
-Open("feta-braces-d.pfb");
-SelectAll();
-Scale(400, 0, 0);
-Generate("feta-braces-d.scale.pfb");
-
-Open("feta-braces-e.pfb");
-SelectAll();
-Scale(500, 0, 0);
-Generate("feta-braces-e.scale.pfb");
-
-Open("feta-braces-f.pfb");
-SelectAll();
-Scale(600, 0, 0);
-Generate("feta-braces-f.scale.pfb");
-
-Open("feta-braces-g.pfb");
-SelectAll();
-Scale(700, 0, 0);
-Generate("feta-braces-g.scale.pfb");
-
-Open("feta-braces-h.pfb");
-SelectAll();
-Scale(800, 0, 0);
-Generate("feta-braces-h.scale.pfb");
-
-Open("feta-braces-i.pfb");
-SelectAll();
-Scale(900, 0, 0);
-Generate("feta-braces-i.scale.pfb");
-
-
-New()
-
-MergeFonts("feta-braces-a.pfb");
-MergeFonts("feta-braces-b.scale.pfb");
-MergeFonts("feta-braces-c.scale.pfb");
-MergeFonts("feta-braces-d.scale.pfb");
-MergeFonts("feta-braces-e.scale.pfb");
-MergeFonts("feta-braces-f.scale.pfb");
-MergeFonts("feta-braces-g.scale.pfb");
-MergeFonts("feta-braces-h.scale.pfb");
-MergeFonts("feta-braces-i.scale.pfb");
-
-SetFontNames("Aybabtu-Regular", "Aybabtu", "Aybabtu Regular", "Regular", "GNU GPL", "@TOPLEVEL_VERSION@");
-
-i = 0;
-while (i < CharCnt())
- Select(i);
-# crashes fontforge, use PUA for now -- jcn
-# SetUnicodeValue(i + 0xF0000, 0);
-/*
-PRIVATE AREA
- In the BMP, the range 0xe000 to 0xf8ff will never be assigned to any
- characters by the standard and is reserved for private usage. For the
- Linux community, this private area has been subdivided further into the
- range 0xe000 to 0xefff which can be used individually by any end-user
- and the Linux zone in the range 0xf000 to 0xf8ff where extensions are
- coordinated among all Linux users. The registry of the characters
- assigned to the Linux zone is currently maintained by H. Peter Anvin
- <Peter.Anvin@linux.org>.
-*/
- SetUnicodeValue(i + 0xE000, 0);
- ++i;
-endloop
-
-LoadTableFromFile("LILF", "aybabtu.subfonts")
-LoadTableFromFile("LILC", "aybabtu.otf-table")
-LoadTableFromFile("LILY", "aybabtu.otf-gtable")
-
-Generate("aybabtu.otf");
-Generate("aybabtu.svg");
--- /dev/null
+#!@FONTFORGE@
+# all your brace are belong to us
+
+Open("feta-braces-b.pfb");
+SelectAll();
+Scale(200, 0, 0);
+Generate("feta-braces-b.scale.pfb");
+
+Open("feta-braces-c.pfb");
+SelectAll();
+Scale(300, 0, 0);
+Generate("feta-braces-c.scale.pfb");
+
+Open("feta-braces-d.pfb");
+SelectAll();
+Scale(400, 0, 0);
+Generate("feta-braces-d.scale.pfb");
+
+Open("feta-braces-e.pfb");
+SelectAll();
+Scale(500, 0, 0);
+Generate("feta-braces-e.scale.pfb");
+
+Open("feta-braces-f.pfb");
+SelectAll();
+Scale(600, 0, 0);
+Generate("feta-braces-f.scale.pfb");
+
+Open("feta-braces-g.pfb");
+SelectAll();
+Scale(700, 0, 0);
+Generate("feta-braces-g.scale.pfb");
+
+Open("feta-braces-h.pfb");
+SelectAll();
+Scale(800, 0, 0);
+Generate("feta-braces-h.scale.pfb");
+
+Open("feta-braces-i.pfb");
+SelectAll();
+Scale(900, 0, 0);
+Generate("feta-braces-i.scale.pfb");
+
+
+New()
+
+MergeFonts("feta-braces-a.pfb");
+MergeFonts("feta-braces-b.scale.pfb");
+MergeFonts("feta-braces-c.scale.pfb");
+MergeFonts("feta-braces-d.scale.pfb");
+MergeFonts("feta-braces-e.scale.pfb");
+MergeFonts("feta-braces-f.scale.pfb");
+MergeFonts("feta-braces-g.scale.pfb");
+MergeFonts("feta-braces-h.scale.pfb");
+MergeFonts("feta-braces-i.scale.pfb");
+
+SetFontNames("Emmentaler-Brace-Regular", "Emmentaler-Brace", "Emmentaler-Brace Regular", "Regular", "GNU GPL", "@TOPLEVEL_VERSION@");
+
+i = 0;
+while (i < CharCnt())
+ Select(i);
+# crashes fontforge, use PUA for now -- jcn
+# SetUnicodeValue(i + 0xF0000, 0);
+/*
+PRIVATE AREA
+ In the BMP, the range 0xe000 to 0xf8ff will never be assigned to any
+ characters by the standard and is reserved for private usage. For the
+ Linux community, this private area has been subdivided further into the
+ range 0xe000 to 0xefff which can be used individually by any end-user
+ and the Linux zone in the range 0xf000 to 0xf8ff where extensions are
+ coordinated among all Linux users. The registry of the characters
+ assigned to the Linux zone is currently maintained by H. Peter Anvin
+ <Peter.Anvin@linux.org>.
+*/
+ SetUnicodeValue(i + 0xE000, 0);
+ ++i;
+endloop
+
+LoadTableFromFile("LILF", "emmentaler-brace.subfonts")
+LoadTableFromFile("LILC", "emmentaler-brace.otf-table")
+LoadTableFromFile("LILY", "emmentaler-brace.otf-gtable")
+
+Generate("emmentaler-brace.otf");
+Generate("emmentaler-brace.svg");
switches off the flag.")
(font-encoding ,symbol? "The font encoding is the broadest
category for selecting a font. Currently, only lilypond's system
-fonts (Emmentaler and Aybabtu) are using this property. Available
-values are @code{fetaMusic} (Emmentaler), @code{fetaBraces} (Aybabtu),
+fonts (Emmentaler) are using this property. Available
+values are @code{fetaMusic} (Emmentaler), @code{fetaBraces},
@code{fetaNumber} (Emmentaler), and @code{fetaDynamic} (Emmentaler).")
(font-family ,symbol? "The font family is the broadest category
for selecting text fonts. Options include: @code{sans},
)))
(fetaBraces ,(ly:pt 20.0)
#(,(delay (ly:system-font-load
- ;;; TODO: rename aybabtu to emmentaler-brace
- (if (string=? name "emmentaler")
- "aybabtu"
- (string-append name "-brace"))
- )))))))
-
+ (format "~a-brace" name)))))
+ )))
+
(define-public (add-pango-fonts node lily-family family factor)
;; Synchronized with the `text-font-size' variable in
;; layout-set-absolute-staff-size-in-module (see paper.scm).
(define (internal-font? file-name)
(or (string-startswith file-name "Emmentaler")
(string-startswith file-name "emmentaler")
- (string-startswith file-name "aybabtu")
- (string-startswith file-name "Aybabtu")))
+ ))
(define (load-font-via-GS font-name-filename)
(define (ps-load-file file-name)
(string-length font)))
(let* ((font-name (ly:font-name font))
(full-name (if font-name font-name (ly:font-file-name font))))
- (if (string-prefix? "Aybabtu" full-name)
- "aybabtu"
- (string-downcase full-name)))))
+ (string-downcase full-name))))
(define-public (modified-font-metric-font-scaling font)
(let* ((designsize (ly:font-design-size font))
projects / lilypond.git / commitdiff