From: Han-Wen Nienhuys Date: Fri, 5 Mar 2010 04:39:01 +0000 (-0300) Subject: Rename aybabtu font to emmentaler-brace. X-Git-Tag: release/2.13.16-1~55 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=56e8135ddcd303406ba3cbc39dce3295a71d4e98;p=lilypond.git Rename aybabtu font to emmentaler-brace. --- diff --git a/ROADMAP b/ROADMAP index 68bb390021..8b66091810 100644 --- a/ROADMAP +++ b/ROADMAP @@ -68,7 +68,7 @@ LilyPond's source files. | 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 diff --git a/lily/all-font-metrics-scheme.cc b/lily/all-font-metrics-scheme.cc index 44fb8397c1..4336e281d2 100644 --- a/lily/all-font-metrics-scheme.cc +++ b/lily/all-font-metrics-scheme.cc @@ -39,7 +39,7 @@ LY_DEFINE (ly_system_font_load, "ly:system-font-load", 1, 0, 0, " 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" diff --git a/lily/font-metric-scheme.cc b/lily/font-metric-scheme.cc index 55373f72c8..7f57e5d1c3 100644 --- a/lily/font-metric-scheme.cc +++ b/lily/font-metric-scheme.cc @@ -31,7 +31,8 @@ LY_DEFINE (ly_font_get_glyph, "ly:font-get-glyph", "\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.") { @@ -53,7 +54,7 @@ LY_DEFINE (ly_get_glyph, "ly:get-glyph", "\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.") { @@ -71,7 +72,7 @@ LY_DEFINE (ly_font_glyph_name_to_index, "ly:font-glyph-name-to-index", "\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.") { @@ -89,7 +90,7 @@ LY_DEFINE (ly_font_index_to_charcode, "ly:font-index-to-charcode", "\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.") { @@ -107,7 +108,7 @@ LY_DEFINE (ly_font_glyph_name_to_charcode, "ly:font-glyph-name-to-charcode", "\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.") { diff --git a/mf/GNUmakefile b/mf/GNUmakefile index 389f7b9baf..6cc194a5ae 100644 --- a/mf/GNUmakefile +++ b/mf/GNUmakefile @@ -22,7 +22,7 @@ STAFF_SIZES = 11 13 14 16 18 20 23 26 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) @@ -44,10 +44,10 @@ LISP_FILES = $(FETA_MF_FILES:%.mf=$(outdir)/%.lisp) 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)' > $@ @@ -67,11 +67,11 @@ $(outdir)/emmentaler-%.svg: $(outdir)/emmentaler-%.pe \ $(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 @@ -106,18 +106,18 @@ $(outdir)/feta11.otf-table: $(outdir)/feta11.lisp \ $(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 diff --git a/mf/aybabtu.pe.in b/mf/aybabtu.pe.in deleted file mode 100644 index 0130cff223..0000000000 --- a/mf/aybabtu.pe.in +++ /dev/null @@ -1,84 +0,0 @@ -#!@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 - . -*/ - 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"); diff --git a/mf/emmentaler-brace.pe.in b/mf/emmentaler-brace.pe.in new file mode 100644 index 0000000000..4c85cae39d --- /dev/null +++ b/mf/emmentaler-brace.pe.in @@ -0,0 +1,84 @@ +#!@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 + . +*/ + 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"); diff --git a/scm/define-grob-properties.scm b/scm/define-grob-properties.scm index 4ccecbc722..ea8424dbe4 100644 --- a/scm/define-grob-properties.scm +++ b/scm/define-grob-properties.scm @@ -285,8 +285,8 @@ for standard flags, @code{'mensural} and @code{'no-flag}, which 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}, diff --git a/scm/font.scm b/scm/font.scm index 26abcba884..e7a388c7b8 100644 --- a/scm/font.scm +++ b/scm/font.scm @@ -170,12 +170,9 @@ ))) (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). diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm index baacb96124..cf2eaa50e5 100644 --- a/scm/framework-ps.scm +++ b/scm/framework-ps.scm @@ -240,8 +240,7 @@ (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) diff --git a/scm/lily-library.scm b/scm/lily-library.scm index 2915ed1108..b68771c187 100644 --- a/scm/lily-library.scm +++ b/scm/lily-library.scm @@ -708,9 +708,7 @@ applied to function @var{getter}.") (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))