Merge branch 'master' of ssh+git://git.sv.gnu.org/srv/git/lilypond

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 b57930a3b08aac3ced558f24e1a305a2fb53f9f5..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')
 
@@ -56,13 +56,13 @@ $(outdir)/aybabtu.otf-gtable: $(BRACES:%=$(outdir)/feta-braces-%.otf-gtable)
 #
 
 
-$(outdir)/emmentaler-%.otf $(outdir)/emmentaler-%.svg: $(outdir)/emmentaler-%.pe $(outdir)/feta%.pfa  $(outdir)/feta-alphabet%.pfa  $(outdir)/parmesan%.pfa $(outdir)/feta%.otf-table $(outdir)/feta%.otf-gtable
+$(outdir)/emmentaler-%.otf $(outdir)/emmentaler-%.svg: $(outdir)/emmentaler-%.pe $(outdir)/feta%.pfb  $(outdir)/feta-alphabet%.pfb  $(outdir)/parmesan%.pfb $(outdir)/feta%.otf-table $(outdir)/feta%.otf-gtable
        cd $(outdir) && $(FONTFORGE) -script $(notdir $(basename ,$@).pe)
 
-$(outdir)/aybabtu.otf $(outdir)/aybabtu.svg: $(outdir)/aybabtu.pe $(foreach s,$(BRACES),$(outdir)/feta-braces-$(s).pfa) $(outdir)/aybabtu.otf-table $(outdir)/aybabtu.otf-gtable
+$(outdir)/aybabtu.otf $(outdir)/aybabtu.svg: $(outdir)/aybabtu.pe $(foreach s,$(BRACES),$(outdir)/feta-braces-$(s).pfb) $(outdir)/aybabtu.otf-table $(outdir)/aybabtu.otf-gtable
        cd $(outdir) && $(FONTFORGE) -script aybabtu.pe
 
-$(outdir)/%.pfa: $(outdir)/%.log
+$(outdir)/%.pfb: $(outdir)/%.log
 
 $(outdir)/%.otf-table: $(outdir)/%.lisp
        cat $< \
@@ -84,7 +84,7 @@ $(outdir)/feta11.otf-table: $(outdir)/feta11.lisp $(outdir)/parmesan11.lisp $(ou
 
 $(outdir)/aybabtu.otf: $(outdir)/aybabtu.subfonts $(outdir)/aybabtu.fontname $(outdir)/aybabtu.otf-table $(outdir)/aybabtu.otf-gtable $(outdir)/aybabtu.pe
 
-$(outdir)/aybabtu.otf $(outdir)/aybabtu.svg: $(BRACES:%=$(outdir)/feta-braces-%.pfa)
+$(outdir)/aybabtu.otf $(outdir)/aybabtu.svg: $(BRACES:%=$(outdir)/feta-braces-%.pfb)
 
 $(outdir)/aybabtu.fontname:
        echo -n 'aybabtu' > $@
@@ -95,11 +95,11 @@ $(PE_SCRIPTS): $(buildscript-dir)/gen-emmentaler-scripts.py
        $(PYTHON) $< --dir=$(outdir)
 
 ALL_FONTS = $(FETA_FONTS)
-PFA_FILES = $(ALL_FONTS:%=$(outdir)/%.pfa)
+PFB_FILES = $(ALL_FONTS:%=$(outdir)/%.pfb)
 
 # Make tfm files first, log files last,
 # so that normally log files aren't made twice
-ALL_GEN_FILES=$(LOG_FILES) $(ENC_FILES) $(LISP_FILES) $(OTF_TABLES) $(NCSB_OTFS) $(PFA_FILES) $(OTF_FILES) $(SVG_FILES) 
+ALL_GEN_FILES=$(LOG_FILES) $(ENC_FILES) $(LISP_FILES) $(OTF_TABLES) $(NCSB_OTFS) $(PFB_FILES) $(OTF_FILES) $(SVG_FILES) 
 
 #PRE_INSTALL=$(MAKE) "$(ALL_GEN_FILES)"
 
@@ -111,11 +111,8 @@ 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=$(PFA_FILES)
+INSTALLATION_OUT_FILES5=$(PFB_FILES)
 
 export MFINPUTS:=.:$(MFINPUTS)
 

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@");
 

diff --git a/scm/lily-library.scm b/scm/lily-library.scm
index c925a808f17c0704598ccd452e38bd7432f256c3..ae13bbebf0ec748142485952847b75a2d1273587 100644 (file)
--- a/scm/lily-library.scm
+++ b/scm/lily-library.scm
@@ -309,13 +309,13 @@ found."
   (lset-difference eq? a b))
 
 (define-public (uniq-list lst)
-  "Uniq LST, assuming that it is sorted"
+  "Uniq LST, assuming that it is sorted. Uses equal? for comparisons."
 
   (reverse! 
    (fold (lambda (x acc)
           (if (null? acc)
               (list x)
-              (if (eq? x (car acc))
+              (if (equal? x (car acc))
                   acc
                   (cons x acc))))
         '() lst) '()))

diff --git a/stepmake/stepmake/metafont-rules.make b/stepmake/stepmake/metafont-rules.make
index b33bd10be6919f7db261dfb56714e1fa2ff04769..71cd6f1bda8d7b47c13e7ca36f61d23f3c2b4aa7 100644 (file)
--- a/stepmake/stepmake/metafont-rules.make
+++ b/stepmake/stepmake/metafont-rules.make
@@ -13,11 +13,15 @@ $(outdir)/%.tfm $(outdir)/%.log: %.mf
        mv $(basename $(@F)).log $(basename $(@F)).tfm $(outdir)
        rm -f $(basename $(@F)).*gf  $(basename $(@F)).*pk
 
+# ugh . mf2pt1 is extremely broken, it pollutes CWD iso. creating a
+# temp dir.
+$(outdir)/%.pfb: %.mf $(outdir)/mf2pt1.mem
+       TMP=`mktemp -d $(outdir)/pfbtemp.XXXXXXXXX` ; \
+               ( cd $$TMP ; \
+               ln -s ../mf2pt1.mem . ; \
+               MFINPUTS=../..:../:: $(PERL) ../../$(buildscript-dir)/mf2pt1.pl $(MF2PT1_OPTIONS) $< ) ; \
+               mv $$TMP/*pfb $(outdir) ; \
+               rm -rf $$TMP
 
-MFTRACE_FORMATS = pfa pfb svg
-$(outdir)/%.pfb $(outdir)/%.svg $(outdir)/%.pfa: %.mf
-       MFINPUTS=$(src-dir) $(MFTRACE) $(MFTRACE_FLAGS) -I $(src-dir) -I $(outdir)/ --formats=pfa,pfb,svg $(basename $(@F))
-#      -mv $(MFTRACE_FORMATS:%=$(basename $(@F).%)) $(outdir)
-       -mv $(basename $(@F)).pfa $(outdir)
-       -mv $(basename $(@F)).pfb $(outdir)
-       -mv $(basename $(@F)).svg $(outdir)
+$(outdir)/mf2pt1.mem:
+       cd $(outdir) && mpost -progname=mpost -ini ../mf2pt1 \\dump

diff --git a/stepmake/stepmake/metafont-vars.make b/stepmake/stepmake/metafont-vars.make
index db3722edcdec36c466c13841493f1c46c25eb53e..25589e1f4db2ff24279ca5936106992137e6304a 100644 (file)
--- a/stepmake/stepmake/metafont-vars.make
+++ b/stepmake/stepmake/metafont-vars.make
@@ -7,5 +7,7 @@ MF_LOG_FILES = $(addprefix $(outdir)/, $(FONT_FILES:.mf=.log))
 DVI_FILES += $(MF_DVI_FILES)
 TFM_FILES += $(MF_TFM_FILES)
 
+MF2PT1_OPTIONS=--rounding=0.0001 
+