* config.make.in: add TARGET_PYTHON

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

* lily/font-config.cc (init_fontconfig): only close nonNULL file.

diff --git a/ChangeLog b/ChangeLog
index a33ef2fc398a9aba7c546528dcde25fcc74e8653..e77b15c750b64c8266d0ad12faad2d7fd82d78e4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2006-05-17  Han-Wen Nienhuys  <hanwen@lilypond.org>
+
+       * config.make.in: add TARGET_PYTHON
+
+       * lily/key-engraver.cc (create_key): use
+       explicitKeySignatureVisibility on cancellation too.
+
+       * lily/font-config.cc (init_fontconfig): only close nonNULL file.
+
+       * scripts/*.py: use TARGET_PYTHON iso PYTHON
+
 2006-05-09  Graham Percival  <gpermus@gmail.com>
 
        * Documentation/user/tweaking.itely, advanced-notation.itely:

diff --git a/config.make.in b/config.make.in
index 8ecbc70b9802130e1fcfcb82e02b97f8126807ce..55dfaefda36c5d75b8cac538be60cdfb1f6aaedc 100644 (file)
--- a/config.make.in
+++ b/config.make.in
@@ -135,6 +135,7 @@ PATHSEP = @PATHSEP@
 PERL = @PERL@
 PLATFORM_WINDOWS = @PLATFORM_WINDOWS@
 PYTHON = @PYTHON@
+TARGET_PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 ROOTSEP = @ROOTSEP@
 SHELL = @SHELL@

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..5e7f2a59809a5ffcade4e161d7e0adf692fdd6f8 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);
     }
 }
 
@@ -204,7 +206,19 @@ ADD_TRANSLATOR (Key_engraver,
                /* doc */ "",
                /* create */ "KeySignature",
                /* accept */ "key-change-event",
-               /* read */ "keySignature printKeyCancellation lastKeySignature "
-               "explicitKeySignatureVisibility createKeyOnClefChange "
-               "keyAlterationOrder keySignature",
-               /* write */ "lastKeySignature tonic keySignature");
+               /* read */
+
+               "createKeyOnClefChange "
+               "explicitKeySignatureVisibility "
+               "keyAlterationOrder "
+               "keySignature "
+               "keySignature "
+               "lastKeySignature "
+               "printKeyCancellation "
+               ,
+               
+               /* write */
+               "keySignature "
+               "lastKeySignature "
+               "tonic "
+               );

diff --git a/make/substitute.make b/make/substitute.make
index 1fe34a194f76765e795414aa9ce44a2d7b30b896..fc175ece72f684ee9ed462e76f0b93dfb91b24a2 100644 (file)
--- a/make/substitute.make
+++ b/make/substitute.make
@@ -19,6 +19,7 @@ ATVARIABLES = \
   PERL\
   PYTHON\
   SHELL\
+  TARGET_PYTHON \
   TOPLEVEL_VERSION\
   bindir\
   datadir\

diff --git a/python/lilylib.py b/python/lilylib.py
index 5ce5b298480c31456a12f2d17fa1f598a62461e9..9c4591b61789d0d968279383e9e103487fbda185 100644 (file)
--- a/python/lilylib.py
+++ b/python/lilylib.py
@@ -14,15 +14,7 @@ import shutil
 import string
 import sys
 import optparse
-import subprocess
 
-## windows mingw cross compile doesn't have selectmodule.so
-have_fcntl = True
-try:
-       import fcntl
-except ImportError:
-       have_fcntl = False
-       
 ################################################################
 # Users of python modules should include this snippet
 # and customize variables below.
@@ -46,8 +38,6 @@ if os.environ.has_key ('LILYPONDPREFIX') :
 sys.path.insert (0, os.path.join (datadir, 'python'))
 
 
-
-
 localedir = '@localedir@'
 try:
        import gettext
@@ -68,10 +58,12 @@ def command_name (cmd):
        return os.path.basename (cmd)
 
 def system (cmd,
-             ignore_error=False,
-             progress_p=True,
-             be_verbose=False,
-             log_file=None):
+           ignore_error=False,
+           progress_p=True,
+           be_verbose=False,
+           log_file=None):
+       
+       import subprocess
        
        show_progress= progress_p 
        name = command_name (cmd)

diff --git a/scripts/abc2ly.py b/scripts/abc2ly.py
index 1257182f718cf0ae268b436a357c099d9b1c2086..ebcfad98bc7762f4f083dad517a8eb7bb17c3ed2 100644 (file)
--- a/scripts/abc2ly.py
+++ b/scripts/abc2ly.py
@@ -1,4 +1,4 @@
-#!@PYTHON@
+#!@TARGET_PYTHON@
 # -*- coding: utf-8 -*-
 # once upon a rainy monday afternoon.
 #

diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index 5393ea3c763b422f03762073d3372b5045becdb6..c4c1e7408252f5861bc375e27e76974ff0f439ea 100644 (file)
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -1,4 +1,4 @@
-#!@PYTHON@
+#!@TARGET_PYTHON@
 #
 # convert-ly.py -- Update old LilyPond input files (fix name?)
 #

diff --git a/scripts/etf2ly.py b/scripts/etf2ly.py
index 18a33a4324d1efd8562591e1ba3e1c261e1b10b0..6bbc78ada5c877cf9166a250465dfdbc620867f3 100644 (file)
--- a/scripts/etf2ly.py
+++ b/scripts/etf2ly.py
@@ -1,4 +1,4 @@
-#!@PYTHON@
+#!@TARGET_PYTHON@
 
 # info mostly taken from looking at files. See also
 # http://lilypond.org/wiki/?EnigmaTransportFormat

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index 24b5d0384ad8e68d7f9e8e86cd15e1c66afdbc9e..f8579a8a715bb4f324c0e0a6e4521aad5518f816 100644 (file)
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -1,4 +1,4 @@
-#!@PYTHON@
+#!@TARGET_PYTHON@
 
 '''
 Example usage:

diff --git a/scripts/midi2ly.py b/scripts/midi2ly.py
index c61cce84ed610a43b00ca60a74eec4450bfaf886..e1dedcdde65f457088f253986355c825c3986aee 100644 (file)
--- a/scripts/midi2ly.py
+++ b/scripts/midi2ly.py
@@ -1,4 +1,4 @@
-#!@PYTHON@
+#!@TARGET_PYTHON@
 #
 # msdi2ly.py -- LilyPond midi import script
 # 

diff --git a/scripts/musicxml2ly.py b/scripts/musicxml2ly.py
index b3a1ccb46da112f72c5feea41ee2e1995cc5f965..65ebd3c55a77d3614bad02a884ff34228ecc5a4d 100644 (file)
--- a/scripts/musicxml2ly.py
+++ b/scripts/musicxml2ly.py
@@ -1,4 +1,4 @@
-#!@PYTHON@
+#!@TARGET_PYTHON@
 
 import optparse
 import sys