*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 33fdb1e1fd300ef514cb2a9db3563d7598ae006f..3c0a4bf248ea3962191d379e079cce3606fead32 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,11 @@
 
 2003-09-22  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+       * mf/GNUmakefile ($(outdir)/%.pfa): break apart one-big-rule for
+       sauter PFAs.
+
+       * configure.in: remove VERSION stuff once again.
+
        * scm/font.scm (paper20-style-sheet-alist): add cmss entries.
 
        * scm/define-grobs.scm (all-grob-descriptions): use sans family

diff --git a/VERSION b/VERSION
index d692c98a5ab63679129dd4edc99fea40cced8171..4baa34001770dda0ff722689f947bf9f4c973f11 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=9
-PATCH_LEVEL=8
+PATCH_LEVEL=9
 MY_PATCH_LEVEL=
 

diff --git a/buildscripts/lilypond-profile.sh b/buildscripts/lilypond-profile.sh
index 78b49536301703463b81c2b4ebe466533b1fffe8..44559f6e3ec272058b82c1a49c2b9943912932ab 100644 (file)
--- a/buildscripts/lilypond-profile.sh
+++ b/buildscripts/lilypond-profile.sh
@@ -7,6 +7,7 @@
 # If run by hand or from you .profile, run as follows
 #   . /PATH/TO/lilypond-profile
 
+echo $0
 # workaround for ZSH posix $0-problem
 [ -n "$ZSH_NAME" ] && setopt nofunctionargzero
 

diff --git a/buildscripts/make-font-dir.py b/buildscripts/make-font-dir.py
index 5814fbab8b266a16cd08d855148da762669ff9d0..3b2a33c1c010adbbb600664074040d4de5b19491 100644 (file)
--- a/buildscripts/make-font-dir.py
+++ b/buildscripts/make-font-dir.py
@@ -51,6 +51,7 @@ def read_afm_file (filename):
 
 class Font_info:
        cm = {
+               'ss' : ('regular', 'sans'),
                'bx': ('bold', 'roman'),
                'bxti' : ('bold', 'italic'),
                'csc' : ('smallcaps', 'roman'),

diff --git a/config.make.in b/config.make.in
index ef14aaee801fff67798b7f667056c64b4a69143a..048aebd4e3c6b8c33d7c610b4c81a2ec2fd23efc 100644 (file)
--- a/config.make.in
+++ b/config.make.in
@@ -3,11 +3,6 @@
 MISSING_OPTIONAL = @OPTIONAL@
 MISSING_REQUIRED = @REQUIRED@
 
-PACKAGE_NAME = @PACKAGE_NAME@
-MAJOR_VERSION = @MAJOR_VERSION@
-MINOR_VERSION = @MINOR_VERSION@
-PATCH_LEVEL = @PATCH_LEVEL@
-MY_PATCH_LEVEL = @MY_PATCH_LEVEL@
 
 # @configure_input@
 

diff --git a/configure.in b/configure.in
index c52480db92e38b7a66f9486ef909e7fe56fd178d..a94f5c4a9cfa6d269b8658f0a7c77628ac72cba3 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -11,16 +11,8 @@ AC_CONFIG_AUX_DIR([stepmake/bin])
 # AC_CONFIG_AUX_DIR(bin)
 
 
-
-. $srcdir/VERSION 
-
 STEPMAKE_INIT
 
-AC_SUBST(PACKAGE_NAME)
-AC_SUBST(MAJOR_VERSION)
-AC_SUBST(MINOR_VERSION)
-AC_SUBST(PATCH_LEVEL)
-AC_SUBST(MY_PATCH_LEVEL)
 
 
 # List a file that identifies your package.

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index e141ba7ac7bbc8a06267ac89c65c680b146c5c8f..6d3b0f3ba9c5ac518383ef4ccf9b998f385ce553 100644 (file)
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -117,10 +117,12 @@ afm: $(AFM_FILES)
 pfa: afm $(PFA_FILES) fontdir
 pfb: afm $(PFB_FILES) fontdir
 
-# needed for web documentation
-$(SAUTER_FONTS:%=$(outdir)/%.pfa):
-       $(foreach i, $(SAUTER_FONTS), \
-               $(MFTRACE) -I $(outdir)/ --pfa --simplify --keep-trying $(i) && mv $(i).pfa $(outdir)/ && ) true
-$(SAUTER_FONTS:%=$(outdir)/%.pfb):
-       $(foreach i, $(SAUTER_FONTS), \
-               $(MFTRACE) -I $(outdir)/ --pfa --pfb --simplify --keep-trying $(i) && mv $(i).pfb $(i).pfa $(outdir)/ && ) true
+
+# stupid trick to have separate rules for each PFA font ;
+# otherwise building PFAs is all-or-nothing.
+$(SAUTER_FONTS:%=$(outdir)/%.bla):
+       $(foreach i, $@, touch $i && ) true
+
+$(outdir)/%.pfa: $(outdir)/%.bla
+       $(MFTRACE) -I $(outdir)/ --pfa --simplify --keep-trying $(notdir $(basename $@))  && mv $(notdir $@) $(outdir)/
+

diff --git a/scm/font.scm b/scm/font.scm
index ba6f8feb161d20a793f6d6511b1945ef89acc012..22c7b5f4703ebbcff7d2bc28c366b85b0fb148d4 100644 (file)
--- a/scm/font.scm
+++ b/scm/font.scm
@@ -75,8 +75,8 @@
     ((-1 medium upright sans 9) . "cmss9" )
     ((-2 medium upright sans 8) . "cmss8" )
     ((-3 medium upright sans 7) . "cmss7" )
-    ((-3 medium upright sans 6) . "cmss6" )
-    ((-4 medium upright sans 5) . "cmss5" )
+    ((-4 medium upright sans 6) . "cmss6" )
+    ((-5 medium upright sans 5) . "cmss5" )
     
     ((3 medium italic roman 12) . "cmti12")
     ((2 medium italic roman 12) . "cmti12")