* Documentation/user/GNUmakefile: dist context-example.eps too.

* lily/key-engraver.cc (create_key): use
explicitKeySignatureVisibility for cancellation too. Backportme.

* lily/font-config.cc (init_fontconfig): don't close file if
f==NULL. Backportme.

diff --git a/ChangeLog b/ChangeLog
index 2e70acc09bb50178a47075d587b411125fb3462b..cb2b35e3f0e2a9daf3dc7aa43647015cce7c6afd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-05-15  Han-Wen Nienhuys  <hanwen@lilypond.org>
+
+       * Documentation/user/GNUmakefile: dist context-example.eps too.
+
+       * lily/key-engraver.cc (create_key): use
+       explicitKeySignatureVisibility for cancellation too. Backportme.
+
+       * lily/font-config.cc (init_fontconfig): don't close file if
+       f==NULL. Backportme.
+
 2006-05-15  Erlend Aasland  <erlenda@gmail.com>
 
        * Documentation/topdocs/NEWS.tely: niente and rotation news

diff --git a/Documentation/topdocs/NEWS.tely b/Documentation/topdocs/NEWS.tely
index 5d21453fd0fb9608dad44af7b2a319a47c4e6996..b17a0280d98b854c8d4581df3585b514f7cf7cc7 100644 (file)
--- a/Documentation/topdocs/NEWS.tely
+++ b/Documentation/topdocs/NEWS.tely
@@ -99,7 +99,7 @@ The beam printing code has been completely rewritten, and now includes
 support for feathered beaming,
 
 @lilypond[ragged-right,fragment,relative=2]
-\featherDurations #(ly:make-moment 3 4) 
+\featherDurations #(ly:make-moment 5 4) 
 {
   \override Beam #'grow-direction = #LEFT
   c16[

diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile
index f8d23a013cc8306cbba115887ce850b2a29da71c..a56214436c8d7c35a5ce58742555826b3017036b 100644 (file)
--- a/Documentation/user/GNUmakefile
+++ b/Documentation/user/GNUmakefile
@@ -5,8 +5,10 @@ LATEX_FILES =$(call src-wildcard,*.latex)
 # todo: add latex.
 DVI_FILES = $(TELY_FILES:%.tely=$(outdir)/%.dvi)
 
-EXTRA_DIST_FILES= $(LATEX_FILES) $(IMAGES) README.txt
+EXTRA_DIST_FILES= $(LATEX_FILES) $(IMAGES) README.txt $(ILLUSTRATIONS)
+
 IMAGES=$(call src-wildcard,*.png)
+ILLUSTRATIONS=context-example.eps
 
 OUT_EPS_IMAGES=$(IMAGES:%.png=$(outdir)/%.eps)
 OUT_PNG_IMAGES=$(IMAGES:%=$(outdir)/%)

diff --git a/THANKS b/THANKS
index 02ba810a4da8586beb0696ce53194e39ace282de..4f4077d1e27971c0d30139ca61637d3c432b0a7a 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -37,6 +37,7 @@ Juergen Reuter
 BUG HUNTERS/SUGGESTIONS
 
 Aurèle Duda
+Cameron Horsburgh
 Claude Routhier
 Christopher Ellis
 Colin Wilding
@@ -49,6 +50,7 @@ Orm Finnendahl
 Rick Hansen
 Sietse Brouwer
 Stephen Carter
+Trent Johnston
 Werner Lemberg
 
 Release 2.8

diff --git a/configure.in b/configure.in
index 1e69994e1cbc97801cd21e7ed1189f7a560e32ea..29bc273838b31128474f871fe242d554a8bdcba5 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -71,6 +71,7 @@ else
       NCSB_FILE=`$FCMATCH --verbose 'Century Schoolbook L:style=$style' | grep 'file:'`
 
       NCSB_FILE=`echo $NCSB_FILE | sed 's/^.*"\(.*\)".*$/\1/g'`
+      NCSB_FILE=`readlink -f $NCSB_FILE`
       NCSB_SOURCE_FILES="$NCSB_FILE $NCSB_SOURCE_FILES"
     done
   else

diff --git a/lily/font-config.cc b/lily/font-config.cc
index 393feb2b6c93c9a23e9c961199c4fb404af1837a..b59325f55a8e2b890b23f31675be62b24cc9b048 100644 (file)
--- a/lily/font-config.cc
+++ b/lily/font-config.cc
@@ -62,7 +62,8 @@ init_fontconfig ()
     {
       /* inhibit future messages. */
       FILE *f = fopen ((char*)cache_file, "w");
-      fclose (f);
+      if (f)
+       fclose (f);
     }
   
 }

diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc
index f46717fb914291d0093600b2b418ff4ef133668f..b2c4ce7cbaa15231096f4a011e3f0c7d95ce3826 100644 (file)
--- a/lily/key-engraver.cc
+++ b/lily/key-engraver.cc
@@ -106,6 +106,8 @@ Key_engraver::create_key (bool is_default)
     {
       SCM visibility = get_property ("explicitKeySignatureVisibility");
       item_->set_property ("break-visibility", visibility);
+      if (cancellation_)
+       cancellation_->set_property ("break-visibility", visibility);
     }
 }