From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Tue, 22 Sep 1998 17:14:54 +0000 (+0200)
Subject: patch::: 1.0.10.jcn1: pats
X-Git-Tag: release/1.0.11~1
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=722ce7fa655c28f9e5a7d75eb6a28f4d212be13b;p=lilypond.git

patch::: 1.0.10.jcn1: pats

pl 10.jcn1
	- mf-to-xpms for Harmonia
---

diff --git a/NEWS b/NEWS
index 794216b558..6908f5c885 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,9 @@
+pl 10.jcn1
+	- mf-to-xpms for Harmonia
 
+(png utils broken on i386; fine on ppc)
 (need to fix pictures. I know)
 
-
 pl 9.jcn1
 	- started gnuisation of website
 	  * filetype and size
diff --git a/VERSION b/VERSION
index 32ca2233ed..a49a56815d 100644
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=0
 PATCH_LEVEL=10
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=jcn1
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.
diff --git a/aclocal.m4 b/aclocal.m4
index e1592d654a..9aae46c032 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -229,7 +229,7 @@ dnl    fi
     AC_CHECK_PROGS(TAR, tar, error)
     AC_CHECK_PROGS(BASH, bash, /bin/sh)
 
-    AC_PATH_PROG(PYTHON, python, -echo no python)
+    AC_PATH_PROG(PYTHON, ${PYTHON:-python}, -echo no python)
     AC_SUBST(PYTHON)
 
 
@@ -438,6 +438,7 @@ AC_DEFUN(AC_STEPMAKE_WARN, [
 
 AC_DEFUN(AC_STEPMAKE_YODL, [
     if test "x$YODL" = "x"; then 
+	AC_CHECK_PROGS(STRIPROFF, striproff, -echo no striproff)
 	AC_CHECK_PROGS(YODL, yodl, -echo no yodl)
 	AC_CHECK_PROGS(YODL2HTML, yodl2html, -echo no yodl)
 	AC_CHECK_PROGS(YODL2LATEX, yodl2latex, )
@@ -446,6 +447,7 @@ AC_DEFUN(AC_STEPMAKE_YODL, [
 	AC_CHECK_PROGS(YODL2TEXINFO, yodl2texinfo, -echo no yodl)
 	AC_CHECK_PROGS(YODL2TXT, yodl2txt, -echo no yodl)
     else
+	AC_SUBST(STRIPROFF)
 	AC_SUBST(YODL)
 	AC_SUBST(YODL2HTML)
 	AC_SUBST(YODL2LATEX)
@@ -453,7 +455,7 @@ AC_DEFUN(AC_STEPMAKE_YODL, [
 	AC_SUBST(YODL2MSLESS)
 	AC_SUBST(YODL2TEXINFO)
 	AC_SUBST(YODL2TXT)
-	export YODL YODL2HTML YODL2LATEX YODL2MAN YODL2MSLESS YODL2TEXINFO YODL2TXT
+	export STRIPROFF YODL YODL2HTML YODL2LATEX YODL2MAN YODL2MSLESS YODL2TEXINFO YODL2TXT
     fi
     if test "x$YODL" = "-echo no yodl"; then
 	AC_STEPMAKE_WARN(Did not find YODL (Yodl is Yet Oneother Document Language, see http://www.cs.uu.nl/~hanwen/yodl))
@@ -562,6 +564,7 @@ AC_DEFUN(AC_CHECK_SEARCH_RESULT, [
 	fi
 ])
 
+
 # Configure paths for GTK+
 # Owen Taylor     97-11-3
 
@@ -573,7 +576,7 @@ AC_DEFUN(AM_PATH_GTK,
 dnl Get the cflags and libraries from the gtk-config script
 dnl
   AC_PATH_PROG(GTK_CONFIG, gtk-config, no)
-  min_gtk_version=ifelse([$1], ,0.99.7,$1)
+  min_gtk_version=ifelse([$1], ,1.1.1,$1)
   AC_MSG_CHECKING(for GTK - version >= $min_gtk_version)
   no_gtk=""
   if test "$GTK_CONFIG" != "no" ; then
@@ -631,22 +634,224 @@ main ()
 
 
 # Configure paths for GTK--
-# Jan Nieuwenhuizen   98-06-3
+# Erik Andersen	30 May 1998
+# Modified by Tero Pulkkinen (added the compiler checks... I hope they work..)
+
+dnl Test for GTK__, and define GTK___CFLAGS and GTK___LIBS
+dnl   to be used as follows:
+dnl AM_PATH_GTKMM([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+dnl
 
-dnl AM_PATH_GTK__([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-dnl Test for GTK--, and define GTK___CFLAGS and GTK___LIBS
+dnl Get the cflags and libraries from the gtkmm-config script
 dnl
-AC_DEFUN(AM_PATH_GTK__,
+AC_ARG_WITH(gtkmm-prefix,[  --with-gtkmm-prefix=PREFIX
+                          Prefix where GTK-- is installed (optional)],
+            gtkmm_config_prefix="$withval", gtkmm_config_prefix="")
+AC_ARG_WITH(gtkmm-exec-prefix,[  --with-gtkmm-exec-prefix=PREFIX
+                          Exec prefix where GTK-- is installed (optional)],
+            gtkmm_config_exec_prefix="$withval", gtkmm_config_exec_prefix="")
+AC_ARG_ENABLE(gtkmmtest, [  --disable-gtkmmtest     Do not try to compile and run a test GTK-- program],
+		    , enable_gtkmmtest=yes)
+
+  if test x$gtkmm_config_exec_prefix != x ; then
+     gtkmm_config_args="$gtkmm_config_args --exec-prefix=$gtkmm_config_exec_prefix"
+     if test x${GTKMM_CONFIG+set} != xset ; then
+        GTKMM_CONFIG=$gtkmm_config_exec_prefix/bin/gtkmm-config
+     fi
+  fi
+  if test x$gtkmm_config_prefix != x ; then
+     gtkmm_config_args="$gtkmm_config_args --prefix=$gtkmm_config_prefix"
+     if test x${GTKMM_CONFIG+set} != xset ; then
+        GTKMM_CONFIG=$gtkmm_config_prefix/bin/gtkmm-config
+     fi
+  fi
+
+
+AC_DEFUN(AM_PATH_GTKMM,
+[dnl 
+
+dnl
+dnl Check check if the installed GTK-- is sufficiently new.
+dnl
+  AC_PATH_PROG(GTKMM_CONFIG, gtkmm-config, no)
+  min_gtkmm_version=ifelse([$1], ,0.9.14,$1)
+
+  AC_MSG_CHECKING(for GTK-- - version >= $min_gtkmm_version)
+  no_gtkmm=""
+  if test "$GTKMM_CONFIG" = "no" ; then
+    no_gtkmm=yes
+  else
+    AC_LANG_SAVE
+    AC_LANG_CPLUSPLUS
+
+    GTK___CFLAGS=`$GTKMM_CONFIG $gtkmm_config_args --cflags`
+    GTK___LIBS=`$GTKMM_CONFIG $gtkmm_config_args --libs`
+    gtkmm_config_major_version=`$GTKMM_CONFIG $gtkmm_config_args --version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+    gtkmm_config_minor_version=`$GTKMM_CONFIG $gtkmm_config_args --version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+    gtkmm_config_micro_version=`$GTKMM_CONFIG $gtkmm_config_args --version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+    if test "x$enable_gtkmmtest" = "xyes" ; then
+      ac_save_CXXFLAGS="$CXXFLAGS"
+      ac_save_LIBS="$LIBS"
+      CXXFLAGS="$CXXFLAGS $GTK___CFLAGS"
+      LIBS="$LIBS $GTK___LIBS"
+dnl
+dnl Now check if the installed GTK-- is sufficiently new. (Also sanity
+dnl checks the results of gtkmm-config to some extent
+dnl
+      rm -f conf.gtkmmtest
+      AC_TRY_RUN([
+#include <gtk--.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+int 
+main ()
+{
+  int major, minor, micro;
+  char *tmp_version;
+
+  system ("touch conf.gtkmmtest");
+
+  /* HP/UX 0 (%@#!) writes to sscanf strings */
+  tmp_version = g_strdup("$min_gtkmm_version");
+  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
+     printf("%s, bad version string\n", "$min_gtkmm_version");
+     exit(1);
+   }
+
+  if ((gtkmm_major_version != $gtkmm_config_major_version) ||
+      (gtkmm_minor_version != $gtkmm_config_minor_version) ||
+      (gtkmm_micro_version != $gtkmm_config_micro_version))
+    {
+      printf("\n*** 'gtkmm-config --version' returned %d.%d.%d, but GTK-- (%d.%d.%d)\n", 
+             $gtkmm_config_major_version, $gtkmm_config_minor_version, $gtkmm_config_micro_version,
+             gtkmm_major_version, gtkmm_minor_version, gtkmm_micro_version);
+      printf ("*** was found! If gtkmm-config was correct, then it is best\n");
+      printf ("*** to remove the old version of GTK--. You may also be able to fix the error\n");
+      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
+      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
+      printf("*** required on your system.\n");
+      printf("*** If gtkmm-config was wrong, set the environment variable GTKMM_CONFIG\n");
+      printf("*** to point to the correct copy of gtkmm-config, and remove the file config.cache\n");
+      printf("*** before re-running configure\n");
+    } 
+/* GTK-- does not have the GTKMM_*_VERSION constants */
+/* 
+  else if ((gtkmm_major_version != GTKMM_MAJOR_VERSION) ||
+	   (gtkmm_minor_version != GTKMM_MINOR_VERSION) ||
+           (gtkmm_micro_version != GTKMM_MICRO_VERSION))
+    {
+      printf("*** GTK-- header files (version %d.%d.%d) do not match\n",
+	     GTKMM_MAJOR_VERSION, GTKMM_MINOR_VERSION, GTKMM_MICRO_VERSION);
+      printf("*** library (version %d.%d.%d)\n",
+	     gtkmm_major_version, gtkmm_minor_version, gtkmm_micro_version);
+    }
+*/
+  else
+    {
+      if ((gtkmm_major_version > major) ||
+        ((gtkmm_major_version == major) && (gtkmm_minor_version > minor)) ||
+        ((gtkmm_major_version == major) && (gtkmm_minor_version == minor) && (gtkmm_micro_version >= micro)))
+      {
+        return 0;
+       }
+     else
+      {
+        printf("\n*** An old version of GTK-- (%d.%d.%d) was found.\n",
+               gtkmm_major_version, gtkmm_minor_version, gtkmm_micro_version);
+        printf("*** You need a version of GTK-- newer than %d.%d.%d. The latest version of\n",
+	       major, minor, micro);
+        printf("*** GTK-- is always available from ftp://ftp.gtk.org.\n");
+        printf("***\n");
+        printf("*** If you have already installed a sufficiently new version, this error\n");
+        printf("*** probably means that the wrong copy of the gtkmm-config shell script is\n");
+        printf("*** being found. The easiest way to fix this is to remove the old version\n");
+        printf("*** of GTK--, but you can also set the GTKMM_CONFIG environment to point to the\n");
+        printf("*** correct copy of gtkmm-config. (In this case, you will have to\n");
+        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
+        printf("*** so that the correct libraries are found at run-time))\n");
+      }
+    }
+  return 1;
+}
+],, no_gtkmm=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+       CXXFLAGS="$ac_save_CXXFLAGS"
+       LIBS="$ac_save_LIBS"
+     fi
+  fi
+  if test "x$no_gtkmm" = x ; then
+     AC_MSG_RESULT(yes)
+     ifelse([$2], , :, [$2])     
+  else
+     AC_MSG_RESULT(no)
+     if test "$GTKMM_CONFIG" = "no" ; then
+       echo "*** The gtkmm-config script installed by GTK-- could not be found"
+       echo "*** If GTK-- was installed in PREFIX, make sure PREFIX/bin is in"
+       echo "*** your path, or set the GTK_CONFIG environment variable to the"
+       echo "*** full path to gtk-config."
+       echo "*** The gtkmm-config script was not available in GTK-- versions"
+       echo "*** prior to 0.9.12. Perhaps you need to update your installed"
+       echo "*** version to 0.9.12 or later"
+     else
+       if test -f conf.gtkmmtest ; then
+        :
+       else
+          echo "*** Could not run GTK-- test program, checking why..."
+          CXXFLAGS="$CFLAGS $GTKMM_CXXFLAGS"
+          LIBS="$LIBS $GTK___LIBS"
+          AC_TRY_LINK([
+#include <gtk--.h>
+#include <stdio.h>
+],      [ return ((gtkmm_major_version) || (gtkmm_minor_version) || (gtkmm_micro_version)); ],
+        [ echo "*** The test program compiled, but did not run. This usually means"
+          echo "*** that the run-time linker is not finding GTK-- or finding the wrong"
+          echo "*** version of GTK--. If it is not finding GTK--, you'll need to set your"
+          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+          echo "*** is required on your system"
+	  echo "***"
+          echo "*** If you have an old version installed, it is best to remove it, although"
+          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
+        [ echo "*** The test program failed to compile or link. See the file config.log for the"
+          echo "*** exact error that occured. This usually means GTK-- was incorrectly installed"
+          echo "*** or that you have moved GTK-- since it was installed. In the latter case, you"
+          echo "*** may want to edit the gtkmm-config script: $GTKMM_CONFIG" ])
+          CXXFLAGS="$ac_save_CXXFLAGS"
+          LIBS="$ac_save_LIBS"
+       fi
+     fi
+     GTK___CFLAGS=""
+     GTK__LIBS=""
+     ifelse([$3], , :, [$3])
+     AC_LANG_RESTORE
+  fi
+  AC_SUBST(GTK___CFLAGS)
+  AC_SUBST(GTK___LIBS)
+  rm -f conf.gtkmmtest
+])
+
+# Configure paths for GTK--DRAW
+# Derek Quinn Wyatt   98-08-21  (adapted from Jan Nieuwenhuizen's code)
+
+dnl AM_PATH_GTK__DRAW([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+dnl Test for GTK--DRAW, and define GTK___CFLAGS and GTK___LIBS
+dnl
+AC_DEFUN(AM_PATH_GTK__DRAW,
 [dnl 
 dnl Get the cflags and libraries from the gtk__-config script
 dnl
-  min_gtk___version=ifelse([$1], ,0.9.4,$1)
-  AC_MSG_CHECKING(for GTK-- - version >= $min_gtk___version)
+  AC_PATH_PROG(GTKMM_CONFIG, gtkmm-config, no)
+  min_gtk___version=ifelse([$1], ,0.0.5,$1)
+  AC_MSG_CHECKING(for GTK--DRAW - version >= $min_gtk___version)
   no_gtk__=""
-  if test "$GTK_CONFIG" != "no" ; then
-    GTK___CFLAGS=`$GTK_CONFIG --cflags`
-    GTK_LIBS=`$GTK_CONFIG --libs`
-    GTK___LIBS="$GTK_LIBS -lgtkmm"
+  if test "$GTKMM_CONFIG" != "no" ; then
+    GTK___CFLAGS=`$GTKMM_CONFIG --cflags`
+    GTK___LIBS=`$GTKMM_CONFIG --libs`
+    GTK___DLIBS="$GTK___LIBS -lgtkmmdraw"
+    GTK___LIBS="$GTK___DLIBS"
     ac_save_CFLAGS="$CFLAGS"
     ac_save_LIBS="$LIBS"
     ac_save_CXXFLAGS="$CXXFLAGS"
diff --git a/buildscripts/mf-to-xpms.sh b/buildscripts/mf-to-xpms.sh
new file mode 100644
index 0000000000..8ea9134e3a
--- /dev/null
+++ b/buildscripts/mf-to-xpms.sh
@@ -0,0 +1,60 @@
+#!@SHELL@
+# mf-to-xpms.sh
+
+if [ $# -ne 1 ]; then
+	echo Usage: mf-to-xpms feta20
+	exit 2
+fi
+
+font=$1
+mf=$font.mf
+afm=out/$font.afm
+PKTOPBM=pktopbm
+MODE=ibmvga
+RESOLUTION=110
+named=yes
+
+if [ ! -e out/$font.${RESOLUTION}pk ]; then
+	mf "\\mode=${MODE}; \\input $mf"
+	mv $font.${RESOLUTION}gf out
+	rm -f $font.log $font.tfm
+	gftopk out/$font.${RESOLUTION}gf out/$font.${RESOLUTION}pk
+fi
+
+# num=`grep "^C *[0-9]*;" $afm | tail -1 | sed "s!^C *\([^;]*\).*!\\1!"`
+# num=66
+# tex=out/$font.tex
+# cat > $tex <<EOF
+# \font\fetatwenty=feta20
+# \fetatwenty
+# \nopagenumbers
+# \newcount\c\c64
+# \char\c
+# \loop\ifnum\c<$num\advance\c by1
+# 	\vfill\eject
+# 	\char\c
+# \repeat
+# \vfill\eject
+# \end
+# EOF
+
+# for i in $NUMS; do
+# 	$PKTOPBM out/$font.${RESOLUTION}pk -c $i out/$font-$i.pbm
+# done
+
+# numbered files
+if [ "x$named" = "x" ]; then
+	NUMS=`grep "^C *[0-9]*;" $afm | sed "s!^C *\([^;]*\).*!\\1!"`
+	PBMS=`grep "^C *[0-9]*;" $afm | sed "s!^C *\([^;]*\).*!out/$font-\\1.pbm!"`
+else
+	NUMS=`grep "^C *[0-9]*;" $afm | sed "s!^C [^;]*; *N *\([^;]*\).*!\\1!"`
+	PBMS=`grep "^C *[0-9]*;" $afm | sed "s!^C [^;]*; *N *\([^;]*\).*!out/$font-\\1.pbm!"`
+fi
+
+# $PKTOPBM out/$font.${RESOLUTION}pk -x 100 -y 100 $PBMS
+$PKTOPBM out/$font.${RESOLUTION}pk $PBMS
+
+for i in $NUMS; do
+	ppmtoxpm out/$font-$i.pbm > out/$font-$i.xpm
+done
+rm -f $PBMS
diff --git a/buildscripts/ps-to-gifs.sh b/buildscripts/ps-to-gifs.sh
index 12ea577339..b342cbc299 100755
--- a/buildscripts/ps-to-gifs.sh
+++ b/buildscripts/ps-to-gifs.sh
@@ -11,6 +11,7 @@ Options:
   -c, --crop         crop output
   -o, --output=NAME  set output base
   -p, --png          convert to png
+  -s, --size=SIZE    set papersize
   -t, --transparent  change white to transparent
 EOF
 }
@@ -45,6 +46,11 @@ shift
 	GIF=png
 	PNMTOGIF=pnmtopng
 	;;
+    -s) SIZE="-sPAPERSIZE=$2"; shift
+        ;;
+    --s*=*)
+        SIZE="-sPAPERSIZE=`echo $opt | sed -e s/"^.*="//`"
+	;;
     -*)
         echo "ps-to-gifs: unknown option: \`$opt'"
 	exit 1
@@ -69,7 +75,7 @@ fi
 rm -f $BASE{.ppm,.$GIF} $BASE-page*{.ppm,.$GIF}
 
 # generate the pixmap at twice the size, then rescale (for antialiasing)
-cat $FILE | gs -sDEVICE=ppmraw -sOutputFile="$BASE-page%d.ppm" -r200 -dNOPAUSE - -c quit $FILE
+cat $FILE | gs -sDEVICE=ppmraw $SIZE -sOutputFile="$BASE-page%d.ppm" -r200 -dNOPAUSE - -c quit $FILE
 # quant is soo slow
 # cat $PPMFILE | ppmquant 2 | pnmscale 0.3333 | pnmcrop | $PNMTOGIF $color > $OUTFILE
 PPMS=`ls $BASE*ppm`
diff --git a/lily/VERSION b/lily/VERSION
index 32ca2233ed..a49a56815d 100644
--- a/lily/VERSION
+++ b/lily/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=0
 PATCH_LEVEL=10
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=jcn1
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.
diff --git a/make/STATE-VECTOR b/make/STATE-VECTOR
index 6a3daf8541..4391da2e2b 100644
--- a/make/STATE-VECTOR
+++ b/make/STATE-VECTOR
@@ -83,3 +83,4 @@
 1.0.9.hwn1
 1.0.9.uu1
 1.0.10
+1.0.10.jcn1
diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index 0062f7c5ba..2a2468d6f7 100644
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -12,6 +12,7 @@ LYTABLES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.ly))
 LOG_FILES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.log))
 TEXTABLES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.tex))
 AFM_FILES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.afm))
+XPM_FONTS = feta20
 
 ALL_GEN_FILES=$(LYTABLES) $(TEXTABLES) $(LOG_FILES) $(AFM_FILES)
 
@@ -27,7 +28,6 @@ $(outdir)/%.afm $(outdir)/%.ly $(outdir)/%.tex $(outdir)/%.dep: $(outdir)/%.log
 
 
 
-
 TEXINSTALL=$(MAKE) INSTALLATION_OUT_DIR=$(TEXDIR)/lilypond depth=.. INSTALLATION_OUT_FILES="$(TEXTABLES)" -f $(stepdir)/install-outfiles.sub.make $@
 
 AFMINSTALL=$(MAKE) depth=.. INSTALLATION_OUT_DIR=$(datadir) INSTALLATION_OUT_FILES="$(AFM_FILES)" -f $(stepdir)/install-outfiles.sub.make $@
diff --git a/stepmake/NEWS b/stepmake/NEWS
index 518805cb3c..9c93e9697d 100644
--- a/stepmake/NEWS
+++ b/stepmake/NEWS
@@ -1,3 +1,9 @@
+pl 52
+	- striproff
+	- reeable $(PACKAGE)_LIBES,_INCLUDES
+	- metafont rules
+	- GTK+, --, -draw config stuff
+
 pl 51
 	- bumped version nr
 
diff --git a/stepmake/VERSION b/stepmake/VERSION
index 8571e128dc..0724c08a89 100644
--- a/stepmake/VERSION
+++ b/stepmake/VERSION
@@ -1,7 +1,7 @@
 PACKAGE_NAME=StepMake
 MAJOR_VERSION=0
 MINOR_VERSION=1
-PATCH_LEVEL=51
+PATCH_LEVEL=52
 MY_PATCH_LEVEL=
 
 # use the above to send patches, always empty for released version:
diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index fc44218fd1..ff8f808a82 100644
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -227,7 +227,7 @@ dnl    fi
     AC_CHECK_PROGS(TAR, tar, error)
     AC_CHECK_PROGS(BASH, bash, /bin/sh)
 
-    AC_PATH_PROG(PYTHON, python, -echo no python)
+    AC_PATH_PROG(PYTHON, ${PYTHON:-python}, -echo no python)
     AC_SUBST(PYTHON)
 
 
@@ -436,6 +436,7 @@ AC_DEFUN(AC_STEPMAKE_WARN, [
 
 AC_DEFUN(AC_STEPMAKE_YODL, [
     if test "x$YODL" = "x"; then 
+	AC_CHECK_PROGS(STRIPROFF, striproff, -echo no striproff)
 	AC_CHECK_PROGS(YODL, yodl, -echo no yodl)
 	AC_CHECK_PROGS(YODL2HTML, yodl2html, -echo no yodl)
 	AC_CHECK_PROGS(YODL2LATEX, yodl2latex, )
@@ -444,6 +445,7 @@ AC_DEFUN(AC_STEPMAKE_YODL, [
 	AC_CHECK_PROGS(YODL2TEXINFO, yodl2texinfo, -echo no yodl)
 	AC_CHECK_PROGS(YODL2TXT, yodl2txt, -echo no yodl)
     else
+	AC_SUBST(STRIPROFF)
 	AC_SUBST(YODL)
 	AC_SUBST(YODL2HTML)
 	AC_SUBST(YODL2LATEX)
@@ -451,7 +453,7 @@ AC_DEFUN(AC_STEPMAKE_YODL, [
 	AC_SUBST(YODL2MSLESS)
 	AC_SUBST(YODL2TEXINFO)
 	AC_SUBST(YODL2TXT)
-	export YODL YODL2HTML YODL2LATEX YODL2MAN YODL2MSLESS YODL2TEXINFO YODL2TXT
+	export STRIPROFF YODL YODL2HTML YODL2LATEX YODL2MAN YODL2MSLESS YODL2TEXINFO YODL2TXT
     fi
     if test "x$YODL" = "-echo no yodl"; then
 	AC_STEPMAKE_WARN(Did not find YODL (Yodl is Yet Oneother Document Language, see http://www.cs.uu.nl/~hanwen/yodl))
@@ -560,6 +562,7 @@ AC_DEFUN(AC_CHECK_SEARCH_RESULT, [
 	fi
 ])
 
+
 # Configure paths for GTK+
 # Owen Taylor     97-11-3
 
@@ -571,7 +574,7 @@ AC_DEFUN(AM_PATH_GTK,
 dnl Get the cflags and libraries from the gtk-config script
 dnl
   AC_PATH_PROG(GTK_CONFIG, gtk-config, no)
-  min_gtk_version=ifelse([$1], ,0.99.7,$1)
+  min_gtk_version=ifelse([$1], ,1.1.1,$1)
   AC_MSG_CHECKING(for GTK - version >= $min_gtk_version)
   no_gtk=""
   if test "$GTK_CONFIG" != "no" ; then
@@ -629,22 +632,224 @@ main ()
 
 
 # Configure paths for GTK--
-# Jan Nieuwenhuizen   98-06-3
+# Erik Andersen	30 May 1998
+# Modified by Tero Pulkkinen (added the compiler checks... I hope they work..)
+
+dnl Test for GTK__, and define GTK___CFLAGS and GTK___LIBS
+dnl   to be used as follows:
+dnl AM_PATH_GTKMM([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+dnl
 
-dnl AM_PATH_GTK__([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-dnl Test for GTK--, and define GTK___CFLAGS and GTK___LIBS
+dnl Get the cflags and libraries from the gtkmm-config script
 dnl
-AC_DEFUN(AM_PATH_GTK__,
+AC_ARG_WITH(gtkmm-prefix,[  --with-gtkmm-prefix=PREFIX
+                          Prefix where GTK-- is installed (optional)],
+            gtkmm_config_prefix="$withval", gtkmm_config_prefix="")
+AC_ARG_WITH(gtkmm-exec-prefix,[  --with-gtkmm-exec-prefix=PREFIX
+                          Exec prefix where GTK-- is installed (optional)],
+            gtkmm_config_exec_prefix="$withval", gtkmm_config_exec_prefix="")
+AC_ARG_ENABLE(gtkmmtest, [  --disable-gtkmmtest     Do not try to compile and run a test GTK-- program],
+		    , enable_gtkmmtest=yes)
+
+  if test x$gtkmm_config_exec_prefix != x ; then
+     gtkmm_config_args="$gtkmm_config_args --exec-prefix=$gtkmm_config_exec_prefix"
+     if test x${GTKMM_CONFIG+set} != xset ; then
+        GTKMM_CONFIG=$gtkmm_config_exec_prefix/bin/gtkmm-config
+     fi
+  fi
+  if test x$gtkmm_config_prefix != x ; then
+     gtkmm_config_args="$gtkmm_config_args --prefix=$gtkmm_config_prefix"
+     if test x${GTKMM_CONFIG+set} != xset ; then
+        GTKMM_CONFIG=$gtkmm_config_prefix/bin/gtkmm-config
+     fi
+  fi
+
+
+AC_DEFUN(AM_PATH_GTKMM,
+[dnl 
+
+dnl
+dnl Check check if the installed GTK-- is sufficiently new.
+dnl
+  AC_PATH_PROG(GTKMM_CONFIG, gtkmm-config, no)
+  min_gtkmm_version=ifelse([$1], ,0.9.14,$1)
+
+  AC_MSG_CHECKING(for GTK-- - version >= $min_gtkmm_version)
+  no_gtkmm=""
+  if test "$GTKMM_CONFIG" = "no" ; then
+    no_gtkmm=yes
+  else
+    AC_LANG_SAVE
+    AC_LANG_CPLUSPLUS
+
+    GTK___CFLAGS=`$GTKMM_CONFIG $gtkmm_config_args --cflags`
+    GTK___LIBS=`$GTKMM_CONFIG $gtkmm_config_args --libs`
+    gtkmm_config_major_version=`$GTKMM_CONFIG $gtkmm_config_args --version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+    gtkmm_config_minor_version=`$GTKMM_CONFIG $gtkmm_config_args --version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+    gtkmm_config_micro_version=`$GTKMM_CONFIG $gtkmm_config_args --version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+    if test "x$enable_gtkmmtest" = "xyes" ; then
+      ac_save_CXXFLAGS="$CXXFLAGS"
+      ac_save_LIBS="$LIBS"
+      CXXFLAGS="$CXXFLAGS $GTK___CFLAGS"
+      LIBS="$LIBS $GTK___LIBS"
+dnl
+dnl Now check if the installed GTK-- is sufficiently new. (Also sanity
+dnl checks the results of gtkmm-config to some extent
+dnl
+      rm -f conf.gtkmmtest
+      AC_TRY_RUN([
+#include <gtk--.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+int 
+main ()
+{
+  int major, minor, micro;
+  char *tmp_version;
+
+  system ("touch conf.gtkmmtest");
+
+  /* HP/UX 0 (%@#!) writes to sscanf strings */
+  tmp_version = g_strdup("$min_gtkmm_version");
+  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
+     printf("%s, bad version string\n", "$min_gtkmm_version");
+     exit(1);
+   }
+
+  if ((gtkmm_major_version != $gtkmm_config_major_version) ||
+      (gtkmm_minor_version != $gtkmm_config_minor_version) ||
+      (gtkmm_micro_version != $gtkmm_config_micro_version))
+    {
+      printf("\n*** 'gtkmm-config --version' returned %d.%d.%d, but GTK-- (%d.%d.%d)\n", 
+             $gtkmm_config_major_version, $gtkmm_config_minor_version, $gtkmm_config_micro_version,
+             gtkmm_major_version, gtkmm_minor_version, gtkmm_micro_version);
+      printf ("*** was found! If gtkmm-config was correct, then it is best\n");
+      printf ("*** to remove the old version of GTK--. You may also be able to fix the error\n");
+      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
+      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
+      printf("*** required on your system.\n");
+      printf("*** If gtkmm-config was wrong, set the environment variable GTKMM_CONFIG\n");
+      printf("*** to point to the correct copy of gtkmm-config, and remove the file config.cache\n");
+      printf("*** before re-running configure\n");
+    } 
+/* GTK-- does not have the GTKMM_*_VERSION constants */
+/* 
+  else if ((gtkmm_major_version != GTKMM_MAJOR_VERSION) ||
+	   (gtkmm_minor_version != GTKMM_MINOR_VERSION) ||
+           (gtkmm_micro_version != GTKMM_MICRO_VERSION))
+    {
+      printf("*** GTK-- header files (version %d.%d.%d) do not match\n",
+	     GTKMM_MAJOR_VERSION, GTKMM_MINOR_VERSION, GTKMM_MICRO_VERSION);
+      printf("*** library (version %d.%d.%d)\n",
+	     gtkmm_major_version, gtkmm_minor_version, gtkmm_micro_version);
+    }
+*/
+  else
+    {
+      if ((gtkmm_major_version > major) ||
+        ((gtkmm_major_version == major) && (gtkmm_minor_version > minor)) ||
+        ((gtkmm_major_version == major) && (gtkmm_minor_version == minor) && (gtkmm_micro_version >= micro)))
+      {
+        return 0;
+       }
+     else
+      {
+        printf("\n*** An old version of GTK-- (%d.%d.%d) was found.\n",
+               gtkmm_major_version, gtkmm_minor_version, gtkmm_micro_version);
+        printf("*** You need a version of GTK-- newer than %d.%d.%d. The latest version of\n",
+	       major, minor, micro);
+        printf("*** GTK-- is always available from ftp://ftp.gtk.org.\n");
+        printf("***\n");
+        printf("*** If you have already installed a sufficiently new version, this error\n");
+        printf("*** probably means that the wrong copy of the gtkmm-config shell script is\n");
+        printf("*** being found. The easiest way to fix this is to remove the old version\n");
+        printf("*** of GTK--, but you can also set the GTKMM_CONFIG environment to point to the\n");
+        printf("*** correct copy of gtkmm-config. (In this case, you will have to\n");
+        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
+        printf("*** so that the correct libraries are found at run-time))\n");
+      }
+    }
+  return 1;
+}
+],, no_gtkmm=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+       CXXFLAGS="$ac_save_CXXFLAGS"
+       LIBS="$ac_save_LIBS"
+     fi
+  fi
+  if test "x$no_gtkmm" = x ; then
+     AC_MSG_RESULT(yes)
+     ifelse([$2], , :, [$2])     
+  else
+     AC_MSG_RESULT(no)
+     if test "$GTKMM_CONFIG" = "no" ; then
+       echo "*** The gtkmm-config script installed by GTK-- could not be found"
+       echo "*** If GTK-- was installed in PREFIX, make sure PREFIX/bin is in"
+       echo "*** your path, or set the GTK_CONFIG environment variable to the"
+       echo "*** full path to gtk-config."
+       echo "*** The gtkmm-config script was not available in GTK-- versions"
+       echo "*** prior to 0.9.12. Perhaps you need to update your installed"
+       echo "*** version to 0.9.12 or later"
+     else
+       if test -f conf.gtkmmtest ; then
+        :
+       else
+          echo "*** Could not run GTK-- test program, checking why..."
+          CXXFLAGS="$CFLAGS $GTKMM_CXXFLAGS"
+          LIBS="$LIBS $GTK___LIBS"
+          AC_TRY_LINK([
+#include <gtk--.h>
+#include <stdio.h>
+],      [ return ((gtkmm_major_version) || (gtkmm_minor_version) || (gtkmm_micro_version)); ],
+        [ echo "*** The test program compiled, but did not run. This usually means"
+          echo "*** that the run-time linker is not finding GTK-- or finding the wrong"
+          echo "*** version of GTK--. If it is not finding GTK--, you'll need to set your"
+          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+          echo "*** is required on your system"
+	  echo "***"
+          echo "*** If you have an old version installed, it is best to remove it, although"
+          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
+        [ echo "*** The test program failed to compile or link. See the file config.log for the"
+          echo "*** exact error that occured. This usually means GTK-- was incorrectly installed"
+          echo "*** or that you have moved GTK-- since it was installed. In the latter case, you"
+          echo "*** may want to edit the gtkmm-config script: $GTKMM_CONFIG" ])
+          CXXFLAGS="$ac_save_CXXFLAGS"
+          LIBS="$ac_save_LIBS"
+       fi
+     fi
+     GTK___CFLAGS=""
+     GTK__LIBS=""
+     ifelse([$3], , :, [$3])
+     AC_LANG_RESTORE
+  fi
+  AC_SUBST(GTK___CFLAGS)
+  AC_SUBST(GTK___LIBS)
+  rm -f conf.gtkmmtest
+])
+
+# Configure paths for GTK--DRAW
+# Derek Quinn Wyatt   98-08-21  (adapted from Jan Nieuwenhuizen's code)
+
+dnl AM_PATH_GTK__DRAW([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+dnl Test for GTK--DRAW, and define GTK___CFLAGS and GTK___LIBS
+dnl
+AC_DEFUN(AM_PATH_GTK__DRAW,
 [dnl 
 dnl Get the cflags and libraries from the gtk__-config script
 dnl
-  min_gtk___version=ifelse([$1], ,0.9.4,$1)
-  AC_MSG_CHECKING(for GTK-- - version >= $min_gtk___version)
+  AC_PATH_PROG(GTKMM_CONFIG, gtkmm-config, no)
+  min_gtk___version=ifelse([$1], ,0.0.5,$1)
+  AC_MSG_CHECKING(for GTK--DRAW - version >= $min_gtk___version)
   no_gtk__=""
-  if test "$GTK_CONFIG" != "no" ; then
-    GTK___CFLAGS=`$GTK_CONFIG --cflags`
-    GTK_LIBS=`$GTK_CONFIG --libs`
-    GTK___LIBS="$GTK_LIBS -lgtkmm"
+  if test "$GTKMM_CONFIG" != "no" ; then
+    GTK___CFLAGS=`$GTKMM_CONFIG --cflags`
+    GTK___LIBS=`$GTKMM_CONFIG --libs`
+    GTK___DLIBS="$GTK___LIBS -lgtkmmdraw"
+    GTK___LIBS="$GTK___DLIBS"
     ac_save_CFLAGS="$CFLAGS"
     ac_save_LIBS="$LIBS"
     ac_save_CXXFLAGS="$CXXFLAGS"
diff --git a/stepmake/bin/release.py b/stepmake/bin/release.py
index 6397ceb70c..18be2822b2 100755
--- a/stepmake/bin/release.py
+++ b/stepmake/bin/release.py
@@ -60,7 +60,7 @@ os.link(package.release_dir + barbaal, barbaal)
 
 # urg
 # os.system('@PYTHON@ ' + package.topdir + '/stepmake/bin/package-diff.py --package=' + topdir)
-os.system('python ' + package.topdir + '/stepmake/bin/package-diff.py --package=' + topdir)
+os.system(sys.executable + ' ' + package.topdir + '/stepmake/bin/package-diff.py --package=' + topdir)
 
 pn = package.name + '-%s' % version_tuple_to_str(cur_ver)
 pn = pn + '.diff'
diff --git a/stepmake/config.make.in b/stepmake/config.make.in
index 1cc983d7c5..021262f252 100644
--- a/stepmake/config.make.in
+++ b/stepmake/config.make.in
@@ -52,6 +52,7 @@ PATHSEP = @PATHSEP@
 PERL = @PERL@
 PYTHON = @PYTHON@
 TAR= @TAR@
+STRIPROFF = @STRIPROFF@
 TROFF = @TROFF@
 YODL= @YODL@
 YODL2HTML= @YODL2HTML@
diff --git a/stepmake/make/generic-rules.make b/stepmake/make/generic-rules.make
index 99d118ecd8..0213970378 100644
--- a/stepmake/make/generic-rules.make
+++ b/stepmake/make/generic-rules.make
@@ -1,5 +1,4 @@
 # title	   package specific rules
-# file	   make/Rules.lilymake.make
 
 #UGH
 
diff --git a/stepmake/make/generic-targets.make b/stepmake/make/generic-targets.make
index 790abd7a43..1667625123 100644
--- a/stepmake/make/generic-targets.make
+++ b/stepmake/make/generic-targets.make
@@ -1,5 +1,4 @@
 # title	   package specific targets
-# file	   make/Targets.make
 
 .PHONY : check-dist-deps check-make-deps check-rpm-doc-deps check-html-deps check-www-doc check-rpm-icons
 
@@ -18,7 +17,3 @@ check-rpm-icons:
 check-make-deps:
 	$(MAKE) -C $(depth)/make
 
-# urg urg
-$(configheader): $(depth)/$(configuration).hh
-	cp $< $@
-
diff --git a/stepmake/make/generic-vars.make b/stepmake/make/generic-vars.make
index 3c5a39dca3..a25ab5af61 100644
--- a/stepmake/make/generic-vars.make
+++ b/stepmake/make/generic-vars.make
@@ -1,5 +1,4 @@
 # title	   package specific variables
-# file	   make/Variables.lilymake.make
 #
 # do not change this file for site-wide extensions; please use 
 # make/$(outdir)/Site.make; 
diff --git a/stepmake/stepmake/c++-vars.make b/stepmake/stepmake/c++-vars.make
index e2667e7e42..d4b8c470d9 100644
--- a/stepmake/stepmake/c++-vars.make
+++ b/stepmake/stepmake/c++-vars.make
@@ -7,7 +7,7 @@
 EXTRA_CXXFLAGS= -Wall -W -Wmissing-prototypes -Wmissing-declarations -Wconversion
 
 
-CXXFLAGS = $(ICFLAGS) $(DEFINES) $(addprefix -I,$(INCLUDES)) $(USER_CFLAGS) $(EXTRA_CFLAGS) $(MODULE_CFLAGS) $(USER_CXXFLAGS) $(EXTRA_CXXFLAGS) $(MODULE_CXXFLAGS)
+ CXXFLAGS = $(ICFLAGS) $(DEFINES) $(addprefix -I,$(INCLUDES)) $(USER_CFLAGS) $(EXTRA_CFLAGS) $(MODULE_CFLAGS) $($(PACKAGE)_CFLAGS) $($(PACKAGE)_CXXFLAGS) $(USER_CXXFLAGS) $(EXTRA_CXXFLAGS) $(MODULE_CXXFLAGS)
 CXX_OUTPUT_OPTION = $< -o $@
 DO_CXX_COMPILE=$(DODEP) $(CXX) -c $(CXXFLAGS) $(CXX_OUTPUT_OPTION)
 
diff --git a/stepmake/stepmake/metafont-rules.make b/stepmake/stepmake/metafont-rules.make
index df23a2fb43..210a6d1ab8 100644
--- a/stepmake/stepmake/metafont-rules.make
+++ b/stepmake/stepmake/metafont-rules.make
@@ -10,8 +10,16 @@ $(outdir)/%.log: %.mf
 	mv $(@F) $@
 	rm $(basename $< ).*gf
 
-
 $(outdir)/%.tfm: %.mf
 	mf '\mode:=ljfour;  input $<;'
 	mv $(@F) $(outdir)
 	rm $(basename $<).*gf $(basename $<).*log
+
+$(outdir)/%.$(XPM_RESOLUTION)gf: %.mf
+	mf "\\mode=$(XPM_MODE); \\input $<"
+	mv $(@F) out
+	rm -f $(basename $<).log $(basename $<).tfm
+
+$(outdir)/%.$(XPM_RESOLUTION)pk: $(outdir)/%.$(XPM_RESOLUTION)gf
+	gftopk $< $@
+
diff --git a/stepmake/stepmake/metafont-targets.make b/stepmake/stepmake/metafont-targets.make
index 4a4d3017e2..5f142738b9 100644
--- a/stepmake/stepmake/metafont-targets.make
+++ b/stepmake/stepmake/metafont-targets.make
@@ -4,3 +4,7 @@ tfm: $(TFM_FILES)
 
 dvi: $(DVI_FILES)
 
+pks: $(addprefix $(outdir)/, $(XPM_FONTS:%=%.$(XPM_RESOLUTION)pk))
+
+xpms: $(addprefix $(outdir)/, $(XPM_FONTS:%=%.afm)) pks
+	$(SHELL) $(depth)/buildscripts/mf-to-xpms.sh $(XPM_FONTS)
diff --git a/stepmake/stepmake/metafont-vars.make b/stepmake/stepmake/metafont-vars.make
index 95d2563275..7beeca4110 100644
--- a/stepmake/stepmake/metafont-vars.make
+++ b/stepmake/stepmake/metafont-vars.make
@@ -8,5 +8,14 @@ MF_LOG_FILES = $(addprefix $(outdir)/, $(FONT_FILES:.mf=.log))
 DVI_FILES += $(MF_DVI_FILES)
 TFM_FILES += $(MF_TFM_FILES)
 
+# XPM_MODE=sun
+# XPM_RESOLUTION=85
+
+# XPM_MODE=declarge
+# XPM_RESOLUTION=100
+
+XPM_MODE=ibmvga
+XPM_RESOLUTION=110
+
 
 
diff --git a/stepmake/stepmake/yodl-rules.make b/stepmake/stepmake/yodl-rules.make
index 7daf7974c2..baabab596a 100644
--- a/stepmake/stepmake/yodl-rules.make
+++ b/stepmake/stepmake/yodl-rules.make
@@ -23,6 +23,6 @@ $(outdir)/%.texinfo: %.yo
 
 $(outdir)/%.txt: %.yo
 #	$(YODL2TXT) -doutdir=$(outdir) --live-data=3 -o $@ $<
-	$(YODL2MSLESS) -doutdir=$(outdir) --live-data=3 $< | striproff > $@
+	$(YODL2MSLESS) -doutdir=$(outdir) --live-data=3 $< | $(STRIPROFF) > $@
 	rm -f $(basename $<).ms