$(builddir). Stepmake is a normal subdirectory now, that is not
configured. Another srcdir build fix.
+ * Documentation/topdocs/INSTALL.texi,
+ buildscripts/lilypond.words.py, lilypond-font-lock.el,
+ lilypond-init.el, lilypond-mode.el, debian/rules,
+ make/lilypond.{redhat,madrake,suse}.spec.in, vimrc:
+ rename generated file lilypond.words to lilypond.words.el.
+
2003-09-20 Heikki Junes <hjunes@cc.hut.fi>
* ly/chord-modifiers-init.ly, lilypond.vim: updates for vim.
An Emacs mode for entering music and running LilyPond is contained in
the source archive as @file{lilypond-mode.el},
@file{lilypond-indent.el}, @file{lilypond-font-lock.el} and
-@file{lilypond.words}. You should install these files to a directory
+@file{lilypond.words.el}. You should install these files to a directory
included in your @var{load-path}. File @file{lilypond-init.el} should
be placed to @var{load-path}@file{/site-start.d/} or appended to your
@file{~/.emacs} or @file{~/.emacs.el}.
A Vim mode for entering music and running LilyPond is contained in
the source archive. Append the content of @file{vimrc} to @file{~/.vimrc}
-to get shortcuts. Install file @file{lilypond.words} to @file{~/.vim/} to
+to get shortcuts. Install file @file{lilypond.words.el} to @file{~/.vim/} to
get auto-completion. Syntax highlighting you get by installing
@file{lilypond.vim} to @file{~/.vim/syntax/} and appending the following
to @file{~/.vim/filetype.vim}:
#!@PYTHON@
# Created 01 September 2003 by Heikki Junes.
-# Makes a lilypond.words file which is used by (X)Emacs and Vim.
+# Generates lilypond.words.el for (X)Emacs and lilypond.words.vim for Vim.
import string
import re
# the output file
if sys.argv[1:] == []:
- out = open('lilypond.words', 'w')
+ out = open('lilypond.words.el', 'w')
else:
- out = open(sys.argv[1]+'/lilypond.words', 'w')
+ out = open(sys.argv[1]+'/lilypond.words.el', 'w')
# the menu in lilypond-mode.el
for line in [
dh_testdir
dh_testroot
cp -av lilypond-mode.el lilypond-font-lock.el lilypond-indent.el \
- buildscripts/out/lilypond.words \
+ buildscripts/out/lilypond.words.el \
$(r)/usr/share/emacs/site-lisp/
dh_installdocs AUTHORS.txt NEWS.txt README.txt \
DEDICATION THANKS
;; Author: 2001-2003: Heikki Junes
;; * Emacs-mode: new keywords, reserved words, identifiers, notenames,
;; some dynamics and brackets are font-lock-keywords
-;; * File lilypond.words contains \keywords, \Identifiers and
-;; ReservedWords notenames.
;; * context-dependent syntax-tables
;; Author: 1997: Han-Wen Nienhuys
;; Author: 1995-1996 Barry A. Warsaw
;; Emacs mode for entering music and running LilyPond is contained in
;; the source archive as `lilypond-mode.el', `lilypond-indent.el',
-;; `lilypond-font-lock.el' and `lilypond.words'. You should install
+;; `lilypond-font-lock.el' and `lilypond.words.el'. You should install
;; these files to a directory included in your `load-path'.
;; File `lilypond-init.el' should be placed to `load-path/site-start.d/'
;; or appended to your `~/.emacs' or `~/.emacs.el'.
(defun LilyPond-words-filename ()
"The file containing LilyPond \keywords \Identifiers and ReservedWords.
-Finds file lilypond-words from load-path."
+Finds file lilypond-words.el from load-path."
(let ((fn nil)
(lp load-path)
- (words-file "lilypond.words"))
+ (words-file "lilypond.words.el"))
(while (and (> (length lp) 0) (not fn))
(setq fn (concat (car lp) "/" words-file))
(if (not (file-readable-p fn))
(progn (setq fn nil) (setq lp (cdr lp)))))
(if (not fn)
- (progn (message "Warning: `lilypond.words' not found in `load-path'. See `lilypond-init.el'.")
+ (progn (message "Warning: `lilypond.words.el' not found in `load-path'. See `lilypond-init.el'.")
(sit-for 5 0)))
fn))
"The last command selected from the LilyPond-Insert -menu.")
(defconst LilyPond-menu-keywords
- (let ((wordlist '()) ; add syntax entries to lilypond.words
+ (let ((wordlist '())
(co (all-completions "" (LilyPond-add-dictionary-word ())))
(currword ""))
(progn
"Keywords inserted from LilyPond-Insert-menu.")
(defconst LilyPond-keywords
- (let ((wordlist '("\\score")) ; add \keywords to lilypond.words
+ (let ((wordlist '("\\score"))
(co (all-completions "" (LilyPond-add-dictionary-word ())))
(currword ""))
(progn
"LilyPond \\keywords")
(defconst LilyPond-identifiers
- (let ((wordlist '("\\voiceOne")) ; add \Identifiers to lilypond.words
+ (let ((wordlist '("\\voiceOne"))
(co (all-completions "" (LilyPond-add-dictionary-word ()))))
(progn
(while (> (length co) 0)
"LilyPond \\Identifiers")
(defconst LilyPond-Capitalized-Reserved-Words
- (let ((wordlist '("Staff")) ; add ReservedWords to lilypond.words
+ (let ((wordlist '("Staff"))
(co (all-completions "" (LilyPond-add-dictionary-word ()))))
(progn
(while (> (length co) 0)
"LilyPond ReservedWords")
(defconst LilyPond-non-capitalized-reserved-words
- (let ((wordlist '("c")) ; add note names lilypond.words
+ (let ((wordlist '("c"))
(co (all-completions "" (LilyPond-add-dictionary-word ()))))
(progn
(while (> (length co) 0)
(message "No tag was selected from LilyPond->Insert tag-menu.")))
(defun LilyPond-insert-tag ()
- "Insert syntax for given tag. The definitions are in lilypond.words."
+ "Insert syntax for given tag. The definitions are in LilyPond-words-filename."
(interactive)
(setq b (find-file-noselect (LilyPond-words-filename) t t))
(let ((word LilyPond-insert-tag-current)
%endif
mkdir -p $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d
-install -m 644 lilypond-mode.el lilypond-font-lock.el lilypond-indent.el out/lilypond.words $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/
+install -m 644 lilypond-mode.el lilypond-font-lock.el lilypond-indent.el out/lilypond.words.el $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/
install -m 644 lilypond-init.el $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d
bzip2 $RPM_BUILD_ROOT%{_mandir}/man1/*
%endif
mkdir -p $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d
-install -m 644 lilypond-mode.el lilypond-font-lock.el lilypond-indent.el out/lilypond.words $RPM_BUILD_ROOT/%{_datadir}/emacs/site-lisp/
+install -m 644 lilypond-mode.el lilypond-font-lock.el lilypond-indent.el out/lilypond.words.el $RPM_BUILD_ROOT/%{_datadir}/emacs/site-lisp/
install -m 644 lilypond-init.el $RPM_BUILD_ROOT/%{_datadir}/emacs/site-lisp/site-start.d
%doc lilypond-font-lock.el
%doc lilypond-indent.el
%doc lilypond-init.el
-%doc out/lilypond.words
+%doc out/lilypond.words.el
%config /etc/profile.d/*
map <S-F12> :g/%.*/normal 0x<Return>
"
" Completions in Insert/Replace-mode with <Ctrl-N>
-set dictionary-=~/.vim/lilypond.words dictionary+=~/.vim/lilypond.words
+set dictionary-=~/.vim/lilypond.words.el dictionary+=~/.vim/lilypond.words.el
set complete-=k complete+=k
" errorformat for lily (with columns) and gcc
" (how to see multiple-line error messages?)