patch::: 1.3.144.jcn1

1.3.144.jcn1
============

* Fixes to point-and-click doco (Thanks, Laura Conrad).

* Bugfixes: changed several (eval to (ly-eval for guile 1.3.4/1.4
compatibility.

* Fixes to buildscripts/clean-fonts.sh.

diff --git a/CHANGES b/CHANGES
index 61b66fd97076243637494a5a7e3ae34e9802080f..a260ae354d48b91c57390e4c730e7097711d1ce9 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,13 @@
+1.3.144.jcn1
+============
+
+* Fixes to point-and-click doco (Thanks, Laura Conrad).
+
+* Bugfixes: changed several (eval to (ly-eval for guile 1.3.4/1.4
+compatibility.
+
+* Fixes to buildscripts/clean-fonts.sh.
+

 1.3.143.jcn3
 ============
 
 1.3.143.jcn3
 ============
 

diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely
index 4f3e0a3fab7914daf0f05f51c4a419f5a18f59b7..8c7d4211d78dc16b0cb397d2b76285fffd45f201 100644 (file)
--- a/Documentation/user/refman.itely
+++ b/Documentation/user/refman.itely
@@ -3441,9 +3441,9 @@ Xdvi} version 22.36 or newer.
 @item emacs
 @end itemize
 
 @item emacs
 @end itemize
 

-Add one these lines to the top of your .ly file. The first one is for
+Add one of these lines to the top of your .ly file. The first one is for

 line location only. The second one is more convenient, but requires
 line location only. The second one is more convenient, but requires

-patching @code{emacsclient}.
+patching @code{emacsclient} and @code{server.el}.

 
 @example
 #(set! point-and-click line-location)
 
 @example
 #(set! point-and-click line-location)


@@ -3470,9 +3470,13 @@ init file, before invoking server-start.
 
 
 Xdvi must be configured to use the emacs editor.  Before starting, set
 
 
 Xdvi must be configured to use the emacs editor.  Before starting, set

-the environment variable @code{XEDITOR} to
+the environment variable @code{XEDITOR} to one of these strings.  The
+second one, that also specifies the column, only works if you have
+patched your emacsclient and server, and have compiled your @code{.ly}
+file using the @code{line-column-location} setting (see above).

 @example
 @example

-emacsclient --no-wait +%c:%l %f
+emacsclient --no-wait +%l %f
+emacsclient --no-wait +%l:%c %f

 @end example
 Xdvi also must be configured to find the fonts. Refer to the
 xdvi documentation for more information.
 @end example
 Xdvi also must be configured to find the fonts. Refer to the
 xdvi documentation for more information.


@@ -3486,6 +3490,9 @@ When you convert the TeX file to PostScript using dvips, dvips
 will complain about not finding @code{src:X:Y} files. Those complaints are
 harmless, and can be ignored.
 
 will complain about not finding @code{src:X:Y} files. Those complaints are
 harmless, and can be ignored.
 

+When using @code{line-colum-location}, the cursor will be one off; it
+will not jump to the exact note that you clicked, but to the next one.
+We hope to fix this before 1.4.

 
 @node Skipping corrected music
 @section Skipping corrected music
 
 @node Skipping corrected music
 @section Skipping corrected music

diff --git a/VERSION b/VERSION
index e8ff955fc9c07b4cd7644648a0cfdf68d17d89b3..7b963f17e6effb4c81b3c44649992dc6fdf35d19 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=144
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=144

-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=jcn1

 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/buildscripts/clean-fonts.sh b/buildscripts/clean-fonts.sh
index 18e070ca0f44df73a1771e990f8f27df660ddfe4..9c132f67b1b38543f5bf6c02cb2d736edec2bd39 100755 (executable)
--- a/buildscripts/clean-fonts.sh
+++ b/buildscripts/clean-fonts.sh
@@ -1,4 +1,10 @@
-#!/bin/sh
+#!@SHELL@
+# use kpsewhich?
+# maybe (optionally) (not) clean stuff from other versions, ie, don't clean
+#     /var/spool/texmf/tfm/lilypond/<NOT-OUR-VERSION>/
+# ?
+
+VERSION="@TOPLEVEL_VERSION@

 
 case  $# in
 0) 
 
 case  $# in
 0) 


@@ -7,25 +13,21 @@ case  $# in
     WHAT=$1;;
 esac
 
     WHAT=$1;;
 esac
 

-# should use kpsepath 
+dirs=".
+/var/lib/texmf
+/var/spool/texmf
+/var/tmp/texfonts
+/var/texfonts
+"

 
 

-TEXDIRS=.
-if [ -d /var/lib/texmf ]; then
-    TEXDIRS="$TEXDIRS /var/lib/texmf"
-fi
-if [ -d /var/spool/texmf ]; then
-    TEXDIRS="$TEXDIRS /var/tmp/texmf"
-fi
-if [ -d /var/tmp/texfonts ]; then
-    TEXDIRS="$TEXDIRS /var/spool/texfonts"
-fi
-if [ -d /var/texfonts ]; then
-    TEXDIRS="$TEXDIRS /var/texfonts"
-fi
-if [ -z "$TEXDIR" ]; then
+for i in $dirs; do
+       if [ -d "$i" ]; then
+               TEXDIRS="$TEXDIRS $i"
+       fi
+done
+
+if [ -z "$TEXDIRS" -o "$TEXDIRS" = "." ]; then

     TEXDIRS=". /var"
     TEXDIRS=". /var"

-else
-    TEXDIRS=". $TEXDIRS"

 fi
 
 # remove possibly stale .pk/.tfm files 
 fi
 
 # remove possibly stale .pk/.tfm files 

diff --git a/scm/chord-name.scm b/scm/chord-name.scm
index 8261fe0b3ca38554e239c6a050718c537c536b56..920875a15b9585d5fa882010da01004051d22fa8 100644 (file)
--- a/scm/chord-name.scm
+++ b/scm/chord-name.scm
@@ -256,7 +256,6 @@
 
 (define (pitch->note-name pitch)
   (cons (cadr pitch) (caddr pitch)))
 
 (define (pitch->note-name pitch)
   (cons (cadr pitch) (caddr pitch)))

-  

 
 (define (accidental->text acc)
     (if (= acc 0)
 
 (define (accidental->text acc)
     (if (= acc 0)


@@ -270,7 +269,7 @@
                                (list (append '((raise . 0.6))
                                  (list
                                   (string-append "accidentals-" 
                                (list (append '((raise . 0.6))
                                  (list
                                   (string-append "accidentals-" 

-                                                 (number->string acc))))))))))))
+                                                 (number->string acc))))))))))))

 )
 
 (define (pitch->text pitch)
 )
 
 (define (pitch->text pitch)

diff --git a/scm/drums.scm b/scm/drums.scm
index b1eff86751fc2458180ed463060728c2237da5de..187844cd5db595ff1fdcc1adedcc2312342b8817 100644 (file)
--- a/scm/drums.scm
+++ b/scm/drums.scm
@@ -1,5 +1,7 @@
-; drum-"hack". See input/tricks/drums.ly and ly/drumpitch.ly
-; 2001/03/25 Rune Zedeler <rune@zedeler.dk>
+;;;; drum-"hack". See input/tricks/drums.ly and ly/drumpitch.ly
+;;;; 2001/03/25 Rune Zedeler <rune@zedeler.dk>
+
+;;;; changed eval to ly-eval for guile 1.4/1.4.1 compatibility --jcn

 
 (define (seq-music-list elts)
    (let* ( (ml (ly-make-music "Sequential_music")) )
 
 (define (seq-music-list elts)
    (let* ( (ml (ly-make-music "Sequential_music")) )


@@ -98,7 +100,7 @@
              (begin
               (display p) ;; UGH. FIXME. pitch->string ???
               (ly-warn " unknown drumpitch.")
              (begin
               (display p) ;; UGH. FIXME. pitch->string ???
               (ly-warn " unknown drumpitch.")

-              (cdar (eval kit))
+              (cdar (ly-eval kit))

           ))
          ((eq? p (caddr (car pitches))) ((name->paper kit) (caar pitches)) )
         (else                          (p2p (cdr pitches) ) )
           ))
          ((eq? p (caddr (car pitches))) ((name->paper kit) (caar pitches)) )
         (else                          (p2p (cdr pitches) ) )


@@ -106,12 +108,12 @@
    )
  )
 (define ((name->paper kit) n)
    )
  )
 (define ((name->paper kit) n)

-   (let n2p ((pitches (eval kit)))
+   (let n2p ((pitches (ly-eval kit)))

      (cond ((eq? pitches '())
              (begin
               (ly-warn (string-append "Kit `" (symbol->string kit) "' doesn't contain drum `" n
                                       "'\nSee lily/drumpitch.ly for supported drums."))
      (cond ((eq? pitches '())
              (begin
               (ly-warn (string-append "Kit `" (symbol->string kit) "' doesn't contain drum `" n
                                       "'\nSee lily/drumpitch.ly for supported drums."))

-              (cdar (eval kit))
+              (cdar (ly-eval kit))

             ))
            ((eq? n (caar pitches))  (cdar pitches) )
           (else                    (n2p (cdr pitches) ) )
             ))
            ((eq? n (caar pitches))  (cdar pitches) )
           (else                    (n2p (cdr pitches) ) )

diff --git a/scm/interface-description.scm b/scm/interface-description.scm
index ee1b65a218f1906ea4747548408fa6f2726a0f04..80fe44bc27f09c53046449c9300ca3984a33498f 100644 (file)
--- a/scm/interface-description.scm
+++ b/scm/interface-description.scm
@@ -775,10 +775,10 @@ direction = Forced direction for all ties"
    ))
 
 
    ))
 
 

-(eval (cons
-       'begin
-       (map (lambda (x) (list 'define (car x) (list 'quote (cdr x))))
-           all-interfaces)))
+(ly-eval (cons
+         'begin
+         (map (lambda (x) (list 'define (car x) (list 'quote (cdr x))))
+              all-interfaces)))

 
 
 (define (interface-names) (map (lambda (x) (symbol->string (car x))) all-interfaces))
 
 
 (define (interface-names) (map (lambda (x) (symbol->string (car x))) all-interfaces))

diff --git a/scripts/update-lily.py b/scripts/update-lily.py
index 1e2c75afee0a91b9953e98a0c536d601ff92f6b7..f022ec3fd54d2fd67e88913b4565eedd6f4f4038 100644 (file)
--- a/scripts/update-lily.py
+++ b/scripts/update-lily.py
@@ -44,8 +44,19 @@ _ = gettext.gettext
 program_name = 'build-lily'
 package_name = 'lilypond'
 help_summary = _("Fetch and rebuild from latest source package")
 program_name = 'build-lily'
 package_name = 'lilypond'
 help_summary = _("Fetch and rebuild from latest source package")

-build_root = os.environ ['HOME'] + '/usr/src'
-build_command = '(./configure --prefix=$HOME/usr && make all web) >> log.txt 2>&1'
+obuild_command = '(./configure --prefix=$HOME/usr && make all web) >> log.txt 2>&1'
+build_command = '''
+cd $HOME/usr/src &&
+(
+tar xzf %t &&
+rm -f building &&
+ln -s %n-%v building &&
+cd %n-%v &&
+./configure --prefix=$HOME/usr && make all web
+) >> log.txt 2>&1 &&
+rm -f %n &&
+ln -s %n%-%v %n
+'''

 
 release_dir = build_root + '/releases'
 patch_dir = build_root + '/patches'
 
 release_dir = build_root + '/releases'
 patch_dir = build_root + '/patches'


@@ -220,6 +231,11 @@ def set_setting (dict, key, val):
 
 option_definitions = [
        ('DIR', 'b', 'build-root', _ ("unpack and build in DIR [%s]") % build_root),
 
 option_definitions = [
        ('DIR', 'b', 'build-root', _ ("unpack and build in DIR [%s]") % build_root),

+       ('COMMAND', 'c', 'command', _ ("execute COMMAND, subtitute:") \
+        + '\n                            ' + _ ("%%n: package name") \
+        + '\n                            ' + _ ("%%v: package version") \
+        + '\n                            ' + _ ("%%t: tarball") \
+        ),

        ('', 'h', 'help', _ ("this help")),
         ('', 'k', 'keep', _ ("keep all output, and name the directory %s") % temp_dir),
        ('', 'r', 'remove-previous', _ ("remove previous build")),
        ('', 'h', 'help', _ ("this help")),
         ('', 'k', 'keep', _ ("keep all output, and name the directory %s") % temp_dir),
        ('', 'r', 'remove-previous', _ ("remove previous build")),


@@ -337,12 +353,19 @@ def find_latest (url):
        return join_package (list[-1])
 
 def build (p):
        return join_package (list[-1])
 
 def build (p):

-       os.chdir (build_root)
-       system ('tar xzf %s/%s.tar.gz' % (release_dir, p))
-       system ('rm -f building')
-        os.symlink ('%s/%s' % (build_root, p), 'building')
-       os.chdir (p)
-       return system (build_command)
+       tar_ball = p + '.tar.gz'
+       (tar_name, tar_version) = split_package (tar_ball)
+       
+       expand = {
+               '%n' : tar_name,
+               '%t' : tar_ball,
+               '%v' : version_tuple_to_str (tar_version),
+               }
+
+       c = build_command
+       for i in expand.keys ():
+               c = re.sub (i, expand[i], c)
+       return system (c)

 
 (sh, long) = getopt_args (__main__.option_definitions)
 try:
 
 (sh, long) = getopt_args (__main__.option_definitions)
 try:


@@ -361,6 +384,8 @@ for opt in options:
                help ()
        elif o == '--buid-root' or o == '-b':
                build_root = a
                help ()
        elif o == '--buid-root' or o == '-b':
                build_root = a

+       elif o == '--command' or o == '-c':
+               build_command = a

        elif o == '--remove-previous' or o == '-r':
                remove_previous_p = 1
        elif o == '--url' or o == '-u':
        elif o == '--remove-previous' or o == '-r':
                remove_previous_p = 1
        elif o == '--url' or o == '-u':


@@ -377,8 +402,7 @@ for opt in options:
 if 1:
        latest = find_latest (url)
 
 if 1:
        latest = find_latest (url)
 

-       #if os.path.isdir ('%s/%s' % (build_root, latest)):
-       if os.path.isdir ('%s/%s/%s' % (build_root, latest, 'lily/out/lilypond')):
+       if os.path.isdir ('%s/%s' % (build_root, latest)):

                progress (_ ("latest is %s") % latest)
                progress (_ ("relax, %s is up to date" % package_name))
                sys.exit (0)
                progress (_ ("latest is %s") % latest)
                progress (_ ("relax, %s is up to date" % package_name))
                sys.exit (0)


@@ -403,16 +427,16 @@ if 1:
                progress (_ ("fetching %s...") % get)
                copy_url (get, '.')
 
                progress (_ ("fetching %s...") % get)
                copy_url (get, '.')
 

-       if not build (latest):
-               if os.path.isdir ('%s/%s' % (build_root, package_name)):
-                       os.chdir ('%s/%s' % (build_root, package_name))
-                       previous = os.getcwd ()
-                       os.chdir (build_root)
-                       if remove_previous_p:
-                               system ('echo rm -rf %s/%s' % (build_root, previous))
-                       
-               system ('rm -f %s' % package_name)
-               os.symlink ('%s/%s' % (build_root, latest),  package_name)
+       if os.path.isdir (os.path.join (build_command, package_name)):
+               os.chdir (os.path.join (build_command, package_name))
+               previous = os.getcwd ()
+       else:
+               previous = 0
+
+       progress (_ ("building %s...") % get)
+       os.chdir (build_root)
+       if not build (latest) and previous and remove_previous_p:
+               system ('rm -rf %s' % os.path.join (build_root, previous))

                
        os.chdir (original_dir)
        if release_dir != temp_dir:
                
        os.chdir (original_dir)
        if release_dir != temp_dir: