Generated by hanwen@cs.uu.nl, From = lilypond-1.4.3, To = lilypond-1.4.4 usage cd lilypond-source-dir; patch -E -p1 < lilypond-1.4.4.diff Patches do not contain automatically generated files or (urg) empty directories, i.e., you should rerun autoconf, configure diff -urN ../lilypond-1.4.3/CHANGES ./CHANGES --- ../lilypond-1.4.3/CHANGES Wed Jun 13 17:39:22 2001 +++ ./CHANGES Wed Jun 27 10:17:13 2001 @@ -1,3 +1,22 @@ + + +1.4.3.jcn2 +========== + +* Included documentatioon and post-flex lexer.cc patch for +Debian/unstable gcc-3.0. + +* Enhanced gcc autoconf and make messages. + +* Added -mieee to CFLAGS for alpha. + +* Fixed help and documentation of new LilyPond command line. + +* Redirected SuSE download to ftp.lilypond.org (where mirror script runs). + +1.4.3 +===== + 1.4.2.jcn4 ========== diff -urN ../lilypond-1.4.3/Documentation/topdocs/INSTALL.texi ./Documentation/topdocs/INSTALL.texi --- ../lilypond-1.4.3/Documentation/topdocs/INSTALL.texi Sat Jun 9 14:33:18 2001 +++ ./Documentation/topdocs/INSTALL.texi Wed Jun 27 10:16:36 2001 @@ -34,6 +34,8 @@ If you want to compile LilyPond from source, download here: @itemize @bullet @item Download development releases from +@c Hmm, these won't show up in lilypond.org/stats +@c Otoh, lilypond.org is not updated when release mail arrives @uref{ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/} by FTP and @uref{http://ftp.cs.uu.nl/pub/GNU/LilyPond/}, by HTTP. @item @uref{ftp://sca.uwaterloo.ca/pub/} by FTP (Canadian mirror) @@ -308,12 +310,12 @@ @uref{ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/binaries/}. You can also compile them yourself. A spec file is in -@file{make/out/redhat.spec}. This file is distributed along with the -sources. You can make the rpm by issuing +@file{make/out/lilypond.redhat.spec}. This file is distributed along +with the sources. You can make the rpm by issuing @example tar xfz lilypond-x.y.z.tar.gz - rpm -bb lilypond-x.y.z/make/out/redhat.spec + rpm -bb lilypond-x.y.z/make/out/lilypond.redhat.spec rpm -i /usr/src/redhat/RPMS/i386/lilypond-x.y.z @end example @@ -340,16 +342,16 @@ Some LinuxPPC RPMS should available from @uref{ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/binaries/}. -A LinuxPPC RPM can be made using the @file{redhat.spec} file. +A LinuxPPC RPM can be made using the @file{lilypond.redhat.spec} file. @subsection SuSE Some SUSE RPMS should available from -@uref{ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/binaries/}. +@uref{ftp://ftp.lilypond.org/pub/LilyPond/binaries/SuSE}. You can also compile a RPM for SUSE yourself. A spec file is in -@file{make/out/suse.spec}, see the instructions for building the Red Hat -RPM. +@file{make/out/lilypond.suse.spec}, see the instructions for building +the Red Hat RPM. You must have the following packages: guile tcsh tetex te_latex te_kpath te_mpost libpng python gpp libgpp gettext autoconf netpbm libnetpb @@ -493,6 +495,17 @@ @email{bug-gnu-music@@gnu.org}. Bugs that are not fault of LilyPond are documented here. + +@unnumberedsubsec Debian GNU/Linux unstable gcc-3.0 + +Flex (2.5.4a-11) in unstable does not produce g++-3.0 compliant C++ +code. To compile LilyPond with gcc-3.0 you may do: +@example + CC=gcc-3.0 CXX=g++-3.0 ./configure + make conf=gcc-3.0 -C lily out-gcc-3.0/lexer.cc + patch -p1 < lexer-gcc-3.0.patch + make conf=gcc-3.0 -C lily +@end example @unnumberedsubsec NetBSD diff -urN ../lilypond-1.4.3/Documentation/user/invoking.itexi ./Documentation/user/invoking.itexi --- ../lilypond-1.4.3/Documentation/user/invoking.itexi Fri May 18 17:40:57 2001 +++ ./Documentation/user/invoking.itexi Mon Jun 18 11:04:05 2001 @@ -9,8 +9,10 @@ Usage: @example - lilypond [@var{OPTION}@dots{} [@var{FILE}]@dots{} + lilypond [@var{OPTION}@dots{} @var{FILE}@dots{} @end example + +To have LilyPond read from stdin, use a dash @code{-} for @var{FILE}. @unnumberedsec Options diff -urN ../lilypond-1.4.3/VERSION ./VERSION --- ../lilypond-1.4.3/VERSION Wed Jun 13 23:13:52 2001 +++ ./VERSION Wed Jun 27 12:56:14 2001 @@ -1,7 +1,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=4 -PATCH_LEVEL=3 +PATCH_LEVEL=4 MY_PATCH_LEVEL= # use the above to send patches: MY_PATCH_LEVEL is always empty for a diff -urN ../lilypond-1.4.3/aclocal.m4 ./aclocal.m4 --- ../lilypond-1.4.3/aclocal.m4 Mon May 14 18:00:51 2001 +++ ./aclocal.m4 Wed Jun 27 10:16:36 2001 @@ -1,5 +1,3 @@ -dnl WARNING WARNING WARNING WARNING -dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4 dnl aclocal.m4 -*-shell-script-*- dnl StepMake subroutines for configure.in @@ -65,6 +63,19 @@ CFLAGS="$CFLAGS $OPTIMIZE" CPPFLAGS=${CPPFLAGS:-""} + + AC_MSG_CHECKING([for IEEE-conformance compiler flags]) + save_cflags="$CFLAGS" + case "$host" in + alpha*-*-*) + dnl should do compile test? + AC_MSG_RESULT(-mieee) + CFLAGS="-mieee $CFLAGS" + ;; + *) + AC_MSG_RESULT([none]) + ;; + esac AC_SUBST(cross_compiling) AC_SUBST(CFLAGS) AC_SUBST(CPPFLAGS) @@ -146,16 +157,19 @@ ]) AC_DEFUN(AC_STEPMAKE_GXX, [ - # ugh autoconf - # urg, egcs: how to check for egcs >= 1.1? + AC_MSG_CHECKING("g++ version") + cxx_version=`$CXX --version` + AC_MSG_RESULT("$cxx_version") changequote(<<, >>)dnl - if $CXX --version | egrep '2\.[89]' > /dev/null || - $CXX --version | grep 'egcs' > /dev/null + # urg, egcs: how to check for egcs >= 1.1? + if expr "$cxx_version" : '.*2\.[89]' > /dev/null || + expr "$cxx_version" : '.*egcs' > /dev/null || + expr "$cxx_version" : '3\.0' > /dev/null changequote([, ])dnl then true else - AC_STEPMAKE_WARN(can\'t find g++ 2.8, 2.9 or egcs 1.1) + AC_STEPMAKE_WARN(can\'t find g++ 2.8, 2.9, 3.0 or egcs 1.1) fi ]) @@ -314,8 +328,9 @@ AC_ARG_ENABLE(config, [ --enable-config=CONF put settings in config-CONF.make and config-CONF.h; do \`make conf=CONF' to get output in ./out-CONF], - [CONFIGSUFFIX=-$enableval]) + [CONFIGURATION=$enableval]) + test -n "$CONFIGURATION" && CONFIGSUFFIX="-$CONFIGURATION" CONFIGFILE=config$CONFIGSUFFIX AC_SUBST(CONFIGSUFFIX) diff -urN ../lilypond-1.4.3/configure.in ./configure.in --- ../lilypond-1.4.3/configure.in Mon May 14 00:35:28 2001 +++ ./configure.in Wed Jun 27 10:16:36 2001 @@ -51,12 +51,14 @@ AC_STEPMAKE_END +test -n "$CONFIGURATION" && mc=" conf=$CONFIGURATION" || mc="" + cat <get_next_arg (); if (!arg) - usage (); + { + usage (); + /* No FILE arguments is now a usage error */ + exit (2); + } else do { @@ -383,8 +387,6 @@ output_name_global = save_output_name_global; p++; - - oparser_p_static->get_next_arg (); } while ((arg = oparser_p_static->get_next_arg ())); delete oparser_p_static; oparser_p_static = 0; diff -urN ../lilypond-1.4.3/po/de.po ./po/de.po --- ../lilypond-1.4.3/po/de.po Fri May 18 17:40:58 2001 +++ ./po/de.po Mon Jun 18 11:04:05 2001 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Lilypond 1.2.8\n" -"POT-Creation-Date: 2001-05-18 15:48+0200\n" +"POT-Creation-Date: 2001-06-14 13:22+0200\n" "PO-Revision-Date: 1999-09-18 01:30+0200\n" "Last-Translator: Erwin Dieterich \n" "Language-Team: LANGUAGE \n" @@ -22,7 +22,7 @@ msgid "warning: " msgstr "Warnung: " -#: input.cc:90 ly2dvi.py:205 ly2dvi.py:830 mup2ly.py:98 mup2ly.py:188 +#: input.cc:90 ly2dvi.py:205 ly2dvi.py:804 mup2ly.py:98 mup2ly.py:188 #: update-lily.py:123 update-lily.py:211 warn.cc:9 warn.cc:17 msgid "error: " msgstr "Fehler: " @@ -136,7 +136,7 @@ msgid "show warranty and copyright" msgstr "Zeige Garantie und Urheberrechte" -#: ly2dvi.py:383 ly2dvi.py:604 ly2dvi.py:629 +#: ly2dvi.py:383 ly2dvi.py:578 ly2dvi.py:603 #, fuzzy, c-format msgid "Running %s..." msgstr "Uralt-Bitte: `%s'" @@ -156,23 +156,23 @@ msgid "invalid value: %s" msgstr "Ungültiger Buchstabe `%c'" -#: ly2dvi.py:807 scores.cc:44 +#: ly2dvi.py:781 scores.cc:44 #, fuzzy, c-format msgid "dependencies output to `%s'..." msgstr "Ausgabe auf Papier auf %s..." -#: ly2dvi.py:817 +#: ly2dvi.py:791 #, fuzzy, c-format msgid "%s output to `%s'..." msgstr "MIDI-Ausgabe nach %s..." -#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:819 +#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:793 #: midi-score-parser.cc:24 scores.cc:136 scores.cc:142 #, c-format msgid "can't find file: `%s'" msgstr "Kann Datei `%s' nicht finden" -#: ly2dvi.py:830 +#: ly2dvi.py:804 msgid "no files specified on command line." msgstr "" @@ -493,7 +493,7 @@ msgid "invalid inversion pitch: not part of chord: %s" msgstr "Unerlaubter Baßton: gehört nicht zum Akkord: %s" -#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:193 +#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:192 #, fuzzy msgid "unterminated chord tremolo" msgstr "Unbeendeter Bindestrich" @@ -667,8 +667,8 @@ #. No version number or newline here. It confuses help2man #. #: main.cc:136 -#, c-format -msgid "Usage: %s [OPTION]... [FILE]..." +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... FILE..." msgstr "Benutzung: %s [OPTIONEN] ... [DATEI] ..." #: main.cc:138 @@ -859,7 +859,7 @@ msgid "none of these in my family: `%s'" msgstr "" -#: percent-repeat-engraver.cc:118 +#: percent-repeat-engraver.cc:117 #, fuzzy msgid "Don't know how to handle a percent repeat of this length." msgstr "Weiß nicht, wie ich eine fehlende Tonart behandeln soll" diff -urN ../lilypond-1.4.3/po/fr.po ./po/fr.po --- ../lilypond-1.4.3/po/fr.po Fri May 18 17:40:58 2001 +++ ./po/fr.po Mon Jun 18 11:04:05 2001 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: lilypond 1.3.18\n" -"POT-Creation-Date: 2001-05-18 15:48+0200\n" +"POT-Creation-Date: 2001-06-14 13:22+0200\n" "PO-Revision-Date: 1999-12-28 00:32 +1\n" "Last-Translator: Laurent Martelli \n" "Language-Team: \n" @@ -21,7 +21,7 @@ msgid "warning: " msgstr "avertissement: " -#: input.cc:90 ly2dvi.py:205 ly2dvi.py:830 mup2ly.py:98 mup2ly.py:188 +#: input.cc:90 ly2dvi.py:205 ly2dvi.py:804 mup2ly.py:98 mup2ly.py:188 #: update-lily.py:123 update-lily.py:211 warn.cc:9 warn.cc:17 msgid "error: " msgstr "erreur: " @@ -132,7 +132,7 @@ msgid "show warranty and copyright" msgstr "" -#: ly2dvi.py:383 ly2dvi.py:604 ly2dvi.py:629 +#: ly2dvi.py:383 ly2dvi.py:578 ly2dvi.py:603 #, fuzzy, c-format msgid "Running %s..." msgstr "Cration des voix..." @@ -152,23 +152,23 @@ msgid "invalid value: %s" msgstr "caractres illgal: `%c'" -#: ly2dvi.py:807 scores.cc:44 +#: ly2dvi.py:781 scores.cc:44 #, fuzzy, c-format msgid "dependencies output to `%s'..." msgstr "Sortie papier vers %s..." -#: ly2dvi.py:817 +#: ly2dvi.py:791 #, fuzzy, c-format msgid "%s output to `%s'..." msgstr "Sortie de Lily vers %s..." -#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:819 +#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:793 #: midi-score-parser.cc:24 scores.cc:136 scores.cc:142 #, c-format msgid "can't find file: `%s'" msgstr "ne peut pas trouver le fichier: `%s'" -#: ly2dvi.py:830 +#: ly2dvi.py:804 msgid "no files specified on command line." msgstr "" @@ -489,7 +489,7 @@ msgid "invalid inversion pitch: not part of chord: %s" msgstr "renversement invalide: ne fait pas partie de l'accord: %s" -#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:193 +#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:192 msgid "unterminated chord tremolo" msgstr "" @@ -660,8 +660,8 @@ #. No version number or newline here. It confuses help2man #. #: main.cc:136 -#, c-format -msgid "Usage: %s [OPTION]... [FILE]..." +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... FILE..." msgstr "Usage: %s [OPTION]... [FICHIER]..." #: main.cc:138 @@ -833,7 +833,7 @@ msgid "none of these in my family: `%s'" msgstr "" -#: percent-repeat-engraver.cc:118 +#: percent-repeat-engraver.cc:117 #, fuzzy msgid "Don't know how to handle a percent repeat of this length." msgstr "ne sait pas traiter les cls vides" diff -urN ../lilypond-1.4.3/po/it.po ./po/it.po --- ../lilypond-1.4.3/po/it.po Fri May 18 17:40:58 2001 +++ ./po/it.po Mon Jun 18 11:04:05 2001 @@ -5,7 +5,7 @@ #, fuzzy msgid "" msgstr "" -"POT-Creation-Date: 2001-05-18 15:48+0200\n" +"POT-Creation-Date: 2001-06-14 13:22+0200\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Date: 1998-05-30 00:17:12+0200\n" "From: \n" @@ -22,7 +22,7 @@ msgid "warning: " msgstr "attenzione: " -#: input.cc:90 ly2dvi.py:205 ly2dvi.py:830 mup2ly.py:98 mup2ly.py:188 +#: input.cc:90 ly2dvi.py:205 ly2dvi.py:804 mup2ly.py:98 mup2ly.py:188 #: update-lily.py:123 update-lily.py:211 warn.cc:9 warn.cc:17 msgid "error: " msgstr "errore: " @@ -137,7 +137,7 @@ msgid "show warranty and copyright" msgstr " -w, --warranty mostra la garanzia e il copyright\n" -#: ly2dvi.py:383 ly2dvi.py:604 ly2dvi.py:629 +#: ly2dvi.py:383 ly2dvi.py:578 ly2dvi.py:603 #, fuzzy, c-format msgid "Running %s..." msgstr "Genero le voci..." @@ -157,23 +157,23 @@ msgid "invalid value: %s" msgstr "carattere illegale: `%c'" -#: ly2dvi.py:807 scores.cc:44 +#: ly2dvi.py:781 scores.cc:44 #, fuzzy, c-format msgid "dependencies output to `%s'..." msgstr "L'output stampato è inviato a %s..." -#: ly2dvi.py:817 +#: ly2dvi.py:791 #, fuzzy, c-format msgid "%s output to `%s'..." msgstr "L'output MIDI è inviato a %s..." -#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:819 +#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:793 #: midi-score-parser.cc:24 scores.cc:136 scores.cc:142 #, c-format msgid "can't find file: `%s'" msgstr "non trovo il file: `%s'" -#: ly2dvi.py:830 +#: ly2dvi.py:804 msgid "no files specified on command line." msgstr "" @@ -489,7 +489,7 @@ msgid "invalid inversion pitch: not part of chord: %s" msgstr "" -#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:193 +#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:192 #, fuzzy msgid "unterminated chord tremolo" msgstr "beam non terminato" @@ -664,8 +664,8 @@ #. No version number or newline here. It confuses help2man #. #: main.cc:136 -#, c-format -msgid "Usage: %s [OPTION]... [FILE]..." +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... FILE..." msgstr "Uso: %s [OPZIONE]... [FILE]..." #: main.cc:138 @@ -851,7 +851,7 @@ msgid "none of these in my family: `%s'" msgstr "" -#: percent-repeat-engraver.cc:118 +#: percent-repeat-engraver.cc:117 #, fuzzy msgid "Don't know how to handle a percent repeat of this length." msgstr "non so manipolare tasti vuoti" diff -urN ../lilypond-1.4.3/po/ja.po ./po/ja.po --- ../lilypond-1.4.3/po/ja.po Fri May 18 17:40:58 2001 +++ ./po/ja.po Mon Jun 18 11:04:05 2001 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: lilypond 1.2.17\n" -"POT-Creation-Date: 2001-05-18 15:48+0200\n" +"POT-Creation-Date: 2001-06-14 13:22+0200\n" "PO-Revision-Date: 2000-03-29 20:50+0900\n" "Last-Translator: Daisuke Yamashita \n" "Language-Team: Japanese \n" @@ -22,7 +22,7 @@ msgid "warning: " msgstr "·Ù¹ð: " -#: input.cc:90 ly2dvi.py:205 ly2dvi.py:830 mup2ly.py:98 mup2ly.py:188 +#: input.cc:90 ly2dvi.py:205 ly2dvi.py:804 mup2ly.py:98 mup2ly.py:188 #: update-lily.py:123 update-lily.py:211 warn.cc:9 warn.cc:17 msgid "error: " msgstr "¥¨¥é¡¼: " @@ -135,7 +135,7 @@ msgid "show warranty and copyright" msgstr "ÊݾڤÈÃøºî¸¢¤Ë¤Ä¤¤¤Æɽ¼¨¤¹¤ë" -#: ly2dvi.py:383 ly2dvi.py:604 ly2dvi.py:629 +#: ly2dvi.py:383 ly2dvi.py:578 ly2dvi.py:603 #, fuzzy, c-format msgid "Running %s..." msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'" @@ -155,23 +155,23 @@ msgid "invalid value: %s" msgstr "̵¸ú¤Êʸ»ú: `%c'" -#: ly2dvi.py:807 scores.cc:44 +#: ly2dvi.py:781 scores.cc:44 #, fuzzy, c-format msgid "dependencies output to `%s'..." msgstr "%s ¤Ø paper ½ÐÎÏ..." -#: ly2dvi.py:817 +#: ly2dvi.py:791 #, fuzzy, c-format msgid "%s output to `%s'..." msgstr "%s ¤Ø¤Î MIDI ½ÐÎÏ" -#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:819 +#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:793 #: midi-score-parser.cc:24 scores.cc:136 scores.cc:142 #, fuzzy, c-format msgid "can't find file: `%s'" msgstr "¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'" -#: ly2dvi.py:830 +#: ly2dvi.py:804 msgid "no files specified on command line." msgstr "" @@ -491,7 +491,7 @@ msgid "invalid inversion pitch: not part of chord: %s" msgstr "̵¸ú¤Êž²ó¥Ô¥Ã¥Á: ¥³¡¼¥É¤Î°ìÉô¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó: %s" -#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:193 +#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:192 #, fuzzy msgid "unterminated chord tremolo" msgstr "½ªÃ¼¤Î¤Ê¤¤¥Ï¥¤¥Õ¥ó" @@ -661,8 +661,8 @@ #. No version number or newline here. It confuses help2man #. #: main.cc:136 -#, c-format -msgid "Usage: %s [OPTION]... [FILE]..." +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... FILE..." msgstr "»È¤¤Êý: %s [¥ª¥×¥·¥ç¥ó]... [¥Õ¥¡¥¤¥ë]..." #: main.cc:138 @@ -869,7 +869,7 @@ msgid "none of these in my family: `%s'" msgstr "¥Õ¥¡¥ß¥ê¤ÎÃæ¤Ë¤¢¤ê¤Þ¤»¤ó" -#: percent-repeat-engraver.cc:118 +#: percent-repeat-engraver.cc:117 #, fuzzy msgid "Don't know how to handle a percent repeat of this length." msgstr "¶õ¤Î¥­¡¼¤Î°·¤¤Êý¤¬È½¤ê¤Þ¤»¤ó" diff -urN ../lilypond-1.4.3/po/lilypond.pot ./po/lilypond.pot --- ../lilypond-1.4.3/po/lilypond.pot Fri May 18 17:40:58 2001 +++ ./po/lilypond.pot Mon Jun 18 11:04:05 2001 @@ -6,13 +6,13 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2001-05-18 15:48+0200\n" +"POT-Creation-Date: 2001-06-14 13:22+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8-bit\n" +"Content-Transfer-Encoding: 8bit\n" #: ly2dvi.py:105 msgid "Generate .dvi with LaTeX for LilyPond" @@ -23,7 +23,7 @@ msgid "warning: " msgstr "" -#: input.cc:90 ly2dvi.py:205 ly2dvi.py:830 mup2ly.py:98 mup2ly.py:188 +#: input.cc:90 ly2dvi.py:205 ly2dvi.py:804 mup2ly.py:98 mup2ly.py:188 #: update-lily.py:123 update-lily.py:211 warn.cc:9 warn.cc:17 msgid "error: " msgstr "" @@ -131,7 +131,7 @@ msgid "show warranty and copyright" msgstr "" -#: ly2dvi.py:383 ly2dvi.py:604 ly2dvi.py:629 +#: ly2dvi.py:383 ly2dvi.py:578 ly2dvi.py:603 #, c-format msgid "Running %s..." msgstr "" @@ -151,23 +151,23 @@ msgid "invalid value: %s" msgstr "" -#: ly2dvi.py:807 scores.cc:44 +#: ly2dvi.py:781 scores.cc:44 #, c-format msgid "dependencies output to `%s'..." msgstr "" -#: ly2dvi.py:817 +#: ly2dvi.py:791 #, c-format msgid "%s output to `%s'..." msgstr "" -#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:819 +#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:793 #: midi-score-parser.cc:24 scores.cc:136 scores.cc:142 #, c-format msgid "can't find file: `%s'" msgstr "" -#: ly2dvi.py:830 +#: ly2dvi.py:804 msgid "no files specified on command line." msgstr "" @@ -477,7 +477,7 @@ msgid "invalid inversion pitch: not part of chord: %s" msgstr "" -#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:193 +#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:192 msgid "unterminated chord tremolo" msgstr "" @@ -639,7 +639,7 @@ #. #: main.cc:136 #, c-format -msgid "Usage: %s [OPTION]... [FILE]..." +msgid "Usage: %s [OPTION]... FILE..." msgstr "" #: main.cc:138 @@ -804,7 +804,7 @@ msgid "none of these in my family: `%s'" msgstr "" -#: percent-repeat-engraver.cc:118 +#: percent-repeat-engraver.cc:117 msgid "Don't know how to handle a percent repeat of this length." msgstr "" diff -urN ../lilypond-1.4.3/po/nl.po ./po/nl.po --- ../lilypond-1.4.3/po/nl.po Fri May 18 17:40:58 2001 +++ ./po/nl.po Mon Jun 18 11:04:06 2001 @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: lilypond 1.4.1\n" -"POT-Creation-Date: 2001-05-18 15:48+0200\n" +"POT-Creation-Date: 2001-06-14 13:22+0200\n" "PO-Revision-Date: 2001-05-09 23:29+0200\n" "Last-Translator: Jan Nieuwenhuizen \n" "Language-Team: Dutch \n" @@ -32,7 +32,7 @@ msgid "warning: " msgstr "waarschuwing: " -#: input.cc:90 ly2dvi.py:205 ly2dvi.py:830 mup2ly.py:98 mup2ly.py:188 +#: input.cc:90 ly2dvi.py:205 ly2dvi.py:804 mup2ly.py:98 mup2ly.py:188 #: update-lily.py:123 update-lily.py:211 warn.cc:9 warn.cc:17 msgid "error: " msgstr "fout: " @@ -142,7 +142,7 @@ msgid "show warranty and copyright" msgstr "toon garantie en auteursrechten" -#: ly2dvi.py:383 ly2dvi.py:604 ly2dvi.py:629 +#: ly2dvi.py:383 ly2dvi.py:578 ly2dvi.py:603 #, c-format msgid "Running %s..." msgstr "Uitvoeren %s..." @@ -162,23 +162,23 @@ msgid "invalid value: %s" msgstr "ongeldige waarde: %s" -#: ly2dvi.py:807 scores.cc:44 +#: ly2dvi.py:781 scores.cc:44 #, c-format msgid "dependencies output to `%s'..." msgstr "afhankelijkheden uitvoer naar %s..." -#: ly2dvi.py:817 +#: ly2dvi.py:791 #, c-format msgid "%s output to `%s'..." msgstr "%s uitvoer naar `%s'..." -#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:819 +#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:793 #: midi-score-parser.cc:24 scores.cc:136 scores.cc:142 #, c-format msgid "can't find file: `%s'" msgstr "kan bestand niet vinden: `%s'" -#: ly2dvi.py:830 +#: ly2dvi.py:804 msgid "no files specified on command line." msgstr "geen bestanden gespecificeerd op de commandoregel." @@ -490,7 +490,7 @@ msgid "invalid inversion pitch: not part of chord: %s" msgstr "ongeldige inversie toon: geen onderdeel van accoord: %s" -#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:193 +#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:192 msgid "unterminated chord tremolo" msgstr "onbeëindigd akkoordtremolo" @@ -654,8 +654,8 @@ #. #: main.cc:136 #, c-format -msgid "Usage: %s [OPTION]... [FILE]..." -msgstr "Gebruik: %s [OPTIE]... [BESTAND]..." +msgid "Usage: %s [OPTION]... FILE..." +msgstr "Gebruik: %s [OPTIE]... BESTAND..." #: main.cc:138 msgid "Typeset music and or play MIDI from FILE" @@ -839,7 +839,7 @@ msgid "none of these in my family: `%s'" msgstr "geen van deze in mijn gezin: `%s'" -#: percent-repeat-engraver.cc:118 +#: percent-repeat-engraver.cc:117 msgid "Don't know how to handle a percent repeat of this length." msgstr "Weet niet hoe procent herhaling van deze lengte af te handelen." @@ -1415,4 +1415,3 @@ #: midi-track-parser.cc:353 msgid "invalid track length" msgstr "ongeldige spoorlengte" - diff -urN ../lilypond-1.4.3/po/ru.po ./po/ru.po --- ../lilypond-1.4.3/po/ru.po Fri May 18 17:40:58 2001 +++ ./po/ru.po Mon Jun 18 11:04:06 2001 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2001-05-18 15:48+0200\n" +"POT-Creation-Date: 2001-06-14 13:22+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: August S.Sigov \n" "Language-Team: Russian \n" @@ -23,7 +23,7 @@ msgid "warning: " msgstr "ÐÒÅÄÕÐÒÅÖÄÁÀ: " -#: input.cc:90 ly2dvi.py:205 ly2dvi.py:830 mup2ly.py:98 mup2ly.py:188 +#: input.cc:90 ly2dvi.py:205 ly2dvi.py:804 mup2ly.py:98 mup2ly.py:188 #: update-lily.py:123 update-lily.py:211 warn.cc:9 warn.cc:17 msgid "error: " msgstr "ÏÛÉÂËÁ: " @@ -134,7 +134,7 @@ msgid "show warranty and copyright" msgstr "ÐÏËÁÚÁÔØ ÇÁÒÁÎÔÉÀ É copyright" -#: ly2dvi.py:383 ly2dvi.py:604 ly2dvi.py:629 +#: ly2dvi.py:383 ly2dvi.py:578 ly2dvi.py:603 #, fuzzy, c-format msgid "Running %s..." msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÍÕÚÙËÕ: `%s'" @@ -154,23 +154,23 @@ msgid "invalid value: %s" msgstr "ÎÅ×ÅÒÎÙÊ ÓÉÍ×ÏÌ: `%c'" -#: ly2dvi.py:807 scores.cc:44 +#: ly2dvi.py:781 scores.cc:44 #, fuzzy, c-format msgid "dependencies output to `%s'..." msgstr "\"ÂÕÍÁÖÎÙÊ\" ×Ù×ÏÄ × %s..." -#: ly2dvi.py:817 +#: ly2dvi.py:791 #, fuzzy, c-format msgid "%s output to `%s'..." msgstr "×Ù×ÏÄ MIDI × %s..." -#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:819 +#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:793 #: midi-score-parser.cc:24 scores.cc:136 scores.cc:142 #, c-format msgid "can't find file: `%s'" msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÆÁÊÌ: `%s'" -#: ly2dvi.py:830 +#: ly2dvi.py:804 msgid "no files specified on command line." msgstr "" @@ -482,7 +482,7 @@ msgid "invalid inversion pitch: not part of chord: %s" msgstr "" -#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:193 +#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:192 msgid "unterminated chord tremolo" msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ ÔÒÅÍÏÌÏ ÁËËÏÒÄÁ" @@ -647,8 +647,8 @@ #. No version number or newline here. It confuses help2man #. #: main.cc:136 -#, c-format -msgid "Usage: %s [OPTION]... [FILE]..." +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... FILE..." msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ïðãéñ]... [æáêì]..." #: main.cc:138 @@ -821,7 +821,7 @@ msgid "none of these in my family: `%s'" msgstr "ÏÎÉ ÍÎÅ ÎÅ ÒÏÄÓÔ×ÅÎÎÉËÉ" -#: percent-repeat-engraver.cc:118 +#: percent-repeat-engraver.cc:117 #, fuzzy msgid "Don't know how to handle a percent repeat of this length." msgstr "îÅ ÚÎÁÀ, ÞÔÏ ÄÅÌÁÔØ Ó ÐÕÓÔÙÍÉ ËÌÀÞÁÍÉ" diff -urN ../lilypond-1.4.3/scm/chord-name.scm ./scm/chord-name.scm --- ../lilypond-1.4.3/scm/chord-name.scm Mon May 7 22:54:58 2001 +++ ./scm/chord-name.scm Mon Jun 18 11:04:06 2001 @@ -218,6 +218,7 @@ * TODO: any uneven step that's lower than an uneven step which is chromatically altered " + (write-me "adds: " (let ((evens (filter-list (lambda (x) (!= 0 (modulo (cadr x) 2))) steps)) (altered-unevens (filter-list (lambda (x) @@ -235,13 +236,13 @@ '())))) ;; Hmm, what if we have a step twice, can we ignore that? (uniq-list (sort (apply append evens altered-unevens highest) - pitch::<)))) + pitch::<))))) ;; FIXME: unLOOP, see ::additions ;; find the pitches that are missing from `normal' chord (define (chord::subtractions chord-pitches) - (let ((tonic (car chord-pitches))) + (write-me "subs: " (let ((tonic (car chord-pitches))) (let loop ((step 1) (pitches chord-pitches) (subtractions '())) (if (pair? pitches) (let* ((pitch (car pitches)) @@ -264,7 +265,7 @@ (if (= p-step step) (loop (+ step 2) (cdr pitches) subtractions) (loop step (cdr pitches) subtractions))))) - (reverse subtractions))))) + (reverse subtractions)))))) (define (chord::additions->text-banter additions subtractions) (if (pair? additions) @@ -375,7 +376,7 @@ ;; return (MATCHED-EXCEPTION . BASE-CHORD-WITH-UNMATCHED-STEPS) ;; BASE-CHORD-WITH-UNMATCHED-STEPS always includes (tonic 3 5) (define (chord::exceptions-lookup style steps) - (let* ((result (chord::exceptions-lookup-helper + (write-me "xl: " (let* ((result (chord::exceptions-lookup-helper (chord::restyle 'chord::names-alist- style) steps '() #f)) (exception-part (car result)) @@ -390,7 +391,7 @@ ((= i 0) base) ()) unmatched-steps))) - (list exception-part unmatched-with-1-3-5))) + (list exception-part unmatched-with-1-3-5)))) (define (chord::name->text style tonic steps bass-and-inversion) diff -urN ../lilypond-1.4.3/scm/grob-property-description.scm ./scm/grob-property-description.scm --- ../lilypond-1.4.3/scm/grob-property-description.scm Wed Jun 13 16:29:19 2001 +++ ./scm/grob-property-description.scm Thu Jun 21 00:54:59 2001 @@ -101,7 +101,7 @@ (grob-property-description 'dash-period number? "the length of one dash + white space.") (grob-property-description 'dashed number? "[FIXME: use dash-period/dash length; see text-spanner] number representing the length of the dashes.") (grob-property-description 'de-uglify-parameters list? "list of 3 real constants. They define the valid areas for the middle control points. Used in de_uglyfy. They are a bit empirical.") -(grob-property-description 'default-neutral-direction dir? "Where to go if we're in the middle of the staff.") +(grob-property-description 'neutral-direction dir? "Where to go if we're in the middle of the staff.") (grob-property-description 'delta-y number? "amount of ascension.") (grob-property-description 'dependencies list? "list of score-grob pointers that indicate who to compute first for certain global passes.") (grob-property-description 'details list? "alist of parameters for detailed grob behavior.") diff -urN ../lilypond-1.4.3/scm/interface-description.scm ./scm/interface-description.scm --- ../lilypond-1.4.3/scm/interface-description.scm Sun May 6 03:10:11 2001 +++ ./scm/interface-description.scm Thu Jun 21 00:55:07 2001 @@ -75,7 +75,7 @@ height flag-width-function damping - default-neutral-direction + neutral-direction thickness space-function beamed-stem-shorten @@ -129,7 +129,7 @@ stem-shorten duration-log beaming - default-neutral-direction + neutral-direction stem-end-position support-head heads diff -urN ../lilypond-1.4.3/scripts/lilypond-book.py ./scripts/lilypond-book.py --- ../lilypond-1.4.3/scripts/lilypond-book.py Tue Jun 12 10:31:28 2001 +++ ./scripts/lilypond-book.py Thu Jun 14 13:01:30 2001 @@ -986,9 +986,13 @@ if do_deps: depfiles=map (lambda x: re.sub ('(.*)\.ly', '\\1.dep', x), tex) for i in depfiles: - text=open (i).read () + f =open (i) + text=f.read () + f.close () text=re.sub ('\n([^:\n]*):', '\n' + foutn + ':', text) - open (i, 'w').write (text) + f = open (i, 'w') + f.write (text) + f.close () for e in eps: system(r"tex '\nonstopmode \input %s'" % e) diff -urN ../lilypond-1.4.3/stepmake/aclocal.m4 ./stepmake/aclocal.m4 --- ../lilypond-1.4.3/stepmake/aclocal.m4 Mon May 14 18:00:51 2001 +++ ./stepmake/aclocal.m4 Wed Jun 27 10:16:36 2001 @@ -63,6 +63,19 @@ CFLAGS="$CFLAGS $OPTIMIZE" CPPFLAGS=${CPPFLAGS:-""} + + AC_MSG_CHECKING([for IEEE-conformance compiler flags]) + save_cflags="$CFLAGS" + case "$host" in + alpha*-*-*) + dnl should do compile test? + AC_MSG_RESULT(-mieee) + CFLAGS="-mieee $CFLAGS" + ;; + *) + AC_MSG_RESULT([none]) + ;; + esac AC_SUBST(cross_compiling) AC_SUBST(CFLAGS) AC_SUBST(CPPFLAGS) @@ -144,16 +157,19 @@ ]) AC_DEFUN(AC_STEPMAKE_GXX, [ - # ugh autoconf - # urg, egcs: how to check for egcs >= 1.1? + AC_MSG_CHECKING("g++ version") + cxx_version=`$CXX --version` + AC_MSG_RESULT("$cxx_version") changequote(<<, >>)dnl - if $CXX --version | egrep '2\.[89]' > /dev/null || - $CXX --version | grep 'egcs' > /dev/null + # urg, egcs: how to check for egcs >= 1.1? + if expr "$cxx_version" : '.*2\.[89]' > /dev/null || + expr "$cxx_version" : '.*egcs' > /dev/null || + expr "$cxx_version" : '3\.0' > /dev/null changequote([, ])dnl then true else - AC_STEPMAKE_WARN(can\'t find g++ 2.8, 2.9 or egcs 1.1) + AC_STEPMAKE_WARN(can\'t find g++ 2.8, 2.9, 3.0 or egcs 1.1) fi ]) @@ -312,8 +328,9 @@ AC_ARG_ENABLE(config, [ --enable-config=CONF put settings in config-CONF.make and config-CONF.h; do \`make conf=CONF' to get output in ./out-CONF], - [CONFIGSUFFIX=-$enableval]) + [CONFIGURATION=$enableval]) + test -n "$CONFIGURATION" && CONFIGSUFFIX="-$CONFIGURATION" CONFIGFILE=config$CONFIGSUFFIX AC_SUBST(CONFIGSUFFIX)