From: Han-Wen Nienhuys Date: Sat, 24 Feb 2001 21:51:46 +0000 (+0100) Subject: release: 1.3.131 X-Git-Tag: release/1.3.131 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=94189ec2b8da6d7e89dc619c646a927adead9b19;p=lilypond.git release: 1.3.131 ============ * Documentation: notation contexts. * 2001 (c) search-replace patch. * Center rehearsal marks by default. * Fixing collapsed dynamics with part-combine * \property tupletNumberFormatFunction selects formatting function for tuplet brackets. 1.3.130.j --- diff --git a/CHANGES b/CHANGES index c4868b9668..29b2aa7ecd 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,17 @@ +1.3.130.hwn2 +============ + +* Documentation: notation contexts. + +* 2001 (c) search-replace patch. + +* Center rehearsal marks by default. + +* Fixing collapsed dynamics with part-combine + +* \property tupletNumberFormatFunction selects formatting function for +tuplet brackets. + 1.3.130.jcn5 ============ @@ -5,17 +19,11 @@ * Bugfix: file-path.cc; absolute directories start with directory separator. -1.3.130.jcn4 -============ - * Makefile template using dependencies: make/ly.make. Needs some simple examples. * Depencies fixes for lilypond, ly2dvi (still kludged) and lilypond-book. -1.3.130.jcn3 -============ - * nl.po update. * Bugfixes and cleanups of mainly main.cc. @@ -24,9 +32,6 @@ simple examples. * Bugfix: use init file extension .ly for extensionless input. -1.3.130.jcn2 -============ - * Ignore outname = ; settings in output blocks. * Revised input and output naming, now it's possible to include a @@ -44,9 +49,6 @@ stepmake templates. * Lilypond-book now writes lily-.ly files. -1.3.130.jcn1 -============ - * Bugfix: don't display repeat colons for zero height bar lines; fixes repeat barlines in lyrics. diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely index a5276db8cf..4a8652b6f5 100644 --- a/Documentation/user/refman.itely +++ b/Documentation/user/refman.itely @@ -600,7 +600,9 @@ major key, e.g., @code{\minor} is defined as 3. The standard mode names @code{\ionian}, @code{\locrian}, @code{\aeolian}, @code{\mixolydian}, @code{\lydian}, @code{\phrygian}, and @code{\dorian} are also defined. -This command sets @code{Staff.keySignature}. +This command sets @code{Staff.keySignature}. + + @cindex @code{keySignature} @@ -2801,25 +2803,159 @@ relative within transposed music, you must place an additional @section Engravers @cindex engravers @menu -* Selecting contexts:: -* Context definitions:: * Notation Contexts:: +* Creating contexts:: +* Default contexts:: +* Context properties:: +* Context definitions:: @end menu @c . {Music expressions} -@node Selecting contexts -@subsection Selecting contexts + + + +@c . {Notation Contexts} +@node Notation Contexts +@subsection Notation Contexts + +@cindex notation contexts + +Notation contexts are objects that only exist during a run of LilyPond. +During the interpretation phase of LilyPond (when lily prints +"interpreting music"), music a @code{\score} block is interpreted in +time order, i.e. in much the same order that humans read, play, and +write music. + +During this reading, the notation context is holds the state +for the current point within the music. It contains information like + +@itemize @bullet + @item What notes are playing at this point? + @item What symbols will be printed at this point? + @item What is the current key signature, time signature, point within + the measure, etc.? +@end itemize + +Contexts are grouped hierarchically: A @code{Voice} context is +contained in a @code{Staff} context (because a staff can contain +multiple voices at any point), a @code{Staff} context is contained in +a @code{Score}, @code{StaffGroup}, or @code{ChoirStaff} context (because +these can all contain multiple staffs). + + +Contexts associated with sheet music output are called @emph{notation +contexts}, those for sound output are called performance contexts. + + +@node Creating contexts +@subsection Creating contexts @cindex @code{\context} @cindex context selection +Contexts for a music expression can be selected manually, using the +following music expression. + @example \context @var{contexttype} [= @var{contextname}] @var{musicexpr} @end example -Interpret @var{musicexpr} within a context of type @var{contexttype}. -If the context does not exist, it will be created. The new context -can optionally be given a name. +This instructs lilypond to interpret @var{musicexpr} within the context + of type @var{contexttype} and with name @var{contextname}. If this +context does not exist, it will be created. + +@quotation + +@lilypond[verbatim] +\score { + \notes \relative c'' { + c4 f + } +} + +@end lilypond +@end quotation + +In this example, the @code{c} and @code{d} are printed on the +default staff. For the @code{e}, a context Staff called +@code{another} is specified; since that does not exist, a new +context is created. Within @code{another}, a (default) Voice context +is created for the @code{e4}. When all music referring to a +context is finished, the context is ended as well. So after the +third quarter, @code{another} is removed. + + + +@node Default contexts +@subsection Default contexts + +Most music expressions don't need @code{\context}: they inherit the +notation context from their parent. Each note is a music expression, and +as you can see in the following example, only the sequential music +enclosing the three notes has an explicit context. + +@lilypond[verbatim] +\score { \notes \context Voice = goUp { c'4 d' e' } } +@end lilypond + +There are some quirks that you must keep in mind when dealing with +defaults: + +Every top-level music is interpreted by the Score context, in other +words, you may think of @code{\score} working like +@example + \score @{ + \context Score @var{music} + @} +@end example + +Sequential music follows the contexts of its "children". Take this example +@lilypond +\score { \context Score \notes { c'4 ( d' )e' } } +@end lilypond + +The sequential music is interpreted by the Score context initially +(notice that the @code{\context} specification is redundant), but when a +note is encountered, contexts are setup to accept that note. In this +case, a Thread, Voice and Staff are created. The rest of the sequential +music is also interpreted with the same Thread, Voice and Staff context, +putting the notes on the same staff, in the same voice. + +This is a convenient mechanism, but do not expect opening chords to work +without @code{\context}. For every note, a separate staff +@lilypond +\score { \notes } +@end lilypond + +Of course, if the chord is preceded by a normal note in sequential +music, the chord will be interpreted by the Thread of the preceding +note: +@lilypond +\score { \notes { c'4 } } +@end lilypond + + + +@node Context properties +@subsection Context properties + +Notation contexts can be modified from within the @file{.ly} file. The +following music expression does that job: + +@cindex @code{\property} +@example + \property @var{contextname}.@var{propname} = @var{value} +@end example + +Sets the @var{propname} property of the context @var{contextname} to the +specified Scheme expression @var{value}. All @var{propname} and +@var{contextname} are strings, which are typically unquoted. + +Properties that are set in one context are inherited by all of the +contained contexts. This means that a property valid for the +@code{Voice} context can be set in the @code{Score} context (for +example) and thus take effect in all @code{Voice} contexts. + @@ -2829,8 +2965,8 @@ can optionally be given a name. @cindex context definition @cindex translator definition -@cindex engraver hacking +[todo: ] A notation contexts is defined by the following information @@ -2997,143 +3133,7 @@ translator: -@c . {Notation Contexts} -@node Notation Contexts -@subsection Notation Contexts - -@cindex notation contexts - -Notation contexts are objects that only exist during a run of -LilyPond. During the interpretation phase of LilyPond, the Music -expression contained in a @code{\score} block is interpreted in time -order. This is the order in which humans read, play, and write -music. - -A context is an object that holds the reading state of the -expression; it contains information like - -@itemize @bullet - @item What notes are playing at this point? - @item What symbols will be printed at this point? - @item In what style will they printed? - @item What is the current key signature, time signature, point within - the measure, etc.? -@end itemize - -Contexts are grouped hierarchically: A @code{Voice} context is -contained in a @code{Staff} context (because a staff can contain -multiple voices at any point), a @code{Staff} context is contained in -a @code{Score}, @code{StaffGroup}, or @code{ChoirStaff} context (because -these can all contain multiple staffs). - -Contexts associated with sheet music output are called @emph{notation -contexts}, those for sound output are called performance contexts. - -Contexts are created either manually or automatically. Initially, the -top level music expression is interpreted by the top level context (the -@code{Score} context). When a atomic music expression (i.e. a note, a -rest, etc.), a nested set of contexts is created that can process these -atomic expressions, as in this example: - -@example -\score @{ \notes @{ c4 @} @} -@end example - -The sequential music, `@code{@{ c4 @}}' is interpreted by @code{Score} -context. When the note @code{c4} itself is interpreted, a set of -contexts is needed that will accept notes. The default for this is a -@code{Voice} context, contained in a @code{Staff} context. Creation of -these contexts results in the staff being printed. - -@cindex context - -You can also create contexts manually, and you probably have to do so -if you want to typeset complicated multiple part material. If a -`@code{\context} @var{name} @var{musicexpr}' expression is encountered -during the interpretation phase, the @var{musicexpr} argument will be -interpreted with a context of type @var{name}. If you specify a name, -the specific context with that name is searched. - -[type vs id] - -If a context of the specified type and name can not be found, a new -one is created. For example, - -@quotation - -@lilypond[verbatim] -\score { - \notes \relative c'' { - c4 f - } -} - -@end lilypond -@end quotation - -In this example, the @code{c} and @code{d} are printed on the -default staff. For the @code{e}, a context Staff called -@code{another} is specified; since that does not exist, a new -context is created. Within @code{another}, a (default) Voice context -is created for the @code{e4}. When all music referring to a -context is finished, the context is ended as well. So after the -third quarter, @code{another} is removed. - -Almost all music expressions inherit their interpretation context -from their parent. In other words, suppose that the syntax for a -music expression is - -@example - - \keyword @var{musicexpr1} @var{musicexpr2} @dots{} -@end example - -When the interpretation of this music expression starts, the context -for @var{musicexpr1}, @var{musicexpr2}, etc. is that of the total -expression. - -Lastly, you may wonder, why this: - -@quotation - -@example -\score @{ - \notes \relative c'' @{ - c4 d4 e4 - @} -@} -@end example - -@end quotation - -doesn't result in this: - -@lilypond[] - - \score { - \notes \relative c'' { - - } - } - -@end lilypond - -For the @code{c4}, a default @code{Staff} (with a contained -@code{Voice}) context is created. After the @code{c4} ends, no -music refers to this default staff, so it would be ended, with the -result shown. To prevent this inconvenient behavior, the context to -which the sequential music refers is adjusted during the -interpretation. So after the @code{c4} ends, the context of the -sequential music is also the default @code{Voice} context. -The @code{d4} gets interpreted in the same context -as @code{c4}. - -Properties that are set in one context are inherited by all of the -contained contexts. This means that a property valid for the -@code{Voice} context can be set in the @code{Score} context (for -example) and thus take effect in all @code{Voice} contexts. - -Properties can be preset within the @code{\translator} block + Properties can be preset within the @code{\translator} block corresponding to the appropriate context. In this case, the syntax is @@ -3152,6 +3152,7 @@ called @emph{performers}. + @c . {Syntactic details} @node Syntactic details @section Syntactic details @@ -3724,18 +3725,9 @@ Translation? @cindex properties @unnumberedsubsec Translation property -[todo: add \set/\override/\revert] - -@cindex @code{\property} -@example - \property @var{contextname}.@var{propname} = @var{value} -@end example +[todo: add \set/\override/\revert] -Sets the @var{propname} property of the context @var{contextname} to -the specified @var{value}. All three arguments are strings. -Depending on the context, it may be necessary to quote the strings or -to leave space on both sides of the dot. @cindex output properties @@ -3782,7 +3774,7 @@ Don't move the finger 2, only text "m.d." ... @menu -* Text markup:: +* Text markup:: @end menu @node Text markup diff --git a/VERSION b/VERSION index 6661c5724b..530cea21ba 100644 --- a/VERSION +++ b/VERSION @@ -1,8 +1,8 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=3 -PATCH_LEVEL=130 -MY_PATCH_LEVEL=jcn6 +PATCH_LEVEL=131 +MY_PATCH_LEVEL= # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/configure b/configure index 6096179843..143b7e2aba 100755 --- a/configure +++ b/configure @@ -1123,6 +1123,7 @@ fi ZIP="zip -r -9" # program_suffix=.exe # urg + # ROOTSEP=':' # DIRSEP='\\' # PATHSEP=';' # @@ -1145,10 +1146,12 @@ fi # this way, you may have buildscripts/out/lilypond-profile # 'automatically' sourced from /usr/etc/profile.d/ too. # + ROOTSEP=':' DIRSEP='/' PATHSEP=':' INSTALL="\$(SHELL) \$(stepdir)/../bin/install-dot-exe.sh -c" else + ROOTSEP='/' DIRSEP='/' PATHSEP=':' LN=ln @@ -1286,7 +1289,7 @@ EOF # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1290: checking for $ac_word" >&5 +echo "configure:1293: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1316,7 +1319,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1320: checking for $ac_word" >&5 +echo "configure:1323: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1367,7 +1370,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1371: checking for $ac_word" >&5 +echo "configure:1374: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1399,7 +1402,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1403: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1406: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1410,12 +1413,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1414 "configure" +#line 1417 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1441,12 +1444,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1445: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1448: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1450: checking whether we are using GNU C" >&5 +echo "configure:1453: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1455,7 +1458,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1459: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1462: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1474,7 +1477,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1478: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1481: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1521,7 +1524,7 @@ fi # AC_HAVE_HEADERS(limits.h malloc.h string.h unistd.h values.h) echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1525: checking how to run the C preprocessor" >&5 +echo "configure:1528: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1536,13 +1539,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1546: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1549: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1553,13 +1556,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1563: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1566: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1570,13 +1573,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1580: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1583: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1604,17 +1607,17 @@ for ac_hdr in assert.h sys/stat.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1608: checking for $ac_hdr" >&5 +echo "configure:1611: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1618: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1621: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1641,12 +1644,12 @@ fi done echo $ac_n "checking whether stat file-mode macros are broken""... $ac_c" 1>&6 -echo "configure:1645: checking whether stat file-mode macros are broken" >&5 +echo "configure:1648: checking whether stat file-mode macros are broken" >&5 if eval "test \"`echo '$''{'ac_cv_header_stat_broken'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1707,7 +1710,7 @@ fi echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:1711: checking how to run the C++ preprocessor" >&5 +echo "configure:1714: checking how to run the C++ preprocessor" >&5 if test -z "$CXXCPP"; then if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1720,12 +1723,12 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross CXXCPP="${CXX-g++} -E" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1729: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1732: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1762,7 +1765,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1766: checking for $ac_word" >&5 +echo "configure:1769: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1794,7 +1797,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1798: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:1801: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1805,12 +1808,12 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext << EOF -#line 1809 "configure" +#line 1812 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:1814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1817: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1836,12 +1839,12 @@ if test $ac_cv_prog_cxx_works = no; then { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1840: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1843: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:1845: checking whether we are using GNU C++" >&5 +echo "configure:1848: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1850,7 +1853,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1854: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1857: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -1869,7 +1872,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}" ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:1873: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:1876: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1903,17 +1906,17 @@ fi ac_safe=`echo "FlexLexer.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for FlexLexer.h""... $ac_c" 1>&6 -echo "configure:1907: checking for FlexLexer.h" >&5 +echo "configure:1910: checking for FlexLexer.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1917: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1920: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1964,12 +1967,12 @@ fi echo $ac_n "checking whether explicit instantiation is needed""... $ac_c" 1>&6 -echo "configure:1968: checking whether explicit instantiation is needed" >&5 +echo "configure:1971: checking whether explicit instantiation is needed" >&5 if eval "test \"`echo '$''{'lily_cv_need_explicit_instantiation'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < struct foo { static int baz; }; @@ -1979,7 +1982,7 @@ int main() { return foo::baz; ; return 0; } EOF -if { (eval echo configure:1983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lily_cv_need_explicit_instantiation=no else @@ -2006,7 +2009,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2010: checking for $ac_word" >&5 +echo "configure:2013: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2049,7 +2052,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2053: checking for $ac_word" >&5 +echo "configure:2056: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_BISON'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2084,7 +2087,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2088: checking for $ac_word" >&5 +echo "configure:2091: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_FLEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2152,7 +2155,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2156: checking for $ac_word" >&5 +echo "configure:2159: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2185,7 +2188,7 @@ test -n "$AR" || AR="error" # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2189: checking for $ac_word" >&5 +echo "configure:2192: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2241,7 +2244,7 @@ fi echo $ac_n "checking language""... $ac_c" 1>&6 -echo "configure:2245: checking language" >&5 +echo "configure:2248: checking language" >&5 case "$language" in En* | en* | Am* | am* | US* | us*) lang=English;; @@ -2277,7 +2280,7 @@ EOF echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6 -echo "configure:2281: checking for gettext in -lintl" >&5 +echo "configure:2284: checking for gettext in -lintl" >&5 ac_lib_var=`echo intl'_'gettext | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2285,7 +2288,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2329,12 +2332,12 @@ fi for ac_func in gettext do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2333: checking for $ac_func" >&5 +echo "configure:2336: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2367: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2392,7 +2395,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2396: checking for $ac_word" >&5 +echo "configure:2399: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2423,7 +2426,7 @@ done test -n "$MSGFMT" || MSGFMT="\$(SHELL) \$(step-bindir)/fake-msgfmt.sh " echo $ac_n "checking whether msgfmt accepts -o""... $ac_c" 1>&6 -echo "configure:2427: checking whether msgfmt accepts -o" >&5 +echo "configure:2430: checking whether msgfmt accepts -o" >&5 msgfmt_output="`msgfmt -o bla 2>&1 | grep usage`" if test "$msgfmt_output" = ""; then echo "$ac_t""yes" 1>&6 @@ -2451,7 +2454,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2455: checking for $ac_word" >&5 +echo "configure:2458: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_METAFONT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2487,7 +2490,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2491: checking for $ac_word" >&5 +echo "configure:2494: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MFONT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2525,7 +2528,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2529: checking for $ac_word" >&5 +echo "configure:2532: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_METAPOST'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2561,7 +2564,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2565: checking for $ac_word" >&5 +echo "configure:2568: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MPOST'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2600,7 +2603,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2604: checking for $ac_word" >&5 +echo "configure:2607: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_INIMETAFONT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2636,7 +2639,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2640: checking for $ac_word" >&5 +echo "configure:2643: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_INIMFONT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2674,7 +2677,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2678: checking for $ac_word" >&5 +echo "configure:2681: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_INIMETAPOST'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2710,7 +2713,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2714: checking for $ac_word" >&5 +echo "configure:2717: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_INIMPOST'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2744,7 +2747,7 @@ test -n "$INIMPOST" || INIMPOST="-echo no inimp or inimpost" fi echo $ac_n "checking for working metafont mode""... $ac_c" 1>&6 -echo "configure:2748: checking for working metafont mode" >&5 +echo "configure:2751: checking for working metafont mode" >&5 modelist='ljfour lj4 lj3 lj2 ljet laserjet' for MFMODE in $modelist; do $METAFONT "\mode:=$MFMODE; mode_setup; end." > /dev/null 2>&1 @@ -2755,7 +2758,7 @@ echo "configure:2748: checking for working metafont mode" >&5 echo "$ac_t""$MFMODE" 1>&6 echo $ac_n "checking for mfplain.mp""... $ac_c" 1>&6 -echo "configure:2759: checking for mfplain.mp" >&5 +echo "configure:2762: checking for mfplain.mp" >&5 # # For now let people define these in their environments # @@ -2763,7 +2766,7 @@ echo "configure:2759: checking for mfplain.mp" >&5 echo "$ac_t""$MFPLAIN_MP" 1>&6 echo $ac_n "checking for inimetapost flags""... $ac_c" 1>&6 -echo "configure:2767: checking for inimetapost flags" >&5 +echo "configure:2770: checking for inimetapost flags" >&5 if test ${INIMETAPOST} = "inimp" ; then : ${INIMETAPOST_FLAGS=''} else @@ -2796,7 +2799,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2800: checking for $ac_word" >&5 +echo "configure:2803: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_KPSEWHICH'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2827,7 +2830,7 @@ done test -n "$KPSEWHICH" || KPSEWHICH="no" echo $ac_n "checking for tfm path""... $ac_c" 1>&6 -echo "configure:2831: checking for tfm path" >&5 +echo "configure:2834: checking for tfm path" >&5 TFM_FONTS="cmr msam" @@ -2855,13 +2858,13 @@ echo "configure:2831: checking for tfm path" >&5 ## First, let's just see if we can find Guile at all. echo $ac_n "checking "for guile-config"""... $ac_c" 1>&6 -echo "configure:2859: checking "for guile-config"" >&5 +echo "configure:2862: checking "for guile-config"" >&5 for guile_config in guile-config $target-guile-config $build-guile-config; do echo "$ac_t"""$guile_config"" 1>&6 if ! $guile_config --version > /dev/null 2>&1 ; then echo "configure: warning: "cannot execute $guile_config"" 1>&2 echo $ac_n "checking "if we are cross compiling"""... $ac_c" 1>&6 -echo "configure:2865: checking "if we are cross compiling"" >&5 +echo "configure:2868: checking "if we are cross compiling"" >&5 guile_config=error else break @@ -2872,7 +2875,7 @@ echo "configure:2865: checking "if we are cross compiling"" >&5 exit 1 fi echo $ac_n "checking "Guile version"""... $ac_c" 1>&6 -echo "configure:2876: checking "Guile version"" >&5 +echo "configure:2879: checking "Guile version"" >&5 need_guile_version="1.3.4" need_guile_version_numeric=100304 guile_version=`$guile_config --version 2>&1 | awk '{print $NF}'` @@ -2891,7 +2894,7 @@ else {last =0}} ## The GUILE_FLAGS macro. echo $ac_n "checking for Guile""... $ac_c" 1>&6 -echo "configure:2895: checking for Guile" >&5 +echo "configure:2898: checking for Guile" >&5 if ! $guile_config link > /dev/null ; then echo "$ac_t"""cannot execute $guile_config"" 1>&6 { echo "configure: error: "cannot find guile-config; is Guile installed?"" 1>&2; exit 1; } @@ -2906,7 +2909,7 @@ echo "configure:2895: checking for Guile" >&5 # Extract the first word of "guile", so it can be a program name with args. set dummy guile; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2910: checking for $ac_word" >&5 +echo "configure:2913: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GUILE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2956,17 +2959,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2960: checking for $ac_hdr" >&5 +echo "configure:2963: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2970: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2973: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2993,7 +2996,7 @@ fi done echo $ac_n "checking for kpse_find_file in -lkpathsea""... $ac_c" 1>&6 -echo "configure:2997: checking for kpse_find_file in -lkpathsea" >&5 +echo "configure:3000: checking for kpse_find_file in -lkpathsea" >&5 ac_lib_var=`echo kpathsea'_'kpse_find_file | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3001,7 +3004,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lkpathsea $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3048,12 +3051,12 @@ fi for ac_func in kpse_find_file do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3052: checking for $ac_func" >&5 +echo "configure:3055: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3108,7 +3111,7 @@ done fi echo $ac_n "checking whether to use kpathsea""... $ac_c" 1>&6 -echo "configure:3112: checking whether to use kpathsea" >&5 +echo "configure:3115: checking whether to use kpathsea" >&5 if test $kpathsea_b = yes; then echo "$ac_t""yes" 1>&6 KPATHSEA=1 @@ -3129,7 +3132,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3133: checking for $ac_word" >&5 +echo "configure:3136: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_BIBTEX2HTML'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3170,7 +3173,7 @@ test -n "$BIBTEX2HTML" || BIBTEX2HTML="error" echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -echo "configure:3174: checking for 8-bit clean memcmp" >&5 +echo "configure:3177: checking for 8-bit clean memcmp" >&5 if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3178,7 +3181,7 @@ else ac_cv_func_memcmp_clean=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_memcmp_clean=yes else @@ -3209,12 +3212,12 @@ echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6 test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}" echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:3213: checking for vprintf" >&5 +echo "configure:3216: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3247: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -3264,12 +3267,12 @@ fi if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:3268: checking for _doprnt" >&5 +echo "configure:3271: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -3322,12 +3325,12 @@ fi for ac_func in memmem snprintf vsnprintf gettext isinf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3326: checking for $ac_func" >&5 +echo "configure:3329: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3392,7 +3395,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3396: checking for $ac_word" >&5 +echo "configure:3399: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MAKEINFO'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3425,7 +3428,7 @@ test -n "$MAKEINFO" || MAKEINFO="error" # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3429: checking for $ac_word" >&5 +echo "configure:3432: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else diff --git a/input/bugs/beaming.ly b/input/bugs/beaming.ly new file mode 100644 index 0000000000..4d718747fe --- /dev/null +++ b/input/bugs/beaming.ly @@ -0,0 +1,4 @@ +\score { \notes { + + [\times 2/3 {c16 c c} c8] + [\times 2/3 {c16 c c} c8]}} diff --git a/input/bugs/dynamic-collide.ly b/input/bugs/dynamic-collide.ly new file mode 100644 index 0000000000..84d3cdcdc8 --- /dev/null +++ b/input/bugs/dynamic-collide.ly @@ -0,0 +1,70 @@ + +% dynamics should not collide with staff +% dynamics (of two voices) should not collide with eachother + +\header { +texidoc="Template for part-combining orchestral scores"; +} + + +End = { \skip 1; } +violoncello = \notes\relative c'' { + c1\ff +} + +contrabasso = \notes\relative c'' { + c1\pp +} + +flautiStaff = \notes \context Staff = flauti < + \context Voice=oneBassi \End + \context Voice=twoBassi \End + \context Voice=Flauti \partcombine Voice + \context Thread=oneFlauti \violoncello + \context Thread=twoFlauti \contrabasso +> + +staffCombineProperties = { + \property Voice.devNullThread = #'unisolo + \property Voice.soloADue = ##t + \property Voice.soloText = #"" + \property Voice.soloIIText = #"" + % This is non-conventional, but currently it is + % the only way to tell the difference. + \property Voice.aDueText = #"\\`a2" + \property Voice.splitInterval = #'(1 . 0) + \property Voice.changeMoment = #`(,(make-moment 1 1) . ,(make-moment 1 1)) +} + +\score { + < + \flautiStaff + > + + + \paper { + % \paperSixteen + linewidth = 80 * \staffspace; + textheight = 200 * \staffspace; + \translator{ + \ThreadContext + \consists "Rest_engraver"; + } + \translator{ + \VoiceContext + \remove "Rest_engraver"; + + devNullThread = #'never + \consists "Thread_devnull_engraver"; + + soloText = #"I." + soloIIText = #"II." + soloADue = ##f + } + \translator{ + \HaraKiriStaffContext + \consists "Mark_engraver"; + } + } +} + diff --git a/input/bugs/score-dynamics.ly b/input/bugs/score-dynamics.ly deleted file mode 100644 index cec828c53c..0000000000 --- a/input/bugs/score-dynamics.ly +++ /dev/null @@ -1,107 +0,0 @@ -% dynamics should not collide with staff -% dynamics (of two voices) should not collide with eachother - -\header { -texidoc="Template for part-combining orchestral scores"; -} - - -End = { \skip 1*8; } -violoncello = \notes\relative c'' { - c1\ff d e \break - c1\ff d e \break - - \property Voice.crescendoText = #"cresc." - \property Voice.crescendoSpanner = #'dashed-line - g4\p\< r r r8 g(| - )c,4 r r r8 c| - [\!f8\sf(\>as f as][f g d)\!g]| -} - -contrabasso = \notes\relative c'' { - c1\pp d e - c2\pp c d1 e - - \property Voice.crescendoText = #"cresc." - \property Voice.crescendoSpanner = #'dashed-line - g4\p\< r r r8 g(| - )c,4 r r r8 c| - [\!f8\sf(\>as f as][f g d)\!g]| -} - -flautiStaff = \notes \context Staff = flauti < - \context Voice=oneBassi \End - \context Voice=twoBassi \End - \context Voice=Flauti \partcombine Voice - \context Thread=oneFlauti \violoncello - \context Thread=twoFlauti \contrabasso -> - -staffCombineProperties = { - \property Voice.devNullThread = #'unisolo - \property Voice.soloADue = ##t - \property Voice.soloText = #"" - \property Voice.soloIIText = #"" - % This is non-conventional, but currently it is - % the only way to tell the difference. - \property Voice.aDueText = #"\\`a2" - \property Voice.splitInterval = #'(1 . 0) - \property Voice.changeMoment = #`(,(make-moment 1 1) . ,(make-moment 1 1)) -} - -\score { - < - \flautiStaff - - \context PianoStaff = bassi_group \notes < - \context Staff=oneBassi \End - \context Staff=twoBassi \End - - \context Staff=oneBassi \partcombine Staff - \context Voice=oneBassi { \staffCombineProperties \violoncello } - \context Voice=twoBassi { \staffCombineProperties \contrabasso } - > - - > - \paper { - % \paperSixteen - linewidth = 80 * \staffspace; - textheight = 200 * \staffspace; - \translator{ - \ThreadContext - \consists "Rest_engraver"; - } - \translator{ - \VoiceContext - \remove "Rest_engraver"; - - % The staff combine (bassi part) needs a - % thread_devnull_engraver here. - % Instead of maintaining two separate hierarchies, - % we switch add it, but switch it off immideately. - % The staff combine parts switch it on. - devNullThread = #'never - \consists "Thread_devnull_engraver"; - - soloText = #"I." - soloIIText = #"II." - soloADue = ##f - } - \translator{ - \HaraKiriStaffContext - \consists "Mark_engraver"; - } - \translator { - \OrchestralScoreContext - skipBars = ##t - % Hmm - currentBarNumber = #218 - BarNumber \override #'padding = #3 - RestCollision \override #'maximum-rest-count = #1 - marginScriptHorizontalAlignment = #1 - TimeSignature \override #'style = #'C - } - \translator { \HaraKiriStaffContext } - } -} - diff --git a/input/test/lyrics-bar.ly b/input/test/lyrics-bar.ly deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/lily/a2-engraver.cc b/lily/a2-engraver.cc index d155be0d15..ef735b38bb 100644 --- a/lily/a2-engraver.cc +++ b/lily/a2-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Jan Nieuwenhuizen + (c) 2000--2001 Jan Nieuwenhuizen */ #include "engraver.hh" diff --git a/lily/afm.cc b/lily/afm.cc index b9224648be..746c6eb123 100644 --- a/lily/afm.cc +++ b/lily/afm.cc @@ -3,7 +3,7 @@ source file of the Flower Library - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 Han-Wen Nienhuys */ #include "afm.hh" diff --git a/lily/align-interface.cc b/lily/align-interface.cc index d335966f7f..dfb79e812b 100644 --- a/lily/align-interface.cc +++ b/lily/align-interface.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 Han-Wen Nienhuys */ diff --git a/lily/align-note-column-engraver.cc b/lily/align-note-column-engraver.cc index 0f7f67afab..d03f316746 100644 --- a/lily/align-note-column-engraver.cc +++ b/lily/align-note-column-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/all-font-metrics.cc b/lily/all-font-metrics.cc index 43b9deee6c..6f749f85cc 100644 --- a/lily/all-font-metrics.cc +++ b/lily/all-font-metrics.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/arpeggio-engraver.cc b/lily/arpeggio-engraver.cc index aa83cb68dc..76bc80a505 100644 --- a/lily/arpeggio-engraver.cc +++ b/lily/arpeggio-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Jan Nieuwenhuizen + (c) 2000--2001 Jan Nieuwenhuizen */ #include "engraver.hh" diff --git a/lily/arpeggio.cc b/lily/arpeggio.cc index ba1e4d28ba..5cbf5c17ec 100644 --- a/lily/arpeggio.cc +++ b/lily/arpeggio.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Jan Nieuwenhuizen + (c) 2000--2001 Jan Nieuwenhuizen */ #include "molecule.hh" diff --git a/lily/audio-column.cc b/lily/audio-column.cc index b29f09982c..fd1255eda2 100644 --- a/lily/audio-column.cc +++ b/lily/audio-column.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Jan Nieuwenhuizen + (c) 1997--2001 Jan Nieuwenhuizen */ #include "audio-column.hh" diff --git a/lily/audio-element-info.cc b/lily/audio-element-info.cc index c9f99c7732..c42ad1a443 100644 --- a/lily/audio-element-info.cc +++ b/lily/audio-element-info.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "audio-element-info.hh" diff --git a/lily/audio-element.cc b/lily/audio-element.cc index 9eff747eb4..ca124d9704 100644 --- a/lily/audio-element.cc +++ b/lily/audio-element.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "audio-element.hh" diff --git a/lily/audio-item.cc b/lily/audio-item.cc index 05b101eabd..fc22538820 100644 --- a/lily/audio-item.cc +++ b/lily/audio-item.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Jan Nieuwenhuizen + (c) 1997--2001 Jan Nieuwenhuizen */ #include "debug.hh" #include "audio-item.hh" diff --git a/lily/audio-staff.cc b/lily/audio-staff.cc index e9993dbfdf..fe9ecaf9f4 100644 --- a/lily/audio-staff.cc +++ b/lily/audio-staff.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Jan Nieuwenhuizen + (c) 1997--2001 Jan Nieuwenhuizen */ #include "audio-staff.hh" diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc index aa4013d2fd..27283b34dd 100644 --- a/lily/auto-beam-engraver.cc +++ b/lily/auto-beam-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Jan Nieuwenhuizen + (c) 1999--2001 Jan Nieuwenhuizen */ diff --git a/lily/auto-change-iterator.cc b/lily/auto-change-iterator.cc index ab240be254..9e3bb205db 100644 --- a/lily/auto-change-iterator.cc +++ b/lily/auto-change-iterator.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/axis-group-engraver.cc b/lily/axis-group-engraver.cc index 38142ee4e9..6e22f40b6b 100644 --- a/lily/axis-group-engraver.cc +++ b/lily/axis-group-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ #include "spanner.hh" diff --git a/lily/axis-group-interface.cc b/lily/axis-group-interface.cc index 67beabd1c7..b7a8ec5a20 100644 --- a/lily/axis-group-interface.cc +++ b/lily/axis-group-interface.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 Han-Wen Nienhuys */ #include "hara-kiri-group-spanner.hh" diff --git a/lily/bar-engraver.cc b/lily/bar-engraver.cc index 32bd40368e..540c321396 100644 --- a/lily/bar-engraver.cc +++ b/lily/bar-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys Jan Nieuwenhuizen */ diff --git a/lily/bar-number-engraver.cc b/lily/bar-number-engraver.cc index ce129ffd9b..b082ddb1aa 100644 --- a/lily/bar-number-engraver.cc +++ b/lily/bar-number-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ @@ -35,6 +35,11 @@ public: Bar_number_engraver(); }; + +/* + TODO: more advanced formatting via SCM function, perhaps barnumbers + every 5 measures? */ + void Bar_number_engraver::create_grobs () { diff --git a/lily/bar.cc b/lily/bar.cc index f46e55c3c0..6d0c9a968b 100644 --- a/lily/bar.cc +++ b/lily/bar.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include diff --git a/lily/beam-engraver.cc b/lily/beam-engraver.cc index 59f41ea6b1..824cf0344e 100644 --- a/lily/beam-engraver.cc +++ b/lily/beam-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ #include "engraver-group-engraver.hh" diff --git a/lily/beam.cc b/lily/beam.cc index 1c00665db9..a28b7b56de 100644 --- a/lily/beam.cc +++ b/lily/beam.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys Jan Nieuwenhuizen */ diff --git a/lily/beaming-info.cc b/lily/beaming-info.cc index 9b92ddeb1a..653e1b3382 100644 --- a/lily/beaming-info.cc +++ b/lily/beaming-info.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/bezier-bow.cc b/lily/bezier-bow.cc index 7b8654d1bb..13fbba0c34 100644 --- a/lily/bezier-bow.cc +++ b/lily/bezier-bow.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Jan Nieuwenhuizen + (c) 1998--2001 Jan Nieuwenhuizen */ #include diff --git a/lily/bezier.cc b/lily/bezier.cc index 21c49801b5..945a1ccda3 100644 --- a/lily/bezier.cc +++ b/lily/bezier.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Jan Nieuwenhuizen + (c) 1998--2001 Jan Nieuwenhuizen */ #include diff --git a/lily/box.cc b/lily/box.cc index 6f8bf34394..f82325d20b 100644 --- a/lily/box.cc +++ b/lily/box.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2001 Han-Wen Nienhuys */ #include "box.hh" diff --git a/lily/break-algorithm.cc b/lily/break-algorithm.cc index 92bed86e45..320857f7b8 100644 --- a/lily/break-algorithm.cc +++ b/lily/break-algorithm.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2001 Han-Wen Nienhuys */ #include "paper-column.hh" diff --git a/lily/break-align-engraver.cc b/lily/break-align-engraver.cc index 1fdf8ea46e..057ea36945 100644 --- a/lily/break-align-engraver.cc +++ b/lily/break-align-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ #include "engraver.hh" diff --git a/lily/break-align-item.cc b/lily/break-align-item.cc index edf184bed6..36f536ba0f 100644 --- a/lily/break-align-item.cc +++ b/lily/break-align-item.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/change-iterator.cc b/lily/change-iterator.cc index 3bf8101690..f76a2d7203 100644 --- a/lily/change-iterator.cc +++ b/lily/change-iterator.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "change-iterator.hh" diff --git a/lily/chord-name-engraver.cc b/lily/chord-name-engraver.cc index 9e2087b41b..7a4302a912 100644 --- a/lily/chord-name-engraver.cc +++ b/lily/chord-name-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Jan Nieuwenhuizen + (c) 1998--2001 Jan Nieuwenhuizen */ #include "engraver.hh" diff --git a/lily/chord-name.cc b/lily/chord-name.cc index dd06b0bbdf..8c0d543487 100644 --- a/lily/chord-name.cc +++ b/lily/chord-name.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Jan Nieuwenhuizen + (c) 1999--2001 Jan Nieuwenhuizen */ #include "chord-name.hh" diff --git a/lily/chord-tremolo-engraver.cc b/lily/chord-tremolo-engraver.cc index 52727f7a1f..a73cb16875 100644 --- a/lily/chord-tremolo-engraver.cc +++ b/lily/chord-tremolo-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 Han-Wen Nienhuys */ diff --git a/lily/chord-tremolo-iterator.cc b/lily/chord-tremolo-iterator.cc index 164efb439d..5487f96251 100644 --- a/lily/chord-tremolo-iterator.cc +++ b/lily/chord-tremolo-iterator.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 Han-Wen Nienhuys */ diff --git a/lily/chord.cc b/lily/chord.cc index 2b7fa42d67..32215b656c 100644 --- a/lily/chord.cc +++ b/lily/chord.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Jan Nieuwenhuizen + (c) 1999--2001 Jan Nieuwenhuizen */ #include "chord.hh" diff --git a/lily/clef-engraver.cc b/lily/clef-engraver.cc index 2d6d585d54..adc1807f39 100644 --- a/lily/clef-engraver.cc +++ b/lily/clef-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys , + (c) 1997--2001 Han-Wen Nienhuys , Mats Bengtsson */ diff --git a/lily/clef-item.cc b/lily/clef-item.cc index 79444fae9c..22dcaf1fd8 100644 --- a/lily/clef-item.cc +++ b/lily/clef-item.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/collision-engraver.cc b/lily/collision-engraver.cc index 7f361c5d8e..b0cc610f12 100644 --- a/lily/collision-engraver.cc +++ b/lily/collision-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "note-column.hh" diff --git a/lily/collision.cc b/lily/collision.cc index 8d5448b128..af13b3f6b2 100644 --- a/lily/collision.cc +++ b/lily/collision.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "debug.hh" #include "collision.hh" diff --git a/lily/column-x-positions.cc b/lily/column-x-positions.cc index 3a56d61cce..bf4eccf4e0 100644 --- a/lily/column-x-positions.cc +++ b/lily/column-x-positions.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "column-x-positions.hh" diff --git a/lily/command-request.cc b/lily/command-request.cc index f37c73825c..1255c87bcc 100644 --- a/lily/command-request.cc +++ b/lily/command-request.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "command-request.hh" diff --git a/lily/context-specced-music.cc b/lily/context-specced-music.cc index 8350fcb098..bb479a4ba6 100644 --- a/lily/context-specced-music.cc +++ b/lily/context-specced-music.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ #include "context-specced-music.hh" diff --git a/lily/cxx-function-smob.cc b/lily/cxx-function-smob.cc index 796e33470a..35b2073219 100644 --- a/lily/cxx-function-smob.cc +++ b/lily/cxx-function-smob.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 Han-Wen Nienhuys */ diff --git a/lily/debug.cc b/lily/debug.cc index 44f120101d..8dc98a7018 100644 --- a/lily/debug.cc +++ b/lily/debug.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2001 Han-Wen Nienhuys */ diff --git a/lily/dimension-cache.cc b/lily/dimension-cache.cc index 879f9f028b..e78ec6c282 100644 --- a/lily/dimension-cache.cc +++ b/lily/dimension-cache.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ #include #include "warn.hh" diff --git a/lily/directional-element-interface.cc b/lily/directional-element-interface.cc index 7075e2e44f..1197048d31 100644 --- a/lily/directional-element-interface.cc +++ b/lily/directional-element-interface.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/dot-column-engraver.cc b/lily/dot-column-engraver.cc index ca52e1273a..9fc7bbcd04 100644 --- a/lily/dot-column-engraver.cc +++ b/lily/dot-column-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ diff --git a/lily/dot-column.cc b/lily/dot-column.cc index 014af080bf..cfd51975ac 100644 --- a/lily/dot-column.cc +++ b/lily/dot-column.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "dots.hh" diff --git a/lily/dots.cc b/lily/dots.cc index 4dc6ab4877..a601beeeb1 100644 --- a/lily/dots.cc +++ b/lily/dots.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "dots.hh" diff --git a/lily/duration.cc b/lily/duration.cc index 9ea1ec5e20..930321d067 100644 --- a/lily/duration.cc +++ b/lily/duration.cc @@ -3,7 +3,7 @@ source file of the LilyPond music typesetter - (c) 1997--2000 Jan Nieuwenhuizen + (c) 1997--2001 Jan Nieuwenhuizen Han-Wen Nienhuys */ diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc index 83b2def70a..223a7303bb 100644 --- a/lily/dynamic-engraver.cc +++ b/lily/dynamic-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "debug.hh" #include "dimensions.hh" @@ -110,8 +110,13 @@ Dynamic_engraver::try_music (Music * m) { accepted_spanreqs_drul_[LEFT] = 0; accepted_spanreqs_drul_[RIGHT] = 0; - if (line_spanner_) - line_spanner_->suicide (); + /* + Let's not kill the line spanner, since that would fuck up + earlier, not-to-be-terminated stuff. + + It will disappear by itself when stop_translation_timestep + () finds that there is nothing to support anymore. */ + line_spanner_ = 0; if (cresc_p_) cresc_p_->suicide (); diff --git a/lily/engraver-group-engraver.cc b/lily/engraver-group-engraver.cc index 33067abcaf..ab1b5602f0 100644 --- a/lily/engraver-group-engraver.cc +++ b/lily/engraver-group-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "flower-proto.hh" diff --git a/lily/engraver.cc b/lily/engraver.cc index 0d3f2a67f8..5e9df9c922 100644 --- a/lily/engraver.cc +++ b/lily/engraver.cc @@ -3,7 +3,7 @@ Sourcefile of GNU LilyPond music type setter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "music.hh" diff --git a/lily/folded-repeat-iterator.cc b/lily/folded-repeat-iterator.cc index a6126ddcb4..75c2e0f3d7 100644 --- a/lily/folded-repeat-iterator.cc +++ b/lily/folded-repeat-iterator.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/font-interface.cc b/lily/font-interface.cc index fa285aef06..0f946a7480 100644 --- a/lily/font-interface.cc +++ b/lily/font-interface.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 Han-Wen Nienhuys */ diff --git a/lily/font-metric.cc b/lily/font-metric.cc index fdc8bbc441..e8682df66b 100644 --- a/lily/font-metric.cc +++ b/lily/font-metric.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys Mats Bengtsson (the ugly TeX parsing in text_dimension) */ diff --git a/lily/global-ctor.cc b/lily/global-ctor.cc index b48a72ff3b..27ab068d09 100644 --- a/lily/global-ctor.cc +++ b/lily/global-ctor.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ #include "global-ctor.hh" diff --git a/lily/global-translator.cc b/lily/global-translator.cc index af8d804537..1174200de2 100644 --- a/lily/global-translator.cc +++ b/lily/global-translator.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "debug.hh" diff --git a/lily/gourlay-breaking.cc b/lily/gourlay-breaking.cc index c05731f149..35db227ff8 100644 --- a/lily/gourlay-breaking.cc +++ b/lily/gourlay-breaking.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include // rint diff --git a/lily/grace-align-item.cc b/lily/grace-align-item.cc index 901953cce1..c907e9ed2b 100644 --- a/lily/grace-align-item.cc +++ b/lily/grace-align-item.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/grace-engraver-group.cc b/lily/grace-engraver-group.cc index e02d09be25..c5e6bcf9ae 100644 --- a/lily/grace-engraver-group.cc +++ b/lily/grace-engraver-group.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/grace-iterator.cc b/lily/grace-iterator.cc index b0c89c9214..3be0038dde 100644 --- a/lily/grace-iterator.cc +++ b/lily/grace-iterator.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/grace-music.cc b/lily/grace-music.cc index a17842339c..20d3e8a167 100644 --- a/lily/grace-music.cc +++ b/lily/grace-music.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/grace-performer-group.cc b/lily/grace-performer-group.cc index f7d2929561..c58a8a25c7 100644 --- a/lily/grace-performer-group.cc +++ b/lily/grace-performer-group.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music playter - (c) 1999--2000 Jan Nieuwenhuizen + (c) 1999--2001 Jan Nieuwenhuizen */ #include "grace-performer-group.hh" diff --git a/lily/grace-position-engraver.cc b/lily/grace-position-engraver.cc index 5a7039016c..b5bf1b1a05 100644 --- a/lily/grace-position-engraver.cc +++ b/lily/grace-position-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/grace-position-performer.cc b/lily/grace-position-performer.cc index 168bbd3a0f..e275e891a7 100644 --- a/lily/grace-position-performer.cc +++ b/lily/grace-position-performer.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Jan Nieuwenhuizen + (c) 1999--2001 Jan Nieuwenhuizen */ diff --git a/lily/grob-info.cc b/lily/grob-info.cc index ac0076dc8f..edd020796e 100644 --- a/lily/grob-info.cc +++ b/lily/grob-info.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "grob-info.hh" diff --git a/lily/grob.cc b/lily/grob.cc index fdfb97c069..467853e6df 100644 --- a/lily/grob.cc +++ b/lily/grob.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/group-interface.cc b/lily/group-interface.cc index 313820a0b5..d0ac48aa3f 100644 --- a/lily/group-interface.cc +++ b/lily/group-interface.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ #include "group-interface.hh" diff --git a/lily/hairpin.cc b/lily/hairpin.cc index c4520adef0..6634746e85 100644 --- a/lily/hairpin.cc +++ b/lily/hairpin.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "molecule.hh" diff --git a/lily/hara-kiri-group-spanner.cc b/lily/hara-kiri-group-spanner.cc index ae50f44685..53166be9e5 100644 --- a/lily/hara-kiri-group-spanner.cc +++ b/lily/hara-kiri-group-spanner.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Jan Nieuwenhuizen + (c) 1998--2001 Jan Nieuwenhuizen Han-Wen Nienhuys */ diff --git a/lily/includable-lexer.cc b/lily/includable-lexer.cc index b4ee0f2821..d1a781699b 100644 --- a/lily/includable-lexer.cc +++ b/lily/includable-lexer.cc @@ -3,7 +3,7 @@ source file of the LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include diff --git a/lily/include/afm.hh b/lily/include/afm.hh index 73f2268a1d..b62d34fa54 100644 --- a/lily/include/afm.hh +++ b/lily/include/afm.hh @@ -4,7 +4,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ diff --git a/lily/include/align-interface.hh b/lily/include/align-interface.hh index 9b7c646ef7..94d60926c0 100644 --- a/lily/include/align-interface.hh +++ b/lily/include/align-interface.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 Han-Wen Nienhuys */ diff --git a/lily/include/all-font-metrics.hh b/lily/include/all-font-metrics.hh index cd3eb17fa4..fb32f70ec7 100644 --- a/lily/include/all-font-metrics.hh +++ b/lily/include/all-font-metrics.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ diff --git a/lily/include/arpeggio.hh b/lily/include/arpeggio.hh index 628d100c29..74411bfc9e 100644 --- a/lily/include/arpeggio.hh +++ b/lily/include/arpeggio.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Jan Nieuwenhuizen + (c) 2000--2001 Jan Nieuwenhuizen */ #ifndef ARPEGGIO_HH diff --git a/lily/include/audio-column.hh b/lily/include/audio-column.hh index fb7e150d67..5705a9c7b0 100644 --- a/lily/include/audio-column.hh +++ b/lily/include/audio-column.hh @@ -1,7 +1,7 @@ /* audio-column.hh -- declare Audio_column - (c) 1997--2000 Jan Nieuwenhuizen + (c) 1997--2001 Jan Nieuwenhuizen */ #ifndef AUDIO_COLUMN_HH diff --git a/lily/include/audio-element-info.hh b/lily/include/audio-element-info.hh index b3b805ca07..85db1680ba 100644 --- a/lily/include/audio-element-info.hh +++ b/lily/include/audio-element-info.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/include/audio-element.hh b/lily/include/audio-element.hh index a8d79fc0e5..21cae00272 100644 --- a/lily/include/audio-element.hh +++ b/lily/include/audio-element.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/audio-item.hh b/lily/include/audio-item.hh index 72281b52da..04b876761f 100644 --- a/lily/include/audio-item.hh +++ b/lily/include/audio-item.hh @@ -1,7 +1,7 @@ /* audio-item.hh -- declare Audio_items - (c) 1996--2000 Jan Nieuwenhuizen + (c) 1996--2001 Jan Nieuwenhuizen */ #ifndef AUDIO_ITEM_HH diff --git a/lily/include/audio-staff.hh b/lily/include/audio-staff.hh index 0413ad0508..2bda2aff9f 100644 --- a/lily/include/audio-staff.hh +++ b/lily/include/audio-staff.hh @@ -1,7 +1,7 @@ /* audio-staff.hh -- declare Audio_staff - (c) 1996--2000 Jan Nieuwenhuizen + (c) 1996--2001 Jan Nieuwenhuizen */ #ifndef AUDIO_STAFF_HH diff --git a/lily/include/auto-change-iterator.hh b/lily/include/auto-change-iterator.hh index 74558ab4df..536da00e82 100644 --- a/lily/include/auto-change-iterator.hh +++ b/lily/include/auto-change-iterator.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/include/axis-group-interface.hh b/lily/include/axis-group-interface.hh index 9c2097b345..869361f64b 100644 --- a/lily/include/axis-group-interface.hh +++ b/lily/include/axis-group-interface.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 Han-Wen Nienhuys */ diff --git a/lily/include/bar-req-collector-engraver.hh b/lily/include/bar-req-collector-engraver.hh index 61affaa054..af401e7946 100644 --- a/lily/include/bar-req-collector-engraver.hh +++ b/lily/include/bar-req-collector-engraver.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/include/bar.hh b/lily/include/bar.hh index ffc4e4ad45..fa3330a15b 100644 --- a/lily/include/bar.hh +++ b/lily/include/bar.hh @@ -1,7 +1,7 @@ /* bar.hh -- part of GNU LilyPond - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2001 Han-Wen Nienhuys */ #ifndef BAR_HH diff --git a/lily/include/beam.hh b/lily/include/beam.hh index 3f0b1a8b2a..e74b8e1b0e 100644 --- a/lily/include/beam.hh +++ b/lily/include/beam.hh @@ -1,7 +1,7 @@ /* beam.hh -- part of GNU LilyPond - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2001 Han-Wen Nienhuys */ #ifndef BEAM_HH diff --git a/lily/include/beaming.hh b/lily/include/beaming.hh index 06dd19f451..fd1643f153 100644 --- a/lily/include/beaming.hh +++ b/lily/include/beaming.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/include/bezier-bow.hh b/lily/include/bezier-bow.hh index 43b09f0e75..db32ad1d43 100644 --- a/lily/include/bezier-bow.hh +++ b/lily/include/bezier-bow.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/include/bezier.hh b/lily/include/bezier.hh index ebdfdb3939..318110c742 100644 --- a/lily/include/bezier.hh +++ b/lily/include/bezier.hh @@ -1,7 +1,7 @@ /* bezier.hh -- declare Bezier and Bezier_bow - (c) 1998--2000 Jan Nieuwenhuizen + (c) 1998--2001 Jan Nieuwenhuizen */ #ifndef BEZIER_HH diff --git a/lily/include/break-algorithm.hh b/lily/include/break-algorithm.hh index 57fd8cdb92..9e7866cac0 100644 --- a/lily/include/break-algorithm.hh +++ b/lily/include/break-algorithm.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2001 Han-Wen Nienhuys */ diff --git a/lily/include/break-align-item.hh b/lily/include/break-align-item.hh index 5ebbc384ff..06f62615ed 100644 --- a/lily/include/break-align-item.hh +++ b/lily/include/break-align-item.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/change-iterator.hh b/lily/include/change-iterator.hh index 929271bcdf..d98488dc4a 100644 --- a/lily/include/change-iterator.hh +++ b/lily/include/change-iterator.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/chord-name.hh b/lily/include/chord-name.hh index 729af54e49..d9cc316497 100644 --- a/lily/include/chord-name.hh +++ b/lily/include/chord-name.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Jan Nieuwenhuizen + (c) 1999--2001 Jan Nieuwenhuizen */ #ifndef CHORD_NAME_HH diff --git a/lily/include/chord-tremolo-iterator.hh b/lily/include/chord-tremolo-iterator.hh index 7f5e5c4852..8c35be601d 100644 --- a/lily/include/chord-tremolo-iterator.hh +++ b/lily/include/chord-tremolo-iterator.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 Han-Wen Nienhuys */ diff --git a/lily/include/chord.hh b/lily/include/chord.hh index 0647233da3..1b6b856927 100644 --- a/lily/include/chord.hh +++ b/lily/include/chord.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Jan Nieuwenhuizen + (c) 1999--2001 Jan Nieuwenhuizen */ #ifndef CHORD_HH diff --git a/lily/include/clef.hh b/lily/include/clef.hh index 81ac89000a..a436219de1 100644 --- a/lily/include/clef.hh +++ b/lily/include/clef.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 Han-Wen Nienhuys */ diff --git a/lily/include/collision.hh b/lily/include/collision.hh index c5c005f06b..798634244e 100644 --- a/lily/include/collision.hh +++ b/lily/include/collision.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/column-x-positions.hh b/lily/include/column-x-positions.hh index f8cb92d079..3e186c57ae 100644 --- a/lily/include/column-x-positions.hh +++ b/lily/include/column-x-positions.hh @@ -1,7 +1,7 @@ /* column-x-positions.hh -- part of GNU LilyPond - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #ifndef COLUMN_X_POSITIONS_HH diff --git a/lily/include/command-request.hh b/lily/include/command-request.hh index b1a28f4350..193636d04c 100644 --- a/lily/include/command-request.hh +++ b/lily/include/command-request.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/context-specced-music.hh b/lily/include/context-specced-music.hh index 719a37fffb..29eeb68fbf 100644 --- a/lily/include/context-specced-music.hh +++ b/lily/include/context-specced-music.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/include/cxx-function-smob.hh b/lily/include/cxx-function-smob.hh index c9ac4bed3c..4f0b09a32f 100644 --- a/lily/include/cxx-function-smob.hh +++ b/lily/include/cxx-function-smob.hh @@ -2,7 +2,7 @@ cxx-function-smob.hh -- source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 Han-Wen Nienhuys */ diff --git a/lily/include/dimension-cache-callback.hh b/lily/include/dimension-cache-callback.hh index 15142a6111..4c8d6d59eb 100644 --- a/lily/include/dimension-cache-callback.hh +++ b/lily/include/dimension-cache-callback.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 Han-Wen Nienhuys */ diff --git a/lily/include/dimension-cache.hh b/lily/include/dimension-cache.hh index e97936d77e..576879b5a2 100644 --- a/lily/include/dimension-cache.hh +++ b/lily/include/dimension-cache.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ diff --git a/lily/include/directional-element-interface.hh b/lily/include/directional-element-interface.hh index b77ef71754..448ef9d809 100644 --- a/lily/include/directional-element-interface.hh +++ b/lily/include/directional-element-interface.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/include/dot-column.hh b/lily/include/dot-column.hh index 452d0ba000..4757501f63 100644 --- a/lily/include/dot-column.hh +++ b/lily/include/dot-column.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/dots.hh b/lily/include/dots.hh index 075bf3fdc7..72c85f09f2 100644 --- a/lily/include/dots.hh +++ b/lily/include/dots.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/duration.hh b/lily/include/duration.hh index 54c4793fb8..06680e1b9e 100644 --- a/lily/include/duration.hh +++ b/lily/include/duration.hh @@ -3,7 +3,7 @@ source file of the LilyPond music typesetter - (c) 1997--2000 Jan Nieuwenhuizen + (c) 1997--2001 Jan Nieuwenhuizen */ diff --git a/lily/include/engraver-group-engraver.hh b/lily/include/engraver-group-engraver.hh index 10ccaada0e..65aadbca8e 100644 --- a/lily/include/engraver-group-engraver.hh +++ b/lily/include/engraver-group-engraver.hh @@ -4,7 +4,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/engraver.hh b/lily/include/engraver.hh index 729c5d7d57..d06055ec37 100644 --- a/lily/include/engraver.hh +++ b/lily/include/engraver.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2001 Han-Wen Nienhuys */ diff --git a/lily/include/file-results.hh b/lily/include/file-results.hh index 64ce52bf66..3474c2f0f8 100644 --- a/lily/include/file-results.hh +++ b/lily/include/file-results.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ diff --git a/lily/include/folded-repeat-iterator.hh b/lily/include/folded-repeat-iterator.hh index 178414c7b6..5bafa50d5d 100644 --- a/lily/include/folded-repeat-iterator.hh +++ b/lily/include/folded-repeat-iterator.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/include/font-interface.hh b/lily/include/font-interface.hh index e18cc9f3ef..a75a25b5b5 100644 --- a/lily/include/font-interface.hh +++ b/lily/include/font-interface.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 Han-Wen Nienhuys */ diff --git a/lily/include/font-metric.hh b/lily/include/font-metric.hh index 2ebbf303b1..24c9cc1032 100644 --- a/lily/include/font-metric.hh +++ b/lily/include/font-metric.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/include/global-ctor.hh b/lily/include/global-ctor.hh index a0cf239349..03ecd38457 100644 --- a/lily/include/global-ctor.hh +++ b/lily/include/global-ctor.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/include/global-translator.hh b/lily/include/global-translator.hh index 1afb8483d1..606fea37bb 100644 --- a/lily/include/global-translator.hh +++ b/lily/include/global-translator.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/gourlay-breaking.hh b/lily/include/gourlay-breaking.hh index 68361114b1..54da51c85c 100644 --- a/lily/include/gourlay-breaking.hh +++ b/lily/include/gourlay-breaking.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/grace-align-item.hh b/lily/include/grace-align-item.hh index debe1d5aa2..b89bd6ef90 100644 --- a/lily/include/grace-align-item.hh +++ b/lily/include/grace-align-item.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/include/grace-engraver-group.hh b/lily/include/grace-engraver-group.hh index 2a47925d34..1419ce3e83 100644 --- a/lily/include/grace-engraver-group.hh +++ b/lily/include/grace-engraver-group.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/include/grace-iterator.hh b/lily/include/grace-iterator.hh index 37c78b7b35..f51cbcbc23 100644 --- a/lily/include/grace-iterator.hh +++ b/lily/include/grace-iterator.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/include/grace-music.hh b/lily/include/grace-music.hh index cc015b5c85..5392b734cc 100644 --- a/lily/include/grace-music.hh +++ b/lily/include/grace-music.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/include/grace-performer-group.hh b/lily/include/grace-performer-group.hh index 5d4b3400e1..f7d2b93221 100644 --- a/lily/include/grace-performer-group.hh +++ b/lily/include/grace-performer-group.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Jan Nieuwenhuizen + (c) 1999--2001 Jan Nieuwenhuizen */ diff --git a/lily/include/grob-info.hh b/lily/include/grob-info.hh index 65db5a3a34..86997faaee 100644 --- a/lily/include/grob-info.hh +++ b/lily/include/grob-info.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/grob.hh b/lily/include/grob.hh index 86ef255b4f..3940b7f58a 100644 --- a/lily/include/grob.hh +++ b/lily/include/grob.hh @@ -1,7 +1,7 @@ /* grob.hh -- declare Grob - (c) 1996-1999--2000 Han-Wen Nienhuys + (c) 1996-1999--2001 Han-Wen Nienhuys */ #ifndef STAFFELEM_HH diff --git a/lily/include/group-interface.hh b/lily/include/group-interface.hh index c9fcde7aee..e2303633dc 100644 --- a/lily/include/group-interface.hh +++ b/lily/include/group-interface.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/include/hairpin.hh b/lily/include/hairpin.hh index 30578b643a..64697548eb 100644 --- a/lily/include/hairpin.hh +++ b/lily/include/hairpin.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/hara-kiri-engraver.hh b/lily/include/hara-kiri-engraver.hh index 0c1d70778e..c1eb5d444f 100644 --- a/lily/include/hara-kiri-engraver.hh +++ b/lily/include/hara-kiri-engraver.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/include/hara-kiri-group-spanner.hh b/lily/include/hara-kiri-group-spanner.hh index 2e3b2dc93f..52312d6f97 100644 --- a/lily/include/hara-kiri-group-spanner.hh +++ b/lily/include/hara-kiri-group-spanner.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Jan Nieuwenhuizen + (c) 1998--2001 Jan Nieuwenhuizen */ diff --git a/lily/include/hara-kiri-line-group-engraver.hh b/lily/include/hara-kiri-line-group-engraver.hh index 391514f7fc..18c3fb8394 100644 --- a/lily/include/hara-kiri-line-group-engraver.hh +++ b/lily/include/hara-kiri-line-group-engraver.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Jan Nieuwenhuizen + (c) 1998--2001 Jan Nieuwenhuizen */ diff --git a/lily/include/includable-lexer.hh b/lily/include/includable-lexer.hh index 1be193910a..2bdfff1f47 100644 --- a/lily/include/includable-lexer.hh +++ b/lily/include/includable-lexer.hh @@ -3,7 +3,7 @@ source file of the LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/input-smob.hh b/lily/include/input-smob.hh index 87d63c5ba6..2cd9462d5d 100644 --- a/lily/include/input-smob.hh +++ b/lily/include/input-smob.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 Han-Wen Nienhuys */ diff --git a/lily/include/interpretation-context-handle.hh b/lily/include/interpretation-context-handle.hh index cb788f124a..4d630936c0 100644 --- a/lily/include/interpretation-context-handle.hh +++ b/lily/include/interpretation-context-handle.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/include/item.hh b/lily/include/item.hh index 48edba0188..0591a80781 100644 --- a/lily/include/item.hh +++ b/lily/include/item.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #ifndef ITEM_HH #define ITEM_HH diff --git a/lily/include/key-item.hh b/lily/include/key-item.hh index bc8f306f7c..cb8e28aab8 100644 --- a/lily/include/key-item.hh +++ b/lily/include/key-item.hh @@ -1,7 +1,7 @@ /* key-item.hh -- part of GNU LilyPond - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2001 Han-Wen Nienhuys */ #ifndef KEYITEM_HH diff --git a/lily/include/keyword.hh b/lily/include/keyword.hh index 6edecf9c52..c2c6338a0a 100644 --- a/lily/include/keyword.hh +++ b/lily/include/keyword.hh @@ -1,7 +1,7 @@ /* keyword.hh -- part of GNU LilyPond - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2001 Han-Wen Nienhuys */ #ifndef KEYWORD_HH diff --git a/lily/include/kpath.hh b/lily/include/kpath.hh index 7bd89c82e4..95e7df7209 100644 --- a/lily/include/kpath.hh +++ b/lily/include/kpath.hh @@ -3,7 +3,7 @@ kpath.hh -- declare kpath funcs. source file of the GNU LilyPond music typesetter -(c) 2000 Han-Wen Nienhuys +(c) 2000--2001 Han-Wen Nienhuys */ diff --git a/lily/include/least-squares.hh b/lily/include/least-squares.hh index 678378eb0a..c7172d8e9f 100644 --- a/lily/include/least-squares.hh +++ b/lily/include/least-squares.hh @@ -1,7 +1,7 @@ /* leastsquare.hh -- part of GNU LilyPond - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2001 Han-Wen Nienhuys */ #ifndef LEASTSQUARE_HH diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh index fdda2b6977..ebb7e70c3f 100644 --- a/lily/include/lily-guile.hh +++ b/lily/include/lily-guile.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Jan Nieuwenhuizen + (c) 1998--2001 Jan Nieuwenhuizen */ #ifndef LILY_GUILE_HH diff --git a/lily/include/lily-proto.hh b/lily/include/lily-proto.hh index 63d44ac69d..94e0adb016 100644 --- a/lily/include/lily-proto.hh +++ b/lily/include/lily-proto.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #ifndef LILY_PROTO_HH diff --git a/lily/include/lily-version.hh b/lily/include/lily-version.hh index f5d37d3a55..c8326aae13 100644 --- a/lily/include/lily-version.hh +++ b/lily/include/lily-version.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Jan Nieuwenhuizen + (c) 1999--2001 Jan Nieuwenhuizen */ diff --git a/lily/include/lilypond-input-version.hh b/lily/include/lilypond-input-version.hh index 79f7e06ef0..3fdfc26950 100644 --- a/lily/include/lilypond-input-version.hh +++ b/lily/include/lilypond-input-version.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Jan Nieuwenhuizen + (c) 1998--2001 Jan Nieuwenhuizen */ diff --git a/lily/include/line-group-group-engraver.hh b/lily/include/line-group-group-engraver.hh index 4f8ca20aaf..4774141b38 100644 --- a/lily/include/line-group-group-engraver.hh +++ b/lily/include/line-group-group-engraver.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/line-of-score.hh b/lily/include/line-of-score.hh index b40d988917..88068617f9 100644 --- a/lily/include/line-of-score.hh +++ b/lily/include/line-of-score.hh @@ -1,7 +1,7 @@ /* line-of-score.hh -- part of GNU LilyPond - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2001 Han-Wen Nienhuys */ #ifndef SCORELINE_HH diff --git a/lily/include/line-spanner.hh b/lily/include/line-spanner.hh index e125a12c02..267a6fda66 100644 --- a/lily/include/line-spanner.hh +++ b/lily/include/line-spanner.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Jan Nieuwenhuizen + (c) 2000--2001 Jan Nieuwenhuizen */ diff --git a/lily/include/local-key-item.hh b/lily/include/local-key-item.hh index c6a762ec4f..e0f781c881 100644 --- a/lily/include/local-key-item.hh +++ b/lily/include/local-key-item.hh @@ -1,7 +1,7 @@ /* local-key-item.hh -- part of GNU LilyPond - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2001 Han-Wen Nienhuys */ #ifndef LOCALKEYITEM_HH diff --git a/lily/include/lookup.hh b/lily/include/lookup.hh index 3a14777e05..4a3dea7e0f 100644 --- a/lily/include/lookup.hh +++ b/lily/include/lookup.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys Jan Nieuwenhuizen */ diff --git a/lily/include/lyric-combine-music-iterator.hh b/lily/include/lyric-combine-music-iterator.hh index dea39fcd91..dae14c81dc 100644 --- a/lily/include/lyric-combine-music-iterator.hh +++ b/lily/include/lyric-combine-music-iterator.hh @@ -4,7 +4,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/include/lyric-combine-music.hh b/lily/include/lyric-combine-music.hh index 78b18b0cb2..a2fcd65dae 100644 --- a/lily/include/lyric-combine-music.hh +++ b/lily/include/lyric-combine-music.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/include/lyric-extender.hh b/lily/include/lyric-extender.hh index 860b6072f4..48595e43e0 100644 --- a/lily/include/lyric-extender.hh +++ b/lily/include/lyric-extender.hh @@ -2,7 +2,7 @@ /* extender-spanner.hh -- part of GNU LilyPond - (c) 1998--2000 Jan Nieuwenhuizen + (c) 1998--2001 Jan Nieuwenhuizen */ #ifndef EXTENDER_SPANNER_HH diff --git a/lily/include/main.hh b/lily/include/main.hh index bc8de748d0..e495ade889 100644 --- a/lily/include/main.hh +++ b/lily/include/main.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #ifndef MAIN_HH #define MAIN_HH diff --git a/lily/include/midi-def.hh b/lily/include/midi-def.hh index b670897c66..1c4c1fe205 100644 --- a/lily/include/midi-def.hh +++ b/lily/include/midi-def.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Jan Nieuwenhuizen + (c) 1997--2001 Jan Nieuwenhuizen */ diff --git a/lily/include/midi-item.hh b/lily/include/midi-item.hh index 2fc7721c21..ef344797cb 100644 --- a/lily/include/midi-item.hh +++ b/lily/include/midi-item.hh @@ -1,7 +1,7 @@ /* midi-item.hh -- declare Midi items - (c) 1997--2000 Jan Nieuwenhuizen + (c) 1997--2001 Jan Nieuwenhuizen */ #ifndef MIDI_ITEM_HH diff --git a/lily/include/midi-stream.hh b/lily/include/midi-stream.hh index 13132e6d28..3881993ab1 100644 --- a/lily/include/midi-stream.hh +++ b/lily/include/midi-stream.hh @@ -1,7 +1,7 @@ /* midi-stream.hh -- declare Midi_stream - (c) 1997--2000 Jan Nieuwenhuizen + (c) 1997--2001 Jan Nieuwenhuizen */ #ifndef MIDI_STREAM_HH diff --git a/lily/include/midi-walker.hh b/lily/include/midi-walker.hh index 9b4c88ca90..766bc08e5c 100644 --- a/lily/include/midi-walker.hh +++ b/lily/include/midi-walker.hh @@ -1,7 +1,7 @@ /* midi-walker.hh -- declare Midi_walker - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2001 Han-Wen Nienhuys Jan Nieuwenhuizen */ diff --git a/lily/include/minterval.hh b/lily/include/minterval.hh index f0381848f4..2c842c3232 100644 --- a/lily/include/minterval.hh +++ b/lily/include/minterval.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/molecule.hh b/lily/include/molecule.hh index b135eeb45b..41eb304160 100644 --- a/lily/include/molecule.hh +++ b/lily/include/molecule.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #ifndef MOLECULE_HH #define MOLECULE_HH diff --git a/lily/include/moment.hh b/lily/include/moment.hh index 46628e211f..2113ab9f60 100644 --- a/lily/include/moment.hh +++ b/lily/include/moment.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/include/multi-measure-rest.hh b/lily/include/multi-measure-rest.hh index ade68b16c0..2a6ef9fae0 100644 --- a/lily/include/multi-measure-rest.hh +++ b/lily/include/multi-measure-rest.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Jan Nieuwenhuizen + (c) 1998--2001 Jan Nieuwenhuizen */ diff --git a/lily/include/music-iterator.hh b/lily/include/music-iterator.hh index 40f24b3576..019976f848 100644 --- a/lily/include/music-iterator.hh +++ b/lily/include/music-iterator.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/music-list.hh b/lily/include/music-list.hh index b0a0017a15..1212195f9c 100644 --- a/lily/include/music-list.hh +++ b/lily/include/music-list.hh @@ -4,7 +4,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/music-output-def.hh b/lily/include/music-output-def.hh index 0fbae9e427..3381788dbb 100644 --- a/lily/include/music-output-def.hh +++ b/lily/include/music-output-def.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/music-output.hh b/lily/include/music-output.hh index 9b4a046493..f52c82dc6f 100644 --- a/lily/include/music-output.hh +++ b/lily/include/music-output.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/music-sequence.hh b/lily/include/music-sequence.hh index 67ce044dee..f3d6ed9e9b 100644 --- a/lily/include/music-sequence.hh +++ b/lily/include/music-sequence.hh @@ -5,7 +5,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 Han-Wen Nienhuys */ diff --git a/lily/include/music-wrapper-iterator.hh b/lily/include/music-wrapper-iterator.hh index 3aec129825..a488b8e2f7 100644 --- a/lily/include/music-wrapper-iterator.hh +++ b/lily/include/music-wrapper-iterator.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ diff --git a/lily/include/music-wrapper.hh b/lily/include/music-wrapper.hh index b5f274cad4..8713d912da 100644 --- a/lily/include/music-wrapper.hh +++ b/lily/include/music-wrapper.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ diff --git a/lily/include/music.hh b/lily/include/music.hh index c6b5339e4f..5ad9151ee0 100644 --- a/lily/include/music.hh +++ b/lily/include/music.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/musical-request.hh b/lily/include/musical-request.hh index 24052a3c96..04f7c0c3aa 100644 --- a/lily/include/musical-request.hh +++ b/lily/include/musical-request.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/my-lily-lexer.hh b/lily/include/my-lily-lexer.hh index 48a87991f4..11ad0adbe0 100644 --- a/lily/include/my-lily-lexer.hh +++ b/lily/include/my-lily-lexer.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #ifndef LEXER_HH diff --git a/lily/include/my-lily-parser.hh b/lily/include/my-lily-parser.hh index bd5b82159b..83463056cf 100644 --- a/lily/include/my-lily-parser.hh +++ b/lily/include/my-lily-parser.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/note-column.hh b/lily/include/note-column.hh index dfc92030af..bb10e2696a 100644 --- a/lily/include/note-column.hh +++ b/lily/include/note-column.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/note-head.hh b/lily/include/note-head.hh index e38fbd1609..9c77a23955 100644 --- a/lily/include/note-head.hh +++ b/lily/include/note-head.hh @@ -1,7 +1,7 @@ /* note-head.hh -- part of GNU LilyPond - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2001 Han-Wen Nienhuys */ #ifndef NOTEHEAD_HH diff --git a/lily/include/output-property-music-iterator.hh b/lily/include/output-property-music-iterator.hh index e7bd04a45a..3c94f39e8d 100644 --- a/lily/include/output-property-music-iterator.hh +++ b/lily/include/output-property-music-iterator.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Jan Nieuwenhuizen + (c) 2000--2001 Jan Nieuwenhuizen */ #ifndef OUTPUT_PROPERTY_MUSIC_ITERATOR_HH diff --git a/lily/include/output-property.hh b/lily/include/output-property.hh index 01e8ffbf13..7a91fd7404 100644 --- a/lily/include/output-property.hh +++ b/lily/include/output-property.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 Han-Wen Nienhuys */ diff --git a/lily/include/paper-column.hh b/lily/include/paper-column.hh index c111a2e05d..00d7e48864 100644 --- a/lily/include/paper-column.hh +++ b/lily/include/paper-column.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/paper-def.hh b/lily/include/paper-def.hh index 55c15c5e01..29d0abacc5 100644 --- a/lily/include/paper-def.hh +++ b/lily/include/paper-def.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2001 Han-Wen Nienhuys */ diff --git a/lily/include/paper-outputter.hh b/lily/include/paper-outputter.hh index a4149faa92..9d76b67f73 100644 --- a/lily/include/paper-outputter.hh +++ b/lily/include/paper-outputter.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/paper-score.hh b/lily/include/paper-score.hh index 31914b2c20..9429aaf5e8 100644 --- a/lily/include/paper-score.hh +++ b/lily/include/paper-score.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2001 Han-Wen Nienhuys */ diff --git a/lily/include/part-combine-music-iterator.hh b/lily/include/part-combine-music-iterator.hh index 4e62ff651c..21be315989 100644 --- a/lily/include/part-combine-music-iterator.hh +++ b/lily/include/part-combine-music-iterator.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Jan Nieuwenhuizen + (c) 2000--2001 Jan Nieuwenhuizen */ diff --git a/lily/include/part-combine-music.hh b/lily/include/part-combine-music.hh index 4314b86471..95062639a5 100644 --- a/lily/include/part-combine-music.hh +++ b/lily/include/part-combine-music.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Jan Nieuwenhuizen + (c) 2000--2001 Jan Nieuwenhuizen */ diff --git a/lily/include/performance.hh b/lily/include/performance.hh index e07dc6a89f..1120ac5c89 100644 --- a/lily/include/performance.hh +++ b/lily/include/performance.hh @@ -1,7 +1,7 @@ /* performance.hh -- declare Performance - (c) 1997--2000 Jan Nieuwenhuizen + (c) 1997--2001 Jan Nieuwenhuizen */ #ifndef PERFORMANCE_HH diff --git a/lily/include/performer-group-performer.hh b/lily/include/performer-group-performer.hh index 986afff64f..8101186210 100644 --- a/lily/include/performer-group-performer.hh +++ b/lily/include/performer-group-performer.hh @@ -1,7 +1,7 @@ /* performer-group-performer.hh -- declare Performer_group_performer - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2001 Han-Wen Nienhuys Jan Nieuwenhuizen */ diff --git a/lily/include/performer.hh b/lily/include/performer.hh index b5257984aa..1e639af771 100644 --- a/lily/include/performer.hh +++ b/lily/include/performer.hh @@ -1,7 +1,7 @@ /* performer.hh -- declare Performer - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2001 Han-Wen Nienhuys Jan Nieuwenhuizen */ diff --git a/lily/include/pitch.hh b/lily/include/pitch.hh index f5cfa19ed0..cd478d250f 100644 --- a/lily/include/pitch.hh +++ b/lily/include/pitch.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ diff --git a/lily/include/property-iterator.hh b/lily/include/property-iterator.hh index 71b0441dd2..e72a0a894f 100644 --- a/lily/include/property-iterator.hh +++ b/lily/include/property-iterator.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/protected-scm.hh b/lily/include/protected-scm.hh index cbe08a30c0..7b96c6e7d6 100644 --- a/lily/include/protected-scm.hh +++ b/lily/include/protected-scm.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ diff --git a/lily/include/relative-music.hh b/lily/include/relative-music.hh index 5a07fbc8a1..fac082d913 100644 --- a/lily/include/relative-music.hh +++ b/lily/include/relative-music.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ diff --git a/lily/include/repeated-music.hh b/lily/include/repeated-music.hh index 5274e35b8f..222a4abcc9 100644 --- a/lily/include/repeated-music.hh +++ b/lily/include/repeated-music.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/include/request-chord-iterator.hh b/lily/include/request-chord-iterator.hh index 204598bdd0..d54cfe9d8e 100644 --- a/lily/include/request-chord-iterator.hh +++ b/lily/include/request-chord-iterator.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/request.hh b/lily/include/request.hh index e05332a7c9..0f693ce13d 100644 --- a/lily/include/request.hh +++ b/lily/include/request.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #ifndef REQUEST_HH diff --git a/lily/include/rest-collision.hh b/lily/include/rest-collision.hh index d58bebf0f4..578b1151dd 100644 --- a/lily/include/rest-collision.hh +++ b/lily/include/rest-collision.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/rest.hh b/lily/include/rest.hh index 462e68922d..b462bca6fc 100644 --- a/lily/include/rest.hh +++ b/lily/include/rest.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/rhythmic-head.hh b/lily/include/rhythmic-head.hh index a9d6f904c0..7b4e7c2302 100644 --- a/lily/include/rhythmic-head.hh +++ b/lily/include/rhythmic-head.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/rod.hh b/lily/include/rod.hh index d795f539ad..b7c07aa575 100644 --- a/lily/include/rod.hh +++ b/lily/include/rod.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ diff --git a/lily/include/scaled-font-metric.hh b/lily/include/scaled-font-metric.hh index 82d1245976..0535df0fc2 100644 --- a/lily/include/scaled-font-metric.hh +++ b/lily/include/scaled-font-metric.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/include/scm-hash.hh b/lily/include/scm-hash.hh index 6f8f5fee6f..c36a368e3e 100644 --- a/lily/include/scm-hash.hh +++ b/lily/include/scm-hash.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/include/scope.hh b/lily/include/scope.hh index 35e19faa62..7420997a49 100644 --- a/lily/include/scope.hh +++ b/lily/include/scope.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ diff --git a/lily/include/score-engraver.hh b/lily/include/score-engraver.hh index faeecc9127..cdabb2eb13 100644 --- a/lily/include/score-engraver.hh +++ b/lily/include/score-engraver.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/score-performer.hh b/lily/include/score-performer.hh index b5999c53f6..41f00e2ed3 100644 --- a/lily/include/score-performer.hh +++ b/lily/include/score-performer.hh @@ -1,7 +1,7 @@ /* score-performer.hh -- declare Score_performer - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2001 Han-Wen Nienhuys Jan Nieuwenhuizen */ diff --git a/lily/include/score.hh b/lily/include/score.hh index ab48fd3c97..26fe6fb57f 100644 --- a/lily/include/score.hh +++ b/lily/include/score.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/script-column.hh b/lily/include/script-column.hh index 2f77a866b4..c5b0bd43ea 100644 --- a/lily/include/script-column.hh +++ b/lily/include/script-column.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/include/script.hh b/lily/include/script.hh index bedf9501e5..8ab6db25dd 100644 --- a/lily/include/script.hh +++ b/lily/include/script.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/include/separating-group-spanner.hh b/lily/include/separating-group-spanner.hh index 67c45a5376..4bff88adc4 100644 --- a/lily/include/separating-group-spanner.hh +++ b/lily/include/separating-group-spanner.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ diff --git a/lily/include/separating-line-group-engraver.hh b/lily/include/separating-line-group-engraver.hh index 6a26cd3194..5a5f7302cf 100644 --- a/lily/include/separating-line-group-engraver.hh +++ b/lily/include/separating-line-group-engraver.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ diff --git a/lily/include/separation-item.hh b/lily/include/separation-item.hh index 1e3d5b67c4..49a50baf45 100644 --- a/lily/include/separation-item.hh +++ b/lily/include/separation-item.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/sequential-music-iterator.hh b/lily/include/sequential-music-iterator.hh index 5da129b286..963faf2d07 100644 --- a/lily/include/sequential-music-iterator.hh +++ b/lily/include/sequential-music-iterator.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #ifndef SEQUENTIAL_MUSIC_ITERATOR_HH diff --git a/lily/include/side-position-interface.hh b/lily/include/side-position-interface.hh index b2c5b5f2ce..38ab695aa1 100644 --- a/lily/include/side-position-interface.hh +++ b/lily/include/side-position-interface.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/include/simple-music-iterator.hh b/lily/include/simple-music-iterator.hh index d03601a6dc..d5f4683d9b 100644 --- a/lily/include/simple-music-iterator.hh +++ b/lily/include/simple-music-iterator.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 Han-Wen Nienhuys */ #ifndef SIMPLE_MUSIC_ITERATOR_HH diff --git a/lily/include/simple-spacer.hh b/lily/include/simple-spacer.hh index 4cf344fbca..2f13a107d2 100644 --- a/lily/include/simple-spacer.hh +++ b/lily/include/simple-spacer.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/include/simultaneous-music-iterator.hh b/lily/include/simultaneous-music-iterator.hh index 9197129477..aec5d6494c 100644 --- a/lily/include/simultaneous-music-iterator.hh +++ b/lily/include/simultaneous-music-iterator.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/slur-bezier-bow.hh b/lily/include/slur-bezier-bow.hh index c84e6723f2..01b1304a4e 100644 --- a/lily/include/slur-bezier-bow.hh +++ b/lily/include/slur-bezier-bow.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Jan Nieuwenhuizen + (c) 2000--2001 Jan Nieuwenhuizen */ #ifndef SLUR_BEZIER_BOW_HH diff --git a/lily/include/slur.hh b/lily/include/slur.hh index 62c7f770cf..f4e28b7947 100644 --- a/lily/include/slur.hh +++ b/lily/include/slur.hh @@ -1,7 +1,7 @@ /* slur.hh -- declare Slur - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2001 Han-Wen Nienhuys */ #ifndef SLUR_HH diff --git a/lily/include/smobs.hh b/lily/include/smobs.hh index 3c46977016..2a519c4326 100644 --- a/lily/include/smobs.hh +++ b/lily/include/smobs.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/include/spaceable-element.hh b/lily/include/spaceable-element.hh index 2730ea6996..2c40d2e8f5 100644 --- a/lily/include/spaceable-element.hh +++ b/lily/include/spaceable-element.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 Han-Wen Nienhuys */ diff --git a/lily/include/spacing-spanner.hh b/lily/include/spacing-spanner.hh index c1158706dd..73d8da023d 100644 --- a/lily/include/spacing-spanner.hh +++ b/lily/include/spacing-spanner.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/include/span-bar.hh b/lily/include/span-bar.hh index e3cc0c2246..370c3626f4 100644 --- a/lily/include/span-bar.hh +++ b/lily/include/span-bar.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/span-score-bar-engraver.hh b/lily/include/span-score-bar-engraver.hh index 0a16540022..b36c83fa69 100644 --- a/lily/include/span-score-bar-engraver.hh +++ b/lily/include/span-score-bar-engraver.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/spanner.hh b/lily/include/spanner.hh index 7a21c3a917..3429e22b0d 100644 --- a/lily/include/spanner.hh +++ b/lily/include/spanner.hh @@ -1,7 +1,7 @@ /* spanner.hh -- part of GNU LilyPond - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2001 Han-Wen Nienhuys */ #ifndef SPANNER_HH diff --git a/lily/include/spring.hh b/lily/include/spring.hh index 7bb5cc3685..9585c874dd 100644 --- a/lily/include/spring.hh +++ b/lily/include/spring.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/include/staff-symbol-referencer.hh b/lily/include/staff-symbol-referencer.hh index 5a702be1d8..8e60ae6591 100644 --- a/lily/include/staff-symbol-referencer.hh +++ b/lily/include/staff-symbol-referencer.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/include/staff-symbol.hh b/lily/include/staff-symbol.hh index 4d578c4b02..dde710433a 100644 --- a/lily/include/staff-symbol.hh +++ b/lily/include/staff-symbol.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/stem-info.hh b/lily/include/stem-info.hh index f4f87721a1..8230ef9018 100644 --- a/lily/include/stem-info.hh +++ b/lily/include/stem-info.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Jan Nieuwenhuizen + (c) 1997--2001 Jan Nieuwenhuizen */ diff --git a/lily/include/stem-tremolo.hh b/lily/include/stem-tremolo.hh index adfdf739d1..d76872cce6 100644 --- a/lily/include/stem-tremolo.hh +++ b/lily/include/stem-tremolo.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/stem.hh b/lily/include/stem.hh index 46ad72c2f6..8d9c533763 100644 --- a/lily/include/stem.hh +++ b/lily/include/stem.hh @@ -1,7 +1,7 @@ /* stem.hh -- declare Stem - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2001 Han-Wen Nienhuys */ #ifndef STEM_HH diff --git a/lily/include/swallow-engraver.hh b/lily/include/swallow-engraver.hh index 169c72ba82..49bc28bc95 100644 --- a/lily/include/swallow-engraver.hh +++ b/lily/include/swallow-engraver.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/swallow-perf.hh b/lily/include/swallow-perf.hh index 334cabd678..b297371896 100644 --- a/lily/include/swallow-perf.hh +++ b/lily/include/swallow-perf.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/symbol-cache.hh b/lily/include/symbol-cache.hh index e07b603d3c..5471f09264 100644 --- a/lily/include/symbol-cache.hh +++ b/lily/include/symbol-cache.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 Han-Wen Nienhuys */ diff --git a/lily/include/system-start-delimiter.hh b/lily/include/system-start-delimiter.hh index bcf039374e..5b15f9b264 100644 --- a/lily/include/system-start-delimiter.hh +++ b/lily/include/system-start-delimiter.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 Han-Wen Nienhuys */ diff --git a/lily/include/text-item.hh b/lily/include/text-item.hh index 246f3fc47a..650096c140 100644 --- a/lily/include/text-item.hh +++ b/lily/include/text-item.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys Jan Nieuwenhuizen */ diff --git a/lily/include/text-spanner.hh b/lily/include/text-spanner.hh index a3af5beedb..7f1486b143 100644 --- a/lily/include/text-spanner.hh +++ b/lily/include/text-spanner.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Jan Nieuwenhuizen + (c) 2000--2001 Jan Nieuwenhuizen */ diff --git a/lily/include/tfm-reader.hh b/lily/include/tfm-reader.hh index 53cb6d45ed..09aef4b701 100644 --- a/lily/include/tfm-reader.hh +++ b/lily/include/tfm-reader.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Jan Nieuwenhuizen + (c) 1999--2001 Jan Nieuwenhuizen revamped code from GNU Fontutils-0.6 diff --git a/lily/include/tfm.hh b/lily/include/tfm.hh index 068ca68ae2..93deefc106 100644 --- a/lily/include/tfm.hh +++ b/lily/include/tfm.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Jan Nieuwenhuizen + (c) 1999--2001 Jan Nieuwenhuizen revamped code from GNU Fontutils-0.6 diff --git a/lily/include/tie-column.hh b/lily/include/tie-column.hh index 333b319949..36072dd03c 100644 --- a/lily/include/tie-column.hh +++ b/lily/include/tie-column.hh @@ -4,7 +4,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 Han-Wen Nienhuys */ diff --git a/lily/include/tie-engraver.hh b/lily/include/tie-engraver.hh index fbd52deae6..089be415ba 100644 --- a/lily/include/tie-engraver.hh +++ b/lily/include/tie-engraver.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ diff --git a/lily/include/tie.hh b/lily/include/tie.hh index 6c5be3f4d7..97499d8a11 100644 --- a/lily/include/tie.hh +++ b/lily/include/tie.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/time-scaled-music-iterator.hh b/lily/include/time-scaled-music-iterator.hh index c13e0bdbd6..5c2763293e 100644 --- a/lily/include/time-scaled-music-iterator.hh +++ b/lily/include/time-scaled-music-iterator.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ diff --git a/lily/include/time-scaled-music.hh b/lily/include/time-scaled-music.hh index d184f395d1..2ede5ffa6a 100644 --- a/lily/include/time-scaled-music.hh +++ b/lily/include/time-scaled-music.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ diff --git a/lily/include/time-signature.hh b/lily/include/time-signature.hh index c45dcd86cc..686c9b132b 100644 --- a/lily/include/time-signature.hh +++ b/lily/include/time-signature.hh @@ -1,7 +1,7 @@ /* time_signature.hh -- declare Time_signature - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2001 Han-Wen Nienhuys */ #ifndef METER_HH diff --git a/lily/include/timing-translator.hh b/lily/include/timing-translator.hh index cdd9143900..85f2c4ba58 100644 --- a/lily/include/timing-translator.hh +++ b/lily/include/timing-translator.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/translation-property.hh b/lily/include/translation-property.hh index dc332df200..3750e927e4 100644 --- a/lily/include/translation-property.hh +++ b/lily/include/translation-property.hh @@ -4,7 +4,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/translator-change.hh b/lily/include/translator-change.hh index 508e3d38f0..992fcedf34 100644 --- a/lily/include/translator-change.hh +++ b/lily/include/translator-change.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/translator-def.hh b/lily/include/translator-def.hh index 634f70db30..dbaea4d43d 100644 --- a/lily/include/translator-def.hh +++ b/lily/include/translator-def.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 Han-Wen Nienhuys */ diff --git a/lily/include/translator-group.hh b/lily/include/translator-group.hh index ebda8bdfec..52d7995aea 100644 --- a/lily/include/translator-group.hh +++ b/lily/include/translator-group.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/translator.hh b/lily/include/translator.hh index 019ea273ef..58500438be 100644 --- a/lily/include/translator.hh +++ b/lily/include/translator.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/transposed-music.hh b/lily/include/transposed-music.hh index 641c8a915b..75de24ff09 100644 --- a/lily/include/transposed-music.hh +++ b/lily/include/transposed-music.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ diff --git a/lily/include/tuplet-engraver.hh b/lily/include/tuplet-engraver.hh index 64539a0f78..7505980fec 100644 --- a/lily/include/tuplet-engraver.hh +++ b/lily/include/tuplet-engraver.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ diff --git a/lily/include/tuplet-spanner.hh b/lily/include/tuplet-spanner.hh index 2e352e6eea..cf1e2cedf0 100644 --- a/lily/include/tuplet-spanner.hh +++ b/lily/include/tuplet-spanner.hh @@ -1,11 +1,11 @@ /* plet-spanner.hh -- part of GNU LilyPond - (c) 1997--2000 Jan Nieuwenhuizen + (c) 1997--2001 Jan Nieuwenhuizen */ -#ifndef Tuplet_spanner_HH -#define Tuplet_spanner_HH +#ifndef Tuplet_bracket_HH +#define Tuplet_bracket_HH #include "lily-guile.hh" @@ -16,7 +16,7 @@ todo: handle breaking elegantly. */ -class Tuplet_spanner +class Tuplet_bracket { public: DECLARE_SCHEME_CALLBACK(brew_molecule, (SCM )); @@ -34,5 +34,5 @@ public: static Direction get_default_dir (Grob*); }; -#endif // Tuplet_spanner_HH +#endif // Tuplet_bracket_HH diff --git a/lily/include/type-swallow-translator.hh b/lily/include/type-swallow-translator.hh index 379cfcbbb9..908e7b86d5 100644 --- a/lily/include/type-swallow-translator.hh +++ b/lily/include/type-swallow-translator.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/volta-spanner.hh b/lily/include/volta-spanner.hh index 94aa2ec9cc..32a39cd3fc 100644 --- a/lily/include/volta-spanner.hh +++ b/lily/include/volta-spanner.hh @@ -1,7 +1,7 @@ /* volta-spanner.hh -- part of GNU LilyPond - (c) 1997--2000 Jan Nieuwenhuizen + (c) 1997--2001 Jan Nieuwenhuizen */ #ifndef VOLTA_SPANNER_HH diff --git a/lily/input-smob.cc b/lily/input-smob.cc index 4b6f455a55..4e6710cd69 100644 --- a/lily/input-smob.cc +++ b/lily/input-smob.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 Han-Wen Nienhuys */ diff --git a/lily/instrument-name-engraver.cc b/lily/instrument-name-engraver.cc index 4b534dac3c..852ef176d3 100644 --- a/lily/instrument-name-engraver.cc +++ b/lily/instrument-name-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 Han-Wen Nienhuys */ diff --git a/lily/interpretation-context-handle.cc b/lily/interpretation-context-handle.cc index e5b056e601..d03d4bc8e0 100644 --- a/lily/interpretation-context-handle.cc +++ b/lily/interpretation-context-handle.cc @@ -4,7 +4,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/item.cc b/lily/item.cc index f157b480a2..099257e001 100644 --- a/lily/item.cc +++ b/lily/item.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc index 35c4af6a35..9ffb77a381 100644 --- a/lily/key-engraver.cc +++ b/lily/key-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "key-item.hh" diff --git a/lily/key-item.cc b/lily/key-item.cc index a23b92eac8..4a3c30db99 100644 --- a/lily/key-item.cc +++ b/lily/key-item.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2001 Han-Wen Nienhuys keyplacement by Mats Bengtsson */ diff --git a/lily/key-performer.cc b/lily/key-performer.cc index 7f2e9e171b..b379691f75 100644 --- a/lily/key-performer.cc +++ b/lily/key-performer.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Jan Nieuwenhuizen + (c) 1997--2001 Jan Nieuwenhuizen */ #include "command-request.hh" diff --git a/lily/kpath.cc b/lily/kpath.cc index 022f929ec3..0f5531dc8e 100644 --- a/lily/kpath.cc +++ b/lily/kpath.cc @@ -3,7 +3,7 @@ kpath.cc -- glue kpathsea to lily. Need some ugly kludges for gcc 2.96 source file of the GNU LilyPond music typesetter -(c) 2000 Han-Wen Nienhuys +(c) 2000--2001 Han-Wen Nienhuys */ diff --git a/lily/least-squares.cc b/lily/least-squares.cc index 4c63681fa5..8e9a5baf4f 100644 --- a/lily/least-squares.cc +++ b/lily/least-squares.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2001 Han-Wen Nienhuys */ diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc index d467a59e82..695601e8ca 100644 --- a/lily/lily-guile.cc +++ b/lily/lily-guile.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Jan Nieuwenhuizen + (c) 1998--2001 Jan Nieuwenhuizen Han-Wen Nienhuys */ diff --git a/lily/lily-version.cc b/lily/lily-version.cc index 6da4880b58..081504324a 100644 --- a/lily/lily-version.cc +++ b/lily/lily-version.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Jan Nieuwenhuizen + (c) 1999--2001 Jan Nieuwenhuizen */ #include "config.h" diff --git a/lily/lilypond-version.cc b/lily/lilypond-version.cc index e252710185..d1bddc5cf7 100644 --- a/lily/lilypond-version.cc +++ b/lily/lilypond-version.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Jan Nieuwenhuizen + (c) 1998--2001 Jan Nieuwenhuizen */ diff --git a/lily/line-group-group-engraver.cc b/lily/line-group-group-engraver.cc index 8d0383c705..7a4f64c4a4 100644 --- a/lily/line-group-group-engraver.cc +++ b/lily/line-group-group-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "command-request.hh" diff --git a/lily/line-of-score.cc b/lily/line-of-score.cc index e921bd0a0f..3a1222d833 100644 --- a/lily/line-of-score.cc +++ b/lily/line-of-score.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2001 Han-Wen Nienhuys */ #include "input-smob.hh" diff --git a/lily/line-spanner.cc b/lily/line-spanner.cc index 051d91d16b..5ea4c1a687 100644 --- a/lily/line-spanner.cc +++ b/lily/line-spanner.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Jan Nieuwenhuizen + (c) 2000--2001 Jan Nieuwenhuizen */ #include "molecule.hh" diff --git a/lily/local-key-engraver.cc b/lily/local-key-engraver.cc index 2bad4ea824..0337c55b6f 100644 --- a/lily/local-key-engraver.cc +++ b/lily/local-key-engraver.cc @@ -1,7 +1,7 @@ /* local-key-engraver.cc -- implement Local_key_engraver - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "musical-request.hh" diff --git a/lily/local-key-item.cc b/lily/local-key-item.cc index 6fb078eda2..e815098eff 100644 --- a/lily/local-key-item.cc +++ b/lily/local-key-item.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "local-key-item.hh" #include "molecule.hh" diff --git a/lily/lookup.cc b/lily/lookup.cc index 1e24db5da7..62f449b08c 100644 --- a/lily/lookup.cc +++ b/lily/lookup.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys Jan Nieuwenhuizen diff --git a/lily/lyric-combine-music-iterator.cc b/lily/lyric-combine-music-iterator.cc index bcff3af02a..139dcc4290 100644 --- a/lily/lyric-combine-music-iterator.cc +++ b/lily/lyric-combine-music-iterator.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/lyric-combine-music.cc b/lily/lyric-combine-music.cc index 51e37f80f5..8f7770ecf9 100644 --- a/lily/lyric-combine-music.cc +++ b/lily/lyric-combine-music.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc index 9fff756ede..439d9602de 100644 --- a/lily/lyric-engraver.cc +++ b/lily/lyric-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys Jan Nieuwenhuizen */ diff --git a/lily/lyric-extender.cc b/lily/lyric-extender.cc index d3af55fbb9..0cbce00123 100644 --- a/lily/lyric-extender.cc +++ b/lily/lyric-extender.cc @@ -2,7 +2,7 @@ lyric-extender.cc -- implement Lyric_extender source file of the GNU LilyPond music typesetter - (c) 1998--2000 Jan Nieuwenhuizen + (c) 1998--2001 Jan Nieuwenhuizen Han-Wen Nienhuys */ diff --git a/lily/lyric-performer.cc b/lily/lyric-performer.cc index 4a759e8043..28551a700b 100644 --- a/lily/lyric-performer.cc +++ b/lily/lyric-performer.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Jan Nieuwenhuizen + (c) 1997--2001 Jan Nieuwenhuizen */ #include "musical-request.hh" diff --git a/lily/main.cc b/lily/main.cc index d9b1c6f315..8713c7d741 100644 --- a/lily/main.cc +++ b/lily/main.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include @@ -182,7 +182,7 @@ version () "lilypond"); cout << endl; - cout << _f ("Copyright (c) %s by", "1996--2000"); + cout << _f ("Copyright (c) %s by", "1996--2001"); cout << '\n'; cout << " Han-Wen Nienhuys \n"; cout << " Jan Nieuwenhuizen \n"; @@ -194,7 +194,7 @@ notice () cout << '\n'; cout << _ ("GNU LilyPond -- The music typesetter"); cout << '\n'; - cout << _f ("Copyright (c) %s by", "1996--2000"); + cout << _f ("Copyright (c) %s by", "1996--2001"); cout << '\n'; cout << " Han-Wen Nienhuys \n"; cout << " Jan Nieuwenhuizen \n"; diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc index 70136ac143..e559ff8029 100644 --- a/lily/mark-engraver.cc +++ b/lily/mark-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Jan Nieuwenhuizen + (c) 1998--2001 Jan Nieuwenhuizen */ #include diff --git a/lily/melisma-engraver.cc b/lily/melisma-engraver.cc index 6f44501411..98deeaca3f 100644 --- a/lily/melisma-engraver.cc +++ b/lily/melisma-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/midi-def.cc b/lily/midi-def.cc index 1917ef03c6..db149af33b 100644 --- a/lily/midi-def.cc +++ b/lily/midi-def.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Jan Nieuwenhuizen + (c) 1997--2001 Jan Nieuwenhuizen */ #include diff --git a/lily/midi-item.cc b/lily/midi-item.cc index bf1bef9b96..c0d980d536 100644 --- a/lily/midi-item.cc +++ b/lily/midi-item.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Jan Nieuwenhuizen + (c) 1997--2001 Jan Nieuwenhuizen */ #include "debug.hh" diff --git a/lily/midi-stream.cc b/lily/midi-stream.cc index 59b25ef27f..976130a3f0 100644 --- a/lily/midi-stream.cc +++ b/lily/midi-stream.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Jan Nieuwenhuizen + (c) 1997--2001 Jan Nieuwenhuizen */ #include diff --git a/lily/midi-walker.cc b/lily/midi-walker.cc index be00d45a80..b99b611c69 100644 --- a/lily/midi-walker.cc +++ b/lily/midi-walker.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys Jan Nieuwenhuizen */ diff --git a/lily/misc.cc b/lily/misc.cc index 9ff95f2a02..1672a08787 100644 --- a/lily/misc.cc +++ b/lily/misc.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys Jan Nieuwenhuizen */ diff --git a/lily/molecule.cc b/lily/molecule.cc index c3cb95b66a..da4ef0cfcb 100644 --- a/lily/molecule.cc +++ b/lily/molecule.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include diff --git a/lily/moment.cc b/lily/moment.cc index cc0f2dd25d..c2e84fa314 100644 --- a/lily/moment.cc +++ b/lily/moment.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/multi-measure-rest-engraver.cc b/lily/multi-measure-rest-engraver.cc index b651d9f34e..328b9a2d77 100644 --- a/lily/multi-measure-rest-engraver.cc +++ b/lily/multi-measure-rest-engraver.cc @@ -1,7 +1,7 @@ /* multi_measure_rest-engraver.cc -- implement Multi_measure_rest_engraver - (c) 1998--2000 Jan Nieuwenhuizen + (c) 1998--2001 Jan Nieuwenhuizen Han-Wen Nienhuys */ diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc index 9cb9063a6b..80849691be 100644 --- a/lily/multi-measure-rest.cc +++ b/lily/multi-measure-rest.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Jan Nieuwenhuizen + (c) 1998--2001 Jan Nieuwenhuizen */ diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc index b0998be9b8..1841c9d182 100644 --- a/lily/music-iterator.cc +++ b/lily/music-iterator.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ /* diff --git a/lily/music-list.cc b/lily/music-list.cc index 4761761884..f11985ca72 100644 --- a/lily/music-list.cc +++ b/lily/music-list.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "music-list.hh" diff --git a/lily/music-output-def.cc b/lily/music-output-def.cc index fe351cdcb4..395b7589d3 100644 --- a/lily/music-output-def.cc +++ b/lily/music-output-def.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "scm-hash.hh" diff --git a/lily/music-sequence.cc b/lily/music-sequence.cc index 5ce5b1a8b9..2ef13f02f7 100644 --- a/lily/music-sequence.cc +++ b/lily/music-sequence.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ #include "music-list.hh" diff --git a/lily/music-wrapper-iterator.cc b/lily/music-wrapper-iterator.cc index 096eee3140..32c1962891 100644 --- a/lily/music-wrapper-iterator.cc +++ b/lily/music-wrapper-iterator.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ diff --git a/lily/music-wrapper.cc b/lily/music-wrapper.cc index c6f7f50b9a..72c161d487 100644 --- a/lily/music-wrapper.cc +++ b/lily/music-wrapper.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ diff --git a/lily/music.cc b/lily/music.cc index bcee6a3d24..e3272b1989 100644 --- a/lily/music.cc +++ b/lily/music.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "input-smob.hh" diff --git a/lily/musical-request.cc b/lily/musical-request.cc index ef2b193979..a1ea36b4ed 100644 --- a/lily/musical-request.cc +++ b/lily/musical-request.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "musical-request.hh" diff --git a/lily/my-lily-lexer.cc b/lily/my-lily-lexer.cc index 763c9e90db..ff9cebe793 100644 --- a/lily/my-lily-lexer.cc +++ b/lily/my-lily-lexer.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include diff --git a/lily/my-lily-parser.cc b/lily/my-lily-parser.cc index 3294631c41..846d4bd2af 100644 --- a/lily/my-lily-parser.cc +++ b/lily/my-lily-parser.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys Jan Nieuwenhuizen */ diff --git a/lily/note-column.cc b/lily/note-column.cc index 81f90310ba..80e7b8c553 100644 --- a/lily/note-column.cc +++ b/lily/note-column.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include // ceil diff --git a/lily/note-head-line-engraver.cc b/lily/note-head-line-engraver.cc index 2a6336f89d..f0483ed031 100644 --- a/lily/note-head-line-engraver.cc +++ b/lily/note-head-line-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Jan Nieuwenhuizen + (c) 2000--2001 Jan Nieuwenhuizen */ #include "engraver.hh" diff --git a/lily/note-head.cc b/lily/note-head.cc index bfd06f0807..c536b0f8ce 100644 --- a/lily/note-head.cc +++ b/lily/note-head.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include diff --git a/lily/note-heads-engraver.cc b/lily/note-heads-engraver.cc index 0ae73fb423..5fc28bbddb 100644 --- a/lily/note-heads-engraver.cc +++ b/lily/note-heads-engraver.cc @@ -1,7 +1,7 @@ /* head-grav.cc -- part of GNU LilyPond - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "rhythmic-head.hh" diff --git a/lily/note-name-engraver.cc b/lily/note-name-engraver.cc index ed76699feb..462045446c 100644 --- a/lily/note-name-engraver.cc +++ b/lily/note-name-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/note-performer.cc b/lily/note-performer.cc index 75b56be3da..5729d0aa1c 100644 --- a/lily/note-performer.cc +++ b/lily/note-performer.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2000 Jan Nieuwenhuizen + (c) 1996--2001 Jan Nieuwenhuizen */ #include "performer.hh" diff --git a/lily/output-property-engraver.cc b/lily/output-property-engraver.cc index 13e089e85b..7676c82e1a 100644 --- a/lily/output-property-engraver.cc +++ b/lily/output-property-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 Han-Wen Nienhuys */ diff --git a/lily/output-property-music-iterator.cc b/lily/output-property-music-iterator.cc index 0cf119c3ea..882d9d63e3 100644 --- a/lily/output-property-music-iterator.cc +++ b/lily/output-property-music-iterator.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Jan Nieuwenhuizen + (c) 2000--2001 Jan Nieuwenhuizen */ #include "input.hh" diff --git a/lily/paper-column.cc b/lily/paper-column.cc index cc09a3d1b1..985b080a07 100644 --- a/lily/paper-column.cc +++ b/lily/paper-column.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "moment.hh" #include "paper-column.hh" diff --git a/lily/paper-def.cc b/lily/paper-def.cc index 4958419c19..8b365ab7eb 100644 --- a/lily/paper-def.cc +++ b/lily/paper-def.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc index c27fafdcb1..7fd502cf41 100644 --- a/lily/paper-outputter.cc +++ b/lily/paper-outputter.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys Jan Nieuwenhuizen */ diff --git a/lily/paper-score.cc b/lily/paper-score.cc index 3b4b40cc1e..49646fb56a 100644 --- a/lily/paper-score.cc +++ b/lily/paper-score.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2001 Han-Wen Nienhuys */ #include "main.hh" diff --git a/lily/paper-stream.cc b/lily/paper-stream.cc index ed6cfc74cd..8b805d15d4 100644 --- a/lily/paper-stream.cc +++ b/lily/paper-stream.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include diff --git a/lily/parser.yy b/lily/parser.yy index 99d1a5d529..b35335cc71 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -5,7 +5,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys Jan Nieuwenhuizen */ diff --git a/lily/part-combine-music-iterator.cc b/lily/part-combine-music-iterator.cc index 526b70ab88..595e3cf822 100644 --- a/lily/part-combine-music-iterator.cc +++ b/lily/part-combine-music-iterator.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Jan Nieuwenhuizen + (c) 2000--2001 Jan Nieuwenhuizen */ #include "part-combine-music.hh" diff --git a/lily/part-combine-music.cc b/lily/part-combine-music.cc index 7059eca24c..75edf8cbb8 100644 --- a/lily/part-combine-music.cc +++ b/lily/part-combine-music.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Jan Nieuwenhuizen + (c) 2000--2001 Jan Nieuwenhuizen */ diff --git a/lily/performance.cc b/lily/performance.cc index 13d72bedb7..7418c30f86 100644 --- a/lily/performance.cc +++ b/lily/performance.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Jan Nieuwenhuizen + (c) 1997--2001 Jan Nieuwenhuizen */ #include diff --git a/lily/performer-group-performer.cc b/lily/performer-group-performer.cc index d7d7bae33f..5b70ea297f 100644 --- a/lily/performer-group-performer.cc +++ b/lily/performer-group-performer.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2001 Han-Wen Nienhuys Jan Nieuwenhuizen */ diff --git a/lily/performer.cc b/lily/performer.cc index f3d2a4eada..205fb3e353 100644 --- a/lily/performer.cc +++ b/lily/performer.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2001 Han-Wen Nienhuys Jan Nieuwenhuizen */ diff --git a/lily/phrasing-slur-engraver.cc b/lily/phrasing-slur-engraver.cc index 8cabec4803..2e9a171a66 100644 --- a/lily/phrasing-slur-engraver.cc +++ b/lily/phrasing-slur-engraver.cc @@ -1,7 +1,7 @@ /* phrasing-slur-engraver.cc -- implement Phrasing_slur_engraver - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "musical-request.hh" diff --git a/lily/piano-pedal-engraver.cc b/lily/piano-pedal-engraver.cc index eefb30b154..641a7fb0f7 100644 --- a/lily/piano-pedal-engraver.cc +++ b/lily/piano-pedal-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Jan Nieuwenhuizen + (c) 2000--2001 Jan Nieuwenhuizen */ #include "engraver.hh" diff --git a/lily/pitch-squash-engraver.cc b/lily/pitch-squash-engraver.cc index 86eb472980..4ab2d01f0a 100644 --- a/lily/pitch-squash-engraver.cc +++ b/lily/pitch-squash-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "staff-symbol-referencer.hh" diff --git a/lily/pitch.cc b/lily/pitch.cc index 576054389e..bbe75c3893 100644 --- a/lily/pitch.cc +++ b/lily/pitch.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ #include "pitch.hh" diff --git a/lily/pointer-group-interface.cc b/lily/pointer-group-interface.cc index fb1b6bce62..def0d3701b 100644 --- a/lily/pointer-group-interface.cc +++ b/lily/pointer-group-interface.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ #include "group-interface.hh" diff --git a/lily/property-engraver.cc b/lily/property-engraver.cc index 4ece8f3919..d56ee274c8 100644 --- a/lily/property-engraver.cc +++ b/lily/property-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/property-inspect.cc b/lily/property-inspect.cc index 2ea7282385..30a6dc3372 100644 --- a/lily/property-inspect.cc +++ b/lily/property-inspect.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/property-iterator.cc b/lily/property-iterator.cc index bb7a40395f..9d61539a12 100644 --- a/lily/property-iterator.cc +++ b/lily/property-iterator.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "property-iterator.hh" diff --git a/lily/protected-scm.cc b/lily/protected-scm.cc index 2878e9c9a8..3628ef7078 100644 --- a/lily/protected-scm.cc +++ b/lily/protected-scm.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ #include "protected-scm.hh" diff --git a/lily/relative-octave-music.cc b/lily/relative-octave-music.cc index ae6773a6b2..770fa11d61 100644 --- a/lily/relative-octave-music.cc +++ b/lily/relative-octave-music.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ diff --git a/lily/repeat-acknowledge-engraver.cc b/lily/repeat-acknowledge-engraver.cc index 2443dfd81a..bba68ba1ae 100644 --- a/lily/repeat-acknowledge-engraver.cc +++ b/lily/repeat-acknowledge-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 Han-Wen Nienhuys */ #include "engraver.hh" diff --git a/lily/repeated-music.cc b/lily/repeated-music.cc index 5785e114cf..665b00e1c6 100644 --- a/lily/repeated-music.cc +++ b/lily/repeated-music.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/request-chord-iterator.cc b/lily/request-chord-iterator.cc index 61efb38797..118279299b 100644 --- a/lily/request-chord-iterator.cc +++ b/lily/request-chord-iterator.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "translator-group.hh" diff --git a/lily/request.cc b/lily/request.cc index e9f6427cd1..7ad67285b1 100644 --- a/lily/request.cc +++ b/lily/request.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2001 Han-Wen Nienhuys */ #include "request.hh" diff --git a/lily/rest-collision-engraver.cc b/lily/rest-collision-engraver.cc index 9b257a8067..0ebc5dde5e 100644 --- a/lily/rest-collision-engraver.cc +++ b/lily/rest-collision-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "debug.hh" diff --git a/lily/rest-collision.cc b/lily/rest-collision.cc index a8f2b3ea90..013953e51a 100644 --- a/lily/rest-collision.cc +++ b/lily/rest-collision.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include // ceil. diff --git a/lily/rest-engraver.cc b/lily/rest-engraver.cc index 599df04ace..7fbaa78e0d 100644 --- a/lily/rest-engraver.cc +++ b/lily/rest-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "item.hh" #include "staff-symbol-referencer.hh" diff --git a/lily/rest.cc b/lily/rest.cc index 149c45ba76..f05f5c0f55 100644 --- a/lily/rest.cc +++ b/lily/rest.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "molecule.hh" diff --git a/lily/rhythmic-column-engraver.cc b/lily/rhythmic-column-engraver.cc index eb378b7410..a7b89c7c7f 100644 --- a/lily/rhythmic-column-engraver.cc +++ b/lily/rhythmic-column-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/rhythmic-head.cc b/lily/rhythmic-head.cc index d3ac1a4867..4589fbec6c 100644 --- a/lily/rhythmic-head.cc +++ b/lily/rhythmic-head.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "rhythmic-head.hh" diff --git a/lily/rod.cc b/lily/rod.cc index 4071293a8d..52d71b3812 100644 --- a/lily/rod.cc +++ b/lily/rod.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ #include "rod.hh" diff --git a/lily/scaled-font-metric.cc b/lily/scaled-font-metric.cc index cef407719a..6b9be2b972 100644 --- a/lily/scaled-font-metric.cc +++ b/lily/scaled-font-metric.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/scm-hash.cc b/lily/scm-hash.cc index 56d48b775b..cd8841a5ea 100644 --- a/lily/scm-hash.cc +++ b/lily/scm-hash.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ #include diff --git a/lily/scope.cc b/lily/scope.cc index 7ada75b65d..8fec4384b1 100644 --- a/lily/scope.cc +++ b/lily/scope.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ diff --git a/lily/score-engraver.cc b/lily/score-engraver.cc index 71501fed7b..40ed1a3a5a 100644 --- a/lily/score-engraver.cc +++ b/lily/score-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "debug.hh" diff --git a/lily/score-performer.cc b/lily/score-performer.cc index 9c9d01e20e..ff25e4cef4 100644 --- a/lily/score-performer.cc +++ b/lily/score-performer.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2000 Jan Nieuwenhuizen + (c) 1996--2001 Jan Nieuwenhuizen */ #include "score-performer.hh" diff --git a/lily/score.cc b/lily/score.cc index 417c3b3a44..f80ef7b2ea 100644 --- a/lily/score.cc +++ b/lily/score.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "ly-smobs.icc" diff --git a/lily/scores.cc b/lily/scores.cc index 8d3cf3b30c..c6d9d15994 100644 --- a/lily/scores.cc +++ b/lily/scores.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "config.h" diff --git a/lily/script-column-engraver.cc b/lily/script-column-engraver.cc index 93e25140b8..185ae49cdf 100644 --- a/lily/script-column-engraver.cc +++ b/lily/script-column-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/script-column.cc b/lily/script-column.cc index da37ed12ff..2c7e6b24de 100644 --- a/lily/script-column.cc +++ b/lily/script-column.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ #include "script-column.hh" diff --git a/lily/script-engraver.cc b/lily/script-engraver.cc index 5f1467ab0b..c8d677d26e 100644 --- a/lily/script-engraver.cc +++ b/lily/script-engraver.cc @@ -1,7 +1,7 @@ /* script-engraver.cc -- implement Script_engraver - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/script.cc b/lily/script.cc index c680f73d93..6ed6ee306c 100644 --- a/lily/script.cc +++ b/lily/script.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/separating-group-spanner.cc b/lily/separating-group-spanner.cc index 0610762f2d..643d67b912 100644 --- a/lily/separating-group-spanner.cc +++ b/lily/separating-group-spanner.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ diff --git a/lily/separating-line-group-engraver.cc b/lily/separating-line-group-engraver.cc index 7b26a9b9a8..0e726c1d4f 100644 --- a/lily/separating-line-group-engraver.cc +++ b/lily/separating-line-group-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ diff --git a/lily/separation-item.cc b/lily/separation-item.cc index 42043f5c14..8a777a0df9 100644 --- a/lily/separation-item.cc +++ b/lily/separation-item.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ diff --git a/lily/sequential-music-iterator.cc b/lily/sequential-music-iterator.cc index ff0940e3d5..1538cb72ad 100644 --- a/lily/sequential-music-iterator.cc +++ b/lily/sequential-music-iterator.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "grace-iterator.hh" #include "translator-group.hh" diff --git a/lily/side-position-interface.cc b/lily/side-position-interface.cc index 1fa32c04ba..f19e5471cc 100644 --- a/lily/side-position-interface.cc +++ b/lily/side-position-interface.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ #include // ceil. diff --git a/lily/simple-music-iterator.cc b/lily/simple-music-iterator.cc index ed118ec11f..712e4745ea 100644 --- a/lily/simple-music-iterator.cc +++ b/lily/simple-music-iterator.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 Han-Wen Nienhuys */ diff --git a/lily/simple-spacer.cc b/lily/simple-spacer.cc index 5053db6a43..40ed6a0c86 100644 --- a/lily/simple-spacer.cc +++ b/lily/simple-spacer.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys TODO: - add support for different stretch/shrink constants? diff --git a/lily/simultaneous-music-iterator.cc b/lily/simultaneous-music-iterator.cc index 791dbd6185..12e0b16c68 100644 --- a/lily/simultaneous-music-iterator.cc +++ b/lily/simultaneous-music-iterator.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "translator-group.hh" diff --git a/lily/slur-bezier-bow.cc b/lily/slur-bezier-bow.cc index 4d5c9bdae6..de36d7e5eb 100644 --- a/lily/slur-bezier-bow.cc +++ b/lily/slur-bezier-bow.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Jan Nieuwenhuizen + (c) 2000--2001 Jan Nieuwenhuizen */ #include "debug.hh" diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc index 0692526657..e3f31f1786 100644 --- a/lily/slur-engraver.cc +++ b/lily/slur-engraver.cc @@ -1,7 +1,7 @@ /* slur-engraver.cc -- implement Slur_engraver - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "musical-request.hh" diff --git a/lily/slur.cc b/lily/slur.cc index 52b96b6e9c..9c3fa7866a 100644 --- a/lily/slur.cc +++ b/lily/slur.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2001 Han-Wen Nienhuys Jan Nieuwenhuizen */ diff --git a/lily/spaceable-element.cc b/lily/spaceable-element.cc index fdfeb3ee1d..9a57db0f14 100644 --- a/lily/spaceable-element.cc +++ b/lily/spaceable-element.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 Han-Wen Nienhuys */ diff --git a/lily/spacing-engraver.cc b/lily/spacing-engraver.cc index 0950112705..e5e3f5c1f0 100644 --- a/lily/spacing-engraver.cc +++ b/lily/spacing-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/spacing-spanner.cc b/lily/spacing-spanner.cc index 41f2a7bbd5..c4c6b100f0 100644 --- a/lily/spacing-spanner.cc +++ b/lily/spacing-spanner.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/span-arpeggio-engraver.cc b/lily/span-arpeggio-engraver.cc index c1f92a775d..5608a0cb60 100644 --- a/lily/span-arpeggio-engraver.cc +++ b/lily/span-arpeggio-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Jan Nieuwenhuizen + (c) 2000--2001 Jan Nieuwenhuizen */ #include "engraver.hh" diff --git a/lily/span-bar-engraver.cc b/lily/span-bar-engraver.cc index 7674d05dc1..cb026be67f 100644 --- a/lily/span-bar-engraver.cc +++ b/lily/span-bar-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/span-bar.cc b/lily/span-bar.cc index 0d0dc9c6a4..50345c1341 100644 --- a/lily/span-bar.cc +++ b/lily/span-bar.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "span-bar.hh" diff --git a/lily/spanner.cc b/lily/spanner.cc index d6a3565729..6f45027f37 100644 --- a/lily/spanner.cc +++ b/lily/spanner.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2001 Han-Wen Nienhuys */ #include #include diff --git a/lily/spring.cc b/lily/spring.cc index c4f03890cd..476007d122 100644 --- a/lily/spring.cc +++ b/lily/spring.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/staff-performer.cc b/lily/staff-performer.cc index 356bd2557b..1b28a06336 100644 --- a/lily/staff-performer.cc +++ b/lily/staff-performer.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Jan Nieuwenhuizen + (c) 1997--2001 Jan Nieuwenhuizen */ #include "translator-group.hh" diff --git a/lily/staff-symbol-engraver.cc b/lily/staff-symbol-engraver.cc index 0f29bdc2e3..a9337fe80e 100644 --- a/lily/staff-symbol-engraver.cc +++ b/lily/staff-symbol-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/staff-symbol-referencer.cc b/lily/staff-symbol-referencer.cc index da1ae75483..d569d52abc 100644 --- a/lily/staff-symbol-referencer.cc +++ b/lily/staff-symbol-referencer.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ #include diff --git a/lily/staff-symbol.cc b/lily/staff-symbol.cc index 7db3226f6c..4980a34636 100644 --- a/lily/staff-symbol.cc +++ b/lily/staff-symbol.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "lookup.hh" diff --git a/lily/stanza-number-engraver.cc b/lily/stanza-number-engraver.cc index 7110c459be..2676c7f44e 100644 --- a/lily/stanza-number-engraver.cc +++ b/lily/stanza-number-engraver.cc @@ -4,7 +4,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys , Glen Prideaux + (c) 2000--2001 Han-Wen Nienhuys , Glen Prideaux Similar to (and derived from) Instrument_name_engraver. */ diff --git a/lily/stem-engraver.cc b/lily/stem-engraver.cc index f49da3e650..374a3b1f1a 100644 --- a/lily/stem-engraver.cc +++ b/lily/stem-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "staff-symbol-referencer.hh" diff --git a/lily/stem-tremolo.cc b/lily/stem-tremolo.cc index 5ff2b8f2a5..e053bda195 100644 --- a/lily/stem-tremolo.cc +++ b/lily/stem-tremolo.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/stem.cc b/lily/stem.cc index c87490d952..7633af05f4 100644 --- a/lily/stem.cc +++ b/lily/stem.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2001 Han-Wen Nienhuys Jan Nieuwenhuizen TODO: This is way too hairy diff --git a/lily/sustain-pedal.cc b/lily/sustain-pedal.cc index c807868387..851fddb88a 100644 --- a/lily/sustain-pedal.cc +++ b/lily/sustain-pedal.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 Han-Wen Nienhuys */ #include "grob.hh" diff --git a/lily/swallow-engraver.cc b/lily/swallow-engraver.cc index 0a86e7163a..26719c8477 100644 --- a/lily/swallow-engraver.cc +++ b/lily/swallow-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "swallow-engraver.hh" diff --git a/lily/swallow-perf.cc b/lily/swallow-perf.cc index 7cafeaf9ce..30cdba8bd5 100644 --- a/lily/swallow-perf.cc +++ b/lily/swallow-perf.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "swallow-perf.hh" diff --git a/lily/symbol-cache.cc b/lily/symbol-cache.cc index dc0d329d24..2cd999d356 100644 --- a/lily/symbol-cache.cc +++ b/lily/symbol-cache.cc @@ -5,7 +5,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 Han-Wen Nienhuys */ diff --git a/lily/system-start-delimiter-engraver.cc b/lily/system-start-delimiter-engraver.cc index 169537a5df..8f172865a3 100644 --- a/lily/system-start-delimiter-engraver.cc +++ b/lily/system-start-delimiter-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 Han-Wen Nienhuys */ diff --git a/lily/system-start-delimiter.cc b/lily/system-start-delimiter.cc index cf792f086b..6f3223ad18 100644 --- a/lily/system-start-delimiter.cc +++ b/lily/system-start-delimiter.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 Han-Wen Nienhuys */ #include diff --git a/lily/template5.cc b/lily/template5.cc index 8a4e1c8b40..105aa44668 100644 --- a/lily/template5.cc +++ b/lily/template5.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include diff --git a/lily/tempo-performer.cc b/lily/tempo-performer.cc index 2c0f70e5ac..413b45ce23 100644 --- a/lily/tempo-performer.cc +++ b/lily/tempo-performer.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Jan Nieuwenhuizen + (c) 1997--2001 Jan Nieuwenhuizen */ #include "command-request.hh" diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc index b58467b016..cb668b4146 100644 --- a/lily/text-engraver.cc +++ b/lily/text-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ diff --git a/lily/text-item.cc b/lily/text-item.cc index d3b1bb2ade..25a0a0d3fb 100644 --- a/lily/text-item.cc +++ b/lily/text-item.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys Jan Nieuwenhuizen */ #include diff --git a/lily/text-spanner-engraver.cc b/lily/text-spanner-engraver.cc index 4f339eb92c..07e9b00fbd 100644 --- a/lily/text-spanner-engraver.cc +++ b/lily/text-spanner-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Jan Nieuwenhuizen + (c) 2000--2001 Jan Nieuwenhuizen */ #include "dimensions.hh" diff --git a/lily/text-spanner.cc b/lily/text-spanner.cc index ba1e420fc1..b4668ce372 100644 --- a/lily/text-spanner.cc +++ b/lily/text-spanner.cc @@ -4,7 +4,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Jan Nieuwenhuizen + (c) 2000--2001 Jan Nieuwenhuizen */ #include "molecule.hh" diff --git a/lily/tfm-reader.cc b/lily/tfm-reader.cc index 70472b8020..37d3ecf7c3 100644 --- a/lily/tfm-reader.cc +++ b/lily/tfm-reader.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Jan Nieuwenhuizen + (c) 1999--2001 Jan Nieuwenhuizen some code shamelessly copied from GNU fontutils-0.6/tfm/tfm_input.c diff --git a/lily/tfm.cc b/lily/tfm.cc index 4e7d22f4fa..0999e49146 100644 --- a/lily/tfm.cc +++ b/lily/tfm.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Jan Nieuwenhuizen + (c) 1999--2001 Jan Nieuwenhuizen some code shamelessly copied from GNU fontutils-0.6/tfm/tfm_input.c diff --git a/lily/thread-devnull-engraver.cc b/lily/thread-devnull-engraver.cc index 83c1f2a36f..3ab759ed81 100644 --- a/lily/thread-devnull-engraver.cc +++ b/lily/thread-devnull-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Jan Nieuwenhuizen + (c) 2000--2001 Jan Nieuwenhuizen */ #include "engraver.hh" diff --git a/lily/tie-column.cc b/lily/tie-column.cc index dcb5e5be8b..bbd6b8d102 100644 --- a/lily/tie-column.cc +++ b/lily/tie-column.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 Han-Wen Nienhuys */ diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc index 57f9baad36..75139c817d 100644 --- a/lily/tie-engraver.cc +++ b/lily/tie-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ diff --git a/lily/tie-performer.cc b/lily/tie-performer.cc index 5261055c87..211cfbb925 100644 --- a/lily/tie-performer.cc +++ b/lily/tie-performer.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Jan Nieuwenhuizen + (c) 1999--2001 Jan Nieuwenhuizen */ diff --git a/lily/tie.cc b/lily/tie.cc index 3b18810532..6a762fc3e0 100644 --- a/lily/tie.cc +++ b/lily/tie.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include diff --git a/lily/time-scaled-music-iterator.cc b/lily/time-scaled-music-iterator.cc index cea13bf68b..b9fbb76010 100644 --- a/lily/time-scaled-music-iterator.cc +++ b/lily/time-scaled-music-iterator.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ diff --git a/lily/time-scaled-music.cc b/lily/time-scaled-music.cc index ed3961b27e..6ff67f2963 100644 --- a/lily/time-scaled-music.cc +++ b/lily/time-scaled-music.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ diff --git a/lily/time-signature-engraver.cc b/lily/time-signature-engraver.cc index 9a4e2b4ee4..caabdb6e25 100644 --- a/lily/time-signature-engraver.cc +++ b/lily/time-signature-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "time-signature.hh" diff --git a/lily/time-signature-performer.cc b/lily/time-signature-performer.cc index 0f65b322b4..d1f3599d78 100644 --- a/lily/time-signature-performer.cc +++ b/lily/time-signature-performer.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Jan Nieuwenhuizen + (c) 1997--2001 Jan Nieuwenhuizen */ #include "audio-item.hh" diff --git a/lily/time-signature.cc b/lily/time-signature.cc index aa65da6e20..cf1efd7e94 100644 --- a/lily/time-signature.cc +++ b/lily/time-signature.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2001 Han-Wen Nienhuys */ diff --git a/lily/timing-engraver.cc b/lily/timing-engraver.cc index 468dc0eb3b..da097bc7d5 100644 --- a/lily/timing-engraver.cc +++ b/lily/timing-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "translator-group.hh" #include "command-request.hh" diff --git a/lily/timing-translator.cc b/lily/timing-translator.cc index 16fe82b6e6..11b5d69c6f 100644 --- a/lily/timing-translator.cc +++ b/lily/timing-translator.cc @@ -4,7 +4,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "debug.hh" diff --git a/lily/translator-ctors.cc b/lily/translator-ctors.cc index 4418310186..4e57c28fa5 100644 --- a/lily/translator-ctors.cc +++ b/lily/translator-ctors.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "translator.hh" diff --git a/lily/translator-def.cc b/lily/translator-def.cc index 668d5a70ea..a54b1715d1 100644 --- a/lily/translator-def.cc +++ b/lily/translator-def.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 Han-Wen Nienhuys */ diff --git a/lily/translator-group.cc b/lily/translator-group.cc index 702c42bf01..4a60731dd4 100644 --- a/lily/translator-group.cc +++ b/lily/translator-group.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "music-output-def.hh" diff --git a/lily/translator.cc b/lily/translator.cc index 0345c2c370..41111b075e 100644 --- a/lily/translator.cc +++ b/lily/translator.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/transposed-music.cc b/lily/transposed-music.cc index a059b2b5bd..c8aa3780e9 100644 --- a/lily/transposed-music.cc +++ b/lily/transposed-music.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ diff --git a/lily/tuplet-engraver.cc b/lily/tuplet-engraver.cc index d6bcec2460..8781845df6 100644 --- a/lily/tuplet-engraver.cc +++ b/lily/tuplet-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ @@ -75,15 +75,19 @@ Tuplet_engraver::create_grobs () continue; Spanner* glep = new Spanner (get_property ("TupletBracket")); - Tuplet_spanner::set_interface (glep); + Tuplet_bracket::set_interface (glep); if (i >= started_span_p_arr_.size ()) started_span_p_arr_.push (glep); else started_span_p_arr_[i] = glep; - int d = gh_scm2int (time_scaled_music_arr_[i]->get_mus_property ("denominator")); - glep->set_grob_property ("text", ly_str02scm (to_str (d).ch_C())); + SCM proc = get_property ("tupletNumberFormatFunction"); + if (gh_procedure_p( proc)) + { + SCM t = gh_apply (proc, gh_list (time_scaled_music_arr_[i]->self_scm (), SCM_UNDEFINED)); + glep->set_grob_property ("text", t); + } announce_grob (glep, time_scaled_music_arr_ [i]); } @@ -102,13 +106,13 @@ Tuplet_engraver::acknowledge_grob (Grob_info i) { for (int j =0; j (i.elem_l_)); + Tuplet_bracket::add_column (started_span_p_arr_[j], dynamic_cast(i.elem_l_)); } else if (Beam::has_interface (i.elem_l_)) { for (int j = 0; j < started_span_p_arr_.size (); j++) if (started_span_p_arr_[j]) - Tuplet_spanner::add_beam (started_span_p_arr_[j],i.elem_l_); + Tuplet_bracket::add_beam (started_span_p_arr_[j],i.elem_l_); } } diff --git a/lily/type-swallow-translator.cc b/lily/type-swallow-translator.cc index 1f5a9ca00a..f73ef586be 100644 --- a/lily/type-swallow-translator.cc +++ b/lily/type-swallow-translator.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "type-swallow-translator.hh" diff --git a/lily/unfolded-repeat-iterator.cc b/lily/unfolded-repeat-iterator.cc index 8ad34fe331..1c2136c625 100644 --- a/lily/unfolded-repeat-iterator.cc +++ b/lily/unfolded-repeat-iterator.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/vertical-align-engraver.cc b/lily/vertical-align-engraver.cc index 59449e1f0e..cee4a10387 100644 --- a/lily/vertical-align-engraver.cc +++ b/lily/vertical-align-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "translator-group.hh" #include "paper-column.hh" diff --git a/lily/voice-devnull-engraver.cc b/lily/voice-devnull-engraver.cc index b3414f531d..6ad506a925 100644 --- a/lily/voice-devnull-engraver.cc +++ b/lily/voice-devnull-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Jan Nieuwenhuizen + (c) 2000--2001 Jan Nieuwenhuizen */ #include "engraver.hh" diff --git a/lily/volta-engraver.cc b/lily/volta-engraver.cc index e4dae39b63..f21f8aebba 100644 --- a/lily/volta-engraver.cc +++ b/lily/volta-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 Han-Wen Nienhuys */ diff --git a/lily/volta-spanner.cc b/lily/volta-spanner.cc index eeb1f83aa4..df0d1e6349 100644 --- a/lily/volta-spanner.cc +++ b/lily/volta-spanner.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Jan Nieuwenhuizen + (c) 1997--2001 Jan Nieuwenhuizen */ diff --git a/lily/warn.cc b/lily/warn.cc index b371ddabe8..1788539e40 100644 --- a/lily/warn.cc +++ b/lily/warn.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "debug.hh" diff --git a/ly/engraver.ly b/ly/engraver.ly index 39623a2056..aad446c46e 100644 --- a/ly/engraver.ly +++ b/ly/engraver.ly @@ -416,6 +416,8 @@ ScoreContext = \translator { pedalUnaChordaStrings = #'("una chorda" "" "tre chorde") pedalSostenutoStrings = #'() % FIXME + tupletNumberFormatFunction = #denominator-tuplet-formatter + 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) diff --git a/make/out/lilypond.lsm b/make/out/lilypond.lsm index 6ba4b1d771..9190111b34 100644 --- a/make/out/lilypond.lsm +++ b/make/out/lilypond.lsm @@ -1,15 +1,15 @@ Begin3 Title: LilyPond -Version: 1.3.130 -Entered-date: 21FEB01 -Description: +Version: 1.3.131 +Entered-date: 24FEB01 +Description: @BLURB@ Keywords: music notation typesetting midi fonts engraving Author: hanwen@cs.uu.nl (Han-Wen Nienhuys) janneke@gnu.org (Jan Nieuwenhuizen) Maintained-by: hanwen@stack.nl (Han-Wen Nienhuys) Primary-site: sunsite.unc.edu /pub/Linux/apps/sound/convert - 1000k lilypond-1.3.130.tar.gz + 1000k lilypond-1.3.131.tar.gz Original-site: ftp.cs.uu.nl /pub/GNU/LilyPond/development/ - 1000k lilypond-1.3.130.tar.gz + 1000k lilypond-1.3.131.tar.gz Copying-policy: GPL End diff --git a/make/out/lilypond.spec b/make/out/lilypond.spec index 14aed143d1..08f2e52e8b 100644 --- a/make/out/lilypond.spec +++ b/make/out/lilypond.spec @@ -1,11 +1,11 @@ %define info yes Name: lilypond -Version: 1.3.130 +Version: 1.3.131 Release: 1 License: GPL Group: Applications/Publishing -Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.3.130.tar.gz +Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.3.131.tar.gz Summary: A program for printing sheet music. URL: http://www.cs.uu.nl/~hanwen/lilypond # Icon: lilypond-icon.gif diff --git a/mf/feta-autometric.mf b/mf/feta-autometric.mf index fdf9b0eb3f..38f62a7758 100644 --- a/mf/feta-autometric.mf +++ b/mf/feta-autometric.mf @@ -4,7 +4,7 @@ % source file of the Feta (not an acronym for Font-En-Tja) % pretty-but-neat music font % -% (c) 1997--2000 Han-Wen Nienhuys +% (c) 1997--2001 Han-Wen Nienhuys % Jan Nieuwenhuizen % % these macros help create ascii logging output diff --git a/mf/feta-beum.mf b/mf/feta-beum.mf index 17cf755a95..936d9cf680 100644 --- a/mf/feta-beum.mf +++ b/mf/feta-beum.mf @@ -3,7 +3,7 @@ % % source file of LilyPond's pretty-but-neat music font % -% (c) 1997--2000 Jan Nieuwenhuizen +% (c) 1997--2001 Jan Nieuwenhuizen % mode_setup; diff --git a/mf/feta-bolletjes.mf b/mf/feta-bolletjes.mf index 877d03cc59..eccb52238c 100644 --- a/mf/feta-bolletjes.mf +++ b/mf/feta-bolletjes.mf @@ -3,7 +3,7 @@ % % source file of LilyPond's pretty-but-neat music font % -% (c) 1997--2000 Jan Nieuwenhuizen +% (c) 1997--2001 Jan Nieuwenhuizen % & Han-Wen Nienhuys % diff --git a/mf/feta-braces11.mf b/mf/feta-braces11.mf index 29ad26a6ae..fd8453098f 100644 --- a/mf/feta-braces11.mf +++ b/mf/feta-braces11.mf @@ -4,7 +4,7 @@ % % source file of the Feta (Font-En-Tja) music font % -% (c) 1997--2000 Han-Wen Nienhuys +% (c) 1997--2001 Han-Wen Nienhuys % font_identifier:="feta-braces11"; diff --git a/mf/feta-braces13.mf b/mf/feta-braces13.mf index 013ecad689..92b47b8166 100644 --- a/mf/feta-braces13.mf +++ b/mf/feta-braces13.mf @@ -4,7 +4,7 @@ % % source file of the Feta (Font-En-Tja) music font % -% (c) 1997--2000 Han-Wen Nienhuys +% (c) 1997--2001 Han-Wen Nienhuys % font_identifier:="feta-braces13"; diff --git a/mf/feta-braces16.mf b/mf/feta-braces16.mf index 06f05f40ed..d11edfc9c6 100644 --- a/mf/feta-braces16.mf +++ b/mf/feta-braces16.mf @@ -4,7 +4,7 @@ % % source file of the Feta (Font-En-Tja) music font % -% (c) 1997--2000 Han-Wen Nienhuys +% (c) 1997--2001 Han-Wen Nienhuys % font_identifier:="feta-braces16"; diff --git a/mf/feta-braces20.mf b/mf/feta-braces20.mf index c7b944e733..9dde058f03 100644 --- a/mf/feta-braces20.mf +++ b/mf/feta-braces20.mf @@ -3,7 +3,7 @@ % % source file of the Feta (Font-En-Tja) music font % -% (c) 1997--2000 Han-Wen Nienhuys +% (c) 1997--2001 Han-Wen Nienhuys % font_identifier:="feta-braces20"; diff --git a/mf/feta-braces23.mf b/mf/feta-braces23.mf index 6e4ca0c712..99d2d46f87 100644 --- a/mf/feta-braces23.mf +++ b/mf/feta-braces23.mf @@ -4,7 +4,7 @@ % % source file of the Feta (Font-En-Tja) music font % -% (c) 1997--2000 Han-Wen Nienhuys +% (c) 1997--2001 Han-Wen Nienhuys % font_identifier:="feta-braces23"; diff --git a/mf/feta-braces26.mf b/mf/feta-braces26.mf index c75ee3544e..c2c0e6850b 100644 --- a/mf/feta-braces26.mf +++ b/mf/feta-braces26.mf @@ -4,7 +4,7 @@ % % source file of the Feta (Font-En-Tja) music font % -% (c) 1997--2000 Han-Wen Nienhuys +% (c) 1997--2001 Han-Wen Nienhuys % font_identifier:="feta-braces26"; diff --git a/mf/feta-eindelijk.mf b/mf/feta-eindelijk.mf index b5f172dbe2..fadde1ec0e 100644 --- a/mf/feta-eindelijk.mf +++ b/mf/feta-eindelijk.mf @@ -4,7 +4,7 @@ % % source file of the Feta (not the Font-En-Tja) music font % -% (c) 1997--2000 Jan Nieuwenhuizen +% (c) 1997--2001 Jan Nieuwenhuizen fet_begingroup("rests"); diff --git a/mf/feta-generic.mf b/mf/feta-generic.mf index f7b7341288..26c91cf95b 100644 --- a/mf/feta-generic.mf +++ b/mf/feta-generic.mf @@ -5,7 +5,7 @@ % source file of the Feta (defintively not an abbreviation for Font-En-Tja) % music font % -% (c) 1997--2000 Han-Wen Nienhuys +% (c) 1997--2001 Han-Wen Nienhuys % diff --git a/mf/feta-klef.mf b/mf/feta-klef.mf index c1e3235257..847045bb44 100644 --- a/mf/feta-klef.mf +++ b/mf/feta-klef.mf @@ -4,7 +4,7 @@ % % source file of the Feta (not the Font-En-Tja) music font % -% (c) 1997--2000 Han-Wen Nienhuys , +% (c) 1997--2001 Han-Wen Nienhuys , % Jan Nieuwenhuizen , % Juergen Reuter diff --git a/mf/feta-nummer-code.mf b/mf/feta-nummer-code.mf index a7664589ef..1cd8e52acc 100644 --- a/mf/feta-nummer-code.mf +++ b/mf/feta-nummer-code.mf @@ -4,7 +4,7 @@ % % source file of the Feta (not the Font-En-Tja) music font % -% (c) 1997--2000 Jan Nieuwenhuizen +% (c) 1997--2001 Jan Nieuwenhuizen fet_begingroup("number") diff --git a/mf/feta-slag.mf b/mf/feta-slag.mf index 060e4537c5..769348609e 100644 --- a/mf/feta-slag.mf +++ b/mf/feta-slag.mf @@ -4,7 +4,7 @@ % source file of the Feta (defintively not an abbreviation for Font-En-Tja) % music font % -% (c) 1998--2000 Jan Nieuwenhuizen +% (c) 1998--2001 Jan Nieuwenhuizen % % this file is included by feta-scripts.mf diff --git a/mf/feta-sleur.mf b/mf/feta-sleur.mf index 3b129a8bdb..fc6298daa6 100644 --- a/mf/feta-sleur.mf +++ b/mf/feta-sleur.mf @@ -3,7 +3,7 @@ % % source file of LilyPond's pretty-but-neat music font % -% (c) 1997--2000 Jan Nieuwenhuizen +% (c) 1997--2001 Jan Nieuwenhuizen % & Han-Wen Nienhuys % % see Documentation/fonts.tex diff --git a/mf/feta-toevallig.mf b/mf/feta-toevallig.mf index b3d77bb108..ad008adc34 100644 --- a/mf/feta-toevallig.mf +++ b/mf/feta-toevallig.mf @@ -3,7 +3,7 @@ % % source file of the Feta (Font-En-Tja) music font % -% (c) 1997--2000 Han-Wen Nienhuys +% (c) 1997--2001 Han-Wen Nienhuys % diff --git a/midi2ly/duration-convert.cc b/midi2ly/duration-convert.cc index a7b7594ff3..b915c87727 100644 --- a/midi2ly/duration-convert.cc +++ b/midi2ly/duration-convert.cc @@ -3,7 +3,7 @@ source file of the LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys Jan Nieuwenhuizen */ #include diff --git a/midi2ly/duration-iter.cc b/midi2ly/duration-iter.cc index fbc8bf4988..12c2fa832b 100644 --- a/midi2ly/duration-iter.cc +++ b/midi2ly/duration-iter.cc @@ -3,7 +3,7 @@ source file of the LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys Jan Nieuwenhuizen */ #include diff --git a/midi2ly/duration.cc b/midi2ly/duration.cc index 2780baec6d..5289273358 100644 --- a/midi2ly/duration.cc +++ b/midi2ly/duration.cc @@ -3,7 +3,7 @@ source file of the LilyPond music typesetter - (c) 1997--2000 Jan Nieuwenhuizen + (c) 1997--2001 Jan Nieuwenhuizen Han-Wen Nienhuys diff --git a/midi2ly/include/duration-convert.hh b/midi2ly/include/duration-convert.hh index 7211cd9053..683c6eb19b 100644 --- a/midi2ly/include/duration-convert.hh +++ b/midi2ly/include/duration-convert.hh @@ -3,7 +3,7 @@ source file of the LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/midi2ly/include/duration-iter.hh b/midi2ly/include/duration-iter.hh index 9f441694b6..d3320c3317 100644 --- a/midi2ly/include/duration-iter.hh +++ b/midi2ly/include/duration-iter.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ diff --git a/midi2ly/include/duration.hh b/midi2ly/include/duration.hh index f43bf2ecb5..22f4fb4530 100644 --- a/midi2ly/include/duration.hh +++ b/midi2ly/include/duration.hh @@ -3,7 +3,7 @@ source file of the LilyPond music typesetter - (c) 1997--2000 Jan Nieuwenhuizen + (c) 1997--2001 Jan Nieuwenhuizen */ diff --git a/midi2ly/include/plet.hh b/midi2ly/include/plet.hh index e538b99a3c..c05709e3ab 100644 --- a/midi2ly/include/plet.hh +++ b/midi2ly/include/plet.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/midi2ly/main.cc b/midi2ly/main.cc index 0a6716d165..38ce2703a6 100644 --- a/midi2ly/main.cc +++ b/midi2ly/main.cc @@ -59,7 +59,7 @@ version () "midi2ly"); cout << endl; - cout << _f ("Copyright (c) %s by", "1996--2000"); + cout << _f ("Copyright (c) %s by", "1996--2001"); cout << "Han-Wen Nienhuys \n" << "Jan Nieuwenhuizen \n"; } @@ -267,9 +267,9 @@ main (int argc_i, char* argv_sz_a[]) if (!output_str.length_i ()) { - String d, dir, base, ext; - split_path (arg_sz, d, dir, base, ext); - output_str = base + ext + ".ly"; + Path p = split_path (arg_sz); + + output_str = p.base + p.ext + ".ly"; } score_p->output (output_str); diff --git a/midi2ly/plet.cc b/midi2ly/plet.cc index 8ffdf5d763..df6efdd842 100644 --- a/midi2ly/plet.cc +++ b/midi2ly/plet.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "plet.hh" diff --git a/scm/auto-beam.scm b/scm/auto-beam.scm index 73a01b0360..bcb394ab3e 100644 --- a/scm/auto-beam.scm +++ b/scm/auto-beam.scm @@ -3,7 +3,7 @@ ;;; ;;; source file of the GNU LilyPond music typesetter ;;; -;;; (c) 2000 Jan Nieuwenhuizen +;;; (c) 2000--2001 Jan Nieuwenhuizen ;;; ;;; specify generic beam begin and end times diff --git a/scm/backend-documentation-lib.scm b/scm/backend-documentation-lib.scm index 9802360423..5cdad802be 100644 --- a/scm/backend-documentation-lib.scm +++ b/scm/backend-documentation-lib.scm @@ -2,7 +2,7 @@ ;;; ;;; source file of the GNU LilyPond music typesetter ;;; -;;; (c) 2000 Han-Wen Nienhuys +;;; (c) 2000--2001 Han-Wen Nienhuys ;;; Jan Nieuwenhuizen diff --git a/scm/c++.scm b/scm/c++.scm index f3d795b7da..8cd3d7b2bf 100644 --- a/scm/c++.scm +++ b/scm/c++.scm @@ -2,7 +2,7 @@ ;;;; ;;;; source file of the GNU LilyPond music typesetter ;;;; -;;;; (c) 1998--2000 Jan Nieuwenhuizen +;;;; (c) 1998--2001 Jan Nieuwenhuizen ;;;; Han-Wen Nienhuys ;;; Note: this file can't be used without LilyPond executable diff --git a/scm/chord-name.scm b/scm/chord-name.scm index f20f70d71e..7597413ded 100644 --- a/scm/chord-name.scm +++ b/scm/chord-name.scm @@ -3,7 +3,7 @@ ;;; ;;; source file of the GNU LilyPond music typesetter ;;; -;;; (c) 2000 Jan Nieuwenhuizen +;;; (c) 2000--2001 Jan Nieuwenhuizen ;;; diff --git a/scm/documentation-lib.scm b/scm/documentation-lib.scm index e69c04884f..a74265b9a7 100644 --- a/scm/documentation-lib.scm +++ b/scm/documentation-lib.scm @@ -3,7 +3,7 @@ ;;; ;;; source file of the GNU LilyPond music typesetter ;;; -;;; (c) 2000 Han-Wen Nienhuys +;;; (c) 2000--2001 Han-Wen Nienhuys ;;; Jan Nieuwenhuizen (define (uniqued-alist alist acc) diff --git a/scm/engraver-documentation-lib.scm b/scm/engraver-documentation-lib.scm index bd18c440f8..b21356f96e 100644 --- a/scm/engraver-documentation-lib.scm +++ b/scm/engraver-documentation-lib.scm @@ -3,7 +3,7 @@ ;;; ;;; source file of the GNU LilyPond music typesetter ;;; -;;; (c) 2000 Han-Wen Nienhuys +;;; (c) 2000--2001 Han-Wen Nienhuys ;;; Jan Nieuwenhuizen diff --git a/scm/font.scm b/scm/font.scm index 538726baef..7c50827b44 100644 --- a/scm/font.scm +++ b/scm/font.scm @@ -3,7 +3,7 @@ ;;; ;;; source file of the GNU LilyPond music typesetter ;;; -;;; (c) 2000 Jan Nieuwenhuizen +;;; (c) 2000--2001 Jan Nieuwenhuizen ;;; (define style-to-font-alist diff --git a/scm/generate-documentation.scm b/scm/generate-documentation.scm index cbc19bae28..b7f9142437 100644 --- a/scm/generate-documentation.scm +++ b/scm/generate-documentation.scm @@ -3,7 +3,7 @@ ;;; ;;; source file of the GNU LilyPond music typesetter ;;; -;;; (c) 2000 Han-Wen Nienhuys +;;; (c) 2000--2001 Han-Wen Nienhuys ;;; Jan Nieuwenhuizen ;;; File entry point for generated documentation diff --git a/scm/grob-description.scm b/scm/grob-description.scm index 956ca621c3..7e814f0439 100644 --- a/scm/grob-description.scm +++ b/scm/grob-description.scm @@ -2,7 +2,7 @@ ;;;; ;;;; source file of the GNU LilyPond music typesetter ;;;; -;;;; (c) 1998--2000 Han-Wen Nienhuys +;;;; (c) 1998--2001 Han-Wen Nienhuys ;;;; Jan Nieuwenhuizen ; distances are given in stafflinethickness (thicknesses) and @@ -284,6 +284,9 @@ (RehearsalMark . ( (molecule-callback . ,Text_item::brew_molecule) + (X-offset-callbacks . (,Side_position::aligned_on_self)) + (self-alignment-X . 0) + (direction . 1) (breakable . #t) (font-family . number) @@ -636,8 +639,8 @@ (number-gap . 2.0) (delta-y . 0) (thick . 1.0) - (after-line-breaking-callback . ,Tuplet_spanner::after_line_breaking) - (molecule-callback . ,Tuplet_spanner::brew_molecule) + (after-line-breaking-callback . ,Tuplet_bracket::after_line_breaking) + (molecule-callback . ,Tuplet_bracket::brew_molecule) (font-family . roman) (font-shape . italic) (font-relative-size . -1) diff --git a/scm/grob-property-description.scm b/scm/grob-property-description.scm index 615dfcc7f1..67f74adc87 100644 --- a/scm/grob-property-description.scm +++ b/scm/grob-property-description.scm @@ -2,7 +2,7 @@ ;;;; ;;;; source file of the GNU LilyPond music typesetter ;;;; -;;;; (c) 1998--2000 Han-Wen Nienhuys +;;;; (c) 1998--2001 Han-Wen Nienhuys ;;;; Jan Nieuwenhuizen diff --git a/scm/interface-description.scm b/scm/interface-description.scm index bed220bdb5..e7253de63f 100644 --- a/scm/interface-description.scm +++ b/scm/interface-description.scm @@ -2,7 +2,7 @@ ;;;; ;;;; source file of the GNU LilyPond music typesetter ;;;; -;;;; (c) 1998--2000 Han-Wen Nienhuys +;;;; (c) 1998--2001 Han-Wen Nienhuys ;;;; Jan Nieuwenhuizen diff --git a/scm/lily.scm b/scm/lily.scm index dcc2b805ff..f8b1a671ed 100644 --- a/scm/lily.scm +++ b/scm/lily.scm @@ -2,7 +2,7 @@ ;;;; ;;;; source file of the GNU LilyPond music typesetter ;;;; -;;;; (c) 1998--2000 Jan Nieuwenhuizen +;;;; (c) 1998--2001 Jan Nieuwenhuizen ;;;; Han-Wen Nienhuys ;;; Library funtions @@ -73,10 +73,14 @@ "clef.scm" "slur.scm" "font.scm" + "music-functions.scm" "auto-beam.scm" "generic-property.scm" "basic-properties.scm" "chord-name.scm" "grob-description.scm" - "script.scm" "midi.scm" + "script.scm" + "midi.scm" ))) + + diff --git a/scm/midi.scm b/scm/midi.scm index fbfdff6cd7..ed637bfd13 100644 --- a/scm/midi.scm +++ b/scm/midi.scm @@ -2,7 +2,7 @@ ;;; ;;; source file of the GNU LilyPond music typesetter ;;; -;;; (c) 2000 Jan Nieuwenhuizen +;;; (c) 2000--2001 Jan Nieuwenhuizen ;; define factor of total volume per dynamic marking diff --git a/scm/music-functions.scm b/scm/music-functions.scm new file mode 100644 index 0000000000..b708b44768 --- /dev/null +++ b/scm/music-functions.scm @@ -0,0 +1,10 @@ + +(define (denominator-tuplet-formatter mus) + (number->string (ly-get-mus-property mus 'denominator))) + +(define (fraction-tuplet-formatter mus) + (string-append (number->string (ly-get-mus-property mus 'numerator)) + ":" + (number->string (ly-get-mus-property mus 'denominator)) + )) + diff --git a/scm/music-property-description.scm b/scm/music-property-description.scm index a7f04601be..e4a2284265 100644 --- a/scm/music-property-description.scm +++ b/scm/music-property-description.scm @@ -2,7 +2,7 @@ ;;;; ;;;; source file of the GNU LilyPond music typesetter ;;;; -;;;; (c) 1998--2000 Han-Wen Nienhuys +;;;; (c) 1998--2001 Han-Wen Nienhuys ;;;; Jan Nieuwenhuizen diff --git a/scm/output-lib.scm b/scm/output-lib.scm index 2ccf6c576e..b2668b4004 100644 --- a/scm/output-lib.scm +++ b/scm/output-lib.scm @@ -2,7 +2,7 @@ ;;;; ;;;; source file of the GNU LilyPond music typesetter ;;;; -;;;; (c) 1998--2000 Jan Nieuwenhuizen +;;;; (c) 1998--2001 Jan Nieuwenhuizen ;;;; Han-Wen Nienhuys diff --git a/scm/ps.scm b/scm/ps.scm index fee2173983..b80308eb62 100644 --- a/scm/ps.scm +++ b/scm/ps.scm @@ -2,7 +2,7 @@ ;;; ;;; source file of the GNU LilyPond music typesetter ;;; -;;; (c) 1998--2000 Jan Nieuwenhuizen +;;; (c) 1998--2001 Jan Nieuwenhuizen ;;; Han-Wen Nienhuys diff --git a/scm/slur.scm b/scm/slur.scm index b188a2a517..c15dd9bf33 100644 --- a/scm/slur.scm +++ b/scm/slur.scm @@ -3,7 +3,7 @@ ;;; ;;; source file of the GNU LilyPond music typesetter ;;; -;;; (c) 2000 Jan Nieuwenhuizen +;;; (c) 2000--2001 Jan Nieuwenhuizen ;;; (define (attached-to-stem slur dir) diff --git a/scm/standalone.scm b/scm/standalone.scm index c4d75ac23e..6596a700c0 100644 --- a/scm/standalone.scm +++ b/scm/standalone.scm @@ -2,7 +2,7 @@ ;;;; ;;;; source file of the GNU LilyPond music typesetter ;;;; -;;;; (c) 1998--2000 Jan Nieuwenhuizen +;;;; (c) 1998--2001 Jan Nieuwenhuizen ;;;; Han-Wen Nienhuys (define standalone (not (defined? 'ly-gulp-file))) diff --git a/scm/tex.scm b/scm/tex.scm index 190a36e7ac..7da4ad9a04 100644 --- a/scm/tex.scm +++ b/scm/tex.scm @@ -2,7 +2,7 @@ ;;; ;;; source file of the GNU LilyPond music typesetter ;;; -;;; (c) 1998--2000 Jan Nieuwenhuizen +;;; (c) 1998--2001 Jan Nieuwenhuizen ;;; Han-Wen Nienhuys diff --git a/scm/translator-property-description.scm b/scm/translator-property-description.scm index 549b54fad9..610f63a298 100644 --- a/scm/translator-property-description.scm +++ b/scm/translator-property-description.scm @@ -289,6 +289,9 @@ pair of numbers, signifying the time signature. For example #'(4 . 4) is a 4/4t Switch off for cadenzas.") (translator-property-description 'transposing integer? "Transpose the MIDI output. Set this property to the number of half-steps to transpose by.") (translator-property-description 'tremoloFlags integer? "Number of tremolo flags to add if none is specified.") +(translator-property-description 'tupletNumberFormatFunction procedure? + "Function taking a music as input, producing a string. This function is called to determine the text to print on a tuplet bracket.") + (translator-property-description 'tupletInvisible boolean? " If set to true, tuplet bracket creation is switched off entirely. This has the same effect as setting both diff --git a/stepmake/configure b/stepmake/configure index d8d6046c95..0655a4f84e 100755 --- a/stepmake/configure +++ b/stepmake/configure @@ -1109,6 +1109,7 @@ fi ZIP="zip -r -9" # program_suffix=.exe # urg + # ROOTSEP=':' # DIRSEP='\\' # PATHSEP=';' # @@ -1131,10 +1132,12 @@ fi # this way, you may have buildscripts/out/lilypond-profile # 'automatically' sourced from /usr/etc/profile.d/ too. # + ROOTSEP=':' DIRSEP='/' PATHSEP=':' INSTALL="\$(SHELL) \$(stepdir)/../bin/install-dot-exe.sh -c" else + ROOTSEP='/' DIRSEP='/' PATHSEP=':' LN=ln @@ -1214,7 +1217,7 @@ fi echo $ac_n "checking language""... $ac_c" 1>&6 -echo "configure:1218: checking language" >&5 +echo "configure:1221: checking language" >&5 case "$language" in En* | en* | Am* | am* | US* | us*) lang=English;; @@ -1249,7 +1252,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1253: checking for $ac_word" >&5 +echo "configure:1256: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MAKEINFO'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else