Pfa vs. pfb fixes.

diff --git a/GNUmakefile.in b/GNUmakefile.in
index f0bd7cf2dc3ddf5f9a6297c33b7958520ac647f9..34576093d6873bd14a7a57ff2284cd4dcfe7907b 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -176,7 +176,7 @@ $(tree-share-prefix)/mf-link-tree link-mf-tree: $(tree-share-prefix)/lilypond-fo
        -cd $(tree-share-prefix)/fonts/tfm && \
                ln -s ../../../../../../mf/$(outconfbase)/*.tfm .
        -cd $(tree-share-prefix)/fonts/type1 && \
-               ln -s ../../../../../../mf/$(outconfbase)/*.pfa .
+               ln -s ../../../../../../mf/$(outconfbase)/*.pf? .
 
 TAGS.make: dummy
        etags -o $@ $(find $(top-src-dir) -name 'GNUmakefile*' -o -name '*.make')

diff --git a/buildscripts/gen-emmentaler-scripts.py b/buildscripts/gen-emmentaler-scripts.py
index 4121a6e96491cf469b9a421d726cc2889d1af1fa..291fc76d7b0dbe1be4329e86d21ae5a3c5e35516 100644 (file)
--- a/buildscripts/gen-emmentaler-scripts.py
+++ b/buildscripts/gen-emmentaler-scripts.py
@@ -41,8 +41,8 @@ notice += "resulting document to be covered by the GNU General Public License.";
 
 SetFontNames("%(name)s-%(design_size)d", "%(name)s", "%(name)s %(design_size)d", "%(design_size)d", notice, "@TOPLEVEL_VERSION@");
 
-MergeFonts("feta%(design_size)d.pfa");
-MergeFonts("parmesan%(design_size)d.pfa");
+MergeFonts("feta%(design_size)d.pfb");
+MergeFonts("parmesan%(design_size)d.pfb");
 
 # load nummer/din after setting PUA.
 i = 0;
@@ -66,7 +66,7 @@ PRIVATE AREA
 endloop
 
 
-MergeFonts("feta-alphabet%(design_size)d.pfa");
+MergeFonts("feta-alphabet%(design_size)d.pfb");
 MergeKern("feta-alphabet%(design_size)d.tfm");
 
 LoadTableFromFile("LILF", "%(filename)s-%(design_size)d.subfonts");

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index 2ea49e022159f84129a53140935ea6d65a930283..c7ad15586898eeea117916cf05d779cd75925232 100644 (file)
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -26,7 +26,7 @@ PE_SCRIPTS = $(STAFF_SIZES:%=$(outdir)/emmentaler-%.pe)\
 OTF_TABLES = $(STAFF_SIZES:%=$(outdir)/feta%.otf-table)\
  $(BRACES:%=$(outdir)/feta-braces-%.otf-table)
 FETA_FONTS = $(FETA_MF_FILES:.mf=)
-SVG_FILES = $(OTF_FILES:%.otf=%.svg) $(ALL_FONTS:%=$(outdir)/%.svg)
+SVG_FILES = $(OTF_FILES:%.otf=%.svg)
 
 FC_FIND=$(shell $(FCMATCH) --verbose 'Century Schoolbook L:style=$(1)' | grep 'file:' | sed 's/.*"\([^"]*\)".*/\1/g')
 
@@ -111,9 +111,6 @@ INSTALLATION_OUT_SUFFIXES=1 2 3 4 5 6
 INSTALLATION_OUT_DIR2=$(local_lilypond_datadir)/fonts/otf
 INSTALLATION_OUT_FILES2=$(OTF_FILES) $(NCSB_OTFS)
 
-INSTALLATION_OUT_DIR4=$(local_lilypond_datadir)/fonts/svg
-INSTALLATION_OUT_FILES4=$(SVG_FILES)
-
 INSTALLATION_OUT_DIR5=$(local_lilypond_datadir)/fonts/type1
 INSTALLATION_OUT_FILES5=$(PFB_FILES)
 

diff --git a/mf/aybabtu.pe.in b/mf/aybabtu.pe.in
index a4c542f386d212e83cd1d92f244f623fa798bab3..0130cff2233477ec37816cee60f8bb87b2288466 100644 (file)
--- a/mf/aybabtu.pe.in
+++ b/mf/aybabtu.pe.in
@@ -1,58 +1,58 @@
 #!@FONTFORGE@
 # all your brace are belong to us
 
-Open("feta-braces-b.pfa");
+Open("feta-braces-b.pfb");
 SelectAll();
 Scale(200, 0, 0);
-Generate("feta-braces-b.scale.pfa");
+Generate("feta-braces-b.scale.pfb");
 
-Open("feta-braces-c.pfa");
+Open("feta-braces-c.pfb");
 SelectAll();
 Scale(300, 0, 0);
-Generate("feta-braces-c.scale.pfa");
+Generate("feta-braces-c.scale.pfb");
 
-Open("feta-braces-d.pfa");
+Open("feta-braces-d.pfb");
 SelectAll();
 Scale(400, 0, 0);
-Generate("feta-braces-d.scale.pfa");
+Generate("feta-braces-d.scale.pfb");
 
-Open("feta-braces-e.pfa");
+Open("feta-braces-e.pfb");
 SelectAll();
 Scale(500, 0, 0);
-Generate("feta-braces-e.scale.pfa");
+Generate("feta-braces-e.scale.pfb");
 
-Open("feta-braces-f.pfa");
+Open("feta-braces-f.pfb");
 SelectAll();
 Scale(600, 0, 0);
-Generate("feta-braces-f.scale.pfa");
+Generate("feta-braces-f.scale.pfb");
 
-Open("feta-braces-g.pfa");
+Open("feta-braces-g.pfb");
 SelectAll();
 Scale(700, 0, 0);
-Generate("feta-braces-g.scale.pfa");
+Generate("feta-braces-g.scale.pfb");
 
-Open("feta-braces-h.pfa");
+Open("feta-braces-h.pfb");
 SelectAll();
 Scale(800, 0, 0);
-Generate("feta-braces-h.scale.pfa");
+Generate("feta-braces-h.scale.pfb");
 
-Open("feta-braces-i.pfa");
+Open("feta-braces-i.pfb");
 SelectAll();
 Scale(900, 0, 0);
-Generate("feta-braces-i.scale.pfa");
+Generate("feta-braces-i.scale.pfb");
 
 
 New()
 
-MergeFonts("feta-braces-a.pfa");
-MergeFonts("feta-braces-b.scale.pfa");
-MergeFonts("feta-braces-c.scale.pfa");
-MergeFonts("feta-braces-d.scale.pfa");
-MergeFonts("feta-braces-e.scale.pfa");
-MergeFonts("feta-braces-f.scale.pfa");
-MergeFonts("feta-braces-g.scale.pfa");
-MergeFonts("feta-braces-h.scale.pfa");
-MergeFonts("feta-braces-i.scale.pfa");
+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@");