lilypond-1.3.136

diff --git a/Documentation/bibliography/GNUmakefile b/Documentation/bibliography/GNUmakefile
index b3fd5fc7a139e34b0ddbaa1216115249ec43a4ce..78e0c3c7306f2a5d9cd0a9839bfa79ec18b10a80 100644 (file)
--- 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 b73273417f731bb09595c26efc29e31a1ca65852..b6c5d83f793ca798271ba39d854f0c81de2a7f58 100644 (file)
--- 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 41d87c4315fdc4e4fa6b20f77ce47240a0af4bf5..9bf8f5caa3a6d2bf49ca62aebea5e49b3ea96a76 100644 (file)
--- 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 472d7bfa88051312b2f03d12ccdaf46f365e3927..b2c1ea1200a2931ad4e2b92b599eafb3539bdbb4 100644 (file)
--- 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 fe928b693513e5d0244f96b5b235618fd6363915..8f6f8193434e9fcd1cb86881c74ea828a7039dd7 100644 (file)
--- a/lily/kpath.cc
+++ b/lily/kpath.cc
@@ -8,7 +8,9 @@ source file of the GNU LilyPond music typesetter
  */
 
 #include <stdio.h>
+
 #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 22870e20757463d6acedb92ccf23d8429ae3a789..ee65cbcb266c725be5973482b66f4fffc986118a 100644 (file)
--- 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 f18363f95dc5ed8dd2758a5cf1437226f5a08590..701e415feef054c06d0f821cde6341706f90860d 100644 (file)
--- 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 f3a595d95d9a726fd2b22e6b1088c542dd92812f..a29c02088560086780097b80a78f6491bb5a95e8 100644 (file)
--- 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 64c846e9de0f3b8955c69d01fef1d958cd15b570..b01250df598eb0663eafd357eca7785b42f67c4d 100644 (file)
--- 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 02c950bc3ef327c08a3ac063a92986190dbe6b71..18da207eec9b589487d3efb2c001ad806d7f5503 100644 (file)
--- 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)/$(<F:.log=.dep)  --afm $(outdir)/$(<F:.log=.afm) --tex $(outdir)/$(<F:.log=.tex) $<
 
-localclean:
+local-clean:
        rm -f mfplain.mem mfplain.log mpout.log
        rm -f *.tfm *.log
 
+

diff --git a/po/GNUmakefile b/po/GNUmakefile
index fb421f78908c3fe1a490f26d23f4870b4b570cb1..09773511607b9a751d0950d2e111494c30904554 100644 (file)
--- a/po/GNUmakefile
+++ b/po/GNUmakefile
@@ -18,14 +18,14 @@ include $(depth)/make/stepmake.make
 
 default: $(MO_FILES)
 
-localinstall: $(MO_FILES)
+local-install: $(MO_FILES)
        for i in $(CATALOGS); do \
          $(INSTALL) -d $(localedir)/$$i/LC_MESSAGES; \
          $(INSTALL) -m 644 $(outdir)/$$i.mo \
          $(localedir)/$$i/LC_MESSAGES/$(package).mo; \
        done
 
-localuninstall:
+local-uninstall:
        for i in $(CATALOGS); do \
          rm -f $(localedir)/$$i/LC_MESSAGES/$(package).mo; \
          rmdir $(localedir)/$$i/LC_MESSAGES || true; \

diff --git a/scm/script.scm b/scm/script.scm
index bf47558dc2d88a179fcc7d9943f71ab7150dc707..c721e51ea79db8cda6acd53b10a77a5b52c2fa3e 100644 (file)
--- a/scm/script.scm
+++ b/scm/script.scm
@@ -6,6 +6,10 @@
 
 ;;TODO?      extra padding :: Real (given in staff spaces)
 
+
+;; TODO: generate Grob types for this, by prepending appropriate props
+;; on top of Script (?)  
+
 (set! default-script-alist
       (append 
       '(("thumb" . ((feta . ("thumb"  . "thumb")) #f 0 1 0))

diff --git a/stepmake/stepmake/documentation-targets.make b/stepmake/stepmake/documentation-targets.make
index 478bffd71d8d69642e6b7e8f7ed57362b7ba6f78..7084ab5b69ce5947420c113113a9167988d876c6 100644 (file)
--- a/stepmake/stepmake/documentation-targets.make
+++ b/stepmake/stepmake/documentation-targets.make
@@ -17,13 +17,13 @@ INFO_INSTALL_FILES = $(wildcard $(addsuffix *, $(INFO_FILES)))
 
 INFOINSTALL=$(MAKE) INSTALLATION_OUT_DIR=$(infodir) depth=$(depth) INSTALLATION_OUT_FILES="$(INFO_INSTALL_FILES)" -f $(stepdir)/install-out.sub.make
 
-localinstall: install-info
-localuninstall: uninstall-info
+local-install: install-info
+local-uninstall: uninstall-info
 
 install-info: $(INFO_FILES)
        -$(INSTALL) -d $(infodir)
-       $(INFOINSTALL) localinstall
+       $(INFOINSTALL) local-install
 
 uninstall-info:
-       $(INFOINSTALL) localuninstall
-       -rmdir $(infodir)
\ No newline at end of file
+       $(INFOINSTALL) local-uninstall
+       -rmdir $(infodir)

diff --git a/stepmake/stepmake/executable-targets.make b/stepmake/stepmake/executable-targets.make
index f0af1ac552521d3042abe4d9d243ead98f93b613..8c019e6f7a71161c0e24666fabfb63c577d0db72 100644 (file)
--- a/stepmake/stepmake/executable-targets.make
+++ b/stepmake/stepmake/executable-targets.make
@@ -13,9 +13,9 @@ exe: $(EXECUTABLE)
 
 
 
-localinstall: installexe
+local-install: installexe
 
-localuninstall: uninstallexe
+local-uninstall: uninstallexe
 
 installexe: all
        -$(INSTALL) -d $(bindir)

diff --git a/stepmake/stepmake/generic-targets.make b/stepmake/stepmake/generic-targets.make
index 697a1dd2c480016eb37bb26f5e065876d59113e3..293a4e513dd8dac38edd915e9a1983bc4db25371 100644 (file)
--- a/stepmake/stepmake/generic-targets.make
+++ b/stepmake/stepmake/generic-targets.make
@@ -11,7 +11,7 @@ man:
        $(LOOP)
 
 # be careful about deletion.
-clean: localclean
+clean: local-clean
        -rm -f $(outdir)/*
        $(LOOP)
 
@@ -130,7 +130,7 @@ configure: configure.in aclocal.m4
        autoconf 
        chmod +x configure
 
-localclean:
+local-clean:
 
 local-distclean:
 
@@ -139,15 +139,15 @@ local-maintainerclean:
 install-strip:
        $(MAKE) INSTALL="$(INSTALL) -s" install
 
-install: localinstall
+install: local-install
        $(LOOP)
 
-localinstall:
+local-install:
 
-uninstall: localuninstall
+uninstall: local-uninstall
        $(LOOP)
 
-localuninstall:
+local-uninstall:
 
 installextradoc:
        -$(INSTALL) -d $(prefix)/doc/$(package)

diff --git a/stepmake/stepmake/help2man-targets.make b/stepmake/stepmake/help2man-targets.make
index f11c29577bad1865b74a7868669e7aba03a5af88..a425c7eeee90a385809815cae40a8d49104efd27 100644 (file)
--- a/stepmake/stepmake/help2man-targets.make
+++ b/stepmake/stepmake/help2man-targets.make
@@ -1,6 +1,6 @@
 default: man
 
-localinstall: install-help2man
+local-install: install-help2man
 
 install-help2man: man
        -$(INSTALL) -d $(mandir)/man1
@@ -9,7 +9,7 @@ install-help2man: man
 
 man: $(HELP2MAN_GROFFS)
 
-localuninstall: uninstall-help2man
+local-uninstall: uninstall-help2man
 
 uninstall-help2man:
        $(foreach a, $(notdir $(MANGROFFS)), rm -f $(a) && ) true

diff --git a/stepmake/stepmake/install-library-targets.make b/stepmake/stepmake/install-library-targets.make
index cb3915ea42ee9f86a4b3ccfe4a8016e430b08513..3d657c5073f2d18e0bc07b506e575a153d8ca72e 100644 (file)
--- a/stepmake/stepmake/install-library-targets.make
+++ b/stepmake/stepmake/install-library-targets.make
@@ -1,5 +1,5 @@
 
-localinstall: $(LIBRARY)
+local-install: $(LIBRARY)
 ifneq ($(strip $(INSTALL_HEADERS)),)
        $(INSTALL) -d $(includedir)
        $(INSTALL) $(INSTALL_HEADERS) $(includedir)
@@ -14,7 +14,7 @@ else
        $(INSTALL) $(LIBRARY) $(libdir)/$(INSTALL_LIBRARY)
 endif
 
-localuninstall:
+local-uninstall:
 ifneq ($(strip $(INSTALL_HEADERS)),)
        rm -f $(addprefix $(includedir)/, $(INSTALL_HEADERS))
 endif

diff --git a/stepmake/stepmake/install-out-targets.make b/stepmake/stepmake/install-out-targets.make
index 18fffef64b8a9df543c828c08acbbc6e3bcc4f41..d4b42579c1ca522c228f876322637017e2fc8ee7 100644 (file)
--- a/stepmake/stepmake/install-out-targets.make
+++ b/stepmake/stepmake/install-out-targets.make
@@ -1,11 +1,11 @@
 # install-out-targets.make
 
-localinstall: localinstall-files localinstall-outfiles
+local-install: local-install-files local-install-outfiles
 
-localinstall-files:
+local-install-files:
 
 # urg, parameterise
-localinstall-outfiles: $(INSTALLATION_OUT_FILES) $(foreach suff, $(INSTALLATION_OUT_SUFFIXES), $(INSTALLATION_OUT_FILES$(suff)))
+local-install-outfiles: $(INSTALLATION_OUT_FILES) $(foreach suff, $(INSTALLATION_OUT_SUFFIXES), $(INSTALLATION_OUT_FILES$(suff)))
        -$(INSTALL) -d $(INSTALLATION_OUT_DIR)
        $(foreach i, $(INSTALLATION_OUT_FILES), \
                $(INSTALL) -m 644 $(i) $(INSTALLATION_OUT_DIR)/ && ) true
@@ -15,11 +15,11 @@ localinstall-outfiles: $(INSTALLATION_OUT_FILES) $(foreach suff, $(INSTALLATION_
                        $(INSTALL) -m 644 $(i) $(INSTALLATION_OUT_DIR$(suff))/ && ) true && ) true
 
 
-localuninstall: localuninstall-outfiles localuninstall-files 
+local-uninstall: local-uninstall-outfiles local-uninstall-files 
 
-localuninstall-files:
+local-uninstall-files:
 
-localuninstall-outfiles:
+local-uninstall-outfiles:
        rm -f $(foreach  i, $(notdir $(INSTALLATION_OUT_FILES)), \
                $(INSTALLATION_OUT_DIR)/$(i))
        rm -f $(foreach suff, $(INSTALLATION_OUT_SUFFIXES),  \

diff --git a/stepmake/stepmake/install-targets.make b/stepmake/stepmake/install-targets.make
index bda232d735a417f4582f1b3b7747c08f0ab892c4..a38b9b49f7b5fff74ca31c6cc9a36670bdd77534 100644 (file)
--- a/stepmake/stepmake/install-targets.make
+++ b/stepmake/stepmake/install-targets.make
@@ -1,11 +1,11 @@
 # install-targets.make
 
-localinstall: localinstall-files localinstall-outfiles
+local-install: local-install-files local-install-outfiles
 
-localinstall-outfiles:
+local-install-outfiles:
 
 # urg, parameterise
-localinstall-files:
+local-install-files:
        $(PRE_INSTALL)
        -$(INSTALL) -d $(INSTALLATION_DIR)
        $(foreach i,  $(INSTALLATION_FILES),\
@@ -16,11 +16,11 @@ localinstall-files:
                        $(INSTALL) -m 644 $(i) $(INSTALLATION_DIR$(suff))/  && )  && ) true
        $(POST_INSTALL)
 
-localuninstall: localuninstall-outfiles localuninstall-files 
+local-uninstall: local-uninstall-outfiles local-uninstall-files 
 
-localuninstall-outfiles:
+local-uninstall-outfiles:
 
-localuninstall-files:
+local-uninstall-files:
        rm -f $(foreach i,  $(INSTALLATION_FILES), $(INSTALLATION_DIR)/$(i))
        rm -f $(foreach suff, $(INSTALLATION_SUFFIXES),  \
                $(foreach i, $(INSTALLATION_FILES$(suff)),\

diff --git a/stepmake/stepmake/manual.make b/stepmake/stepmake/manual.make
index 0e6206dabf068750695fd925eb29383982e883bd..526d31e1fa53dd8456dbfb221fbb82e7728af2bd 100644 (file)
--- a/stepmake/stepmake/manual.make
+++ b/stepmake/stepmake/manual.make
@@ -2,12 +2,12 @@
 
 MANGROFF = $(addprefix $(outdir)/, $(addsuffix .$(SECTION)))
 
-localinstall: $(MANGROFFS)
+local-install: $(MANGROFFS)
        -$(INSTALL) -d $(mandir)/man$(SECTION)
        $(INSTALL) -m 644 $(MANGROFFS) $(mandir)/man$(SECTION)
 
 
-localuninstall:
+local-uninstall:
        (cd  $(mandir)/man$(SECTION)/; rm -f $(MANGROFF))
 
 

diff --git a/stepmake/stepmake/yolily-toplevel-targets.make b/stepmake/stepmake/yolily-toplevel-targets.make
index 377e05398c23723197beda6391918db7381e58ab..449b91c9acc9afcf48363870cf8eb8520152aab4 100644 (file)
--- a/stepmake/stepmake/yolily-toplevel-targets.make
+++ b/stepmake/stepmake/yolily-toplevel-targets.make
@@ -11,7 +11,7 @@ do-top-doc:
 
 $(README_TXT_FILES): do-top-doc
 
-localclean:
+local-clean:
 
 
 # if you fix this, please fix yodl too!

diff --git a/tex/fetdefs.tex b/tex/fetdefs.tex
index d98c6327af66c5f32205688c30a111d3e2d8ea4b..fca3c1bfd251b0d37219dbed3d2176f0fed7d860 100644 (file)
--- a/tex/fetdefs.tex
+++ b/tex/fetdefs.tex
@@ -2,13 +2,19 @@
 % encapsulating tex backend for auto-generated feta definitions
 
 % fix chord.cc::banter_str before removing these
+
 \def\fetdef#1#2{%
   \def#1{\hbox{\char#2}}}
 
 \fetdef\fetasharp{16}
 \fetdef\fetanatural{17}
 \fetdef\fetaflat{18}
-\font\fetasixteenfont=feta16
+
+%  \font\fetasixteenfont=feta16
+
+\def\fetasixteenfont{\message{TeX strings are deprecated. Please use
+Scheme markup expressions. See the reference manual for more information}} 
+
 \def\fetafont{\fetasixteenfont}
 \def\textflat{{\fetafont\raise 1ex\hbox{\fetaflat}}}
 \def\textnatural{{\fetafont\raise 1ex\hbox{\fetanatural}}}