patch::: 1.2.15.jcn3

pl 15.jcn3
	- bf: smob fix?
	- mutopia/doc target 'local-web':
	  shorthand for 'CONFIGSUFFIX=www local-WWW'

diff --git a/CHANGES b/CHANGES
index e7b8bdb8f3f59e87a4aa2a2546e21aa783cc82fb..fd5211f724fb2ea36025230b9547c150b1b809fb 100644 (file)
--- 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 92af2c636680826f750609af2a41e64ecda2f4dd..2898e1d987f698b294c0ab48a8e22e13ee29c00b 100644 (file)
--- 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 9282bfc0100c045c6128c51491ee3bb2cb15dcac..8ab1a73889ff302af0d4ef8c8d3a71730dbb3745 100644 (file)
--- 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 7bc061169dcfd41065ef58fad41f449d68cf37f3..35b8afd3be33d83ec672ba1ad70543dfd6b741a3 100644 (file)
--- 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 fc2d648a1f347407ace210535bbb66c28a64ce04..36650129c00c2815ac0c3406bf1fcfbc51d9e375 100644 (file)
--- 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