From cb1e0050829dc392fe3069ec77a54c9b11388173 Mon Sep 17 00:00:00 2001 From: fred Date: Tue, 26 Mar 2002 22:27:07 +0000 Subject: [PATCH] lilypond-1.2.12 --- aclocal.m4 | 23 +++++++++++++--------- config.make.in | 4 +++- scm/lily.scm | 28 +++++++++++++-------------- stepmake/aclocal.m4 | 23 +++++++++++++--------- stepmake/configure | 5 ++--- stepmake/stepmake/metapost-rules.make | 3 +-- 6 files changed, 48 insertions(+), 38 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index c71271fe54..f9c5a64a78 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -2,14 +2,17 @@ dnl WARNING WARNING WARNING WARNING dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4 dnl WARNING WARNING WARNING WARNING dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4 +dnl WARNING WARNING WARNING WARNING +dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4 dnl aclocal.m4 -*-shell-script-*- dnl StepMake subroutines for configure.in AC_DEFUN(AC_STEPMAKE_COMPILE, [ # -O is necessary to get inlining OPTIMIZE="" - CXXFLAGS=${CXXFLAGS:-""} CFLAGS=${CFLAGS:-""} + CXXFLAGS=${CXXFLAGS:-$CFLAGS} + LDFLAGS=${LDFLAGS:-""} checking_b=yes optimise_b=no profile_b=no @@ -42,12 +45,6 @@ AC_DEFUN(AC_STEPMAKE_COMPILE, [ [MINGWPREFIX=$enableval], [MINGWPREFIX=no]) - if test "$printing_b" = no; then - # ugh - AC_DEFINE(NPRINT) - DEFINES="$DEFINES -DNPRINT" - fi - if test "$checking_b" = no; then # ugh AC_DEFINE(NDEBUG) @@ -101,7 +98,7 @@ AC_DEFUN(AC_STEPMAKE_CXX, [ CPPFLAGS="$CPPFLAGS $DEFINES" CXXFLAGS="$CXXFLAGS $OPTIMIZE" - LDFLAGS=$EXTRA_LIBES + LDFLAGS="$LDFLAGS $EXTRA_LIBES" AC_SUBST(CXXFLAGS) AC_SUBST(CXX) @@ -343,7 +340,6 @@ dnl fi AC_SUBST(PATHSEP) AC_SUBST(DIRSEP) - AC_STEPMAKE_DATADIR ]) @@ -565,6 +561,13 @@ AC_DEFUN(AC_STEPMAKE_TEXMF, [ break; fi done + + # + # For now let people define these in their environments + # + : ${MFPLAIN_MP='/usr/share/texmf/metapost/base/mfplain.mp'} + : ${INIMETAPOST_FLAGS='-interaction=nonstopmode'} + rm -f mfput.* AC_MSG_RESULT($MFMODE) @@ -573,6 +576,8 @@ AC_DEFUN(AC_STEPMAKE_TEXMF, [ AC_SUBST(MFMODE) AC_SUBST(INIMETAFONT) AC_SUBST(INIMETAPOST) + AC_SUBST(MFPLAIN_MP) + AC_SUBST(INIMETAPOST_FLAGS) ]) AC_DEFUN(AC_STEPMAKE_WARN, [ diff --git a/config.make.in b/config.make.in index 0c1b920b10..2ace88be93 100644 --- a/config.make.in +++ b/config.make.in @@ -6,7 +6,7 @@ package-depth = @package_depth@ USER_CFLAGS = @CFLAGS@ USER_CXXFLAGS = @CXXFLAGS@ @CPPFLAGS@ @GUILE_CFLAGS@ -USER_LDFLAGS = @GUILE_LDFLAGS@ +USER_LDFLAGS = @LDFLAGS@ @GUILE_LDFLAGS@ CC = @CC@ CXX = @CXX@ @@ -48,11 +48,13 @@ FIND = @FIND@ FLEX = @FLEX@ INIMETAFONT = @INIMETAFONT@ INIMETAPOST = @INIMETAPOST@ +INIMETAPOST_FLAGS = @INIMETAPOST_FLAGS@ LN = @LN@ LN_S = @LN_S@ METAFONT = @METAFONT@ MFMODE = @MFMODE@ METAPOST = @METAPOST@ +MFPLAIN_MP = @MFPLAIN_MP@ MSGFMT = @MSGFMT@ PATHSEP = @PATHSEP@ PERL = @PERL@ diff --git a/scm/lily.scm b/scm/lily.scm index f1431284bc..9c9ae7a896 100644 --- a/scm/lily.scm +++ b/scm/lily.scm @@ -410,20 +410,20 @@ ))) (define (select-font font-name magnification) - (if (not (equal? font-name current-font)) - (begin - (set! current-font font-name) - (define font-cmd (assoc font-name font-alist)) - (if (eq? font-cmd #f) - (begin - (set! font-cmd (cached-fontname font-count)) - (set! font-alist (acons font-name font-cmd font-alist)) - (set! font-count (+ 1 font-count)) - (string-append "\n/" font-cmd " {/" - font-name " findfont " - (mag-to-size magnification) - " scalefont setfont} bind def \n" - font-cmd " \n")) + (define font-cmd (assoc font-name font-alist)) + (if (not (equal? font-name current-font)) + (begin + (set! current-font font-name) + (if (eq? font-cmd #f) + (begin + (set! font-cmd (cached-fontname font-count)) + (set! font-alist (acons font-name font-cmd font-alist)) + (set! font-count (+ 1 font-count)) + (string-append "\n/" font-cmd " {/" + font-name " findfont " + (mag-to-size magnification) + " scalefont setfont} bind def \n" + font-cmd " \n")) (string-append (cdr font-cmd) " "))) ; font-name == current-font no switch needed "" diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4 index 1bbc0f1cc9..2d681ce09a 100644 --- a/stepmake/aclocal.m4 +++ b/stepmake/aclocal.m4 @@ -1,13 +1,16 @@ dnl WARNING WARNING WARNING WARNING dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4 +dnl WARNING WARNING WARNING WARNING +dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4 dnl aclocal.m4 -*-shell-script-*- dnl StepMake subroutines for configure.in AC_DEFUN(AC_STEPMAKE_COMPILE, [ # -O is necessary to get inlining OPTIMIZE="" - CXXFLAGS=${CXXFLAGS:-""} CFLAGS=${CFLAGS:-""} + CXXFLAGS=${CXXFLAGS:-$CFLAGS} + LDFLAGS=${LDFLAGS:-""} checking_b=yes optimise_b=no profile_b=no @@ -40,12 +43,6 @@ AC_DEFUN(AC_STEPMAKE_COMPILE, [ [MINGWPREFIX=$enableval], [MINGWPREFIX=no]) - if test "$printing_b" = no; then - # ugh - AC_DEFINE(NPRINT) - DEFINES="$DEFINES -DNPRINT" - fi - if test "$checking_b" = no; then # ugh AC_DEFINE(NDEBUG) @@ -99,7 +96,7 @@ AC_DEFUN(AC_STEPMAKE_CXX, [ CPPFLAGS="$CPPFLAGS $DEFINES" CXXFLAGS="$CXXFLAGS $OPTIMIZE" - LDFLAGS=$EXTRA_LIBES + LDFLAGS="$LDFLAGS $EXTRA_LIBES" AC_SUBST(CXXFLAGS) AC_SUBST(CXX) @@ -341,7 +338,6 @@ dnl fi AC_SUBST(PATHSEP) AC_SUBST(DIRSEP) - AC_STEPMAKE_DATADIR ]) @@ -563,6 +559,13 @@ AC_DEFUN(AC_STEPMAKE_TEXMF, [ break; fi done + + # + # For now let people define these in their environments + # + : ${MFPLAIN_MP='/usr/share/texmf/metapost/base/mfplain.mp'} + : ${INIMETAPOST_FLAGS='-interaction=nonstopmode'} + rm -f mfput.* AC_MSG_RESULT($MFMODE) @@ -571,6 +574,8 @@ AC_DEFUN(AC_STEPMAKE_TEXMF, [ AC_SUBST(MFMODE) AC_SUBST(INIMETAFONT) AC_SUBST(INIMETAPOST) + AC_SUBST(MFPLAIN_MP) + AC_SUBST(INIMETAPOST_FLAGS) ]) AC_DEFUN(AC_STEPMAKE_WARN, [ diff --git a/stepmake/configure b/stepmake/configure index f0e6d92683..635962676a 100755 --- a/stepmake/configure +++ b/stepmake/configure @@ -1117,7 +1117,6 @@ EOF - if test "$datadir" = "\${prefix}/share"; then datadir='${prefix}/share/'$package @@ -1173,7 +1172,7 @@ fi echo $ac_n "checking language""... $ac_c" 1>&6 -echo "configure:1177: checking language" >&5 +echo "configure:1176: checking language" >&5 case "$language" in En* | en* | Am* | am* | US* | us*) lang=English;; @@ -1208,7 +1207,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1212: checking for $ac_word" >&5 +echo "configure:1211: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MAKEINFO'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else diff --git a/stepmake/stepmake/metapost-rules.make b/stepmake/stepmake/metapost-rules.make index ef846f8a3c..2ecf0bc232 100644 --- a/stepmake/stepmake/metapost-rules.make +++ b/stepmake/stepmake/metapost-rules.make @@ -2,9 +2,8 @@ $(outdir)/%.0: %.mf mfplain.mem -$(METAPOST) "&mfplain \mode=lowres; \mag=1.0; nonstopmode; input $<" -MFPLAIN_MP=/usr/share/texmf/metapost/base/mfplain.mp mfplain.mem: $(MFPLAIN_MP) - $(INIMETAPOST) -interaction=nonstopmode $(MFPLAIN_MP) dump + $(INIMETAPOST) $(INIMETAPOST_FLAGS) $(MFPLAIN_MP) dump $(outdir)/%.pfa: $(outdir)/%.0 -- 2.39.5