- |
+ |
- |
+ |
diff -urN ../lilypond-1.4.6/Documentation/index.texi ./Documentation/index.texi
--- ../lilypond-1.4.6/Documentation/index.texi Tue May 15 16:27:58 2001
+++ ./Documentation/index.texi Thu Aug 23 15:17:45 2001
@@ -191,28 +191,28 @@
@itemize @bullet
-@item @uref{http://mail.gnu.org/mailman/listinfo/gnu-music-discuss,gnu-music-discuss@@gnu.org}
-This list is for discussions concerning LilyPond.
+@item @uref{http://mail.gnu.org/mailman/listinfo/lilypond-devel,lilypond-devel@@gnu.org}
+This list is for discussions concerning LilyPond development.
Searchable archives are available from
-@uref{http://www.mail-archive.com/gnu-music-discuss@@gnu.org}.
+@uref{http://www.mail-archive.com/lilypond-devel@@gnu.org}.
-@item @uref{http://mail.gnu.org/mailman/listinfo/info-gnu-music,info-gnu-music@@gnu.org}
+@item @uref{http://mail.gnu.org/mailman/listinfo/info-lilypond,info-lilypond@@gnu.org}
is a low-volume list for information on the GNU Music project.
This list is moderated; ask
@email{drl@@gnu.org, David R. Linn} or
@email{hanwen@@cs.uu.nl, Han-Wen} to send announcements for this list.
Searchable archives are available from
-@uref{http://www.mail-archive.com/info-gnu-music@@gnu.org}.
+@uref{http://www.mail-archive.com/info-lilypond@@gnu.org}.
-@item @uref{http://mail.gnu.org/mailman/listinfo/help-gnu-music,help-gnu-music@@gnu.org}
- For help with using LilyPond.
+@item @uref{http://mail.gnu.org/mailman/listinfo/lilypond-user,lilypond-user@@gnu.org}
+ For everyday use of LilyPond, in particular the stable (1.4) series.
Searchable archives are available from
-@uref{http://www.mail-archive.com/help-gnu-music@@gnu.org}.
+@uref{http://www.mail-archive.com/lilypond-user@@gnu.org}.
-@item @uref{http://mail.gnu.org/mailman/listinfo/bug-gnu-music,bug-gnu-music@@gnu.org}
+@item @uref{http://mail.gnu.org/mailman/listinfo/bug-lilypond,bug-lilypond@@gnu.org}
If you have bugreports, you should send them to this list.
@@ -223,7 +223,7 @@
Searchable archives are available from
-@uref{http://www.mail-archive.com/bug-gnu-music@@gnu.org}.
+@uref{http://www.mail-archive.com/bug-lilypond@@gnu.org}.
@end itemize
diff -urN ../lilypond-1.4.6/Documentation/topdocs/FAQ.texi ./Documentation/topdocs/FAQ.texi
--- ../lilypond-1.4.6/Documentation/topdocs/FAQ.texi Sun Apr 1 14:59:00 2001
+++ ./Documentation/topdocs/FAQ.texi Thu Aug 23 15:25:02 2001
@@ -24,11 +24,11 @@
@itemize @bullet
@item
-@uref{http://www.mail-archive.com/help-gnu-music@@gnu.org,help-gnu-music}
+@uref{http://www.mail-archive.com/lilypond-user@@gnu.org,lilypond-user}
@item
-@uref{http://www.mail-archive.com/bug-gnu-music@@gnu.org,bug-gnu-music}
+@uref{http://www.mail-archive.com/bug-lilypond@@gnu.org,bug-lilypond}
@item
-@uref{http://www.mail-archive.com/gnu-music-discuss@@gnu.org,gnu-music-discuss}
+@uref{http://www.mail-archive.com/lilypond-devel@@gnu.org,lilypond-devel}
@end itemize
If you are still at loss, send your questions to the @strong{mailing
@@ -58,7 +58,7 @@
@end example
-@subsection I downloaded the windows32 port, and it doesn't match the website!
+i@subsection I downloaded the windows32 port, and it doesn't match the website!
The website is usually made from the latest snapshots. Binary releases,
in particular the windows32 binaries, are only made every once in a while.
diff -urN ../lilypond-1.4.6/Documentation/topdocs/INSTALL.texi ./Documentation/topdocs/INSTALL.texi
--- ../lilypond-1.4.6/Documentation/topdocs/INSTALL.texi Thu Jun 28 18:05:31 2001
+++ ./Documentation/topdocs/INSTALL.texi Thu Aug 23 15:23:10 2001
@@ -329,12 +329,6 @@
libgr-progs.
-@b{Warning}
-
-There appears to be a problem with the Xdvi shipped with Red Hat 7.1.
-Symptoms: Xdvi responds very sluggishly or hangs while viewing
-lilypond output. The cause for this problem is unknown; you are advised
-to recompile Xdvi from source.
@subsection LinuxPPC
@@ -489,10 +483,9 @@
@section Problems
-For help and questions use @email{help-gnu-music@@gnu.org} and
-@email{gnu-music-discuss@@gnu.org}. Please consult the FAQ before
-mailing your problems. If you find bugs, please send bug reports to
-@email{bug-gnu-music@@gnu.org}.
+For help and questions use @email{lilypond-user@@gnu.org}. Please
+consult the FAQ before mailing your problems. If you find bugs, please
+send bug reports to @email{bug-lilypond@@gnu.org}.
Bugs that are not fault of LilyPond are documented here.
diff -urN ../lilypond-1.4.6/Documentation/topdocs/README.texi ./Documentation/topdocs/README.texi
--- ../lilypond-1.4.6/Documentation/topdocs/README.texi Thu May 17 11:40:10 2001
+++ ./Documentation/topdocs/README.texi Thu Aug 23 15:39:38 2001
@@ -64,20 +64,17 @@
We have the following mailing lists:
@itemize @bullet
-@item @uref{http://mail.gnu.org/mailman/listinfo/info-gnu-music,info-gnu-music@@gnu.org}
+@item @uref{http://mail.gnu.org/mailman/listinfo/info-lilypond,info-lilypond@@gnu.org}
is a low-volume list for information on the GNU Music project.
This list is moderated; ask
@email{drl@@gnu.org, David R. Linn} or
- @email{hanwen@@cs.uu.nl, Han-Wen} to send announcements for this
-list.
+ @email{hanwen@@cs.uu.nl, Han-Wen} to send announcements for this list.
@item
-@uref{http://mail.gnu.org/mailman/listinfo/gnu-music-discuss,gnu-music-discuss@@gnu.org}
- For general discussions concerning LilyPond.
+@uref{http://mail.gnu.org/mailman/listinfo/lilypond-user,lilypond-user@@gnu.org}
+ For general discussions about using LilyPond.
-@item @uref{http://mail.gnu.org/mailman/listinfo/help-gnu-music,help-gnu-music@@gnu.org}
- For help with using LilyPond.
-@item @uref{http://mail.gnu.org/mailman/listinfo/bug-gnu-music,bug-gnu-music@@gnu.org}
-If you have bugreports, you should send them to this list.
+@item @uref{http://mail.gnu.org/mailman/listinfo/bug-lilypond,bug-lilypond@@gnu.org}
+ If you have bugreports, you should send them to this list.
@end itemize
@@ -100,10 +97,9 @@
@section Bugs
-Send bug reports to @email{bug-gnu-music@@gnu.org}. For help and
-questions use @email{help-gnu-music@@gnu.org} and
-@email{gnu-music-discuss@@gnu.org}. Please consult the FAQ and
-installation instructions before mailing your problems.
+Send bug reports to @email{bug-lilypond@@gnu.org}. For help and
+questions use @email{lilypond-user@@gnu.org}. Please consult the FAQ
+and installation instructions before mailing your problems.
diff -urN ../lilypond-1.4.6/Documentation/topdocs/index.tely ./Documentation/topdocs/index.tely
--- ../lilypond-1.4.6/Documentation/topdocs/index.tely Sun Jul 15 14:14:41 2001
+++ ./Documentation/topdocs/index.tely Thu Aug 23 14:59:51 2001
@@ -41,6 +41,27 @@
Public License, so you can use, modify and redistribute the program with
almost no restrictions.
+
+is actively developed. Experimental, development releases have
+an odd version number (e.g. 1.5.7), while stable releases have
+(e.g. 1.4.7) should be unchanging and bug-free. Unless you have special
+needs, you should use the stable version. You can access the websites of
+the stable version @uref{http://lilypond.org/stable, here}. The website
+of the development series are @uref{http://lilypond.org/development,
+here}
+
+
+LilyPond has a development version and a stable version. This webpage
+is for the @b{stable} release. This means that it won't change much,
+and it is essentially bug-free. On the other hand, experimental
+releases contain experimental and often buggy code. They are under
+active development, so you should use those if you need any special new
+features. The website of the latest development release is
+@uref{http://lilypond.org/development, here}
+
+
+
+
@unnumberedsec Want to know more?
If you want to know more, visit the
diff -urN ../lilypond-1.4.6/Documentation/user/bugs.itexi ./Documentation/user/bugs.itexi
--- ../lilypond-1.4.6/Documentation/user/bugs.itexi Tue Apr 24 13:03:01 2001
+++ ./Documentation/user/bugs.itexi Tue Aug 21 18:06:42 2001
@@ -27,7 +27,7 @@
@end itemize
-You can send the report to @email{bug-gnu-music@@gnu.org}. This is a
+You can send the report to @email{bug-lilypond@@gnu.org}. This is a
mailinglist, but you don't have to be subscribed to it. You may also
enter the bug in the LilyPond wiki, at
@uref{http://www.lilypond.org/wiki?LilyPondBugs}.
diff -urN ../lilypond-1.4.6/Documentation/user/convert-ly.itexi ./Documentation/user/convert-ly.itexi
--- ../lilypond-1.4.6/Documentation/user/convert-ly.itexi Sun May 20 21:25:56 2001
+++ ./Documentation/user/convert-ly.itexi Tue Aug 21 18:06:42 2001
@@ -53,6 +53,6 @@
@code{convert-ly} is written in @uref{http://www.python.org,Python}. It
was written by @email{hanwen@@cs.uu.nl, Han-Wen Nienhuys}. Report bugs
-to @code{bug-gnu-music@@gnu.org}
+to @code{bug-lilypond@@gnu.org}
diff -urN ../lilypond-1.4.6/Documentation/user/converters.itely ./Documentation/user/converters.itely
--- ../lilypond-1.4.6/Documentation/user/converters.itely Sun Jun 3 14:56:56 2001
+++ ./Documentation/user/converters.itely Tue Aug 21 18:06:42 2001
@@ -75,7 +75,7 @@
@end table
-Report bugs to @email{bug-gnu-music@@gnu.org}.
+Report bugs to @email{bug-lilypond@@gnu.org}.
Written by @email{Jan Nieuwenhuizen, janneke@@gnu.org}.
@@ -115,7 +115,7 @@
Written by @email{Han-Wen Nienhuys,hanwen@@cs.uu.nl}.
-Report bugs to @email{bug-gnu-music@@gnu.org}.
+Report bugs to @email{bug-lilypond@@gnu.org}.
@node abc2ly
@section abc2ly
@@ -175,7 +175,7 @@
Written by @email{Han-Wen Nienhuys,hanwen@@cs.uu.nl}.
@c How about Laura? /MB
-Report bugs to @email{bug-gnu-music@@gnu.org}.
+Report bugs to @email{bug-lilypond@@gnu.org}.
@node pmx2ly
@section pmx2ly
@@ -183,7 +183,7 @@
PMX is a MusiXTeX preprocessor written by Don Simons, see
@uref{http://icking-music-archive.sunsite.dk/Misc/Music/musixtex/software/pmx/}.
-Report bugs to @email{bug-gnu-music@@gnu.org}.
+Report bugs to @email{bug-lilypond@@gnu.org}.
@subsection Invoking pmx2ly
@@ -204,7 +204,7 @@
version information
@end table
-Report bugs to @email{bug-gnu-music@@gnu.org}.
+Report bugs to @email{bug-lilypond@@gnu.org}.
Written by @email{Han-Wen Nienhuys,hanwen@@cs.uu.nl}.
@@ -242,7 +242,7 @@
@var{REFFILE}
@end table
-Report bugs to @email{bug-gnu-music@@gnu.org}.
+Report bugs to @email{bug-lilypond@@gnu.org}.
Written by @email{Han-Wen Nienhuys,hanwen@@cs.uu.nl}.
@@ -289,7 +289,7 @@
Written by @email{Jan Nieuwenhuizen,janneke@@gnu.org}, based on pmx2ly.
-Report bugs to @email{bug-gnu-music@@gnu.org}.
+Report bugs to @email{bug-lilypond@@gnu.org}.
diff -urN ../lilypond-1.4.6/Documentation/user/ly2dvi.itexi ./Documentation/user/ly2dvi.itexi
--- ../lilypond-1.4.6/Documentation/user/ly2dvi.itexi Wed Jul 11 14:52:55 2001
+++ ./Documentation/user/ly2dvi.itexi Tue Aug 21 18:06:42 2001
@@ -153,7 +153,7 @@
@unnumberedsubsec Bugs
Cannot generate @TeX{} or @code{PostScript} only. Send bugreports to to
-@email{bug-gnu-music@@gnu.org}.
+@email{bug-lilypond@@gnu.org}.
@unnumberedsubsec Authors
diff -urN ../lilypond-1.4.6/Documentation/user/refman.itely ./Documentation/user/refman.itely
--- ../lilypond-1.4.6/Documentation/user/refman.itely Wed Jul 11 14:52:55 2001
+++ ./Documentation/user/refman.itely Tue Aug 21 18:06:42 2001
@@ -1226,7 +1226,8 @@
c''-\rtoe c''-\turn c''-\open c''-\flageolet
c''-\reverseturn c''-\trill c''-\prall c''-\mordent
c''-\prallprall c''-\prallmordent c''-\upprall c''-\downprall
- c''-\thumb c''-\segno c''-\coda
+ c''-\upmordent c''-\downmordent c''-\pralldown c''-\prallup
+ c''-\lineprall c''-\thumb c''-\segno c''-\coda
}
\context Lyrics \lyrics {
accent__ marcato__ staccatissimo__ fermata
@@ -1235,7 +1236,8 @@
rtoe__ turn__ open__ flageolet
reverseturn__ trill__ prall__ mordent
prallprall__ prallmordent__ uprall__ downprall
- thumb__ segno__ coda
+ upmordent__ downmordent__ pralldown__ prallup__
+ lineprall__ thumb__ segno__ coda
}
>
\paper {
diff -urN ../lilypond-1.4.6/Documentation/windows/compiling.texi ./Documentation/windows/compiling.texi
--- ../lilypond-1.4.6/Documentation/windows/compiling.texi Thu Jun 28 18:05:31 2001
+++ ./Documentation/windows/compiling.texi Tue Aug 14 18:46:08 2001
@@ -70,9 +70,7 @@
@item @file{fix-suffixes.sh}
Add @file{.exe} to binary executables, add @file{.py} to Python scripts.
@item @file{python-wrapper.sh}
-All python scripts get a wrapper script to make direct invocation easier
-and to change file paths to DOS style, which is needed by non-Cygwin
-Python, that's currently used.
+All python scripts get a wrapper script to make direct invocation easier.
@item @file{latex-wrapper.sh}
TeX and LaTeX get a wrapper script that changes the TEX path variables
to DOS style, which is needed by non-Cygwin TeX, that's currently used.
diff -urN ../lilypond-1.4.6/Documentation/windows/installing.texi ./Documentation/windows/installing.texi
--- ../lilypond-1.4.6/Documentation/windows/installing.texi Thu Jun 28 18:05:31 2001
+++ ./Documentation/windows/installing.texi Tue Aug 14 18:46:08 2001
@@ -18,7 +18,7 @@
@section Windows binary setup
-Apart from LilyPond itself, you need Cygwin, GUILE, Python, and a TeX
+Apart from LilyPond itself, you need Cygwin, GUILE, Python and a TeX
installation, but all this software be installed by running setup.exe:
@table @asis
@@ -32,9 +32,9 @@
LilyPond. Make sure to install in the default place, @file{c:/cygwin},
and install everything.
-As of version 1.3.150, you also have the option to install MiKTeX,
-Python and GSView from this installer, which is recommended. If you
-choose to install these by hand (see below), make sure to install them
+As of version 1.3.150, you also have the option to install MiKTeX and
+GSView from this installer, which is recommended. If you choose to
+install these by hand (see below), make sure to install them
@strong{before} you install LilyPond, otherwise your LilyPond setup will
be broken.
@@ -137,13 +137,6 @@
@uref{ftp://ftp.cs.wisc.edu/ghost/ghostgum,ftp.cs.wisc.edu}.
or visit the
@uref{http://www.cs.wisc.edu/~ghost/,Ghostscript, Ghostview and GSview site}.
-
-@item Python
-Click @uref{http://www.python.org/ftp/python/win32/py152.exe,here} to
-install Python-1.5.2, or visit
-@uref{http://www.python.org,www.python.org}.
-
-We have not tried using newer versions than 1.5.2.
@end table
diff -urN ../lilypond-1.4.6/Documentation/windows/python-wrapper.sh ./Documentation/windows/python-wrapper.sh
--- ../lilypond-1.4.6/Documentation/windows/python-wrapper.sh Thu Apr 19 12:56:39 2001
+++ ./Documentation/windows/python-wrapper.sh Tue Aug 14 18:46:08 2001
@@ -5,9 +5,9 @@
echo
else
cat <
-
- */
-#include "string.hh"
-#include "array.hh"
-#include "dictionary.hh"
-
-
-// Note: assumes long is at least 32 bits.
-const unsigned long my_prime_list[] =
-{
- 5, 11, 23, // be a bit careful for short lists: we want reasonable mem usage.
- 53, 97, 193, 389, 769,
- 1543, 3079, 6151, 12289, 24593,
- 49157, 98317, 196613, 393241, 786433,
- 1572869, 3145739, 6291469, 12582917, 25165843,
- 50331653, 100663319, 201326611, 402653189u, 805306457u,
- 1610612741u, 3221225473u, 4294967291u
-};
-
-unsigned long
-prime_list (int idx)
-{
- return my_prime_list [idx];
-}
-
-unsigned int
-string_hash (String s)
-{
- const char* str = s.ch_C ();
- unsigned int result = 0;
- while (1) {
- char c = *str++;
- if (c == 0) break;
- result += (result<<3) + c;
- }
- return result;
-}
-
-
-unsigned int
-hash (unsigned int i)
-{
- return i;
-}
-
-unsigned int
-int_hash (int i)
-{
- return (unsigned) i;
-}
-
diff -urN ../lilypond-1.4.6/flower/include/dictionary-iter.hh ./flower/include/dictionary-iter.hh
--- ../lilypond-1.4.6/flower/include/dictionary-iter.hh Fri Jan 14 00:22:04 2000
+++ ./flower/include/dictionary-iter.hh Tue Aug 21 18:15:19 2001
@@ -11,8 +11,6 @@
#define DICTIONARY_ITER_HH
#include "dictionary.hh"
-#include "hash-table-iter.hh"
-
template
class Dictionary_iter : public Hash_table_iter
diff -urN ../lilypond-1.4.6/flower/include/dictionary.hh ./flower/include/dictionary.hh
--- ../lilypond-1.4.6/flower/include/dictionary.hh Mon Apr 16 23:17:45 2001
+++ ./flower/include/dictionary.hh Tue Aug 21 18:16:39 2001
@@ -40,10 +40,8 @@
}
Dictionary (Dict_initialiser *p)
{
- hash_func_ = string_hash;
for (Dict_initialiser *q = p; q->key_; q++)
- (*this) [q->key_] = q->value_;
-
+ (*this) [q->key_] = q->value_;
}
bool elem_b (String s)
{
diff -urN ../lilypond-1.4.6/flower/include/hash-table-iter.hh ./flower/include/hash-table-iter.hh
--- ../lilypond-1.4.6/flower/include/hash-table-iter.hh Sun Mar 11 19:10:32 2001
+++ ./flower/include/hash-table-iter.hh Thu Jan 1 01:00:00 1970
@@ -1,61 +0,0 @@
-/*
- hash-table-iter.hh -- declare Hash_table_iter
-
- source file of the Flower Library
-
- (c) 1999 Han-Wen Nienhuys
-
- */
-
-#ifndef HASH_TABLE_ITER_HH
-#define HASH_TABLE_ITER_HH
-#include "hash-table.hh"
-
-template
-class Hash_table_iter
-{
- Hash_table *dict_l_;
- int i;
-public:
- Hash_table_iter (Hash_table const &dict)
- {
- i = 0;
- dict_l_ = (Hash_table *) & dict;
- next_used ();
- }
-
- bool ok () const
- {
- return i < dict_l_->fixed_p_->dict_arr_.size ();
- }
-
- void next_used ()
- {
- while (ok () && dict_l_->fixed_p_->dict_arr_[i].free_b_)
- {
- i ++;
- }
- }
- void operator ++ (int)
- {
- i++;
- next_used ();
- }
-
- K key () const
- {
- return dict_l_->fixed_p_->dict_arr_[i].key_;
- }
- V val () const
- {
- return dict_l_->fixed_p_->dict_arr_[i].value_;
- }
- V &val_ref ()
- {
- return dict_l_->fixed_p_->dict_arr_[i].value_;
- }
-};
-
-
-#endif /* HASH_TABLE_ITER_HH */
-
diff -urN ../lilypond-1.4.6/flower/include/hash-table.hh ./flower/include/hash-table.hh
--- ../lilypond-1.4.6/flower/include/hash-table.hh Sun Mar 11 19:10:32 2001
+++ ./flower/include/hash-table.hh Thu Jan 1 01:00:00 1970
@@ -1,216 +0,0 @@
-/*
- hash-table.hh -- declare Hash_table_entry, Hash_table
-
- source file of the Flower Library
-
- (c) 1999 Han-Wen Nienhuys
-
- */
-
-#ifndef HASH_TABLE_HH
-#define HASH_TABLE_HH
-
-unsigned int int_hash (int);
-unsigned long prime_list (int idx);
-template struct Hash_table_iter;
-
-template
-unsigned int
-pointer_hash (K *p)
-{
- return int_hash ((unsigned int) p);
-}
-
-template
-struct Hash_table_entry
-{
- K key_;
- V value_;
- bool free_b_;
-
- Hash_table_entry () {
- free_b_ = true;
- }
- Hash_table_entry (K s, V v)
- {
- key_ = s;
- value_ = v;
- free_b_ = false;
- }
-};
-
-/**
- A hash table of prime size.
-
- We use quadratic probing.
-
- DEPRECATED. Use either SCM (preferred) or STL
-*/
-template
-class Fixed_size_hash_table
-{
-public:
- Array > dict_arr_;
- int size_idx_;
- Fixed_size_hash_table (int size_idx)
- {
- size_idx_ = size_idx;
- int sz = prime_list (size_idx_);
- dict_arr_.set_size (sz);
- }
-
- /// find #s#, or find first empty entry corresponding to #s#
- int lookup (K s, unsigned int initial_hash)
- {
- int sz =dict_arr_.size ();
- initial_hash = initial_hash % sz;
- int i;
- int j = 0;
- while (j <= sz/2) {
- i = (initial_hash + j*j) % sz;
-
- if (dict_arr_[i].free_b_)
- return i;
-
- if (dict_arr_[i].key_ == s)
- return i;
-
- j++;
- }
-
-
- return -1;
- }
-
- /// remove #s# from the hash table.
- V remove (K s, unsigned int initial_hash)
- {
- // TODO
- assert (false);
- }
-};
-
-/**
- Hash table with sliding sizes.
- */
-template
-class Hash_table
-{
- Fixed_size_hash_table * fixed_p_;
- /// set size to next prime, and copy contents
- void enlarge ()
- {
- Fixed_size_hash_table *f = new Fixed_size_hash_table (fixed_p_->size_idx_ +1);
-
- for (int i=0; i < fixed_p_->dict_arr_.size (); i++)
- {
- if (fixed_p_->dict_arr_[i].free_b_)
- continue;
-
- K nm (fixed_p_->dict_arr_[i].key_);
- unsigned int h = (*hash_func_) (nm);
- int nl = f->lookup (nm, h);
-
- f->dict_arr_[nl] = Hash_table_entry (nm, fixed_p_->dict_arr_[i].value_);
- }
- delete fixed_p_;
- fixed_p_ = f;
- }
-public:
- Hash_table ()
- {
- hash_func_ = 0;
- fixed_p_ = new Fixed_size_hash_table (0);
- }
- ~Hash_table ()
- {
- delete fixed_p_;
- }
- void operator = (Hash_table const &src)
- {
- if (&src == this)
- return;
-
- delete fixed_p_;
- fixed_p_ = new Fixed_size_hash_table (*src.fixed_p_);
- hash_func_ = src.hash_func_;
- }
- Hash_table (Hash_table const &src)
- {
- fixed_p_ = new Fixed_size_hash_table (*src.fixed_p_);
- hash_func_ = src.hash_func_;
- }
-
- void clear ()
- {
- int i= fixed_p_->size_idx_;
- delete fixed_p_;
- fixed_p_ = new Fixed_size_hash_table (i);
- }
- bool elem_b (K s) const
- {
- int l = fixed_p_->lookup (s, (*hash_func_) (s));
-
- return (l >= 0 && !fixed_p_->dict_arr_[l].free_b_) ;
- }
-
- /**
- Find and return element. If #s# is not in the table, create an
- entry in the table, and init */
- V& elem (K s)
- {
- int l;
- unsigned int h = (*hash_func_) (s);
- while ((l= fixed_p_->lookup (s,h)) <0)
- {
- enlarge ();
- }
-
- fixed_p_->dict_arr_[l].free_b_ = false;
- fixed_p_->dict_arr_[l].key_ = s;
- return fixed_p_->dict_arr_[l].value_;
- }
- bool try_retrieve (K k, V *v)
- {
- int l = fixed_p_->lookup (k, (*hash_func_) (k));
- if (l < 0 || fixed_p_->dict_arr_[l].free_b_)
- return false;
- else
- {
- *v = fixed_p_->dict_arr_[l].value_;
- return true;
- }
- }
- V elem (K s) const
- {
- return const_elem (s);
- }
- V const_elem (K k) const
- {
- V retval;
- assert (elem_b (k));
- retval = ((Hash_table*)this)->elem (k);
- return retval;
- }
- V& operator [] (K k)
- {
- return elem (k);
- }
-
- V operator [] (K k) const
- {
- return const_elem (k);
- }
-
- V remove (K s)
- {
- return fixed_p_->remove (s, (*hash_func_) (s));
- }
- friend class Hash_table_iter;
-public:
- unsigned int (*hash_func_) (K);
-};
-
-
-#endif /* HASH_TABLE_HH */
-
diff -urN ../lilypond-1.4.6/input/test/trills.ly ./input/test/trills.ly
--- ../lilypond-1.4.6/input/test/trills.ly Thu Jun 28 18:05:31 2001
+++ ./input/test/trills.ly Tue Aug 14 13:45:04 2001
@@ -1,22 +1,62 @@
\header {
texidoc="Document trills, pralls and turns"
- title="Marques des agr\'ements et leur signification"
+ title="Marques des agr\\'ements et leur signification"
+ composer="D'Anglebert"
copyright="(1689)"
}
+invisible = \property Voice.NoteHead \override #'transparent = ##t
+visible = \property Voice.NoteHead \revert #'transparent
+
+% Ugly hack to get reasonable position of the pincé and Cheute
+startHorizScript = {
+ \property Voice.scriptHorizontal = ##t
+ \property Voice.Script \override #'padding = #0.3
+ \property Voice.Script \override #'extra-offset = #'(-.6 . 0)
+ % Avoid collision with the dots of dotted notes
+ \property Voice.Dots \override #'extra-extent-X = #'(-0.7 . 0)
+}
+endHorizScript = {
+ \property Voice.scriptHorizontal \unset
+ \property Voice.Dots \revert #'padding
+ \property Voice.Script \revert #'padding
+ \property Voice.Script \revert #'extra-offset
+}
+
+
\score {
<
\property Score.TimeSignature = \turnOff
\context GrandStaff <
\context Staff=upper \notes\relative c'' {
\time 1/4
- c4-\prallprall
+ c4-\prall
\time 3/8
- c4.^"TODO"
+ c4.^\lineprall
c4.-\downprall
c4.-\upprall
\time 5/8
c4-\turn c4.-\upprall
+ d4-\turn b4.-\downprall
+ \time 3/4
+ b4 c^\turn d
+ \time 1/4
+ <\context Voice=upper{\voiceOne d4}
+ \context Voice=lower{\voiceTwo
+ \property Voice.Script \override #'extra-offset = #'(-0.8 . 2.0)
+ b_\turn}>
+ \startHorizScript c^\comma
+ \time 3/8
+ c4.^\comma
+ b8 c4_\comma
+ c8 b4_\comma
+ b8 c4^\comma _\comma \endHorizScript
+ \time 2/2 \slurDown
+ <{c2}{s4 \invisible d1*1/4 ( \visible }> ) e2
+ <{a,2}{s4 \invisible b1*1/4 ( \visible }> ) d2
+ <{a2}{s4 \invisible b1*1/4 ( \visible }> ) d2
+ \time 3/4
+ d2^\prallup e4
}
\context Lyrics=one \lyrics {
"Tremblement"4
@@ -24,10 +64,27 @@
"Cadence"
"autre"
"Double"4 "cadence"4.
+ "autre"4 _4.
+ _4 "sans tremblement"2
+ "sur une tierce"4
+ "Pinc\\'e"4
+ "autre"4.
+ "Cheute ou Port de"
+ "en descendant"
+ "Cheute et pinc\\'e"
+ "Coul\\'e Sur 2 notes"1
+ "autre"
+ "autre"
+ "Double cadence"2.
}
\context Lyrics=two \lyrics {
"simple"4
"appuy\'e"4.
+ \skip 1*3
+ \skip 4 \skip 4.
+ "voix et montant"
+ \skip 2.
+ "de suite"1
}
\context Staff=lower \notes\relative c'' {
% autobeamer has som problems here
diff -urN ../lilypond-1.4.6/lily/kpath.cc ./lily/kpath.cc
--- ../lilypond-1.4.6/lily/kpath.cc Wed May 9 19:40:21 2001
+++ ./lily/kpath.cc Tue Aug 21 18:07:48 2001
@@ -46,7 +46,10 @@
return p;
#if (KPATHSEA && HAVE_KPSE_FIND_FILE)
- return kpse_find_file (name, kpse_tfm_format, true);
+ char const * str = kpse_find_file (name, kpse_tfm_format, true);
+ if (!str)
+ str = "";
+ return String (str);
#endif
return "";
}
diff -urN ../lilypond-1.4.6/lily/main.cc ./lily/main.cc
--- ../lilypond-1.4.6/lily/main.cc Thu Jun 28 18:05:31 2001
+++ ./lily/main.cc Tue Aug 21 18:04:35 2001
@@ -169,7 +169,7 @@
cout << endl;
- cout << _f ("Report bugs to %s", "bug-gnu-music@gnu.org") << endl;
+ cout << _f ("Report bugs to %s", "bug-lilypond@gnu.org") << endl;
}
void
diff -urN ../lilypond-1.4.6/lily/musical-request.cc ./lily/musical-request.cc
--- ../lilypond-1.4.6/lily/musical-request.cc Fri May 11 01:57:13 2001
+++ ./lily/musical-request.cc Tue Aug 14 13:45:04 2001
@@ -103,7 +103,8 @@
Articulation_req const* a = dynamic_cast (r);
return a && gh_equal_p (get_mus_property ("articulation-type"),
- r->get_mus_property ("articulation-type"));
+ r->get_mus_property ("articulation-type"))
+ && get_direction () == a->get_direction ();
}
diff -urN ../lilypond-1.4.6/lily/piano-pedal-performer.cc ./lily/piano-pedal-performer.cc
--- ../lilypond-1.4.6/lily/piano-pedal-performer.cc Thu May 3 17:04:50 2001
+++ ./lily/piano-pedal-performer.cc Tue Aug 21 18:16:21 2001
@@ -10,8 +10,7 @@
#include "command-request.hh"
#include "musical-request.hh"
#include "audio-item.hh"
-#include "dictionary.hh"
-#include "dictionary-iter.hh"
+
/**
perform Piano pedals
diff -urN ../lilypond-1.4.6/ly/engraver.ly ./ly/engraver.ly
--- ../lilypond-1.4.6/ly/engraver.ly Fri May 4 01:31:43 2001
+++ ./ly/engraver.ly Tue Aug 14 13:45:04 2001
@@ -433,6 +433,8 @@
keyAccidentalOrder = #'(
(6 . -1) (2 . -1) (5 . -1 ) (1 . -1) (4 . -1) (0 . -1) (3 . -1)
(3 . 1) (0 . 1) (4 . 1) (1 . 1) (5 . 1) (2 . 1) (6 . 1)
+ (6 . -2) (2 . -2) (5 . -2 ) (1 . -2) (4 . -2) (0 . -2) (3 . -2)
+ (3 . 2) (0 . 2) (4 . 2) (2 . 2) (5 . 2) (2 . 2) (6 . 2)
)
breakAlignOrder = #'(
Instrument_name
diff -urN ../lilypond-1.4.6/ly/script.ly ./ly/script.ly
--- ../lilypond-1.4.6/ly/script.ly Sun Apr 8 01:30:32 2001
+++ ./ly/script.ly Tue Aug 14 13:45:04 2001
@@ -43,5 +43,11 @@
prallmordent = \script "prallmordent"
upprall = \script "upprall"
downprall = \script "downprall"
+upmordent = \script "upmordent"
+downmordent = \script "downmordent"
+lineprall = \script "lineprall"
+pralldown = \script "pralldown"
+prallup = \script "prallup"
segno = \script "segno"
coda = \script "coda"
+comma = \script "comma"
diff -urN ../lilypond-1.4.6/mf/feta-generic.mf ./mf/feta-generic.mf
--- ../lilypond-1.4.6/mf/feta-generic.mf Sun May 6 03:10:10 2001
+++ ./mf/feta-generic.mf Tue Aug 14 13:45:04 2001
@@ -37,14 +37,14 @@
input feta-accordion;
input feta-custodes;
else:
- input feta-bolletjes;
- input feta-banier;
+% input feta-bolletjes;
+& input feta-banier;
% input feta-eindelijk;
% input feta-klef;
% input feta-toevallig;
-% input feta-schrift;
+ input feta-schrift;
% input feta-haak;
- %input feta-timesig;
+% %input feta-timesig;
% input feta-pendaal;
% input feta-accordion;
fi
diff -urN ../lilypond-1.4.6/mf/feta-schrift.mf ./mf/feta-schrift.mf
--- ../lilypond-1.4.6/mf/feta-schrift.mf Sat Mar 24 01:28:01 2001
+++ ./mf/feta-schrift.mf Tue Aug 14 13:45:04 2001
@@ -123,9 +123,11 @@
labels(4);
fet_endchar;
+% Hmm, changed 1.5 to 1.4 to avoid problems with "random" placement of
+% the dots because of quantization effects for almost integer values. /MB
fet_beginchar("staccato dot", "staccato", "staccato")
save radius;
- radius# = 1.5 stafflinethickness#;
+ radius# = 1.4 stafflinethickness#;
define_pixels(radius);
pickup pencircle scaled 2 radius;
draw (0,0);
@@ -676,6 +678,39 @@
draw (0,-h) -- (0,h);
draw (-w,0) -- (w,0);
+fet_endchar;
+
+def draw_comma =
+ save alpha, thick, thin, ht;
+ alpha:=35;
+ thin# = 1.2 stafflinethickness#;
+ thick# = 3 stafflinethickness#;
+ ht# = .6staff_space#;
+ define_pixels(thin, thick,ht);
+ set_char_box(0, .5staff_space#, ht#, ht#);
+
+ penpos1(thick, alpha);
+ penpos2(thick, alpha+90);
+ penpos3(thin, 180-alpha);
+ penpos4(thin, 90-alpha);
+ x3r=0;
+ x1l=x3l;
+ y2r=-y4l=h;
+ z1=z2;
+ z3=z4;
+ penlabels(1,2,3,4);
+ fill z1l{dir (alpha+90)} .. z2r{dir alpha} .. z1r{dir (alpha-90)} ..
+ z3l{dir (270-alpha)} .. z4l{dir (alpha+180)} ..
+ z3r{dir (90-alpha)} .. cycle;
+enddef;
+
+fet_beginchar("Right Comma","rcomma","rcomma");
+ draw_comma;
+fet_endchar;
+
+fet_beginchar("Left Comma","lcomma","lcomma");
+ draw_comma;
+ xy_mirror_char;
fet_endchar;
thick#:=1/24designsize;
diff -urN ../lilypond-1.4.6/mf/feta-slag.mf ./mf/feta-slag.mf
--- ../lilypond-1.4.6/mf/feta-slag.mf Sat Feb 24 22:06:31 2001
+++ ./mf/feta-slag.mf Tue Aug 14 13:45:04 2001
@@ -93,7 +93,7 @@
fet_beginchar("mordent", "mordent", "mordent")
trills := 2;
- set_char_box(trills*twidth#-0.5toverlap#, trills*twidth#-0.5toverlap#, theight#, theight#);
+ set_char_box(trills*twidth#-0.5toverlap#, trills*twidth#-0.5toverlap#, 4/3*theight#, 4/3*theight#);
draw_trill_two;
draw_mordent(0);
fet_endchar;
@@ -112,7 +112,7 @@
fet_beginchar("prallmordent", "prallmordent", "prallmordent")
trills := 3;
- set_char_box(trills*twidth#-(trills-1)*0.5toverlap#, trills*twidth#-(trills-1)*0.5toverlap#, theight#, theight#);
+ set_char_box(trills*twidth#-(trills-1)*0.5toverlap#, trills*twidth#-(trills-1)*0.5toverlap#, 4/3*theight#, 4/3*theight#);
draw_trill_three;
draw_mordent(twidth-0.5toverlap);
fet_endchar;
@@ -144,5 +144,63 @@
% currentpicture := currentpicture shifted (-0.5w+tthin,-tfat*theight+0.75tthin);
currentpicture := currentpicture shifted (-0.5w+tthin,-tfat*theight+0.5tthin);
draw_trill_three;
+fet_endchar;
+
+fet_beginchar("upmordent", "upmordent", "upmordent")
+% trills := 4;
+ trills := 3;
+ set_char_box(trills*twidth#-(trills-1)*0.5toverlap#, trills*twidth#-(trills-1)*0.5toverlap#, 4/3*theight#, 4/3*theight#);
+% draw_slur(-2twidth#,-2theight#,0,-1);
+% currentpicture := currentpicture shifted (-0.5w+tthin,-tfat*theight+0.75tthin);
+ draw_slur(0,-2theight#,0,-1);
+% currentpicture := currentpicture shifted (-0.5w+1.3tthin,-tfat*theight+1.5tthin);
+ currentpicture := currentpicture shifted (-0.5w+1.65tthin,-tfat*theight+1.15tthin);
+% draw_trill_four;
+ draw_trill_three;
+ draw_mordent(twidth-0.5toverlap);
+fet_endchar;
+
+fet_beginchar("downmordent", "downmordent", "downmordent")
+ trills := 3;
+ set_char_box(trills*twidth#-(trills-1)*0.5toverlap#, trills*twidth#-(trills-1)*0.5toverlap#, 4/3*theight#, 4/3*theight#);
+% draw_slur(-2twidth#,2theight#,0,1);
+ draw_slur(0,2theight#,0,1);
+% currentpicture := currentpicture shifted (-0.5w+tthin,-tfat*theight+0.75tthin);
+ currentpicture := currentpicture shifted (-0.5w+tthin,-tfat*theight+0.5tthin);
+ draw_trill_three;
+ draw_mordent(twidth-0.5toverlap);
+fet_endchar;
+
+fet_beginchar("lineprall", "lineprall", "lineprall")
+ trills := 3;
+ set_char_box(trills*twidth#-(trills-1)*0.5toverlap#, trills*twidth#-(trills-1)*0.5toverlap#, theight#, 4*theight#);
+ pickup pencircle scaled tthin;
+ draw (-0.5w+tthin,-tfat*theight+0.5tthin) -- (-0.5w+tthin,h);
+ draw_trill_three;
+fet_endchar;
+
+fet_beginchar("pralldown", "pralldown", "pralldown")
+% trills := 4;
+ trills := 3;
+ set_char_box(trills*twidth#-(trills-1)*0.5toverlap#, trills*twidth#-(trills-1)*0.5toverlap#, theight#, theight#);
+% draw_slur(-2twidth#,-2theight#,0,-1);
+% currentpicture := currentpicture shifted (-0.5w+tthin,-tfat*theight+0.75tthin);
+ draw_slur(0,-2theight#,0,-1);
+% currentpicture := currentpicture shifted (-0.5w+1.3tthin,-tfat*theight+1.5tthin);
+ currentpicture := currentpicture shifted (-0.5w+1.65tthin,-tfat*theight+1.15tthin);
+% draw_trill_four;
+ draw_trill_three;
+ currentpicture := currentpicture xscaled -1;
+fet_endchar;
+
+fet_beginchar("prallup", "prallup", "prallup")
+ trills := 3;
+ set_char_box(trills*twidth#-(trills-1)*0.5toverlap#, trills*twidth#-(trills-1)*0.5toverlap#, theight#, theight#);
+% draw_slur(-2twidth#,2theight#,0,1);
+ draw_slur(0,2theight#,0,1);
+% currentpicture := currentpicture shifted (-0.5w+tthin,-tfat*theight+0.75tthin);
+ currentpicture := currentpicture shifted (-0.5w+tthin,-tfat*theight+0.5tthin);
+ draw_trill_three;
+ currentpicture := currentpicture xscaled -1;
fet_endchar;
diff -urN ../lilypond-1.4.6/midi2ly/lilypond-item.cc ./midi2ly/lilypond-item.cc
--- ../lilypond-1.4.6/midi2ly/lilypond-item.cc Thu Apr 5 00:48:35 2001
+++ ./midi2ly/lilypond-item.cc Wed Aug 22 12:28:44 2001
@@ -311,7 +311,7 @@
return "";
String str = "\\skip ";
- str += Duration_convert::dur2_str (dur) + "; ";
+ str += Duration_convert::dur2_str (dur);
return str;
}
diff -urN ../lilypond-1.4.6/midi2ly/lilypond-stream.cc ./midi2ly/lilypond-stream.cc
--- ../lilypond-1.4.6/midi2ly/lilypond-stream.cc Mon May 28 00:34:20 2001
+++ ./midi2ly/lilypond-stream.cc Wed Aug 22 12:28:14 2001
@@ -100,7 +100,7 @@
*os_p_ << filename_str_g;
*os_p_ << "\n\n";
// ugh
- *os_p_ << "\\version \"1.4.0\";\n";
+ *os_p_ << "\\version \"1.4.0\"\n";
}
void
diff -urN ../lilypond-1.4.6/midi2ly/main.cc ./midi2ly/main.cc
--- ../lilypond-1.4.6/midi2ly/main.cc Mon Apr 16 23:17:45 2001
+++ ./midi2ly/main.cc Tue Aug 21 18:04:46 2001
@@ -121,7 +121,7 @@
cout << '\n';
cout << Long_option_init::table_str (long_option_init_a) << endl;
- cout << _f ("Report bugs to %s", "bug-gnu-music@gnu.org") << endl;
+ cout << _f ("Report bugs to %s", "bug-lilypond@gnu.org") << endl;
}
void
diff -urN ../lilypond-1.4.6/ps/music-drawing-routines.ps ./ps/music-drawing-routines.ps
--- ../lilypond-1.4.6/ps/music-drawing-routines.ps Thu Jun 28 18:05:32 2001
+++ ./ps/music-drawing-routines.ps Tue Aug 21 18:08:30 2001
@@ -12,6 +12,8 @@
1 copy mul exch 1 copy mul add sqrt
} bind def
+/skeel { scale } bind def
+
% FIXME. translate to middle of box.
% Nice rectangle with rounded corners
% FIXME: linewidth hardcoded. check: too round?
@@ -31,13 +33,6 @@
l 2 div sub /h exch def
l 2 div sub /d exch def
-
- %% UGH huh?
- %% Where does this correction come from?
- %% Why don't we need this in x direction?
- h l 2 div sub /h exch def
- d l 2 div sub /d exch def
-
l 2 div sub /w exch def
l 2 div sub /b exch def
@@ -64,9 +59,9 @@
%% real thin lines for testing
/l 0.01 def
}{
- /l 0.1 def
+ /l 0.05 def
} ifelse
- l 2 div setlinewidth
+ l setlinewidth
0 setlinecap
1 setlinejoin
diff -urN ../lilypond-1.4.6/scm/grob-description.scm ./scm/grob-description.scm
--- ../lilypond-1.4.6/scm/grob-description.scm Thu Jun 28 16:00:58 2001
+++ ./scm/grob-description.scm Tue Aug 21 18:11:21 2001
@@ -80,7 +80,7 @@
(thickness . 0.48) ; in staff-space
(before-line-breaking-callback . ,Beam::before_line_breaking)
(after-line-breaking-callback . ,Beam::after_line_breaking)
- (neutral-direction . 1)
+ (neutral-direction . -1)
(dir-function . ,beam-dir-majority)
(height-quants . ,default-beam-dy-quants)
(vertical-position-quant-function . ,default-beam-y-quants)
@@ -581,7 +581,7 @@
(lengths . (3.5 3.5 3.5 4.5 5.0))
(stem-shorten . (0.5))
; if stem is on middle line, choose this direction.
- (neutral-direction . 1)
+ (neutral-direction . -1)
(X-offset-callbacks . (,Stem::off_callback))
(X-extent-callback . ,Stem::dim_callback)
(Y-extent-callback . ,Stem::height)
diff -urN ../lilypond-1.4.6/scm/interface-description.scm ./scm/interface-description.scm
--- ../lilypond-1.4.6/scm/interface-description.scm Thu Jun 21 00:55:07 2001
+++ ./scm/interface-description.scm Tue Aug 21 18:11:31 2001
@@ -134,7 +134,7 @@
support-head
heads
direction
- stem-length
+ length
style
flag-style
dir-forced
diff -urN ../lilypond-1.4.6/scm/script.scm ./scm/script.scm
--- ../lilypond-1.4.6/scm/script.scm Thu Mar 8 00:41:15 2001
+++ ./scm/script.scm Tue Aug 14 13:45:04 2001
@@ -21,6 +21,7 @@
("stopped" . ((feta . ("stopped" . "stopped")) #f 0 1 0))
("staccato" . ((feta . ("staccato" . "staccato")) #t -1 0 -100))
("tenuto" . ((feta . ("tenuto" . "tenuto")) #t -1 0 0))
+ ("comma" . ((feta . ("lcomma" . "rcomma")) #t 0 1 0))
("upbow" . ((feta . ("upbow" . "upbow")) #f 0 1 0))
("downbow" . ((feta . ("downbow" . "downbow")) #f 0 1 0))
("lheel" . ((feta . ("upedalheel" . "upedalheel")) #f 0 -1 0))
@@ -38,6 +39,11 @@
("prallmordent" . ((feta . ("prallmordent" . "prallmordent")) #f 0 1 0))
("upprall" . ((feta . ("upprall" . "upprall")) #f 0 1 0))
("downprall" . ((feta . ("downprall" . "downprall")) #f 0 1 0))
+ ("upmordent" . ((feta . ("upmordent" . "upmordent")) #f 0 1 0))
+ ("downmordent" . ((feta . ("downmordent" . "downmordent")) #f 0 1 0))
+ ("lineprall" . ((feta . ("lineprall" . "lineprall")) #f 0 1 0))
+ ("pralldown" . ((feta . ("pralldown" . "pralldown")) #f 0 1 0))
+ ("prallup" . ((feta . ("prallup" . "prallup")) #f 0 1 0))
("segno" . ((feta . ("segno" . "segno")) #f 0 1 0))
("coda" . ((feta . ("coda" . "coda")) #f 0 1 0)))
default-script-alist)
diff -urN ../lilypond-1.4.6/scripts/convert-ly.py ./scripts/convert-ly.py
--- ../lilypond-1.4.6/scripts/convert-ly.py Tue May 15 16:13:29 2001
+++ ./scripts/convert-ly.py Tue Aug 21 18:05:28 2001
@@ -53,7 +53,7 @@
-n, --no-version don't add new version stamp.
--version print program version
-Report bugs to bugs-gnu-music@gnu.org
+Report bugs to bugs-lilypond@gnu.org
""" % program_name)
diff -urN ../lilypond-1.4.6/scripts/etf2ly.py ./scripts/etf2ly.py
--- ../lilypond-1.4.6/scripts/etf2ly.py Thu Apr 5 00:12:30 2001
+++ ./scripts/etf2ly.py Tue Aug 21 18:05:28 2001
@@ -1008,7 +1008,7 @@
Finale product. This program will convert a subset of ETF to a
ready-to-use lilypond file.
-Report bugs to bug-gnu-music@gnu.org
+Report bugs to bug-lilypond@gnu.org
Written by Han-Wen Nienhuys
"""
diff -urN ../lilypond-1.4.6/scripts/lilypond-book.py ./scripts/lilypond-book.py
--- ../lilypond-1.4.6/scripts/lilypond-book.py Sun Jul 15 14:14:41 2001
+++ ./scripts/lilypond-book.py Tue Aug 21 18:05:28 2001
@@ -1096,7 +1096,7 @@
-Report bugs to bug-gnu-music@gnu.org.
+Report bugs to bug-lilypond@gnu.org.
Written by Tom Cato Amundsen and
Han-Wen Nienhuys
diff -urN ../lilypond-1.4.6/scripts/ly2dvi.py ./scripts/ly2dvi.py
--- ../lilypond-1.4.6/scripts/ly2dvi.py Sun Jul 8 23:01:49 2001
+++ ./scripts/ly2dvi.py Thu Aug 23 15:21:55 2001
@@ -66,7 +66,10 @@
import operator
import tempfile
import traceback
-
+import resource
+
+
+
datadir = '@datadir@'
sys.path.append (datadir + '/python')
try:
@@ -179,10 +182,7 @@
NO WARRANTY.'''))
sys.stdout.write ('\n')
-if ( os.name == 'posix' ):
- errorport=sys.stderr
-else:
- errorport=sys.stdout
+errorport=sys.stderr
def progress (s):
errorport.write (s + '\n')
@@ -270,7 +270,7 @@
('\n'),
(options_help_str (option_definitions)),
('\n\n'),
- (_ ("Report bugs to %s") % 'bug-gnu-music@gnu.org'),
+ (_ ("Report bugs to %s") % 'bug-lilypond@gnu.org'),
('\n')]
map (sys.stdout.write, ls)
@@ -296,12 +296,11 @@
Exit status of CMD
"""
-
- if ( os.name != 'posix' ):
- cmd = re.sub (r'''\\''', r'''\\\\\\''', cmd)
- cmd = "sh -c \'%s\'" % cmd
-
+ # Attempt to fix problems with limited stack size set by Python!
+ # Sets unlimited stack size.
+ resource.setrlimit(resource.RLIMIT_STACK, (-1,-1))
+
if verbose_p:
progress (_ ("Invoking `%s\'") % cmd)
st = os.system (cmd)
@@ -576,7 +575,7 @@
cmd = 'latex \\\\nonstopmode \\\\input %s' % latex_fn
- if not verbose_p and os.name == 'posix':
+ if not verbose_p:
progress ( _("Running %s...") % 'LaTeX')
cmd = cmd + ' 1> /dev/null 2> /dev/null'
@@ -601,7 +600,7 @@
cmd = 'dvips %s -o%s %s' % (opts, outbase + '.ps', outbase + '.dvi')
- if not verbose_p and os.name == 'posix':
+ if not verbose_p:
progress ( _("Running %s...") % 'dvips')
cmd = cmd + ' 1> /dev/null 2> /dev/null'
diff -urN ../lilypond-1.4.6/scripts/mup2ly.py ./scripts/mup2ly.py
--- ../lilypond-1.4.6/scripts/mup2ly.py Wed May 9 16:32:01 2001
+++ ./scripts/mup2ly.py Tue Aug 21 18:05:28 2001
@@ -165,7 +165,7 @@
sys.stdout.write ('\n')
warning (_ ("%s is far from completed. Not all constructs are recognised.") % program_name)
sys.stdout.write ('\n')
- sys.stdout.write (_ ("Report bugs to %s") % 'bug-gnu-music@gnu.org')
+ sys.stdout.write (_ ("Report bugs to %s") % 'bug-lilypond@gnu.org')
sys.stdout.write ('\n')
sys.exit (0)
diff -urN ../lilypond-1.4.6/scripts/musedata2ly.py ./scripts/musedata2ly.py
--- ../lilypond-1.4.6/scripts/musedata2ly.py Thu Apr 5 00:12:30 2001
+++ ./scripts/musedata2ly.py Tue Aug 21 18:05:28 2001
@@ -519,7 +519,7 @@
musedata2ly converts a set of musedata files to one .ly file, and will
include a \header field if a .ref file is supplied
-Report bugs to bug-gnu-music@gnu.org.
+Report bugs to bug-lilypond@gnu.org.
Written by Han-Wen Nienhuys
""")
diff -urN ../lilypond-1.4.6/scripts/pmx2ly.py ./scripts/pmx2ly.py
--- ../lilypond-1.4.6/scripts/pmx2ly.py Thu Apr 5 00:12:30 2001
+++ ./scripts/pmx2ly.py Tue Aug 21 18:05:28 2001
@@ -748,7 +748,7 @@
PMX is a Musixtex preprocessor written by Don Simons, see
http://www.gmd.de/Misc/Music/musixtex/software/pmx/
-Report bugs to bug-gnu-music@gnu.org.
+Report bugs to bug-lilypond@gnu.org.
Written by Han-Wen Nienhuys
""")
diff -urN ../lilypond-1.4.6/scripts/update-lily.py ./scripts/update-lily.py
--- ../lilypond-1.4.6/scripts/update-lily.py Fri May 11 15:29:05 2001
+++ ./scripts/update-lily.py Tue Aug 21 18:05:28 2001
@@ -188,7 +188,7 @@
sys.stdout.write ('\n')
sys.stdout.write (options_help_str (option_definitions))
sys.stdout.write ('\n\n')
- sys.stdout.write (_ ("Report bugs to %s") % 'bug-gnu-music@gnu.org')
+ sys.stdout.write (_ ("Report bugs to %s") % 'bug-lilypond@gnu.org')
sys.stdout.write ('\n')
sys.exit (0)
diff -urN ../lilypond-1.4.6/tex/lily-ps-defs.tex ./tex/lily-ps-defs.tex
--- ../lilypond-1.4.6/tex/lily-ps-defs.tex Fri Mar 30 12:18:18 2001
+++ ./tex/lily-ps-defs.tex Tue Aug 21 18:08:53 2001
@@ -16,7 +16,7 @@
\def\embeddedps##1{%
\special{ps\string: @beginspecial @setspecial
\lilypondpaperoutputscale\lilySpace
- \lilypondpaperoutputscale\lilySpace scale
+ \lilypondpaperoutputscale\lilySpace skeel
##1 @endspecial}%
}
}
|
![[icon]](@TOP@Documentation/pictures/out-www/lelie-icon.png){kind=icon}