From: fred Date: Wed, 27 Mar 2002 00:57:20 +0000 (+0000) Subject: lilypond-1.3.136 X-Git-Tag: release/1.5.59~874 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=bd8ab682f83ce4f259040fbd9d31860b2e02f5ee;p=lilypond.git lilypond-1.3.136 --- diff --git a/Documentation/bibliography/GNUmakefile b/Documentation/bibliography/GNUmakefile index b3fd5fc7a1..78e0c3c730 100644 --- a/Documentation/bibliography/GNUmakefile +++ b/Documentation/bibliography/GNUmakefile @@ -36,5 +36,5 @@ $(outdir)/%.html: %.bib -$(BIBTEX2HTML) $(BIBTEX2HTML_FLAGS) $(footify) $@ -localclean: +local-clean: rm -f fonts.aux fonts.log feta*.tfm feta*.*pk diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile index b73273417f..b6c5d83f79 100644 --- a/Documentation/user/GNUmakefile +++ b/Documentation/user/GNUmakefile @@ -100,7 +100,7 @@ $(outdir)/%.bib: %.bib # we want footers even if website builds (or is built) partly $(MAKE) footify -localclean: +local-clean: rm -f fonts.aux fonts.log feta*.tfm feta*.*pk rm -rf $(outdir)/lilypond $(outdir)/lilypond-internals diff --git a/GNUmakefile.in b/GNUmakefile.in index 41d87c4315..9bf8f5caa3 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -73,7 +73,7 @@ examples: # and using a matching TeX (well, I gave up trying for now). my_tfm_path=$(TFM_PATH) /tmp /tmp /tmp /tmp /tmp /tmp -localinstall: +local-install: mkdir -p $(datadir) ifeq ($(KPATHSEA),0) $(foreach i, 1 2 3 4 5, rm -f $(datadir)/tfm.$(i); $(LN_S) $(word $(i), $(my_tfm_path)) $(datadir)/tfm.$(i) ; ) diff --git a/intl/GNUmakefile b/intl/GNUmakefile index 472d7bfa88..b2c1ea1200 100644 --- a/intl/GNUmakefile +++ b/intl/GNUmakefile @@ -24,10 +24,10 @@ default: $(outdir) $(outdir)/library.a: @echo "*** To install libintl type 'make lib; make install-lib' ***" -localinstall: $(outdir) +local-install: $(outdir) @echo "*** To install libintl type 'make lib; make install-lib' ***" -localuninstall: $(outdir) +local-uninstall: $(outdir) @echo "*** To uninstall libintl type 'make uninstall-lib' ***" include $(depth)/make/stepmake.make @@ -38,8 +38,8 @@ lib: $(MAKE) LIBINTL=yes all install-lib: $(LIBRARY) - $(MAKE) LIBINTL=yes localinstall + $(MAKE) LIBINTL=yes local-install uninstall-lib: - $(MAKE) LIBINTL=yes localuninstall + $(MAKE) LIBINTL=yes local-uninstall diff --git a/lily/kpath.cc b/lily/kpath.cc index fe928b6935..8f6f819343 100644 --- a/lily/kpath.cc +++ b/lily/kpath.cc @@ -8,7 +8,9 @@ source file of the GNU LilyPond music typesetter */ #include + #include "config.h" +#include "string.hh" #define popen REALLYUGLYKLUDGE #define pclose ANOTHERREALLYUGLYKLUDGE @@ -21,7 +23,7 @@ extern "C" { #endif #include "kpath.hh" - +#include "version.hh" char * ly_find_afm (char const * name) @@ -51,18 +53,19 @@ ly_init_kpath (char *av0) kpse_set_program_name(av0, NULL); kpse_maketex_option("tfm", TRUE); - /* - UGH: should not use DIR_DATADIR, but /var, - */ - /* ugh: apparently the program_args is non-functional. */ - kpse_format_info[kpse_tfm_format].program ="mktextfm --destdir " DIR_DATADIR "/tfm"; +#define VERSION MAJOR_VERSION "." MINOR_VERSION "." PATCH_LEVEL + +#define MY_TFMPATH "$VARTEXFONTS/tfm/lilypond/" VERSION "/" - kpse_format_info[kpse_tfm_format].client_path = - (DIR_DATADIR "/tfm" ); + char * mypath = kpse_expand (MY_TFMPATH); + String prog = "mktextfm --destdir "; + prog += mypath; + kpse_format_info[kpse_tfm_format].program = strdup (prog.ch_C()); + kpse_format_info[kpse_tfm_format].client_path = mypath; #endif } diff --git a/lily/script-engraver.cc b/lily/script-engraver.cc index 22870e2075..ee65cbcb26 100644 --- a/lily/script-engraver.cc +++ b/lily/script-engraver.cc @@ -24,7 +24,7 @@ protected: virtual void initialize (); virtual void stop_translation_timestep (); virtual void start_translation_timestep (); - virtual void create_grobs (); + virtual void process_music (); virtual void acknowledge_grob (Grob_info); }; @@ -52,7 +52,7 @@ Script_engraver::try_music (Music *r_l) } void -Script_engraver::create_grobs () +Script_engraver::process_music () { for (int i=0; i < script_req_l_arr_.size(); i++) { @@ -115,7 +115,6 @@ Script_engraver::create_grobs () announce_grob (p, l); } - script_req_l_arr_.clear (); } void @@ -134,6 +133,7 @@ Script_engraver::acknowledge_grob (Grob_info inf) Grob*e = script_p_arr_[i]; e->set_grob_property ("direction-source", inf.elem_l_->self_scm ()); + e->add_dependency (inf.elem_l_); Side_position_interface::add_support (e, inf.elem_l_); } } diff --git a/lily/side-position-interface.cc b/lily/side-position-interface.cc index f18363f95d..701e415fee 100644 --- a/lily/side-position-interface.cc +++ b/lily/side-position-interface.cc @@ -14,6 +14,7 @@ #include "dimensions.hh" #include "staff-symbol-referencer.hh" #include "group-interface.hh" +#include "directional-element-interface.hh" void Side_position_interface::add_support (Grob*me, Grob*e) @@ -41,7 +42,7 @@ Side_position_interface::get_direction (Grob*me) Grob * e = unsmob_grob(other_elt); if (e) { - return (Direction)(relative_dir * Side_position_interface::get_direction (e)); + return (Direction)(relative_dir * Directional_element_interface::get (e)); } return CENTER; diff --git a/make/ly.make b/make/ly.make index f3a595d95d..a29c020885 100644 --- a/make/ly.make +++ b/make/ly.make @@ -70,7 +70,7 @@ $(outdir)/%-book.ps: $(outdir)/%.ps # # Also clean hand-compiled stuff in cwd # -localclean: local-auto-gen-clean +local-clean: local-auto-gen-clean # Compose string from two parts: must not remove myself. auto-gen-tag=Generated diff --git a/make/mutopia-targets.make b/make/mutopia-targets.make index 64c846e9de..b01250df59 100644 --- a/make/mutopia-targets.make +++ b/make/mutopia-targets.make @@ -35,7 +35,7 @@ mutopia-letter=$(mutopia-examples:%=out-letter/%.ps.gz) mutopia: $(MAKE) examples="$(mutopia-examples)" PAPERSIZE=letter local-WWW $(mutopia-letter) -localclean: local-letter-clean +local-clean: local-letter-clean local-letter-clean: rm -f $(outdir)-letter/* diff --git a/mf/GNUmakefile b/mf/GNUmakefile index 02c950bc3e..18da207eec 100644 --- a/mf/GNUmakefile +++ b/mf/GNUmakefile @@ -58,7 +58,8 @@ default: $(ALL_GEN_FILES) $(outdir)/%.afm $(outdir)/%.tex $(outdir)/%.dep: $(outdir)/%.log $(PYTHON) $(buildscript-dir)/mf-to-table.py --package=$(topdir) --outdir=$(outdir) --dep $(outdir)/$(