* input/mutopia/W.A.Mozart/mozart-hrn-3.ly: Mozart died in 1791

* python/lilylib.py (command_name): don't return 1st path
component.

* scripts/lilypond-book.py (Lilypond_snippet.is_outdated): treat
.png case separately.

* python/lilylib.py (system): typo.

diff --git a/ChangeLog b/ChangeLog
index af39afdeb1bb43017dcbddb44c7c650a593f0807..a6b69ee620c8b0ecb330e5388beb8295ffd04c6d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2004-03-28  Han-Wen Nienhuys   <hanwen@xs4all.nl>
+
+       * input/mutopia/W.A.Mozart/mozart-hrn-3.ly: Mozart died in 1791
+
+       * python/lilylib.py (command_name): don't return 1st path
+       component.
+
+       * scripts/lilypond-book.py (Lilypond_snippet.is_outdated): treat
+       .png case separately.
+
+       * python/lilylib.py (system): typo.
+
 2004-03-28  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * Documentation/user/preface.itely: Run texinfo-all-menus-update.

diff --git a/VERSION b/VERSION
index aeaa26a9105dbd7f4d8eb2391a4f03d3ce20bbd8..a2757e59c0ca75b202899e622d5c8e3559edc289 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=2
 MINOR_VERSION=1
-PATCH_LEVEL=34
+PATCH_LEVEL=35
 MY_PATCH_LEVEL=
 

diff --git a/input/mutopia/W.A.Mozart/mozart-hrn-3.ly b/input/mutopia/W.A.Mozart/mozart-hrn-3.ly
index 482b81fa7f545c86047a707a3343edf38892dd50..5091326ac325d8c8fc9a112d6a2ffeb14860ed70 100644 (file)
--- a/input/mutopia/W.A.Mozart/mozart-hrn-3.ly
+++ b/input/mutopia/W.A.Mozart/mozart-hrn-3.ly
@@ -1,7 +1,7 @@
 \header{
   title =       "Konzert Nr. 3 Es dur"
   subtitle = "für Horn und Orchester"
-  composer =    "Wolfgang Amadeus Mozart (1756-1792)"
+  composer =    "Wolfgang Amadeus Mozart (1756-1791)"
   enteredby =   "HWN"
   opus = "KV 447"
 

diff --git a/python/lilylib.py b/python/lilylib.py
index 7bac5a445f256ee8e3746aa68b542ff3abd00e93..a705e7d0fce7ba95ae90b4688f221b913914bac6 100644 (file)
--- a/python/lilylib.py
+++ b/python/lilylib.py
@@ -234,10 +234,13 @@ def setup_temp ():
        return __main__.temp_dir
 
 def command_name (cmd):
-       return re.match ('^[^a-z0-9_-]*([a-z0-9_-]*)', cmd).group (1)
+
+       # deal with "((latex ) >& 1 ) .." too 
+       cmd = re.match ("([\(\)]*)([^ ]*)", cmd).group(2)
+       return os.path.split (cmd)[1]
 
 def error_log (name):
-       name = re.sub('[^a-z]','x',name)
+       name = re.sub('[^a-z]','x', name)
        return tempfile.mktemp ('%s.errorlog' % name)
 
 def read_pipe (cmd, mode = 'r'):
@@ -326,7 +329,7 @@ Exit status of CMD '''
                        error (msg)
                        if not progress_p and error_log_file:
                                error (_ ("The error log is as follows:"))
-                               sys.stderr.write (error_log_file).read ()
+                               sys.stderr.write (open (error_log_file).read ())
                        if error_log_file:
                                os.unlink (error_log_file)
                        exit (status)

diff --git a/scm/font.scm b/scm/font.scm
index ec561cc5abd66b55c36a4c80449041e2261b2086..ffe7b00ce544b5dc95170c4d83bc5fe70bf6b305 100644 (file)
--- a/scm/font.scm
+++ b/scm/font.scm
@@ -118,25 +118,23 @@
        ((qual (font-qualifier node))
         (def (font-default node))
         (val (chain-assoc-get qual alist-chain def))
-        (desired-font (lookup-font
-                       (hashq-ref (font-children node)
-                                  val) alist-chain))
-
-        (default (hashq-ref (font-children node) def))
-        (font (if desired-font
-                  desired-font
-                  (g-lookup-font (hashq-ref (font-children node)
-                                          def) alist-chain)))
+        (desired-child (hashq-ref (font-children node) val))
         )
-      font))
+
+    (if desired-child
+       (g-lookup-font desired-child alist-chain)
+       (g-lookup-font (hashq-ref (font-children node) def) alist-chain)
+       )))
 
 (define-method (g-lookup-font (node <Font-tree-leaf>) alist-chain)
   node)
 
+;; two step call  is handy for debugging.
 (define (lookup-font node alist-chain)
   (g-lookup-font node alist-chain))
 
 
+
 (define-public (make-font-tree factor)
   (let*
       ((n (make-font-tree-node 'font-encoding 'music))

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index 4f90a8efd6235ca24dc42da98be1833f6206fdcd..b84d2976cd01243d0d4fedc7da1692e34f14f17f 100644 (file)
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -511,12 +511,12 @@ class Lilypond_snippet (Snippet):
 
        def is_outdated (self):
                base = self.basename ()
-               ## FIXME: adding PNG to is_outdated test fixes
-               ##        interrupted (web) builds.
-               ##        should only do this if PNG is actually target
-               if os.path.exists (base + '.ly') \
-                  and os.path.exists (base + '.tex') \
-                  and os.path.exists (base + '.png') \
+
+               require = ['.ly', '.tex']
+               if format == HTML:
+                       require.append ('.png')
+               require = [os.path.exists (base + x) for x in require]
+               if reduce (lambda a,b: a and b, require) \
                   and (use_hash_p \
                        or self.ly () == open (base + '.ly').read ()):
                        # TODO: something smart with target formats