From c73da6297d1ae783a1bf3d2fc581d5d7a326586c Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Wed, 20 Oct 1999 12:28:26 +0200 Subject: [PATCH] patch::: 1.2.15.jcn3 pl 15.jcn3 - bf: smob fix? - mutopia/doc target 'local-web': shorthand for 'CONFIGSUFFIX=www local-WWW' --- CHANGES | 5 +++++ VERSION | 2 +- lily/score-element.cc | 4 +++- make/mutopia-targets.make | 4 +++- stepmake/stepmake/documentation-targets.make | 3 +++ 5 files changed, 15 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index e7b8bdb8f3..fd5211f724 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,8 @@ +pl 15.jcn3 + - bf: smob fix? + - mutopia/doc target 'local-web': + shorthand for 'CONFIGSUFFIX=www local-WWW' + pl 15.jcn2 - small website fixes diff --git a/VERSION b/VERSION index 92af2c6366..2898e1d987 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=2 PATCH_LEVEL=15 -MY_PATCH_LEVEL=jcn2 +MY_PATCH_LEVEL=jcn3 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/lily/score-element.cc b/lily/score-element.cc index 9282bfc010..8ab1a73889 100644 --- a/lily/score-element.cc +++ b/lily/score-element.cc @@ -448,12 +448,14 @@ Score_element::smobify_self () return self_scm_; SCM s; + SCM_NEWCELL(s); + self_scm_ = s; + SCM_SETCAR(s,smob_tag); void * me_p = this; SCM_SETCDR(s,me_p); scm_protect_object (s); - self_scm_ = s; scm_unprotect_object (element_property_alist_); // ugh return s; diff --git a/make/mutopia-targets.make b/make/mutopia-targets.make index 7bc061169d..35b8afd3be 100644 --- a/make/mutopia-targets.make +++ b/make/mutopia-targets.make @@ -2,12 +2,14 @@ all: $(OUT_FILES) - local-WWW: $(ly_examples) $(fly_examples) $(ps_examples) $(png_examples) (cd $(outdir); $(PYTHON) ../$(buildscripts)/mutopia-index.py --prefix=../ --suffix=/$(outdir) $(html_subdirs) $(all_examples)) echo $^ > $(depth)/wwwlist # $(footify) $(outdir)/index.html +local-web: + $(MAKE) CONFIGSUFFIX=www local-WWW + convert-mudela: local-convert-mudela $(LOOP) diff --git a/stepmake/stepmake/documentation-targets.make b/stepmake/stepmake/documentation-targets.make index fc2d648a1f..36650129c0 100644 --- a/stepmake/stepmake/documentation-targets.make +++ b/stepmake/stepmake/documentation-targets.make @@ -7,6 +7,9 @@ do-doc: $(OUTTXT_FILES) local-WWW: $(OUTHTML_FILES) echo $^ > $(depth)/wwwlist +local-web: + $(MAKE) CONFIGSUFFIX=www local-WWW + doc: do-doc -- 2.39.5