From 51960b3e828530e93c4047787e12bfa4e48549db Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Wed, 22 Aug 2001 12:29:23 +0200 Subject: [PATCH] release: 1.4.7 ========== * Change gnu-music to lilypond in email adresses. * Neutral direction down * Redhat Xdvi fix * Bugfix in stem interface description * Bugfix: don't crash on lost TFM fonts. * Junk hash-table-* * Syntax fixes for midi2ly. 1.4.6.j --- CHANGES | 35 +++- Documentation/footer.html.in | 4 +- Documentation/header.html.in | 23 +-- Documentation/index.texi | 20 +-- Documentation/topdocs/FAQ.texi | 8 +- Documentation/topdocs/INSTALL.texi | 13 +- Documentation/topdocs/README.texi | 22 ++- Documentation/topdocs/index.tely | 21 +++ Documentation/user/bugs.itexi | 2 +- Documentation/user/convert-ly.itexi | 2 +- Documentation/user/converters.itely | 14 +- Documentation/user/ly2dvi.itexi | 2 +- Documentation/user/refman.itely | 6 +- FAQ.txt | 9 +- INSTALL.txt | 14 +- README.txt | 25 ++- VERSION | 4 +- flower/hash.cc | 57 ------- flower/include/dictionary-iter.hh | 2 - flower/include/dictionary.hh | 4 +- flower/include/hash-table-iter.hh | 61 ------- flower/include/hash-table.hh | 216 ------------------------- input/test/trills.ly | 63 +++++++- lily/kpath.cc | 5 +- lily/main.cc | 2 +- lily/musical-request.cc | 3 +- lily/piano-pedal-performer.cc | 3 +- ly/engraver.ly | 2 + ly/script.ly | 6 + make/out/lilypond.lsm | 8 +- make/out/lilypond.redhat.spec | 4 +- make/out/lilypond.suse.spec | 4 +- mf/feta-generic.mf | 8 +- mf/feta-schrift.mf | 37 ++++- mf/feta-slag.mf | 62 ++++++- midi2ly/lilypond-item.cc | 2 +- midi2ly/lilypond-stream.cc | 2 +- midi2ly/main.cc | 2 +- po/de.po | 228 ++++++++++++-------------- po/fr.po | 232 +++++++++++++------------- po/it.po | 230 ++++++++++++-------------- po/ja.po | 230 ++++++++++++-------------- po/lilypond.pot | 214 ++++++++++++------------ po/nl.po | 241 +++++++++++++--------------- po/ru.po | 222 ++++++++++++------------- ps/music-drawing-routines.ps | 2 + scm/grob-description.scm | 4 +- scm/interface-description.scm | 2 +- scm/script.scm | 6 + scripts/convert-ly.py | 2 +- scripts/etf2ly.py | 2 +- scripts/lilypond-book.py | 2 +- scripts/ly2dvi.py | 11 +- scripts/mup2ly.py | 2 +- scripts/musedata2ly.py | 2 +- scripts/pmx2ly.py | 2 +- scripts/update-lily.py | 2 +- tex/lily-ps-defs.tex | 2 +- 58 files changed, 1088 insertions(+), 1327 deletions(-) delete mode 100644 flower/hash.cc delete mode 100644 flower/include/hash-table-iter.hh delete mode 100644 flower/include/hash-table.hh diff --git a/CHANGES b/CHANGES index 062b9ff2cd..8f6bd248ce 100644 --- a/CHANGES +++ b/CHANGES @@ -1,9 +1,40 @@ -1.4.6.jcn2 +1.4.6.hwn1 ========== -* Fixes for PostScript beams and stems. +* Change gnu-music to lilypond in email adresses. + +* Neutral direction down + +* Redhat Xdvi fix + +* Bugfix in stem interface description + +* Bugfix: don't crash on lost TFM fonts. +* Junk hash-table-* + +* Syntax fixes for midi2ly. + +1.4.6.jcn1 +========== + +* Fixes for PostScript beams and stems. + * Use Cygwin included Python; drop Windows Python and workarounds. + +1.4.6.mb1 +========= + +* Allow for duplicated articulation scripts with different direction. + +* Added new ornaments: \upmordent, \downmordent, \pralldown, \prallup, + \lineprall, \thumb, \comma (to be used with scriptHorizontal = ##t), + see also input/test/trill.ly. [WARNING: FONT UPDATE!] + +* Bug fix: staccato dot placement. + +* Handle keys with double flats/sharps better. + 1.4.6 ===== diff --git a/Documentation/footer.html.in b/Documentation/footer.html.in index d71ff8d1ad..8a96551d0c 100644 --- a/Documentation/footer.html.in +++ b/Documentation/footer.html.in @@ -19,8 +19,8 @@ Go back to index of LilyPond.

Please send GNU LilyPond questions and comments to - -gnu-music-discuss@gnu.org. + +lilypond-user@gnu.org.

Please send comments on these web pages to diff --git a/Documentation/header.html.in b/Documentation/header.html.in index 0771ca05f4..d158a91a0c 100644 --- a/Documentation/header.html.in +++ b/Documentation/header.html.in @@ -22,17 +22,17 @@ which substitutes some @AT_VARIABLES@ as well. - - -
+ [icon] +

GNU LilyPond

Welcome to the home of the GNU Music Typesetter
+ - +
@@ -68,18 +68,21 @@ which substitutes some @AT_VARIABLES@ as well.
About the lists
- Discussion
- Help
- Bugs
- Announcements
+ LilyPond users
+ Development
+ Bugs
+ Announcements

Sites
External sites
- Website
+ Development version
+ Stable version
WikiWiki
FTP site
+ Mutopia archive
+
- 		+ diff --git a/Documentation/index.texi b/Documentation/index.texi index d67c4ef2fd..0f056f388f 100644 --- a/Documentation/index.texi +++ b/Documentation/index.texi @@ -191,28 +191,28 @@ Frequently Asked Questions} first. @itemize @bullet -@item @uref{http://mail.gnu.org/mailman/listinfo/gnu-music-discuss,gnu-music-discuss@@gnu.org} -This list is for discussions concerning LilyPond. +@item @uref{http://mail.gnu.org/mailman/listinfo/lilypond-devel,lilypond-devel@@gnu.org} +This list is for discussions concerning LilyPond development. Searchable archives are available from -@uref{http://www.mail-archive.com/gnu-music-discuss@@gnu.org}. +@uref{http://www.mail-archive.com/lilypond-devel@@gnu.org}. -@item @uref{http://mail.gnu.org/mailman/listinfo/info-gnu-music,info-gnu-music@@gnu.org} +@item @uref{http://mail.gnu.org/mailman/listinfo/info-lilypond,info-lilypond@@gnu.org} is a low-volume list for information on the GNU Music project. This list is moderated; ask @email{drl@@gnu.org, David R. Linn} or @email{hanwen@@cs.uu.nl, Han-Wen} to send announcements for this list. Searchable archives are available from -@uref{http://www.mail-archive.com/info-gnu-music@@gnu.org}. +@uref{http://www.mail-archive.com/info-lilypond@@gnu.org}. -@item @uref{http://mail.gnu.org/mailman/listinfo/help-gnu-music,help-gnu-music@@gnu.org} - For help with using LilyPond. +@item @uref{http://mail.gnu.org/mailman/listinfo/lilypond-user,lilypond-user@@gnu.org} + For everyday use of LilyPond, in particular the stable (1.4) series. Searchable archives are available from -@uref{http://www.mail-archive.com/help-gnu-music@@gnu.org}. +@uref{http://www.mail-archive.com/lilypond-user@@gnu.org}. -@item @uref{http://mail.gnu.org/mailman/listinfo/bug-gnu-music,bug-gnu-music@@gnu.org} +@item @uref{http://mail.gnu.org/mailman/listinfo/bug-lilypond,bug-lilypond@@gnu.org} If you have bugreports, you should send them to this list. @@ -223,7 +223,7 @@ they tend to be very big and don't help with describing the problem. Searchable archives are available from -@uref{http://www.mail-archive.com/bug-gnu-music@@gnu.org}. +@uref{http://www.mail-archive.com/bug-lilypond@@gnu.org}. @end itemize diff --git a/Documentation/topdocs/FAQ.texi b/Documentation/topdocs/FAQ.texi index 257fccc37d..fd329126b5 100644 --- a/Documentation/topdocs/FAQ.texi +++ b/Documentation/topdocs/FAQ.texi @@ -24,11 +24,11 @@ FAQs}. Also, please look in the searchable mailinglist archives: @itemize @bullet @item -@uref{http://www.mail-archive.com/help-gnu-music@@gnu.org,help-gnu-music} +@uref{http://www.mail-archive.com/lilypond-user@@gnu.org,lilypond-user} @item -@uref{http://www.mail-archive.com/bug-gnu-music@@gnu.org,bug-gnu-music} +@uref{http://www.mail-archive.com/bug-lilypond@@gnu.org,bug-lilypond} @item -@uref{http://www.mail-archive.com/gnu-music-discuss@@gnu.org,gnu-music-discuss} +@uref{http://www.mail-archive.com/lilypond-devel@@gnu.org,lilypond-devel} @end itemize If you are still at loss, send your questions to the @strong{mailing @@ -58,7 +58,7 @@ yourself: @end example -@subsection I downloaded the windows32 port, and it doesn't match the website! +i@subsection I downloaded the windows32 port, and it doesn't match the website! The website is usually made from the latest snapshots. Binary releases, in particular the windows32 binaries, are only made every once in a while. diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi index 6bdfb552b6..f4099dd970 100644 --- a/Documentation/topdocs/INSTALL.texi +++ b/Documentation/topdocs/INSTALL.texi @@ -329,12 +329,6 @@ guile-devel, flex, bison, texinfo, tetex-devel, groff, libgr-progs. -@b{Warning} - -There appears to be a problem with the Xdvi shipped with Red Hat 7.1. -Symptoms: Xdvi responds very sluggishly or hangs while viewing -lilypond output. The cause for this problem is unknown; you are advised -to recompile Xdvi from source. @subsection LinuxPPC @@ -489,10 +483,9 @@ interfere with your build, you may want to do this before the build too: @section Problems -For help and questions use @email{help-gnu-music@@gnu.org} and -@email{gnu-music-discuss@@gnu.org}. Please consult the FAQ before -mailing your problems. If you find bugs, please send bug reports to -@email{bug-gnu-music@@gnu.org}. +For help and questions use @email{lilypond-user@@gnu.org}. Please +consult the FAQ before mailing your problems. If you find bugs, please +send bug reports to @email{bug-lilypond@@gnu.org}. Bugs that are not fault of LilyPond are documented here. diff --git a/Documentation/topdocs/README.texi b/Documentation/topdocs/README.texi index a9160cdb0d..5c1f530baf 100644 --- a/Documentation/topdocs/README.texi +++ b/Documentation/topdocs/README.texi @@ -64,20 +64,17 @@ criticism, comments, bugreports, patches, etc., to the mailing list, We have the following mailing lists: @itemize @bullet -@item @uref{http://mail.gnu.org/mailman/listinfo/info-gnu-music,info-gnu-music@@gnu.org} +@item @uref{http://mail.gnu.org/mailman/listinfo/info-lilypond,info-lilypond@@gnu.org} is a low-volume list for information on the GNU Music project. This list is moderated; ask @email{drl@@gnu.org, David R. Linn} or - @email{hanwen@@cs.uu.nl, Han-Wen} to send announcements for this -list. + @email{hanwen@@cs.uu.nl, Han-Wen} to send announcements for this list. @item -@uref{http://mail.gnu.org/mailman/listinfo/gnu-music-discuss,gnu-music-discuss@@gnu.org} - For general discussions concerning LilyPond. +@uref{http://mail.gnu.org/mailman/listinfo/lilypond-user,lilypond-user@@gnu.org} + For general discussions about using LilyPond. -@item @uref{http://mail.gnu.org/mailman/listinfo/help-gnu-music,help-gnu-music@@gnu.org} - For help with using LilyPond. -@item @uref{http://mail.gnu.org/mailman/listinfo/bug-gnu-music,bug-gnu-music@@gnu.org} -If you have bugreports, you should send them to this list. +@item @uref{http://mail.gnu.org/mailman/listinfo/bug-lilypond,bug-lilypond@@gnu.org} + If you have bugreports, you should send them to this list. @end itemize @@ -100,10 +97,9 @@ a script to do this for you is in @file{buildscripts/clean-fonts.sh} @section Bugs -Send bug reports to @email{bug-gnu-music@@gnu.org}. For help and -questions use @email{help-gnu-music@@gnu.org} and -@email{gnu-music-discuss@@gnu.org}. Please consult the FAQ and -installation instructions before mailing your problems. +Send bug reports to @email{bug-lilypond@@gnu.org}. For help and +questions use @email{lilypond-user@@gnu.org}. Please consult the FAQ +and installation instructions before mailing your problems. diff --git a/Documentation/topdocs/index.tely b/Documentation/topdocs/index.tely index 1b26344f9e..5442ceb1fc 100644 --- a/Documentation/topdocs/index.tely +++ b/Documentation/topdocs/index.tely @@ -41,6 +41,27 @@ LilyPond is @b{free software}. It is part of the Public License, so you can use, modify and redistribute the program with almost no restrictions. + +is actively developed. Experimental, development releases have +an odd version number (e.g. 1.5.7), while stable releases have +(e.g. 1.4.7) should be unchanging and bug-free. Unless you have special +needs, you should use the stable version. You can access the websites of +the stable version @uref{http://lilypond.org/stable, here}. The website +of the development series are @uref{http://lilypond.org/development, +here} + + +LilyPond has a development version and a stable version. This webpage +is for the @b{stable} release. This means that it won't change much, +and it is essentially bug-free. On the other hand, experimental +releases contain experimental and often buggy code. They are under +active development, so you should use those if you need any special new +features. The website of the latest development release is +@uref{http://lilypond.org/development, here} + + + + @unnumberedsec Want to know more? If you want to know more, visit the diff --git a/Documentation/user/bugs.itexi b/Documentation/user/bugs.itexi index fc51178df9..9b50eb7df2 100644 --- a/Documentation/user/bugs.itexi +++ b/Documentation/user/bugs.itexi @@ -27,7 +27,7 @@ system libraries, whether you downloaded a binary release) @end itemize -You can send the report to @email{bug-gnu-music@@gnu.org}. This is a +You can send the report to @email{bug-lilypond@@gnu.org}. This is a mailinglist, but you don't have to be subscribed to it. You may also enter the bug in the LilyPond wiki, at @uref{http://www.lilypond.org/wiki?LilyPondBugs}. diff --git a/Documentation/user/convert-ly.itexi b/Documentation/user/convert-ly.itexi index dc1590a6ed..f5bfe39042 100644 --- a/Documentation/user/convert-ly.itexi +++ b/Documentation/user/convert-ly.itexi @@ -53,6 +53,6 @@ work. @code{convert-ly} is written in @uref{http://www.python.org,Python}. It was written by @email{hanwen@@cs.uu.nl, Han-Wen Nienhuys}. Report bugs -to @code{bug-gnu-music@@gnu.org} +to @code{bug-lilypond@@gnu.org} diff --git a/Documentation/user/converters.itely b/Documentation/user/converters.itely index b6d09011ad..7609ed2ca2 100644 --- a/Documentation/user/converters.itely +++ b/Documentation/user/converters.itely @@ -75,7 +75,7 @@ robust midi2ly. @end table -Report bugs to @email{bug-gnu-music@@gnu.org}. +Report bugs to @email{bug-lilypond@@gnu.org}. Written by @email{Jan Nieuwenhuizen, janneke@@gnu.org}. @@ -115,7 +115,7 @@ Known: articulation scripts are buggy. Empty measures confuse etf2ly. Written by @email{Han-Wen Nienhuys,hanwen@@cs.uu.nl}. -Report bugs to @email{bug-gnu-music@@gnu.org}. +Report bugs to @email{bug-lilypond@@gnu.org}. @node abc2ly @section abc2ly @@ -175,7 +175,7 @@ abc2ly ignores the ABC beaming. Written by @email{Han-Wen Nienhuys,hanwen@@cs.uu.nl}. @c How about Laura? /MB -Report bugs to @email{bug-gnu-music@@gnu.org}. +Report bugs to @email{bug-lilypond@@gnu.org}. @node pmx2ly @section pmx2ly @@ -183,7 +183,7 @@ Report bugs to @email{bug-gnu-music@@gnu.org}. PMX is a MusiXTeX preprocessor written by Don Simons, see @uref{http://icking-music-archive.sunsite.dk/Misc/Music/musixtex/software/pmx/}. -Report bugs to @email{bug-gnu-music@@gnu.org}. +Report bugs to @email{bug-lilypond@@gnu.org}. @subsection Invoking pmx2ly @@ -204,7 +204,7 @@ set output filename to FILE version information @end table -Report bugs to @email{bug-gnu-music@@gnu.org}. +Report bugs to @email{bug-lilypond@@gnu.org}. Written by @email{Han-Wen Nienhuys,hanwen@@cs.uu.nl}. @@ -242,7 +242,7 @@ version information @var{REFFILE} @end table -Report bugs to @email{bug-gnu-music@@gnu.org}. +Report bugs to @email{bug-lilypond@@gnu.org}. Written by @email{Han-Wen Nienhuys,hanwen@@cs.uu.nl}. @@ -289,7 +289,7 @@ converted. Written by @email{Jan Nieuwenhuizen,janneke@@gnu.org}, based on pmx2ly. -Report bugs to @email{bug-gnu-music@@gnu.org}. +Report bugs to @email{bug-lilypond@@gnu.org}. diff --git a/Documentation/user/ly2dvi.itexi b/Documentation/user/ly2dvi.itexi index ad872aa34f..9f91398699 100644 --- a/Documentation/user/ly2dvi.itexi +++ b/Documentation/user/ly2dvi.itexi @@ -153,7 +153,7 @@ selects the language for the warning messages of Ly2dvi and LilyPond. @unnumberedsubsec Bugs Cannot generate @TeX{} or @code{PostScript} only. Send bugreports to to -@email{bug-gnu-music@@gnu.org}. +@email{bug-lilypond@@gnu.org}. @unnumberedsubsec Authors diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely index f23e2053ab..4df8e41c5a 100644 --- a/Documentation/user/refman.itely +++ b/Documentation/user/refman.itely @@ -1226,7 +1226,8 @@ underneath. c''-\rtoe c''-\turn c''-\open c''-\flageolet c''-\reverseturn c''-\trill c''-\prall c''-\mordent c''-\prallprall c''-\prallmordent c''-\upprall c''-\downprall - c''-\thumb c''-\segno c''-\coda + c''-\upmordent c''-\downmordent c''-\pralldown c''-\prallup + c''-\lineprall c''-\thumb c''-\segno c''-\coda } \context Lyrics \lyrics { accent__ marcato__ staccatissimo__ fermata @@ -1235,7 +1236,8 @@ underneath. rtoe__ turn__ open__ flageolet reverseturn__ trill__ prall__ mordent prallprall__ prallmordent__ uprall__ downprall - thumb__ segno__ coda + upmordent__ downmordent__ pralldown__ prallup__ + lineprall__ thumb__ segno__ coda } > \paper { diff --git a/FAQ.txt b/FAQ.txt index 0db3958775..bea634bdd7 100644 --- a/FAQ.txt +++ b/FAQ.txt @@ -11,12 +11,11 @@ I'm stuck, HELP! (http://appel.lilypond.org/wiki?LilyPondFaqs). Also, please look in the searchable mailinglist archives: - * help-gnu-music (http://www.mail-archive.com/help-gnu-music@gnu.org) + * lilypond-user (http://www.mail-archive.com/lilypond-user@gnu.org) - * bug-gnu-music (http://www.mail-archive.com/bug-gnu-music@gnu.org) + * bug-lilypond (http://www.mail-archive.com/bug-lilypond@gnu.org) - * gnu-music-discuss - (http://www.mail-archive.com/gnu-music-discuss@gnu.org) + * lilypond-devel (http://www.mail-archive.com/lilypond-devel@gnu.org) If you are still at loss, send your questions to the *mailing list*, and not to authors directly. @@ -44,6 +43,8 @@ yourself: autoconf configure + i + I downloaded the windows32 port, and it doesn't match the website! ------------------------------------------------------------------ diff --git a/INSTALL.txt b/INSTALL.txt index 23caefdcdf..52ab1d5bb1 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -308,13 +308,6 @@ addition to the those needed for running: glibc-devel, gcc-c++, libstdc++-devel, guile-devel, flex, bison, texinfo, tetex-devel, groff, libgr-progs. - Warning - - There appears to be a problem with the Xdvi shipped with Red Hat 7.1. -Symptoms: Xdvi responds very sluggishly or hangs while viewing lilypond -output. The cause for this problem is unknown; you are advised to -recompile Xdvi from source. - LinuxPPC -------- @@ -463,10 +456,9 @@ interfere with your build, you may want to do this before the build too: Problems ======== - For help and questions use and -. Please consult the FAQ before mailing -your problems. If you find bugs, please send bug reports to -. + For help and questions use . Please consult +the FAQ before mailing your problems. If you find bugs, please send +bug reports to . Bugs that are not fault of LilyPond are documented here. diff --git a/README.txt b/README.txt index 9d530f818c..37771351b3 100644 --- a/README.txt +++ b/README.txt @@ -52,22 +52,18 @@ list, _not_ to us personally. We have the following mailing lists: - * info-gnu-music@gnu.org - (http://mail.gnu.org/mailman/listinfo/info-gnu-music) is a + * info-lilypond@gnu.org + (http://mail.gnu.org/mailman/listinfo/info-lilypond) is a low-volume list for information on the GNU Music project. This list is moderated; ask David R. Linn or Han-Wen to send announcements for this list. - * gnu-music-discuss@gnu.org - (http://mail.gnu.org/mailman/listinfo/gnu-music-discuss) For - general discussions concerning LilyPond. + * lilypond-user@gnu.org + (http://mail.gnu.org/mailman/listinfo/lilypond-user) For general + discussions about using LilyPond. - * help-gnu-music@gnu.org - (http://mail.gnu.org/mailman/listinfo/help-gnu-music) For help - with using LilyPond. - - * bug-gnu-music@gnu.org - (http://mail.gnu.org/mailman/listinfo/bug-gnu-music) If you have + * bug-lilypond@gnu.org + (http://mail.gnu.org/mailman/listinfo/bug-lilypond) If you have bugreports, you should send them to this list. Windows 32 @@ -90,8 +86,7 @@ files, eg., Bugs ==== - Send bug reports to . For help and questions -use and . Please -consult the FAQ and installation instructions before mailing your -problems. + Send bug reports to . For help and questions +use . Please consult the FAQ and installation +instructions before mailing your problems. diff --git a/VERSION b/VERSION index 8cd3fef62b..830da425b3 100644 --- a/VERSION +++ b/VERSION @@ -1,8 +1,8 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=4 -PATCH_LEVEL=6 -MY_PATCH_LEVEL=po1 +PATCH_LEVEL=7 +MY_PATCH_LEVEL= # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/flower/hash.cc b/flower/hash.cc deleted file mode 100644 index c33e7ed53d..0000000000 --- a/flower/hash.cc +++ /dev/null @@ -1,57 +0,0 @@ -/* - hash.cc -- implement various functions for hash tables. - - source file of the Flower Library - - (c) 1999 Han-Wen Nienhuys - - */ -#include "string.hh" -#include "array.hh" -#include "dictionary.hh" - - -// Note: assumes long is at least 32 bits. -const unsigned long my_prime_list[] = -{ - 5, 11, 23, // be a bit careful for short lists: we want reasonable mem usage. - 53, 97, 193, 389, 769, - 1543, 3079, 6151, 12289, 24593, - 49157, 98317, 196613, 393241, 786433, - 1572869, 3145739, 6291469, 12582917, 25165843, - 50331653, 100663319, 201326611, 402653189u, 805306457u, - 1610612741u, 3221225473u, 4294967291u -}; - -unsigned long -prime_list (int idx) -{ - return my_prime_list [idx]; -} - -unsigned int -string_hash (String s) -{ - const char* str = s.ch_C (); - unsigned int result = 0; - while (1) { - char c = *str++; - if (c == 0) break; - result += (result<<3) + c; - } - return result; -} - - -unsigned int -hash (unsigned int i) -{ - return i; -} - -unsigned int -int_hash (int i) -{ - return (unsigned) i; -} - diff --git a/flower/include/dictionary-iter.hh b/flower/include/dictionary-iter.hh index eaf0317464..6d1e353ca2 100644 --- a/flower/include/dictionary-iter.hh +++ b/flower/include/dictionary-iter.hh @@ -11,8 +11,6 @@ #define DICTIONARY_ITER_HH #include "dictionary.hh" -#include "hash-table-iter.hh" - template class Dictionary_iter : public Hash_table_iter diff --git a/flower/include/dictionary.hh b/flower/include/dictionary.hh index 701bc30d1d..4604d2645c 100644 --- a/flower/include/dictionary.hh +++ b/flower/include/dictionary.hh @@ -40,10 +40,8 @@ public: } Dictionary (Dict_initialiser *p) { - hash_func_ = string_hash; for (Dict_initialiser *q = p; q->key_; q++) - (*this) [q->key_] = q->value_; - + (*this) [q->key_] = q->value_; } bool elem_b (String s) { diff --git a/flower/include/hash-table-iter.hh b/flower/include/hash-table-iter.hh deleted file mode 100644 index ee84098251..0000000000 --- a/flower/include/hash-table-iter.hh +++ /dev/null @@ -1,61 +0,0 @@ -/* - hash-table-iter.hh -- declare Hash_table_iter - - source file of the Flower Library - - (c) 1999 Han-Wen Nienhuys - - */ - -#ifndef HASH_TABLE_ITER_HH -#define HASH_TABLE_ITER_HH -#include "hash-table.hh" - -template -class Hash_table_iter -{ - Hash_table *dict_l_; - int i; -public: - Hash_table_iter (Hash_table const &dict) - { - i = 0; - dict_l_ = (Hash_table *) & dict; - next_used (); - } - - bool ok () const - { - return i < dict_l_->fixed_p_->dict_arr_.size (); - } - - void next_used () - { - while (ok () && dict_l_->fixed_p_->dict_arr_[i].free_b_) - { - i ++; - } - } - void operator ++ (int) - { - i++; - next_used (); - } - - K key () const - { - return dict_l_->fixed_p_->dict_arr_[i].key_; - } - V val () const - { - return dict_l_->fixed_p_->dict_arr_[i].value_; - } - V &val_ref () - { - return dict_l_->fixed_p_->dict_arr_[i].value_; - } -}; - - -#endif /* HASH_TABLE_ITER_HH */ - diff --git a/flower/include/hash-table.hh b/flower/include/hash-table.hh deleted file mode 100644 index 8cc51f2e1b..0000000000 --- a/flower/include/hash-table.hh +++ /dev/null @@ -1,216 +0,0 @@ -/* - hash-table.hh -- declare Hash_table_entry, Hash_table - - source file of the Flower Library - - (c) 1999 Han-Wen Nienhuys - - */ - -#ifndef HASH_TABLE_HH -#define HASH_TABLE_HH - -unsigned int int_hash (int); -unsigned long prime_list (int idx); -template struct Hash_table_iter; - -template -unsigned int -pointer_hash (K *p) -{ - return int_hash ((unsigned int) p); -} - -template -struct Hash_table_entry -{ - K key_; - V value_; - bool free_b_; - - Hash_table_entry () { - free_b_ = true; - } - Hash_table_entry (K s, V v) - { - key_ = s; - value_ = v; - free_b_ = false; - } -}; - -/** - A hash table of prime size. - - We use quadratic probing. - - DEPRECATED. Use either SCM (preferred) or STL -*/ -template -class Fixed_size_hash_table -{ -public: - Array > dict_arr_; - int size_idx_; - Fixed_size_hash_table (int size_idx) - { - size_idx_ = size_idx; - int sz = prime_list (size_idx_); - dict_arr_.set_size (sz); - } - - /// find #s#, or find first empty entry corresponding to #s# - int lookup (K s, unsigned int initial_hash) - { - int sz =dict_arr_.size (); - initial_hash = initial_hash % sz; - int i; - int j = 0; - while (j <= sz/2) { - i = (initial_hash + j*j) % sz; - - if (dict_arr_[i].free_b_) - return i; - - if (dict_arr_[i].key_ == s) - return i; - - j++; - } - - - return -1; - } - - /// remove #s# from the hash table. - V remove (K s, unsigned int initial_hash) - { - // TODO - assert (false); - } -}; - -/** - Hash table with sliding sizes. - */ -template -class Hash_table -{ - Fixed_size_hash_table * fixed_p_; - /// set size to next prime, and copy contents - void enlarge () - { - Fixed_size_hash_table *f = new Fixed_size_hash_table (fixed_p_->size_idx_ +1); - - for (int i=0; i < fixed_p_->dict_arr_.size (); i++) - { - if (fixed_p_->dict_arr_[i].free_b_) - continue; - - K nm (fixed_p_->dict_arr_[i].key_); - unsigned int h = (*hash_func_) (nm); - int nl = f->lookup (nm, h); - - f->dict_arr_[nl] = Hash_table_entry (nm, fixed_p_->dict_arr_[i].value_); - } - delete fixed_p_; - fixed_p_ = f; - } -public: - Hash_table () - { - hash_func_ = 0; - fixed_p_ = new Fixed_size_hash_table (0); - } - ~Hash_table () - { - delete fixed_p_; - } - void operator = (Hash_table const &src) - { - if (&src == this) - return; - - delete fixed_p_; - fixed_p_ = new Fixed_size_hash_table (*src.fixed_p_); - hash_func_ = src.hash_func_; - } - Hash_table (Hash_table const &src) - { - fixed_p_ = new Fixed_size_hash_table (*src.fixed_p_); - hash_func_ = src.hash_func_; - } - - void clear () - { - int i= fixed_p_->size_idx_; - delete fixed_p_; - fixed_p_ = new Fixed_size_hash_table (i); - } - bool elem_b (K s) const - { - int l = fixed_p_->lookup (s, (*hash_func_) (s)); - - return (l >= 0 && !fixed_p_->dict_arr_[l].free_b_) ; - } - - /** - Find and return element. If #s# is not in the table, create an - entry in the table, and init */ - V& elem (K s) - { - int l; - unsigned int h = (*hash_func_) (s); - while ((l= fixed_p_->lookup (s,h)) <0) - { - enlarge (); - } - - fixed_p_->dict_arr_[l].free_b_ = false; - fixed_p_->dict_arr_[l].key_ = s; - return fixed_p_->dict_arr_[l].value_; - } - bool try_retrieve (K k, V *v) - { - int l = fixed_p_->lookup (k, (*hash_func_) (k)); - if (l < 0 || fixed_p_->dict_arr_[l].free_b_) - return false; - else - { - *v = fixed_p_->dict_arr_[l].value_; - return true; - } - } - V elem (K s) const - { - return const_elem (s); - } - V const_elem (K k) const - { - V retval; - assert (elem_b (k)); - retval = ((Hash_table*)this)->elem (k); - return retval; - } - V& operator [] (K k) - { - return elem (k); - } - - V operator [] (K k) const - { - return const_elem (k); - } - - V remove (K s) - { - return fixed_p_->remove (s, (*hash_func_) (s)); - } - friend class Hash_table_iter; -public: - unsigned int (*hash_func_) (K); -}; - - -#endif /* HASH_TABLE_HH */ - diff --git a/input/test/trills.ly b/input/test/trills.ly index ab7cc17555..aab0438e97 100644 --- a/input/test/trills.ly +++ b/input/test/trills.ly @@ -1,22 +1,62 @@ \header { texidoc="Document trills, pralls and turns" - title="Marques des agr\'ements et leur signification" + title="Marques des agr\\'ements et leur signification" + composer="D'Anglebert" copyright="(1689)" } +invisible = \property Voice.NoteHead \override #'transparent = ##t +visible = \property Voice.NoteHead \revert #'transparent + +% Ugly hack to get reasonable position of the pincé and Cheute +startHorizScript = { + \property Voice.scriptHorizontal = ##t + \property Voice.Script \override #'padding = #0.3 + \property Voice.Script \override #'extra-offset = #'(-.6 . 0) + % Avoid collision with the dots of dotted notes + \property Voice.Dots \override #'extra-extent-X = #'(-0.7 . 0) +} +endHorizScript = { + \property Voice.scriptHorizontal \unset + \property Voice.Dots \revert #'padding + \property Voice.Script \revert #'padding + \property Voice.Script \revert #'extra-offset +} + + \score { < \property Score.TimeSignature = \turnOff \context GrandStaff < \context Staff=upper \notes\relative c'' { \time 1/4 - c4-\prallprall + c4-\prall \time 3/8 - c4.^"TODO" + c4.^\lineprall c4.-\downprall c4.-\upprall \time 5/8 c4-\turn c4.-\upprall + d4-\turn b4.-\downprall + \time 3/4 + b4 c^\turn d + \time 1/4 + <\context Voice=upper{\voiceOne d4} + \context Voice=lower{\voiceTwo + \property Voice.Script \override #'extra-offset = #'(-0.8 . 2.0) + b_\turn}> + \startHorizScript c^\comma + \time 3/8 + c4.^\comma + b8 c4_\comma + c8 b4_\comma + b8 c4^\comma _\comma \endHorizScript + \time 2/2 \slurDown + <{c2}{s4 \invisible d1*1/4 ( \visible }> ) e2 + <{a,2}{s4 \invisible b1*1/4 ( \visible }> ) d2 + <{a2}{s4 \invisible b1*1/4 ( \visible }> ) d2 + \time 3/4 + d2^\prallup e4 } \context Lyrics=one \lyrics { "Tremblement"4 @@ -24,10 +64,27 @@ "Cadence" "autre" "Double"4 "cadence"4. + "autre"4 _4. + _4 "sans tremblement"2 + "sur une tierce"4 + "Pinc\\'e"4 + "autre"4. + "Cheute ou Port de" + "en descendant" + "Cheute et pinc\\'e" + "Coul\\'e Sur 2 notes"1 + "autre" + "autre" + "Double cadence"2. } \context Lyrics=two \lyrics { "simple"4 "appuy\'e"4. + \skip 1*3 + \skip 4 \skip 4. + "voix et montant" + \skip 2. + "de suite"1 } \context Staff=lower \notes\relative c'' { % autobeamer has som problems here diff --git a/lily/kpath.cc b/lily/kpath.cc index f42c5fd1f6..7027ea2475 100644 --- a/lily/kpath.cc +++ b/lily/kpath.cc @@ -46,7 +46,10 @@ ly_find_tfm (char const * name) return p; #if (KPATHSEA && HAVE_KPSE_FIND_FILE) - return kpse_find_file (name, kpse_tfm_format, true); + char const * str = kpse_find_file (name, kpse_tfm_format, true); + if (!str) + str = ""; + return String (str); #endif return ""; } diff --git a/lily/main.cc b/lily/main.cc index ccf5ab3923..1f355bf961 100644 --- a/lily/main.cc +++ b/lily/main.cc @@ -169,7 +169,7 @@ _ ( cout << endl; - cout << _f ("Report bugs to %s", "bug-gnu-music@gnu.org") << endl; + cout << _f ("Report bugs to %s", "bug-lilypond@gnu.org") << endl; } void diff --git a/lily/musical-request.cc b/lily/musical-request.cc index e4866b6064..71a04ef12a 100644 --- a/lily/musical-request.cc +++ b/lily/musical-request.cc @@ -103,7 +103,8 @@ Articulation_req::do_equal_b (Request const* r) const Articulation_req const* a = dynamic_cast (r); return a && gh_equal_p (get_mus_property ("articulation-type"), - r->get_mus_property ("articulation-type")); + r->get_mus_property ("articulation-type")) + && get_direction () == a->get_direction (); } diff --git a/lily/piano-pedal-performer.cc b/lily/piano-pedal-performer.cc index 3783a353a6..aa8ee6196c 100644 --- a/lily/piano-pedal-performer.cc +++ b/lily/piano-pedal-performer.cc @@ -10,8 +10,7 @@ #include "command-request.hh" #include "musical-request.hh" #include "audio-item.hh" -#include "dictionary.hh" -#include "dictionary-iter.hh" + /** perform Piano pedals diff --git a/ly/engraver.ly b/ly/engraver.ly index b8fa85214a..e5b1b72345 100644 --- a/ly/engraver.ly +++ b/ly/engraver.ly @@ -433,6 +433,8 @@ ScoreContext = \translator { keyAccidentalOrder = #'( (6 . -1) (2 . -1) (5 . -1 ) (1 . -1) (4 . -1) (0 . -1) (3 . -1) (3 . 1) (0 . 1) (4 . 1) (1 . 1) (5 . 1) (2 . 1) (6 . 1) + (6 . -2) (2 . -2) (5 . -2 ) (1 . -2) (4 . -2) (0 . -2) (3 . -2) + (3 . 2) (0 . 2) (4 . 2) (2 . 2) (5 . 2) (2 . 2) (6 . 2) ) breakAlignOrder = #'( Instrument_name diff --git a/ly/script.ly b/ly/script.ly index b0fcedd3dc..963c1f914d 100644 --- a/ly/script.ly +++ b/ly/script.ly @@ -43,5 +43,11 @@ prallprall = \script "prallprall" prallmordent = \script "prallmordent" upprall = \script "upprall" downprall = \script "downprall" +upmordent = \script "upmordent" +downmordent = \script "downmordent" +lineprall = \script "lineprall" +pralldown = \script "pralldown" +prallup = \script "prallup" segno = \script "segno" coda = \script "coda" +comma = \script "comma" diff --git a/make/out/lilypond.lsm b/make/out/lilypond.lsm index f22df3d472..7bde761d31 100644 --- a/make/out/lilypond.lsm +++ b/make/out/lilypond.lsm @@ -1,15 +1,15 @@ Begin3 Title: LilyPond -Version: 1.4.6 -Entered-date: 29JUL01 +Version: 1.4.7 +Entered-date: 23AUG01 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.4.6.tar.gz + 1000k lilypond-1.4.7.tar.gz Original-site: ftp.cs.uu.nl /pub/GNU/LilyPond/development/ - 1000k lilypond-1.4.6.tar.gz + 1000k lilypond-1.4.7.tar.gz Copying-policy: GPL End diff --git a/make/out/lilypond.redhat.spec b/make/out/lilypond.redhat.spec index c8a75135b6..ccac7a4339 100644 --- a/make/out/lilypond.redhat.spec +++ b/make/out/lilypond.redhat.spec @@ -1,11 +1,11 @@ %define info yes Name: lilypond -Version: 1.4.6 +Version: 1.4.7 Release: 1 License: GPL Group: Applications/Publishing -Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.4.6.tar.gz +Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.4.7.tar.gz Summary: Create and print music notation URL: http://www.cs.uu.nl/~hanwen/lilypond BuildRoot: /tmp/lilypond-install diff --git a/make/out/lilypond.suse.spec b/make/out/lilypond.suse.spec index c46b333884..1b09b2a83b 100644 --- a/make/out/lilypond.suse.spec +++ b/make/out/lilypond.suse.spec @@ -14,11 +14,11 @@ Distribution: SuSE Linux 7.0 (i386) Name: lilypond -Version: 1.4.6 +Version: 1.4.7 Release: 2 Copyright: GPL Group: Applications/Publishing -Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.4.6.tar.gz +Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.4.7.tar.gz # music notation software for.. ? Summary: A program for printing sheet music. URL: http://www.lilypond.org/ diff --git a/mf/feta-generic.mf b/mf/feta-generic.mf index d60d56c977..391eb7f6be 100644 --- a/mf/feta-generic.mf +++ b/mf/feta-generic.mf @@ -37,14 +37,14 @@ if test = 0: input feta-accordion; input feta-custodes; else: - input feta-bolletjes; - input feta-banier; +% input feta-bolletjes; +& input feta-banier; % input feta-eindelijk; % input feta-klef; % input feta-toevallig; -% input feta-schrift; + input feta-schrift; % input feta-haak; - %input feta-timesig; +% %input feta-timesig; % input feta-pendaal; % input feta-accordion; fi diff --git a/mf/feta-schrift.mf b/mf/feta-schrift.mf index 8ddcc5d1d6..9ef3b815f5 100644 --- a/mf/feta-schrift.mf +++ b/mf/feta-schrift.mf @@ -123,9 +123,11 @@ fet_beginchar("> accent", "sforzato", "sforzatoaccent") labels(4); fet_endchar; +% Hmm, changed 1.5 to 1.4 to avoid problems with "random" placement of +% the dots because of quantization effects for almost integer values. /MB fet_beginchar("staccato dot", "staccato", "staccato") save radius; - radius# = 1.5 stafflinethickness#; + radius# = 1.4 stafflinethickness#; define_pixels(radius); pickup pencircle scaled 2 radius; draw (0,0); @@ -678,6 +680,39 @@ fet_beginchar("Coda", "coda", "coda") fet_endchar; +def draw_comma = + save alpha, thick, thin, ht; + alpha:=35; + thin# = 1.2 stafflinethickness#; + thick# = 3 stafflinethickness#; + ht# = .6staff_space#; + define_pixels(thin, thick,ht); + set_char_box(0, .5staff_space#, ht#, ht#); + + penpos1(thick, alpha); + penpos2(thick, alpha+90); + penpos3(thin, 180-alpha); + penpos4(thin, 90-alpha); + x3r=0; + x1l=x3l; + y2r=-y4l=h; + z1=z2; + z3=z4; + penlabels(1,2,3,4); + fill z1l{dir (alpha+90)} .. z2r{dir alpha} .. z1r{dir (alpha-90)} .. + z3l{dir (270-alpha)} .. z4l{dir (alpha+180)} .. + z3r{dir (90-alpha)} .. cycle; +enddef; + +fet_beginchar("Right Comma","rcomma","rcomma"); + draw_comma; +fet_endchar; + +fet_beginchar("Left Comma","lcomma","lcomma"); + draw_comma; + xy_mirror_char; +fet_endchar; + thick#:=1/24designsize; define_blacker_pixels(thick); diff --git a/mf/feta-slag.mf b/mf/feta-slag.mf index 769348609e..df3ae8d0cb 100644 --- a/mf/feta-slag.mf +++ b/mf/feta-slag.mf @@ -93,7 +93,7 @@ fet_endchar; fet_beginchar("mordent", "mordent", "mordent") trills := 2; - set_char_box(trills*twidth#-0.5toverlap#, trills*twidth#-0.5toverlap#, theight#, theight#); + set_char_box(trills*twidth#-0.5toverlap#, trills*twidth#-0.5toverlap#, 4/3*theight#, 4/3*theight#); draw_trill_two; draw_mordent(0); fet_endchar; @@ -112,7 +112,7 @@ fet_endchar; fet_beginchar("prallmordent", "prallmordent", "prallmordent") trills := 3; - set_char_box(trills*twidth#-(trills-1)*0.5toverlap#, trills*twidth#-(trills-1)*0.5toverlap#, theight#, theight#); + set_char_box(trills*twidth#-(trills-1)*0.5toverlap#, trills*twidth#-(trills-1)*0.5toverlap#, 4/3*theight#, 4/3*theight#); draw_trill_three; draw_mordent(twidth-0.5toverlap); fet_endchar; @@ -146,3 +146,61 @@ fet_beginchar("downprall", "downprall", "downprall") draw_trill_three; fet_endchar; +fet_beginchar("upmordent", "upmordent", "upmordent") +% trills := 4; + trills := 3; + set_char_box(trills*twidth#-(trills-1)*0.5toverlap#, trills*twidth#-(trills-1)*0.5toverlap#, 4/3*theight#, 4/3*theight#); +% draw_slur(-2twidth#,-2theight#,0,-1); +% currentpicture := currentpicture shifted (-0.5w+tthin,-tfat*theight+0.75tthin); + draw_slur(0,-2theight#,0,-1); +% currentpicture := currentpicture shifted (-0.5w+1.3tthin,-tfat*theight+1.5tthin); + currentpicture := currentpicture shifted (-0.5w+1.65tthin,-tfat*theight+1.15tthin); +% draw_trill_four; + draw_trill_three; + draw_mordent(twidth-0.5toverlap); +fet_endchar; + +fet_beginchar("downmordent", "downmordent", "downmordent") + trills := 3; + set_char_box(trills*twidth#-(trills-1)*0.5toverlap#, trills*twidth#-(trills-1)*0.5toverlap#, 4/3*theight#, 4/3*theight#); +% draw_slur(-2twidth#,2theight#,0,1); + draw_slur(0,2theight#,0,1); +% currentpicture := currentpicture shifted (-0.5w+tthin,-tfat*theight+0.75tthin); + currentpicture := currentpicture shifted (-0.5w+tthin,-tfat*theight+0.5tthin); + draw_trill_three; + draw_mordent(twidth-0.5toverlap); +fet_endchar; + +fet_beginchar("lineprall", "lineprall", "lineprall") + trills := 3; + set_char_box(trills*twidth#-(trills-1)*0.5toverlap#, trills*twidth#-(trills-1)*0.5toverlap#, theight#, 4*theight#); + pickup pencircle scaled tthin; + draw (-0.5w+tthin,-tfat*theight+0.5tthin) -- (-0.5w+tthin,h); + draw_trill_three; +fet_endchar; + +fet_beginchar("pralldown", "pralldown", "pralldown") +% trills := 4; + trills := 3; + set_char_box(trills*twidth#-(trills-1)*0.5toverlap#, trills*twidth#-(trills-1)*0.5toverlap#, theight#, theight#); +% draw_slur(-2twidth#,-2theight#,0,-1); +% currentpicture := currentpicture shifted (-0.5w+tthin,-tfat*theight+0.75tthin); + draw_slur(0,-2theight#,0,-1); +% currentpicture := currentpicture shifted (-0.5w+1.3tthin,-tfat*theight+1.5tthin); + currentpicture := currentpicture shifted (-0.5w+1.65tthin,-tfat*theight+1.15tthin); +% draw_trill_four; + draw_trill_three; + currentpicture := currentpicture xscaled -1; +fet_endchar; + +fet_beginchar("prallup", "prallup", "prallup") + trills := 3; + set_char_box(trills*twidth#-(trills-1)*0.5toverlap#, trills*twidth#-(trills-1)*0.5toverlap#, theight#, theight#); +% draw_slur(-2twidth#,2theight#,0,1); + draw_slur(0,2theight#,0,1); +% currentpicture := currentpicture shifted (-0.5w+tthin,-tfat*theight+0.75tthin); + currentpicture := currentpicture shifted (-0.5w+tthin,-tfat*theight+0.5tthin); + draw_trill_three; + currentpicture := currentpicture xscaled -1; +fet_endchar; + diff --git a/midi2ly/lilypond-item.cc b/midi2ly/lilypond-item.cc index 4c3830a637..977f44e70e 100644 --- a/midi2ly/lilypond-item.cc +++ b/midi2ly/lilypond-item.cc @@ -311,7 +311,7 @@ Lilypond_skip::str () return ""; String str = "\\skip "; - str += Duration_convert::dur2_str (dur) + "; "; + str += Duration_convert::dur2_str (dur); return str; } diff --git a/midi2ly/lilypond-stream.cc b/midi2ly/lilypond-stream.cc index aee29cef2b..1f476649a6 100644 --- a/midi2ly/lilypond-stream.cc +++ b/midi2ly/lilypond-stream.cc @@ -100,7 +100,7 @@ Lilypond_stream::header() *os_p_ << filename_str_g; *os_p_ << "\n\n"; // ugh - *os_p_ << "\\version \"1.4.0\";\n"; + *os_p_ << "\\version \"1.4.0\"\n"; } void diff --git a/midi2ly/main.cc b/midi2ly/main.cc index 9cc78171d8..cce169c639 100644 --- a/midi2ly/main.cc +++ b/midi2ly/main.cc @@ -121,7 +121,7 @@ usage() cout << '\n'; cout << Long_option_init::table_str (long_option_init_a) << endl; - cout << _f ("Report bugs to %s", "bug-gnu-music@gnu.org") << endl; + cout << _f ("Report bugs to %s", "bug-lilypond@gnu.org") << endl; } void diff --git a/po/de.po b/po/de.po index e40f655d1c..39ee516b13 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Lilypond 1.2.8\n" -"POT-Creation-Date: 2001-09-09 17:30+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" @@ -13,181 +13,166 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: ENCODING\n" -#: ly2dvi.py:106 +#: ly2dvi.py:105 msgid "Generate .dvi with LaTeX for LilyPond" msgstr "" -#: data-file.cc:118 input.cc:85 ly2dvi.py:191 midi-parser.cc:100 mup2ly.py:93 +#: data-file.cc:118 input.cc:85 ly2dvi.py:190 midi-parser.cc:100 mup2ly.py:93 #: update-lily.py:118 warn.cc:23 msgid "warning: " msgstr "Warnung: " -#: input.cc:90 ly2dvi.py:206 ly2dvi.py:639 ly2dvi.py:657 ly2dvi.py:848 -#: mup2ly.py:98 mup2ly.py:188 update-lily.py:123 update-lily.py:211 warn.cc:9 -#: warn.cc:17 +#: 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: " -#: ly2dvi.py:207 mup2ly.py:100 update-lily.py:125 +#: ly2dvi.py:206 mup2ly.py:100 update-lily.py:125 #, fuzzy msgid "Exiting ... " msgstr "Linie ... " -#: ly2dvi.py:265 mup2ly.py:158 update-lily.py:183 +#: ly2dvi.py:264 mup2ly.py:158 update-lily.py:183 #, fuzzy, c-format msgid "Usage: %s [OPTION]... FILE" msgstr "Verwendung: %s [OPTIONEN] ... [DATEI]" -#: ly2dvi.py:269 main.cc:120 main.cc:149 mup2ly.py:162 update-lily.py:187 +#: ly2dvi.py:268 main.cc:120 main.cc:148 mup2ly.py:162 update-lily.py:187 msgid "Options:" msgstr "Optionen:" -#: ly2dvi.py:273 main.cc:124 main.cc:172 mup2ly.py:168 update-lily.py:191 +#: ly2dvi.py:272 main.cc:124 main.cc:171 mup2ly.py:168 update-lily.py:191 #, fuzzy, c-format msgid "Report bugs to %s" msgstr "Melde Fehler an" -#: ly2dvi.py:306 mup2ly.py:185 update-lily.py:208 +#: ly2dvi.py:305 mup2ly.py:185 update-lily.py:208 #, fuzzy, c-format msgid "Invoking `%s'" msgstr "Uralt-Bitte: `%s'" -#: ly2dvi.py:310 mup2ly.py:188 update-lily.py:211 +#: ly2dvi.py:309 mup2ly.py:188 update-lily.py:211 #, c-format msgid "command exited with value %d" msgstr "" -#: ly2dvi.py:312 mup2ly.py:190 update-lily.py:213 +#: ly2dvi.py:311 mup2ly.py:190 update-lily.py:213 msgid "(ignored)" msgstr "" -#: ly2dvi.py:322 +#: ly2dvi.py:321 #, fuzzy, c-format msgid "Cleaning %s..." msgstr "Uralt-Bitte: `%s'" -#: ly2dvi.py:337 mup2ly.py:214 update-lily.py:237 +#: ly2dvi.py:336 mup2ly.py:214 update-lily.py:237 #, fuzzy, c-format msgid "no such setting: %s" msgstr "Kein solches instrument: `%s'" -#: ly2dvi.py:350 main.cc:113 +#: ly2dvi.py:349 main.cc:112 msgid "write Makefile dependencies for every input file" msgstr "Schreibe Makefile-Abhängigkeiten für jede Eingabedatei" -#: ly2dvi.py:351 main.cc:96 main.cc:109 mup2ly.py:1117 update-lily.py:251 +#: ly2dvi.py:350 main.cc:96 main.cc:108 mup2ly.py:1117 update-lily.py:251 msgid "this help" msgstr "Diese Hilfe" -#: ly2dvi.py:352 main.cc:111 main.cc:116 +#: ly2dvi.py:351 main.cc:110 main.cc:115 msgid "DIR" msgstr "DIR" -#: ly2dvi.py:352 +#: ly2dvi.py:351 #, fuzzy msgid "add DIR to LilyPond's search path" msgstr "Hänge DIR an den Suchpfad an" -#: ly2dvi.py:353 +#: ly2dvi.py:352 #, c-format msgid "keep all output, and name the directory %s.dir" msgstr "" -#: ly2dvi.py:354 +#: ly2dvi.py:353 msgid "don't run LilyPond" msgstr "" -#: ly2dvi.py:355 main.cc:114 +#: ly2dvi.py:354 main.cc:113 #, fuzzy msgid "produce MIDI output only" msgstr "Nur Midiausgabe" -#: ly2dvi.py:356 ly2dvi.py:357 main.cc:99 main.cc:112 main.cc:115 +#: ly2dvi.py:355 main.cc:99 main.cc:111 main.cc:114 msgid "FILE" msgstr "DATEI" -#: ly2dvi.py:356 +#: ly2dvi.py:355 #, fuzzy msgid "write ouput to FILE" msgstr "Schreibe die Ausgabe in BASENAME[-x].Erweiterung" #: ly2dvi.py:357 -msgid "find pfa fonts used in FILE" -msgstr "" - -#: ly2dvi.py:359 #, fuzzy msgid "generate PostScript output" msgstr "Degenerierte Zwangsbedingungen" -#: ly2dvi.py:360 +#: ly2dvi.py:358 msgid "KEY=VAL" msgstr "" -#: ly2dvi.py:360 +#: ly2dvi.py:358 msgid "change global setting KEY to VAL" msgstr "" -#: ly2dvi.py:361 main.cc:119 mup2ly.py:1120 update-lily.py:255 +#: ly2dvi.py:359 main.cc:118 mup2ly.py:1120 update-lily.py:255 #, fuzzy msgid "verbose" msgstr "Sei geschwätzig" -#: ly2dvi.py:362 main.cc:105 main.cc:118 mup2ly.py:1121 update-lily.py:256 +#: ly2dvi.py:360 main.cc:105 main.cc:117 mup2ly.py:1121 update-lily.py:256 msgid "print version number" msgstr "Zeige die Versionsnummer" -#: ly2dvi.py:363 main.cc:107 main.cc:120 mup2ly.py:1122 update-lily.py:258 +#: ly2dvi.py:361 main.cc:107 main.cc:119 mup2ly.py:1122 update-lily.py:258 msgid "show warranty and copyright" msgstr "Zeige Garantie und Urheberrechte" -#: ly2dvi.py:385 ly2dvi.py:580 ly2dvi.py:605 +#: ly2dvi.py:383 ly2dvi.py:578 ly2dvi.py:603 #, fuzzy, c-format msgid "Running %s..." msgstr "Uralt-Bitte: `%s'" -#: ly2dvi.py:398 +#: ly2dvi.py:396 #, fuzzy, c-format msgid "Analyzing %s..." msgstr "Uralt-Bitte: `%s'" -#: ly2dvi.py:454 +#: ly2dvi.py:452 #, c-format msgid "no lilypond output found for %s" msgstr "" -#: ly2dvi.py:496 +#: ly2dvi.py:494 #, fuzzy, c-format msgid "invalid value: %s" msgstr "Ungültiger Buchstabe `%c'" -#: ly2dvi.py:639 -#, fuzzy, c-format -msgid "not a PostScript file: `%s'" -msgstr "Kann die Datei %s nicht öffnen" - -#: ly2dvi.py:657 -#, c-format -msgid "getopt says: `%s'" -msgstr "" - -#: ly2dvi.py:824 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:835 +#: 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:837 +#: 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:848 +#: ly2dvi.py:804 msgid "no files specified on command line." msgstr "" @@ -213,7 +198,7 @@ msgstr "" msgid "define macro NAME [optional expansion EXP]" msgstr "" -#: main.cc:115 mup2ly.py:1118 +#: main.cc:114 mup2ly.py:1118 #, fuzzy msgid "write output to FILE" msgstr "Schreibe die Ausgabe in BASENAME[-x].Erweiterung" @@ -437,6 +422,15 @@ msgstr "" msgid "Can't switch translators, I'm there already" msgstr "" +#: beam.cc:86 +#, fuzzy +msgid "beam has less than two stems" +msgstr "Balken mit weniger als zwei Hälsen" + +#: beam.cc:637 +msgid "weird beam vertical offset" +msgstr "" + #: beam-engraver.cc:91 beam-engraver.cc:124 #, fuzzy msgid "can't find start of beam" @@ -465,15 +459,6 @@ msgstr "Notenhals passt nicht in den Balken" msgid "beam was started here" msgstr "Der Balken bagann hier" -#: beam.cc:86 -#, fuzzy -msgid "beam has less than two stems" -msgstr "Balken mit weniger als zwei Hälsen" - -#: beam.cc:637 -msgid "weird beam vertical offset" -msgstr "" - #: break-align-item.cc:136 #, fuzzy, c-format msgid "unknown spacing pair `%s', `%s'" @@ -498,6 +483,16 @@ msgstr "" msgid "none of these in my family" msgstr "" +#: chord.cc:369 +#, c-format +msgid "invalid subtraction: not part of chord: %s" +msgstr "Unerlaubte Subtraktion: nicht Teil eines Akkords: %s" + +#: chord.cc:398 +#, c-format +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:192 #, fuzzy msgid "unterminated chord tremolo" @@ -508,16 +503,6 @@ msgstr "Unbeendeter Bindestrich" msgid "no one to print a tremolos" msgstr "Keiner darf eine Wiederholungsklammer drucken" -#: chord.cc:376 -#, c-format -msgid "invalid subtraction: not part of chord: %s" -msgstr "Unerlaubte Subtraktion: nicht Teil eines Akkords: %s" - -#: chord.cc:405 -#, c-format -msgid "invalid inversion pitch: not part of chord: %s" -msgstr "Unerlaubter Baßton: gehört nicht zum Akkord: %s" - #: collision.cc:127 msgid "Too many clashing notecolumns. Ignoring them." msgstr "Zu viele aneinanderstoßende Notenspalten. Ich ignoriere sie." @@ -634,65 +619,64 @@ msgstr "" msgid "Huh? Melismatic note found to have associated lyrics." msgstr "" -#. print example usage: lilypond -e "(set-lily-option 'help 0)" ? -#: main.cc:105 +#: main.cc:104 msgid "EXPR" msgstr "" -#: main.cc:105 +#: main.cc:104 msgid "evalute EXPR as Scheme after .scm init is read" msgstr "" #. another bug in option parser: --output=foe is taken as an abbreviation #. for --output-format -#: main.cc:108 +#: main.cc:107 msgid "EXT" msgstr "EXT" -#: main.cc:108 +#: main.cc:107 #, fuzzy msgid "use output format EXT (scm, ps, tex or as)" msgstr "Benutze das Ausgabeformat EXT" -#: main.cc:110 +#: main.cc:109 #, fuzzy msgid "FIELD" msgstr "DATEI" -#: main.cc:110 +#: main.cc:109 msgid "write header field to BASENAME.FIELD" msgstr "" -#: main.cc:111 +#: main.cc:110 msgid "add DIR to search path" msgstr "Hänge DIR an den Suchpfad an" -#: main.cc:112 +#: main.cc:111 msgid "use FILE as init file" msgstr "Verwende FILE als Initialisierungsdatei" -#: main.cc:116 +#: main.cc:115 msgid "prepend DIR to dependencies" msgstr "" -#: main.cc:117 +#: main.cc:116 msgid "inhibit file output naming and exporting" msgstr "Unterdrücke die automatische Benennung von Ausgabedateien und Export" #. #. No version number or newline here. It confuses help2man #. -#: main.cc:137 +#: main.cc:136 #, fuzzy, c-format msgid "Usage: %s [OPTION]... FILE..." msgstr "Benutzung: %s [OPTIONEN] ... [DATEI] ..." -#: main.cc:139 +#: main.cc:138 #, fuzzy msgid "Typeset music and or play MIDI from FILE" msgstr "Setze Musik oder spiele MIDI von DATEI" -#: main.cc:143 +#: main.cc:142 msgid "" "LilyPond is a music typesetter. It produces beautiful sheet music\n" "using a high level description file as input. LilyPond is part of \n" @@ -702,11 +686,11 @@ msgstr "" "Notenblätter erzeugen. Dazu verwendet es eine eigene Beschreibungssprache.\n" "lilyPond ist Teil des GNU-Projekts\n" -#: main.cc:153 +#: main.cc:152 msgid "This binary was compiled with the following options:" msgstr "Diese Programm wurde mit den folgenden Optionen übersetzt:" -#: main.cc:56 main.cc:180 +#: main.cc:56 main.cc:179 #, c-format msgid "" "This is free software. It is covered by the GNU General Public License,\n" @@ -719,17 +703,17 @@ msgstr "" "einhalten. Wenn Sie das Programm mit `%s --warranty starten, bekommen\n" "Sie mehr Informationen.\n" -#: main.cc:63 main.cc:187 main.cc:199 +#: main.cc:63 main.cc:186 main.cc:198 #, c-format msgid "Copyright (c) %s by" msgstr "Urheberrechte (Copyright) (c) %s bei" -#: main.cc:197 +#: main.cc:196 #, fuzzy msgid "GNU LilyPond -- The music typesetter" msgstr "GNU LilyPond -- Der Notensatz des GNU-Projekts" -#: main.cc:72 main.cc:205 +#: main.cc:72 main.cc:204 msgid "" " This program is free software; you can redistribute it and/or\n" "modify it under the terms of the GNU General Public License version 2\n" @@ -772,10 +756,10 @@ msgstr "Unsinnige Dauer" msgid "silly pitch" msgstr "unsinnige Tonhöhe" -#: music-output-def.cc:115 +#: musical-request.cc:28 #, fuzzy, c-format -msgid "can't find `%s' context" -msgstr "Kann Partiturkontext nicht finden" +msgid "Transposition by %s makes accidental larger than two" +msgstr "Transponieren um %s macht Vorzecihen größer als zwei" #: music.cc:232 msgid "ly_get_mus_property (): Not a Music" @@ -797,10 +781,10 @@ msgstr "" msgid "ly_music_name (): Not a music expression" msgstr "" -#: musical-request.cc:28 +#: music-output-def.cc:115 #, fuzzy, c-format -msgid "Transposition by %s makes accidental larger than two" -msgstr "Transponieren um %s macht Vorzecihen größer als zwei" +msgid "can't find `%s' context" +msgstr "Kann Partiturkontext nicht finden" #: my-lily-lexer.cc:139 #, fuzzy, c-format @@ -945,16 +929,11 @@ msgstr "Zu viele kollidierende Pausen." msgid "too many notes for rest collision" msgstr "Zu viele Noten für kollidierende Pausen." -#: scm-option.cc:63 +#: scm-option.cc:59 #, fuzzy msgid "Scheme options:" msgstr "Optionen:" -#: score-engraver.cc:188 -#, fuzzy, c-format -msgid "unbound spanner `%s'" -msgstr "Unbeschränkter Abstand `%s'" - #: score.cc:78 msgid "Interpreting music..." msgstr "Interpretiere die Noten..." @@ -975,6 +954,11 @@ msgstr "Habe Fehler gefunden, /* die Partitur wird nicht verarbeitet */" msgid "elapsed time: %.2f seconds" msgstr "verstrichene Zeit %.2f Sekunden" +#: score-engraver.cc:188 +#, fuzzy, c-format +msgid "unbound spanner `%s'" +msgstr "Unbeschränkter Abstand `%s'" + #: scores.cc:106 #, fuzzy msgid "Score contains errors; will not process it" @@ -996,6 +980,15 @@ msgstr "Ich wei msgid "Separation_item: I've been drinking too much" msgstr "Single_malt_grouping_item: Ich saufe zu viel" +#: slur.cc:48 +#, fuzzy +msgid "Putting slur over rest. Ignoring." +msgstr "Setze Bindebogen über Pause. Wird ignoriert" + +#: slur.cc:383 +msgid "Slur over rest?" +msgstr "Bindebogen übe den Rest?" + #: slur-engraver.cc:127 msgid "unterminated slur" msgstr "Unbeendeter Bindebogen" @@ -1007,25 +1000,20 @@ msgstr "Unbeendeter Bindebogen" msgid "can't find start of slur" msgstr "Kann nicht beide Enden von %s finden" -#: slur.cc:48 +#: stem.cc:116 #, fuzzy -msgid "Putting slur over rest. Ignoring." -msgstr "Setze Bindebogen über Pause. Wird ignoriert" - -#: slur.cc:383 -msgid "Slur over rest?" -msgstr "Bindebogen übe den Rest?" +msgid "Weird stem size; check for narrow beams" +msgstr "" +"Dubiose Größe des Notenhalses: Überprüfe die Eingabe auf schmale Balken" #: stem-engraver.cc:115 #, c-format msgid "Adding note head to incompatible stem (type = %d)" msgstr "Setze Note auf unpassenden Hals (Typ = %d)" -#: stem.cc:116 -#, fuzzy -msgid "Weird stem size; check for narrow beams" +#: text-spanner.cc:121 +msgid "Text_spanner too small" msgstr "" -"Dubiose Größe des Notenhalses: Überprüfe die Eingabe auf schmale Balken" #: text-spanner-engraver.cc:94 #, fuzzy @@ -1042,9 +1030,10 @@ msgstr "Habe schon einen Balken" msgid "unterminated text spanner" msgstr "Unbeendete Linienfortführung" -#: text-spanner.cc:121 -msgid "Text_spanner too small" -msgstr "" +#: tfm.cc:77 +#, fuzzy, c-format +msgid "can't find ascii character: %d" +msgstr "Kann ASCII-Zeichen `%d' nicht finden" #: tfm-reader.cc:106 #, fuzzy, c-format @@ -1056,11 +1045,6 @@ msgstr "TFM header von `%s' hat nur %u Wort(e)" msgid "%s: TFM file has %u parameters, which is more than the %u I can handle" msgstr "%s: TFM-Datei hat %u Parameter. Das ist mehr als die" -#: tfm.cc:77 -#, fuzzy, c-format -msgid "can't find ascii character: %d" -msgstr "Kann ASCII-Zeichen `%d' nicht finden" - #. How to shut up this warning, when no notes appeared because #. they were suicided by Thread_devnull_engraver? #: tie-engraver.cc:220 tie-performer.cc:173 @@ -1202,7 +1186,7 @@ msgstr "F msgid "Have to be in Chord mode for chords" msgstr "Für Akkorde muß ich im Akkord-(Chord)-Modus sein" -#: parser.yy:1911 +#: parser.yy:1910 msgid "need integer number arg" msgstr "" diff --git a/po/fr.po b/po/fr.po index feffb80143..6cad31a3d9 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6,184 +6,169 @@ msgid "" msgstr "" "Project-Id-Version: lilypond 1.3.18\n" -"POT-Creation-Date: 2001-09-09 17:30+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" "MIME-Version: 1.0\n" -#: ly2dvi.py:106 +#: ly2dvi.py:105 msgid "Generate .dvi with LaTeX for LilyPond" msgstr "" -#: data-file.cc:118 input.cc:85 ly2dvi.py:191 midi-parser.cc:100 mup2ly.py:93 +#: data-file.cc:118 input.cc:85 ly2dvi.py:190 midi-parser.cc:100 mup2ly.py:93 #: update-lily.py:118 warn.cc:23 msgid "warning: " msgstr "avertissement: " -#: input.cc:90 ly2dvi.py:206 ly2dvi.py:639 ly2dvi.py:657 ly2dvi.py:848 -#: mup2ly.py:98 mup2ly.py:188 update-lily.py:123 update-lily.py:211 warn.cc:9 -#: warn.cc:17 +#: 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: " -#: ly2dvi.py:207 mup2ly.py:100 update-lily.py:125 +#: ly2dvi.py:206 mup2ly.py:100 update-lily.py:125 #, fuzzy msgid "Exiting ... " msgstr "Ligne ..." -#: ly2dvi.py:265 mup2ly.py:158 update-lily.py:183 +#: ly2dvi.py:264 mup2ly.py:158 update-lily.py:183 #, fuzzy, c-format msgid "Usage: %s [OPTION]... FILE" msgstr "Usage: %s [OPTION... [FICHIER]" -#: ly2dvi.py:269 main.cc:120 main.cc:149 mup2ly.py:162 update-lily.py:187 +#: ly2dvi.py:268 main.cc:120 main.cc:148 mup2ly.py:162 update-lily.py:187 msgid "Options:" msgstr "Options: " -#: ly2dvi.py:273 main.cc:124 main.cc:172 mup2ly.py:168 update-lily.py:191 +#: ly2dvi.py:272 main.cc:124 main.cc:171 mup2ly.py:168 update-lily.py:191 #, fuzzy, c-format msgid "Report bugs to %s" msgstr "Rapporter les bugs " -#: ly2dvi.py:306 mup2ly.py:185 update-lily.py:208 +#: ly2dvi.py:305 mup2ly.py:185 update-lily.py:208 #, c-format msgid "Invoking `%s'" msgstr "" -#: ly2dvi.py:310 mup2ly.py:188 update-lily.py:211 +#: ly2dvi.py:309 mup2ly.py:188 update-lily.py:211 #, c-format msgid "command exited with value %d" msgstr "" -#: ly2dvi.py:312 mup2ly.py:190 update-lily.py:213 +#: ly2dvi.py:311 mup2ly.py:190 update-lily.py:213 msgid "(ignored)" msgstr "" -#: ly2dvi.py:322 +#: ly2dvi.py:321 #, fuzzy, c-format msgid "Cleaning %s..." msgstr "Cration des voix..." -#: ly2dvi.py:337 mup2ly.py:214 update-lily.py:237 +#: ly2dvi.py:336 mup2ly.py:214 update-lily.py:237 #, fuzzy, c-format msgid "no such setting: %s" msgstr "Pas d'instrument tel: `%s'" -#: ly2dvi.py:350 main.cc:113 +#: ly2dvi.py:349 main.cc:112 msgid "write Makefile dependencies for every input file" msgstr "" -#: ly2dvi.py:351 main.cc:96 main.cc:109 mup2ly.py:1117 update-lily.py:251 +#: ly2dvi.py:350 main.cc:96 main.cc:108 mup2ly.py:1117 update-lily.py:251 msgid "this help" msgstr "cette aide" -#: ly2dvi.py:352 main.cc:111 main.cc:116 +#: ly2dvi.py:351 main.cc:110 main.cc:115 msgid "DIR" msgstr "REP" -#: ly2dvi.py:352 +#: ly2dvi.py:351 #, fuzzy msgid "add DIR to LilyPond's search path" msgstr "ajoute REP au chemin de recherche" -#: ly2dvi.py:353 +#: ly2dvi.py:352 #, c-format msgid "keep all output, and name the directory %s.dir" msgstr "" -#: ly2dvi.py:354 +#: ly2dvi.py:353 msgid "don't run LilyPond" msgstr "" -#: ly2dvi.py:355 main.cc:114 +#: ly2dvi.py:354 main.cc:113 #, fuzzy msgid "produce MIDI output only" msgstr "produit seulement la sortie MIDI" -#: ly2dvi.py:356 ly2dvi.py:357 main.cc:99 main.cc:112 main.cc:115 +#: ly2dvi.py:355 main.cc:99 main.cc:111 main.cc:114 msgid "FILE" msgstr "FICHIER" -#: ly2dvi.py:356 +#: ly2dvi.py:355 msgid "write ouput to FILE" msgstr "" #: ly2dvi.py:357 -msgid "find pfa fonts used in FILE" -msgstr "" - -#: ly2dvi.py:359 msgid "generate PostScript output" msgstr "" -#: ly2dvi.py:360 +#: ly2dvi.py:358 msgid "KEY=VAL" msgstr "" -#: ly2dvi.py:360 +#: ly2dvi.py:358 msgid "change global setting KEY to VAL" msgstr "" -#: ly2dvi.py:361 main.cc:119 mup2ly.py:1120 update-lily.py:255 +#: ly2dvi.py:359 main.cc:118 mup2ly.py:1120 update-lily.py:255 msgid "verbose" msgstr "" -#: ly2dvi.py:362 main.cc:105 main.cc:118 mup2ly.py:1121 update-lily.py:256 +#: ly2dvi.py:360 main.cc:105 main.cc:117 mup2ly.py:1121 update-lily.py:256 msgid "print version number" msgstr "afficher le numro de version" -#: ly2dvi.py:363 main.cc:107 main.cc:120 mup2ly.py:1122 update-lily.py:258 +#: ly2dvi.py:361 main.cc:107 main.cc:119 mup2ly.py:1122 update-lily.py:258 msgid "show warranty and copyright" msgstr "" -#: ly2dvi.py:385 ly2dvi.py:580 ly2dvi.py:605 +#: ly2dvi.py:383 ly2dvi.py:578 ly2dvi.py:603 #, fuzzy, c-format msgid "Running %s..." msgstr "Cration des voix..." -#: ly2dvi.py:398 +#: ly2dvi.py:396 #, fuzzy, c-format msgid "Analyzing %s..." msgstr "Cration des voix..." -#: ly2dvi.py:454 +#: ly2dvi.py:452 #, c-format msgid "no lilypond output found for %s" msgstr "" -#: ly2dvi.py:496 +#: ly2dvi.py:494 #, fuzzy, c-format msgid "invalid value: %s" msgstr "caractres illgal: `%c'" -#: ly2dvi.py:639 -#, fuzzy, c-format -msgid "not a PostScript file: `%s'" -msgstr "impossible d'ouvrir le fichier: `%s'" - -#: ly2dvi.py:657 -#, c-format -msgid "getopt says: `%s'" -msgstr "" - -#: ly2dvi.py:824 scores.cc:44 +#: ly2dvi.py:781 scores.cc:44 #, fuzzy, c-format msgid "dependencies output to `%s'..." msgstr "Sortie papier vers %s..." -#: ly2dvi.py:835 +#: 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:837 +#: 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:848 +#: ly2dvi.py:804 msgid "no files specified on command line." msgstr "" @@ -209,7 +194,7 @@ msgstr "" msgid "define macro NAME [optional expansion EXP]" msgstr "" -#: main.cc:115 mup2ly.py:1118 +#: main.cc:114 mup2ly.py:1118 msgid "write output to FILE" msgstr "" @@ -433,6 +418,15 @@ msgstr "" msgid "Can't switch translators, I'm there already" msgstr "" +#: beam.cc:86 +#, fuzzy +msgid "beam has less than two stems" +msgstr "barre avec moins de deux tiges" + +#: beam.cc:637 +msgid "weird beam vertical offset" +msgstr "" + #: beam-engraver.cc:91 beam-engraver.cc:124 #, fuzzy msgid "can't find start of beam" @@ -461,15 +455,6 @@ msgstr "la tige ne rentre pas dans la barre" msgid "beam was started here" msgstr "la barre a commenc ici" -#: beam.cc:86 -#, fuzzy -msgid "beam has less than two stems" -msgstr "barre avec moins de deux tiges" - -#: beam.cc:637 -msgid "weird beam vertical offset" -msgstr "" - #: break-align-item.cc:136 #, fuzzy, c-format msgid "unknown spacing pair `%s', `%s'" @@ -494,24 +479,24 @@ msgstr "" msgid "none of these in my family" msgstr "" -#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:192 -msgid "unterminated chord tremolo" -msgstr "" - -#: chord-tremolo-iterator.cc:48 -msgid "no one to print a tremolos" -msgstr "" - -#: chord.cc:376 +#: chord.cc:369 #, c-format msgid "invalid subtraction: not part of chord: %s" msgstr "soustraction invalide: ne fait pas partie de l'accord: %s" -#: chord.cc:405 +#: chord.cc:398 #, c-format 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:192 +msgid "unterminated chord tremolo" +msgstr "" + +#: chord-tremolo-iterator.cc:48 +msgid "no one to print a tremolos" +msgstr "" + #: collision.cc:127 #, fuzzy msgid "Too many clashing notecolumns. Ignoring them." @@ -626,65 +611,64 @@ msgstr "" msgid "Huh? Melismatic note found to have associated lyrics." msgstr "" -#. print example usage: lilypond -e "(set-lily-option 'help 0)" ? -#: main.cc:105 +#: main.cc:104 msgid "EXPR" msgstr "" -#: main.cc:105 +#: main.cc:104 msgid "evalute EXPR as Scheme after .scm init is read" msgstr "" #. another bug in option parser: --output=foe is taken as an abbreviation #. for --output-format -#: main.cc:108 +#: main.cc:107 msgid "EXT" msgstr "" -#: main.cc:108 +#: main.cc:107 msgid "use output format EXT (scm, ps, tex or as)" msgstr "" -#: main.cc:110 +#: main.cc:109 #, fuzzy msgid "FIELD" msgstr "FICHIER" -#: main.cc:110 +#: main.cc:109 msgid "write header field to BASENAME.FIELD" msgstr "" -#: main.cc:111 +#: main.cc:110 #, fuzzy msgid "add DIR to search path" msgstr "ajoute REP au chemin de recherche" -#: main.cc:112 +#: main.cc:111 #, fuzzy msgid "use FILE as init file" msgstr "utilise FICHIER comme fichier d'initialisation" -#: main.cc:116 +#: main.cc:115 msgid "prepend DIR to dependencies" msgstr "" -#: main.cc:117 +#: main.cc:116 msgid "inhibit file output naming and exporting" msgstr "" #. #. No version number or newline here. It confuses help2man #. -#: main.cc:137 +#: main.cc:136 #, fuzzy, c-format msgid "Usage: %s [OPTION]... FILE..." msgstr "Usage: %s [OPTION]... [FICHIER]..." -#: main.cc:139 +#: main.cc:138 msgid "Typeset music and or play MIDI from FILE" msgstr "" -#: main.cc:143 +#: main.cc:142 #, fuzzy msgid "" "LilyPond is a music typesetter. It produces beautiful sheet music\n" @@ -695,12 +679,12 @@ msgstr "" "paritions partir de description de gaut niveau en entre. Lilypond\n" "fait partie du projet GNU.\n" -#: main.cc:153 +#: main.cc:152 #, fuzzy msgid "This binary was compiled with the following options:" msgstr "Cet excutable a t compil avec les options suivantes:" -#: main.cc:56 main.cc:180 +#: main.cc:56 main.cc:179 #, c-format msgid "" "This is free software. It is covered by the GNU General Public License,\n" @@ -708,17 +692,17 @@ msgid "" "certain conditions. Invoke as `%s --warranty' for more information.\n" msgstr "" -#: main.cc:63 main.cc:187 main.cc:199 +#: main.cc:63 main.cc:186 main.cc:198 #, c-format msgid "Copyright (c) %s by" msgstr "Copyright (c) %s par" -#: main.cc:197 +#: main.cc:196 #, fuzzy msgid "GNU LilyPond -- The music typesetter" msgstr "GNU LilyPond -- Il tipografo musicale del progetto GNU" -#: main.cc:72 main.cc:205 +#: main.cc:72 main.cc:204 msgid "" " This program is free software; you can redistribute it and/or\n" "modify it under the terms of the GNU General Public License version 2\n" @@ -748,10 +732,10 @@ msgstr "" msgid "silly pitch" msgstr "" -#: music-output-def.cc:115 -#, fuzzy, c-format -msgid "can't find `%s' context" -msgstr "ne peut pas trouver `%s'" +#: musical-request.cc:28 +#, c-format +msgid "Transposition by %s makes accidental larger than two" +msgstr "" #: music.cc:232 msgid "ly_get_mus_property (): Not a Music" @@ -773,10 +757,10 @@ msgstr "" msgid "ly_music_name (): Not a music expression" msgstr "" -#: musical-request.cc:28 -#, c-format -msgid "Transposition by %s makes accidental larger than two" -msgstr "" +#: music-output-def.cc:115 +#, fuzzy, c-format +msgid "can't find `%s' context" +msgstr "ne peut pas trouver `%s'" #: my-lily-lexer.cc:139 #, c-format @@ -917,16 +901,11 @@ msgstr "" msgid "too many notes for rest collision" msgstr "" -#: scm-option.cc:63 +#: scm-option.cc:59 #, fuzzy msgid "Scheme options:" msgstr "Options: " -#: score-engraver.cc:188 -#, fuzzy, c-format -msgid "unbound spanner `%s'" -msgstr "traducteur inconnu `%s'" - #: score.cc:78 msgid "Interpreting music..." msgstr "" @@ -945,6 +924,11 @@ msgstr "" msgid "elapsed time: %.2f seconds" msgstr "temps ecoul: %.2f secondes" +#: score-engraver.cc:188 +#, fuzzy, c-format +msgid "unbound spanner `%s'" +msgstr "traducteur inconnu `%s'" + #: scores.cc:106 msgid "Score contains errors; will not process it" msgstr "" @@ -964,6 +948,14 @@ msgstr "" msgid "Separation_item: I've been drinking too much" msgstr "" +#: slur.cc:48 +msgid "Putting slur over rest. Ignoring." +msgstr "" + +#: slur.cc:383 +msgid "Slur over rest?" +msgstr "" + #: slur-engraver.cc:127 msgid "unterminated slur" msgstr "" @@ -975,23 +967,19 @@ msgstr "" msgid "can't find start of slur" msgstr "impossible de trouver le caractres numro %d" -#: slur.cc:48 -msgid "Putting slur over rest. Ignoring." -msgstr "" - -#: slur.cc:383 -msgid "Slur over rest?" -msgstr "" +#: stem.cc:116 +#, fuzzy +msgid "Weird stem size; check for narrow beams" +msgstr "dcallage de barre bizarre, check your knees" #: stem-engraver.cc:115 #, c-format msgid "Adding note head to incompatible stem (type = %d)" msgstr "" -#: stem.cc:116 -#, fuzzy -msgid "Weird stem size; check for narrow beams" -msgstr "dcallage de barre bizarre, check your knees" +#: text-spanner.cc:121 +msgid "Text_spanner too small" +msgstr "" #: text-spanner-engraver.cc:94 #, fuzzy @@ -1008,9 +996,10 @@ msgstr "Il y a dj une barre" msgid "unterminated text spanner" msgstr "Barre non termine" -#: text-spanner.cc:121 -msgid "Text_spanner too small" -msgstr "" +#: tfm.cc:77 +#, fuzzy, c-format +msgid "can't find ascii character: %d" +msgstr "ne peut pas trouver le caractre ascii `%d'" #: tfm-reader.cc:106 #, c-format @@ -1022,11 +1011,6 @@ msgstr "" msgid "%s: TFM file has %u parameters, which is more than the %u I can handle" msgstr "" -#: tfm.cc:77 -#, fuzzy, c-format -msgid "can't find ascii character: %d" -msgstr "ne peut pas trouver le caractre ascii `%d'" - #. How to shut up this warning, when no notes appeared because #. they were suicided by Thread_devnull_engraver? #: tie-engraver.cc:220 tie-performer.cc:173 @@ -1167,7 +1151,7 @@ msgstr "il faut tre en mode Note pour les notes" msgid "Have to be in Chord mode for chords" msgstr "il faut tre en mode Accord pour les accords" -#: parser.yy:1911 +#: parser.yy:1910 msgid "need integer number arg" msgstr "" diff --git a/po/it.po b/po/it.po index af424e7b1e..0aa67d4b4e 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ #, fuzzy msgid "" msgstr "" -"POT-Creation-Date: 2001-09-09 17:30+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" @@ -13,182 +13,167 @@ msgstr "" "out --add-comments --keyword=_ --keyword=_f\n" "Files: bow.cc int.cc\n" -#: ly2dvi.py:106 +#: ly2dvi.py:105 msgid "Generate .dvi with LaTeX for LilyPond" msgstr "" -#: data-file.cc:118 input.cc:85 ly2dvi.py:191 midi-parser.cc:100 mup2ly.py:93 +#: data-file.cc:118 input.cc:85 ly2dvi.py:190 midi-parser.cc:100 mup2ly.py:93 #: update-lily.py:118 warn.cc:23 msgid "warning: " msgstr "attenzione: " -#: input.cc:90 ly2dvi.py:206 ly2dvi.py:639 ly2dvi.py:657 ly2dvi.py:848 -#: mup2ly.py:98 mup2ly.py:188 update-lily.py:123 update-lily.py:211 warn.cc:9 -#: warn.cc:17 +#: 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: " -#: ly2dvi.py:207 mup2ly.py:100 update-lily.py:125 +#: ly2dvi.py:206 mup2ly.py:100 update-lily.py:125 msgid "Exiting ... " msgstr "" -#: ly2dvi.py:265 mup2ly.py:158 update-lily.py:183 +#: ly2dvi.py:264 mup2ly.py:158 update-lily.py:183 #, fuzzy, c-format msgid "Usage: %s [OPTION]... FILE" msgstr "Uso: %s [OPZIONE... [FILE]" -#: ly2dvi.py:269 main.cc:120 main.cc:149 mup2ly.py:162 update-lily.py:187 +#: ly2dvi.py:268 main.cc:120 main.cc:148 mup2ly.py:162 update-lily.py:187 msgid "Options:" msgstr "Opzioni: " -#: ly2dvi.py:273 main.cc:124 main.cc:172 mup2ly.py:168 update-lily.py:191 +#: ly2dvi.py:272 main.cc:124 main.cc:171 mup2ly.py:168 update-lily.py:191 #, c-format msgid "Report bugs to %s" msgstr "" -#: ly2dvi.py:306 mup2ly.py:185 update-lily.py:208 +#: ly2dvi.py:305 mup2ly.py:185 update-lily.py:208 #, c-format msgid "Invoking `%s'" msgstr "" -#: ly2dvi.py:310 mup2ly.py:188 update-lily.py:211 +#: ly2dvi.py:309 mup2ly.py:188 update-lily.py:211 #, c-format msgid "command exited with value %d" msgstr "" -#: ly2dvi.py:312 mup2ly.py:190 update-lily.py:213 +#: ly2dvi.py:311 mup2ly.py:190 update-lily.py:213 msgid "(ignored)" msgstr "" -#: ly2dvi.py:322 +#: ly2dvi.py:321 #, fuzzy, c-format msgid "Cleaning %s..." msgstr "Genero le voci..." -#: ly2dvi.py:337 mup2ly.py:214 update-lily.py:237 +#: ly2dvi.py:336 mup2ly.py:214 update-lily.py:237 #, fuzzy, c-format msgid "no such setting: %s" msgstr "% strumento:" -#: ly2dvi.py:350 main.cc:113 +#: ly2dvi.py:349 main.cc:112 #, fuzzy msgid "write Makefile dependencies for every input file" msgstr "" " -d, --dependencies scrive le dependenze del Makefile per ogni file di " "input\n" -#: ly2dvi.py:351 main.cc:96 main.cc:109 mup2ly.py:1117 update-lily.py:251 +#: ly2dvi.py:350 main.cc:96 main.cc:108 mup2ly.py:1117 update-lily.py:251 msgid "this help" msgstr "" -#: ly2dvi.py:352 main.cc:111 main.cc:116 +#: ly2dvi.py:351 main.cc:110 main.cc:115 msgid "DIR" msgstr "" -#: ly2dvi.py:352 +#: ly2dvi.py:351 #, fuzzy msgid "add DIR to LilyPond's search path" msgstr " -I, --include=DIR aggiunge DIR ai path di ricerca\n" -#: ly2dvi.py:353 +#: ly2dvi.py:352 #, c-format msgid "keep all output, and name the directory %s.dir" msgstr "" -#: ly2dvi.py:354 +#: ly2dvi.py:353 msgid "don't run LilyPond" msgstr "" -#: ly2dvi.py:355 main.cc:114 +#: ly2dvi.py:354 main.cc:113 #, fuzzy msgid "produce MIDI output only" msgstr " -M, --no-paper produce solo output midi\n" -#: ly2dvi.py:356 ly2dvi.py:357 main.cc:99 main.cc:112 main.cc:115 +#: ly2dvi.py:355 main.cc:99 main.cc:111 main.cc:114 msgid "FILE" msgstr "" -#: ly2dvi.py:356 +#: ly2dvi.py:355 msgid "write ouput to FILE" msgstr "" #: ly2dvi.py:357 -msgid "find pfa fonts used in FILE" -msgstr "" - -#: ly2dvi.py:359 #, fuzzy msgid "generate PostScript output" msgstr "vincoli degenerati" -#: ly2dvi.py:360 +#: ly2dvi.py:358 msgid "KEY=VAL" msgstr "" -#: ly2dvi.py:360 +#: ly2dvi.py:358 msgid "change global setting KEY to VAL" msgstr "" -#: ly2dvi.py:361 main.cc:119 mup2ly.py:1120 update-lily.py:255 +#: ly2dvi.py:359 main.cc:118 mup2ly.py:1120 update-lily.py:255 msgid "verbose" msgstr "" -#: ly2dvi.py:362 main.cc:105 main.cc:118 mup2ly.py:1121 update-lily.py:256 +#: ly2dvi.py:360 main.cc:105 main.cc:117 mup2ly.py:1121 update-lily.py:256 msgid "print version number" msgstr "" -#: ly2dvi.py:363 main.cc:107 main.cc:120 mup2ly.py:1122 update-lily.py:258 +#: ly2dvi.py:361 main.cc:107 main.cc:119 mup2ly.py:1122 update-lily.py:258 #, fuzzy msgid "show warranty and copyright" msgstr " -w, --warranty mostra la garanzia e il copyright\n" -#: ly2dvi.py:385 ly2dvi.py:580 ly2dvi.py:605 +#: ly2dvi.py:383 ly2dvi.py:578 ly2dvi.py:603 #, fuzzy, c-format msgid "Running %s..." msgstr "Genero le voci..." -#: ly2dvi.py:398 +#: ly2dvi.py:396 #, fuzzy, c-format msgid "Analyzing %s..." msgstr "Genero le voci..." -#: ly2dvi.py:454 +#: ly2dvi.py:452 #, c-format msgid "no lilypond output found for %s" msgstr "" -#: ly2dvi.py:496 +#: ly2dvi.py:494 #, fuzzy, c-format msgid "invalid value: %s" msgstr "carattere illegale: `%c'" -#: ly2dvi.py:639 -#, fuzzy, c-format -msgid "not a PostScript file: `%s'" -msgstr "non posso aprire il file: `%s'" - -#: ly2dvi.py:657 -#, c-format -msgid "getopt says: `%s'" -msgstr "" - -#: ly2dvi.py:824 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:835 +#: 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:837 +#: 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:848 +#: ly2dvi.py:804 msgid "no files specified on command line." msgstr "" @@ -214,7 +199,7 @@ msgstr "" msgid "define macro NAME [optional expansion EXP]" msgstr "" -#: main.cc:115 mup2ly.py:1118 +#: main.cc:114 mup2ly.py:1118 msgid "write output to FILE" msgstr "" @@ -434,6 +419,15 @@ msgstr "" msgid "Can't switch translators, I'm there already" msgstr "" +#: beam.cc:86 +#, fuzzy +msgid "beam has less than two stems" +msgstr "beam con meno di due gambi" + +#: beam.cc:637 +msgid "weird beam vertical offset" +msgstr "" + #: beam-engraver.cc:91 beam-engraver.cc:124 #, fuzzy msgid "can't find start of beam" @@ -461,15 +455,6 @@ msgstr "il gambo non rientra nel beam" msgid "beam was started here" msgstr "" -#: beam.cc:86 -#, fuzzy -msgid "beam has less than two stems" -msgstr "beam con meno di due gambi" - -#: beam.cc:637 -msgid "weird beam vertical offset" -msgstr "" - #: break-align-item.cc:136 #, fuzzy, c-format msgid "unknown spacing pair `%s', `%s'" @@ -494,6 +479,16 @@ msgstr "" msgid "none of these in my family" msgstr "" +#: chord.cc:369 +#, c-format +msgid "invalid subtraction: not part of chord: %s" +msgstr "" + +#: chord.cc:398 +#, c-format +msgid "invalid inversion pitch: not part of chord: %s" +msgstr "" + #: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:192 #, fuzzy msgid "unterminated chord tremolo" @@ -503,16 +498,6 @@ msgstr "beam non terminato" msgid "no one to print a tremolos" msgstr "" -#: chord.cc:376 -#, c-format -msgid "invalid subtraction: not part of chord: %s" -msgstr "" - -#: chord.cc:405 -#, c-format -msgid "invalid inversion pitch: not part of chord: %s" -msgstr "" - #: collision.cc:127 #, fuzzy msgid "Too many clashing notecolumns. Ignoring them." @@ -628,48 +613,47 @@ msgstr "" msgid "Huh? Melismatic note found to have associated lyrics." msgstr "" -#. print example usage: lilypond -e "(set-lily-option 'help 0)" ? -#: main.cc:105 +#: main.cc:104 msgid "EXPR" msgstr "" -#: main.cc:105 +#: main.cc:104 msgid "evalute EXPR as Scheme after .scm init is read" msgstr "" #. another bug in option parser: --output=foe is taken as an abbreviation #. for --output-format -#: main.cc:108 +#: main.cc:107 msgid "EXT" msgstr "" -#: main.cc:108 +#: main.cc:107 msgid "use output format EXT (scm, ps, tex or as)" msgstr "" -#: main.cc:110 +#: main.cc:109 msgid "FIELD" msgstr "" -#: main.cc:110 +#: main.cc:109 msgid "write header field to BASENAME.FIELD" msgstr "" -#: main.cc:111 +#: main.cc:110 #, fuzzy msgid "add DIR to search path" msgstr " -I, --include=DIR aggiunge DIR ai path di ricerca\n" -#: main.cc:112 +#: main.cc:111 #, fuzzy msgid "use FILE as init file" msgstr " -i, --init=NOMEFILE usa NOMEFILE come file iniziale\n" -#: main.cc:116 +#: main.cc:115 msgid "prepend DIR to dependencies" msgstr "" -#: main.cc:117 +#: main.cc:116 #, fuzzy msgid "inhibit file output naming and exporting" msgstr "" @@ -679,29 +663,29 @@ msgstr "" #. #. No version number or newline here. It confuses help2man #. -#: main.cc:137 +#: main.cc:136 #, fuzzy, c-format msgid "Usage: %s [OPTION]... FILE..." msgstr "Uso: %s [OPZIONE]... [FILE]..." -#: main.cc:139 +#: main.cc:138 #, fuzzy msgid "Typeset music and or play MIDI from FILE" msgstr "Stampa partitura oppure suona una song MIDI da FILE o " -#: main.cc:143 +#: main.cc:142 msgid "" "LilyPond is a music typesetter. It produces beautiful sheet music\n" "using a high level description file as input. LilyPond is part of \n" "the GNU Project.\n" msgstr "" -#: main.cc:153 +#: main.cc:152 #, fuzzy msgid "This binary was compiled with the following options:" msgstr "GNU LilyPond è stata compilata con le seguenti impostazioni:" -#: main.cc:56 main.cc:180 +#: main.cc:56 main.cc:179 #, c-format msgid "" "This is free software. It is covered by the GNU General Public License,\n" @@ -709,17 +693,17 @@ msgid "" "certain conditions. Invoke as `%s --warranty' for more information.\n" msgstr "" -#: main.cc:63 main.cc:187 main.cc:199 +#: main.cc:63 main.cc:186 main.cc:198 #, c-format msgid "Copyright (c) %s by" msgstr "Copyright (c) %s di" -#: main.cc:197 +#: main.cc:196 #, fuzzy msgid "GNU LilyPond -- The music typesetter" msgstr "GNU LilyPond -- Il tipografo musicale del progetto GNU" -#: main.cc:72 main.cc:205 +#: main.cc:72 main.cc:204 msgid "" " This program is free software; you can redistribute it and/or\n" "modify it under the terms of the GNU General Public License version 2\n" @@ -764,10 +748,10 @@ msgstr "indicazione durata priva di senso" msgid "silly pitch" msgstr "indicazione altezza priva di senso" -#: music-output-def.cc:115 +#: musical-request.cc:28 #, fuzzy, c-format -msgid "can't find `%s' context" -msgstr "non trovo `%s'" +msgid "Transposition by %s makes accidental larger than two" +msgstr "la trasposizine di %s rende le alterazioni più che doppie" #: music.cc:232 msgid "ly_get_mus_property (): Not a Music" @@ -789,10 +773,10 @@ msgstr "" msgid "ly_music_name (): Not a music expression" msgstr "" -#: musical-request.cc:28 +#: music-output-def.cc:115 #, fuzzy, c-format -msgid "Transposition by %s makes accidental larger than two" -msgstr "la trasposizine di %s rende le alterazioni più che doppie" +msgid "can't find `%s' context" +msgstr "non trovo `%s'" #: my-lily-lexer.cc:139 #, fuzzy, c-format @@ -936,16 +920,11 @@ msgstr "Troppi crescendi" msgid "too many notes for rest collision" msgstr "" -#: scm-option.cc:63 +#: scm-option.cc:59 #, fuzzy msgid "Scheme options:" msgstr "Opzioni: " -#: score-engraver.cc:188 -#, fuzzy, c-format -msgid "unbound spanner `%s'" -msgstr "Spanner non legato `%s'" - #: score.cc:78 msgid "Interpreting music..." msgstr "Interpretazione della musica..." @@ -966,6 +945,11 @@ msgstr "ho trovato un errore, /*non sto elaborando lo spartito*/" msgid "elapsed time: %.2f seconds" msgstr "durata: %.2f secondi" +#: score-engraver.cc:188 +#, fuzzy, c-format +msgid "unbound spanner `%s'" +msgstr "Spanner non legato `%s'" + #: scores.cc:106 #, fuzzy msgid "Score contains errors; will not process it" @@ -986,6 +970,16 @@ msgstr "" msgid "Separation_item: I've been drinking too much" msgstr "" +#: slur.cc:48 +#, fuzzy +msgid "Putting slur over rest. Ignoring." +msgstr "Metto uno slur sulla pausa." + +#: slur.cc:383 +#, fuzzy +msgid "Slur over rest?" +msgstr "Metto uno slur sulla pausa." + #: slur-engraver.cc:127 msgid "unterminated slur" msgstr "slur non terminato" @@ -997,25 +991,19 @@ msgstr "slur non terminato" msgid "can't find start of slur" msgstr "non trovo le estremità di %s" -#: slur.cc:48 -#, fuzzy -msgid "Putting slur over rest. Ignoring." -msgstr "Metto uno slur sulla pausa." - -#: slur.cc:383 +#: stem.cc:116 #, fuzzy -msgid "Slur over rest?" -msgstr "Metto uno slur sulla pausa." +msgid "Weird stem size; check for narrow beams" +msgstr "dimensione del gambo poco ortodossa; check for narrow beams" #: stem-engraver.cc:115 #, c-format msgid "Adding note head to incompatible stem (type = %d)" msgstr "" -#: stem.cc:116 -#, fuzzy -msgid "Weird stem size; check for narrow beams" -msgstr "dimensione del gambo poco ortodossa; check for narrow beams" +#: text-spanner.cc:121 +msgid "Text_spanner too small" +msgstr "" #: text-spanner-engraver.cc:94 #, fuzzy @@ -1032,9 +1020,10 @@ msgstr "crescendo non terminato" msgid "unterminated text spanner" msgstr "extender non terminato" -#: text-spanner.cc:121 -msgid "Text_spanner too small" -msgstr "" +#: tfm.cc:77 +#, fuzzy, c-format +msgid "can't find ascii character: %d" +msgstr "non riesco a trovare il carattere `%s'" #: tfm-reader.cc:106 #, c-format @@ -1046,11 +1035,6 @@ msgstr "" msgid "%s: TFM file has %u parameters, which is more than the %u I can handle" msgstr "" -#: tfm.cc:77 -#, fuzzy, c-format -msgid "can't find ascii character: %d" -msgstr "non riesco a trovare il carattere `%s'" - #. How to shut up this warning, when no notes appeared because #. they were suicided by Thread_devnull_engraver? #: tie-engraver.cc:220 tie-performer.cc:173 @@ -1191,7 +1175,7 @@ msgstr "bisogna essere in Note mode per le note" msgid "Have to be in Chord mode for chords" msgstr "bisogna essere in Chord mode per gli accordi" -#: parser.yy:1911 +#: parser.yy:1910 msgid "need integer number arg" msgstr "" diff --git a/po/ja.po b/po/ja.po index c62e927173..f652910f64 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: lilypond 1.2.17\n" -"POT-Creation-Date: 2001-09-09 17:30+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" @@ -13,180 +13,165 @@ msgstr "" "Content-Type: text/plain; charset=EUC-JP\n" "Content-Transfer-Encoding: 8bit\n" -#: ly2dvi.py:106 +#: ly2dvi.py:105 msgid "Generate .dvi with LaTeX for LilyPond" msgstr "" -#: data-file.cc:118 input.cc:85 ly2dvi.py:191 midi-parser.cc:100 mup2ly.py:93 +#: data-file.cc:118 input.cc:85 ly2dvi.py:190 midi-parser.cc:100 mup2ly.py:93 #: update-lily.py:118 warn.cc:23 msgid "warning: " msgstr "·Ù¹ð: " -#: input.cc:90 ly2dvi.py:206 ly2dvi.py:639 ly2dvi.py:657 ly2dvi.py:848 -#: mup2ly.py:98 mup2ly.py:188 update-lily.py:123 update-lily.py:211 warn.cc:9 -#: warn.cc:17 +#: 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 "¥¨¥é¡¼: " -#: ly2dvi.py:207 mup2ly.py:100 update-lily.py:125 +#: ly2dvi.py:206 mup2ly.py:100 update-lily.py:125 #, fuzzy msgid "Exiting ... " msgstr "¹Ô ..." -#: ly2dvi.py:265 mup2ly.py:158 update-lily.py:183 +#: ly2dvi.py:264 mup2ly.py:158 update-lily.py:183 #, fuzzy, c-format msgid "Usage: %s [OPTION]... FILE" msgstr "»È¤¤Êý: %s [¥ª¥×¥·¥ç¥ó]... [¥Õ¥¡¥¤¥ë]" -#: ly2dvi.py:269 main.cc:120 main.cc:149 mup2ly.py:162 update-lily.py:187 +#: ly2dvi.py:268 main.cc:120 main.cc:148 mup2ly.py:162 update-lily.py:187 msgid "Options:" msgstr "¥ª¥×¥·¥ç¥ó:" -#: ly2dvi.py:273 main.cc:124 main.cc:172 mup2ly.py:168 update-lily.py:191 +#: ly2dvi.py:272 main.cc:124 main.cc:171 mup2ly.py:168 update-lily.py:191 #, c-format msgid "Report bugs to %s" msgstr "¥Ð¥°¥ì¥Ý¡¼¥È¤Ï %s ¤Ø" -#: ly2dvi.py:306 mup2ly.py:185 update-lily.py:208 +#: ly2dvi.py:305 mup2ly.py:185 update-lily.py:208 #, fuzzy, c-format msgid "Invoking `%s'" msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'" -#: ly2dvi.py:310 mup2ly.py:188 update-lily.py:211 +#: ly2dvi.py:309 mup2ly.py:188 update-lily.py:211 #, c-format msgid "command exited with value %d" msgstr "" -#: ly2dvi.py:312 mup2ly.py:190 update-lily.py:213 +#: ly2dvi.py:311 mup2ly.py:190 update-lily.py:213 msgid "(ignored)" msgstr "" -#: ly2dvi.py:322 +#: ly2dvi.py:321 #, fuzzy, c-format msgid "Cleaning %s..." msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'" -#: ly2dvi.py:337 mup2ly.py:214 update-lily.py:237 +#: ly2dvi.py:336 mup2ly.py:214 update-lily.py:237 #, fuzzy, c-format msgid "no such setting: %s" msgstr "¤½¤ÎÍͤʳڴï¤Ï¤¢¤ê¤Þ¤»¤ó: `%s'" -#: ly2dvi.py:350 main.cc:113 +#: ly2dvi.py:349 main.cc:112 msgid "write Makefile dependencies for every input file" msgstr "Á´¤Æ¤ÎÆþÎÏ¥Õ¥¡¥¤¥ë¤Î Makefile °Í¸´Ø·¸¤ò½ñ¤­¹þ¤à" -#: ly2dvi.py:351 main.cc:96 main.cc:109 mup2ly.py:1117 update-lily.py:251 +#: ly2dvi.py:350 main.cc:96 main.cc:108 mup2ly.py:1117 update-lily.py:251 msgid "this help" msgstr "¤³¤Î¥Ø¥ë¥×" -#: ly2dvi.py:352 main.cc:111 main.cc:116 +#: ly2dvi.py:351 main.cc:110 main.cc:115 msgid "DIR" msgstr "DIR" -#: ly2dvi.py:352 +#: ly2dvi.py:351 #, fuzzy msgid "add DIR to LilyPond's search path" msgstr "DIR ¤ò¸¡º÷¥Ñ¥¹¤ËÄɲÃ" -#: ly2dvi.py:353 +#: ly2dvi.py:352 #, c-format msgid "keep all output, and name the directory %s.dir" msgstr "" -#: ly2dvi.py:354 +#: ly2dvi.py:353 msgid "don't run LilyPond" msgstr "" -#: ly2dvi.py:355 main.cc:114 +#: ly2dvi.py:354 main.cc:113 msgid "produce MIDI output only" msgstr "MIDI ½ÐÎϤÎÀ¸À®¤Î¤ß" -#: ly2dvi.py:356 ly2dvi.py:357 main.cc:99 main.cc:112 main.cc:115 +#: ly2dvi.py:355 main.cc:99 main.cc:111 main.cc:114 msgid "FILE" msgstr "FILE" -#: ly2dvi.py:356 +#: ly2dvi.py:355 #, fuzzy msgid "write ouput to FILE" msgstr "BASENAME[-x].³ÈÄ¥»Ò ¤Ø½ÐÎϤò½ñ¤­¹þ¤à" #: ly2dvi.py:357 -msgid "find pfa fonts used in FILE" -msgstr "" - -#: ly2dvi.py:359 #, fuzzy msgid "generate PostScript output" msgstr "À©¸Â¤ò´ËÏÂ" -#: ly2dvi.py:360 +#: ly2dvi.py:358 msgid "KEY=VAL" msgstr "" -#: ly2dvi.py:360 +#: ly2dvi.py:358 msgid "change global setting KEY to VAL" msgstr "" -#: ly2dvi.py:361 main.cc:119 mup2ly.py:1120 update-lily.py:255 +#: ly2dvi.py:359 main.cc:118 mup2ly.py:1120 update-lily.py:255 #, fuzzy msgid "verbose" msgstr "¾ÜºÙ¤Ê¾ðÊó¤òɽ¼¨¤·¤Þ¤¹" -#: ly2dvi.py:362 main.cc:105 main.cc:118 mup2ly.py:1121 update-lily.py:256 +#: ly2dvi.py:360 main.cc:105 main.cc:117 mup2ly.py:1121 update-lily.py:256 msgid "print version number" msgstr "¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤òɽ¼¨" -#: ly2dvi.py:363 main.cc:107 main.cc:120 mup2ly.py:1122 update-lily.py:258 +#: ly2dvi.py:361 main.cc:107 main.cc:119 mup2ly.py:1122 update-lily.py:258 msgid "show warranty and copyright" msgstr "ÊݾڤÈÃøºî¸¢¤Ë¤Ä¤¤¤Æɽ¼¨¤¹¤ë" -#: ly2dvi.py:385 ly2dvi.py:580 ly2dvi.py:605 +#: ly2dvi.py:383 ly2dvi.py:578 ly2dvi.py:603 #, fuzzy, c-format msgid "Running %s..." msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'" -#: ly2dvi.py:398 +#: ly2dvi.py:396 #, fuzzy, c-format msgid "Analyzing %s..." msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'" -#: ly2dvi.py:454 +#: ly2dvi.py:452 #, c-format msgid "no lilypond output found for %s" msgstr "" -#: ly2dvi.py:496 +#: ly2dvi.py:494 #, fuzzy, c-format msgid "invalid value: %s" msgstr "̵¸ú¤Êʸ»ú: `%c'" -#: ly2dvi.py:639 -#, fuzzy, c-format -msgid "not a PostScript file: `%s'" -msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤±¤Þ¤»¤ó: `%s'" - -#: ly2dvi.py:657 -#, c-format -msgid "getopt says: `%s'" -msgstr "" - -#: ly2dvi.py:824 scores.cc:44 +#: ly2dvi.py:781 scores.cc:44 #, fuzzy, c-format msgid "dependencies output to `%s'..." msgstr "%s ¤Ø paper ½ÐÎÏ..." -#: ly2dvi.py:835 +#: ly2dvi.py:791 #, fuzzy, c-format msgid "%s output to `%s'..." msgstr "%s ¤Ø¤Î MIDI ½ÐÎÏ" -#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:837 +#: 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:848 +#: ly2dvi.py:804 msgid "no files specified on command line." msgstr "" @@ -212,7 +197,7 @@ msgstr "" msgid "define macro NAME [optional expansion EXP]" msgstr "" -#: main.cc:115 mup2ly.py:1118 +#: main.cc:114 mup2ly.py:1118 #, fuzzy msgid "write output to FILE" msgstr "BASENAME[-x].³ÈÄ¥»Ò ¤Ø½ÐÎϤò½ñ¤­¹þ¤à" @@ -434,6 +419,15 @@ msgstr " msgid "Can't switch translators, I'm there already" msgstr "¥È¥é¥ó¥¹¥ì¡¼¥¿¤òÀÚ¤êÂؤ¨¤é¤ì¤Þ¤»¤ó¡£´û¤Ë¤½¤¦¤Ê¤Ã¤Æ¤¤¤Þ¤¹" +#: beam.cc:86 +#, fuzzy +msgid "beam has less than two stems" +msgstr "³Ã¤¬Æó¤Ä̤Ëþ¤ÎÉäÈø¤È¤È¤â¤Ë»È¤ï¤ì¤Þ¤·¤¿" + +#: beam.cc:637 +msgid "weird beam vertical offset" +msgstr "¿âľÊý¸þ¤Î°ÌÃ֤Ȥ·¤Æ¤ª¤«¤·¤Ê³Ã" + #: beam-engraver.cc:91 beam-engraver.cc:124 msgid "can't find start of beam" msgstr "" @@ -463,15 +457,6 @@ msgstr " msgid "beam was started here" msgstr "³Ã¤Ï¤³¤³¤«¤é³«»Ï¤µ¤ì¤Þ¤·¤¿" -#: beam.cc:86 -#, fuzzy -msgid "beam has less than two stems" -msgstr "³Ã¤¬Æó¤Ä̤Ëþ¤ÎÉäÈø¤È¤È¤â¤Ë»È¤ï¤ì¤Þ¤·¤¿" - -#: beam.cc:637 -msgid "weird beam vertical offset" -msgstr "¿âľÊý¸þ¤Î°ÌÃ֤Ȥ·¤Æ¤ª¤«¤·¤Ê³Ã" - #: break-align-item.cc:136 #, fuzzy, c-format msgid "unknown spacing pair `%s', `%s'" @@ -496,6 +481,16 @@ msgstr " msgid "none of these in my family" msgstr "¥Õ¥¡¥ß¥ê¤ÎÃæ¤Ë¤¢¤ê¤Þ¤»¤ó" +#: chord.cc:369 +#, c-format +msgid "invalid subtraction: not part of chord: %s" +msgstr "̵¸ú¤Ê°ú¤­»»: ¥³¡¼¥É¤Î°ìÉô¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó: %s" + +#: chord.cc:398 +#, c-format +msgid "invalid inversion pitch: not part of chord: %s" +msgstr "̵¸ú¤Êž²ó¥Ô¥Ã¥Á: ¥³¡¼¥É¤Î°ìÉô¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó: %s" + #: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:192 #, fuzzy msgid "unterminated chord tremolo" @@ -506,16 +501,6 @@ msgstr " msgid "no one to print a tremolos" msgstr "È¿Éüµ­¹æ¤òɽ¼¨¤¹¤ë¤â¤Î¤¬¤¢¤ê¤Þ¤»¤ó" -#: chord.cc:376 -#, c-format -msgid "invalid subtraction: not part of chord: %s" -msgstr "̵¸ú¤Ê°ú¤­»»: ¥³¡¼¥É¤Î°ìÉô¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó: %s" - -#: chord.cc:405 -#, c-format -msgid "invalid inversion pitch: not part of chord: %s" -msgstr "̵¸ú¤Êž²ó¥Ô¥Ã¥Á: ¥³¡¼¥É¤Î°ìÉô¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó: %s" - #: collision.cc:127 msgid "Too many clashing notecolumns. Ignoring them." msgstr "Äà¤ê¹ç¤ï¤Ê¤¤²»É䤬¿¤¹¤®¤Þ¤¹¡£¤½¤ì¤é¤ò̵»ë¤·¤Þ¤¹¡£" @@ -628,64 +613,63 @@ msgstr "" msgid "Huh? Melismatic note found to have associated lyrics." msgstr "" -#. print example usage: lilypond -e "(set-lily-option 'help 0)" ? -#: main.cc:105 +#: main.cc:104 msgid "EXPR" msgstr "" -#: main.cc:105 +#: main.cc:104 msgid "evalute EXPR as Scheme after .scm init is read" msgstr "" #. another bug in option parser: --output=foe is taken as an abbreviation #. for --output-format -#: main.cc:108 +#: main.cc:107 msgid "EXT" msgstr "EXT" -#: main.cc:108 +#: main.cc:107 #, fuzzy msgid "use output format EXT (scm, ps, tex or as)" msgstr "½ÐÎÏ¥Õ¥©¡¼¥Þ¥Ã¥È EXT ¤ò»È¤¦" -#: main.cc:110 +#: main.cc:109 #, fuzzy msgid "FIELD" msgstr "FILE" -#: main.cc:110 +#: main.cc:109 msgid "write header field to BASENAME.FIELD" msgstr "" -#: main.cc:111 +#: main.cc:110 msgid "add DIR to search path" msgstr "DIR ¤ò¸¡º÷¥Ñ¥¹¤ËÄɲÃ" -#: main.cc:112 +#: main.cc:111 msgid "use FILE as init file" msgstr "FILE ¤ò½é´ü²½¥Õ¥¡¥¤¥ë¤È¤·¤Æ»ÈÍÑ" -#: main.cc:116 +#: main.cc:115 msgid "prepend DIR to dependencies" msgstr "" -#: main.cc:117 +#: main.cc:116 msgid "inhibit file output naming and exporting" msgstr "̾Á°ÉÕ¤±¤È¥¨¥¯¥¹¥Ý¡¼¥È¤Î½ÐÎÏ¥Õ¥¡¥¤¥ë¤òÍÞÀ©¤¹¤ë" #. #. No version number or newline here. It confuses help2man #. -#: main.cc:137 +#: main.cc:136 #, fuzzy, c-format msgid "Usage: %s [OPTION]... FILE..." msgstr "»È¤¤Êý: %s [¥ª¥×¥·¥ç¥ó]... [¥Õ¥¡¥¤¥ë]..." -#: main.cc:139 +#: main.cc:138 msgid "Typeset music and or play MIDI from FILE" msgstr "¥Õ¥¡¥¤¥ë¤Î³Ú¶Ê¤òÁÈÈǤ·¤¿¤ê¡¢MIDI ±éÁÕ¤·¤¿¤ê¤¹¤ë" -#: main.cc:143 +#: main.cc:142 msgid "" "LilyPond is a music typesetter. It produces beautiful sheet music\n" "using a high level description file as input. LilyPond is part of \n" @@ -695,11 +679,11 @@ msgstr "" "Èþ¤·¤¤ÉèÌ̤òºîÀ®¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£LilyPond ¤Ï GNU ¥×¥í¥¸¥§¥¯¥È¤Î°ìÉô¤Ç" "¤¹¡£\n" -#: main.cc:153 +#: main.cc:152 msgid "This binary was compiled with the following options:" msgstr "¤³¤Î¥Ð¥¤¥Ê¥ê¤Ï°Ê²¼¤Î¥ª¥×¥·¥ç¥óÉÕ¤­¤Ç¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤Þ¤·¤¿" -#: main.cc:56 main.cc:180 +#: main.cc:56 main.cc:179 #, c-format msgid "" "This is free software. It is covered by the GNU General Public License,\n" @@ -715,17 +699,17 @@ msgstr "" "¤³¤ì¤ò²þÊѤ·¤¿¤ê¡¢Ê£À½¤òÇÛÉÛ¤·¤¿¤ê¤¹¤ë»ö¤Ï´¿·Þ¤µ¤ì¤Þ¤¹¡£\n" "`--warranty' ¥ª¥×¥·¥ç¥óÉÕ¤­¤Çµ¯Æ°¤¹¤ë¤È¡¢¤è¤ê¾ÜºÙ¤Ê¾ðÊó¤¬ÆÀ¤é¤ì¤Þ¤¹¡£\n" -#: main.cc:63 main.cc:187 main.cc:199 +#: main.cc:63 main.cc:186 main.cc:198 #, c-format msgid "Copyright (c) %s by" msgstr "Copyright (c) %s by" -#: main.cc:197 +#: main.cc:196 #, fuzzy msgid "GNU LilyPond -- The music typesetter" msgstr "GNU LilyPond -- The GNU Project music typesetter" -#: main.cc:72 main.cc:205 +#: main.cc:72 main.cc:204 msgid "" " This program is free software; you can redistribute it and/or\n" "modify it under the terms of the GNU General Public License version 2\n" @@ -785,10 +769,10 @@ msgstr " msgid "silly pitch" msgstr "Çϼ¯¤²¤¿¥Ô¥Ã¥Á" -#: music-output-def.cc:115 -#, fuzzy, c-format -msgid "can't find `%s' context" -msgstr "`%s' ¥³¥ó¥Æ¥­¥¹¥È¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó" +#: musical-request.cc:28 +#, c-format +msgid "Transposition by %s makes accidental larger than two" +msgstr "%s ¤ÎÊÑÄ´¤Ë¤è¤Ã¤Æ¡¢Æó¤Ä¤òĶ¤¨¤ëÇÉÀ¸²»¤¬ºî¤é¤ì¤Þ¤·¤¿" #: music.cc:232 msgid "ly_get_mus_property (): Not a Music" @@ -810,10 +794,10 @@ msgstr "" msgid "ly_music_name (): Not a music expression" msgstr "" -#: musical-request.cc:28 -#, c-format -msgid "Transposition by %s makes accidental larger than two" -msgstr "%s ¤ÎÊÑÄ´¤Ë¤è¤Ã¤Æ¡¢Æó¤Ä¤òĶ¤¨¤ëÇÉÀ¸²»¤¬ºî¤é¤ì¤Þ¤·¤¿" +#: music-output-def.cc:115 +#, fuzzy, c-format +msgid "can't find `%s' context" +msgstr "`%s' ¥³¥ó¥Æ¥­¥¹¥È¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó" #: my-lily-lexer.cc:139 #, c-format @@ -953,16 +937,11 @@ msgstr " msgid "too many notes for rest collision" msgstr "µÙÉä¤Î¾×ÆͤËÂФ·¤Æ²»É䤬¿¤¹¤®¤Þ¤¹" -#: scm-option.cc:63 +#: scm-option.cc:59 #, fuzzy msgid "Scheme options:" msgstr "¥ª¥×¥·¥ç¥ó:" -#: score-engraver.cc:188 -#, c-format -msgid "unbound spanner `%s'" -msgstr "ÊĤ¸¤Æ¤¤¤Ê¤¤¥¹¥Ñ¥Ê `%s'" - #: score.cc:78 msgid "Interpreting music..." msgstr "³Ú¶Ê¤Î²ò¼áÃæ..." @@ -981,6 +960,11 @@ msgstr " msgid "elapsed time: %.2f seconds" msgstr "·Ð²á»þ´Ö: %.2f ÉÃ" +#: score-engraver.cc:188 +#, c-format +msgid "unbound spanner `%s'" +msgstr "ÊĤ¸¤Æ¤¤¤Ê¤¤¥¹¥Ñ¥Ê `%s'" + #: scores.cc:106 msgid "Score contains errors; will not process it" msgstr "³ÚÉè¤Ë¥¨¥é¡¼¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹ -- ½èÍý¤·¤Þ¤»¤ó" @@ -1001,6 +985,14 @@ msgstr " msgid "Separation_item: I've been drinking too much" msgstr "Single_malt_grouping_item: °û¤ß¤¹¤®¤Á¤ã¤Ã¤¿" +#: slur.cc:48 +msgid "Putting slur over rest. Ignoring." +msgstr "µÙÉä¤ò¤Þ¤¿¤¤¤À¥¹¥é¡¼¤¬¤¢¤ê¤Þ¤¹¡£Ìµ»ë¤·¤Þ¤¹¡£" + +#: slur.cc:383 +msgid "Slur over rest?" +msgstr "¥¹¥é¡¼¤¬µÙÉä¤ò¤Þ¤¿¤¤¤Ç¤¤¤ë?" + #: slur-engraver.cc:127 msgid "unterminated slur" msgstr "½ªÃ¼¤µ¤ì¤Æ¤¤¤Ê¤¤¥¹¥é¡¼" @@ -1012,22 +1004,18 @@ msgstr " msgid "can't find start of slur" msgstr "ËöÈø¤Ø¤Î(¥Ç)¥¯¥ì¥Ã¥·¥§¥ó¥É¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó" -#: slur.cc:48 -msgid "Putting slur over rest. Ignoring." -msgstr "µÙÉä¤ò¤Þ¤¿¤¤¤À¥¹¥é¡¼¤¬¤¢¤ê¤Þ¤¹¡£Ìµ»ë¤·¤Þ¤¹¡£" - -#: slur.cc:383 -msgid "Slur over rest?" -msgstr "¥¹¥é¡¼¤¬µÙÉä¤ò¤Þ¤¿¤¤¤Ç¤¤¤ë?" +#: stem.cc:116 +msgid "Weird stem size; check for narrow beams" +msgstr "ÊѤÊÉäÈø¤Î¥µ¥¤¥º -- ºÙ¤¤³Ã¤Î¥Á¥§¥Ã¥¯¤ò¤·¤Æ²¼¤µ¤¤" #: stem-engraver.cc:115 #, c-format msgid "Adding note head to incompatible stem (type = %d)" msgstr "Ì·½â¤·¤¿ÉäÈø¤ØÉäƬ¤òÄɲä·¤Þ¤¹ (¥¿¥¤¥× = %d)" -#: stem.cc:116 -msgid "Weird stem size; check for narrow beams" -msgstr "ÊѤÊÉäÈø¤Î¥µ¥¤¥º -- ºÙ¤¤³Ã¤Î¥Á¥§¥Ã¥¯¤ò¤·¤Æ²¼¤µ¤¤" +#: text-spanner.cc:121 +msgid "Text_spanner too small" +msgstr "" #: text-spanner-engraver.cc:94 #, fuzzy @@ -1044,9 +1032,10 @@ msgstr " msgid "unterminated text spanner" msgstr "½ªÃ¼¤Î¤Ê¤¤¥¨¥¯¥¹¥Æ¥ó¥À" -#: text-spanner.cc:121 -msgid "Text_spanner too small" -msgstr "" +#: tfm.cc:77 +#, fuzzy, c-format +msgid "can't find ascii character: %d" +msgstr "ascii ʸ»ú¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%d'" #: tfm-reader.cc:106 #, fuzzy, c-format @@ -1058,11 +1047,6 @@ msgstr "`%s' msgid "%s: TFM file has %u parameters, which is more than the %u I can handle" msgstr "%s: TFM ¥Õ¥¡¥¤¥ë¤Ï %u ¸Ä¤Î¥Ñ¥é¥á¥¿¤¬¤¢¤ê¤Þ¤¹¤¬¡¢%u °Ê¾å¤Ï°·¤¨¤Þ¤»¤ó" -#: tfm.cc:77 -#, fuzzy, c-format -msgid "can't find ascii character: %d" -msgstr "ascii ʸ»ú¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%d'" - #. How to shut up this warning, when no notes appeared because #. they were suicided by Thread_devnull_engraver? #: tie-engraver.cc:220 tie-performer.cc:173 @@ -1200,7 +1184,7 @@ msgstr " msgid "Have to be in Chord mode for chords" msgstr "¥³¡¼¥É¤Ï Chord ¥â¡¼¥ÉÆâ¤Ë½ñ¤¤¤Æ¤¯¤À¤µ¤¤" -#: parser.yy:1911 +#: parser.yy:1910 msgid "need integer number arg" msgstr "" diff --git a/po/lilypond.pot b/po/lilypond.pot index 6f6e3e2a1e..d85c3cfe60 100644 --- a/po/lilypond.pot +++ b/po/lilypond.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2001-09-09 17:30+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" @@ -14,175 +14,160 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: ly2dvi.py:106 +#: ly2dvi.py:105 msgid "Generate .dvi with LaTeX for LilyPond" msgstr "" -#: data-file.cc:118 input.cc:85 ly2dvi.py:191 midi-parser.cc:100 mup2ly.py:93 +#: data-file.cc:118 input.cc:85 ly2dvi.py:190 midi-parser.cc:100 mup2ly.py:93 #: update-lily.py:118 warn.cc:23 msgid "warning: " msgstr "" -#: input.cc:90 ly2dvi.py:206 ly2dvi.py:639 ly2dvi.py:657 ly2dvi.py:848 -#: mup2ly.py:98 mup2ly.py:188 update-lily.py:123 update-lily.py:211 warn.cc:9 -#: warn.cc:17 +#: 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 "" -#: ly2dvi.py:207 mup2ly.py:100 update-lily.py:125 +#: ly2dvi.py:206 mup2ly.py:100 update-lily.py:125 msgid "Exiting ... " msgstr "" -#: ly2dvi.py:265 mup2ly.py:158 update-lily.py:183 +#: ly2dvi.py:264 mup2ly.py:158 update-lily.py:183 #, c-format msgid "Usage: %s [OPTION]... FILE" msgstr "" -#: ly2dvi.py:269 main.cc:120 main.cc:149 mup2ly.py:162 update-lily.py:187 +#: ly2dvi.py:268 main.cc:120 main.cc:148 mup2ly.py:162 update-lily.py:187 msgid "Options:" msgstr "" -#: ly2dvi.py:273 main.cc:124 main.cc:172 mup2ly.py:168 update-lily.py:191 +#: ly2dvi.py:272 main.cc:124 main.cc:171 mup2ly.py:168 update-lily.py:191 #, c-format msgid "Report bugs to %s" msgstr "" -#: ly2dvi.py:306 mup2ly.py:185 update-lily.py:208 +#: ly2dvi.py:305 mup2ly.py:185 update-lily.py:208 #, c-format msgid "Invoking `%s'" msgstr "" -#: ly2dvi.py:310 mup2ly.py:188 update-lily.py:211 +#: ly2dvi.py:309 mup2ly.py:188 update-lily.py:211 #, c-format msgid "command exited with value %d" msgstr "" -#: ly2dvi.py:312 mup2ly.py:190 update-lily.py:213 +#: ly2dvi.py:311 mup2ly.py:190 update-lily.py:213 msgid "(ignored)" msgstr "" -#: ly2dvi.py:322 +#: ly2dvi.py:321 #, c-format msgid "Cleaning %s..." msgstr "" -#: ly2dvi.py:337 mup2ly.py:214 update-lily.py:237 +#: ly2dvi.py:336 mup2ly.py:214 update-lily.py:237 #, c-format msgid "no such setting: %s" msgstr "" -#: ly2dvi.py:350 main.cc:113 +#: ly2dvi.py:349 main.cc:112 msgid "write Makefile dependencies for every input file" msgstr "" -#: ly2dvi.py:351 main.cc:96 main.cc:109 mup2ly.py:1117 update-lily.py:251 +#: ly2dvi.py:350 main.cc:96 main.cc:108 mup2ly.py:1117 update-lily.py:251 msgid "this help" msgstr "" -#: ly2dvi.py:352 main.cc:111 main.cc:116 +#: ly2dvi.py:351 main.cc:110 main.cc:115 msgid "DIR" msgstr "" -#: ly2dvi.py:352 +#: ly2dvi.py:351 msgid "add DIR to LilyPond's search path" msgstr "" -#: ly2dvi.py:353 +#: ly2dvi.py:352 #, c-format msgid "keep all output, and name the directory %s.dir" msgstr "" -#: ly2dvi.py:354 +#: ly2dvi.py:353 msgid "don't run LilyPond" msgstr "" -#: ly2dvi.py:355 main.cc:114 +#: ly2dvi.py:354 main.cc:113 msgid "produce MIDI output only" msgstr "" -#: ly2dvi.py:356 ly2dvi.py:357 main.cc:99 main.cc:112 main.cc:115 +#: ly2dvi.py:355 main.cc:99 main.cc:111 main.cc:114 msgid "FILE" msgstr "" -#: ly2dvi.py:356 +#: ly2dvi.py:355 msgid "write ouput to FILE" msgstr "" #: ly2dvi.py:357 -msgid "find pfa fonts used in FILE" -msgstr "" - -#: ly2dvi.py:359 msgid "generate PostScript output" msgstr "" -#: ly2dvi.py:360 +#: ly2dvi.py:358 msgid "KEY=VAL" msgstr "" -#: ly2dvi.py:360 +#: ly2dvi.py:358 msgid "change global setting KEY to VAL" msgstr "" -#: ly2dvi.py:361 main.cc:119 mup2ly.py:1120 update-lily.py:255 +#: ly2dvi.py:359 main.cc:118 mup2ly.py:1120 update-lily.py:255 msgid "verbose" msgstr "" -#: ly2dvi.py:362 main.cc:105 main.cc:118 mup2ly.py:1121 update-lily.py:256 +#: ly2dvi.py:360 main.cc:105 main.cc:117 mup2ly.py:1121 update-lily.py:256 msgid "print version number" msgstr "" -#: ly2dvi.py:363 main.cc:107 main.cc:120 mup2ly.py:1122 update-lily.py:258 +#: ly2dvi.py:361 main.cc:107 main.cc:119 mup2ly.py:1122 update-lily.py:258 msgid "show warranty and copyright" msgstr "" -#: ly2dvi.py:385 ly2dvi.py:580 ly2dvi.py:605 +#: ly2dvi.py:383 ly2dvi.py:578 ly2dvi.py:603 #, c-format msgid "Running %s..." msgstr "" -#: ly2dvi.py:398 +#: ly2dvi.py:396 #, c-format msgid "Analyzing %s..." msgstr "" -#: ly2dvi.py:454 +#: ly2dvi.py:452 #, c-format msgid "no lilypond output found for %s" msgstr "" -#: ly2dvi.py:496 +#: ly2dvi.py:494 #, c-format msgid "invalid value: %s" msgstr "" -#: ly2dvi.py:639 -#, c-format -msgid "not a PostScript file: `%s'" -msgstr "" - -#: ly2dvi.py:657 -#, c-format -msgid "getopt says: `%s'" -msgstr "" - -#: ly2dvi.py:824 scores.cc:44 +#: ly2dvi.py:781 scores.cc:44 #, c-format msgid "dependencies output to `%s'..." msgstr "" -#: ly2dvi.py:835 +#: ly2dvi.py:791 #, c-format msgid "%s output to `%s'..." msgstr "" -#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:837 +#: 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:848 +#: ly2dvi.py:804 msgid "no files specified on command line." msgstr "" @@ -208,7 +193,7 @@ msgstr "" msgid "define macro NAME [optional expansion EXP]" msgstr "" -#: main.cc:115 mup2ly.py:1118 +#: main.cc:114 mup2ly.py:1118 msgid "write output to FILE" msgstr "" @@ -426,6 +411,14 @@ msgstr "" msgid "Can't switch translators, I'm there already" msgstr "" +#: beam.cc:86 +msgid "beam has less than two stems" +msgstr "" + +#: beam.cc:637 +msgid "weird beam vertical offset" +msgstr "" + #: beam-engraver.cc:91 beam-engraver.cc:124 msgid "can't find start of beam" msgstr "" @@ -450,14 +443,6 @@ msgstr "" msgid "beam was started here" msgstr "" -#: beam.cc:86 -msgid "beam has less than two stems" -msgstr "" - -#: beam.cc:637 -msgid "weird beam vertical offset" -msgstr "" - #: break-align-item.cc:136 #, c-format msgid "unknown spacing pair `%s', `%s'" @@ -482,24 +467,24 @@ msgstr "" msgid "none of these in my family" msgstr "" -#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:192 -msgid "unterminated chord tremolo" -msgstr "" - -#: chord-tremolo-iterator.cc:48 -msgid "no one to print a tremolos" -msgstr "" - -#: chord.cc:376 +#: chord.cc:369 #, c-format msgid "invalid subtraction: not part of chord: %s" msgstr "" -#: chord.cc:405 +#: chord.cc:398 #, c-format msgid "invalid inversion pitch: not part of chord: %s" msgstr "" +#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:192 +msgid "unterminated chord tremolo" +msgstr "" + +#: chord-tremolo-iterator.cc:48 +msgid "no one to print a tremolos" +msgstr "" + #: collision.cc:127 msgid "Too many clashing notecolumns. Ignoring them." msgstr "" @@ -607,73 +592,72 @@ msgstr "" msgid "Huh? Melismatic note found to have associated lyrics." msgstr "" -#. print example usage: lilypond -e "(set-lily-option 'help 0)" ? -#: main.cc:105 +#: main.cc:104 msgid "EXPR" msgstr "" -#: main.cc:105 +#: main.cc:104 msgid "evalute EXPR as Scheme after .scm init is read" msgstr "" #. another bug in option parser: --output=foe is taken as an abbreviation #. for --output-format -#: main.cc:108 +#: main.cc:107 msgid "EXT" msgstr "" -#: main.cc:108 +#: main.cc:107 msgid "use output format EXT (scm, ps, tex or as)" msgstr "" -#: main.cc:110 +#: main.cc:109 msgid "FIELD" msgstr "" -#: main.cc:110 +#: main.cc:109 msgid "write header field to BASENAME.FIELD" msgstr "" -#: main.cc:111 +#: main.cc:110 msgid "add DIR to search path" msgstr "" -#: main.cc:112 +#: main.cc:111 msgid "use FILE as init file" msgstr "" -#: main.cc:116 +#: main.cc:115 msgid "prepend DIR to dependencies" msgstr "" -#: main.cc:117 +#: main.cc:116 msgid "inhibit file output naming and exporting" msgstr "" #. #. No version number or newline here. It confuses help2man #. -#: main.cc:137 +#: main.cc:136 #, c-format msgid "Usage: %s [OPTION]... FILE..." msgstr "" -#: main.cc:139 +#: main.cc:138 msgid "Typeset music and or play MIDI from FILE" msgstr "" -#: main.cc:143 +#: main.cc:142 msgid "" "LilyPond is a music typesetter. It produces beautiful sheet music\n" "using a high level description file as input. LilyPond is part of \n" "the GNU Project.\n" msgstr "" -#: main.cc:153 +#: main.cc:152 msgid "This binary was compiled with the following options:" msgstr "" -#: main.cc:56 main.cc:180 +#: main.cc:56 main.cc:179 #, c-format msgid "" "This is free software. It is covered by the GNU General Public License,\n" @@ -681,16 +665,16 @@ msgid "" "certain conditions. Invoke as `%s --warranty' for more information.\n" msgstr "" -#: main.cc:63 main.cc:187 main.cc:199 +#: main.cc:63 main.cc:186 main.cc:198 #, c-format msgid "Copyright (c) %s by" msgstr "" -#: main.cc:197 +#: main.cc:196 msgid "GNU LilyPond -- The music typesetter" msgstr "" -#: main.cc:72 main.cc:205 +#: main.cc:72 main.cc:204 msgid "" " This program is free software; you can redistribute it and/or\n" "modify it under the terms of the GNU General Public License version 2\n" @@ -720,9 +704,9 @@ msgstr "" msgid "silly pitch" msgstr "" -#: music-output-def.cc:115 +#: musical-request.cc:28 #, c-format -msgid "can't find `%s' context" +msgid "Transposition by %s makes accidental larger than two" msgstr "" #: music.cc:232 @@ -745,9 +729,9 @@ msgstr "" msgid "ly_music_name (): Not a music expression" msgstr "" -#: musical-request.cc:28 +#: music-output-def.cc:115 #, c-format -msgid "Transposition by %s makes accidental larger than two" +msgid "can't find `%s' context" msgstr "" #: my-lily-lexer.cc:139 @@ -884,15 +868,10 @@ msgstr "" msgid "too many notes for rest collision" msgstr "" -#: scm-option.cc:63 +#: scm-option.cc:59 msgid "Scheme options:" msgstr "" -#: score-engraver.cc:188 -#, c-format -msgid "unbound spanner `%s'" -msgstr "" - #: score.cc:78 msgid "Interpreting music..." msgstr "" @@ -911,6 +890,11 @@ msgstr "" msgid "elapsed time: %.2f seconds" msgstr "" +#: score-engraver.cc:188 +#, c-format +msgid "unbound spanner `%s'" +msgstr "" + #: scores.cc:106 msgid "Score contains errors; will not process it" msgstr "" @@ -930,6 +914,14 @@ msgstr "" msgid "Separation_item: I've been drinking too much" msgstr "" +#: slur.cc:48 +msgid "Putting slur over rest. Ignoring." +msgstr "" + +#: slur.cc:383 +msgid "Slur over rest?" +msgstr "" + #: slur-engraver.cc:127 msgid "unterminated slur" msgstr "" @@ -940,12 +932,8 @@ msgstr "" msgid "can't find start of slur" msgstr "" -#: slur.cc:48 -msgid "Putting slur over rest. Ignoring." -msgstr "" - -#: slur.cc:383 -msgid "Slur over rest?" +#: stem.cc:116 +msgid "Weird stem size; check for narrow beams" msgstr "" #: stem-engraver.cc:115 @@ -953,8 +941,8 @@ msgstr "" msgid "Adding note head to incompatible stem (type = %d)" msgstr "" -#: stem.cc:116 -msgid "Weird stem size; check for narrow beams" +#: text-spanner.cc:121 +msgid "Text_spanner too small" msgstr "" #: text-spanner-engraver.cc:94 @@ -969,8 +957,9 @@ msgstr "" msgid "unterminated text spanner" msgstr "" -#: text-spanner.cc:121 -msgid "Text_spanner too small" +#: tfm.cc:77 +#, c-format +msgid "can't find ascii character: %d" msgstr "" #: tfm-reader.cc:106 @@ -983,11 +972,6 @@ msgstr "" msgid "%s: TFM file has %u parameters, which is more than the %u I can handle" msgstr "" -#: tfm.cc:77 -#, c-format -msgid "can't find ascii character: %d" -msgstr "" - #. How to shut up this warning, when no notes appeared because #. they were suicided by Thread_devnull_engraver? #: tie-engraver.cc:220 tie-performer.cc:173 @@ -1124,7 +1108,7 @@ msgstr "" msgid "Have to be in Chord mode for chords" msgstr "" -#: parser.yy:1911 +#: parser.yy:1910 msgid "need integer number arg" msgstr "" diff --git a/po/nl.po b/po/nl.po index 06bb49fc6c..c8d1627e0c 100644 --- a/po/nl.po +++ b/po/nl.po @@ -9,9 +9,9 @@ # msgid "" msgstr "" -"Project-Id-Version: lilypond 1.4.6\n" -"POT-Creation-Date: 2001-09-09 17:30+0200\n" -"PO-Revision-Date: 2001-09-09 17:34+0200\n" +"Project-Id-Version: lilypond 1.4.1\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" "MIME-Version: 1.0\n" @@ -19,180 +19,166 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Date: 2001-05-09 23:29+0200\n" "From: \n" -"Xgettext-Options: --c++ --default-domain=lilypond --join --output-dir=../po --add-comments --keyword=_\n" +"Xgettext-Options: --c++ --default-domain=lilypond --join --output-dir=../po " +"--add-comments --keyword=_\n" "Files: bow.cc int.cc\n" -#: ly2dvi.py:106 +#: ly2dvi.py:105 msgid "Generate .dvi with LaTeX for LilyPond" msgstr "Genereer .dvi met LaTeX voor LilyPond" -#: data-file.cc:118 input.cc:85 ly2dvi.py:191 midi-parser.cc:100 mup2ly.py:93 +#: data-file.cc:118 input.cc:85 ly2dvi.py:190 midi-parser.cc:100 mup2ly.py:93 #: update-lily.py:118 warn.cc:23 msgid "warning: " msgstr "waarschuwing: " -#: input.cc:90 ly2dvi.py:206 ly2dvi.py:639 ly2dvi.py:657 ly2dvi.py:848 -#: mup2ly.py:98 mup2ly.py:188 update-lily.py:123 update-lily.py:211 warn.cc:9 -#: warn.cc:17 +#: 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: " -#: ly2dvi.py:207 mup2ly.py:100 update-lily.py:125 +#: ly2dvi.py:206 mup2ly.py:100 update-lily.py:125 msgid "Exiting ... " msgstr "Beëidigen ..." -#: ly2dvi.py:265 mup2ly.py:158 update-lily.py:183 +#: ly2dvi.py:264 mup2ly.py:158 update-lily.py:183 #, c-format msgid "Usage: %s [OPTION]... FILE" msgstr "Gebruik: %s [OPTIE]... BESTAND" -#: ly2dvi.py:269 main.cc:120 main.cc:149 mup2ly.py:162 update-lily.py:187 +#: ly2dvi.py:268 main.cc:120 main.cc:148 mup2ly.py:162 update-lily.py:187 msgid "Options:" msgstr "Opties:" -#: ly2dvi.py:273 main.cc:124 main.cc:172 mup2ly.py:168 update-lily.py:191 +#: ly2dvi.py:272 main.cc:124 main.cc:171 mup2ly.py:168 update-lily.py:191 #, c-format msgid "Report bugs to %s" msgstr "" "Meld luizen in het programma aan %s;\n" "meld onjuistheden in de vertaling aan of " -#: ly2dvi.py:306 mup2ly.py:185 update-lily.py:208 +#: ly2dvi.py:305 mup2ly.py:185 update-lily.py:208 #, c-format msgid "Invoking `%s'" msgstr "Uitvoeren `%s'" -#: ly2dvi.py:310 mup2ly.py:188 update-lily.py:211 +#: ly2dvi.py:309 mup2ly.py:188 update-lily.py:211 #, c-format msgid "command exited with value %d" msgstr "opdracht eindigde met waarde %d" -#: ly2dvi.py:312 mup2ly.py:190 update-lily.py:213 +#: ly2dvi.py:311 mup2ly.py:190 update-lily.py:213 msgid "(ignored)" msgstr "(genegeerd)" -#: ly2dvi.py:322 +#: ly2dvi.py:321 #, c-format msgid "Cleaning %s..." msgstr "Schoonmaken %s..." -#: ly2dvi.py:337 mup2ly.py:214 update-lily.py:237 +#: ly2dvi.py:336 mup2ly.py:214 update-lily.py:237 #, c-format msgid "no such setting: %s" msgstr "geen dergelijke instelling: %s" -#: ly2dvi.py:350 main.cc:113 +#: ly2dvi.py:349 main.cc:112 msgid "write Makefile dependencies for every input file" msgstr "schrijf Makefile afhankelijkheden voor elk invoerbestand" -#: ly2dvi.py:351 main.cc:96 main.cc:109 mup2ly.py:1117 update-lily.py:251 +#: ly2dvi.py:350 main.cc:96 main.cc:108 mup2ly.py:1117 update-lily.py:251 msgid "this help" msgstr "deze hulp" -#: ly2dvi.py:352 main.cc:111 main.cc:116 +#: ly2dvi.py:351 main.cc:110 main.cc:115 msgid "DIR" msgstr "DIR" -#: ly2dvi.py:352 +#: ly2dvi.py:351 msgid "add DIR to LilyPond's search path" msgstr "voeg DIR toe aan LilyPonds zoekpad" -#: ly2dvi.py:353 +#: ly2dvi.py:352 #, c-format msgid "keep all output, and name the directory %s.dir" msgstr "bewaar alle uitvoer, en noem de directory %s.dir" -#: ly2dvi.py:354 +#: ly2dvi.py:353 msgid "don't run LilyPond" msgstr "draai LilyPond niet" -#: ly2dvi.py:355 main.cc:114 +#: ly2dvi.py:354 main.cc:113 msgid "produce MIDI output only" msgstr "produceer alleen MIDI uitvoer" -#: ly2dvi.py:356 ly2dvi.py:357 main.cc:99 main.cc:112 main.cc:115 +#: ly2dvi.py:355 main.cc:99 main.cc:111 main.cc:114 msgid "FILE" msgstr "BESTAND" -#: ly2dvi.py:356 +#: ly2dvi.py:355 msgid "write ouput to FILE" msgstr "schrijf uitvoer naar BESTAND" #: ly2dvi.py:357 -msgid "find pfa fonts used in FILE" -msgstr "zoek pfa fonts gebruikt in BESTAND" - -#: ly2dvi.py:359 msgid "generate PostScript output" msgstr "genereer PostScipt uitvoer" -#: ly2dvi.py:360 +#: ly2dvi.py:358 msgid "KEY=VAL" msgstr "SEUTEL=WAARDE" -#: ly2dvi.py:360 +#: ly2dvi.py:358 msgid "change global setting KEY to VAL" msgstr "verander globale instelling SLEUTEL in WAARDE" -#: ly2dvi.py:361 main.cc:119 mup2ly.py:1120 update-lily.py:255 +#: ly2dvi.py:359 main.cc:118 mup2ly.py:1120 update-lily.py:255 msgid "verbose" msgstr "breedsprakig" -#: ly2dvi.py:362 main.cc:105 main.cc:118 mup2ly.py:1121 update-lily.py:256 +#: ly2dvi.py:360 main.cc:105 main.cc:117 mup2ly.py:1121 update-lily.py:256 msgid "print version number" msgstr "druk versienummer af" -#: ly2dvi.py:363 main.cc:107 main.cc:120 mup2ly.py:1122 update-lily.py:258 +#: ly2dvi.py:361 main.cc:107 main.cc:119 mup2ly.py:1122 update-lily.py:258 msgid "show warranty and copyright" msgstr "toon garantie en auteursrechten" -#: ly2dvi.py:385 ly2dvi.py:580 ly2dvi.py:605 +#: ly2dvi.py:383 ly2dvi.py:578 ly2dvi.py:603 #, c-format msgid "Running %s..." msgstr "Uitvoeren %s..." -#: ly2dvi.py:398 +#: ly2dvi.py:396 #, c-format msgid "Analyzing %s..." msgstr "Analyseer %s..." -#: ly2dvi.py:454 +#: ly2dvi.py:452 #, c-format msgid "no lilypond output found for %s" msgstr "geen lilypond uitvoer gevonden voor %s" -#: ly2dvi.py:496 +#: ly2dvi.py:494 #, c-format msgid "invalid value: %s" msgstr "ongeldige waarde: %s" -#: ly2dvi.py:639 -#, c-format -msgid "not a PostScript file: `%s'" -msgstr "geen PostScript bestand: `%s'" - -#: ly2dvi.py:657 -#, c-format -msgid "getopt says: `%s'" -msgstr "getopt zegt: `%s'" - -#: ly2dvi.py:824 scores.cc:44 +#: ly2dvi.py:781 scores.cc:44 #, c-format msgid "dependencies output to `%s'..." -msgstr "afhankelijkheden uitvoer naar `%s'..." +msgstr "afhankelijkheden uitvoer naar %s..." -#: ly2dvi.py:835 +#: 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:837 +#: 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:848 +#: ly2dvi.py:804 msgid "no files specified on command line." msgstr "geen bestanden gespecificeerd op de commandoregel." @@ -218,7 +204,7 @@ msgstr "debug" msgid "define macro NAME [optional expansion EXP]" msgstr "definieer macro NAAM [optionele expansie EXP]" -#: main.cc:115 mup2ly.py:1118 +#: main.cc:114 mup2ly.py:1118 msgid "write output to FILE" msgstr "schrijf uitvoer naar BESTAND" @@ -390,12 +376,12 @@ msgstr "kan teken niet vinden genaamd: `%s'" #: afm.cc:124 #, c-format msgid "Error parsing AFM file: `%s'" -msgstr "Fout bij ontleden AFM-bestand: `%s'" +msgstr "Fout bij ontleden AFM bestand: `%s'" #: all-font-metrics.cc:95 #, c-format msgid "checksum mismatch for font file: `%s'" -msgstr "checksum fout voor fontbestand: `%s'" +msgstr "checksum fout voor font bestand: `%s'" #: all-font-metrics.cc:97 #, c-format @@ -438,6 +424,14 @@ msgstr "Geef op" msgid "Can't switch translators, I'm there already" msgstr "Kan niet wisselen van vertaler, ben al hier" +#: beam.cc:86 +msgid "beam has less than two stems" +msgstr "waardestreep heeft minder dan twee stokken" + +#: beam.cc:637 +msgid "weird beam vertical offset" +msgstr "rare verticale waardestreep verplaatsing" + #: beam-engraver.cc:91 beam-engraver.cc:124 msgid "can't find start of beam" msgstr "kan start van waardestreep niet vinden" @@ -462,14 +456,6 @@ msgstr "stok past niet in waardestreep" msgid "beam was started here" msgstr "waardestreep werd hier gestart" -#: beam.cc:86 -msgid "beam has less than two stems" -msgstr "waardestreep heeft minder dan twee stokken" - -#: beam.cc:637 -msgid "weird beam vertical offset" -msgstr "rare verticale waardestreep verplaatsing" - #: break-align-item.cc:136 #, c-format msgid "unknown spacing pair `%s', `%s'" @@ -494,24 +480,24 @@ msgstr "Ben er zelf een" msgid "none of these in my family" msgstr "geen van deze in mijn gezin" -#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:192 -msgid "unterminated chord tremolo" -msgstr "onbeëindigd akkoordtremolo" - -#: chord-tremolo-iterator.cc:48 -msgid "no one to print a tremolos" -msgstr "niemand om tremolos af te drukken" - -#: chord.cc:376 +#: chord.cc:369 #, c-format msgid "invalid subtraction: not part of chord: %s" msgstr "ongeldige aftrek: maakt geen deel uit van accoord: %s" -#: chord.cc:405 +#: chord.cc:398 #, c-format 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:192 +msgid "unterminated chord tremolo" +msgstr "onbeëindigd akkoordtremolo" + +#: chord-tremolo-iterator.cc:48 +msgid "no one to print a tremolos" +msgstr "niemand om tremolos af te drukken" + #: collision.cc:127 msgid "Too many clashing notecolumns. Ignoring them." msgstr "Te veel botsende nootkolommen. Negeer ze." @@ -621,62 +607,61 @@ msgstr "liedteksten gevonden zonder bijbehorend nootbolletje" msgid "Huh? Melismatic note found to have associated lyrics." msgstr "Huh? Melismatische noot blijkt bijbehorende liedtekst te hebben." -#. print example usage: lilypond -e "(set-lily-option 'help 0)" ? -#: main.cc:105 +#: main.cc:104 msgid "EXPR" msgstr "EXPR" -#: main.cc:105 +#: main.cc:104 msgid "evalute EXPR as Scheme after .scm init is read" msgstr "evalueer EXPR als Scheme nadat .scm init is gelezen" #. another bug in option parser: --output=foe is taken as an abbreviation #. for --output-format -#: main.cc:108 +#: main.cc:107 msgid "EXT" msgstr "EXT" -#: main.cc:108 +#: main.cc:107 msgid "use output format EXT (scm, ps, tex or as)" msgstr "gebruik uitvoer formaat EXT (scm, ps, tex of as)" -#: main.cc:110 +#: main.cc:109 msgid "FIELD" msgstr "VELD" -#: main.cc:110 +#: main.cc:109 msgid "write header field to BASENAME.FIELD" msgstr "schrijf kop veld naar BASISNAAM.VELD" -#: main.cc:111 +#: main.cc:110 msgid "add DIR to search path" msgstr "voeg DIR toe aan zoekpad" -#: main.cc:112 +#: main.cc:111 msgid "use FILE as init file" msgstr "gebruik BESTAND als initialisatiebestand" -#: main.cc:116 +#: main.cc:115 msgid "prepend DIR to dependencies" msgstr "voeg DIR voor aan afhankelijkheden" -#: main.cc:117 +#: main.cc:116 msgid "inhibit file output naming and exporting" -msgstr "verbied naamgeving van uitvoerbestand en exportering" +msgstr "verbied naamgeving van uitvoer bestand en exportering" #. #. No version number or newline here. It confuses help2man #. -#: main.cc:137 +#: main.cc:136 #, c-format msgid "Usage: %s [OPTION]... FILE..." msgstr "Gebruik: %s [OPTIE]... BESTAND..." -#: main.cc:139 +#: main.cc:138 msgid "Typeset music and or play MIDI from FILE" msgstr "Zet muziek en of speel MIDI van BESTAND" -#: main.cc:143 +#: main.cc:142 msgid "" "LilyPond is a music typesetter. It produces beautiful sheet music\n" "using a high level description file as input. LilyPond is part of \n" @@ -686,11 +671,11 @@ msgstr "" "uitgaande van een hoog niveau beschrijving bestand. LilyPond \n" "maakt deel uit van het GNU Project.\n" -#: main.cc:153 +#: main.cc:152 msgid "This binary was compiled with the following options:" msgstr "Dit programma is gecompileerd met de volgende instellingen:" -#: main.cc:56 main.cc:180 +#: main.cc:56 main.cc:179 #, c-format msgid "" "This is free software. It is covered by the GNU General Public License,\n" @@ -702,16 +687,16 @@ msgstr "" "onder bepaalde voorwaarden. Roep aan als `%s --warranty' voor meer\n" "informatie.\n" -#: main.cc:63 main.cc:187 main.cc:199 +#: main.cc:63 main.cc:186 main.cc:198 #, c-format msgid "Copyright (c) %s by" msgstr "Copyright (c) %s " -#: main.cc:197 +#: main.cc:196 msgid "GNU LilyPond -- The music typesetter" msgstr "GNU LilyPond -- De Muziekzetter" -#: main.cc:72 main.cc:205 +#: main.cc:72 main.cc:204 msgid "" " This program is free software; you can redistribute it and/or\n" "modify it under the terms of the GNU General Public License version 2\n" @@ -754,10 +739,10 @@ msgstr "rare duur" msgid "silly pitch" msgstr "rare toonhoogte" -#: music-output-def.cc:115 +#: musical-request.cc:28 #, c-format -msgid "can't find `%s' context" -msgstr "kan `%s' context niet vinden" +msgid "Transposition by %s makes accidental larger than two" +msgstr "Transponering van %s geeft tripel kruizen/mollen" #: music.cc:232 msgid "ly_get_mus_property (): Not a Music" @@ -779,10 +764,10 @@ msgstr "ly_make_music (): Geen string" msgid "ly_music_name (): Not a music expression" msgstr "ly_make_music (): Geen muziek expressie" -#: musical-request.cc:28 +#: music-output-def.cc:115 #, c-format -msgid "Transposition by %s makes accidental larger than two" -msgstr "Transponering van %s geeft tripel kruizen/mollen" +msgid "can't find `%s' context" +msgstr "kan `%s' context niet vinden" #: my-lily-lexer.cc:139 #, c-format @@ -836,7 +821,7 @@ msgstr "kan directory niet scheppen: `%s'" #: paper-stream.cc:55 msgid "Error syncing file (disk full?)" -msgstr "Fout bij synchroniseren van bestand (schijf vol?)" +msgstr "Fout by synchroniseren van bestand (disk vol?)" #. #. We could change the current translator's id, but that would make @@ -920,15 +905,10 @@ msgstr "te veel botsende rusten" msgid "too many notes for rest collision" msgstr "te veel noten voor bosting met rusten" -#: scm-option.cc:63 +#: scm-option.cc:59 msgid "Scheme options:" msgstr "Scheme opties:" -#: score-engraver.cc:188 -#, c-format -msgid "unbound spanner `%s'" -msgstr "ongebonden spanner `%s'" - #: score.cc:78 msgid "Interpreting music..." msgstr "Vertolken van muziek..." @@ -947,6 +927,11 @@ msgstr "Fouten gevonden, /*verwerk partituur niet */" msgid "elapsed time: %.2f seconds" msgstr "duur: %.2f seconden" +#: score-engraver.cc:188 +#, c-format +msgid "unbound spanner `%s'" +msgstr "ongebonden spanner `%s'" + #: scores.cc:106 msgid "Score contains errors; will not process it" msgstr "Partituur bevat fouten; zal hem niet verwerken" @@ -966,6 +951,14 @@ msgstr "Weet niet hoe articulatie te vertolken `%s'" msgid "Separation_item: I've been drinking too much" msgstr "Separation_item: Ik heb te veel gedronken" +#: slur.cc:48 +msgid "Putting slur over rest. Ignoring." +msgstr "Zet bindingsboog over rust. Negeer." + +#: slur.cc:383 +msgid "Slur over rest?" +msgstr "Boogje over rust?" + #: slur-engraver.cc:127 msgid "unterminated slur" msgstr "onbeëindigde bindingsboog" @@ -976,22 +969,18 @@ msgstr "onbe msgid "can't find start of slur" msgstr "kan start van bindingsboog niet vinden" -#: slur.cc:48 -msgid "Putting slur over rest. Ignoring." -msgstr "Zet bindingsboog over rust. Negeer." - -#: slur.cc:383 -msgid "Slur over rest?" -msgstr "Boogje over rust?" +#: stem.cc:116 +msgid "Weird stem size; check for narrow beams" +msgstr "Vreemde stoklengte; controleer op krappe waardestrepen" #: stem-engraver.cc:115 #, c-format msgid "Adding note head to incompatible stem (type = %d)" msgstr "Voeg noot bolletje toe aan onverenigbare stok (type = %d)" -#: stem.cc:116 -msgid "Weird stem size; check for narrow beams" -msgstr "Vreemde stoklengte; controleer op krappe waardestrepen" +#: text-spanner.cc:121 +msgid "Text_spanner too small" +msgstr "Text_spanner te klein" #: text-spanner-engraver.cc:94 msgid "can't find start of text spanner" @@ -1005,9 +994,10 @@ msgstr "heb al een tekst spanner" msgid "unterminated text spanner" msgstr "onbeëindigde tekst spanner" -#: text-spanner.cc:121 -msgid "Text_spanner too small" -msgstr "Text_spanner te klein" +#: tfm.cc:77 +#, c-format +msgid "can't find ascii character: %d" +msgstr "kan ascii teken niet vinden: %d" #: tfm-reader.cc:106 #, c-format @@ -1020,11 +1010,6 @@ msgid "%s: TFM file has %u parameters, which is more than the %u I can handle" msgstr "" "%s: TFM bestand heeft %u parameters, wat meer is dan de %u die ik aan kan" -#: tfm.cc:77 -#, c-format -msgid "can't find ascii character: %d" -msgstr "kan ascii teken niet vinden: %d" - #. How to shut up this warning, when no notes appeared because #. they were suicided by Thread_devnull_engraver? #: tie-engraver.cc:220 tie-performer.cc:173 @@ -1163,7 +1148,7 @@ msgstr "Moet in Note modus zijn voor noten" msgid "Have to be in Chord mode for chords" msgstr "Moet in Chord modus zijn voor accoorden" -#: parser.yy:1911 +#: parser.yy:1910 msgid "need integer number arg" msgstr "heb integer getal arg nogig" diff --git a/po/ru.po b/po/ru.po index a1b406243f..67c9d6b344 100644 --- a/po/ru.po +++ b/po/ru.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2001-09-09 17:30+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" @@ -14,178 +14,163 @@ msgstr "" "Content-Type: text/plain; charset=koi8-r\n" "Content-Transfer-Encoding: ENCODING\n" -#: ly2dvi.py:106 +#: ly2dvi.py:105 msgid "Generate .dvi with LaTeX for LilyPond" msgstr "" -#: data-file.cc:118 input.cc:85 ly2dvi.py:191 midi-parser.cc:100 mup2ly.py:93 +#: data-file.cc:118 input.cc:85 ly2dvi.py:190 midi-parser.cc:100 mup2ly.py:93 #: update-lily.py:118 warn.cc:23 msgid "warning: " msgstr "ÐÒÅÄÕÐÒÅÖÄÁÀ: " -#: input.cc:90 ly2dvi.py:206 ly2dvi.py:639 ly2dvi.py:657 ly2dvi.py:848 -#: mup2ly.py:98 mup2ly.py:188 update-lily.py:123 update-lily.py:211 warn.cc:9 -#: warn.cc:17 +#: 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 "ÏÛÉÂËÁ: " -#: ly2dvi.py:207 mup2ly.py:100 update-lily.py:125 +#: ly2dvi.py:206 mup2ly.py:100 update-lily.py:125 msgid "Exiting ... " msgstr "" -#: ly2dvi.py:265 mup2ly.py:158 update-lily.py:183 +#: ly2dvi.py:264 mup2ly.py:158 update-lily.py:183 #, fuzzy, c-format msgid "Usage: %s [OPTION]... FILE" msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ïðãéñ]... [æáêì]" -#: ly2dvi.py:269 main.cc:120 main.cc:149 mup2ly.py:162 update-lily.py:187 +#: ly2dvi.py:268 main.cc:120 main.cc:148 mup2ly.py:162 update-lily.py:187 msgid "Options:" msgstr "ïÐÃÉÉ:" -#: ly2dvi.py:273 main.cc:124 main.cc:172 mup2ly.py:168 update-lily.py:191 +#: ly2dvi.py:272 main.cc:124 main.cc:171 mup2ly.py:168 update-lily.py:191 #, c-format msgid "Report bugs to %s" msgstr "óÏÏÂÝÁÊÔÅ Ï ÏÛÉÂËÁÈ ÐÏ %s" -#: ly2dvi.py:306 mup2ly.py:185 update-lily.py:208 +#: ly2dvi.py:305 mup2ly.py:185 update-lily.py:208 #, fuzzy, c-format msgid "Invoking `%s'" msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÍÕÚÙËÕ: `%s'" -#: ly2dvi.py:310 mup2ly.py:188 update-lily.py:211 +#: ly2dvi.py:309 mup2ly.py:188 update-lily.py:211 #, c-format msgid "command exited with value %d" msgstr "" -#: ly2dvi.py:312 mup2ly.py:190 update-lily.py:213 +#: ly2dvi.py:311 mup2ly.py:190 update-lily.py:213 msgid "(ignored)" msgstr "" -#: ly2dvi.py:322 +#: ly2dvi.py:321 #, fuzzy, c-format msgid "Cleaning %s..." msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÍÕÚÙËÕ: `%s'" -#: ly2dvi.py:337 mup2ly.py:214 update-lily.py:237 +#: ly2dvi.py:336 mup2ly.py:214 update-lily.py:237 #, fuzzy, c-format msgid "no such setting: %s" msgstr "ÎÅÔ ÔÁËÏÇÏ ÉÎÓÔÒÕÍÅÎÔÁ: `%s'" -#: ly2dvi.py:350 main.cc:113 +#: ly2dvi.py:349 main.cc:112 msgid "write Makefile dependencies for every input file" msgstr "ÚÁÐÉÓÙ×ÁÔØ ÚÁ×ÉÓÉÍÏÓÔÉ Makefile ÄÌÑ ËÁÖÄÏÇÏ ×ÈÏÄÎÏÇÏ ÆÁÊÌÁ" -#: ly2dvi.py:351 main.cc:96 main.cc:109 mup2ly.py:1117 update-lily.py:251 +#: ly2dvi.py:350 main.cc:96 main.cc:108 mup2ly.py:1117 update-lily.py:251 msgid "this help" msgstr "ÜÔÁ ÓÐÒÁ×ËÁ" -#: ly2dvi.py:352 main.cc:111 main.cc:116 +#: ly2dvi.py:351 main.cc:110 main.cc:115 msgid "DIR" msgstr "ëáô" -#: ly2dvi.py:352 +#: ly2dvi.py:351 #, fuzzy msgid "add DIR to LilyPond's search path" msgstr "ÄÏÂÁ×ÉÔØ ëáô Ë ÐÕÔÉ ÐÏÉÓËÁ" -#: ly2dvi.py:353 +#: ly2dvi.py:352 #, c-format msgid "keep all output, and name the directory %s.dir" msgstr "" -#: ly2dvi.py:354 +#: ly2dvi.py:353 msgid "don't run LilyPond" msgstr "" -#: ly2dvi.py:355 main.cc:114 +#: ly2dvi.py:354 main.cc:113 msgid "produce MIDI output only" msgstr "ÐÒÏÉÚ×ÏÄÉÔØ ×Ù×ÏÄ ÔÏÌØËÏ MIDI" -#: ly2dvi.py:356 ly2dvi.py:357 main.cc:99 main.cc:112 main.cc:115 +#: ly2dvi.py:355 main.cc:99 main.cc:111 main.cc:114 msgid "FILE" msgstr "æáêì" -#: ly2dvi.py:356 +#: ly2dvi.py:355 #, fuzzy msgid "write ouput to FILE" msgstr "ÚÁÐÉÓÙ×ÁÔØ ×Ù×ÏÄ × ïóîï÷á[-x].ÒÁÓÛÉÒÅÎÉÅ" #: ly2dvi.py:357 -msgid "find pfa fonts used in FILE" -msgstr "" - -#: ly2dvi.py:359 msgid "generate PostScript output" msgstr "" -#: ly2dvi.py:360 +#: ly2dvi.py:358 msgid "KEY=VAL" msgstr "" -#: ly2dvi.py:360 +#: ly2dvi.py:358 msgid "change global setting KEY to VAL" msgstr "" -#: ly2dvi.py:361 main.cc:119 mup2ly.py:1120 update-lily.py:255 +#: ly2dvi.py:359 main.cc:118 mup2ly.py:1120 update-lily.py:255 #, fuzzy msgid "verbose" msgstr "ÂÙÔØ ÂÏÌÔÌÉ×ÙÍ" -#: ly2dvi.py:362 main.cc:105 main.cc:118 mup2ly.py:1121 update-lily.py:256 +#: ly2dvi.py:360 main.cc:105 main.cc:117 mup2ly.py:1121 update-lily.py:256 msgid "print version number" msgstr "×Ù×ÏÄÉÔØ ÎÏÍÅÒ ×ÅÒÓÉÉ" -#: ly2dvi.py:363 main.cc:107 main.cc:120 mup2ly.py:1122 update-lily.py:258 +#: ly2dvi.py:361 main.cc:107 main.cc:119 mup2ly.py:1122 update-lily.py:258 msgid "show warranty and copyright" msgstr "ÐÏËÁÚÁÔØ ÇÁÒÁÎÔÉÀ É copyright" -#: ly2dvi.py:385 ly2dvi.py:580 ly2dvi.py:605 +#: ly2dvi.py:383 ly2dvi.py:578 ly2dvi.py:603 #, fuzzy, c-format msgid "Running %s..." msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÍÕÚÙËÕ: `%s'" -#: ly2dvi.py:398 +#: ly2dvi.py:396 #, fuzzy, c-format msgid "Analyzing %s..." msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÍÕÚÙËÕ: `%s'" -#: ly2dvi.py:454 +#: ly2dvi.py:452 #, c-format msgid "no lilypond output found for %s" msgstr "" -#: ly2dvi.py:496 +#: ly2dvi.py:494 #, fuzzy, c-format msgid "invalid value: %s" msgstr "ÎÅ×ÅÒÎÙÊ ÓÉÍ×ÏÌ: `%c'" -#: ly2dvi.py:639 -#, fuzzy, c-format -msgid "not a PostScript file: `%s'" -msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ ÆÁÊÌ: `%s'" - -#: ly2dvi.py:657 -#, c-format -msgid "getopt says: `%s'" -msgstr "" - -#: ly2dvi.py:824 scores.cc:44 +#: ly2dvi.py:781 scores.cc:44 #, fuzzy, c-format msgid "dependencies output to `%s'..." msgstr "\"ÂÕÍÁÖÎÙÊ\" ×Ù×ÏÄ × %s..." -#: ly2dvi.py:835 +#: ly2dvi.py:791 #, fuzzy, c-format msgid "%s output to `%s'..." msgstr "×Ù×ÏÄ MIDI × %s..." -#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:837 +#: 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:848 +#: ly2dvi.py:804 msgid "no files specified on command line." msgstr "" @@ -211,7 +196,7 @@ msgstr "" msgid "define macro NAME [optional expansion EXP]" msgstr "" -#: main.cc:115 mup2ly.py:1118 +#: main.cc:114 mup2ly.py:1118 #, fuzzy msgid "write output to FILE" msgstr "ÚÁÐÉÓÙ×ÁÔØ ×Ù×ÏÄ × ïóîï÷á[-x].ÒÁÓÛÉÒÅÎÉÅ" @@ -431,6 +416,14 @@ msgstr " msgid "Can't switch translators, I'm there already" msgstr "îÅ ÍÏÇÕ ÐÅÒÅËÌÀÞÉÔØ ÐÅÒÅ×ÏÄÞÉËÏ×, Ñ ÕÖÅ ÔÁÍ" +#: beam.cc:86 +msgid "beam has less than two stems" +msgstr "ÇÒÕÐÐÉÒÏ×ËÁ ÍÅÎÅÅ Ä×ÕÈ ÛÔÉÌÅÊ" + +#: beam.cc:637 +msgid "weird beam vertical offset" +msgstr "ÄÉËÏÅ ×ÅÒÔÉËÁÌØÎÏÅ ÓÍÅÝÅÎÉÅ ÇÒÕÐÐÉÒÏ×ËÉ ÛÔÉÌÅÊ" + #: beam-engraver.cc:91 beam-engraver.cc:124 msgid "can't find start of beam" msgstr "ÞÔÏ-ÔÏ ÎÅ ÎÁÊÄÕ ÎÁÞÁÌÏ ÇÒÕÐÐÉÒÏ×ËÉ ÛÔÉÌÅÊ" @@ -455,14 +448,6 @@ msgstr " msgid "beam was started here" msgstr "ÇÒÕÐÐÉÒÏ×ËÁ ÎÁÞÉÎÁÌÁÓØ ÚÄÅÓØ" -#: beam.cc:86 -msgid "beam has less than two stems" -msgstr "ÇÒÕÐÐÉÒÏ×ËÁ ÍÅÎÅÅ Ä×ÕÈ ÛÔÉÌÅÊ" - -#: beam.cc:637 -msgid "weird beam vertical offset" -msgstr "ÄÉËÏÅ ×ÅÒÔÉËÁÌØÎÏÅ ÓÍÅÝÅÎÉÅ ÇÒÕÐÐÉÒÏ×ËÉ ÛÔÉÌÅÊ" - #: break-align-item.cc:136 #, fuzzy, c-format msgid "unknown spacing pair `%s', `%s'" @@ -487,6 +472,16 @@ msgstr " msgid "none of these in my family" msgstr "ÏÎÉ ÍÎÅ ÎÅ ÒÏÄÓÔ×ÅÎÎÉËÉ" +#: chord.cc:369 +#, c-format +msgid "invalid subtraction: not part of chord: %s" +msgstr "ÎÅ×ÅÒÎÏÅ ×ÙÞÉÔÁÎÉÅ: ÎÅ ÞÁÓÔØ ÁËËÏÒÄÁ: %s" + +#: chord.cc:398 +#, c-format +msgid "invalid inversion pitch: not part of chord: %s" +msgstr "" + #: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:192 msgid "unterminated chord tremolo" msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ ÔÒÅÍÏÌÏ ÁËËÏÒÄÁ" @@ -496,16 +491,6 @@ msgstr " msgid "no one to print a tremolos" msgstr "ÎÅËÏÍÕ ÒÉÓÏ×ÁÔØ ÓËÏÂÕ ÐÏ×ÔÏÒÁ" -#: chord.cc:376 -#, c-format -msgid "invalid subtraction: not part of chord: %s" -msgstr "ÎÅ×ÅÒÎÏÅ ×ÙÞÉÔÁÎÉÅ: ÎÅ ÞÁÓÔØ ÁËËÏÒÄÁ: %s" - -#: chord.cc:405 -#, c-format -msgid "invalid inversion pitch: not part of chord: %s" -msgstr "" - #: collision.cc:127 msgid "Too many clashing notecolumns. Ignoring them." msgstr "óÌÉÛËÏÍ ÍÎÏÇÏ ÐÅÒÅÓÅËÁÀÝÉÈÓÑ ÓÔÏÌÂÃÏ× ÎÏÔ. éÇÎÏÒÉÒÕÀ." @@ -614,64 +599,63 @@ msgstr "" msgid "Huh? Melismatic note found to have associated lyrics." msgstr "" -#. print example usage: lilypond -e "(set-lily-option 'help 0)" ? -#: main.cc:105 +#: main.cc:104 msgid "EXPR" msgstr "" -#: main.cc:105 +#: main.cc:104 msgid "evalute EXPR as Scheme after .scm init is read" msgstr "" #. another bug in option parser: --output=foe is taken as an abbreviation #. for --output-format -#: main.cc:108 +#: main.cc:107 msgid "EXT" msgstr "òáóû" -#: main.cc:108 +#: main.cc:107 #, fuzzy msgid "use output format EXT (scm, ps, tex or as)" msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ ×ÙÈÏÄÎÏÊ ÆÏÒÍÁÔ òáóû" -#: main.cc:110 +#: main.cc:109 #, fuzzy msgid "FIELD" msgstr "æáêì" -#: main.cc:110 +#: main.cc:109 msgid "write header field to BASENAME.FIELD" msgstr "" -#: main.cc:111 +#: main.cc:110 msgid "add DIR to search path" msgstr "ÄÏÂÁ×ÉÔØ ëáô Ë ÐÕÔÉ ÐÏÉÓËÁ" -#: main.cc:112 +#: main.cc:111 msgid "use FILE as init file" msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ æáêì ËÁË ÆÁÊÌ ÉÎÉÃÉÁÌÉÚÁÃÉÉ" -#: main.cc:116 +#: main.cc:115 msgid "prepend DIR to dependencies" msgstr "" -#: main.cc:117 +#: main.cc:116 msgid "inhibit file output naming and exporting" msgstr "ÓËÒÙÔØ ÉÍÅÎÏ×ÁÎÉÅ É ÜËÓÐÏÒÔ ×Ù×ÏÄÁ × ÆÁÊÌ" #. #. No version number or newline here. It confuses help2man #. -#: main.cc:137 +#: main.cc:136 #, fuzzy, c-format msgid "Usage: %s [OPTION]... FILE..." msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ïðãéñ]... [æáêì]..." -#: main.cc:139 +#: main.cc:138 msgid "Typeset music and or play MIDI from FILE" msgstr "îÁÂÉÒÁÔØ ÍÕÚÙËÕ É/ÉÌÉ ÐÒÏÉÇÒÙ×ÁÔØ MIDI ÉÚ æáêìÁ" -#: main.cc:143 +#: main.cc:142 msgid "" "LilyPond is a music typesetter. It produces beautiful sheet music\n" "using a high level description file as input. LilyPond is part of \n" @@ -681,11 +665,11 @@ msgstr "" "ÎÁ ÂÕÍÁÇÅ, ÉÓÐÏÌØÚÕÑ ×ÙÓÏËÏÕÒÏ×ÎÅ×ÙÊ ÆÁÊÌ ÏÐÉÓÁÎÉÑ ÎÁ ××ÏÄÅ. Lilypond\n" "Ñ×ÌÑÅÔÓÑ ÞÁÓÔØÀ ðÒÏÅËÔÁ GNU.\n" -#: main.cc:153 +#: main.cc:152 msgid "This binary was compiled with the following options:" msgstr "üÔÏÔ ÉÓÐÏÌÎÑÅÍÙÊ ÆÁÊÌ ÂÙÌ ÓÏÂÒÁÎ ÓÏ ÓÌÅÄÕÀÝÉÍÉ ÏÐÃÉÑÍÉ:" -#: main.cc:56 main.cc:180 +#: main.cc:56 main.cc:179 #, c-format msgid "" "This is free software. It is covered by the GNU General Public License,\n" @@ -697,17 +681,17 @@ msgstr "" "ÐÒÉ ÓÏÂÌÀÄÅÎÉÉ ÎÅËÏÔÏÒÙÈ ÕÓÌÏ×ÉÊ. ÷ÙÚÙ×ÁÊÔÅ ËÁË `%s --warranty' ÄÌÑ\n" "ÐÏÌÕÞÅÎÉÑ ÄÏÐÏÌÎÉÔÅÌØÎÏÊ ÉÎÆÏÒÍÁÃÉÉ.\n" -#: main.cc:63 main.cc:187 main.cc:199 +#: main.cc:63 main.cc:186 main.cc:198 #, c-format msgid "Copyright (c) %s by" msgstr "÷ÓÅ ÐÒÁ×Á ÚÁÝÉÝÅÎÙ (c) %s by" -#: main.cc:197 +#: main.cc:196 #, fuzzy msgid "GNU LilyPond -- The music typesetter" msgstr "GNU LilyPond -- îÁÂÏÒÝÉË ÍÕÚÙËÉ ðÒÏÅËÔÁ GNU" -#: main.cc:72 main.cc:205 +#: main.cc:72 main.cc:204 msgid "" " This program is free software; you can redistribute it and/or\n" "modify it under the terms of the GNU General Public License version 2\n" @@ -737,10 +721,10 @@ msgstr " msgid "silly pitch" msgstr "ÇÌÕÐÙÊ ÔÏÎ" -#: music-output-def.cc:115 +#: musical-request.cc:28 #, c-format -msgid "can't find `%s' context" -msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ËÏÎÔÅËÓÔ `%s'" +msgid "Transposition by %s makes accidental larger than two" +msgstr "" #: music.cc:232 msgid "ly_get_mus_property (): Not a Music" @@ -762,10 +746,10 @@ msgstr "" msgid "ly_music_name (): Not a music expression" msgstr "" -#: musical-request.cc:28 +#: music-output-def.cc:115 #, c-format -msgid "Transposition by %s makes accidental larger than two" -msgstr "" +msgid "can't find `%s' context" +msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ËÏÎÔÅËÓÔ `%s'" #: my-lily-lexer.cc:139 #, c-format @@ -905,16 +889,11 @@ msgstr " msgid "too many notes for rest collision" msgstr "" -#: scm-option.cc:63 +#: scm-option.cc:59 #, fuzzy msgid "Scheme options:" msgstr "ïÐÃÉÉ:" -#: score-engraver.cc:188 -#, c-format -msgid "unbound spanner `%s'" -msgstr "" - #: score.cc:78 msgid "Interpreting music..." msgstr "éÎÔÅÒÐÒÅÔÉÒÕÀ ÍÕÚÙËÕ..." @@ -933,6 +912,11 @@ msgstr " msgid "elapsed time: %.2f seconds" msgstr "ÚÁÔÒÁÞÅÎÎÏÅ ×ÒÅÍÑ: %.2f ÓÅËÕÎÄ" +#: score-engraver.cc:188 +#, c-format +msgid "unbound spanner `%s'" +msgstr "" + #: scores.cc:106 msgid "Score contains errors; will not process it" msgstr "" @@ -953,6 +937,14 @@ msgstr "" msgid "Separation_item: I've been drinking too much" msgstr "Single_malt_grouping_item: Ñ ÌÉÛËÏÍ ÍÎÏÇÏ ×ÙÐÉÌ" +#: slur.cc:48 +msgid "Putting slur over rest. Ignoring." +msgstr "ìÉÇÁ ÎÁÄ ÐÁÕÚÏÊ. éÇÎÏÒÉÒÕÀ." + +#: slur.cc:383 +msgid "Slur over rest?" +msgstr "ìÉÇÁ ÎÁÄ ÐÁÕÚÏÊ?" + #: slur-engraver.cc:127 msgid "unterminated slur" msgstr "ÎÅÚÁ×ÅÒÛÅÎÎÁÑ ÌÉÇÁ" @@ -964,21 +956,17 @@ msgstr " msgid "can't find start of slur" msgstr "ÞÔÏ-ÔÏ ÎÅ ÎÁÊÄÕ ÎÁÞÁÌÏ ÇÒÕÐÐÉÒÏ×ËÉ ÛÔÉÌÅÊ" -#: slur.cc:48 -msgid "Putting slur over rest. Ignoring." -msgstr "ìÉÇÁ ÎÁÄ ÐÁÕÚÏÊ. éÇÎÏÒÉÒÕÀ." - -#: slur.cc:383 -msgid "Slur over rest?" -msgstr "ìÉÇÁ ÎÁÄ ÐÁÕÚÏÊ?" +#: stem.cc:116 +msgid "Weird stem size; check for narrow beams" +msgstr "" #: stem-engraver.cc:115 #, c-format msgid "Adding note head to incompatible stem (type = %d)" msgstr "äÏÂÁ×ÌÑÀ ÎÏÔÕ Ë ÎÅÓÏ×ÍÅÓÔÉÍÏÍÕ ÛÔÉÌÀ (ÔÉÐ = %d)" -#: stem.cc:116 -msgid "Weird stem size; check for narrow beams" +#: text-spanner.cc:121 +msgid "Text_spanner too small" msgstr "" #: text-spanner-engraver.cc:94 @@ -996,9 +984,10 @@ msgstr " msgid "unterminated text spanner" msgstr "ÎÅÚÁ×ÅÒÛÅÎÎÙÊ ÒÁÓÛÉÒÉÔÅÌØ" -#: text-spanner.cc:121 -msgid "Text_spanner too small" -msgstr "" +#: tfm.cc:77 +#, fuzzy, c-format +msgid "can't find ascii character: %d" +msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÓÉÍ×ÏÌ ASCII: `%d'" #: tfm-reader.cc:106 #, c-format @@ -1010,11 +999,6 @@ msgstr "" msgid "%s: TFM file has %u parameters, which is more than the %u I can handle" msgstr "" -#: tfm.cc:77 -#, fuzzy, c-format -msgid "can't find ascii character: %d" -msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÓÉÍ×ÏÌ ASCII: `%d'" - #. How to shut up this warning, when no notes appeared because #. they were suicided by Thread_devnull_engraver? #: tie-engraver.cc:220 tie-performer.cc:173 @@ -1152,7 +1136,7 @@ msgstr " msgid "Have to be in Chord mode for chords" msgstr "äÏÌÖÅÎ ÂÙÔØ × áËËÏÒÄÎÏÍ ÒÅÖÉÍÅ ÄÌÑ ÁËËÏÒÄÏ×" -#: parser.yy:1911 +#: parser.yy:1910 msgid "need integer number arg" msgstr "" diff --git a/ps/music-drawing-routines.ps b/ps/music-drawing-routines.ps index 2f1f4ba350..f6d27bcfa9 100644 --- a/ps/music-drawing-routines.ps +++ b/ps/music-drawing-routines.ps @@ -12,6 +12,8 @@ 1 copy mul exch 1 copy mul add sqrt } bind def +/skeel { scale } bind def + % FIXME. translate to middle of box. % Nice rectangle with rounded corners % FIXME: linewidth hardcoded. check: too round? diff --git a/scm/grob-description.scm b/scm/grob-description.scm index 257dac1b5c..22082c5ae3 100644 --- a/scm/grob-description.scm +++ b/scm/grob-description.scm @@ -80,7 +80,7 @@ (thickness . 0.48) ; in staff-space (before-line-breaking-callback . ,Beam::before_line_breaking) (after-line-breaking-callback . ,Beam::after_line_breaking) - (neutral-direction . 1) + (neutral-direction . -1) (dir-function . ,beam-dir-majority) (height-quants . ,default-beam-dy-quants) (vertical-position-quant-function . ,default-beam-y-quants) @@ -581,7 +581,7 @@ (lengths . (3.5 3.5 3.5 4.5 5.0)) (stem-shorten . (0.5)) ; if stem is on middle line, choose this direction. - (neutral-direction . 1) + (neutral-direction . -1) (X-offset-callbacks . (,Stem::off_callback)) (X-extent-callback . ,Stem::dim_callback) (Y-extent-callback . ,Stem::height) diff --git a/scm/interface-description.scm b/scm/interface-description.scm index 2328a217cc..d63e131639 100644 --- a/scm/interface-description.scm +++ b/scm/interface-description.scm @@ -134,7 +134,7 @@ support-head heads direction - stem-length + length style flag-style dir-forced diff --git a/scm/script.scm b/scm/script.scm index c721e51ea7..628876274b 100644 --- a/scm/script.scm +++ b/scm/script.scm @@ -21,6 +21,7 @@ ("stopped" . ((feta . ("stopped" . "stopped")) #f 0 1 0)) ("staccato" . ((feta . ("staccato" . "staccato")) #t -1 0 -100)) ("tenuto" . ((feta . ("tenuto" . "tenuto")) #t -1 0 0)) + ("comma" . ((feta . ("lcomma" . "rcomma")) #t 0 1 0)) ("upbow" . ((feta . ("upbow" . "upbow")) #f 0 1 0)) ("downbow" . ((feta . ("downbow" . "downbow")) #f 0 1 0)) ("lheel" . ((feta . ("upedalheel" . "upedalheel")) #f 0 -1 0)) @@ -38,6 +39,11 @@ ("prallmordent" . ((feta . ("prallmordent" . "prallmordent")) #f 0 1 0)) ("upprall" . ((feta . ("upprall" . "upprall")) #f 0 1 0)) ("downprall" . ((feta . ("downprall" . "downprall")) #f 0 1 0)) + ("upmordent" . ((feta . ("upmordent" . "upmordent")) #f 0 1 0)) + ("downmordent" . ((feta . ("downmordent" . "downmordent")) #f 0 1 0)) + ("lineprall" . ((feta . ("lineprall" . "lineprall")) #f 0 1 0)) + ("pralldown" . ((feta . ("pralldown" . "pralldown")) #f 0 1 0)) + ("prallup" . ((feta . ("prallup" . "prallup")) #f 0 1 0)) ("segno" . ((feta . ("segno" . "segno")) #f 0 1 0)) ("coda" . ((feta . ("coda" . "coda")) #f 0 1 0))) default-script-alist) diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py index 6209e86e8b..7ec56ec48b 100644 --- a/scripts/convert-ly.py +++ b/scripts/convert-ly.py @@ -53,7 +53,7 @@ Options: -n, --no-version don't add new version stamp. --version print program version -Report bugs to bugs-gnu-music@gnu.org +Report bugs to bugs-lilypond@gnu.org """ % program_name) diff --git a/scripts/etf2ly.py b/scripts/etf2ly.py index 1511bf2a96..731b061d2a 100644 --- a/scripts/etf2ly.py +++ b/scripts/etf2ly.py @@ -1008,7 +1008,7 @@ Enigma Transport Format is a format used by Coda Music Technology's Finale product. This program will convert a subset of ETF to a ready-to-use lilypond file. -Report bugs to bug-gnu-music@gnu.org +Report bugs to bug-lilypond@gnu.org Written by Han-Wen Nienhuys """ diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py index e70fe1037f..1034493cfe 100644 --- a/scripts/lilypond-book.py +++ b/scripts/lilypond-book.py @@ -1096,7 +1096,7 @@ Options: -Report bugs to bug-gnu-music@gnu.org. +Report bugs to bug-lilypond@gnu.org. Written by Tom Cato Amundsen and Han-Wen Nienhuys diff --git a/scripts/ly2dvi.py b/scripts/ly2dvi.py index 7900ef5c89..7a896a282e 100644 --- a/scripts/ly2dvi.py +++ b/scripts/ly2dvi.py @@ -66,7 +66,10 @@ import __main__ import operator import tempfile import traceback - +import resource + + + datadir = '@datadir@' sys.path.append (datadir + '/python') try: @@ -267,7 +270,7 @@ def help (): ('\n'), (options_help_str (option_definitions)), ('\n\n'), - (_ ("Report bugs to %s") % 'bug-gnu-music@gnu.org'), + (_ ("Report bugs to %s") % 'bug-lilypond@gnu.org'), ('\n')] map (sys.stdout.write, ls) @@ -293,6 +296,10 @@ def system (cmd, ignore_error = 0): Exit status of CMD """ + + # Attempt to fix problems with limited stack size set by Python! + # Sets unlimited stack size. + resource.setrlimit(resource.RLIMIT_STACK, (-1,-1)) if verbose_p: progress (_ ("Invoking `%s\'") % cmd) diff --git a/scripts/mup2ly.py b/scripts/mup2ly.py index 208aa76ae3..afa0dc50ad 100644 --- a/scripts/mup2ly.py +++ b/scripts/mup2ly.py @@ -165,7 +165,7 @@ def help (): sys.stdout.write ('\n') warning (_ ("%s is far from completed. Not all constructs are recognised.") % program_name) sys.stdout.write ('\n') - sys.stdout.write (_ ("Report bugs to %s") % 'bug-gnu-music@gnu.org') + sys.stdout.write (_ ("Report bugs to %s") % 'bug-lilypond@gnu.org') sys.stdout.write ('\n') sys.exit (0) diff --git a/scripts/musedata2ly.py b/scripts/musedata2ly.py index 9f1a3d1699..e17ab88afb 100644 --- a/scripts/musedata2ly.py +++ b/scripts/musedata2ly.py @@ -519,7 +519,7 @@ encoded in so-called Musedata format musedata2ly converts a set of musedata files to one .ly file, and will include a \header field if a .ref file is supplied -Report bugs to bug-gnu-music@gnu.org. +Report bugs to bug-lilypond@gnu.org. Written by Han-Wen Nienhuys """) diff --git a/scripts/pmx2ly.py b/scripts/pmx2ly.py index 44535e503a..d701344577 100644 --- a/scripts/pmx2ly.py +++ b/scripts/pmx2ly.py @@ -748,7 +748,7 @@ Options: PMX is a Musixtex preprocessor written by Don Simons, see http://www.gmd.de/Misc/Music/musixtex/software/pmx/ -Report bugs to bug-gnu-music@gnu.org. +Report bugs to bug-lilypond@gnu.org. Written by Han-Wen Nienhuys """) diff --git a/scripts/update-lily.py b/scripts/update-lily.py index b1fdd3420f..15920ab109 100644 --- a/scripts/update-lily.py +++ b/scripts/update-lily.py @@ -188,7 +188,7 @@ def help (): sys.stdout.write ('\n') sys.stdout.write (options_help_str (option_definitions)) sys.stdout.write ('\n\n') - sys.stdout.write (_ ("Report bugs to %s") % 'bug-gnu-music@gnu.org') + sys.stdout.write (_ ("Report bugs to %s") % 'bug-lilypond@gnu.org') sys.stdout.write ('\n') sys.exit (0) diff --git a/tex/lily-ps-defs.tex b/tex/lily-ps-defs.tex index c1ff2b18ed..6cae405e8a 100644 --- a/tex/lily-ps-defs.tex +++ b/tex/lily-ps-defs.tex @@ -16,7 +16,7 @@ \def\embeddedps##1{% \special{ps\string: @beginspecial @setspecial \lilypondpaperoutputscale\lilySpace - \lilypondpaperoutputscale\lilySpace scale + \lilypondpaperoutputscale\lilySpace skeel ##1 @endspecial}% } } -- 2.39.5