From: Han-Wen Nienhuys Date: Wed, 7 Mar 2001 23:56:10 +0000 (+0100) Subject: release: 1.3.136 X-Git-Tag: release/1.3.136 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=125c505b0b8e664b9df2f11718fa6ffca6806060;p=lilypond.git release: 1.3.136 ======= * Bugfix: set dependency for direction-source in script-engraver. This fixes core-dump problem when stacking multiple scripts containing staccato dots. * Put TFM files under $VARTEXFONTS (/var/lib/texmf, typically). PK files are put in the right spot automatically, and dirs are also created automatically. A change to mktexnam is still required -- add MT_DESTROOT=foobar before line 161. 1.3.135.j --- diff --git a/CHANGES b/CHANGES index 0e5a9f2ca1..8b72892a42 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,20 @@ +1.3.136 +======= + +* Bugfix: set dependency for direction-source in script-engraver. This +fixes core-dump problem when stacking multiple scripts containing +staccato dots. + +* Put TFM files under $VARTEXFONTS (/var/lib/texmf, +typically). PK files are put in the right spot +automatically, and dirs are also created automatically. + +A change to mktexnam is still required -- add + + MT_DESTROOT=foobar + +before line 161. + 1.3.135.jcn3 ============ @@ -5,21 +22,18 @@ * Coriolan fixes. -1.3.135.jcn2 -============ - * Bugfix: (first and also) write global header fields; this fixes `latexpackages' and ly2dvi. -* Crude sanity check for kpath.cc searching. - -1.3.135.jcn1 -============ - * Bugfix: website build. * Fixed titling: cleaned out titledefs.tex for use by ly2dvi. +1.3.134.mb1 +=========== + +* minor documentation fix. + 1.3.134.jcn2 ============ @@ -86,7 +100,7 @@ interface-description.scm ============ * Tied notes at a linebreak repeat their accidental. - +F * Removed some cruft from lily/include/. * Bugfix: tied notes in chords sometimes got stuck in MIDI output 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/VERSION b/VERSION index d1fa40109c..967c6ccf87 100644 --- a/VERSION +++ b/VERSION @@ -1,8 +1,8 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=3 -PATCH_LEVEL=135 -MY_PATCH_LEVEL=jcn4 +PATCH_LEVEL=136 +MY_PATCH_LEVEL= # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/buildscripts/lilypond-login.sh b/buildscripts/lilypond-login.sh index ca9d6c5c9f..38fb855e80 100755 --- a/buildscripts/lilypond-login.sh +++ b/buildscripts/lilypond-login.sh @@ -19,5 +19,11 @@ if ($?TEXINPUTS) then else setenv TEXINPUTS "/usr/share/lilypond/tex::" endif +if ($?TEXINPUTS) then + setenv TFMFONTS "@datadir@/tfm:$TFMFONTS" +else + setenv TFMFONTS "@datadir@/tfm:" +endif + diff --git a/buildscripts/lilypond-profile.sh b/buildscripts/lilypond-profile.sh index 7dbb5dd467..48e60c0f3e 100755 --- a/buildscripts/lilypond-profile.sh +++ b/buildscripts/lilypond-profile.sh @@ -11,6 +11,7 @@ LILYPONDPREFIX="@datadir@" MFINPUTS="@datadir@/mf:"${MFINPUTS:=":"} TEXINPUTS="@datadir@/tex:@datadir@/ps:"${TEXINPUTS:=":"} +# TFMFONTS="@datadir@/tfm:$TFMFONTS" ## gs_lib ??? export LILYINCLUDE LILYPONDPREFIX MFINPUTS TEXINPUTS GS_LIB GS_FONTPATH diff --git a/input/bugs/st.ly b/input/bugs/st.ly new file mode 100644 index 0000000000..3f5f29252e --- /dev/null +++ b/input/bugs/st.ly @@ -0,0 +1,2 @@ + +\score { \notes { c'''-. c-. }} diff --git a/input/test/ancient-font.ly b/input/test/ancient-font.ly index fa45aac506..608810ada4 100644 --- a/input/test/ancient-font.ly +++ b/input/test/ancient-font.ly @@ -61,6 +61,7 @@ lowerVoice = \context Staff = lowerNotes < \property Staff.Custos \override #'style = #'mensural \clef "mensural1_c2"; c2 d e f g + \property Staff.forceClef = ##t \clef "mensural1_c2"; a b c' b a g f @@ -69,6 +70,7 @@ lowerVoice = \context Staff = lowerNotes < \clef "mensural2_c2"; c2 d e f g + \property Staff.forceClef = ##t \clef "mensural3_c2"; a b c' b a g f @@ -77,25 +79,30 @@ lowerVoice = \context Staff = lowerNotes < \clef "mensural1_f"; c2 d e f g + \property Staff.forceClef = ##t \clef "mensural1_f"; a b c' b a g f \clef "mensural2_f"; e d c1 \bar "|"; + \property Staff.forceClef = ##t \clef "mensural2_f"; c2 d e f g \clef "mensural_g"; a' b' c'' b' a' g' f' + \property Staff.forceClef = ##t \clef "mensural_g"; e' d' c'1 \bar "|"; + \property Staff.forceClef = ##t \clef "mensural_g"; c'2 d' e' f' g' \clef "hufnagel_do_fa"; a b c' b a g f + \property Staff.forceClef = ##t \clef "hufnagel_do_fa"; e d c1 \bar "||"; } 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 8fa0c142bd..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 @@ -20,14 +22,8 @@ extern "C" { } #endif -#include -#include -#if HAVE_SYS_STAT_H -#include -#endif - #include "kpath.hh" - +#include "version.hh" char * ly_find_afm (char const * name) @@ -58,28 +54,18 @@ ly_init_kpath (char *av0) kpse_maketex_option("tfm", TRUE); /* - UGH: should not use DIR_DATADIR, but /var, - - hmm, but where to get /var? - + ugh: apparently the program_args is non-functional. */ +#define VERSION MAJOR_VERSION "." MINOR_VERSION "." PATCH_LEVEL + +#define MY_TFMPATH "$VARTEXFONTS/tfm/lilypond/" VERSION "/" - int fd; - struct stat stat_buf; - if (stat (DIR_DATADIR "/tfm", &stat_buf) == 0 - && (S_ISDIR (stat_buf.st_mode) || S_ISLNK (stat_buf.st_mode)) - // ugh, howto test if we can write there? - // && (stat_buf.st_mode & S_IWUSR)) - && ((fd = open (DIR_DATADIR "/tfm/lily", O_CREAT)) != -1)) - { - close (fd); - unlink (DIR_DATADIR "/tfm/lily"); - kpse_format_info[kpse_tfm_format].program ="mktextfm --destdir " DIR_DATADIR "/tfm"; - - 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/pointer-group-interface.cc b/lily/pointer-group-interface.cc deleted file mode 100644 index def0d3701b..0000000000 --- a/lily/pointer-group-interface.cc +++ /dev/null @@ -1,15 +0,0 @@ -/* - group-interface.cc -- implement Pointer_group_interface - - source file of the GNU LilyPond music typesetter - - (c) 1999--2001 Han-Wen Nienhuys - - */ -#include "group-interface.hh" -#include "grob.hh" - - - - - 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/lilypond-vars.make b/make/lilypond-vars.make index 94531eb693..c0d23272d4 100644 --- a/make/lilypond-vars.make +++ b/make/lilypond-vars.make @@ -4,6 +4,7 @@ export PATH:=$(topdir)/lily/out:$(topdir)/buildscripts/out:$(PATH) export MFINPUTS:=$(topdir)/mf/:$(MFINPUTS):: export TEXINPUTS:=$(topdir)/mf/out/:$(topdir)/tex/:$(topdir)/ps/:$(TEXINPUTS):$(pwd):: export LILYINCLUDE:=$(topdir)/ps:$(topdir)/scm:$(topdir)/ly:$(topdir)/mf/out::$(TEX_TFMDIR):$(LILYINCLUDE) +export TFMFONTS=$(topdir)/mf/out: export LILYPONDPREFIX:=$(depth)/ 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/make/out/lilypond.lsm b/make/out/lilypond.lsm index 06e0fb02a5..0628708933 100644 --- a/make/out/lilypond.lsm +++ b/make/out/lilypond.lsm @@ -1,15 +1,15 @@ Begin3 Title: LilyPond -Version: 1.3.135 -Entered-date: 05MAR01 +Version: 1.3.136 +Entered-date: 08MAR01 Description: @BLURB@ Keywords: music notation typesetting midi fonts engraving Author: hanwen@cs.uu.nl (Han-Wen Nienhuys) janneke@gnu.org (Jan Nieuwenhuizen) Maintained-by: hanwen@stack.nl (Han-Wen Nienhuys) Primary-site: sunsite.unc.edu /pub/Linux/apps/sound/convert - 1000k lilypond-1.3.135.tar.gz + 1000k lilypond-1.3.136.tar.gz Original-site: ftp.cs.uu.nl /pub/GNU/LilyPond/development/ - 1000k lilypond-1.3.135.tar.gz + 1000k lilypond-1.3.136.tar.gz Copying-policy: GPL End diff --git a/make/out/lilypond.spec b/make/out/lilypond.spec index 92f02cbddc..b88efa2b62 100644 --- a/make/out/lilypond.spec +++ b/make/out/lilypond.spec @@ -1,11 +1,11 @@ %define info yes Name: lilypond -Version: 1.3.135 +Version: 1.3.136 Release: 1 License: GPL Group: Applications/Publishing -Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.3.135.tar.gz +Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.3.136.tar.gz Summary: A program for printing sheet music. URL: http://www.cs.uu.nl/~hanwen/lilypond # Icon: lilypond-icon.gif 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)/$(