From: Han-Wen Nienhuys Date: Fri, 7 Jan 2005 15:15:48 +0000 (+0000) Subject: (debian-mirror): rename bigcheese to emmentaler. X-Git-Tag: release/2.5.14~296 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=e8e8afc359c7b083f8d8f1857e83adc6af0a5dea;p=lilypond.git (debian-mirror): rename bigcheese to emmentaler. --- diff --git a/ChangeLog b/ChangeLog index 87c4d1b333..01f49ec84f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2005-01-07 Han-Wen Nienhuys + * mf/GNUmakefile (debian-mirror): rename bigcheese to emmentaler. + * lily/include/main.hh: lose _b hungarian suffixes for global variables. diff --git a/buildscripts/gen-bigcheese-scripts.py b/buildscripts/gen-bigcheese-scripts.py deleted file mode 100644 index d4091e82f1..0000000000 --- a/buildscripts/gen-bigcheese-scripts.py +++ /dev/null @@ -1,94 +0,0 @@ -#!@PYTHON@ -import sys -import getopt -import re -import os -import string - -(options, files) = \ - getopt.getopt (sys.argv[1:], - '', - ['dir=']) - - -outdir = '' -for opt in options: - o = opt[0] - a = opt[1] - if o == '--dir': - outdir = a - else: - print o - raise getopt.error - - -for design_size in [11,13,14,16,18,20,23,26]: - name = 'bigcheese' - script = '''#!@FONTFORGE@ -New(); - -# Separate Feta versioning? -# Naming: * expose LilyPond20/LilyPond rather than %(name)s -# * using 20 as Weight works for gnome-font-select widget: gfs -SetFontNames("%(name)s%(design_size)d", "LilyPond", "LilyPond %(name)s %(design_size)d", "%(design_size)d", "GNU GPL", "@TOPLEVEL_VERSION@"); - -MergeFonts("feta%(design_size)d.pfa"); -MergeFonts("parmesan%(design_size)d.pfa"); - -# load nummer/din after setting PUA. -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 - - -MergeFonts("feta-alphabet%(design_size)d.pfa"); -MergeKern("feta-alphabet%(design_size)d.tfm"); - -LoadTableFromFile("LILF", "%(name)s%(design_size)d.subfonts") -LoadTableFromFile("LILC", "feta%(design_size)d.otf-table") -LoadTableFromFile("LILY", "feta%(design_size)d.otf-gtable") - -Generate("%(name)s%(design_size)d.otf"); -Generate("%(name)s%(design_size)d.cff"); -Generate("%(name)s%(design_size)d.svg"); -''' % vars() - - path = os.path.join (outdir, name + '%d' % design_size + '.pe') - open (path, 'w').write (script) - - subfonts = ['feta%(design_size)d', - 'parmesan%(design_size)d', - 'feta-alphabet%(design_size)d'] - - ns = [] - for s in subfonts: - ns.append ('%s' % (s % vars())) - - subfonts_str = string.join (ns) - - open (os.path.join (outdir, '%(name)s%(design_size)d.subfonts' % vars()), 'w').write (subfonts_str) - - path = os.path.join (outdir, name + '%d' % design_size + '.dep') - - deps = r'''%(name)s%(design_size)d.otf: $(outdir)/feta%(design_size)d.pfa \ - $(outdir)/parmesan%(design_size)d.pfa \ - $(outdir)/feta-alphabet%(design_size)d.pfa feta%(design_size)d.otf-table \ - $(outdir)/feta-alphabet%(design_size)d.pfa feta%(design_size)d.otf-gtable -''' % vars() - open (path, 'w').write (deps) diff --git a/buildscripts/gen-emmentaler-scripts.py b/buildscripts/gen-emmentaler-scripts.py new file mode 100644 index 0000000000..d4091e82f1 --- /dev/null +++ b/buildscripts/gen-emmentaler-scripts.py @@ -0,0 +1,94 @@ +#!@PYTHON@ +import sys +import getopt +import re +import os +import string + +(options, files) = \ + getopt.getopt (sys.argv[1:], + '', + ['dir=']) + + +outdir = '' +for opt in options: + o = opt[0] + a = opt[1] + if o == '--dir': + outdir = a + else: + print o + raise getopt.error + + +for design_size in [11,13,14,16,18,20,23,26]: + name = 'bigcheese' + script = '''#!@FONTFORGE@ +New(); + +# Separate Feta versioning? +# Naming: * expose LilyPond20/LilyPond rather than %(name)s +# * using 20 as Weight works for gnome-font-select widget: gfs +SetFontNames("%(name)s%(design_size)d", "LilyPond", "LilyPond %(name)s %(design_size)d", "%(design_size)d", "GNU GPL", "@TOPLEVEL_VERSION@"); + +MergeFonts("feta%(design_size)d.pfa"); +MergeFonts("parmesan%(design_size)d.pfa"); + +# load nummer/din after setting PUA. +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 + + +MergeFonts("feta-alphabet%(design_size)d.pfa"); +MergeKern("feta-alphabet%(design_size)d.tfm"); + +LoadTableFromFile("LILF", "%(name)s%(design_size)d.subfonts") +LoadTableFromFile("LILC", "feta%(design_size)d.otf-table") +LoadTableFromFile("LILY", "feta%(design_size)d.otf-gtable") + +Generate("%(name)s%(design_size)d.otf"); +Generate("%(name)s%(design_size)d.cff"); +Generate("%(name)s%(design_size)d.svg"); +''' % vars() + + path = os.path.join (outdir, name + '%d' % design_size + '.pe') + open (path, 'w').write (script) + + subfonts = ['feta%(design_size)d', + 'parmesan%(design_size)d', + 'feta-alphabet%(design_size)d'] + + ns = [] + for s in subfonts: + ns.append ('%s' % (s % vars())) + + subfonts_str = string.join (ns) + + open (os.path.join (outdir, '%(name)s%(design_size)d.subfonts' % vars()), 'w').write (subfonts_str) + + path = os.path.join (outdir, name + '%d' % design_size + '.dep') + + deps = r'''%(name)s%(design_size)d.otf: $(outdir)/feta%(design_size)d.pfa \ + $(outdir)/parmesan%(design_size)d.pfa \ + $(outdir)/feta-alphabet%(design_size)d.pfa feta%(design_size)d.otf-table \ + $(outdir)/feta-alphabet%(design_size)d.pfa feta%(design_size)d.otf-gtable +''' % vars() + open (path, 'w').write (deps) diff --git a/mf/GNUmakefile b/mf/GNUmakefile index 584c2de680..ff226ff955 100644 --- a/mf/GNUmakefile +++ b/mf/GNUmakefile @@ -17,10 +17,10 @@ FETA_MF_FILES = $(wildcard feta[0-9]*.mf)\ STAFF_SIZES = 11 13 14 16 18 20 23 26 BRACES = a b c d e f g h i -OTF_FILES = $(addsuffix .otf, $(addprefix $(outdir)/bigcheese, $(STAFF_SIZES)))\ +OTF_FILES = $(addsuffix .otf, $(addprefix $(outdir)/emmentaler, $(STAFF_SIZES)))\ $(outdir)/aybabtu.otf -PE_SCRIPTS = $(addsuffix .pe, $(addprefix $(outdir)/bigcheese, $(STAFF_SIZES))) \ - $(addsuffix .dep, $(addprefix $(outdir)/bigcheese, $(STAFF_SIZES))) +PE_SCRIPTS = $(addsuffix .pe, $(addprefix $(outdir)/emmentaler, $(STAFF_SIZES))) \ + $(addsuffix .dep, $(addprefix $(outdir)/emmentaler, $(STAFF_SIZES))) OTF_TABLES = $(addsuffix .otf-table, $(addprefix $(outdir)/feta, $(STAFF_SIZES))) \ $(BRACES:%=$(outdir)/feta-braces-%.otf-table) FETA_FONTS = $(FETA_MF_FILES:.mf=) @@ -69,7 +69,7 @@ $(outdir)/aybabtu.otf: $(outdir)/aybabtu.subfonts $(outdir)/aybabtu.otf-table $( $(outdir)/aybabtu.subfonts: echo $(subst .mf,,$(wildcard feta-braces-[a-z].mf)) > $@ -$(PE_SCRIPTS): $(buildscript-dir)/gen-bigcheese-scripts.py +$(PE_SCRIPTS): $(buildscript-dir)/gen-emmentaler-scripts.py $(PYTHON) $< --dir=$(outdir) @@ -113,7 +113,7 @@ INSTALLATION_OUT_FILES8=$(OTF_FILES) export MFINPUTS:=.:$(MFINPUTS) -default: pfa_warning $(ALL_GEN_FILES) $(outdir)/bigcheese20.otf +default: pfa_warning $(ALL_GEN_FILES) $(outdir)/emmentaler20.otf pfa_warning: ifneq ($(shell $(MFTRACE) --version | sed 's/ .*//'),mftrace)