From: Jan Nieuwenhuizen Date: Thu, 16 Dec 2004 21:21:58 +0000 (+0000) Subject: * scm/font.scm (add-music-fonts): Load aybabtu iso all separate X-Git-Tag: release/2.5.14~416 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=01c7f176c310496ba9f19d43ee3e80440a6128a9;p=lilypond.git * scm/font.scm (add-music-fonts): Load aybabtu iso all separate braces. * lily/open-type-font.cc (design_size): Use 12 as default for design size. * mf/aybabtu.pe.in: New file. Merge all our braces. * mf/GNUmakefile: Generate aybabtu. * tex/lilyponddefs.tex: teTeX 3.0 pdfetex fix. --- diff --git a/ChangeLog b/ChangeLog index 096c1b18bd..e6e82d4a31 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2004-12-16 Jan Nieuwenhuizen + + * scm/font.scm (add-music-fonts): Load aybabtu iso all separate + braces. + + * lily/open-type-font.cc (design_size): Use 12 as default for + design size. + + * mf/aybabtu.pe.in: New file. Merge all our braces. + + * mf/GNUmakefile: Generate aybabtu. + + * tex/lilyponddefs.tex: teTeX 3.0 pdfetex fix. + 2004-12-14 Jan Nieuwenhuizen * scm/lily-library.scm (char->unicode-index): Remove. diff --git a/lily/open-type-font.cc b/lily/open-type-font.cc index 9e78737405..741db31b43 100644 --- a/lily/open-type-font.cc +++ b/lily/open-type-font.cc @@ -211,7 +211,8 @@ Real Open_type_font::design_size () const { SCM entry = scm_hashq_ref (lily_global_table_, - ly_symbol2scm ("staffsize"), SCM_BOOL_F); + ly_symbol2scm ("staffsize"), + scm_from_int (12)); return scm_to_double (entry); } diff --git a/mf/GNUmakefile b/mf/GNUmakefile index 49b70b3533..7258626958 100644 --- a/mf/GNUmakefile +++ b/mf/GNUmakefile @@ -14,12 +14,15 @@ FETA_MF_FILES = $(wildcard feta[0-9]*.mf)\ $(wildcard feta-alphabet*[0-9].mf)\ $(wildcard parmesan[0-9]*.mf) -STAFF_SIZES=11 13 14 16 18 20 23 26 - -CHEESES=$(addsuffix .otf,$(addprefix $(outdir)/bigcheese,$(STAFF_SIZES))) -PE_SCRIPTS=$(addsuffix .pe, $(addprefix $(outdir)/bigcheese,$(STAFF_SIZES))) \ - $(addsuffix .dep, $(addprefix $(outdir)/bigcheese,$(STAFF_SIZES))) -OTF_TABLES=$(addsuffix .otf-table, $(addprefix $(outdir)/feta,$(STAFF_SIZES))) +STAFF_SIZES = 11 13 14 16 18 20 23 26 +BRACES = a b c d e f g h i + +CHEESES = $(addsuffix .otf, $(addprefix $(outdir)/bigcheese, $(STAFF_SIZES)))\ + $(outdir)/aybabtu.otf +PE_SCRIPTS = $(addsuffix .pe, $(addprefix $(outdir)/bigcheese, $(STAFF_SIZES))) \ + $(addsuffix .dep, $(addprefix $(outdir)/bigcheese, $(STAFF_SIZES))) +OTF_TABLES = $(addsuffix .otf-table, $(addprefix $(outdir)/feta, $(STAFF_SIZES))) \ + $(BRACES:%=$(outdir)/feta-braces-%.otf-table) FETA_FONTS = $(FETA_MF_FILES:.mf=) diff --git a/mf/aybabtu.pe.in b/mf/aybabtu.pe.in new file mode 100644 index 0000000000..566d7c0430 --- /dev/null +++ b/mf/aybabtu.pe.in @@ -0,0 +1,44 @@ +#!@FONTFORGE@ + +# all your braces are belong to us + +New(); + +SetFontNames("aybabtu", "LilyPondBraces", "LilyPond Braces", "Regular", "GNU GPL", "@TOPLEVEL_VERSION@"); + +MergeFonts("feta-braces-a.pfa"); +MergeFonts("feta-braces-b.pfa"); +MergeFonts("feta-braces-c.pfa"); +MergeFonts("feta-braces-d.pfa"); +MergeFonts("feta-braces-e.pfa"); +MergeFonts("feta-braces-f.pfa"); +MergeFonts("feta-braces-g.pfa"); +MergeFonts("feta-braces-h.pfa"); +MergeFonts("feta-braces-i.pfa"); + +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", "feta-braces-a.otf-table") +LoadTableFromFile("LILY", "feta-braces-a.otf-gtable") + +Generate("aybabtu.otf"); +Generate("aybabtu.cff"); diff --git a/scm/font.scm b/scm/font.scm index 7e1677764a..88dee84047 100644 --- a/scm/font.scm +++ b/scm/font.scm @@ -183,16 +183,7 @@ ,(delay (ly:font-load "bigcheese26")))) (fetaBraces 15 #(,(delay - (ly:make-virtual-font - (ly:font-load "feta-braces-a") - (ly:font-load "feta-braces-b") - (ly:font-load "feta-braces-c") - (ly:font-load "feta-braces-d") - (ly:font-load "feta-braces-e") - (ly:font-load "feta-braces-f") - (ly:font-load "feta-braces-g") - (ly:font-load "feta-braces-h") - (ly:font-load "feta-braces-i")))))))) + (ly:font-load "aybabtu"))))))) (define-public (add-cmr-fonts node factor) (add-font node '((font-encoding . TeX-math)) diff --git a/tex/lilyponddefs.tex b/tex/lilyponddefs.tex index 456d05d715..c862ae1442 100644 --- a/tex/lilyponddefs.tex +++ b/tex/lilyponddefs.tex @@ -315,11 +315,34 @@ %% %% (Don't remove the spaces after the arguments to \input!) %% +% +%% In teTeX-3.0, latex is actually pdfetex, and we need +%% ifpdf.sty to determinine if we are really *tex or pdf*tex. +% +%% \input ifpdf.sty +% +%% However, ifpfd.sty is too smart for LilyPond, so we copy the +%% logic here. Using \input ifpdf.sty is a no-op when using latex, +%% and the \ifpdf switch is needed before \documentclass, using +%% \usepackage{ifpdf} is not an option. +% \lilypondifundefined{lilypondpostscript} - {\lilypondifundefined{pdfoutput} + {\newif\ifpdf + \ifx\pdfoutput\undefined + \else + \ifx\pdfoutput\relax + \else + \ifcase\pdfoutput + \else + \pdftrue + \fi + \fi + \fi + \ifpdf + {\input lily-pdf-defs } + \else {\input lily-ps-defs } - {\pdfoutput = 1 - \input lily-pdf-defs }} + \fi} {} %% Restore newline functionality (disabled to avoid \par).