$(FCMATCH), only if $(NCSB_DIR) not set.
* configure.in (LINK_GXX_STATICALLY): only warn if $NCSB_DIR set.
* config.make.in (DOCUMENTATION): set FCMATCH
* autogen.sh (srcdir): don't set --with-ncsb-dir.
+2006-05-03 Han-Wen Nienhuys <hanwen@xs4all.nl>
+
+ * mf/GNUmakefile (FC_FIND): new function. Find ncsb using
+ $(FCMATCH), only if $(NCSB_DIR) not set.
+
+ * configure.in (LINK_GXX_STATICALLY): only warn if $NCSB_DIR set.
+
+ * config.make.in (DOCUMENTATION): set FCMATCH
+
+ * autogen.sh (srcdir): don't set --with-ncsb-dir.
+
2006-05-03 Graham Percival <gpermus@gmail.com>
* Documentation/user/ various: final round of reorg.
done
#conf_flags="--enable-maintainer-mode --enable-compile-warnings" #--enable-iso-c
-conf_flags="--with-ncsb-dir=/usr/share/fonts/default/Type1/"
+#conf_flags="--with-ncsb-dir=/usr/share/fonts/default/Type1/"
if test -n "$NOCONFIGURE"; then
echo Skipping configure process.
DOCUMENTATION = @DOCUMENTATION@
DOTEXE = @DOTEXE@
FIND = @FIND@
+FCMATCH = @FCMATCH@
FLEX = @FLEX@
FLEXLEXER_FILE = @FLEXLEXER_FILE@
FONTFORGE = @FONTFORGE@
AC_ARG_WITH(ncsb-dir,
[ --with-ncsb-dir=DIR location of Century Schoolbook fonts.],
[NCSB_DIR=$withval],
- [NCSB_DIR=/usr/share/fonts/default/Type1])
+ )
reloc_b=no
AC_ARG_ENABLE(relocation,
STEPMAKE_PATH_PROG(GHOSTSCRIPT, gs, OPTIONAL, 8.15)
STEPMAKE_PROGS(MFTRACE, mftrace, REQUIRED, 1.1.19)
+STEPMAKE_PROGS(FCMATCH, fc-match, OPTIONAL, 2.1.0)
STEPMAKE_PATH_PROG(FONTFORGE, fontforge, REQUIRED, 20050624)
AC_CHECK_HEADERS([assert.h grp.h libio.h pwd.h sys/stat.h wchar.h])
fi
AC_MSG_CHECKING([New Century Schoolbook PFB files])
-if test ! -f "$NCSB_DIR/c059016l.pfb"; then
- AC_MSG_WARN($NCSB_DIR does not contain c059033l.pfb. Use --with-ncsb-dir)
+
+if test "$NCSB_DIR" != "" ; then
+ if test ! -f "$NCSB_DIR/c059016l.pfb"; then
+ AC_MSG_WARN($NCSB_DIR does not contain c059033l.pfb. Use --with-ncsb-dir)
+ fi
fi
+
AC_MSG_RESULT($NCSB_DIR)
AC_SUBST(NCSB_DIR)
FETA_FONTS = $(FETA_MF_FILES:.mf=)
SVG_FILES = $(OTF_FILES:%.otf=%.svg) $(ALL_FONTS:%=$(outdir)/%.svg)
+FC_FIND=$(shell $(FCMATCH) --verbose 'Century Schoolbook L:style=$(1)' | grep 'file:' | sed 's/.*"\([^"]*\)".*/\1/g')
+
+ifeq ($(NCSB_DIR),)
+NCSB_SOURCE_FILES=$(call FC_FIND,Roman) \
+ $(call FC_FIND,Italic) \
+ $(call FC_FIND,Bold Italic) \
+ $(call FC_FIND,Bold)
+else
+NCSB_SOURCE_FILES=$(addsuffix .pfb,$(addprefix $(NCSB_DIR),c059013l c059016l c059033l c059036l))
+endif
-NCSB_SOURCE_FILES=c059013l c059016l c059033l c059036l
NCSB_OTFS=$(addprefix $(outdir)/,CenturySchL-Ital.otf CenturySchL-BoldItal.otf CenturySchL-Roma.otf CenturySchL-Bold.otf)
NCSB_INSTALL_DIR=$(local_lilypond_datadir)/fonts/otf
cp $< $@
-$(NCSB_OTFS): $(addsuffix .pfb,$(addprefix $(NCSB_DIR)/,$(NCSB_SOURCE_FILES))) $(buildscript-dir)/pfx2ttf.fontforge
- $(foreach i,$(NCSB_SOURCE_FILES), \
+$(NCSB_OTFS): $(NCSB_SOURCE_FILES) $(buildscript-dir)/pfx2ttf.fontforge
+ $(foreach i, $(basename $(NCSB_SOURCE_FILES)), \
$(FONTFORGE) -script $(buildscript-dir)/pfx2ttf.fontforge \
- $(NCSB_DIR)/$(i).pfb $(NCSB_DIR)/$(i).afm $(outdir)/ && ) true
+ $(i).pfb $(i).afm $(outdir)/ && ) true