From ca6d87cc5cd97c4d76c4be22829476d01dc2c19e Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Mon, 18 Apr 2005 14:57:41 +0000 Subject: [PATCH] *** empty log message *** --- ChangeLog | 6 ++++++ config.make.in | 1 - input/test/ancient-font.ly | 4 ++-- stepmake/aclocal.m4 | 28 ++-------------------------- 4 files changed, 10 insertions(+), 29 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1359e3c6d2..1296215845 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,12 @@ 2005-04-18 Han-Wen Nienhuys + * config.make.in (TTFTOOL_ENDIAN): rm TFM_PATH + + * aclocal.m4: remove --enable-tfm-path configure option + + * input/test/ancient-font.ly (lowerStaff): clef name errors. + * scm/backend-library.scm (postscript->png): newline after finishing command. diff --git a/config.make.in b/config.make.in index 971ab5c59d..ec381e6fc4 100644 --- a/config.make.in +++ b/config.make.in @@ -106,7 +106,6 @@ ROOTSEP = @ROOTSEP@ SHELL = @SHELL@ SPLITTING_MAKEINFO = @SPLITTING_MAKEINFO@ TAR = @TAR@ -TFM_PATH = @TFM_PATH@ TTFTOOL_ENDIAN = @TTFTOOL_ENDIAN@ YACC = @YACC@ ZIP = @ZIP@ diff --git a/input/test/ancient-font.ly b/input/test/ancient-font.ly index 5960389186..b038e1a0d7 100644 --- a/input/test/ancient-font.ly +++ b/input/test/ancient-font.ly @@ -263,7 +263,7 @@ lowerStaff = \context MensuralStaff = "lowerStaff" << \override Custos #'style = #'mensural \override Custos #'neutral-position = #3 \override Custos #'neutral-direction = #-1 - clefGlyph = #"clefs.petrucci-c2" + clefGlyph = #"clefs.petrucci.c2" clefPosition = #-2 clefOctavation = #0 } @@ -281,7 +281,7 @@ lowerStaff = \context MensuralStaff = "lowerStaff" << \override Custos #'style = #'vaticana \override Custos #'neutral-position = #4 \override Custos #'neutral-direction = #-1 - clefGlyph = #"clefs.vaticana-do" + clefGlyph = #"clefs.vaticana.do" clefPosition = #1 clefOctavation = #0 } diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4 index 31ddaed991..71b2f9f097 100644 --- a/stepmake/aclocal.m4 +++ b/stepmake/aclocal.m4 @@ -994,36 +994,12 @@ AC_DEFUN(STEPMAKE_PYTHON_DEVEL, [ ]) + AC_DEFUN(STEPMAKE_TEXMF_DIRS, [ - AC_ARG_ENABLE(tfm-path, - [ --enable-tfm-path=PATH set path of tex directories where tfm files live, - esp.: cmr10.tfm. Default: use kpsewhich], - [tfm_path=$enableval], - [tfm_path=auto] ) # ugh STEPMAKE_PROGS(KPSEWHICH, kpsewhich, OPTIONAL) - AC_MSG_CHECKING(for tfm path) - - TFM_FONTS="cmr msam" - - if test "x$tfm_path" = xauto ; then - if test "x$KPSEWHICH" != "xno" ; then - for i in $TFM_FONTS; do - dir=`$KPSEWHICH tfm ${i}10.tfm` - TFM_PATH="$TFM_PATH `dirname $dir`" - done - else - STEPMAKE_WARN(Please specify where cmr10.tfm lives: - ./configure --enable-tfm-path=/usr/local/TeX/lib/tex/fonts) - fi - else - TFM_PATH=$tfm_path - fi - - TFM_PATH=`echo $TFM_PATH | tr ':' ' '` - AC_MSG_RESULT($TFM_PATH) - AC_SUBST(TFM_PATH) + ]) -- 2.39.2