* 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 096c1b18bd42669b6328a7219442d567b43e02e4..e6e82d4a316a5fb93b9931316975eb7558b8adda 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2004-12-16  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * 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  <janneke@gnu.org>
 
        * scm/lily-library.scm (char->unicode-index): Remove.

diff --git a/lily/open-type-font.cc b/lily/open-type-font.cc
index 9e78737405f8bf90340acb0a9f251bed1ffdde6c..741db31b4357e59090d3fa20c9788ad9f8102d21 100644 (file)
--- 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 49b70b35330f1a137328b7d378b3358f53aeb775..7258626958cb1c370b4bee6d41a9d83013659417 100644 (file)
--- 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 (file)
index 0000000..566d7c0
--- /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
+       <Peter.Anvin@linux.org>.
+*/
+  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 7e1677764a4524c156726cbecfdb5cadb5aa6048..88dee8404765255f27ce1ca5b538f19253bceaf6 100644 (file)
--- 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 456d05d715f5b54a3a8ebad1050ace40a8139415..c862ae144297704b65b39da1305fbfed7508dc71 100644 (file)
--- 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).