From 01d6763cea8e4890874001a2f756ba2162e4262f Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Tue, 25 Jul 2000 19:43:47 +0200 Subject: [PATCH] release: 1.3.75 ====== 1.3.74. --- CHANGES | 36 + Documentation/regression-test.tely | 7 +- Documentation/topdocs/INSTALL.texi | 6 +- INSTALL.txt | 6 +- VERSION | 4 +- aclocal.m4 | 38 +- config.hh.in | 14 +- config.make.in | 2 + configure | 373 +++++++--- configure.in | 3 +- input/bugs/non-empty-text.ly | 23 + input/test/banter-chords.ly | 36 +- input/test/chord-names.ly | 3 + input/test/non-empty-text.ly | 23 + lily/GNUmakefile | 2 - lily/all-font-metrics.cc | 15 +- lily/chord-name.cc | 4 +- lily/include/lily-guile.hh | 4 + lily/input-smob.cc | 1 - lily/main.cc | 30 +- lily/my-lily-parser.cc | 4 +- lily/scm-hash.cc | 6 +- lily/scores.cc | 7 +- lily/text-engraver.cc | 18 +- ly/declarations-as.ly | 12 +- ly/engraver.ly | 8 +- ly/init-as.fly | 2 +- ly/init-as.ly | 2 +- ly/params-as.ly | 36 +- make/out/lilypond.lsm | 8 +- make/out/lilypond.spec | 4 +- make/toplevel.make.in | 12 + po/de.po | 419 ++++++----- po/fr.po | 406 ++++++----- po/it.po | 418 ++++++----- po/ja.po | 1074 +++++++++++++++------------- po/lilypond.pot | 325 +++++---- po/nl.po | 328 +++++---- po/ru.po | 407 ++++++----- scm/lily.scm | 12 +- stepmake/aclocal.m4 | 38 +- 41 files changed, 2362 insertions(+), 1814 deletions(-) create mode 100644 input/bugs/non-empty-text.ly create mode 100644 input/test/non-empty-text.ly diff --git a/CHANGES b/CHANGES index 597aa4bbfa..0360536b99 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,9 @@ +1.3.75 +====== + +1.3.74.gp1 +========== + * Improved default handling of Lyric_phrasing_engraver and made it on by default. @@ -7,10 +13,40 @@ default. * fixed bug in script.cc so fermata (and other scripts) get flipped correctly when they are above the staff. +1.3.74.jcn2 +=========== + +* Reincluded simple code for including tfm.[1-5] into search path. + Configure with --disable-kpathsea to enable this kludge. + +1.3.74.jcn1 +=========== + +* Updated input/test/banter-chords.ly German H/B example. + +* Updated nl.po. + +* Have configure check for kpathsea library and functions. Made kpathsea + support optional for now. + +* Bugfix: halved width of tremolo-beams. + +* Included compilation fix for guile-1.3.4 (Anthony). + +* Added: chord inversion and base to regtest. + +* Fixed: Chord names that were broken by pl73. + +* Fixed: Chord inversions that were broken by pl72. + +* Resurrected ascii-script output, for debugging purposes. + +* Included compilation fix for scm-hash.cc (Han-Wen). 1.3.74 ====== + * Small bugfix: also do a deep copy on submusices * Fixed: \autochange doesn't crash anymore. diff --git a/Documentation/regression-test.tely b/Documentation/regression-test.tely index 0e745b244f..e07ea7dfb9 100644 --- a/Documentation/regression-test.tely +++ b/Documentation/regression-test.tely @@ -12,7 +12,7 @@ @section Introduction -This document tries give an brief overview of LilyPond features. When +This document tries give a brief overview of LilyPond features. When the text correspond with the shown notation, we consider LilyPond Officially BugFree (tm). This document is intended for finding bugs, and documenting bugfixes. @@ -309,6 +309,11 @@ lyrics don't collide with barlines. @mudelafile{lyrics-bar.ly} +Text is set with empty horizontal dimensions. The boolean property +textNonEmpty is used to respect the horizontal size of text. + +@mudelafile{non-empty-text.ly} + @section Global stuff Breaks can be encouraged and discouraged using @code{\break} and diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi index 3ae43ce2fe..3583f2a772 100644 --- a/Documentation/topdocs/INSTALL.texi +++ b/Documentation/topdocs/INSTALL.texi @@ -75,6 +75,10 @@ Check out @uref{ftp://ftp.gnu.org/gnu/flex/,ftp://ftp.gnu.org/gnu/flex/}. @item Bison (version 1.25 or newer). Check out @uref{ftp://ftp.gnu.org/gnu/bison/,ftp://ftp.gnu.org/gnu/bison/}. +@item TeX. If you want LilyPond to use kpathsea support (recommended), +make sure you have tetex 1.0 or newer (1.0.6 is known to work). You may +need to install a tetex-devel or tetex-dev package too. + @item Texinfo (version 4.0 or newer). Check out @uref{ftp://ftp.gnu.org/gnu/texinfo/,ftp://ftp.gnu.org/gnu/texinfo/}. Most documentation is in texinfo. @@ -103,7 +107,7 @@ GNU LilyPond does use a lot of resources. For operation you need the following software @itemize @bullet -@item TeX +@item TeX. @item A PostScript printer and/or viewer (such as Ghostscript) is strongly recommended. Xdvi will show all embedded PostScript too if you have Ghostscript installed. diff --git a/INSTALL.txt b/INSTALL.txt index c7fcd32855..378400dc44 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -67,6 +67,10 @@ Prerequisites * Bison (version 1.25 or newer). Check out ftp://ftp.gnu.org/gnu/bison/ (ftp://ftp.gnu.org/gnu/bison/). + * TeX. If you want LilyPond to use kpathsea support (recommended), + make sure you have tetex 1.0 or newer (1.0.6 is known to work). + You may need to install a tetex-devel or tetex-dev package too. + * Texinfo (version 4.0 or newer). Check out ftp://ftp.gnu.org/gnu/texinfo/ (ftp://ftp.gnu.org/gnu/texinfo/). Most documentation is in texinfo. @@ -94,7 +98,7 @@ Running GNU LilyPond does use a lot of resources. For operation you need the following software - * TeX + * TeX. * A PostScript printer and/or viewer (such as Ghostscript) is strongly recommended. Xdvi will show all embedded PostScript diff --git a/VERSION b/VERSION index 968d29242b..d4f243d7e1 100644 --- a/VERSION +++ b/VERSION @@ -1,8 +1,8 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=3 -PATCH_LEVEL=74 -MY_PATCH_LEVEL=gp1 +PATCH_LEVEL=75 +MY_PATCH_LEVEL= # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/aclocal.m4 b/aclocal.m4 index 25ba3293eb..6bca70dc77 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -152,7 +152,7 @@ AC_DEFUN(AC_STEPMAKE_GXX, [ then true else - AC_STEPMAKE_WARN(can\'t find g++ 2.8 or egcs 1.1) + AC_STEPMAKE_WARN(can\'t find g++ 2.8, 2.9 or egcs 1.1) fi ]) @@ -393,6 +393,34 @@ dnl fi AC_STEPMAKE_DATADIR ]) +AC_DEFUN(AC_STEPMAKE_KPATHSEA, [ + + kpathsea_b=yes + AC_ARG_ENABLE(kpathsea, + [ enable-kpathsea use kpathsea lib. Default: on], + [kpathsea_b=$enableval]) + + if test $kpathsea_b = yes; then + AC_HAVE_HEADERS(kpathsea/kpathsea.h) + AC_CHECK_LIB(kpathsea, kpse_find_file) + # urg: kpse_find_tfm is a #define, how to check for this? + # AC_CHECK_LIB(kpathsea, kpse_find_tfm) + # AC_CHECK_FUNCS(kpse_find_file kpse_find_tfm,, AC_STEPMAKE_WARN(Cannot find kpathsea functions. You may have to create TFM files manually.)) + AC_CHECK_FUNCS(kpse_find_file,, AC_STEPMAKE_WARN(Cannot find kpathsea functions. You may have to create TFM files manually.) kpathsea_b=no) + fi + AC_MSG_CHECKING(whether to use kpathsea) + if test $kpathsea_b = yes; then + AC_MSG_RESULT(yes) + KPATHSEA=1 + else + AC_MSG_RESULT(no) + KPATHSEA=0 + fi + + AC_SUBST(KPATHSEA) + AC_DEFINE_UNQUOTED(KPATHSEA, $KPATHSEA) +]) + AC_DEFUN(AC_STEPMAKE_LEXYACC, [ # ugh, automake: we want (and check for) bison AC_PROG_YACC @@ -520,7 +548,7 @@ AC_DEFUN(AC_STEPMAKE_MSGFMT, [ #why has this been dropped? AC_DEFUN(XXAC_STEPMAKE_TEXMF_DIRS, [ AC_ARG_ENABLE(tex-prefix, - [ enable-tex-prefix=DIR set the tex-directory to find TeX subdirectories. (default: PREFIX)], + [ enable-tex-prefix=DIR set the tex-directory to find TeX subdirectories. Default: PREFIX], [TEXPREFIX=$enableval], [TEXPREFIX=auto] ) @@ -554,7 +582,7 @@ AC_DEFUN(XXAC_STEPMAKE_TEXMF_DIRS, [ AC_DEFUN(AC_STEPMAKE_TEXMF_DIRS, [ AC_ARG_ENABLE(tfm-path, - [ enable-tfm-path=PATH set path of tex directories where tfm files live, esp.: cmr10.tfm (default: use kpsewhich)], + [ enable-tfm-path=PATH set path of tex directories where tfm files live, esp.: cmr10.tfm. Default: use kpsewhich], [tfm_path=$enableval], [tfm_path=auto] ) @@ -699,7 +727,7 @@ AC_DEFUN(AC_TEX_PREFIX, [ if test "x$find_texpostfix" = x; then find_texpostfix='/lib/texmf/tex' - AC_STEPMAKE_WARN(Cannot determine the TeX-directory. Please use --enable-tex-prefix) + AC_STEPMAKE_WARN(Cannot determine the TeX-directory. Please use --enable-tex-prefix) fi find_texprefix="$find_root_prefix/$find_texpostfix" @@ -727,7 +755,7 @@ AC_DEFUN(AC_FIND_DIR_IN_PREFIX, [ if test "x$find_dirdir" = x; then find_dirdir="/$3"; - AC_STEPMAKE_WARN(Cannot determine $4 subdirectory. Please set from command-line) + AC_STEPMAKE_WARN(Cannot determine $4 subdirectory. Please set from command-line) true fi $2=$find_dirdir diff --git a/config.hh.in b/config.hh.in index 4272e0b1c7..a24a0584cd 100644 --- a/config.hh.in +++ b/config.hh.in @@ -24,6 +24,18 @@ /* define if you have isinf */ #define HAVE_ISINF 0 +/* define if you want KPATHSEA */ +#define KPATHSEA @KPATHSEA@ + +/* define if you have kpatsea header */ +#define HAVE_KPATHSEA_KPATHSEA_H 0 + +/* define if you have kpse_find_file */ +#define HAVE_KPSE_FIND_FILE 0 + +/* define if you have kpse_find_tfm */ +#define HAVE_KPSE_FIND_TFM 0 + /* define if explicit instantiation is needed */ #undef NEED_EXPLICIT_INSTANTIATION @@ -31,5 +43,5 @@ #define DIRSEP '@DIRSEP@' #define PATHSEP '@PATHSEP@' -/* define if no assert */ +/* define if you have assert */ #define HAVE_ASSERT_H 1 diff --git a/config.make.in b/config.make.in index 2e4232adfd..bd7a13c042 100644 --- a/config.make.in +++ b/config.make.in @@ -27,6 +27,7 @@ prefix = @prefix@ srcdir = @srcdir@ TEXPREFIX = @TEXPREFIX@ TEXDIR = @TEXDIR@ +KPATHSEA = @KPATHSEA@ MFDIR = @MFDIR@ mandir = @mandir@ infodir = @infodir@ @@ -38,6 +39,7 @@ localedir = @localedir@ program_prefix = @program_prefix@ program_suffix = @program_suffix@ EXTRA_LIBES = @EXTRA_LIBES@ @LIBS@ +TFM_PATH = @TFM_PATH@ RANLIB = @RANLIB@ DEFS = @DEFS@ #SET_MAKE = @SET_MAKE@ diff --git a/configure b/configure index 839124306e..2b07fc6941 100755 --- a/configure +++ b/configure @@ -83,7 +83,9 @@ ac_help="$ac_help ac_help="$ac_help with-lang=LANG use LANG as language to emit messages" ac_help="$ac_help - enable-tfm-path=PATH set path of tex directories where tfm files live, esp.: cmr10.tfm (default: use kpsewhich)" + enable-tfm-path=PATH set path of tex directories where tfm files live, esp.: cmr10.tfm. Default: use kpsewhich" +ac_help="$ac_help + enable-kpathsea use kpathsea lib. Default: on" # Initialize some variables set by options. # The variables have the same names as the options, with @@ -627,7 +629,7 @@ fi fi echo $ac_n "checking Package""... $ac_c" 1>&6 -echo "configure:631: checking Package" >&5 +echo "configure:633: checking Package" >&5 if test "x$PACKAGE" = "xSTEPMAKE"; then echo "$ac_t""Stepmake package!" 1>&6 @@ -679,7 +681,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. fi echo $ac_n "checking for stepmake""... $ac_c" 1>&6 -echo "configure:683: checking for stepmake" >&5 +echo "configure:685: checking for stepmake" >&5 # Check for installed stepmake if test -d $stepmake; then echo "$ac_t""$stepmake" 1>&6 @@ -801,7 +803,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:805: checking host system type" >&5 +echo "configure:807: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -826,7 +828,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:830: checking for $ac_word" >&5 +echo "configure:832: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MAKE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -861,7 +863,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:865: checking for $ac_word" >&5 +echo "configure:867: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_FIND'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -898,7 +900,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:902: checking for $ac_word" >&5 +echo "configure:904: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_TAR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -933,7 +935,7 @@ test -n "$TAR" || TAR="error" # Extract the first word of "bash", so it can be a program name with args. set dummy bash; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:937: checking for $ac_word" >&5 +echo "configure:939: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_BASH'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -973,7 +975,7 @@ fi # Extract the first word of "bash", so it can be a program name with args. set dummy bash; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:977: checking for $ac_word" >&5 +echo "configure:979: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_SHELL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1010,7 +1012,7 @@ fi # Extract the first word of "bash", so it can be a program name with args. set dummy bash; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1014: checking for $ac_word" >&5 +echo "configure:1016: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_BASH'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1051,7 +1053,7 @@ fi # Extract the first word of "${PYTHON:-python}", so it can be a program name with args. set dummy ${PYTHON:-python}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1055: checking for $ac_word" >&5 +echo "configure:1057: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1276,7 +1278,7 @@ EOF # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1280: checking for $ac_word" >&5 +echo "configure:1282: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1306,7 +1308,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1310: checking for $ac_word" >&5 +echo "configure:1312: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1357,7 +1359,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1361: checking for $ac_word" >&5 +echo "configure:1363: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1389,7 +1391,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1393: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1395: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1400,12 +1402,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1404 "configure" +#line 1406 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1431,12 +1433,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1435: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1437: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1440: checking whether we are using GNU C" >&5 +echo "configure:1442: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1445,7 +1447,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1449: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1451: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1464,7 +1466,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1468: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1470: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1510,7 +1512,7 @@ fi # AC_HAVE_HEADERS(limits.h malloc.h string.h unistd.h values.h) echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1514: checking how to run the C preprocessor" >&5 +echo "configure:1516: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1525,13 +1527,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1535: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1537: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1542,13 +1544,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1552: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1554: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1559,13 +1561,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1569: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1571: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1593,17 +1595,17 @@ for ac_hdr in assert.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1597: checking for $ac_hdr" >&5 +echo "configure:1599: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1607: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1609: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1656,7 +1658,7 @@ EOF fi echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:1660: checking how to run the C++ preprocessor" >&5 +echo "configure:1662: checking how to run the C++ preprocessor" >&5 if test -z "$CXXCPP"; then if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1669,12 +1671,12 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross CXXCPP="${CXX-g++} -E" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1678: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1680: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1711,7 +1713,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1715: checking for $ac_word" >&5 +echo "configure:1717: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1743,7 +1745,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1747: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:1749: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1754,12 +1756,12 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext << EOF -#line 1758 "configure" +#line 1760 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:1763: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1785,12 +1787,12 @@ if test $ac_cv_prog_cxx_works = no; then { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1789: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1791: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:1794: checking whether we are using GNU C++" >&5 +echo "configure:1796: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1799,7 +1801,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1803: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1805: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -1818,7 +1820,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}" ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:1822: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:1824: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1852,17 +1854,17 @@ fi ac_safe=`echo "FlexLexer.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for FlexLexer.h""... $ac_c" 1>&6 -echo "configure:1856: checking for FlexLexer.h" >&5 +echo "configure:1858: checking for FlexLexer.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1866: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1868: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1906,19 +1908,19 @@ fi true else - echo "configure: warning: can\'t find g++ 2.8 or egcs 1.1" 1>&2 + echo "configure: warning: can\'t find g++ 2.8" 1>&2 warn_b=yes fi echo $ac_n "checking whether explicit instantiation is needed""... $ac_c" 1>&6 -echo "configure:1917: checking whether explicit instantiation is needed" >&5 +echo "configure:1919: checking whether explicit instantiation is needed" >&5 if eval "test \"`echo '$''{'lily_cv_need_explicit_instantiation'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < struct foo { static int baz; }; @@ -1928,7 +1930,7 @@ int main() { return foo::baz; ; return 0; } EOF -if { (eval echo configure:1932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lily_cv_need_explicit_instantiation=no else @@ -1955,7 +1957,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1959: checking for $ac_word" >&5 +echo "configure:1961: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1998,7 +2000,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2002: checking for $ac_word" >&5 +echo "configure:2004: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_BISON'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2033,7 +2035,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2037: checking for $ac_word" >&5 +echo "configure:2039: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_FLEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2101,7 +2103,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2105: checking for $ac_word" >&5 +echo "configure:2107: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2134,7 +2136,7 @@ test -n "$AR" || AR="error" # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2138: checking for $ac_word" >&5 +echo "configure:2140: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2190,7 +2192,7 @@ fi echo $ac_n "checking language""... $ac_c" 1>&6 -echo "configure:2194: checking language" >&5 +echo "configure:2196: checking language" >&5 case "$language" in En* | en* | Am* | am* | US* | us*) lang=English;; @@ -2226,7 +2228,7 @@ EOF echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6 -echo "configure:2230: checking for gettext in -lintl" >&5 +echo "configure:2232: checking for gettext in -lintl" >&5 ac_lib_var=`echo intl'_'gettext | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2234,7 +2236,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2254: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2278,12 +2280,12 @@ fi for ac_func in gettext do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2282: checking for $ac_func" >&5 +echo "configure:2284: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2341,7 +2343,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2345: checking for $ac_word" >&5 +echo "configure:2347: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2372,7 +2374,7 @@ done test -n "$MSGFMT" || MSGFMT="\$(SHELL) \$(step-bindir)/fake-msgfmt.sh " echo $ac_n "checking whether msgfmt accepts -o""... $ac_c" 1>&6 -echo "configure:2376: checking whether msgfmt accepts -o" >&5 +echo "configure:2378: checking whether msgfmt accepts -o" >&5 msgfmt_output="`msgfmt -o bla 2>&1 | grep usage`" if test "$msgfmt_output" = ""; then echo "$ac_t""yes" 1>&6 @@ -2400,7 +2402,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2404: checking for $ac_word" >&5 +echo "configure:2406: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_METAFONT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2436,7 +2438,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2440: checking for $ac_word" >&5 +echo "configure:2442: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MFONT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2474,7 +2476,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2478: checking for $ac_word" >&5 +echo "configure:2480: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_METAPOST'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2510,7 +2512,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2514: checking for $ac_word" >&5 +echo "configure:2516: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MPOST'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2549,7 +2551,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2553: checking for $ac_word" >&5 +echo "configure:2555: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_INIMETAFONT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2585,7 +2587,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2589: checking for $ac_word" >&5 +echo "configure:2591: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_INIMFONT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2623,7 +2625,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2627: checking for $ac_word" >&5 +echo "configure:2629: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_INIMETAPOST'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2659,7 +2661,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2663: checking for $ac_word" >&5 +echo "configure:2665: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_INIMPOST'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2693,7 +2695,7 @@ test -n "$INIMPOST" || INIMPOST="-echo no inimp or inimpost" fi echo $ac_n "checking for working metafont mode""... $ac_c" 1>&6 -echo "configure:2697: checking for working metafont mode" >&5 +echo "configure:2699: checking for working metafont mode" >&5 modelist='ljfour lj4 lj3 lj2 ljet laserjet' for MFMODE in $modelist; do $METAFONT "\mode:=$MFMODE; mode_setup; end." > /dev/null 2>&1 @@ -2739,7 +2741,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2743: checking for $ac_word" >&5 +echo "configure:2745: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_KPSEWHICH'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2770,7 +2772,7 @@ done test -n "$KPSEWHICH" || KPSEWHICH="no" echo $ac_n "checking for tfm path""... $ac_c" 1>&6 -echo "configure:2774: checking for tfm path" >&5 +echo "configure:2776: checking for tfm path" >&5 TFM_FONTS="cmr msam" @@ -2798,13 +2800,13 @@ echo "configure:2774: checking for tfm path" >&5 ## First, let's just see if we can find Guile at all. echo $ac_n "checking "for guile-config"""... $ac_c" 1>&6 -echo "configure:2802: checking "for guile-config"" >&5 +echo "configure:2804: checking "for guile-config"" >&5 for guile_config in guile-config $target-guile-config $build-guile-config; do echo "$ac_t"""$guile_config"" 1>&6 if ! $guile_config --version > /dev/null 2>&1 ; then echo "configure: warning: "cannot execute $guile_config"" 1>&2 echo $ac_n "checking "if we are cross compiling"""... $ac_c" 1>&6 -echo "configure:2808: checking "if we are cross compiling"" >&5 +echo "configure:2810: checking "if we are cross compiling"" >&5 guile_config=error else break @@ -2815,7 +2817,7 @@ echo "configure:2808: checking "if we are cross compiling"" >&5 exit 1 fi echo $ac_n "checking "Guile version"""... $ac_c" 1>&6 -echo "configure:2819: checking "Guile version"" >&5 +echo "configure:2821: checking "Guile version"" >&5 need_guile_version="1.3.4" guile_version=`expr "\`$guile_config --version 2>&1\`" : ".*\($need_guile_version\).*"` echo "$ac_t"""$guile_version"" 1>&6 @@ -2828,7 +2830,7 @@ echo "configure:2819: checking "Guile version"" >&5 ## The GUILE_FLAGS macro. echo $ac_n "checking for Guile""... $ac_c" 1>&6 -echo "configure:2832: checking for Guile" >&5 +echo "configure:2834: checking for Guile" >&5 if ! $guile_config link > /dev/null ; then echo "$ac_t"""cannot execute $guile_config"" 1>&6 { echo "configure: error: "cannot find guile-config; is Guile installed?"" 1>&2; exit 1; } @@ -2843,7 +2845,7 @@ echo "configure:2832: checking for Guile" >&5 # Extract the first word of "guile", so it can be a program name with args. set dummy guile; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2847: checking for $ac_word" >&5 +echo "configure:2849: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GUILE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2880,8 +2882,190 @@ fi + kpathsea_b=yes + # Check whether --enable-kpathsea or --disable-kpathsea was given. +if test "${enable_kpathsea+set}" = set; then + enableval="$enable_kpathsea" + kpathsea_b=$enableval +fi + + + if test $kpathsea_b = yes; then + for ac_hdr in kpathsea/kpathsea.h +do +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:2899: checking for $ac_hdr" >&5 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:2909: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" +fi +rm -f conftest* +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <&6 +fi +done + + echo $ac_n "checking for kpse_find_file in -lkpathsea""... $ac_c" 1>&6 +echo "configure:2936: checking for kpse_find_file in -lkpathsea" >&5 +ac_lib_var=`echo kpathsea'_'kpse_find_file | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lkpathsea $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_lib=HAVE_LIB`echo kpathsea | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + cat >> confdefs.h <&6 +fi + + # urg: kpse_find_tfm is a #define, how to check for this? + # AC_CHECK_LIB(kpathsea, kpse_find_tfm) + # AC_CHECK_FUNCS(kpse_find_file kpse_find_tfm,, AC_STEPMAKE_WARN(Cannot find kpathsea functions. You may have to create TFM files manually.)) + for ac_func in kpse_find_file +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:2991: checking for $ac_func" >&5 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +$ac_func(); +#endif + +; return 0; } +EOF +if { (eval echo configure:3022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_$ac_func=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <&6 +echo "configure: warning: Cannot find kpathsea functions. You may have to create TFM files manually." 1>&2 + warn_b=yes + kpathsea_b=no +fi +done + + fi + echo $ac_n "checking whether to use kpathsea""... $ac_c" 1>&6 +echo "configure:3051: checking whether to use kpathsea" >&5 + if test $kpathsea_b = yes; then + echo "$ac_t""yes" 1>&6 + KPATHSEA=1 + else + echo "$ac_t""no" 1>&6 + KPATHSEA=0 + fi + + + cat >> confdefs.h <&6 -echo "configure:2885: checking for 8-bit clean memcmp" >&5 +echo "configure:3069: checking for 8-bit clean memcmp" >&5 if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2889,7 +3073,7 @@ else ac_cv_func_memcmp_clean=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_memcmp_clean=yes else @@ -2920,12 +3104,12 @@ echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6 test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}" echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:2924: checking for vprintf" >&5 +echo "configure:3108: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -2975,12 +3159,12 @@ fi if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:2979: checking for _doprnt" >&5 +echo "configure:3163: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -3033,12 +3217,12 @@ fi for ac_func in memmem snprintf vsnprintf gettext isinf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3037: checking for $ac_func" >&5 +echo "configure:3221: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3103,7 +3287,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3107: checking for $ac_word" >&5 +echo "configure:3291: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MAKEINFO'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3136,7 +3320,7 @@ test -n "$MAKEINFO" || MAKEINFO="error" # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3140: checking for $ac_word" >&5 +echo "configure:3324: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3171,7 +3355,6 @@ fi - trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure @@ -3366,6 +3549,7 @@ s%@TFM_PATH@%$TFM_PATH%g s%@GUILE_CFLAGS@%$GUILE_CFLAGS%g s%@GUILE_LDFLAGS@%$GUILE_LDFLAGS%g s%@GUILE@%$GUILE%g +s%@KPATHSEA@%$KPATHSEA%g s%@LIBOBJS@%$LIBOBJS%g s%@MAKEINFO@%$MAKEINFO%g s%@PERL@%$PERL%g @@ -3687,4 +3871,3 @@ fi fi -# ugh, hack. diff --git a/configure.in b/configure.in index 07ca6f4bc4..f19b156e36 100644 --- a/configure.in +++ b/configure.in @@ -44,6 +44,7 @@ AC_STEPMAKE_MSGFMT AC_STEPMAKE_TEXMF AC_STEPMAKE_TEXMF_DIRS AC_STEPMAKE_GUILE +AC_STEPMAKE_KPATHSEA dnl should check out -print dnl huh? @@ -59,7 +60,5 @@ AC_DEFINE_UNQUOTED(FLOWER_VERSION, "${FULL_FLOWER_VERSION}") AC_CHECK_PROGS(MAKEINFO, makeinfo, error) AC_PATH_PROG(PERL, perl, error) - AC_STEPMAKE_END -# ugh, hack. diff --git a/input/bugs/non-empty-text.ly b/input/bugs/non-empty-text.ly new file mode 100644 index 0000000000..6244598991 --- /dev/null +++ b/input/bugs/non-empty-text.ly @@ -0,0 +1,23 @@ +% +% Try this file with 1.2.17: it works +% 1.2 had a different default, and uses textEmptyDimension scalar property +% +\score{ + \notes\relative c''{ + %\property Staff.textEmptyDimension=1 + a-"This text has no" + a + a + a-"width; the default" + \break + \property Staff.textNonEmpty=##t + %\property Staff.textEmptyDimension=0 + a-"This text" + a-"is fat: notes are spaced" + a-"far apart and text" + a-"does not collide" + } + \paper{ + linewidth=80.\mm; + } +} diff --git a/input/test/banter-chords.ly b/input/test/banter-chords.ly index 642aaa8bae..ccd10d088f 100644 --- a/input/test/banter-chords.ly +++ b/input/test/banter-chords.ly @@ -16,24 +16,34 @@ TestedFeatures = "Banter named chords"; % when this file has been parsed... % { -#(set! note-names-alist - (append - '( - ; use these for German naming - ((6 . 0) . ("H" "")) - ((6 . -1) . ("B" ("feta-1" . ""))) - ) - note-names-alist)) -#(set! chord-names-alist +#;(define chord::names-alist-banter '()) +#(set! chord::names-alist-banter (append '( - (((0 . 0) (2 . -1) (4 . -1)) . ("m" . ("script" . "5-"))) + (((0 . 0) (2 . -1) (4 . -1)) . (("m" ("5-" . (type . "super"))))) ; Co iso Cm5-7- - ; urg, niet te pruimen - ; (((0 . 0) (2 . -1) (4 . -1) (6 . -2)) . ("" . ("feta-1" . "."))) - (((0 . 0) (2 . -1) (4 . -1) (6 . -2)) . ("" . ("script" . "o"))) + (((0 . 0) (2 . -1) (4 . -1) (6 . -2)) . ("o" (type "super"))) ))) + +% German note names: +% Urg, this will break again, in time +% Is this correct, anyway? + +#(define (pitch->text pitch) + (if (and (= (modulo (cadr pitch) 7) 6) + (= (caddr pitch) -1)) + (cons (make-string 1 (integer->char 66)) '()) + (cons + (if (= (modulo (cadr pitch) 7) 6) + (make-string 1 (integer->char 72)) + (make-string 1 (integer->char (+ (modulo (+ (cadr pitch) 2) 7) 65)))) + (if (= (caddr pitch) 0) + '() + (list (list (string-append "accidentals-" + (number->string (caddr pitch))) + '(font . "feta"))))))) + % } chord = \notes\transpose c''\chords{ diff --git a/input/test/chord-names.ly b/input/test/chord-names.ly index 87e82c4699..500f98e949 100644 --- a/input/test/chord-names.ly +++ b/input/test/chord-names.ly @@ -8,6 +8,9 @@ chord = \notes\transpose c''\chords{ c:5-.7+ c:m7 c:7 + d + d/a + d/+gis } \score{ diff --git a/input/test/non-empty-text.ly b/input/test/non-empty-text.ly new file mode 100644 index 0000000000..6244598991 --- /dev/null +++ b/input/test/non-empty-text.ly @@ -0,0 +1,23 @@ +% +% Try this file with 1.2.17: it works +% 1.2 had a different default, and uses textEmptyDimension scalar property +% +\score{ + \notes\relative c''{ + %\property Staff.textEmptyDimension=1 + a-"This text has no" + a + a + a-"width; the default" + \break + \property Staff.textNonEmpty=##t + %\property Staff.textEmptyDimension=0 + a-"This text" + a-"is fat: notes are spaced" + a-"far apart and text" + a-"does not collide" + } + \paper{ + linewidth=80.\mm; + } +} diff --git a/lily/GNUmakefile b/lily/GNUmakefile index 7699304769..254cf67f78 100644 --- a/lily/GNUmakefile +++ b/lily/GNUmakefile @@ -6,7 +6,6 @@ depth = .. NAME = lilypond SUBDIRS = include -EXTRA_LIBES=-lkpathsea MODULE_LIBS=$(depth)/flower MODULE_INCLUDES= $(depth)/flower/include MODULE_CXXFLAGS= @@ -15,7 +14,6 @@ HELP2MAN_EXECS = lilypond STEPMAKE_TEMPLATES= c++ executable po help2man include $(depth)/make/stepmake.make -EXTRA_LIBES=-lkpathsea # force these: Make can't know these have to be generated in advance $(outdir)/my-lily-parser.o: $(outdir)/parser.hh $(outdir)/my-lily-lexer.o: $(outdir)/parser.hh diff --git a/lily/all-font-metrics.cc b/lily/all-font-metrics.cc index 10f0ef3476..23d709d928 100644 --- a/lily/all-font-metrics.cc +++ b/lily/all-font-metrics.cc @@ -7,6 +7,7 @@ */ +#include "config.h" #include "main.hh" #include "all-font-metrics.hh" #include "debug.hh" @@ -17,11 +18,11 @@ #include "scm-hash.hh" - - +#if HAVE_KPATHSEA_KPATHSEA_H extern "C" { #include } +#endif const char * default_font_sz_ = "cmr10"; @@ -48,12 +49,15 @@ All_font_metrics::find_afm (String name) if (!afm_p_dict_->elem_b (sname)) { String path; + +#if KPATHSEA && HAVE_KPSE_FIND_FILE if (path.empty_b ()) { - char * p = kpse_find_file(name.ch_C(), kpse_afm_format, true); + char * p = kpse_find_file (name.ch_C(), kpse_afm_format, true); if (p) path = p; } +#endif if (path.empty_b()) path = search_path_.find (name + ".afm"); @@ -103,11 +107,14 @@ All_font_metrics::find_tfm (String name) { String path; +//#if KPATHSEA && HAVE_KPSE_FIND_TFM -- urg: a macro +#if KPATHSEA && HAVE_KPSE_FIND_FILE if (path.empty_b()) { - char * p = kpse_find_tfm(name.ch_C()); + char * p = kpse_find_tfm (name.ch_C()); path = p; } +#endif if (path.empty_b()) path = search_path_.find (name + ".tfm"); if (path.empty_b()) diff --git a/lily/chord-name.cc b/lily/chord-name.cc index c05ebfc187..62562e08ec 100644 --- a/lily/chord-name.cc +++ b/lily/chord-name.cc @@ -136,11 +136,11 @@ Chord_name::brew_molecule (SCM smob) style = ly_str02scm ("banter"); SCM inversion = sc-> get_elt_property ("inversion"); - if (inversion != SCM_BOOL_T) + if (inversion == SCM_EOL) inversion = SCM_BOOL_F; SCM bass = sc->get_elt_property ("bass"); - if (bass != SCM_BOOL_T) + if (bass == SCM_EOL) bass = SCM_BOOL_F; SCM pitches = sc->get_elt_property ("pitches"); diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh index be8a39ff6f..fed4a8af55 100644 --- a/lily/include/lily-guile.hh +++ b/lily/include/lily-guile.hh @@ -11,6 +11,10 @@ #include #include + +#define fix_guile_1_3_4_scm_puts(scm_data, port) scm_puts ((char*)scm_data, port) +#define scm_puts(scm_data, port) fix_guile_1_3_4_scm_puts (scm_data, port) + #include "direction.hh" #include "flower-proto.hh" diff --git a/lily/input-smob.cc b/lily/input-smob.cc index ead1b749e2..2a9927db86 100644 --- a/lily/input-smob.cc +++ b/lily/input-smob.cc @@ -14,7 +14,6 @@ static long input_tag; - static SCM mark_smob (SCM) { diff --git a/lily/main.cc b/lily/main.cc index 33c8e8f338..3a8c8fcf5a 100644 --- a/lily/main.cc +++ b/lily/main.cc @@ -32,9 +32,11 @@ #include #endif +#if KPATHSEA && HAVE_KPATHSEA_KPATHSEA_H extern "C" { #include } +#endif bool verbose_global_b = false; bool no_paper_global_b = false; @@ -91,7 +93,8 @@ Long_option_init theopts[] = { void identify (ostream* os) { - *os << gnu_lilypond_version_str () << endl; + //*os << gnu_lilypond_version_str () << endl; + *os << gnu_lilypond_version_str (); } void @@ -228,8 +231,27 @@ setup_paths () for (char **s = suffixes; *s; s++) { String p = prefix + to_str ('/') + String (*s); - global_path.add (p); + +#if !KPATHSEA + /* + Although kpathsea seems nice, it is not universally available + (GNU/Windows). + + Compiling kpathsea seems not possible without + (compiling) a matching tex installation. Apart from the fact + that I cannot get kpathsea compiled for GNU/Windows, another + major problem is that TeX installations may be different on + different clients, so it wouldn't work anyway. While ugly, + this code is simple and effective. + -- jcn + */ + + /* Urg: GNU make's $(word) index starts at 1 */ + int i = 1; + while (global_path.try_add (p + to_str (".") + to_str (i))) + i++; +#endif } } @@ -241,6 +263,8 @@ main_prog (int, char**) need to do this first. Engravers use lily.scm contents. */ init_lily_guile (); + if (verbose_global_b) + progress_indication ("\n"); read_lily_scm_file ("lily.scm"); cout << endl; @@ -307,11 +331,13 @@ main (int argc, char **argv) setenv ("GUILE_INIT_SEGMENT_SIZE_1", "4194304", 0); setenv ("GUILE_MAX_SEGMENT_SIZE", "8388608", 0); +#if KPATHSEA && HAVE_KPATHSEA_KPATHSEA_H /* initialize kpathsea */ kpse_set_program_name(argv[0], NULL); kpse_maketex_option("tfm", TRUE); +#endif oparser_global_p = new Getopt_long(argc, argv,theopts); while (Long_option_init const * opt = (*oparser_global_p)()) diff --git a/lily/my-lily-parser.cc b/lily/my-lily-parser.cc index f77e59a4df..b7bd385961 100644 --- a/lily/my-lily-parser.cc +++ b/lily/my-lily-parser.cc @@ -118,8 +118,8 @@ My_lily_parser::get_chord (Musical_pitch tonic, Tonic_req* t = new Tonic_req; t->pitch_ = tonic; + SCM l = gh_cons (t->self_scm (), SCM_EOL); - SCM l = SCM_EOL; //urg if (chord.inversion_b_ && Chord::find_notename_i (&chord.pitch_arr_, chord.inversion_pitch_) > 0) @@ -137,7 +137,7 @@ My_lily_parser::get_chord (Musical_pitch tonic, } Array pitch_arr = chord.to_pitch_arr (); - for (int i = 0; i < pitch_arr.size (); i++) + for (int i = pitch_arr.size (); --i >= 0;) { Musical_pitch p = pitch_arr[i]; Note_req* n = new Note_req; diff --git a/lily/scm-hash.cc b/lily/scm-hash.cc index 23f587f6c7..c6a922d07d 100644 --- a/lily/scm-hash.cc +++ b/lily/scm-hash.cc @@ -6,12 +6,10 @@ (c) 1999--2000 Han-Wen Nienhuys */ -#include -#include "scm-hash.hh" +#include #include "ly-smobs.icc" - - +#include "scm-hash.hh" Scheme_hash_table::Scheme_hash_table () { diff --git a/lily/scores.cc b/lily/scores.cc index 86c0303284..0a075e5bc7 100644 --- a/lily/scores.cc +++ b/lily/scores.cc @@ -31,8 +31,8 @@ void write_dependency_file (String fn, Array targets, { const int WRAPWIDTH = 65; - - cout << _f ("Writing dependency file: `%s'...", fn) << '\n'; + progress_indication (_f ("Writing dependency file: `%s'...", fn.ch_C ())); + progress_indication ("\n"); ofstream f (fn.ch_C ()); if (!f) warning (_f ("can't open file: `%s'", fn)); @@ -121,7 +121,8 @@ do_one_file (String init_str, String file_str) { My_lily_parser parser (source_global_l); parser.set_version_check (false); - cout << "\nNow processing `" << file_str << "'\n"; + progress_indication (_f ("Now processing: `%s'", file_str.ch_C ())); + progress_indication ("\n"); parser.parse_file (init_str, file_str); if (parser.error_level_i_) diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc index f6661e2359..0fa41ca7cd 100644 --- a/lily/text-engraver.cc +++ b/lily/text-engraver.cc @@ -97,8 +97,22 @@ Text_engraver::do_process_music () if (r->style_str_.length_i ()) text->set_elt_property ("style", ly_str02scm (r->style_str_.ch_C())); - SCM empty = get_property ("textNonEmpty"); - if (to_boolean (empty)) + /* + huh?, this said: + + SCM empty = get_property ("textNonEmpty"); + if (to_boolean (empty)) + no-spacing-rods + + Text is empty by default, which means that the only condition + for not setting 'no-spacing-rods' should be: boolean && true. + + Anyway, non-empty text has been broken for some time now. + */ + SCM nonempty = get_property ("textNonEmpty"); + if (to_boolean (nonempty)) + ; + else { text->set_elt_property ("no-spacing-rods" , SCM_BOOL_F); text->set_extent_callback (0, X_AXIS); diff --git a/ly/declarations-as.ly b/ly/declarations-as.ly index fe4d71c552..ceae9b08aa 100644 --- a/ly/declarations-as.ly +++ b/ly/declarations-as.ly @@ -2,13 +2,15 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% UGH UGH UGH UGHUGH FIXME %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -> duplication! - -breve = \duration { -1 0 } -longa = \duration { -2 0 } -maxima = \duration { -3 0 } +breve = \duration #'( -1 0) +longa = \duration #'( -2 0 ) +maxima = \duration #'( -3 0 ) #(eval-string (ly-gulp-file "generic-property.scm")) +% urg, move to basic property? +#(eval-string (ly-gulp-file "slur.scm")) + \include "nederlands.ly" % dutch \include "chord-modifiers.ly" \include "script.ly" @@ -28,7 +30,7 @@ center=0 break = \penalty -1000000; nobreak = \penalty 1000000; -\include "scales.ly" +\include "scale-definitions.ly" melisma = \property Staff.melismaBusy = ##t diff --git a/ly/engraver.ly b/ly/engraver.ly index 5553f0a1b9..0ce4a5f879 100644 --- a/ly/engraver.ly +++ b/ly/engraver.ly @@ -104,7 +104,7 @@ RhythmicStaffContext=\translator{ Generic_property_list = #generic-staff-properties - barSize = 4.0 * \interline ; + barSize = 4.0 * \staffspace ; \consists "Pitch_squash_engraver"; \consists "Separating_line_group_engraver"; \name RhythmicStaff; @@ -436,7 +436,7 @@ ScoreContext = \translator { basicBeamProperties = #`( (molecule-callback . ,Beam::brew_molecule) - (beam-thickness . 0.42) ; interline + (beam-thickness . 0.42) ; staff-space (before-line-breaking-callback . ,Beam::before_line_breaking) (after-line-breaking-callback . ,Beam::after_line_breaking) (default-neutral-direction . 1) @@ -702,8 +702,8 @@ ScoreContext = \translator { ) basicStemTremoloProperties = #`( (molecule-callback . ,Stem_tremolo::brew_molecule) - (beam-width . 4.0) ; interline! - (beam-thickness . 0.42) ; interline! + (beam-width . 2.0) ; staff-space + (beam-thickness . 0.42) ; staff-space ) basicSeparationItemProperties = #`( diff --git a/ly/init-as.fly b/ly/init-as.fly index e076e4467b..4697e96c22 100644 --- a/ly/init-as.fly +++ b/ly/init-as.fly @@ -33,7 +33,7 @@ \paper_as_nine %linewidth=-1.0; %indent = 0.0; - \translator { \StaffContext barSize = #'staff-height } + \translator { \StaffContext barSize = \staffheight; } % no beam-slope %\translator { \VoiceContext beamHeight = #0; } diff --git a/ly/init-as.ly b/ly/init-as.ly index ce7099b426..c24c19d257 100644 --- a/ly/init-as.ly +++ b/ly/init-as.ly @@ -27,7 +27,7 @@ \paper { \paper_as_nine - \translator { \StaffContext barSize = #'staff-height } + \translator { \StaffContext barSize = \staffheight; } % no beam-slope %\translator { \VoiceContext beamHeight = #0; } diff --git a/ly/params-as.ly b/ly/params-as.ly index f06f633e0f..01e44e8281 100644 --- a/ly/params-as.ly +++ b/ly/params-as.ly @@ -1,8 +1,6 @@ % params-as.ly % generic paper parameters -#'staff-height = \staffheight; - %%paperfile = \papersize + ".ly"; %%% paperfile = "a4.ly"; %%\include \paperfile; @@ -23,9 +21,6 @@ interline = \staffspace; % urg, need grace_ versions of these too? beam_thickness = 0.52 * (\staffspace - \stafflinethickness); -#'beam-thickness = \beam_thickness; %% UGR - - interbeam = (2.0 * \staffspace + \stafflinethickness - \beam_thickness) / 2.0; interbeam4 = (3.0 * \staffspace - \beam_thickness) / 3.0; @@ -117,7 +112,7 @@ tie_thickness = 1.2 * \stafflinethickness; %{ Specifies the maximum height of slurs. %} -slur_height_limit = \staffheight; +slur_height_limit_factor = \staffheight; %{ @@ -143,21 +138,9 @@ method. %} gourlay_maxmeasures = 10.; -bar_kern = 1.0\char; -bar_thinkern = 1.0\char; -barthick_thick = 2.0\char; -barthick_score = 1.0\char; -barthick_thin = 1.0\char; - -bracket_arch_thick = \staffspace / 3.0; -bracket_width = 2.0 * \staffspace; -bracket_thick = 2.0 * \stafflinethickness; -bracket_arch_height = 1.5 * \staffspace; -bracket_arch_width = \bracket_arch_height; -bracket_arch_angle = 50.0; - -tuplet_spanner_gap = 2.0 * \staffspace; -tuplet_thick = 1.0\char; +% vertical space between lines. +line_kern = \staffspace; + volta_thick = 1.0\char; volta_spanner_height = 1.0\char; @@ -243,14 +226,3 @@ Wordwrap =0.0; \include "engraver.ly"; - -#'margin-shape = #'() - - -% -#'Local_key_item::left-padding = #'0.2 -#'Local_key_item::right-padding = #'0.4 - -#'Staff_symbol::staff-space = \staffspace ; -#'Staff_symbol::line-count = #5 - diff --git a/make/out/lilypond.lsm b/make/out/lilypond.lsm index cae88b51f5..2d411125e3 100644 --- a/make/out/lilypond.lsm +++ b/make/out/lilypond.lsm @@ -1,15 +1,15 @@ Begin3 Title: LilyPond -Version: 1.3.74 -Entered-date: 19JUL00 +Version: 1.3.75 +Entered-date: 25JUL00 Description: Keywords: music notation typesetting midi fonts engraving Author: hanwen@cs.uu.nl (Han-Wen Nienhuys) janneke@gnu.org (Jan Nieuwenhuizen) Maintained-by: hanwen@stack.nl (Han-Wen Nienhuys) Primary-site: sunsite.unc.edu /pub/Linux/apps/sound/convert - 1000k lilypond-1.3.74.tar.gz + 1000k lilypond-1.3.75.tar.gz Original-site: ftp.cs.uu.nl /pub/GNU/LilyPond/development/ - 1000k lilypond-1.3.74.tar.gz + 1000k lilypond-1.3.75.tar.gz Copying-policy: GPL End diff --git a/make/out/lilypond.spec b/make/out/lilypond.spec index d7d2b3f088..647dfb5cc4 100644 --- a/make/out/lilypond.spec +++ b/make/out/lilypond.spec @@ -1,9 +1,9 @@ Name: lilypond -Version: 1.3.74 +Version: 1.3.75 Release: 1 Copyright: GPL Group: Applications/Publishing -Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.3.74.tar.gz +Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.3.75.tar.gz Summary: A program for printing sheet music. URL: http://www.cs.uu.nl/~hanwen/lilypond # Icon: lilypond-icon.gif diff --git a/make/toplevel.make.in b/make/toplevel.make.in index 3e6ae7f4e1..389a87c28f 100644 --- a/make/toplevel.make.in +++ b/make/toplevel.make.in @@ -55,15 +55,27 @@ examples: # don't understand this comment --hwn +# See below. The footify-all you had before caused dead links on the +# webpage, because the footify command assumes it can calculate the location +# of index.html from the current depth. That doesn't work, if you don't +# use recursive make like we do everywhere else; leads to bugs that you +# make a specific fix for. + $(PYTHON) $(buildscripts)/mutopia-index.py -o short-examples.html input/ $(PYTHON) $(buildscripts)/mutopia-index.py -o long-examples.html mutopia/ #$(footify-all-command) $(footify) --index=./ `$(FIND) . -name '*.html' -print` tar --exclude='*.dvi' --exclude='*.tex' --exclude='*.ps' --exclude='*.ppm' -czf $(outdir)/examples.tar.gz *-examples.html `find input mutopia -type d -name 'out-www' -print` +# Kpathsea is overkill, and a horror/impossible to compile without compiling +# and using a matching TeX (well, I gave up trying for now). +my_tfm_path=$(TFM_PATH) /tmp /tmp /tmp /tmp /tmp /tmp localinstall: mkdir -p $(datadir) +ifeq ($(KPATHSEA),0) + $(foreach i, 1 2 3 4 5, rm -f $(datadir)/tfm.$(i); $(LN_S) $(word $(i), $(my_tfm_path)) $(datadir)/tfm.$(i) ; ) +endif local-WWW-clean: $(SHELL) $(depth)/buildscripts/clean-fonts.sh diff --git a/po/de.po b/po/de.po index ff9f1cee4a..7258319846 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: 2000-06-09 02:01+0200\n" +"POT-Creation-Date: 2000-07-24 21:55+0200\n" "PO-Revision-Date: 1999-09-18 01:30+0200\n" "Last-Translator: Erwin Dieterich \n" "Language-Team: LANGUAGE \n" @@ -17,11 +17,11 @@ msgstr "" msgid "EOF in a string" msgstr "Dateiende in Zeichenkette" -#: data-file.cc:116 input.cc:87 midi-parser.cc:100 warn.cc:22 +#: data-file.cc:116 input.cc:85 midi-parser.cc:100 warn.cc:22 msgid "warning: " msgstr "Warnung: " -#: dstream.cc:184 +#: dstream.cc:187 #, fuzzy msgid "not enough fields in Dstream init" msgstr "Nicht genug Felder in der Dstream Inititalisierung" @@ -46,16 +46,16 @@ msgstr "Unbekannte Option: `%s'" msgid "invalid argument `%s' to option `%s'" msgstr "Argument `%s' für Optione '%s' ist nicht erlaubt" -#: input.cc:92 warn.cc:8 warn.cc:16 +#: input.cc:90 warn.cc:8 warn.cc:16 msgid "error: " msgstr "Fehler: " -#: input.cc:98 +#: input.cc:96 #, fuzzy msgid "non fatal error: " msgstr "Undramatische Fehler: " -#: input.cc:106 source-file.cc:62 source-file.cc:155 +#: input.cc:104 source-file.cc:62 source-file.cc:155 msgid "position unknown" msgstr "Position unbekannt" @@ -64,7 +64,7 @@ msgid "can't map file" msgstr "Kann die Datei nicht mappen" #: mapped-file-storage.cc:87 midi-stream.cc:77 mudela-stream.cc:111 -#: paper-stream.cc:25 scores.cc:38 simple-file-storage.cc:44 text-stream.cc:22 +#: paper-stream.cc:25 scores.cc:37 simple-file-storage.cc:44 text-stream.cc:22 #, c-format msgid "can't open file: `%s'" msgstr "Kann die Datei %s nicht öffnen" @@ -88,41 +88,41 @@ msgstr "Programmierfehler: " msgid " (Continuing; cross thumbs)" msgstr " (Ich mache weiter: Drück´ mir die Daumen!)" -#: afm.cc:42 +#: afm.cc:51 #, fuzzy, c-format msgid "can't find character number: %d" msgstr "ich kann das Zeichen nummer %d nicht finden" -#: afm.cc:57 +#: afm.cc:66 #, fuzzy, c-format msgid "can't find character called: `%s'" msgstr "Ich kann das Zeichen `%s' nicht finden" -#: afm.cc:87 +#: afm.cc:96 msgid "Error parsing AFM file" msgstr "" -#: all-font-metrics.cc:104 lookup.cc:56 +#: all-font-metrics.cc:149 lookup.cc:80 #, c-format msgid "can't find font: `%s'" msgstr "Kann Schrift `%s' nicht finden" -#: all-font-metrics.cc:105 +#: all-font-metrics.cc:150 #, fuzzy msgid "Loading default font" msgstr "Kann die Schrift %s nicht finden, lade die Standardschrift." -#: all-font-metrics.cc:122 +#: all-font-metrics.cc:167 #, fuzzy, c-format msgid "can't find default font: `%s'" msgstr "Kann Schrift `%s' nicht finden" -#: all-font-metrics.cc:123 includable-lexer.cc:49 lookup.cc:57 scores.cc:109 +#: all-font-metrics.cc:168 includable-lexer.cc:50 lookup.cc:81 scores.cc:108 #, c-format msgid "(search path: `%s')" msgstr "(Suchpfad: `%s')" -#: all-font-metrics.cc:124 +#: all-font-metrics.cc:169 msgid "Giving up" msgstr "" @@ -130,44 +130,44 @@ msgstr "" msgid "Can't switch translators, I'm there already" msgstr "" -#: beam-engraver.cc:40 beam-engraver.cc:56 +#: beam-engraver.cc:75 beam-engraver.cc:91 #, fuzzy msgid "can't find start of beam" msgstr "Kann nicht beide Enden von %s finden" -#: beam-engraver.cc:85 +#: beam-engraver.cc:120 #, fuzzy msgid "already have a beam" msgstr "Habe schon einen Balken" -#: beam-engraver.cc:141 +#: beam-engraver.cc:177 #, fuzzy msgid "unterminated beam" msgstr "Unbeendeter Bindestrich" -#: beam-engraver.cc:169 chord-tremolo-engraver.cc:167 +#: beam-engraver.cc:210 chord-tremolo-engraver.cc:172 #, fuzzy msgid "stem must have Rhythmic structure" msgstr "Ein Notenhals muss rhythmische Struktur haben." -#: beam-engraver.cc:180 +#: beam-engraver.cc:221 msgid "stem doesn't fit in beam" msgstr "Notenhals passt nicht in den Balken" -#: beam-engraver.cc:181 +#: beam-engraver.cc:222 msgid "beam was started here" msgstr "Der Balken bagann hier" -#: beam.cc:90 +#: beam.cc:84 #, fuzzy msgid "beam has less than two stems" msgstr "Balken mit weniger als zwei Hälsen" -#: beam.cc:483 +#: beam.cc:510 msgid "weird beam vertical offset" msgstr "" -#: break-align-item.cc:87 +#: break-align-item.cc:119 #, fuzzy, c-format msgid "unknown spacing pair `%s', `%s'" msgstr "unbekannter Übersetzer `%s'" @@ -191,44 +191,44 @@ msgstr "" msgid "none of these in my family" msgstr "" -#: chord-tremolo-engraver.cc:111 +#: chord-tremolo-engraver.cc:115 #, fuzzy msgid "unterminated chord tremolo" msgstr "Unbeendeter Bindestrich" -#: chord-tremolo-iterator.cc:41 +#: chord-tremolo-iterator.cc:42 #, fuzzy msgid "no one to print a tremolos" msgstr "Keiner darf eine Wiederholungsklammer drucken" -#: chord.cc:151 +#: chord.cc:152 #, c-format msgid "invalid subtraction: not part of chord: %s" msgstr "Unerlaubte Subtraktion: nicht Teil eines Akkords: %s" -#: chord.cc:375 +#: chord.cc:376 #, c-format msgid "invalid inversion pitch: not part of chord: %s" msgstr "Unerlaubter Baßton: gehört nicht zum Akkord: %s" -#: clef-engraver.cc:166 +#: clef-engraver.cc:167 #, fuzzy msgid "unknown clef type" msgstr "Unbekannter Notenschlüssel" -#: collision.cc:111 +#: collision.cc:118 msgid "Too many clashing notecolumns. Ignoring them." msgstr "Zu viele aneinanderstoßende Notenspalten. Ich ignoriere sie." -#: crescendo.cc:69 +#: crescendo.cc:65 msgid "crescendo" msgstr "Crescendo" -#: crescendo.cc:69 +#: crescendo.cc:65 msgid "too small" msgstr "zu klein" -#: cross-staff.cc:19 +#: cross-staff.cc:22 #, fuzzy msgid "" "minVerticalAlign != maxVerticalAlign: cross staff spanners may be broken" @@ -250,31 +250,31 @@ msgstr "Kann die Speicher msgid "NaN" msgstr "NaN" -#: dynamic-engraver.cc:281 span-dynamic-performer.cc:87 +#: dynamic-engraver.cc:184 span-dynamic-performer.cc:87 #, fuzzy msgid "can't find start of (de)crescendo" msgstr "Ich kann kein (De)crescendo bis zum Ende finden" -#: dynamic-engraver.cc:300 +#: dynamic-engraver.cc:203 #, fuzzy msgid "already have a crescendo" msgstr "Habe schon einen Balken" -#: dynamic-engraver.cc:301 +#: dynamic-engraver.cc:204 #, fuzzy msgid "already have a decrescendo" msgstr "Habe schon einen Balken" -#: dynamic-engraver.cc:381 +#: dynamic-engraver.cc:289 #, fuzzy msgid "unterminated (de)crescendo" msgstr "Nichtbeendetes Crescendo" -#: extender-engraver.cc:96 +#: extender-engraver.cc:98 msgid "unterminated extender" msgstr "Unbeendete Linienfortführung" -#: extender-engraver.cc:108 +#: extender-engraver.cc:110 msgid "Nothing to connect extender to on the left. Ignoring extender request." msgstr "" @@ -292,173 +292,157 @@ msgstr "" msgid "no Grace context available" msgstr "Kein Verzierungskontext vorhanden!" -#: grace-position-engraver.cc:93 +#: grace-position-engraver.cc:94 msgid "Unattached grace notes. Attaching to last musical column." msgstr "" "Unverknüpfte Verzierungsnoten. Ich verknüpfe sie mit der letzten " "musikalischen Spalte." -#: hyphen-engraver.cc:59 +#: hyphen-engraver.cc:90 msgid "unterminated hyphen" msgstr "Unbeendeter Bindestrich" -#: hyphen-engraver.cc:71 +#: hyphen-engraver.cc:102 msgid "Nothing to connect hyphen to on the left. Ignoring hyphen request." msgstr "" -#: identifier.cc:44 +#: identifier.cc:49 #, fuzzy, c-format msgid "wrong identifier type, expected: `%s'" msgstr "Falscher Typ von Identifier: " -#: includable-lexer.cc:47 lily-guile.cc:121 lily-guile.cc:144 -#: midi-score-parser.cc:24 scores.cc:108 scores.cc:114 +#: includable-lexer.cc:48 lily-guile.cc:117 midi-score-parser.cc:24 +#: scores.cc:107 scores.cc:113 #, c-format msgid "can't find file: `%s'" msgstr "Kann Datei `%s' nicht finden" -#: key-def.cc:31 -#, fuzzy -msgid "No key name, assuming `C'" -msgstr "Keine Tonart: ich nehme `C' an" - -#: key-def.cc:92 -#, fuzzy -msgid "Don't know how handle empty keys" -msgstr "Weiß nicht, wie ich eine fehlende Tonart behandeln soll" - -#: key-engraver.cc:74 key-performer.cc:65 +#: key-engraver.cc:92 key-performer.cc:54 msgid "FIXME: key change merge" msgstr "" -#: lily-guile.cc:123 lily-guile.cc:146 +#: lily-guile.cc:119 #, c-format msgid "(load path: `%s')" msgstr "(Ladepfad ist `%s')" -#: line-of-score.cc:90 +#: line-of-score.cc:96 #, c-format msgid "Element count %d." msgstr "" -#: line-of-score.cc:207 paper-score.cc:70 +#: line-of-score.cc:255 paper-score.cc:79 #, c-format msgid "Element count %d " msgstr "" -#: line-of-score.cc:221 +#: line-of-score.cc:269 msgid "Calculating column positions..." msgstr "Berechne Position der Spalten..." -#: local-key-engraver.cc:82 -#, fuzzy -msgid "out of tune:" -msgstr "Verstimmt" - -#: local-key-engraver.cc:83 time-signature-engraver.cc:29 -#: translator-group.cc:416 translator-group.cc:425 -#, fuzzy, c-format -msgid "can't find: `%s'" -msgstr "Kann `%s' nicht finden" - -#: lookup.cc:58 +#: lookup.cc:82 msgid "Aborting" msgstr "Ich breche nieder" -#: lookup.cc:198 +#: lookup.cc:223 #, fuzzy, c-format msgid "Non-matching braces in text `%s', adding braces" msgstr "Nicht zusammenpassende Klammern im Text `%s', füge Klammern hinzu." -#: main.cc:71 main.cc:92 +#: lyric-phrasing-engraver.cc:147 +msgid "lyrics found without matching notehead ... aligning on self" +msgstr "" + +#: main.cc:75 main.cc:92 msgid "enable debugging output" msgstr "Debugger Ausgabe an" -#: main.cc:72 +#: main.cc:76 msgid "EXT" msgstr "EXT" -#: main.cc:72 +#: main.cc:76 #, fuzzy msgid "use output format EXT (scm, ps, tex or as)" msgstr "Benutze das Ausgabeformat EXT" -#: main.cc:73 main.cc:93 +#: main.cc:77 main.cc:93 msgid "this help" msgstr "Diese Hilfe" -#: main.cc:74 +#: main.cc:78 msgid "DIR" msgstr "DIR" -#: main.cc:74 +#: main.cc:78 msgid "add DIR to search path" msgstr "Hänge DIR an den Suchpfad an" -#: main.cc:75 main.cc:96 +#: main.cc:79 main.cc:96 msgid "FILE" msgstr "DATEI" -#: main.cc:75 +#: main.cc:79 msgid "use FILE as init file" msgstr "Verwende FILE als Initialisierungsdatei" -#: main.cc:76 +#: main.cc:80 msgid "write Makefile dependencies for every input file" msgstr "Schreibe Makefile-Abhängigkeiten für jede Eingabedatei" -#: main.cc:77 +#: main.cc:81 #, fuzzy msgid "produce MIDI output only" msgstr "Nur Midiausgabe" -#: main.cc:78 +#: main.cc:82 msgid "BASENAME" msgstr "BASENAME" -#: main.cc:78 +#: main.cc:82 msgid "write output to BASENAME[-x].extension" msgstr "Schreibe die Ausgabe in BASENAME[-x].Erweiterung" -#: main.cc:79 +#: main.cc:83 msgid "show all changes in relative syntax" msgstr "Zeige alle Veränderungen in relativer Syntax" -#: main.cc:80 +#: main.cc:84 msgid "inhibit file output naming and exporting" msgstr "Unterdrücke die automatische Benennung von Ausgabedateien und Export" -#: main.cc:81 main.cc:100 +#: main.cc:85 main.cc:100 msgid "don't timestamp the output" msgstr "Keine Datumsangabe auf der Ausgabe" -#: main.cc:82 +#: main.cc:86 msgid "switch on experimental features" msgstr "Schalte experimentelle Möglichkeiten an" -#: main.cc:83 -msgid "ignore mudela version" -msgstr "Ignoriere Version von Mudela" - -#: main.cc:84 main.cc:101 +#: main.cc:87 main.cc:101 msgid "print version number" msgstr "Zeige die Versionsnummer" -#: main.cc:85 main.cc:103 +#: main.cc:88 +#, fuzzy +msgid "verbose" +msgstr "Sei geschwätzig" + +#: main.cc:89 main.cc:103 msgid "show warranty and copyright" msgstr "Zeige Garantie und Urheberrechte" -#: main.cc:100 +#: main.cc:105 #, c-format msgid "Usage: %s [OPTION]... [FILE]..." msgstr "Benutzung: %s [OPTIONEN] ... [DATEI] ..." -#: main.cc:102 +#: main.cc:107 #, fuzzy msgid "Typeset music and or play MIDI from FILE" msgstr "Setze Musik oder spiele MIDI von DATEI" -#: main.cc:106 +#: main.cc:111 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" @@ -468,20 +452,20 @@ msgstr "" "Notenblätter erzeugen. Dazu verwendet es eine eigene Beschreibungssprache.\n" "lilyPond ist Teil des GNU-Projekts\n" -#: main.cc:112 main.cc:116 +#: main.cc:116 main.cc:117 msgid "Options:" msgstr "Optionen:" -#: main.cc:116 +#: main.cc:121 msgid "This binary was compiled with the following options:" msgstr "Diese Programm wurde mit den folgenden Optionen übersetzt:" -#: main.cc:120 main.cc:135 +#: main.cc:120 main.cc:140 #, fuzzy, c-format msgid "Report bugs to %s" msgstr "Melde Fehler an" -#: main.cc:53 main.cc:143 +#: main.cc:53 main.cc:148 #, c-format msgid "" "This is free software. It is covered by the GNU General Public License,\n" @@ -494,17 +478,17 @@ msgstr "" "einhalten. Wenn Sie das Programm mit `%s --warranty starten, bekommen\n" "Sie mehr Informationen.\n" -#: main.cc:60 main.cc:150 main.cc:162 +#: main.cc:60 main.cc:155 main.cc:167 #, c-format msgid "Copyright (c) %s by" msgstr "Urheberrechte (Copyright) (c) %s bei" #. GNU GNU? -#: main.cc:160 +#: main.cc:165 msgid "GNU LilyPond -- The GNU Project music typesetter" msgstr "GNU LilyPond -- Der Notensatz des GNU-Projekts" -#: main.cc:69 main.cc:168 +#: main.cc:69 main.cc:173 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" @@ -534,7 +518,7 @@ msgstr "" "the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139,\n" "USA.\n" -#: midi-item.cc:311 +#: midi-item.cc:310 #, fuzzy, c-format msgid "no such instrument: `%s'" msgstr "Kein solches instrument: `%s'" @@ -544,11 +528,11 @@ msgstr "Kein solches instrument: `%s'" msgid "unconventional key: flats: %d, sharps: %d" msgstr "Ungewöhnliche Tonart: Bes: %d, Kreuze: %d" -#: midi-item.cc:410 +#: midi-item.cc:412 msgid "silly duration" msgstr "Unsinnige Dauer" -#: midi-item.cc:423 +#: midi-item.cc:425 msgid "silly pitch" msgstr "unsinnige Tonhöhe" @@ -557,11 +541,11 @@ msgstr "unsinnige Tonh msgid "Error syncing file (disk full?)" msgstr "Fehler beim Abspeichern der Datei (Platte voll?)" -#: music-output-def.cc:57 +#: music-output-def.cc:51 msgid "Interpretation context with empty type" msgstr "Interpretationskontext mit leerer Typangabe" -#: music-output-def.cc:87 +#: music-output-def.cc:78 #, fuzzy, c-format msgid "can't find `%s' context" msgstr "Kann Partiturkontext nicht finden" @@ -571,48 +555,39 @@ msgstr "Kann Partiturkontext nicht finden" msgid "Transposition by %s makes accidental larger than two" msgstr "Transponieren um %s macht Vorzecihen größer als zwei" -#: my-lily-lexer.cc:129 +#: my-lily-lexer.cc:118 #, fuzzy, c-format msgid "Identifier name is a keyword: `%s'" msgstr "name ist ein Schlüsselbegriff (keyword) (`%s')" -#: my-lily-lexer.cc:148 +#: my-lily-lexer.cc:137 #, c-format msgid "error at EOF: %s" msgstr "Fehler am Dateiende(EOF): %s" -#: midi-score-parser.cc:94 my-lily-parser.cc:56 +#: midi-score-parser.cc:94 my-lily-parser.cc:55 msgid "Parsing..." msgstr "Verarbeite..." -#: my-lily-parser.cc:64 +#: my-lily-parser.cc:63 #, fuzzy msgid "Braces don't match" msgstr "Klammern passen nicht zusammen" -#: paper-def.cc:70 -#, c-format -msgid "unknown paper variable: `%s'" -msgstr "Unbekannte papier-Variable: `%s'" - -#: paper-def.cc:74 -msgid "not a real variable" -msgstr "Keine echte Variable" - -#: paper-def.cc:165 +#: paper-def.cc:149 #, fuzzy, c-format msgid "paper output to %s..." msgstr "Ausgabe auf Papier auf %s..." -#: mudela-stream.cc:93 paper-outputter.cc:92 performance.cc:95 +#: mudela-stream.cc:93 paper-outputter.cc:91 performance.cc:97 msgid ", at " msgstr ", bei " -#: paper-score.cc:72 +#: paper-score.cc:82 msgid "Preprocessing elements..." msgstr "Verarbeite Element vor..." -#: paper-score.cc:97 +#: paper-score.cc:107 #, fuzzy msgid "Outputting Score, defined at: " msgstr "Gebe Partitur aus, definiert bei: " @@ -622,36 +597,36 @@ msgid "Track ... " msgstr "Stück ... " #. perhaps multiple text events? -#: performance.cc:75 +#: performance.cc:77 msgid "Creator: " msgstr "Erstellt von: " -#: performance.cc:90 +#: performance.cc:92 msgid "Automatically generated" msgstr "Automatisch generiert" -#: performance.cc:104 +#: performance.cc:106 #, c-format msgid "from musical definition: %s" msgstr "von der musiaklischen Definition: %s" -#: performance.cc:172 +#: performance.cc:174 #, c-format msgid "MIDI output to %s..." msgstr "MIDI-Ausgabe nach %s..." -#: piano-pedal-engraver.cc:158 piano-pedal-engraver.cc:170 +#: piano-pedal-engraver.cc:157 piano-pedal-engraver.cc:169 #: piano-pedal-performer.cc:87 #, fuzzy, c-format msgid "can't find start of piano pedal: %s" msgstr "Kann keine kürzeste Note bei %s finden" -#: property-engraver.cc:106 +#: property-engraver.cc:128 #, fuzzy msgid "Wrong type for property" msgstr "Falsche Type für Besitz-Wert" -#: repeat-engraver.cc:196 +#: repeat-engraver.cc:253 msgid "No bar engraver found. Ignoring repeats." msgstr "" @@ -670,70 +645,71 @@ msgstr "Wie? Keine Anforderung: `%s'" msgid "Junking music: `%s'" msgstr "Uralt-Bitte: `%s'" -#: rest-collision.cc:135 +#: rest-collision.cc:159 #, fuzzy msgid "too many colliding rests" msgstr "Zu viele kollidierende Pausen." -#: rest-collision.cc:139 +#: rest-collision.cc:163 #, fuzzy msgid "too many notes for rest collision" msgstr "Zu viele Noten für kollidierende Pausen." -#: score-engraver.cc:139 +#: score-engraver.cc:151 #, fuzzy, c-format msgid "unbound spanner `%s'" msgstr "Unbeschränkter Abstand `%s'" -#: score.cc:64 -msgid "no toplevel translator" -msgstr "Kein Übersetzer für den obersten Level" - #: score.cc:67 msgid "Interpreting music..." msgstr "Interpretiere die Noten..." -#: score.cc:79 +#: score.cc:81 #, fuzzy msgid "Need music in a score" msgstr "Ich brauche Noten in einer Partitur" #. should we? hampers debugging. -#: score.cc:92 +#: score.cc:94 #, fuzzy msgid "Errors found/*, not processing score*/" msgstr "Habe Fehler gefunden, /* die Partitur wird nicht verarbeitet */" -#: score.cc:97 +#: score.cc:100 #, fuzzy, c-format msgid "elapsed time: %.2f seconds" msgstr "verstrichene Zeit %.2f Sekunden" -#: scores.cc:35 +#: scores.cc:34 #, fuzzy, c-format -msgid "Writing dependency file: `%s'..." +msgid "Writing dependency file: `%s'...\n" msgstr "Schreibe Datei mit Abhängigkeiten: `%s'..." -#: scores.cc:79 +#: scores.cc:78 #, fuzzy msgid "Score contains errors; will not process it" msgstr "Partitur enthält Fehler; ich werde sie nicht weiterverarbeiten" -#: script-engraver.cc:68 +#: scores.cc:123 +#, c-format +msgid "Now processing: `%s'\n" +msgstr "" + +#: script-engraver.cc:65 #, fuzzy, c-format msgid "Don't know how to interpret articulation `%s'" msgstr "Ich weiß nicht, wie ich die Artikulation `%s' interpretieren soll\n" -#: sequential-music-iterator.cc:83 -msgid "Must stop before this music ends" -msgstr "" - #. this shouldn't happen, but let's continue anyway. -#: single-malt-grouping-item.cc:51 +#: separation-item.cc:48 #, fuzzy -msgid "Single_malt_grouping_item: I've been drinking too much" +msgid "Separation_item: I've been drinking too much" msgstr "Single_malt_grouping_item: Ich saufe zu viel" +#: sequential-music-iterator.cc:83 +msgid "Must stop before this music ends" +msgstr "" + #: slur-engraver.cc:82 msgid "unterminated slur" msgstr "Unbeendeter Bindebogen" @@ -747,51 +723,46 @@ msgstr "Kann nicht beide Enden von %s finden" msgid "slur" msgstr "Bindebogen" -#: slur.cc:231 +#: slur.cc:48 #, fuzzy msgid "Putting slur over rest. Ignoring." msgstr "Setze Bindebogen über Pause. Wird ignoriert" -#: slur.cc:312 +#: slur.cc:122 msgid "Slur over rest?" msgstr "Bindebogen übe den Rest?" -#: spanner.cc:35 spanner.cc:174 -#, fuzzy, c-format -msgid "Spanner `%s' has equal left and right spanpoints" -msgstr "Bogen `%s' mit gleichen linken und rechten Bogenpunkten" - -#: stem-engraver.cc:124 +#: stem-engraver.cc:128 #, c-format msgid "Adding note head to incompatible stem (type = %d)" msgstr "Setze Note auf unpassenden Hals (Typ = %d)" -#: stem.cc:118 +#: stem.cc:116 #, fuzzy msgid "Weird stem size; check for narrow beams" msgstr "" "Dubiose Größe des Notenhalses: Überprüfe die Eingabe auf schmale Balken" -#: tfm-reader.cc:115 +#: tfm-reader.cc:105 #, c-format msgid "TFM header of `%s' has only %u word(s)" msgstr "TFM header von `%s' hat nur %u Wort(e)" -#: tfm-reader.cc:153 +#: tfm-reader.cc:143 #, fuzzy, c-format 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:70 +#: tfm.cc:71 #, fuzzy, c-format msgid "can't find ascii character: `%d'" msgstr "Kann ASCII-Zeichen `%d' nicht finden" -#: tie-engraver.cc:195 tie-performer.cc:109 +#: tie-engraver.cc:203 tie-performer.cc:109 msgid "No ties were created!" msgstr "Es wurden keine Haltebögen erzeugt!" -#: tie.cc:80 +#: tie-engraver.cc:242 msgid "lonely tie" msgstr "Einsamer Haltebogen" @@ -800,11 +771,17 @@ msgstr "Einsamer Haltebogen" msgid "no one to print a tuplet start bracket" msgstr "Niemand schreibt eine mehrfahce Anfangsklammer" -#: time-signature-engraver.cc:28 +#: time-signature-engraver.cc:49 #, fuzzy msgid "lost in time:" msgstr "Verloren in der Zeit" +#: time-signature-engraver.cc:50 translator-group.cc:419 +#: translator-group.cc:428 +#, fuzzy, c-format +msgid "can't find: `%s'" +msgstr "Kann `%s' nicht finden" + #: timing-translator.cc:36 msgid "conflicting timing request" msgstr "Widersprechende Zeitangaben" @@ -813,94 +790,110 @@ msgstr "Widersprechende Zeitangaben" msgid "This is the other timing request" msgstr "" -#: timing-translator.cc:78 +#: timing-translator.cc:79 #, fuzzy, c-format msgid "barcheck failed at: %s" msgstr "Überprüfung der Takte is fehlgeschlagen bei: %s" -#: translator-ctors.cc:42 +#: translator-ctors.cc:41 #, fuzzy, c-format msgid "unknown translator: `%s'" msgstr "unbekannter Übersetzer `%s'" -#: translator-group.cc:81 translator-group.cc:94 +#: translator-group.cc:82 translator-group.cc:95 msgid "Program has no such type" msgstr "" -#: translator-group.cc:85 translator-group.cc:100 +#: translator-group.cc:86 translator-group.cc:101 #, fuzzy, c-format msgid "Already contains: `%s'" msgstr "Enthält schon ein `%s'" -#: translator-group.cc:210 +#: translator-group.cc:213 #, c-format msgid "can't find or create `%s' called `%s'" msgstr "Kann ein `%s', genannt `%s' weder finden noch erzeugen" -#: translator-group.cc:322 +#: translator-group.cc:325 #, fuzzy, c-format msgid "can't find or create: `%s'" msgstr "Kann ein `%s' weder finden noch erzeugen" -#: unfolded-repeat-iterator.cc:145 +#: unfolded-repeat-iterator.cc:146 #, fuzzy msgid "no one to print a volta bracket" msgstr "Niemand schreibt eine Volta-Klammer" -#: parser.yy:58 +#: parser.yy:59 #, c-format msgid "Oldest supported input version: %s" msgstr "Älteste noch unterstütze Version der Eingabe: %s" -#: parser.yy:427 +#: parser.yy:426 msgid "Need a translator group for a context" msgstr "Ich brauche eine Übersetzer-Gruppe für den Kontext" -#: parser.yy:448 +#: parser.yy:441 msgid "Wrong type for property value" msgstr "Falsche Type für Besitz-Wert" -#: parser.yy:694 +#: parser.yy:626 msgid "More alternatives than repeats. Junking excess alternatives." msgstr "" -#: parser.yy:739 +#: parser.yy:666 msgid "Second argument must be a symbol" msgstr "" -#: parser.yy:744 +#: parser.yy:671 msgid "First argument must be a procedure taking 1 argument" msgstr "" -#: parser.yy:1069 +#: parser.yy:971 +msgid "Expecting string as script definition" +msgstr "" + +#: parser.yy:981 msgid "Can't specify direction for this request" msgstr "" -#: parser.yy:1170 +#: parser.yy:1073 #, c-format msgid "Expecting %d arguments" msgstr "" -#: parser.yy:1193 parser.yy:1201 parser.yy:1443 +#: parser.yy:1089 +msgid "Must have 2 arguments for duration" +msgstr "" + +#: parser.yy:1096 parser.yy:1104 parser.yy:1339 #, fuzzy msgid "Have to be in Lyric mode for lyrics" msgstr "Um Text zu verarbeiten, muß ich im Text-(Lyrics)-Modus sein" -#: parser.yy:1342 parser.yy:1362 +#: parser.yy:1245 parser.yy:1265 #, c-format msgid "not a duration: %d" msgstr "Keine Dauer: %d" -#: parser.yy:1371 +#: parser.yy:1274 #, fuzzy msgid "Have to be in Note mode for notes" msgstr "Für Noten muß ich im Noten-(Note)-Modus sein" -#: parser.yy:1459 +#: parser.yy:1352 #, fuzzy msgid "Have to be in Chord mode for chords" msgstr "Für Akkorde muß ich im Akkord-(Chord)-Modus sein" +#: parser.yy:1513 parser.yy:1531 +msgid "need integer number arg" +msgstr "" + +#: parser.yy:1517 +msgid "Must be positive integer" +msgstr "" + #: lexer.ll:158 msgid "EOF found inside a comment" msgstr "Während eines Kommentar war die Datei zu Ende (EOF gefunden)" @@ -909,42 +902,46 @@ msgstr "W msgid "\\maininput disallowed outside init files" msgstr "" -#: lexer.ll:202 -#, c-format -msgid "undefined identifier: `%s'" +#: lexer.ll:196 +#, fuzzy, c-format +msgid "wrong or undefined identifier: `%s'" msgstr "Unbekannter Identifier: `%s'" #. backup rule -#: lexer.ll:207 +#: lexer.ll:201 #, fuzzy msgid "Missing end quote" msgstr "Endnote fehlt" #. backup rule -#: lexer.ll:229 lexer.ll:233 +#: lexer.ll:223 lexer.ll:227 msgid "white expected" msgstr "Erwarte Weiß" -#: lexer.ll:241 +#: lexer.ll:235 #, fuzzy msgid "Can't evaluate Scheme in safe mode" msgstr "Kann Scheme nicht interpretieren, wenn ich im sicheren Modus bin" -#: lexer.ll:436 +#: lexer.ll:431 #, c-format msgid "invalid character: `%c'" msgstr "Ungültiger Buchstabe `%c'" -#: lexer.ll:494 +#: lexer.ll:508 #, c-format msgid "unknown escaped string: `\\%s'" msgstr "Unbekannte Sonder-Zeichenkette" -#: lexer.ll:580 +#: lexer.ll:594 #, c-format msgid "incorrect mudela version: %s (%s, %s)" msgstr "Falsche Version von Mudela: (s /%s, %s)" +#: lexer.ll:595 +msgid "Consider converting the input with the convert-mudela script" +msgstr "" + #: main.cc:91 msgid "write exact durations, e.g.: a4*385/384" msgstr "Schreibe genaue Dauer, z.B.: a4*385/384" @@ -1128,6 +1125,34 @@ msgstr "% Automatisch generiert" msgid "% from input file: " msgstr "% aus Eingabedatei: " +#, fuzzy +#~ msgid "No key name, assuming `C'" +#~ msgstr "Keine Tonart: ich nehme `C' an" + +#, fuzzy +#~ msgid "Don't know how handle empty keys" +#~ msgstr "Weiß nicht, wie ich eine fehlende Tonart behandeln soll" + +#, fuzzy +#~ msgid "out of tune:" +#~ msgstr "Verstimmt" + +#~ msgid "ignore mudela version" +#~ msgstr "Ignoriere Version von Mudela" + +#~ msgid "unknown paper variable: `%s'" +#~ msgstr "Unbekannte papier-Variable: `%s'" + +#~ msgid "not a real variable" +#~ msgstr "Keine echte Variable" + +#~ msgid "no toplevel translator" +#~ msgstr "Kein Übersetzer für den obersten Level" + +#, fuzzy +#~ msgid "Spanner `%s' has equal left and right spanpoints" +#~ msgstr "Bogen `%s' mit gleichen linken und rechten Bogenpunkten" + #~ msgid "Debug output disabled. Compiled with NPRINT." #~ msgstr "Debug-Ausgabe außer Betrieb. Übersetzt mit NPRINT." diff --git a/po/fr.po b/po/fr.po index 23107fbf69..d8b6a122ce 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: lilypond 1.3.18\n" -"POT-Creation-Date: 2000-06-09 02:01+0200\n" +"POT-Creation-Date: 2000-07-24 21:55+0200\n" "PO-Revision-Date: 1999-12-28 00:32 +1\n" "Last-Translator: Laurent Martelli \n" "Language-Team: \n" @@ -17,11 +17,11 @@ msgstr "" msgid "EOF in a string" msgstr "EOF dans une chaîne" -#: data-file.cc:116 input.cc:87 midi-parser.cc:100 warn.cc:22 +#: data-file.cc:116 input.cc:85 midi-parser.cc:100 warn.cc:22 msgid "warning: " msgstr "avertissement: " -#: dstream.cc:184 +#: dstream.cc:187 #, fuzzy msgid "not enough fields in Dstream init" msgstr "Pas assez de champs dans l'initialisation de Dstream." @@ -46,16 +46,16 @@ msgstr "option non reconnue: `%s'" msgid "invalid argument `%s' to option `%s'" msgstr "argument `%s' invalide pour l'option `%s'" -#: input.cc:92 warn.cc:8 warn.cc:16 +#: input.cc:90 warn.cc:8 warn.cc:16 msgid "error: " msgstr "erreur: " -#: input.cc:98 +#: input.cc:96 #, fuzzy msgid "non fatal error: " msgstr "Erreur non fatale: " -#: input.cc:106 source-file.cc:62 source-file.cc:155 +#: input.cc:104 source-file.cc:62 source-file.cc:155 msgid "position unknown" msgstr "position inconnue" @@ -64,7 +64,7 @@ msgid "can't map file" msgstr "impossible de mapper le fichier" #: mapped-file-storage.cc:87 midi-stream.cc:77 mudela-stream.cc:111 -#: paper-stream.cc:25 scores.cc:38 simple-file-storage.cc:44 text-stream.cc:22 +#: paper-stream.cc:25 scores.cc:37 simple-file-storage.cc:44 text-stream.cc:22 #, c-format msgid "can't open file: `%s'" msgstr "impossible d'ouvrir le fichier: `%s'" @@ -88,41 +88,41 @@ msgstr "Erreur de programmation: " msgid " (Continuing; cross thumbs)" msgstr " (je continure; croisez les doigts)" -#: afm.cc:42 +#: afm.cc:51 #, fuzzy, c-format msgid "can't find character number: %d" msgstr "impossible de trouver le caractères numéro %d" -#: afm.cc:57 +#: afm.cc:66 #, fuzzy, c-format msgid "can't find character called: `%s'" msgstr "impossible de trouver le caractères appelé `%s'" -#: afm.cc:87 +#: afm.cc:96 msgid "Error parsing AFM file" msgstr "" -#: all-font-metrics.cc:104 lookup.cc:56 +#: all-font-metrics.cc:149 lookup.cc:80 #, fuzzy, c-format msgid "can't find font: `%s'" msgstr "ne peut pas trouver le fichier: `%s'" -#: all-font-metrics.cc:105 +#: all-font-metrics.cc:150 #, fuzzy msgid "Loading default font" msgstr "Impossible de trouver la police `%s', chargement la police par défaut" -#: all-font-metrics.cc:122 +#: all-font-metrics.cc:167 #, fuzzy, c-format msgid "can't find default font: `%s'" msgstr "Impossible de trouver la fonte par défaut `%s', abandon." -#: all-font-metrics.cc:123 includable-lexer.cc:49 lookup.cc:57 scores.cc:109 +#: all-font-metrics.cc:168 includable-lexer.cc:50 lookup.cc:81 scores.cc:108 #, fuzzy, c-format msgid "(search path: `%s')" msgstr "chemin de recherche= %s" -#: all-font-metrics.cc:124 +#: all-font-metrics.cc:169 msgid "Giving up" msgstr "" @@ -130,44 +130,44 @@ msgstr "" msgid "Can't switch translators, I'm there already" msgstr "" -#: beam-engraver.cc:40 beam-engraver.cc:56 +#: beam-engraver.cc:75 beam-engraver.cc:91 #, fuzzy msgid "can't find start of beam" msgstr "impossible de trouver le caractères numéro %d" -#: beam-engraver.cc:85 +#: beam-engraver.cc:120 #, fuzzy msgid "already have a beam" msgstr "Il y a déjà une barre" -#: beam-engraver.cc:141 +#: beam-engraver.cc:177 #, fuzzy msgid "unterminated beam" msgstr "Barre non terminée" -#: beam-engraver.cc:169 chord-tremolo-engraver.cc:167 +#: beam-engraver.cc:210 chord-tremolo-engraver.cc:172 #, fuzzy msgid "stem must have Rhythmic structure" msgstr "La tige doit avoir une structure rythmique." -#: beam-engraver.cc:180 +#: beam-engraver.cc:221 msgid "stem doesn't fit in beam" msgstr "la tige ne rentre pas dans la barre" -#: beam-engraver.cc:181 +#: beam-engraver.cc:222 msgid "beam was started here" msgstr "la barre a commencé ici" -#: beam.cc:90 +#: beam.cc:84 #, fuzzy msgid "beam has less than two stems" msgstr "barre avec moins de deux tiges" -#: beam.cc:483 +#: beam.cc:510 msgid "weird beam vertical offset" msgstr "" -#: break-align-item.cc:87 +#: break-align-item.cc:119 #, fuzzy, c-format msgid "unknown spacing pair `%s', `%s'" msgstr "traducteur inconnu `%s'" @@ -191,43 +191,43 @@ msgstr "" msgid "none of these in my family" msgstr "" -#: chord-tremolo-engraver.cc:111 +#: chord-tremolo-engraver.cc:115 msgid "unterminated chord tremolo" msgstr "" -#: chord-tremolo-iterator.cc:41 +#: chord-tremolo-iterator.cc:42 msgid "no one to print a tremolos" msgstr "" -#: chord.cc:151 +#: chord.cc:152 #, c-format msgid "invalid subtraction: not part of chord: %s" msgstr "soustraction invalide: ne fait pas partie de l'accord: %s" -#: chord.cc:375 +#: chord.cc:376 #, c-format msgid "invalid inversion pitch: not part of chord: %s" msgstr "renversement invalide: ne fait pas partie de l'accord: %s" -#: clef-engraver.cc:166 +#: clef-engraver.cc:167 #, fuzzy msgid "unknown clef type" msgstr "type de clé inconnu" -#: collision.cc:111 +#: collision.cc:118 #, fuzzy msgid "Too many clashing notecolumns. Ignoring them." msgstr "Trop de colonnes de notes superposées. Je les ignore." -#: crescendo.cc:69 +#: crescendo.cc:65 msgid "crescendo" msgstr "" -#: crescendo.cc:69 +#: crescendo.cc:65 msgid "too small" msgstr "trop petit" -#: cross-staff.cc:19 +#: cross-staff.cc:22 msgid "" "minVerticalAlign != maxVerticalAlign: cross staff spanners may be broken" msgstr "" @@ -246,31 +246,31 @@ msgstr "impossible de positionner mem-checking" msgid "NaN" msgstr "" -#: dynamic-engraver.cc:281 span-dynamic-performer.cc:87 +#: dynamic-engraver.cc:184 span-dynamic-performer.cc:87 #, fuzzy msgid "can't find start of (de)crescendo" msgstr "ne peut pas trouver un (de)crescendo à la fin" -#: dynamic-engraver.cc:300 +#: dynamic-engraver.cc:203 #, fuzzy msgid "already have a crescendo" msgstr "Il y a déjà une barre" -#: dynamic-engraver.cc:301 +#: dynamic-engraver.cc:204 #, fuzzy msgid "already have a decrescendo" msgstr "Il y a déjà une barre" -#: dynamic-engraver.cc:381 +#: dynamic-engraver.cc:289 #, fuzzy msgid "unterminated (de)crescendo" msgstr "crescendo non terminé" -#: extender-engraver.cc:96 +#: extender-engraver.cc:98 msgid "unterminated extender" msgstr "" -#: extender-engraver.cc:108 +#: extender-engraver.cc:110 msgid "Nothing to connect extender to on the left. Ignoring extender request." msgstr "" @@ -287,171 +287,154 @@ msgstr "" msgid "no Grace context available" msgstr "pas une vrai variable" -#: grace-position-engraver.cc:93 +#: grace-position-engraver.cc:94 msgid "Unattached grace notes. Attaching to last musical column." msgstr "" -#: hyphen-engraver.cc:59 +#: hyphen-engraver.cc:90 msgid "unterminated hyphen" msgstr "" -#: hyphen-engraver.cc:71 +#: hyphen-engraver.cc:102 msgid "Nothing to connect hyphen to on the left. Ignoring hyphen request." msgstr "" -#: identifier.cc:44 +#: identifier.cc:49 #, fuzzy, c-format msgid "wrong identifier type, expected: `%s'" msgstr "Mauvais type d'indentifiant: " -#: includable-lexer.cc:47 lily-guile.cc:121 lily-guile.cc:144 -#: midi-score-parser.cc:24 scores.cc:108 scores.cc:114 +#: includable-lexer.cc:48 lily-guile.cc:117 midi-score-parser.cc:24 +#: scores.cc:107 scores.cc:113 #, c-format msgid "can't find file: `%s'" msgstr "ne peut pas trouver le fichier: `%s'" -#: key-def.cc:31 -#, fuzzy -msgid "No key name, assuming `C'" -msgstr "Pas de nom de clé: Do assumé" - -#: key-def.cc:92 -#, fuzzy -msgid "Don't know how handle empty keys" -msgstr "ne sait pas traiter les clés vides" - -#: key-engraver.cc:74 key-performer.cc:65 +#: key-engraver.cc:92 key-performer.cc:54 msgid "FIXME: key change merge" msgstr "" -#: lily-guile.cc:123 lily-guile.cc:146 +#: lily-guile.cc:119 #, c-format msgid "(load path: `%s')" msgstr "" -#: line-of-score.cc:90 +#: line-of-score.cc:96 #, c-format msgid "Element count %d." msgstr "" -#: line-of-score.cc:207 paper-score.cc:70 +#: line-of-score.cc:255 paper-score.cc:79 #, c-format msgid "Element count %d " msgstr "" -#: line-of-score.cc:221 +#: line-of-score.cc:269 msgid "Calculating column positions..." msgstr "Calcul de la position des colonnes..." -#: local-key-engraver.cc:82 -#, fuzzy -msgid "out of tune:" -msgstr "hors de la tonalité" - -#: local-key-engraver.cc:83 time-signature-engraver.cc:29 -#: translator-group.cc:416 translator-group.cc:425 -#, fuzzy, c-format -msgid "can't find: `%s'" -msgstr "ne peut pas trouver `%s'" - -#: lookup.cc:58 +#: lookup.cc:82 msgid "Aborting" msgstr "Annulation" -#: lookup.cc:198 +#: lookup.cc:223 #, c-format msgid "Non-matching braces in text `%s', adding braces" msgstr "" -#: main.cc:71 main.cc:92 +#: lyric-phrasing-engraver.cc:147 +msgid "lyrics found without matching notehead ... aligning on self" +msgstr "" + +#: main.cc:75 main.cc:92 msgid "enable debugging output" msgstr "" -#: main.cc:72 +#: main.cc:76 msgid "EXT" msgstr "" -#: main.cc:72 +#: main.cc:76 msgid "use output format EXT (scm, ps, tex or as)" msgstr "" -#: main.cc:73 main.cc:93 +#: main.cc:77 main.cc:93 msgid "this help" msgstr "cette aide" -#: main.cc:74 +#: main.cc:78 msgid "DIR" msgstr "REP" -#: main.cc:74 +#: main.cc:78 #, fuzzy msgid "add DIR to search path" msgstr "ajoute REP au chemin de recherche" -#: main.cc:75 main.cc:96 +#: main.cc:79 main.cc:96 msgid "FILE" msgstr "FICHIER" -#: main.cc:75 +#: main.cc:79 #, fuzzy msgid "use FILE as init file" msgstr "utilise FICHIER comme fichier d'initialisation" -#: main.cc:76 +#: main.cc:80 msgid "write Makefile dependencies for every input file" msgstr "" -#: main.cc:77 +#: main.cc:81 #, fuzzy msgid "produce MIDI output only" msgstr "produit seulement la sortie MIDI" -#: main.cc:78 +#: main.cc:82 msgid "BASENAME" msgstr "" -#: main.cc:78 +#: main.cc:82 msgid "write output to BASENAME[-x].extension" msgstr "" -#: main.cc:79 +#: main.cc:83 msgid "show all changes in relative syntax" msgstr "" -#: main.cc:80 +#: main.cc:84 msgid "inhibit file output naming and exporting" msgstr "" -#: main.cc:81 main.cc:100 +#: main.cc:85 main.cc:100 msgid "don't timestamp the output" msgstr "" -#: main.cc:82 +#: main.cc:86 msgid "switch on experimental features" msgstr "" -#: main.cc:83 -msgid "ignore mudela version" -msgstr "" - -#: main.cc:84 main.cc:101 +#: main.cc:87 main.cc:101 msgid "print version number" msgstr "afficher le numéro de version" -#: main.cc:85 main.cc:103 +#: main.cc:88 +msgid "verbose" +msgstr "" + +#: main.cc:89 main.cc:103 msgid "show warranty and copyright" msgstr "" -#: main.cc:100 +#: main.cc:105 #, c-format msgid "Usage: %s [OPTION]... [FILE]..." msgstr "Usage: %s [OPTION]... [FICHIER]..." -#: main.cc:102 +#: main.cc:107 msgid "Typeset music and or play MIDI from FILE" msgstr "" -#: main.cc:106 +#: main.cc:111 #, fuzzy msgid "" "LilyPond is a music typesetter. It produces beautiful sheet music\n" @@ -462,21 +445,21 @@ msgstr "" "paritions à partir de description de gaut niveau en entrée. Lilypond\n" "fait partie du projet GNU.\n" -#: main.cc:112 main.cc:116 +#: main.cc:116 main.cc:117 msgid "Options:" msgstr "Options: " -#: main.cc:116 +#: main.cc:121 #, fuzzy msgid "This binary was compiled with the following options:" msgstr "Cet exécutable a été compilé avec les options suivantes:" -#: main.cc:120 main.cc:135 +#: main.cc:120 main.cc:140 #, fuzzy, c-format msgid "Report bugs to %s" msgstr "Rapporter les bugs à" -#: main.cc:53 main.cc:143 +#: main.cc:53 main.cc:148 #, c-format msgid "" "This is free software. It is covered by the GNU General Public License,\n" @@ -484,17 +467,17 @@ msgid "" "certain conditions. Invoke as `%s --warranty' for more information.\n" msgstr "" -#: main.cc:60 main.cc:150 main.cc:162 +#: main.cc:60 main.cc:155 main.cc:167 #, c-format msgid "Copyright (c) %s by" msgstr "Copyright (c) %s par" #. GNU GNU? -#: main.cc:160 +#: main.cc:165 msgid "GNU LilyPond -- The GNU Project music typesetter" msgstr "GNU LilyPond -- Il tipografo musicale del progetto GNU" -#: main.cc:69 main.cc:168 +#: main.cc:69 main.cc:173 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" @@ -511,7 +494,7 @@ msgid "" "USA.\n" msgstr "" -#: midi-item.cc:311 +#: midi-item.cc:310 #, fuzzy, c-format msgid "no such instrument: `%s'" msgstr "Pas d'instrument tel: `%s'" @@ -521,11 +504,11 @@ msgstr "Pas d'instrument tel: `%s'" msgid "unconventional key: flats: %d, sharps: %d" msgstr "" -#: midi-item.cc:410 +#: midi-item.cc:412 msgid "silly duration" msgstr "" -#: midi-item.cc:423 +#: midi-item.cc:425 msgid "silly pitch" msgstr "" @@ -534,11 +517,11 @@ msgstr "" msgid "Error syncing file (disk full?)" msgstr ")" -#: music-output-def.cc:57 +#: music-output-def.cc:51 msgid "Interpretation context with empty type" msgstr "" -#: music-output-def.cc:87 +#: music-output-def.cc:78 #, fuzzy, c-format msgid "can't find `%s' context" msgstr "ne peut pas trouver `%s'" @@ -548,47 +531,38 @@ msgstr "ne peut pas trouver `%s'" msgid "Transposition by %s makes accidental larger than two" msgstr "" -#: my-lily-lexer.cc:129 +#: my-lily-lexer.cc:118 #, c-format msgid "Identifier name is a keyword: `%s'" msgstr "" -#: my-lily-lexer.cc:148 +#: my-lily-lexer.cc:137 #, c-format msgid "error at EOF: %s" msgstr "" -#: midi-score-parser.cc:94 my-lily-parser.cc:56 +#: midi-score-parser.cc:94 my-lily-parser.cc:55 msgid "Parsing..." msgstr "Analyse..." -#: my-lily-parser.cc:64 +#: my-lily-parser.cc:63 msgid "Braces don't match" msgstr "" -#: paper-def.cc:70 -#, c-format -msgid "unknown paper variable: `%s'" -msgstr "variable papier inconnue: `%s'" - -#: paper-def.cc:74 -msgid "not a real variable" -msgstr "pas une vrai variable" - -#: paper-def.cc:165 +#: paper-def.cc:149 #, fuzzy, c-format msgid "paper output to %s..." msgstr "Sortie papier vers %s..." -#: mudela-stream.cc:93 paper-outputter.cc:92 performance.cc:95 +#: mudela-stream.cc:93 paper-outputter.cc:91 performance.cc:97 msgid ", at " msgstr ", à " -#: paper-score.cc:72 +#: paper-score.cc:82 msgid "Preprocessing elements..." msgstr "" -#: paper-score.cc:97 +#: paper-score.cc:107 msgid "Outputting Score, defined at: " msgstr "" @@ -598,36 +572,36 @@ msgid "Track ... " msgstr "Piste ... " #. perhaps multiple text events? -#: performance.cc:75 +#: performance.cc:77 msgid "Creator: " msgstr "Auteur: " -#: performance.cc:90 +#: performance.cc:92 msgid "Automatically generated" msgstr "Généré automatiquement" -#: performance.cc:104 +#: performance.cc:106 #, c-format msgid "from musical definition: %s" msgstr "" -#: performance.cc:172 +#: performance.cc:174 #, c-format msgid "MIDI output to %s..." msgstr "" -#: piano-pedal-engraver.cc:158 piano-pedal-engraver.cc:170 +#: piano-pedal-engraver.cc:157 piano-pedal-engraver.cc:169 #: piano-pedal-performer.cc:87 #, fuzzy, c-format msgid "can't find start of piano pedal: %s" msgstr "ne peut pas trouver le fichier: `%s'" -#: property-engraver.cc:106 +#: property-engraver.cc:128 #, fuzzy msgid "Wrong type for property" msgstr "Mauvais type pour la valeur de la propriété" -#: repeat-engraver.cc:196 +#: repeat-engraver.cc:253 msgid "No bar engraver found. Ignoring repeats." msgstr "" @@ -646,62 +620,63 @@ msgstr "" msgid "Junking music: `%s'" msgstr "" -#: rest-collision.cc:135 +#: rest-collision.cc:159 msgid "too many colliding rests" msgstr "" -#: rest-collision.cc:139 +#: rest-collision.cc:163 msgid "too many notes for rest collision" msgstr "" -#: score-engraver.cc:139 +#: score-engraver.cc:151 #, fuzzy, c-format msgid "unbound spanner `%s'" msgstr "traducteur inconnu `%s'" -#: score.cc:64 -msgid "no toplevel translator" -msgstr "" - #: score.cc:67 msgid "Interpreting music..." msgstr "" -#: score.cc:79 +#: score.cc:81 msgid "Need music in a score" msgstr "" #. should we? hampers debugging. -#: score.cc:92 +#: score.cc:94 msgid "Errors found/*, not processing score*/" msgstr "" -#: score.cc:97 +#: score.cc:100 #, fuzzy, c-format msgid "elapsed time: %.2f seconds" msgstr "temps ecoulé: %.2f secondes" -#: scores.cc:35 +#: scores.cc:34 #, fuzzy, c-format -msgid "Writing dependency file: `%s'..." +msgid "Writing dependency file: `%s'...\n" msgstr "impossible d'ouvrir le fichier: `%s'" -#: scores.cc:79 +#: scores.cc:78 msgid "Score contains errors; will not process it" msgstr "" -#: script-engraver.cc:68 +#: scores.cc:123 #, c-format -msgid "Don't know how to interpret articulation `%s'" +msgid "Now processing: `%s'\n" msgstr "" -#: sequential-music-iterator.cc:83 -msgid "Must stop before this music ends" +#: script-engraver.cc:65 +#, c-format +msgid "Don't know how to interpret articulation `%s'" msgstr "" #. this shouldn't happen, but let's continue anyway. -#: single-malt-grouping-item.cc:51 -msgid "Single_malt_grouping_item: I've been drinking too much" +#: separation-item.cc:48 +msgid "Separation_item: I've been drinking too much" +msgstr "" + +#: sequential-music-iterator.cc:83 +msgid "Must stop before this music ends" msgstr "" #: slur-engraver.cc:82 @@ -717,49 +692,44 @@ msgstr "" msgid "slur" msgstr "" -#: slur.cc:231 +#: slur.cc:48 msgid "Putting slur over rest. Ignoring." msgstr "" -#: slur.cc:312 +#: slur.cc:122 msgid "Slur over rest?" msgstr "" -#: spanner.cc:35 spanner.cc:174 -#, c-format -msgid "Spanner `%s' has equal left and right spanpoints" -msgstr "" - -#: stem-engraver.cc:124 +#: stem-engraver.cc:128 #, c-format msgid "Adding note head to incompatible stem (type = %d)" msgstr "" -#: stem.cc:118 +#: stem.cc:116 #, fuzzy msgid "Weird stem size; check for narrow beams" msgstr "décallage de barre bizarre, check your knees" -#: tfm-reader.cc:115 +#: tfm-reader.cc:105 #, c-format msgid "TFM header of `%s' has only %u word(s)" msgstr "" -#: tfm-reader.cc:153 +#: tfm-reader.cc:143 #, c-format msgid "%s: TFM file has %u parameters, which is more than the %u I can handle" msgstr "" -#: tfm.cc:70 +#: tfm.cc:71 #, fuzzy, c-format msgid "can't find ascii character: `%d'" msgstr "ne peut pas trouver le caractère ascii `%d'" -#: tie-engraver.cc:195 tie-performer.cc:109 +#: tie-engraver.cc:203 tie-performer.cc:109 msgid "No ties were created!" msgstr "Aucune liaison n'a été crée" -#: tie.cc:80 +#: tie-engraver.cc:242 msgid "lonely tie" msgstr "liaison solitaire" @@ -767,11 +737,17 @@ msgstr "liaison solitaire" msgid "no one to print a tuplet start bracket" msgstr "" -#: time-signature-engraver.cc:28 +#: time-signature-engraver.cc:49 #, fuzzy msgid "lost in time:" msgstr "perdu dans le temps" +#: time-signature-engraver.cc:50 translator-group.cc:419 +#: translator-group.cc:428 +#, fuzzy, c-format +msgid "can't find: `%s'" +msgstr "ne peut pas trouver `%s'" + #: timing-translator.cc:36 msgid "conflicting timing request" msgstr "" @@ -780,93 +756,109 @@ msgstr "" msgid "This is the other timing request" msgstr "" -#: timing-translator.cc:78 +#: timing-translator.cc:79 #, c-format msgid "barcheck failed at: %s" msgstr "" -#: translator-ctors.cc:42 +#: translator-ctors.cc:41 #, fuzzy, c-format msgid "unknown translator: `%s'" msgstr "traducteur inconnu `%s'" -#: translator-group.cc:81 translator-group.cc:94 +#: translator-group.cc:82 translator-group.cc:95 msgid "Program has no such type" msgstr "" -#: translator-group.cc:85 translator-group.cc:100 +#: translator-group.cc:86 translator-group.cc:101 #, fuzzy, c-format msgid "Already contains: `%s'" msgstr "Contient déjà un `%s'" -#: translator-group.cc:210 +#: translator-group.cc:213 #, c-format msgid "can't find or create `%s' called `%s'" msgstr "ne peut pas trouver ou créer `%s' nommé `%s'" -#: translator-group.cc:322 +#: translator-group.cc:325 #, fuzzy, c-format msgid "can't find or create: `%s'" msgstr "ne peut pas trouver ou créer `%s'" -#: unfolded-repeat-iterator.cc:145 +#: unfolded-repeat-iterator.cc:146 msgid "no one to print a volta bracket" msgstr "" -#: parser.yy:58 +#: parser.yy:59 #, c-format msgid "Oldest supported input version: %s" msgstr "Plus ancienne version supportée: %s" -#: parser.yy:427 +#: parser.yy:426 msgid "Need a translator group for a context" msgstr "" -#: parser.yy:448 +#: parser.yy:441 msgid "Wrong type for property value" msgstr "Mauvais type pour la valeur de la propriété" -#: parser.yy:694 +#: parser.yy:626 msgid "More alternatives than repeats. Junking excess alternatives." msgstr "" -#: parser.yy:739 +#: parser.yy:666 msgid "Second argument must be a symbol" msgstr "" -#: parser.yy:744 +#: parser.yy:671 msgid "First argument must be a procedure taking 1 argument" msgstr "" -#: parser.yy:1069 +#: parser.yy:971 +msgid "Expecting string as script definition" +msgstr "" + +#: parser.yy:981 msgid "Can't specify direction for this request" msgstr "" -#: parser.yy:1170 +#: parser.yy:1073 #, c-format msgid "Expecting %d arguments" msgstr "" -#: parser.yy:1193 parser.yy:1201 parser.yy:1443 +#: parser.yy:1089 +msgid "Must have 2 arguments for duration" +msgstr "" + +#: parser.yy:1096 parser.yy:1104 parser.yy:1339 #, fuzzy msgid "Have to be in Lyric mode for lyrics" msgstr "il fayt être en mode Parole pour les paroles" -#: parser.yy:1342 parser.yy:1362 +#: parser.yy:1245 parser.yy:1265 #, c-format msgid "not a duration: %d" msgstr "pas une durée: %d" -#: parser.yy:1371 +#: parser.yy:1274 #, fuzzy msgid "Have to be in Note mode for notes" msgstr "il faut être en mode Note pour les notes" -#: parser.yy:1459 +#: parser.yy:1352 #, fuzzy msgid "Have to be in Chord mode for chords" msgstr "il faut être en mode Accord pour les accords" +#: parser.yy:1513 parser.yy:1531 +msgid "need integer number arg" +msgstr "" + +#: parser.yy:1517 +msgid "Must be positive integer" +msgstr "" + #: lexer.ll:158 msgid "EOF found inside a comment" msgstr "EOF trouvé dans un commentaire" @@ -875,40 +867,44 @@ msgstr "EOF trouv msgid "\\maininput disallowed outside init files" msgstr "" -#: lexer.ll:202 -#, c-format -msgid "undefined identifier: `%s'" +#: lexer.ll:196 +#, fuzzy, c-format +msgid "wrong or undefined identifier: `%s'" msgstr "indentifiant non défini: `%s'" #. backup rule -#: lexer.ll:207 +#: lexer.ll:201 msgid "Missing end quote" msgstr "" #. backup rule -#: lexer.ll:229 lexer.ll:233 +#: lexer.ll:223 lexer.ll:227 msgid "white expected" msgstr "blanche attendue" -#: lexer.ll:241 +#: lexer.ll:235 msgid "Can't evaluate Scheme in safe mode" msgstr "" -#: lexer.ll:436 +#: lexer.ll:431 #, fuzzy, c-format msgid "invalid character: `%c'" msgstr "caractères illégal: `%c'" -#: lexer.ll:494 +#: lexer.ll:508 #, c-format msgid "unknown escaped string: `\\%s'" msgstr "chaîne d'échappement inconnue: `\\%s'" -#: lexer.ll:580 +#: lexer.ll:594 #, c-format msgid "incorrect mudela version: %s (%s, %s)" msgstr "version de mudela incorrecte: %s (%s, %s)" +#: lexer.ll:595 +msgid "Consider converting the input with the convert-mudela script" +msgstr "" + #: main.cc:91 msgid "write exact durations, e.g.: a4*385/384" msgstr "" @@ -1089,6 +1085,24 @@ msgstr "% G msgid "% from input file: " msgstr "% dal file di input: " +#, fuzzy +#~ msgid "No key name, assuming `C'" +#~ msgstr "Pas de nom de clé: Do assumé" + +#, fuzzy +#~ msgid "Don't know how handle empty keys" +#~ msgstr "ne sait pas traiter les clés vides" + +#, fuzzy +#~ msgid "out of tune:" +#~ msgstr "hors de la tonalité" + +#~ msgid "unknown paper variable: `%s'" +#~ msgstr "variable papier inconnue: `%s'" + +#~ msgid "not a real variable" +#~ msgstr "pas une vrai variable" + #~ msgid "Debug output disabled. Compiled with NPRINT." #~ msgstr "Messages de deboggage désactivés. Compilé avec NPRINT." diff --git a/po/it.po b/po/it.po index d07f63010f..6d4b9d5dc6 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ #, fuzzy msgid "" msgstr "" -"POT-Creation-Date: 2000-06-09 02:01+0200\n" +"POT-Creation-Date: 2000-07-24 21:55+0200\n" "Content-Type: text/plain; charset=\n" "Date: 1998-05-30 00:17:12+0200\n" "From: \n" @@ -17,11 +17,11 @@ msgstr "" msgid "EOF in a string" msgstr "EOF in una corda" -#: data-file.cc:116 input.cc:87 midi-parser.cc:100 warn.cc:22 +#: data-file.cc:116 input.cc:85 midi-parser.cc:100 warn.cc:22 msgid "warning: " msgstr "attenzione: " -#: dstream.cc:184 +#: dstream.cc:187 #, fuzzy msgid "not enough fields in Dstream init" msgstr "Non ci sono sufficienti campi in Dstream init." @@ -46,16 +46,16 @@ msgstr "opzione non riconosciuta: `%s'" msgid "invalid argument `%s' to option `%s'" msgstr "argomento `%s' non valido per l'opzione `%s'" -#: input.cc:92 warn.cc:8 warn.cc:16 +#: input.cc:90 warn.cc:8 warn.cc:16 msgid "error: " msgstr "errore: " -#: input.cc:98 +#: input.cc:96 #, fuzzy msgid "non fatal error: " msgstr "Errore non fatale: " -#: input.cc:106 source-file.cc:62 source-file.cc:155 +#: input.cc:104 source-file.cc:62 source-file.cc:155 msgid "position unknown" msgstr "posizione sconosciuta" @@ -64,7 +64,7 @@ msgid "can't map file" msgstr "non posso mappare il documento" #: mapped-file-storage.cc:87 midi-stream.cc:77 mudela-stream.cc:111 -#: paper-stream.cc:25 scores.cc:38 simple-file-storage.cc:44 text-stream.cc:22 +#: paper-stream.cc:25 scores.cc:37 simple-file-storage.cc:44 text-stream.cc:22 #, c-format msgid "can't open file: `%s'" msgstr "non posso aprire il file: `%s'" @@ -86,40 +86,40 @@ msgstr "" msgid " (Continuing; cross thumbs)" msgstr "" -#: afm.cc:42 +#: afm.cc:51 #, fuzzy, c-format msgid "can't find character number: %d" msgstr "non riesco a trovare il carattere `%s'" -#: afm.cc:57 +#: afm.cc:66 #, fuzzy, c-format msgid "can't find character called: `%s'" msgstr "non riesco a trovare il carattere `%s'" -#: afm.cc:87 +#: afm.cc:96 msgid "Error parsing AFM file" msgstr "" -#: all-font-metrics.cc:104 lookup.cc:56 +#: all-font-metrics.cc:149 lookup.cc:80 #, fuzzy, c-format msgid "can't find font: `%s'" msgstr "non trovo il file: `%s'" -#: all-font-metrics.cc:105 +#: all-font-metrics.cc:150 msgid "Loading default font" msgstr "" -#: all-font-metrics.cc:122 +#: all-font-metrics.cc:167 #, fuzzy, c-format msgid "can't find default font: `%s'" msgstr "non trovo il file: `%s'" -#: all-font-metrics.cc:123 includable-lexer.cc:49 lookup.cc:57 scores.cc:109 +#: all-font-metrics.cc:168 includable-lexer.cc:50 lookup.cc:81 scores.cc:108 #, fuzzy, c-format msgid "(search path: `%s')" msgstr "(Il path di caricamento è `%s'" -#: all-font-metrics.cc:124 +#: all-font-metrics.cc:169 msgid "Giving up" msgstr "" @@ -127,43 +127,43 @@ msgstr "" msgid "Can't switch translators, I'm there already" msgstr "" -#: beam-engraver.cc:40 beam-engraver.cc:56 +#: beam-engraver.cc:75 beam-engraver.cc:91 #, fuzzy msgid "can't find start of beam" msgstr "non trovo le estremità di %s" -#: beam-engraver.cc:85 +#: beam-engraver.cc:120 msgid "already have a beam" msgstr "" -#: beam-engraver.cc:141 +#: beam-engraver.cc:177 #, fuzzy msgid "unterminated beam" msgstr "beam non terminato" -#: beam-engraver.cc:169 chord-tremolo-engraver.cc:167 +#: beam-engraver.cc:210 chord-tremolo-engraver.cc:172 #, fuzzy msgid "stem must have Rhythmic structure" msgstr "I gambi devono avere una struttura ritmica." -#: beam-engraver.cc:180 +#: beam-engraver.cc:221 msgid "stem doesn't fit in beam" msgstr "il gambo non rientra nel beam" -#: beam-engraver.cc:181 +#: beam-engraver.cc:222 msgid "beam was started here" msgstr "" -#: beam.cc:90 +#: beam.cc:84 #, fuzzy msgid "beam has less than two stems" msgstr "beam con meno di due gambi" -#: beam.cc:483 +#: beam.cc:510 msgid "weird beam vertical offset" msgstr "" -#: break-align-item.cc:87 +#: break-align-item.cc:119 #, fuzzy, c-format msgid "unknown spacing pair `%s', `%s'" msgstr "traduttore sconosciuto `%s'" @@ -187,44 +187,44 @@ msgstr "" msgid "none of these in my family" msgstr "" -#: chord-tremolo-engraver.cc:111 +#: chord-tremolo-engraver.cc:115 #, fuzzy msgid "unterminated chord tremolo" msgstr "beam non terminato" -#: chord-tremolo-iterator.cc:41 +#: chord-tremolo-iterator.cc:42 msgid "no one to print a tremolos" msgstr "" -#: chord.cc:151 +#: chord.cc:152 #, c-format msgid "invalid subtraction: not part of chord: %s" msgstr "" -#: chord.cc:375 +#: chord.cc:376 #, c-format msgid "invalid inversion pitch: not part of chord: %s" msgstr "" -#: clef-engraver.cc:166 +#: clef-engraver.cc:167 #, fuzzy msgid "unknown clef type" msgstr "tipo di chiave sconosciuto" -#: collision.cc:111 +#: collision.cc:118 #, fuzzy msgid "Too many clashing notecolumns. Ignoring them." msgstr "Troppe collisioni tra colonne di note. Le ignoro." -#: crescendo.cc:69 +#: crescendo.cc:65 msgid "crescendo" msgstr "" -#: crescendo.cc:69 +#: crescendo.cc:65 msgid "too small" msgstr "troppo piccolo" -#: cross-staff.cc:19 +#: cross-staff.cc:22 msgid "" "minVerticalAlign != maxVerticalAlign: cross staff spanners may be broken" msgstr "" @@ -243,31 +243,31 @@ msgstr "non posso settare mem-checking" msgid "NaN" msgstr "" -#: dynamic-engraver.cc:281 span-dynamic-performer.cc:87 +#: dynamic-engraver.cc:184 span-dynamic-performer.cc:87 #, fuzzy msgid "can't find start of (de)crescendo" msgstr "non trovo un (de)crescendo fino alla fine" -#: dynamic-engraver.cc:300 +#: dynamic-engraver.cc:203 #, fuzzy msgid "already have a crescendo" msgstr "crescendo non terminato" -#: dynamic-engraver.cc:301 +#: dynamic-engraver.cc:204 #, fuzzy msgid "already have a decrescendo" msgstr "crescendo non terminato" -#: dynamic-engraver.cc:381 +#: dynamic-engraver.cc:289 #, fuzzy msgid "unterminated (de)crescendo" msgstr "crescendo non terminato" -#: extender-engraver.cc:96 +#: extender-engraver.cc:98 msgid "unterminated extender" msgstr "extender non terminato" -#: extender-engraver.cc:108 +#: extender-engraver.cc:110 msgid "Nothing to connect extender to on the left. Ignoring extender request." msgstr "" @@ -284,209 +284,191 @@ msgstr "" msgid "no Grace context available" msgstr "non è una vera variabile" -#: grace-position-engraver.cc:93 +#: grace-position-engraver.cc:94 msgid "Unattached grace notes. Attaching to last musical column." msgstr "" -#: hyphen-engraver.cc:59 +#: hyphen-engraver.cc:90 #, fuzzy msgid "unterminated hyphen" msgstr "beam non terminato" -#: hyphen-engraver.cc:71 +#: hyphen-engraver.cc:102 msgid "Nothing to connect hyphen to on the left. Ignoring hyphen request." msgstr "" -#: identifier.cc:44 +#: identifier.cc:49 #, fuzzy, c-format msgid "wrong identifier type, expected: `%s'" msgstr "Tipo di identificatore sbagliato: " -#: includable-lexer.cc:47 lily-guile.cc:121 lily-guile.cc:144 -#: midi-score-parser.cc:24 scores.cc:108 scores.cc:114 +#: includable-lexer.cc:48 lily-guile.cc:117 midi-score-parser.cc:24 +#: scores.cc:107 scores.cc:113 #, c-format msgid "can't find file: `%s'" msgstr "non trovo il file: `%s'" -#: key-def.cc:31 -#, fuzzy -msgid "No key name, assuming `C'" -msgstr "Nessuna armatura di chiave: assumo Do'" - -#: key-def.cc:92 -#, fuzzy -msgid "Don't know how handle empty keys" -msgstr "non so manipolare tasti vuoti" - -#: key-engraver.cc:74 key-performer.cc:65 +#: key-engraver.cc:92 key-performer.cc:54 msgid "FIXME: key change merge" msgstr "" -#: lily-guile.cc:123 lily-guile.cc:146 +#: lily-guile.cc:119 #, fuzzy, c-format msgid "(load path: `%s')" msgstr "(Il path di caricamento è `%s'" -#: line-of-score.cc:90 +#: line-of-score.cc:96 #, c-format msgid "Element count %d." msgstr "" -#: line-of-score.cc:207 paper-score.cc:70 +#: line-of-score.cc:255 paper-score.cc:79 #, c-format msgid "Element count %d " msgstr "" -#: line-of-score.cc:221 +#: line-of-score.cc:269 msgid "Calculating column positions..." msgstr "Calcolo delle posizioni della colonne..." -#: local-key-engraver.cc:82 -#, fuzzy -msgid "out of tune:" -msgstr "stonato" - -#: local-key-engraver.cc:83 time-signature-engraver.cc:29 -#: translator-group.cc:416 translator-group.cc:425 -#, fuzzy, c-format -msgid "can't find: `%s'" -msgstr "non trovo `%s'" - -#: lookup.cc:58 +#: lookup.cc:82 msgid "Aborting" msgstr "" -#: lookup.cc:198 +#: lookup.cc:223 #, c-format msgid "Non-matching braces in text `%s', adding braces" msgstr "" -#: main.cc:71 main.cc:92 +#: lyric-phrasing-engraver.cc:147 +msgid "lyrics found without matching notehead ... aligning on self" +msgstr "" + +#: main.cc:75 main.cc:92 #, fuzzy msgid "enable debugging output" msgstr " -D, --debug abilita l'output di debugging\n" -#: main.cc:72 +#: main.cc:76 msgid "EXT" msgstr "" -#: main.cc:72 +#: main.cc:76 msgid "use output format EXT (scm, ps, tex or as)" msgstr "" -#: main.cc:73 main.cc:93 +#: main.cc:77 main.cc:93 msgid "this help" msgstr "" -#: main.cc:74 +#: main.cc:78 msgid "DIR" msgstr "" -#: main.cc:74 +#: main.cc:78 #, fuzzy msgid "add DIR to search path" msgstr " -I, --include=DIR aggiunge DIR ai path di ricerca\n" -#: main.cc:75 main.cc:96 +#: main.cc:79 main.cc:96 msgid "FILE" msgstr "" -#: main.cc:75 +#: main.cc:79 #, fuzzy msgid "use FILE as init file" msgstr " -i, --init=NOMEFILE usa NOMEFILE come file iniziale\n" -#: main.cc:76 +#: main.cc:80 #, fuzzy msgid "write Makefile dependencies for every input file" msgstr "" " -d, --dependencies scrive le dependenze del Makefile per ogni file di " "input\n" -#: main.cc:77 +#: main.cc:81 #, fuzzy msgid "produce MIDI output only" msgstr " -M, --no-paper produce solo output midi\n" -#: main.cc:78 +#: main.cc:82 msgid "BASENAME" msgstr "" -#: main.cc:78 +#: main.cc:82 msgid "write output to BASENAME[-x].extension" msgstr "" -#: main.cc:79 +#: main.cc:83 #, fuzzy msgid "show all changes in relative syntax" msgstr "" " -Q, --find-old-relative mostra tutti i cambiamenti nella sintassi " "relativa\n" -#: main.cc:80 +#: main.cc:84 #, fuzzy msgid "inhibit file output naming and exporting" msgstr "" " -s, --safe inibisce la rinomina dei file di output e " "l'esportazione di macro di TeX\n" -#: main.cc:81 main.cc:100 +#: main.cc:85 main.cc:100 #, fuzzy msgid "don't timestamp the output" msgstr "" " -T, --no-timestamps non inserisce marcatori temporali nell'output\n" -#: main.cc:82 +#: main.cc:86 #, fuzzy msgid "switch on experimental features" msgstr " -t, --test usa le caratteristiche sperimentali\n" -#: main.cc:83 -#, fuzzy -msgid "ignore mudela version" -msgstr "versione di mudela errata: %s (%s, %s)" - -#: main.cc:84 main.cc:101 +#: main.cc:87 main.cc:101 msgid "print version number" msgstr "" -#: main.cc:85 main.cc:103 +#: main.cc:88 +msgid "verbose" +msgstr "" + +#: main.cc:89 main.cc:103 #, fuzzy msgid "show warranty and copyright" msgstr " -w, --warranty mostra la garanzia e il copyright\n" -#: main.cc:100 +#: main.cc:105 #, c-format msgid "Usage: %s [OPTION]... [FILE]..." msgstr "Uso: %s [OPZIONE]... [FILE]..." -#: main.cc:102 +#: main.cc:107 #, fuzzy msgid "Typeset music and or play MIDI from FILE" msgstr "Stampa partitura oppure suona una song MIDI da FILE o " -#: main.cc:106 +#: main.cc:111 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:112 main.cc:116 +#: main.cc:116 main.cc:117 msgid "Options:" msgstr "Opzioni: " -#: main.cc:116 +#: main.cc:121 #, fuzzy msgid "This binary was compiled with the following options:" msgstr "GNU LilyPond è stata compilata con le seguenti impostazioni:" -#: main.cc:120 main.cc:135 +#: main.cc:120 main.cc:140 #, c-format msgid "Report bugs to %s" msgstr "" -#: main.cc:53 main.cc:143 +#: main.cc:53 main.cc:148 #, c-format msgid "" "This is free software. It is covered by the GNU General Public License,\n" @@ -494,17 +476,17 @@ msgid "" "certain conditions. Invoke as `%s --warranty' for more information.\n" msgstr "" -#: main.cc:60 main.cc:150 main.cc:162 +#: main.cc:60 main.cc:155 main.cc:167 #, c-format msgid "Copyright (c) %s by" msgstr "Copyright (c) %s di" #. GNU GNU? -#: main.cc:160 +#: main.cc:165 msgid "GNU LilyPond -- The GNU Project music typesetter" msgstr "GNU LilyPond -- Il tipografo musicale del progetto GNU" -#: main.cc:69 main.cc:168 +#: main.cc:69 main.cc:173 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" @@ -536,7 +518,7 @@ msgstr "" "Cambridge, MA 02136\n" "USA.\n" -#: midi-item.cc:311 +#: midi-item.cc:310 #, fuzzy, c-format msgid "no such instrument: `%s'" msgstr "% strumento:" @@ -546,11 +528,11 @@ msgstr "% strumento:" msgid "unconventional key: flats: %d, sharps: %d" msgstr "armatura non convenzionale: %d bemolli e %d diesis" -#: midi-item.cc:410 +#: midi-item.cc:412 msgid "silly duration" msgstr "indicazione durata priva di senso" -#: midi-item.cc:423 +#: midi-item.cc:425 msgid "silly pitch" msgstr "indicazione altezza priva di senso" @@ -559,11 +541,11 @@ msgstr "indicazione altezza priva di senso" msgid "Error syncing file (disk full?)" msgstr "errore nel sincronizzare il file (disco pieno?)" -#: music-output-def.cc:57 +#: music-output-def.cc:51 msgid "Interpretation context with empty type" msgstr "" -#: music-output-def.cc:87 +#: music-output-def.cc:78 #, fuzzy, c-format msgid "can't find `%s' context" msgstr "non trovo `%s'" @@ -573,48 +555,39 @@ msgstr "non trovo `%s'" msgid "Transposition by %s makes accidental larger than two" msgstr "la trasposizine di %s rende le alterazioni più che doppie" -#: my-lily-lexer.cc:129 +#: my-lily-lexer.cc:118 #, fuzzy, c-format msgid "Identifier name is a keyword: `%s'" msgstr "Il nome dell'identificatore è una parola chiave (`%s')" -#: my-lily-lexer.cc:148 +#: my-lily-lexer.cc:137 #, c-format msgid "error at EOF: %s" msgstr "errore alla fine del file: %s" -#: midi-score-parser.cc:94 my-lily-parser.cc:56 +#: midi-score-parser.cc:94 my-lily-parser.cc:55 msgid "Parsing..." msgstr "Analisi..." -#: my-lily-parser.cc:64 +#: my-lily-parser.cc:63 #, fuzzy msgid "Braces don't match" msgstr "le bretelle no si accoppiano" -#: paper-def.cc:70 -#, c-format -msgid "unknown paper variable: `%s'" -msgstr "variabile paper sconosciuta: `%s'" - -#: paper-def.cc:74 -msgid "not a real variable" -msgstr "non è una vera variabile" - -#: paper-def.cc:165 +#: paper-def.cc:149 #, fuzzy, c-format msgid "paper output to %s..." msgstr "L'output stampato è inviato a %s..." -#: mudela-stream.cc:93 paper-outputter.cc:92 performance.cc:95 +#: mudela-stream.cc:93 paper-outputter.cc:91 performance.cc:97 msgid ", at " msgstr ", a " -#: paper-score.cc:72 +#: paper-score.cc:82 msgid "Preprocessing elements..." msgstr "Pre-elaborazione..." -#: paper-score.cc:97 +#: paper-score.cc:107 #, fuzzy msgid "Outputting Score, defined at: " msgstr "emetto lo Score, definito a: " @@ -625,36 +598,36 @@ msgid "Track ... " msgstr "traccia " #. perhaps multiple text events? -#: performance.cc:75 +#: performance.cc:77 msgid "Creator: " msgstr "Autore: " -#: performance.cc:90 +#: performance.cc:92 msgid "Automatically generated" msgstr "Generato automaticamente" -#: performance.cc:104 +#: performance.cc:106 #, c-format msgid "from musical definition: %s" msgstr "della definizione musicale: %s" -#: performance.cc:172 +#: performance.cc:174 #, c-format msgid "MIDI output to %s..." msgstr "L'output MIDI è inviato a %s..." -#: piano-pedal-engraver.cc:158 piano-pedal-engraver.cc:170 +#: piano-pedal-engraver.cc:157 piano-pedal-engraver.cc:169 #: piano-pedal-performer.cc:87 #, fuzzy, c-format msgid "can't find start of piano pedal: %s" msgstr "non risco a trovare una ruling note a %s" -#: property-engraver.cc:106 +#: property-engraver.cc:128 #, fuzzy msgid "Wrong type for property" msgstr "Tipo sbagliato per il valore di una proprietà" -#: repeat-engraver.cc:196 +#: repeat-engraver.cc:253 msgid "No bar engraver found. Ignoring repeats." msgstr "" @@ -673,66 +646,67 @@ msgstr "Cosa? Non msgid "Junking music: `%s'" msgstr "" -#: rest-collision.cc:135 +#: rest-collision.cc:159 #, fuzzy msgid "too many colliding rests" msgstr "Troppi crescendi" -#: rest-collision.cc:139 +#: rest-collision.cc:163 msgid "too many notes for rest collision" msgstr "" -#: score-engraver.cc:139 +#: score-engraver.cc:151 #, fuzzy, c-format msgid "unbound spanner `%s'" msgstr "Spanner non legato `%s'" -#: score.cc:64 -msgid "no toplevel translator" -msgstr "non c'è un traduttore di livello massimo" - #: score.cc:67 msgid "Interpreting music..." msgstr "Interpretazione della musica..." -#: score.cc:79 +#: score.cc:81 #, fuzzy msgid "Need music in a score" msgstr "ho bisogno di musica nello spartito" #. should we? hampers debugging. -#: score.cc:92 +#: score.cc:94 #, fuzzy msgid "Errors found/*, not processing score*/" msgstr "ho trovato un errore, /*non sto elaborando lo spartito*/" -#: score.cc:97 +#: score.cc:100 #, fuzzy, c-format msgid "elapsed time: %.2f seconds" msgstr "durata: %.2f secondi" -#: scores.cc:35 +#: scores.cc:34 #, fuzzy, c-format -msgid "Writing dependency file: `%s'..." +msgid "Writing dependency file: `%s'...\n" msgstr "scrivo il file delle dipendenze: `%s'..." -#: scores.cc:79 +#: scores.cc:78 #, fuzzy msgid "Score contains errors; will not process it" msgstr "lo spartito contiene errori; non lo elaborerò" -#: script-engraver.cc:68 +#: scores.cc:123 #, c-format -msgid "Don't know how to interpret articulation `%s'" +msgid "Now processing: `%s'\n" msgstr "" -#: sequential-music-iterator.cc:83 -msgid "Must stop before this music ends" +#: script-engraver.cc:65 +#, c-format +msgid "Don't know how to interpret articulation `%s'" msgstr "" #. this shouldn't happen, but let's continue anyway. -#: single-malt-grouping-item.cc:51 -msgid "Single_malt_grouping_item: I've been drinking too much" +#: separation-item.cc:48 +msgid "Separation_item: I've been drinking too much" +msgstr "" + +#: sequential-music-iterator.cc:83 +msgid "Must stop before this music ends" msgstr "" #: slur-engraver.cc:82 @@ -748,51 +722,46 @@ msgstr "non trovo le estremit msgid "slur" msgstr "" -#: slur.cc:231 +#: slur.cc:48 #, fuzzy msgid "Putting slur over rest. Ignoring." msgstr "Metto uno slur sulla pausa." -#: slur.cc:312 +#: slur.cc:122 #, fuzzy msgid "Slur over rest?" msgstr "Metto uno slur sulla pausa." -#: spanner.cc:35 spanner.cc:174 -#, fuzzy, c-format -msgid "Spanner `%s' has equal left and right spanpoints" -msgstr "I punti di span sinistro e destro dello spanner `%s' coincidono" - -#: stem-engraver.cc:124 +#: stem-engraver.cc:128 #, c-format msgid "Adding note head to incompatible stem (type = %d)" msgstr "" -#: stem.cc:118 +#: stem.cc:116 #, fuzzy msgid "Weird stem size; check for narrow beams" msgstr "dimensione del gambo poco ortodossa; check for narrow beams" -#: tfm-reader.cc:115 +#: tfm-reader.cc:105 #, c-format msgid "TFM header of `%s' has only %u word(s)" msgstr "" -#: tfm-reader.cc:153 +#: tfm-reader.cc:143 #, c-format msgid "%s: TFM file has %u parameters, which is more than the %u I can handle" msgstr "" -#: tfm.cc:70 +#: tfm.cc:71 #, fuzzy, c-format msgid "can't find ascii character: `%d'" msgstr "non riesco a trovare il carattere `%s'" -#: tie-engraver.cc:195 tie-performer.cc:109 +#: tie-engraver.cc:203 tie-performer.cc:109 msgid "No ties were created!" msgstr "" -#: tie.cc:80 +#: tie-engraver.cc:242 msgid "lonely tie" msgstr "" @@ -800,11 +769,17 @@ msgstr "" msgid "no one to print a tuplet start bracket" msgstr "" -#: time-signature-engraver.cc:28 +#: time-signature-engraver.cc:49 #, fuzzy msgid "lost in time:" msgstr "mi sono persa nel tempo" +#: time-signature-engraver.cc:50 translator-group.cc:419 +#: translator-group.cc:428 +#, fuzzy, c-format +msgid "can't find: `%s'" +msgstr "non trovo `%s'" + #: timing-translator.cc:36 msgid "conflicting timing request" msgstr "richieste di timing in conflitto" @@ -813,93 +788,109 @@ msgstr "richieste di timing in conflitto" msgid "This is the other timing request" msgstr "" -#: timing-translator.cc:78 +#: timing-translator.cc:79 #, fuzzy, c-format msgid "barcheck failed at: %s" msgstr "controllo del battute fallito: %s" -#: translator-ctors.cc:42 +#: translator-ctors.cc:41 #, fuzzy, c-format msgid "unknown translator: `%s'" msgstr "traduttore sconosciuto `%s'" -#: translator-group.cc:81 translator-group.cc:94 +#: translator-group.cc:82 translator-group.cc:95 msgid "Program has no such type" msgstr "" -#: translator-group.cc:85 translator-group.cc:100 +#: translator-group.cc:86 translator-group.cc:101 #, c-format msgid "Already contains: `%s'" msgstr "" -#: translator-group.cc:210 +#: translator-group.cc:213 #, c-format msgid "can't find or create `%s' called `%s'" msgstr "non trovo e non posso creare '%s' chiamato '%s'" -#: translator-group.cc:322 +#: translator-group.cc:325 #, fuzzy, c-format msgid "can't find or create: `%s'" msgstr "non trovo e non posso creare `%s'" -#: unfolded-repeat-iterator.cc:145 +#: unfolded-repeat-iterator.cc:146 msgid "no one to print a volta bracket" msgstr "" -#: parser.yy:58 +#: parser.yy:59 #, c-format msgid "Oldest supported input version: %s" msgstr "" -#: parser.yy:427 +#: parser.yy:426 msgid "Need a translator group for a context" msgstr "Ho bisogno di un gruppo di traduzione per un contesto" -#: parser.yy:448 +#: parser.yy:441 msgid "Wrong type for property value" msgstr "Tipo sbagliato per il valore di una proprietà" -#: parser.yy:694 +#: parser.yy:626 msgid "More alternatives than repeats. Junking excess alternatives." msgstr "" -#: parser.yy:739 +#: parser.yy:666 msgid "Second argument must be a symbol" msgstr "" -#: parser.yy:744 +#: parser.yy:671 msgid "First argument must be a procedure taking 1 argument" msgstr "" -#: parser.yy:1069 +#: parser.yy:971 +msgid "Expecting string as script definition" +msgstr "" + +#: parser.yy:981 msgid "Can't specify direction for this request" msgstr "" -#: parser.yy:1170 +#: parser.yy:1073 #, c-format msgid "Expecting %d arguments" msgstr "" -#: parser.yy:1193 parser.yy:1201 parser.yy:1443 +#: parser.yy:1089 +msgid "Must have 2 arguments for duration" +msgstr "" + +#: parser.yy:1096 parser.yy:1104 parser.yy:1339 #, fuzzy msgid "Have to be in Lyric mode for lyrics" msgstr "bisogna essere in Lyric mode per i testi" -#: parser.yy:1342 parser.yy:1362 +#: parser.yy:1245 parser.yy:1265 #, c-format msgid "not a duration: %d" msgstr "non è una durata: %d" -#: parser.yy:1371 +#: parser.yy:1274 #, fuzzy msgid "Have to be in Note mode for notes" msgstr "bisogna essere in Note mode per le note" -#: parser.yy:1459 +#: parser.yy:1352 #, fuzzy msgid "Have to be in Chord mode for chords" msgstr "bisogna essere in Chord mode per gli accordi" +#: parser.yy:1513 parser.yy:1531 +msgid "need integer number arg" +msgstr "" + +#: parser.yy:1517 +msgid "Must be positive integer" +msgstr "" + #: lexer.ll:158 msgid "EOF found inside a comment" msgstr "ho trovato un EOF in un commento" @@ -908,41 +899,45 @@ msgstr "ho trovato un EOF in un commento" msgid "\\maininput disallowed outside init files" msgstr "" -#: lexer.ll:202 -#, c-format -msgid "undefined identifier: `%s'" +#: lexer.ll:196 +#, fuzzy, c-format +msgid "wrong or undefined identifier: `%s'" msgstr "indentificatore non definito: `%s'" #. backup rule -#: lexer.ll:207 +#: lexer.ll:201 #, fuzzy msgid "Missing end quote" msgstr "apice finale mancante" #. backup rule -#: lexer.ll:229 lexer.ll:233 +#: lexer.ll:223 lexer.ll:227 msgid "white expected" msgstr "aspettavo uno spazio bianco" -#: lexer.ll:241 +#: lexer.ll:235 msgid "Can't evaluate Scheme in safe mode" msgstr "" -#: lexer.ll:436 +#: lexer.ll:431 #, fuzzy, c-format msgid "invalid character: `%c'" msgstr "carattere illegale: `%c'" -#: lexer.ll:494 +#: lexer.ll:508 #, c-format msgid "unknown escaped string: `\\%s'" msgstr "stringa di escape sconosciuta: `\\%s'" -#: lexer.ll:580 +#: lexer.ll:594 #, c-format msgid "incorrect mudela version: %s (%s, %s)" msgstr "versione di mudela errata: %s (%s, %s)" +#: lexer.ll:595 +msgid "Consider converting the input with the convert-mudela script" +msgstr "" + #: main.cc:91 #, fuzzy msgid "write exact durations, e.g.: a4*385/384" @@ -1131,6 +1126,35 @@ msgstr "% Generato automaticamente" msgid "% from input file: " msgstr "% dal file di input: " +#, fuzzy +#~ msgid "No key name, assuming `C'" +#~ msgstr "Nessuna armatura di chiave: assumo Do'" + +#, fuzzy +#~ msgid "Don't know how handle empty keys" +#~ msgstr "non so manipolare tasti vuoti" + +#, fuzzy +#~ msgid "out of tune:" +#~ msgstr "stonato" + +#, fuzzy +#~ msgid "ignore mudela version" +#~ msgstr "versione di mudela errata: %s (%s, %s)" + +#~ msgid "unknown paper variable: `%s'" +#~ msgstr "variabile paper sconosciuta: `%s'" + +#~ msgid "not a real variable" +#~ msgstr "non è una vera variabile" + +#~ msgid "no toplevel translator" +#~ msgstr "non c'è un traduttore di livello massimo" + +#, fuzzy +#~ msgid "Spanner `%s' has equal left and right spanpoints" +#~ msgstr "I punti di span sinistro e destro dello spanner `%s' coincidono" + #~ msgid "Debug output disabled. Compiled with NPRINT." #~ msgstr "L'output di debug è disabilitato. Compilato con NPRINT." diff --git a/po/ja.po b/po/ja.po index 5384961816..948b349c7f 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: 1999-09-16 20:29+0200\n" +"POT-Creation-Date: 2000-07-24 21:55+0200\n" "PO-Revision-Date: 2000-03-29 20:50+0900\n" "Last-Translator: Daisuke Yamashita \n" "Language-Team: Japanese \n" @@ -17,281 +17,259 @@ msgstr "" msgid "EOF in a string" msgstr "ʸ»úÎóÃæ¤Ë EOF ¤¬¤¢¤ê¤Þ¤¹" -#: data-file.cc:116 input.cc:86 midi-parser.cc:100 warn.cc:21 +#: data-file.cc:116 input.cc:85 midi-parser.cc:100 warn.cc:22 msgid "warning: " msgstr "·Ù¹ð: " -#: dstream.cc:158 +#: dstream.cc:187 msgid "not enough fields in Dstream init" msgstr "Dstream ½é´ü²½»þ¤Î¥Õ¥£¡¼¥ë¥É¤¬ÉÔ½½Ê¬" -#: flower-debug.cc:17 -msgid "Debug output disabled. Compiled with NPRINT." -msgstr "¥Ç¥Ð¥Ã¥°½ÐÎϤ¬Ìµ¸ú¤Ë¤µ¤ì¤Æ¤¤¤Þ¤¹¡£NPRINT ¤Ä¤­¤Ç¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤Þ¤·¤¿¡£" - -#: getopt-long.cc:141 -#, c-format -msgid "Option `%s' requires an argument" +#: getopt-long.cc:143 +#, fuzzy, c-format +msgid "option `%s' requires an argument" msgstr "¥ª¥×¥·¥ç¥ó `%s' ¤Ë¤Ï°ú¿ô¤¬É¬ÍפǤ¹" -#: getopt-long.cc:145 -#, c-format -msgid "Option `%s' doesn't allow an argument" +#: getopt-long.cc:147 +#, fuzzy, c-format +msgid "option `%s' doesn't allow an argument" msgstr "¥ª¥×¥·¥ç¥ó `%s' ¤Ï°ú¿ô¤òµö²Ä¤·¤Þ¤»¤ó" -#: getopt-long.cc:149 +#: getopt-long.cc:151 #, c-format msgid "unrecognized option: `%s'" msgstr "ǧ¼±¤Ç¤­¤Ê¤¤¥ª¥×¥·¥ç¥ó: `%s'" -#: getopt-long.cc:156 +#: getopt-long.cc:158 #, c-format msgid "invalid argument `%s' to option `%s'" msgstr "¥ª¥×¥·¥ç¥ó `%2$s' ¤ËÂФ¹¤ë̵¸ú¤Ê°ú¿ô `%1$s'" -#: text-stream.cc:8 -msgid "" -msgstr "" - -#: mapped-file-storage.cc:87 midi-stream.cc:77 mudela-stream.cc:104 -#: paper-stream.cc:25 scores.cc:38 simple-file-storage.cc:44 text-stream.cc:21 -#, c-format -msgid "Can't open file: `%s'" -msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤±¤Þ¤»¤ó: `%s'" - -#: input.cc:91 warn.cc:7 warn.cc:15 +#: input.cc:90 warn.cc:8 warn.cc:16 msgid "error: " msgstr "¥¨¥é¡¼: " -#: input.cc:97 -msgid "Non fatal error: " +#: input.cc:96 +#, fuzzy +msgid "non fatal error: " msgstr "³¹Ô²Äǽ¤Ê¥¨¥é¡¼: " -#: input.cc:105 source-file.cc:63 source-file.cc:156 +#: input.cc:104 source-file.cc:62 source-file.cc:155 msgid "position unknown" msgstr "°ÌÃÖ¤¬È½¤ê¤Þ¤»¤ó" #: mapped-file-storage.cc:74 -msgid "Can't map file" +#, fuzzy +msgid "can't map file" msgstr "¥Õ¥¡¥¤¥ë¤ò¥Þ¥Ã¥×¤Ç¤­¤Þ¤»¤ó" +#: mapped-file-storage.cc:87 midi-stream.cc:77 mudela-stream.cc:111 +#: paper-stream.cc:25 scores.cc:37 simple-file-storage.cc:44 text-stream.cc:22 +#, fuzzy, c-format +msgid "can't open file: `%s'" +msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤±¤Þ¤»¤ó: `%s'" + #: simple-file-storage.cc:56 #, c-format msgid "Huh? Got %d, expected %d characters" msgstr "¤Ï¡© %2$d ʸ»ú¤¢¤ë¤Ï¤º¤Ê¤Î¤Ë %1$d ʸ»ú¤·¤«¤Ê¤¤" -#: warn.cc:34 +#: text-stream.cc:9 +msgid "" +msgstr "" + +#: warn.cc:35 msgid "programming error: " msgstr "¥×¥í¥°¥é¥à¾å¤Î¥¨¥é¡¼: " -#: warn.cc:34 +#: warn.cc:35 msgid " (Continuing; cross thumbs)" msgstr " (³¤±¤Þ¤¹ -- cross thumbs)" -#: warn.cc:40 -msgid "programming warning: " -msgstr "¥×¥í¥°¥é¥à¾å¤Î·Ù¹ð: " +#: afm.cc:51 +#, fuzzy, c-format +msgid "can't find character number: %d" +msgstr "ʸ»úÈֹ椬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %d" -#: afm.cc:129 -#, c-format -msgid "Can't find character called: `%s'" +#: afm.cc:66 +#, fuzzy, c-format +msgid "can't find character called: `%s'" msgstr "¸Æ¤Ó½Ð¤µ¤ì¤¿Ê¸»ú¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'" -#: afm.cc:154 -#, c-format -msgid "Can't find character number: %d" -msgstr "ʸ»úÈֹ椬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %d" +#: afm.cc:96 +msgid "Error parsing AFM file" +msgstr "" -#: all-font-metrics.cc:69 lookup.cc:103 -#, c-format -msgid "Can't find font: `%s'" +#: all-font-metrics.cc:149 lookup.cc:80 +#, fuzzy, c-format +msgid "can't find font: `%s'" msgstr "¥Õ¥©¥ó¥È¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'" -#: all-font-metrics.cc:70 +#: all-font-metrics.cc:150 msgid "Loading default font" msgstr "¥Ç¥Õ¥©¥ë¥È¥Õ¥©¥ó¥È¤ò¥í¡¼¥É¤·¤Þ¤¹" -#: all-font-metrics.cc:75 -#, c-format -msgid "Can't find default font: `%s'" +#: all-font-metrics.cc:167 +#, fuzzy, c-format +msgid "can't find default font: `%s'" msgstr "¥Ç¥Õ¥©¥ë¥È¥Õ¥©¥ó¥È¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'" -#: all-font-metrics.cc:76 +#: all-font-metrics.cc:168 includable-lexer.cc:50 lookup.cc:81 scores.cc:108 #, c-format -msgid "(search path: `%s)'" +msgid "(search path: `%s')" msgstr "(¸¡º÷¥Ñ¥¹: `%s')" -#: all-font-metrics.cc:77 +#: all-font-metrics.cc:169 msgid "Giving up" msgstr "Äü¤á¤Þ¤·¤¿" -#: beam-engraver.cc:42 beam-engraver.cc:58 -msgid "no beam to end" -msgstr "ËöÈø¤Ø¤Î³Ã¤¬¤¢¤ê¤Þ¤»¤ó" +#: auto-change-iterator.cc:43 change-iterator.cc:60 +msgid "Can't switch translators, I'm there already" +msgstr "¥È¥é¥ó¥¹¥ì¡¼¥¿¤òÀÚ¤êÂؤ¨¤é¤ì¤Þ¤»¤ó¡£´û¤Ë¤½¤¦¤Ê¤Ã¤Æ¤¤¤Þ¤¹" -#: beam-engraver.cc:87 -msgid "Already have a Beam" +#: beam-engraver.cc:75 beam-engraver.cc:91 +msgid "can't find start of beam" +msgstr "" + +#: beam-engraver.cc:120 +#, fuzzy +msgid "already have a beam" msgstr "´û¤Ë³Ã¤¬¤¢¤ê¤Þ¤¹" -#: beam-engraver.cc:149 -msgid "unfinished beam" -msgstr "½ªÎ»¤µ¤ì¤Æ¤¤¤Ê¤¤³Ã" +#: beam-engraver.cc:177 +#, fuzzy +msgid "unterminated beam" +msgstr "½ªÃ¼¤Î¤Ê¤¤¥Ï¥¤¥Õ¥ó" -#: beam-engraver.cc:174 -msgid "Stem must have Rhythmic structure" +#: beam-engraver.cc:210 chord-tremolo-engraver.cc:172 +#, fuzzy +msgid "stem must have Rhythmic structure" msgstr "ÉäÈø¤Ï¥ê¥º¥à¹½Â¤¤ò»ý¤¿¤Í¤Ð¤Ê¤ê¤Þ¤»¤ó" -#: beam-engraver.cc:185 -msgid "Stem doesn't fit in beam" +#: beam-engraver.cc:221 +#, fuzzy +msgid "stem doesn't fit in beam" msgstr "ÉäÈø¤¬³Ã¤ÎÃæ¤Ë¤ª¤µ¤Þ¤ê¤Þ¤»¤ó" -#: beam-engraver.cc:186 -msgid "Beam was started here" +#: beam-engraver.cc:222 +#, fuzzy +msgid "beam was started here" msgstr "³Ã¤Ï¤³¤³¤«¤é³«»Ï¤µ¤ì¤Þ¤·¤¿" -#: beam.cc:147 -msgid "beam with less than two stems" +#: beam.cc:84 +#, fuzzy +msgid "beam has less than two stems" msgstr "³Ã¤¬Æó¤Ä̤Ëþ¤ÎÉäÈø¤È¤È¤â¤Ë»È¤ï¤ì¤Þ¤·¤¿" -#: beam.cc:312 +#: beam.cc:510 msgid "weird beam vertical offset" msgstr "¿âľÊý¸þ¤Î°ÌÃ֤Ȥ·¤Æ¤ª¤«¤·¤Ê³Ã" -#: break-algorithm.cc:28 -msgid "0 lines" -msgstr "0 ¹Ô" - -#: break-algorithm.cc:30 -#, c-format -msgid "1 line (of %.0f columns)" -msgstr "1 ¹Ô (%.0f ¥«¥é¥à)" - -#: break-algorithm.cc:32 -#, c-format -msgid "%d lines (with an average of %.1f columns)" -msgstr "%d ¹Ô (Ê¿¶Ñ %.1f ¥«¥é¥à)" - -#: break-algorithm.cc:155 -msgid "Score does not have any columns" -msgstr "ÉèÌ̤˥«¥é¥à¤¬¤¢¤ê¤Þ¤»¤ó" - -#: break-algorithm.cc:172 -#, c-format -msgid "approximated %s" -msgstr "¤ª¤ª¤è¤½ %s" - -#: break-algorithm.cc:174 -#, c-format -msgid "calculated %s exactly" -msgstr "Àµ³Î¤Ë·×»»¤µ¤ì¤¿ %s" - -#: break-algorithm.cc:175 -#, c-format -msgid "elapsed time %.2f seconds" -msgstr "%.2f É÷вá" +#: break-align-item.cc:119 +#, fuzzy, c-format +msgid "unknown spacing pair `%s', `%s'" +msgstr "Ƚ¤é¤Ê¤¤¥È¥é¥ó¥¹¥ì¡¼¥¿: `%s'" #: change-iterator.cc:22 -#, c-format -msgid "Can't change `%s' to `%s'" +#, fuzzy, c-format +msgid "can't change `%s' to `%s'" msgstr "`%s' ¤«¤é `%s' ¤ËÊѹ¹¤Ç¤­¤Þ¤»¤ó" -#: change-iterator.cc:57 -msgid "Can't switch translators, I'm there already" -msgstr "¥È¥é¥ó¥¹¥ì¡¼¥¿¤òÀÚ¤êÂؤ¨¤é¤ì¤Þ¤»¤ó¡£´û¤Ë¤½¤¦¤Ê¤Ã¤Æ¤¤¤Þ¤¹" - #. #. We could change the current translator's id, but that would make #. errors hard to catch #. #. last->translator_id_str_ = change_l ()->change_to_id_str_; #. -#: change-iterator.cc:76 +#: change-iterator.cc:79 msgid "I'm one myself" msgstr "¥È¥é¥ó¥¹¥ì¡¼¥¿¤½¤Î¤â¤Î¤Ç¤¹" -#: change-iterator.cc:79 +#: change-iterator.cc:82 msgid "none of these in my family" msgstr "¥Õ¥¡¥ß¥ê¤ÎÃæ¤Ë¤¢¤ê¤Þ¤»¤ó" -#: chord-tremolo-engraver.cc:41 chord-tremolo-engraver.cc:58 -msgid "no tremolo beam to end" -msgstr "ËöÈø¤Ø¤Î¥È¥ì¥â¥íµ­¹æ¤¬¤¢¤ê¤Þ¤»¤ó" - -#: chord-tremolo-engraver.cc:83 -msgid "Already have a tremolo beam" -msgstr "¤¹¤Ç¤Ë¥È¥ì¥â¥íµ­¹æ¤¬¤¢¤ê¤Þ¤¹" +#: chord-tremolo-engraver.cc:115 +#, fuzzy +msgid "unterminated chord tremolo" +msgstr "½ªÃ¼¤Î¤Ê¤¤¥Ï¥¤¥Õ¥ó" -#: chord-tremolo-engraver.cc:124 -msgid "unfinished tremolo beam" -msgstr "½ª¤ï¤Ã¤Æ¤¤¤Ê¤¤¥È¥ì¥â¥íµ­¹æ" +#: chord-tremolo-iterator.cc:42 +#, fuzzy +msgid "no one to print a tremolos" +msgstr "È¿Éüµ­¹æ¤òɽ¼¨¤¹¤ë¤â¤Î¤¬¤¢¤ê¤Þ¤»¤ó" -#: chord.cc:231 +#: chord.cc:152 #, c-format msgid "invalid subtraction: not part of chord: %s" msgstr "̵¸ú¤Ê°ú¤­»»: ¥³¡¼¥É¤Î°ìÉô¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó: %s" -#: chord.cc:245 +#: chord.cc:376 #, c-format msgid "invalid inversion pitch: not part of chord: %s" msgstr "̵¸ú¤Êž²ó¥Ô¥Ã¥Á: ¥³¡¼¥É¤Î°ìÉô¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó: %s" -#: clef-engraver.cc:178 +#: clef-engraver.cc:167 msgid "unknown clef type" msgstr "ÉÔÌÀ¤Ê²»Éôµ­¹æ(Clef)" -#: collision.cc:95 +#: collision.cc:118 msgid "Too many clashing notecolumns. Ignoring them." msgstr "Äà¤ê¹ç¤ï¤Ê¤¤²»É䤬¿¤¹¤®¤Þ¤¹¡£¤½¤ì¤é¤ò̵»ë¤·¤Þ¤¹¡£" -#: crescendo.cc:42 +#: crescendo.cc:65 msgid "crescendo" msgstr "¥¯¥ì¥Ã¥·¥§¥ó¥É" -#: crescendo.cc:42 +#: crescendo.cc:65 msgid "too small" msgstr "¾®¤µ¤¹¤®¤Þ¤¹" -#: debug.cc:56 +#: cross-staff.cc:22 +#, fuzzy +msgid "" +"minVerticalAlign != maxVerticalAlign: cross staff spanners may be broken" +msgstr "" +"minVerticalAlign != maxVerticalAlign: ÆâÉôŪ¤Ê beams/slurs ¤¬²õ¤ì¤Þ¤·¤¿" + +#: debug.cc:26 msgid "floating point exception" msgstr "ÉâÆ°¾®¿ôÅÀÎã³°" -#: debug.cc:139 -msgid "Can't set mem-checking!" +#: debug.cc:50 +#, fuzzy +msgid "can't set mem-checking!" msgstr "¥á¥â¥ê¥Á¥§¥Ã¥¯¤òÀßÄê¤Ç¤­¤Þ¤»¤ó" #: dimensions.cc:13 msgid "NaN" msgstr "NaN" -#: dynamic-engraver.cc:109 -msgid "Got a dynamic already. Continuing dazed and confused." -msgstr "´û¤ËưŪ¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£º®Í𤷤¿¤Þ¤Þ³¤±¤Þ¤¹¡£" - -#: dynamic-engraver.cc:162 -msgid "Can't find (de)crescendo to end" +#: dynamic-engraver.cc:184 span-dynamic-performer.cc:87 +#, fuzzy +msgid "can't find start of (de)crescendo" msgstr "ËöÈø¤Ø¤Î(¥Ç)¥¯¥ì¥Ã¥·¥§¥ó¥É¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó" -#: dynamic-engraver.cc:216 -msgid "Too many crescendi here" -msgstr "¤³¤³¤Î¥¯¥ì¥Ã¥·¥§¥ó¥É¤¬Â¿¤¹¤®¤Þ¤¹" - -#: dynamic-engraver.cc:254 -msgid "unended crescendo" -msgstr "½ªÎ»¤·¤Æ¤¤¤Ê¤¤¥¯¥ì¥Ã¥·¥§¥ó¥É" +#: dynamic-engraver.cc:203 +#, fuzzy +msgid "already have a crescendo" +msgstr "´û¤Ë³Ã¤¬¤¢¤ê¤Þ¤¹" -#: encompass-info.cc:32 -msgid "Slur over rest?" -msgstr "¥¹¥é¡¼¤¬µÙÉä¤ò¤Þ¤¿¤¤¤Ç¤¤¤ë?" +#: dynamic-engraver.cc:204 +#, fuzzy +msgid "already have a decrescendo" +msgstr "´û¤Ë³Ã¤¬¤¢¤ê¤Þ¤¹" -#: encompass-info.cc:67 stem-info.cc:140 -msgid "minVerticalAlign != maxVerticalAlign: interstaff beams/slurs may be broken" -msgstr "minVerticalAlign != maxVerticalAlign: ÆâÉôŪ¤Ê beams/slurs ¤¬²õ¤ì¤Þ¤·¤¿" +#: dynamic-engraver.cc:289 +#, fuzzy +msgid "unterminated (de)crescendo" +msgstr "½ªÎ»¤·¤Æ¤¤¤Ê¤¤¥¯¥ì¥Ã¥·¥§¥ó¥É" -#: extender-engraver.cc:62 +#: extender-engraver.cc:98 msgid "unterminated extender" msgstr "½ªÃ¼¤Î¤Ê¤¤¥¨¥¯¥¹¥Æ¥ó¥À" -#: extender-engraver.cc:74 +#: extender-engraver.cc:110 msgid "Nothing to connect extender to on the left. Ignoring extender request." msgstr "¥¨¥¯¥¹¥Æ¥ó¥À¤¬º¸Â¦¤Ë¤Ä¤Ê¤¬¤ê¤Þ¤»¤ó¡£¥¨¥¯¥¹¥Æ¥ó¥ÀÍ×µá¤ò̵»ë¤·¤Þ¤¹¡£" @@ -299,205 +277,184 @@ msgstr " msgid "no one to print a repeat brace" msgstr "È¿Éüµ­¹æ¤òɽ¼¨¤¹¤ë¤â¤Î¤¬¤¢¤ê¤Þ¤»¤ó" +#: gourlay-breaking.cc:157 +msgid "No feasible line breaking found" +msgstr "" + #: grace-iterator.cc:43 msgid "no Grace context available" msgstr "Áõ¾þ¥³¥ó¥Æ¥­¥¹¥È¤¬¤¢¤ê¤Þ¤»¤ó" -#: grace-position-engraver.cc:89 +#: grace-position-engraver.cc:94 msgid "Unattached grace notes. Attaching to last musical column." msgstr "Áõ¾þ²»É䤬¤Ä¤±¤é¤ì¤Þ¤»¤ó¤Ç¤·¤¿¡£Ä¾Á°¤Î¥«¥é¥à¤Ë¤Ä¤±¤Þ¤¹" -#: hyphen-engraver.cc:60 +#: hyphen-engraver.cc:90 msgid "unterminated hyphen" msgstr "½ªÃ¼¤Î¤Ê¤¤¥Ï¥¤¥Õ¥ó" -#: hyphen-engraver.cc:72 +#: hyphen-engraver.cc:102 msgid "Nothing to connect hyphen to on the left. Ignoring hyphen request." msgstr "º¸Â¦¤Ë·Ò¤²¤ë¥Ï¥¤¥Õ¥ó¤¬¤¢¤ê¤Þ¤»¤ó¡£¥Ï¥¤¥Õ¥ó¤ÎÍ×µá¤ò̵»ë¤·¤Þ¤¹" -#: identifier.cc:46 +#: identifier.cc:49 #, c-format msgid "wrong identifier type, expected: `%s'" msgstr "´Ö°ã¤Ã¤¿¼±Ê̻ҷ¿¡¢¤³¤³¤ËÍè¤ë¤Ù¤­¤â¤Î¤Ï: `%s'" -#: includable-lexer.cc:47 lily-guile.cc:82 lily-guile.cc:105 -#: midi-score-parser.cc:24 scores.cc:108 scores.cc:114 -#, c-format -msgid "Can't find file: `%s'" +#: includable-lexer.cc:48 lily-guile.cc:117 midi-score-parser.cc:24 +#: scores.cc:107 scores.cc:113 +#, fuzzy, c-format +msgid "can't find file: `%s'" msgstr "¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'" -#: includable-lexer.cc:49 lookup.cc:104 scores.cc:109 -#, c-format -msgid "(search path: `%s')" -msgstr "(¸¡º÷¥Ñ¥¹: `%s')" - -#: ineq-constrained-qp.cc:169 -#, c-format -msgid "Ineq_constrained_qp::solve (): Constraint off by %f" -msgstr "Ineq_constrained_qp::solve (): À©¸Â¤ò %f ¤Ç²ò½ü" - -#: ineq-constrained-qp.cc:233 -msgid "Didn't converge!" -msgstr "¼ý«¤·¤Þ¤»¤ó¤Ç¤·¤¿!" - -#: ineq-constrained-qp.cc:235 -msgid "too much degeneracy" -msgstr "¾®¤µ¤¹¤®¤Þ¤¹" - -#: key-def.cc:31 -msgid "No key name, assuming `C'" -msgstr "¥­¡¼Ì¾¤¬¤¢¤ê¤Þ¤»¤ó¡¢`C' ¤ò»î¤ß¤Þ¤¹" - -#: key-def.cc:92 -msgid "Don't know how handle empty keys" -msgstr "¶õ¤Î¥­¡¼¤Î°·¤¤Êý¤¬È½¤ê¤Þ¤»¤ó" - -#: key-engraver.cc:70 key-performer.cc:65 +#: key-engraver.cc:92 key-performer.cc:54 msgid "FIXME: key change merge" msgstr "FIXME: ¥­¡¼Êѹ¹¤Î¥Þ¡¼¥¸" -#: key.cc:54 key.cc:59 -#, c-format -msgid "Don't have that many octaves (%s)" -msgstr "¤½¤ó¤Ê¤ËÂô»³¤Î¥ª¥¯¥¿¡¼¥Ö (%s) ¤ò»È¤ï¤Ê¤¤¤Ç¤¯¤À¤µ¤¤" - -#: key.cc:77 -#, c-format -msgid "underdone accidentals (%s)" -msgstr "¥Õ¥é¥Ã¥È¤¬Â¿¤¹¤®¤Þ¤¹ (%s)" - -#: key.cc:82 -#, c-format -msgid "overdone accidentals (%s)" -msgstr "¥·¥ã¡¼¥×¤¬Â¿¤¹¤®¤Þ¤¹ (%s)" - -#: lily-guile.cc:84 lily-guile.cc:107 +#: lily-guile.cc:119 #, c-format msgid "(load path: `%s')" msgstr "(Æɹþ¥Ñ¥¹: `%s')" -#: line-of-score.cc:91 -msgid "Huh? Empty Line_of_score?" -msgstr "¤Ï? ÉèÌ̤ιԤ¬¶õ?" - -#: local-key-engraver.cc:42 -msgid "out of tune:" -msgstr "Èϰϳ°¤ÎÄ´:" +#: line-of-score.cc:96 +#, c-format +msgid "Element count %d." +msgstr "" -#: local-key-engraver.cc:43 time-signature-engraver.cc:29 -#: translator-group.cc:437 translator-group.cc:446 +#: line-of-score.cc:255 paper-score.cc:79 #, c-format -msgid "Can't find: `%s'" -msgstr "¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'" +msgid "Element count %d " +msgstr "" -#: lookup.cc:105 +#: line-of-score.cc:269 +msgid "Calculating column positions..." +msgstr "¥«¥é¥à°ÌÃÖ¤ò·×»»Ãæ..." + +#: lookup.cc:82 msgid "Aborting" msgstr "½ªÎ»¤·¤Þ¤¹" -#: lookup.cc:436 +#: lookup.cc:223 #, c-format msgid "Non-matching braces in text `%s', adding braces" msgstr "¥Æ¥­¥¹¥È `%s' Ãæ¤Ë°ìÃפ¹¤ë¥Ö¥ì¡¼¥¹¤¬¤¢¤ê¤Þ¤»¤ó¡£¥Ö¥ì¡¼¥¹¤òÄɲä·¤Þ¤¹" -#: main.cc:71 main.cc:91 +#: lyric-phrasing-engraver.cc:147 +msgid "lyrics found without matching notehead ... aligning on self" +msgstr "" + +#: main.cc:75 main.cc:92 msgid "enable debugging output" msgstr "¥Ç¥Ð¥Ã¥°½ÐÎϤòÍ­¸ú" -#: main.cc:72 +#: main.cc:76 msgid "EXT" msgstr "EXT" -#: main.cc:72 -msgid "use output format EXT" +#: main.cc:76 +#, fuzzy +msgid "use output format EXT (scm, ps, tex or as)" msgstr "½ÐÎÏ¥Õ¥©¡¼¥Þ¥Ã¥È EXT ¤ò»È¤¦" -#: main.cc:73 main.cc:92 +#: main.cc:77 main.cc:93 msgid "this help" msgstr "¤³¤Î¥Ø¥ë¥×" -#: main.cc:74 +#: main.cc:78 msgid "DIR" msgstr "DIR" -#: main.cc:74 +#: main.cc:78 msgid "add DIR to search path" msgstr "DIR ¤ò¸¡º÷¥Ñ¥¹¤ËÄɲÃ" -#: main.cc:75 main.cc:95 +#: main.cc:79 main.cc:96 msgid "FILE" msgstr "FILE" -#: main.cc:75 +#: main.cc:79 msgid "use FILE as init file" msgstr "FILE ¤ò½é´ü²½¥Õ¥¡¥¤¥ë¤È¤·¤Æ»ÈÍÑ" -#: main.cc:76 +#: main.cc:80 msgid "write Makefile dependencies for every input file" msgstr "Á´¤Æ¤ÎÆþÎÏ¥Õ¥¡¥¤¥ë¤Î Makefile °Í¸´Ø·¸¤ò½ñ¤­¹þ¤à" -#: main.cc:77 +#: main.cc:81 msgid "produce MIDI output only" msgstr "MIDI ½ÐÎϤÎÀ¸À®¤Î¤ß" -#: main.cc:78 +#: main.cc:82 msgid "BASENAME" msgstr "BASENAME" -#: main.cc:78 +#: main.cc:82 msgid "write output to BASENAME[-x].extension" msgstr "BASENAME[-x].³ÈÄ¥»Ò ¤Ø½ÐÎϤò½ñ¤­¹þ¤à" -#: main.cc:79 +#: main.cc:83 msgid "show all changes in relative syntax" msgstr "´ØÏ¢¤¹¤ëʸˡ¤«¤éÁ´¤Æ¤ÎÊѹ¹¤òɽ¼¨" -#: main.cc:80 +#: main.cc:84 msgid "inhibit file output naming and exporting" msgstr "̾Á°ÉÕ¤±¤È¥¨¥¯¥¹¥Ý¡¼¥È¤Î½ÐÎÏ¥Õ¥¡¥¤¥ë¤òÍÞÀ©¤¹¤ë" -#: main.cc:81 main.cc:99 +#: main.cc:85 main.cc:100 msgid "don't timestamp the output" msgstr "½ÐÎϤ˥¿¥¤¥à¥¹¥¿¥ó¥×¤ò¤Ä¤±¤Ê¤¤" -#: main.cc:82 +#: main.cc:86 msgid "switch on experimental features" msgstr "¼Â¸³Åª¤Êµ¡Ç½¤òÍ­¸ú¤Ë¤¹¤ë" -#: main.cc:83 -msgid "ignore mudela version" -msgstr "mudela ¤Î¥Ð¡¼¥¸¥ç¥ó¤ò̵»ë¤¹¤ë" - -#: main.cc:84 main.cc:100 +#: main.cc:87 main.cc:101 msgid "print version number" msgstr "¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤òɽ¼¨" -#: main.cc:85 main.cc:102 +#: main.cc:88 +#, fuzzy +msgid "verbose" +msgstr "¾ÜºÙ¤Ê¾ðÊó¤òɽ¼¨¤·¤Þ¤¹" + +#: main.cc:89 main.cc:103 msgid "show warranty and copyright" msgstr "ÊݾڤÈÃøºî¸¢¤Ë¤Ä¤¤¤Æɽ¼¨¤¹¤ë" -#: main.cc:92 +#: main.cc:105 #, c-format msgid "Usage: %s [OPTION]... [FILE]..." msgstr "»È¤¤Êý: %s [¥ª¥×¥·¥ç¥ó]... [¥Õ¥¡¥¤¥ë]..." -#: main.cc:94 +#: main.cc:107 msgid "Typeset music and or play MIDI from FILE" msgstr "¥Õ¥¡¥¤¥ë¤Î³Ú¶Ê¤òÁÈÈǤ·¤¿¤ê¡¢MIDI ±éÁÕ¤·¤¿¤ê¤¹¤ë" -#: main.cc:100 main.cc:115 +#: main.cc:111 +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 "" +"LilyPond ¤Ï³Ú¶ÊÁÈÈÇ¥½¥Õ¥È¤Ç¤¹¡£ÆþÎÏ¥Õ¥¡¥¤¥ë¤Ë¤Ï¥Ï¥¤¥ì¥Ù¥ë¤Êµ­½Ò¤ò»ÈÍѤǤ­¡¢\n" +"Èþ¤·¤¤ÉèÌ̤òºîÀ®¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£LilyPond ¤Ï GNU " +"¥×¥í¥¸¥§¥¯¥È¤Î°ìÉô¤Ç¤¹¡£\n" + +#: main.cc:116 main.cc:117 msgid "Options:" msgstr "¥ª¥×¥·¥ç¥ó:" -#: main.cc:104 +#: main.cc:121 msgid "This binary was compiled with the following options:" msgstr "¤³¤Î¥Ð¥¤¥Ê¥ê¤Ï°Ê²¼¤Î¥ª¥×¥·¥ç¥óÉÕ¤­¤Ç¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤Þ¤·¤¿" -#: main.cc:119 main.cc:123 +#: main.cc:120 main.cc:140 #, c-format msgid "Report bugs to %s" msgstr "¥Ð¥°¥ì¥Ý¡¼¥È¤Ï %s ¤Ø" -#: main.cc:52 main.cc:137 +#: main.cc:53 main.cc:148 #, c-format msgid "" "This is free software. It is covered by the GNU General Public License,\n" @@ -513,17 +470,17 @@ msgstr "" "¤³¤ì¤ò²þÊѤ·¤¿¤ê¡¢Ê£À½¤òÇÛÉÛ¤·¤¿¤ê¤¹¤ë»ö¤Ï´¿·Þ¤µ¤ì¤Þ¤¹¡£\n" "`--warranty' ¥ª¥×¥·¥ç¥óÉÕ¤­¤Çµ¯Æ°¤¹¤ë¤È¡¢¤è¤ê¾ÜºÙ¤Ê¾ðÊó¤¬ÆÀ¤é¤ì¤Þ¤¹¡£\n" -#: main.cc:59 main.cc:144 main.cc:156 +#: main.cc:60 main.cc:155 main.cc:167 #, c-format msgid "Copyright (c) %s by" msgstr "Copyright (c) %s by" #. GNU GNU? -#: main.cc:154 +#: main.cc:165 msgid "GNU LilyPond -- The GNU Project music typesetter" msgstr "GNU LilyPond -- The GNU Project music typesetter" -#: main.cc:68 main.cc:162 +#: main.cc:69 main.cc:173 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" @@ -554,33 +511,37 @@ msgstr "" "USA.\n" "\n" "-- »²¹ÍÌõ\n" -" ¤³¤Î¥×¥í¥°¥é¥à¤Ï¡¢¥Õ¥ê¡¼¥½¥Õ¥È¥¦¥§¥¢¤Ç¤¹¡£¤¢¤Ê¤¿¤Ï Free Software Foundation\n" -"¤¬¸øɽ¤·¤¿ GNU °ìÈ̸øÍ­»ÈÍѵöÂú¤Î¥Ð¡¼¥¸¥ç¥ó 2 ¤Î¾ò¹à¤Ë´ð¤Å¤¤¤Æ¡¢¤³¤Î¥×¥í¥°¥é\n" +" ¤³¤Î¥×¥í¥°¥é¥à¤Ï¡¢¥Õ¥ê¡¼¥½¥Õ¥È¥¦¥§¥¢¤Ç¤¹¡£¤¢¤Ê¤¿¤Ï Free Software " +"Foundation\n" +"¤¬¸øɽ¤·¤¿ GNU °ìÈ̸øÍ­»ÈÍѵöÂú¤Î¥Ð¡¼¥¸¥ç¥ó 2 " +"¤Î¾ò¹à¤Ë´ð¤Å¤¤¤Æ¡¢¤³¤Î¥×¥í¥°¥é\n" "¥à¤òºÆÈÒÉÛ¤Þ¤¿¤ÏÊѹ¹¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£\n" "\n" -"¤³¤Î¥×¥í¥°¥é¥à¤ÏÍ­ÍѤȤϻפ¤¤Þ¤¹¤¬¡¢ÈÒÉÛ¤ËÅö¤¿¤Ã¤Æ¤Ï¡¢»Ô¾ìÀ­µÚ¤ÓÆÃÄêÌÜŪŬ¹ç\n" -"À­¤Ë¤Ä¤¤¤Æ¤Î°ÅÌÛ¤ÎÊݾڤâ´Þ¤á¤Æ¡¢¤¤¤«¤Ê¤ëÊݾڤâ¹Ô¤Ê¤¤¤Þ¤»¤ó¡£¾ÜºÙ¤Ë¤Ä¤¤¤Æ¤Ï¡¢\n" +"¤³¤Î¥×¥í¥°¥é¥à¤ÏÍ­ÍѤȤϻפ¤¤Þ¤¹¤¬¡¢ÈÒÉÛ¤ËÅö¤¿¤Ã¤Æ¤Ï¡¢»Ô¾ìÀ­µÚ¤ÓÆÃÄêÌÜŪŬ¹ç" +"\n" +"À­¤Ë¤Ä¤¤¤Æ¤Î°ÅÌÛ¤ÎÊݾڤâ´Þ¤á¤Æ¡¢¤¤¤«¤Ê¤ëÊݾڤâ¹Ô¤Ê¤¤¤Þ¤»¤ó¡£¾ÜºÙ¤Ë¤Ä¤¤¤Æ¤Ï¡¢" +"\n" "GNU °ìÈ̸øÍ­»ÈÍѵöÂú½ñ¤ò¤ªÆɤ߲¼¤µ¤¤¡£\n" "\n" "¤¢¤Ê¤¿¤Ï¡¢¤³¤Î¥×¥í¥°¥é¥à¤È°ì½ï¤Ë GNU °ìÈ̸øÍ­»ÈÍѵöÂú½ñ¤ò¼õ¤±¼è¤Ã¤Æ¤¤¤ë¤Ï¤º\n" "¤Ç¤¹(COPYING ¥Õ¥¡¥¤¥ë¤ò»²¾È)¡£¤½¤¦¤Ç¤Ê¤¤¾ì¹ç¤Ï¡¢Free Software Foundation,\n" "Inc., 675 Mass Ave, Cambridge, MA 02139, USA ¤Ë¼ê»æ¤ò½ñ¤¤¤Æ¤¯¤À¤µ¤¤¡£\n" -#: midi-item.cc:303 +#: midi-item.cc:310 #, c-format msgid "no such instrument: `%s'" msgstr "¤½¤ÎÍͤʳڴï¤Ï¤¢¤ê¤Þ¤»¤ó: `%s'" -#: midi-item.cc:357 +#: midi-item.cc:365 #, c-format msgid "unconventional key: flats: %d, sharps: %d" msgstr "´·½¬¤Ë¹ç¤ï¤Ê¤¤¥­¡¼¤Ç¤¹: ¥Õ¥é¥Ã¥È: %d ¸Ä, ¥·¥ã¡¼¥× %d ¸Ä" -#: midi-item.cc:402 +#: midi-item.cc:412 msgid "silly duration" msgstr "Çϼ¯¤²¤¿²»Ä¹" -#: midi-item.cc:415 +#: midi-item.cc:425 msgid "silly pitch" msgstr "Çϼ¯¤²¤¿¥Ô¥Ã¥Á" @@ -588,13 +549,13 @@ msgstr " msgid "Error syncing file (disk full?)" msgstr "¥Õ¥¡¥¤¥ë¤ÎƱĴ¥¨¥é¡¼ (¥Ç¥£¥¹¥¯¤¬°ìÇÕ?)" -#: music-output-def.cc:56 +#: music-output-def.cc:51 msgid "Interpretation context with empty type" msgstr "¶õ¥¿¥¤¥×¤Î²ò¼á¥³¥ó¥Æ¥­¥¹¥È" -#: music-output-def.cc:83 -#, c-format -msgid "Can't find `%s' context" +#: music-output-def.cc:78 +#, fuzzy, c-format +msgid "can't find `%s' context" msgstr "`%s' ¥³¥ó¥Æ¥­¥¹¥È¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó" #: musical-request.cc:42 @@ -602,81 +563,40 @@ msgstr "`%s' msgid "Transposition by %s makes accidental larger than two" msgstr "%s ¤ÎÊÑÄ´¤Ë¤è¤Ã¤Æ¡¢Æó¤Ä¤òĶ¤¨¤ëÇÉÀ¸²»¤¬ºî¤é¤ì¤Þ¤·¤¿" -#: my-lily-lexer.cc:137 -#, c-format -msgid "redeclaration of `\\%s'" -msgstr "`\\%s' ¤ÎºÆÀë¸À" - -#: my-lily-lexer.cc:143 +#: my-lily-lexer.cc:118 #, c-format msgid "Identifier name is a keyword: `%s'" msgstr "¼±ÊÌ»Ò̾¤Ï¥­¡¼¥ï¡¼¥É¤Ç¤¹: `%s'" -#: my-lily-lexer.cc:172 +#: my-lily-lexer.cc:137 #, c-format msgid "error at EOF: %s" msgstr "EOF ¤Î¤È¤³¤í¤Ç¥¨¥é¡¼: %s" -#: midi-score-parser.cc:94 my-lily-parser.cc:60 +#: midi-score-parser.cc:94 my-lily-parser.cc:55 msgid "Parsing..." msgstr "¹½Ê¸²òÀÏÃæ..." -#: my-lily-parser.cc:69 +#: my-lily-parser.cc:63 msgid "Braces don't match" msgstr "¥Ö¥ì¡¼¥¹¤¬°ìÃפ·¤Þ¤»¤ó" -#: p-col.cc:48 -msgid "Must set spring between differing columns" -msgstr "°Û¤Ê¤ë¥«¥é¥à¤Î´Ö¤Ë spring ¤ò¥»¥Ã¥È¤·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó" - -#: paper-def.cc:95 -#, c-format -msgid "unknown paper variable: `%s'" -msgstr "paper ÊÑ¿ô¤ÎÃͤ¬È½¤ê¤Þ¤»¤ó: `%s'" - -#: paper-def.cc:99 -msgid "not a real variable" -msgstr "Ãͤ¬¼Â¿ô¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó" - -#. for now; breaks -fscm output -#: paper-def.cc:251 -msgid "Outputting Score, defined at: " -msgstr "ÉèÌ̤ò½ÐÎϤ·¤Þ¤¹¡£¤³¤³¤ÇÄêµÁ: " - -#: paper-def.cc:280 +#: paper-def.cc:149 #, c-format msgid "paper output to %s..." msgstr "%s ¤Ø paper ½ÐÎÏ..." -#: mudela-stream.cc:86 paper-outputter.cc:76 performance.cc:97 +#: mudela-stream.cc:93 paper-outputter.cc:91 performance.cc:97 msgid ", at " msgstr ", at " -#: paper-outputter.cc:130 -#, c-format -msgid "improbable offset for object type: `%s'" -msgstr "¥ª¥Ö¥¸¥§¥¯¥È·¿¤Ë¤È¤Ã¤Æ¤¢¤ê¤½¤¦¤Ë¤Ê¤¤¥ª¥Õ¥»¥Ã¥È: `%s'" - -#: paper-score.cc:131 -msgid "Can't solve this casting problem exactly; reverting to Word_wrap" -msgstr "Àµ³Î¤Ë¥­¥ã¥¹¥È¤ò²ò·è¤Ç¤­¤Þ¤»¤ó -- Word_wrap ¤ËÉüµ¢¤·¤Þ¤¹" - -#: paper-score.cc:156 +#: paper-score.cc:82 msgid "Preprocessing elements..." msgstr "Í×ÁǤòÁ°½èÍýÃæ..." -#: paper-score.cc:160 -msgid "Calculating column positions..." -msgstr "¥«¥é¥à°ÌÃÖ¤ò·×»»Ãæ..." - -#: paper-score.cc:179 -#, c-format -msgid "%s elements" -msgstr "%s ¸Ä¤ÎÍ×ÁÇ" - -#: paper-score.cc:182 -msgid "Line ... " -msgstr "¹Ô ..." +#: paper-score.cc:107 +msgid "Outputting Score, defined at: " +msgstr "ÉèÌ̤ò½ÐÎϤ·¤Þ¤¹¡£¤³¤³¤ÇÄêµÁ: " #: performance.cc:50 msgid "Track ... " @@ -701,402 +621,368 @@ msgstr " msgid "MIDI output to %s..." msgstr "%s ¤Ø¤Î MIDI ½ÐÎÏ" -#: qlpsolve.cc:88 qlpsolve.cc:139 -msgid "degenerate constraints" -msgstr "À©¸Â¤ò´ËÏÂ" +#: piano-pedal-engraver.cc:157 piano-pedal-engraver.cc:169 +#: piano-pedal-performer.cc:87 +#, fuzzy, c-format +msgid "can't find start of piano pedal: %s" +msgstr "¸Æ¤Ó½Ð¤µ¤ì¤¿Ê¸»ú¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'" + +#: property-engraver.cc:128 +#, fuzzy +msgid "Wrong type for property" +msgstr "°À­ÃͤؤΥ¿¥¤¥×¤¬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹" -#: repeat-engraver.cc:177 +#: repeat-engraver.cc:253 msgid "No bar engraver found. Ignoring repeats." msgstr "¾®À᤬¸«¤Ä¤«¤ê¤Þ¤»¤ó¡£È¿Éü¤ò̵»ë¤·¤Þ¤¹¡£" -#: request-chord-iterator.cc:73 +#: request-chord-iterator.cc:72 #, c-format msgid "Junking request: `%s'" msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'" -#: request-chord-iterator.cc:76 +#: request-chord-iterator.cc:75 #, c-format msgid "Huh? Not a Request: `%s'" msgstr "¤Ï? Í×µá¤Ç¤Ï¤Ê¤¤: `%s'" -#: rest-collision.cc:64 +#: request-iterator.cc:20 +#, fuzzy, c-format +msgid "Junking music: `%s'" +msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'" + +#: rest-collision.cc:159 msgid "too many colliding rests" msgstr "µÙÉä¤Î¾×Æͤ¬Â¿¤¹¤®¤Þ¤¹" -#: rest-collision.cc:68 +#: rest-collision.cc:163 msgid "too many notes for rest collision" msgstr "µÙÉä¤Î¾×ÆͤËÂФ·¤Æ²»É䤬¿¤¹¤®¤Þ¤¹" -#: score-engraver.cc:149 +#: score-engraver.cc:151 #, c-format msgid "unbound spanner `%s'" msgstr "ÊĤ¸¤Æ¤¤¤Ê¤¤¥¹¥Ñ¥Ê `%s'" -#: score.cc:56 -msgid "no toplevel translator" -msgstr "ºÇ¾å°Ì¤Î¥È¥é¥ó¥¹¥ì¡¼¥¿¤¬¤¢¤ê¤Þ¤»¤ó" - -#: score.cc:59 +#: score.cc:67 msgid "Interpreting music..." msgstr "³Ú¶Ê¤Î²ò¼áÃæ..." -#: score.cc:70 +#: score.cc:81 msgid "Need music in a score" msgstr "³ÚÉè¤Ë¤Ï³Ú¶Ê¤¬É¬ÍפǤ¹" #. should we? hampers debugging. -#: score.cc:83 +#: score.cc:94 msgid "Errors found/*, not processing score*/" msgstr "¥¨¥é¡¼¤òȯ¸«/*, ³ÚÉè¤ò½èÍý¤·¤Þ¤»¤ó*/" -#: score.cc:88 +#: score.cc:100 #, c-format msgid "elapsed time: %.2f seconds" msgstr "·Ð²á»þ´Ö: %.2f ÉÃ" -#: scores.cc:35 -#, c-format -msgid "Writing dependency file: `%s'..." +#: scores.cc:34 +#, fuzzy, c-format +msgid "Writing dependency file: `%s'...\n" msgstr "°Í¸´Ø·¸¥Õ¥¡¥¤¥ë¤Î½ñ¤­¹þ¤ß: `%s'..." -#: scores.cc:79 +#: scores.cc:78 msgid "Score contains errors; will not process it" msgstr "³ÚÉè¤Ë¥¨¥é¡¼¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹ -- ½èÍý¤·¤Þ¤»¤ó" -#: script-engraver.cc:49 +#: scores.cc:123 +#, c-format +msgid "Now processing: `%s'\n" +msgstr "" + +#: script-engraver.cc:65 #, c-format msgid "Don't know how to interpret articulation `%s'" msgstr "²»Àá `%s' ¤Î²ò¼áÊýË¡¤¬È½¤ê¤Þ¤»¤ó" -#: sequential-music-iterator.cc:82 -msgid "Must stop before this music ends" -msgstr "¤³¤Î³Ú¶Ê¤Î½ª¤ï¤ê¤Þ¤Ç¤Ë»ß¤á¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó" - #. this shouldn't happen, but let's continue anyway. -#: single-malt-grouping-item.cc:43 -msgid "Single_malt_grouping_item: I've been drinking too much" +#: separation-item.cc:48 +#, fuzzy +msgid "Separation_item: I've been drinking too much" msgstr "Single_malt_grouping_item: °û¤ß¤¹¤®¤Á¤ã¤Ã¤¿" -#: slur-engraver.cc:64 +#: sequential-music-iterator.cc:83 +msgid "Must stop before this music ends" +msgstr "¤³¤Î³Ú¶Ê¤Î½ª¤ï¤ê¤Þ¤Ç¤Ë»ß¤á¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó" + +#: slur-engraver.cc:82 msgid "unterminated slur" msgstr "½ªÃ¼¤µ¤ì¤Æ¤¤¤Ê¤¤¥¹¥é¡¼" -#: slur-engraver.cc:80 -#, c-format -msgid "Can't find both ends of %s" +#: slur-engraver.cc:98 +#, fuzzy, c-format +msgid "can't find both ends of %s" msgstr "%s ¤Îξü¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó" -#: slur-engraver.cc:80 +#: slur-engraver.cc:98 msgid "slur" msgstr "¥¹¥é¡¼" -#: slur.cc:38 +#: slur.cc:48 msgid "Putting slur over rest. Ignoring." msgstr "µÙÉä¤ò¤Þ¤¿¤¤¤À¥¹¥é¡¼¤¬¤¢¤ê¤Þ¤¹¡£Ìµ»ë¤·¤Þ¤¹¡£" -#: spanner.cc:41 -msgid "Left spanpoint is right spanpoint" -msgstr "ÈϰϤκ¸Â¦¤¬¡¢±¦Â¦¤Ë¤¢¤ê¤Þ¤¹" - -#: spanner.cc:111 -#, c-format -msgid "Spanner `%s' has equal left and right spanpoints" -msgstr "ÈÏ°Ï»ØÄê»Ò `%s' ¤Îº¸±¦¤ÎÅÀ¤¬Æ±¤¸¤Ç¤¹" - -#: spanner.cc:143 -msgid "spanner with negative length" -msgstr "ÈÏ°Ï»ØÄê»Ò¤¬Éé¤ÎŤµ¤Ç¤¹" - -#: spring-spacer.cc:134 -msgid "I'm too fat; call Oprah" -msgstr "ÂÀ¤¹¤®¤Þ¤¹ -- Oprah ¤ò¸Æ¤ó¤Ç" - -#: spring-spacer.cc:299 -msgid "Solution doesn't satisfy constraints" -msgstr "¤½¤Î²ò·è¤ÏÀ©¸Â¤òËþ¤¿¤·¤Þ¤»¤ó" - -#: spring-spacer.cc:400 -#, c-format -msgid "Improbable distance: %f point, setting to 10 mm" -msgstr "¤¢¤ê¤½¤¦¤Ë¤Ê¤¤µ÷Î¥: %f ¥Ý¥¤¥ó¥È, 10 mm ¤ËÀßÄꤷ¤Þ¤¹" - -#: spring-spacer.cc:405 -msgid "Negative distance, setting to 10 mm" -msgstr "Éé¤ÎÃͤȤʤëµ÷Î¥, 10 mm ¤ËÀßÄꤷ¤Þ¤¹" +#: slur.cc:122 +msgid "Slur over rest?" +msgstr "¥¹¥é¡¼¤¬µÙÉä¤ò¤Þ¤¿¤¤¤Ç¤¤¤ë?" -#: stem-engraver.cc:80 +#: stem-engraver.cc:128 #, c-format msgid "Adding note head to incompatible stem (type = %d)" msgstr "Ì·½â¤·¤¿ÉäÈø¤ØÉäƬ¤òÄɲä·¤Þ¤¹ (¥¿¥¤¥× = %d)" -#: stem.cc:26 -msgid "stem direction set already!" -msgstr "ÉäÈø¤ÎÊý¸þ¤Ï´û¤Ë¥»¥Ã¥È¤µ¤ì¤Æ¤¤¤Þ¤¹!" - -#: stem.cc:106 +#: stem.cc:116 msgid "Weird stem size; check for narrow beams" msgstr "ÊѤÊÉäÈø¤Î¥µ¥¤¥º -- ºÙ¤¤³Ã¤Î¥Á¥§¥Ã¥¯¤ò¤·¤Æ²¼¤µ¤¤" -#: tfm-reader.cc:108 +#: tfm-reader.cc:105 #, c-format msgid "TFM header of `%s' has only %u word(s)" msgstr "`%s' ¤Î TFM ¥Ø¥Ã¥À¤Ë %u ¸ì¤·¤«¤¢¤ê¤Þ¤»¤ó" -#: tfm-reader.cc:146 +#: tfm-reader.cc:143 #, c-format msgid "%s: TFM file has %u parameters, which is more than the %u I can handle" msgstr "%s: TFM ¥Õ¥¡¥¤¥ë¤Ï %u ¸Ä¤Î¥Ñ¥é¥á¥¿¤¬¤¢¤ê¤Þ¤¹¤¬¡¢%u °Ê¾å¤Ï°·¤¨¤Þ¤»¤ó" -#: tfm.cc:64 -#, c-format -msgid "Can't find ascii character: `%d'" +#: tfm.cc:71 +#, fuzzy, c-format +msgid "can't find ascii character: `%d'" msgstr "ascii ʸ»ú¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%d'" -#: tie-engraver.cc:91 -msgid "unequal number of note heads for tie" -msgstr "¥¿¥¤¤ËÂбþ¤¹¤ëÉäƬ¤Î¿ô¤¬¶ÑÅù¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó" - -#: tie-engraver.cc:155 tie-performer.cc:106 +#: tie-engraver.cc:203 tie-performer.cc:109 msgid "No ties were created!" msgstr "ºî¤é¤ì¤¿¥¿¥¤¤¬¤¢¤ê¤Þ¤»¤ó!" -#: tie.cc:55 +#: tie-engraver.cc:242 msgid "lonely tie" msgstr "°ì¤Ä¤À¤±¤Î¥¿¥¤" -#: time-description.cc:17 -msgid "cadenza" -msgstr "cadenza" - -#: time-description.cc:106 -msgid "Partial measure must be non-negative" -msgstr "¾®ÀáÉô¤ÏÈóÉé¤Ç¤Ê¤¯¤Æ¤Ï¤Ê¤ê¤Þ¤»¤ó" - -#: time-description.cc:108 -msgid "partial measure too large" -msgstr "¾®ÀáÉô¤¬Â礭¤¹¤®¤Þ¤¹" - #: time-scaled-music-iterator.cc:25 msgid "no one to print a tuplet start bracket" msgstr "¥¿¥×¥ì¥Ã¥È³«»Ï¥Ö¥é¥±¥Ã¥È¤òɽ¼¨¤¹¤ë¤â¤Î¤¬¤¢¤ê¤Þ¤»¤ó" -#: time-signature-engraver.cc:28 +#: time-signature-engraver.cc:49 msgid "lost in time:" msgstr "Çï»Ò¤Ë̤¤¤Þ¤·¤¿:" -#: timing-translator.cc:26 +#: time-signature-engraver.cc:50 translator-group.cc:419 +#: translator-group.cc:428 +#, fuzzy, c-format +msgid "can't find: `%s'" +msgstr "¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'" + +#: timing-translator.cc:36 msgid "conflicting timing request" msgstr "Çï»Ò¤ÎÍ׵᤬¶¥¹ç¤·¤Þ¤¹" -#: timing-translator.cc:62 -msgid "time signature change not allowed here" -msgstr "¤³¤³¤Ç¤ÏÇï»Òµ­¹æ¤òÊѹ¹¤Ç¤­¤Þ¤»¤ó" +#: timing-translator.cc:37 +msgid "This is the other timing request" +msgstr "" -#: timing-translator.cc:83 +#: timing-translator.cc:79 #, c-format msgid "barcheck failed at: %s" msgstr "¾®Àá¥Á¥§¥Ã¥¯¤¬¼ºÇÔ: %s" -#: translator-ctors.cc:39 +#: translator-ctors.cc:41 #, c-format msgid "unknown translator: `%s'" msgstr "Ƚ¤é¤Ê¤¤¥È¥é¥ó¥¹¥ì¡¼¥¿: `%s'" -#: translator-group.cc:78 translator-group.cc:91 +#: translator-group.cc:82 translator-group.cc:95 msgid "Program has no such type" msgstr "¥×¥í¥°¥é¥à¤Ë¤Ï¤½¤ÎÍͤʥ¿¥¤¥×¤¬¤¢¤ê¤Þ¤»¤ó" -#: translator-group.cc:82 translator-group.cc:97 +#: translator-group.cc:86 translator-group.cc:101 #, c-format msgid "Already contains: `%s'" msgstr "´û¤Ë´Þ¤ó¤Ç¤¤¤Þ¤¹: `%s'" -#: translator-group.cc:207 -#, c-format -msgid "Can't find or create `%s' called `%s'" +#: translator-group.cc:213 +#, fuzzy, c-format +msgid "can't find or create `%s' called `%s'" msgstr "`%2$s' ¤Ë¸Æ¤Ð¤ì¤¿ `%1$s' ¤¬¸«¤Ä¤«¤é¤Ê¤¤¤«ºî¤ì¤Þ¤»¤ó" -#: translator-group.cc:341 -#, c-format -msgid "Can't find or create: `%s'" +#: translator-group.cc:325 +#, fuzzy, c-format +msgid "can't find or create: `%s'" msgstr "¸«¤Ä¤«¤é¤Ê¤¤¤«ºî¤ì¤Þ¤»¤ó: `%s'" -#: transposed-music.cc:31 -msgid "Will ignore \\relative for transposed music" -msgstr "žĴ¤µ¤ì¤¿³Ú¶Ê¤Ï \\relative ¤ò̵»ë¤·¤Þ¤¹" - -#: unfolded-repeat-iterator.cc:145 +#: unfolded-repeat-iterator.cc:146 msgid "no one to print a volta bracket" msgstr "volta ¥Ö¥é¥±¥Ã¥È¤òɽ¼¨¤¹¤ë¤â¤Î¤¬¤¢¤ê¤Þ¤»¤ó" -#: word-wrap.cc:75 -#, c-format -msgid "Ugh, this measure is too long, breakpoint: %d" -msgstr "¤¦¤°¤Ã¡¢¤³¤Î¾®Àá¤ÏŤ¹¤®¤Þ¤¹¡£¤­¤ë¾ì½ê: %d" - -#: word-wrap.cc:77 -msgid "Generating stupido solution" -msgstr "Çϼ¯¤²¤¿²ò·è¤òÀ¸À®Ãæ" - -#: word-wrap.cc:95 -msgid "I don't fit; put me on Montignac" -msgstr "¾å¼ê¤¯¤Ï¤Þ¤ê¤Þ¤»¤ó -- Montignac ¤Î¤È¤³¤í¤ËÃÖ¤¤¤Æ¤¯¤À¤µ¤¤" - -#: parser.yy:55 +#: parser.yy:59 #, c-format msgid "Oldest supported input version: %s" msgstr "°ìÈָŤ¤ÆþÎϲÄǽ¥Ð¡¼¥¸¥ç¥ó: %s" -#: parser.yy:313 -msgid "Can't evaluate Scheme in safe mode" -msgstr "°ÂÁ´¥â¡¼¥É¤Ç¤Ï Scheme ¤Îɾ²Á¤ò¤Ç¤­¤Þ¤»¤ó" - -#: parser.yy:433 parser.yy:441 parser.yy:465 +#: parser.yy:426 msgid "Need a translator group for a context" msgstr "¥³¥ó¥Æ¥­¥¹¥È¤Ë¤Ï¥È¥é¥ó¥¹¥ì¡¼¥¿¥°¥ë¡¼¥×¤¬É¬ÍפǤ¹" -#: parser.yy:459 +#: parser.yy:441 msgid "Wrong type for property value" msgstr "°À­ÃͤؤΥ¿¥¤¥×¤¬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹" -#: parser.yy:515 -msgid "More than one music block" -msgstr "Ê£¿ô¤Î³Ú¶Ê¥Ö¥í¥Ã¥¯" - -#: parser.yy:575 -msgid "Need even number of args for shape array" -msgstr "shape ÇÛÎó¤Ø¤Î°ú¿ô¤Ï¶ö¿ô¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó" - -#: parser.yy:723 +#: parser.yy:626 msgid "More alternatives than repeats. Junking excess alternatives." msgstr "·«¤êÊÖ¤·¤è¤ê¤âÁªÂò»è¤¬Â¿¤¤¡£Ä¶²áʬ¤ò¼Î¤Æ¤Þ¤¹¡£" -#: parser.yy:946 parser.yy:1360 parser.yy:1380 -#, c-format -msgid "not a duration: %d" -msgstr "²»Ä¹¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó: %d" +#: parser.yy:666 +msgid "Second argument must be a symbol" +msgstr "" -#: parser.yy:948 parser.yy:1382 -msgid "Can't abbreviate" -msgstr "¾Êά¤Ç¤­¤Þ¤»¤ó" +#: parser.yy:671 +msgid "First argument must be a procedure taking 1 argument" +msgstr "" -#: parser.yy:1076 +#: parser.yy:971 +msgid "Expecting string as script definition" +msgstr "" + +#: parser.yy:981 msgid "Can't specify direction for this request" msgstr "¤³¤ÎÍ×µá¤ËÂФ¹¤ëÊý¸þ¤ò»ØÄꤹ¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó" -#: parser.yy:1211 parser.yy:1219 parser.yy:1444 +#: parser.yy:1073 +#, c-format +msgid "Expecting %d arguments" +msgstr "" + +#: parser.yy:1089 +msgid "Must have 2 arguments for duration" +msgstr "" + +#: parser.yy:1096 parser.yy:1104 parser.yy:1339 msgid "Have to be in Lyric mode for lyrics" msgstr "²Î»ì¤Ï Lyric ¥â¡¼¥ÉÆâ¤Ë½ñ¤¤¤Æ¤¯¤À¤µ¤¤" -#: parser.yy:1391 +#: parser.yy:1245 parser.yy:1265 +#, c-format +msgid "not a duration: %d" +msgstr "²»Ä¹¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó: %d" + +#: parser.yy:1274 msgid "Have to be in Note mode for notes" msgstr "²»Éä¤Ï Note ¥â¡¼¥ÉÆâ¤Ë½ñ¤¤¤Æ¤¯¤À¤µ¤¤" -#: parser.yy:1403 -msgid "Can't abbreviate tuplet" -msgstr "¥¿¥×¥ì¥Ã¥È¤ò¾Êά¤Ç¤­¤Þ¤»¤ó" - -#: parser.yy:1450 +#: parser.yy:1352 msgid "Have to be in Chord mode for chords" msgstr "¥³¡¼¥É¤Ï Chord ¥â¡¼¥ÉÆâ¤Ë½ñ¤¤¤Æ¤¯¤À¤µ¤¤" -#: lexer.ll:155 +#: parser.yy:1513 parser.yy:1531 +msgid "need integer number arg" +msgstr "" + +#: parser.yy:1517 +msgid "Must be positive integer" +msgstr "" + +#: lexer.ll:158 msgid "EOF found inside a comment" msgstr "¥³¥á¥ó¥ÈÆâ¤Ë EOF ¤¬¸«¤Ä¤«¤ê¤Þ¤·¤¿" -#: lexer.ll:169 +#: lexer.ll:172 msgid "\\maininput disallowed outside init files" msgstr "½é´ü²½¥Õ¥¡¥¤¥ë¤Î³°¤Ç¤Ï \\maininput ¤òµ­½Ò¤Ç¤­¤Þ¤»¤ó" -#: lexer.ll:199 -#, c-format -msgid "undefined identifier: `%s'" +#: lexer.ll:196 +#, fuzzy, c-format +msgid "wrong or undefined identifier: `%s'" msgstr "̤ÄêµÁ¤Î¼±ÊÌ»Ò: `%s'" #. backup rule -#: lexer.ll:204 +#: lexer.ll:201 msgid "Missing end quote" msgstr "½ªÎ»¥¯¥ª¡¼¥È¤¬¤¢¤ê¤Þ¤»¤ó" #. backup rule -#: lexer.ll:227 lexer.ll:231 +#: lexer.ll:223 lexer.ll:227 msgid "white expected" msgstr "¶õÇò¤¬É¬ÍפǤ¹" -#: lexer.ll:401 +#: lexer.ll:235 +msgid "Can't evaluate Scheme in safe mode" +msgstr "°ÂÁ´¥â¡¼¥É¤Ç¤Ï Scheme ¤Îɾ²Á¤ò¤Ç¤­¤Þ¤»¤ó" + +#: lexer.ll:431 #, c-format msgid "invalid character: `%c'" msgstr "̵¸ú¤Êʸ»ú: `%c'" -#: lexer.ll:457 +#: lexer.ll:508 #, c-format msgid "unknown escaped string: `\\%s'" msgstr "̤ÃΤΥ¨¥¹¥±¡¼¥×ʸ»úÎó: `\\%s'" -#: lexer.ll:543 +#: lexer.ll:594 #, c-format msgid "incorrect mudela version: %s (%s, %s)" msgstr "´Ö°ã¤Ã¤¿ mudela ¥Ð¡¼¥¸¥ç¥ó: %s (%s, %s)" -#: out/BLURB.hh:2 -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" +#: lexer.ll:595 +msgid "Consider converting the input with the convert-mudela script" msgstr "" -"LilyPond ¤Ï³Ú¶ÊÁÈÈÇ¥½¥Õ¥È¤Ç¤¹¡£ÆþÎÏ¥Õ¥¡¥¤¥ë¤Ë¤Ï¥Ï¥¤¥ì¥Ù¥ë¤Êµ­½Ò¤ò»ÈÍѤǤ­¡¢\n" -"Èþ¤·¤¤ÉèÌ̤òºîÀ®¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£LilyPond ¤Ï GNU ¥×¥í¥¸¥§¥¯¥È¤Î°ìÉô¤Ç¤¹¡£\n" -#: main.cc:90 +#: main.cc:91 msgid "write exact durations, e.g.: a4*385/384" msgstr "Àµ³Î¤Ê²»Ä¹¤ò½ñ¤¤¤Æ¤¯¤À¤µ¤¤¡£Îã: a4*385/384" -#: main.cc:93 +#: main.cc:94 msgid "ACC[:MINOR]" msgstr "ACC[:MINOR]" -#: main.cc:93 +#: main.cc:94 msgid "set key: ACC +sharps/-flats; :1 minor" msgstr "Ä´¤òÀßÄê: ACC +¥·¥ã¡¼¥×/-¥Õ¥é¥Ã¥È :1 ûĴ" -#: main.cc:94 -msgid "assume no tuplets or double dots, smallest is 32" +#: main.cc:95 +#, fuzzy +msgid "don't output tuplets or double dots, smallest is 32" msgstr "ÉäÅÀ¤äÊ£ÉäÅÀ¤ò¤Ê¤¯¤¹¤è¤¦»î¤ß¤Þ¤¹¡¢ºÇ¾®¤Ï 32" -#: main.cc:95 +#: main.cc:96 msgid "set FILE as default output" msgstr "¥Ç¥Õ¥©¥ë¥È½ÐÎϤȤ·¤Æ FILE ¤òÀßÄꤹ¤ë" -#: main.cc:96 -msgid "assume no tuplets" -msgstr "ÉäÅÀ¤ò̵¤¯¤¹¤è¤¦»î¤ß¤Þ¤¹" - #: main.cc:97 +msgid "don't output tuplets" +msgstr "" + +#: main.cc:98 msgid "be quiet" msgstr "ÀŤ«¤Ë¤·¤Þ¤¹" -#: main.cc:98 +#: main.cc:99 msgid "DUR" msgstr "DUR" -#: main.cc:98 +#: main.cc:99 msgid "set smallest duration" msgstr "²»Ä¹¤òºÇ¾®¤ËÀßÄꤷ¤Þ¤¹" -#: main.cc:101 +#: main.cc:102 msgid "be verbose" msgstr "¾ÜºÙ¤Ê¾ðÊó¤òɽ¼¨¤·¤Þ¤¹" -#: main.cc:103 +#: main.cc:104 msgid "assume no double dotted notes" msgstr "Ê£ÉäÅÀ²»Éä¤ò̵¤¯¤¹¤è¤¦»î¤ß¤Þ¤¹" -#: main.cc:110 +#: main.cc:111 #, c-format msgid "Usage: %s [OPTION]... [FILE]" msgstr "»È¤¤Êý: %s [¥ª¥×¥·¥ç¥ó]... [¥Õ¥¡¥¤¥ë]" -#: main.cc:112 +#: main.cc:113 msgid "Translate MIDI-file to mudela" msgstr "MIDI ¥Õ¥¡¥¤¥ë¤ò mudela ¤ËÊÑ´¹¤·¤Þ¤¹" @@ -1121,7 +1007,8 @@ msgid "invalid number of tracks" msgstr "̵¸ú¤Ê¥È¥é¥Ã¥¯¿ô" #: midi-score-parser.cc:58 -msgid "Can't handle non-metrical time" +#, fuzzy +msgid "can't handle non-metrical time" msgstr "±¤Î§¤Ë¤Ê¤é¤Ê¤¤Çï»Ò¤Ï°·¤¨¤Þ¤»¤ó" #: midi-track-parser.cc:68 @@ -1192,11 +1079,11 @@ msgstr " msgid "Settling columns..." msgstr "¥«¥é¥à¤ò·èÄꤷ¤Þ¤¹..." -#: mudela-staff.cc:177 +#: mudela-staff.cc:178 msgid "% MIDI copyright:" msgstr "% MIDI copyright:" -#: mudela-staff.cc:178 +#: mudela-staff.cc:179 msgid "% MIDI instrument:" msgstr "% MIDI instrument:" @@ -1206,15 +1093,196 @@ msgid "lily indent level: %d" msgstr "lily indent level: %d" #. Maybe better not to translate these? -#: mudela-stream.cc:76 +#: mudela-stream.cc:83 msgid "% Creator: " msgstr "%s Creator: " -#: mudela-stream.cc:81 +#: mudela-stream.cc:88 msgid "% Automatically generated" msgstr "% Automatically generated" -#: mudela-stream.cc:90 +#: mudela-stream.cc:97 #, c-format msgid "% from input file: " msgstr "% from input file: " + +#~ msgid "Debug output disabled. Compiled with NPRINT." +#~ msgstr "" +#~ "¥Ç¥Ð¥Ã¥°½ÐÎϤ¬Ìµ¸ú¤Ë¤µ¤ì¤Æ¤¤¤Þ¤¹¡£NPRINT ¤Ä¤­¤Ç¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤Þ¤·¤¿¡£" + +#~ msgid "programming warning: " +#~ msgstr "¥×¥í¥°¥é¥à¾å¤Î·Ù¹ð: " + +#~ msgid "(search path: `%s)'" +#~ msgstr "(¸¡º÷¥Ñ¥¹: `%s')" + +#~ msgid "no beam to end" +#~ msgstr "ËöÈø¤Ø¤Î³Ã¤¬¤¢¤ê¤Þ¤»¤ó" + +#~ msgid "unfinished beam" +#~ msgstr "½ªÎ»¤µ¤ì¤Æ¤¤¤Ê¤¤³Ã" + +#~ msgid "0 lines" +#~ msgstr "0 ¹Ô" + +#~ msgid "1 line (of %.0f columns)" +#~ msgstr "1 ¹Ô (%.0f ¥«¥é¥à)" + +#~ msgid "%d lines (with an average of %.1f columns)" +#~ msgstr "%d ¹Ô (Ê¿¶Ñ %.1f ¥«¥é¥à)" + +#~ msgid "Score does not have any columns" +#~ msgstr "ÉèÌ̤˥«¥é¥à¤¬¤¢¤ê¤Þ¤»¤ó" + +#~ msgid "approximated %s" +#~ msgstr "¤ª¤ª¤è¤½ %s" + +#~ msgid "calculated %s exactly" +#~ msgstr "Àµ³Î¤Ë·×»»¤µ¤ì¤¿ %s" + +#~ msgid "elapsed time %.2f seconds" +#~ msgstr "%.2f É÷вá" + +#~ msgid "no tremolo beam to end" +#~ msgstr "ËöÈø¤Ø¤Î¥È¥ì¥â¥íµ­¹æ¤¬¤¢¤ê¤Þ¤»¤ó" + +#~ msgid "Already have a tremolo beam" +#~ msgstr "¤¹¤Ç¤Ë¥È¥ì¥â¥íµ­¹æ¤¬¤¢¤ê¤Þ¤¹" + +#~ msgid "unfinished tremolo beam" +#~ msgstr "½ª¤ï¤Ã¤Æ¤¤¤Ê¤¤¥È¥ì¥â¥íµ­¹æ" + +#~ msgid "Got a dynamic already. Continuing dazed and confused." +#~ msgstr "´û¤ËưŪ¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£º®Í𤷤¿¤Þ¤Þ³¤±¤Þ¤¹¡£" + +#~ msgid "Too many crescendi here" +#~ msgstr "¤³¤³¤Î¥¯¥ì¥Ã¥·¥§¥ó¥É¤¬Â¿¤¹¤®¤Þ¤¹" + +#~ msgid "Ineq_constrained_qp::solve (): Constraint off by %f" +#~ msgstr "Ineq_constrained_qp::solve (): À©¸Â¤ò %f ¤Ç²ò½ü" + +#~ msgid "Didn't converge!" +#~ msgstr "¼ý«¤·¤Þ¤»¤ó¤Ç¤·¤¿!" + +#~ msgid "too much degeneracy" +#~ msgstr "¾®¤µ¤¹¤®¤Þ¤¹" + +#~ msgid "No key name, assuming `C'" +#~ msgstr "¥­¡¼Ì¾¤¬¤¢¤ê¤Þ¤»¤ó¡¢`C' ¤ò»î¤ß¤Þ¤¹" + +#~ msgid "Don't know how handle empty keys" +#~ msgstr "¶õ¤Î¥­¡¼¤Î°·¤¤Êý¤¬È½¤ê¤Þ¤»¤ó" + +#~ msgid "Don't have that many octaves (%s)" +#~ msgstr "¤½¤ó¤Ê¤ËÂô»³¤Î¥ª¥¯¥¿¡¼¥Ö (%s) ¤ò»È¤ï¤Ê¤¤¤Ç¤¯¤À¤µ¤¤" + +#~ msgid "underdone accidentals (%s)" +#~ msgstr "¥Õ¥é¥Ã¥È¤¬Â¿¤¹¤®¤Þ¤¹ (%s)" + +#~ msgid "overdone accidentals (%s)" +#~ msgstr "¥·¥ã¡¼¥×¤¬Â¿¤¹¤®¤Þ¤¹ (%s)" + +#~ msgid "Huh? Empty Line_of_score?" +#~ msgstr "¤Ï? ÉèÌ̤ιԤ¬¶õ?" + +#~ msgid "out of tune:" +#~ msgstr "Èϰϳ°¤ÎÄ´:" + +#~ msgid "ignore mudela version" +#~ msgstr "mudela ¤Î¥Ð¡¼¥¸¥ç¥ó¤ò̵»ë¤¹¤ë" + +#~ msgid "redeclaration of `\\%s'" +#~ msgstr "`\\%s' ¤ÎºÆÀë¸À" + +#~ msgid "Must set spring between differing columns" +#~ msgstr "°Û¤Ê¤ë¥«¥é¥à¤Î´Ö¤Ë spring ¤ò¥»¥Ã¥È¤·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó" + +#~ msgid "unknown paper variable: `%s'" +#~ msgstr "paper ÊÑ¿ô¤ÎÃͤ¬È½¤ê¤Þ¤»¤ó: `%s'" + +#~ msgid "not a real variable" +#~ msgstr "Ãͤ¬¼Â¿ô¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó" + +#~ msgid "improbable offset for object type: `%s'" +#~ msgstr "¥ª¥Ö¥¸¥§¥¯¥È·¿¤Ë¤È¤Ã¤Æ¤¢¤ê¤½¤¦¤Ë¤Ê¤¤¥ª¥Õ¥»¥Ã¥È: `%s'" + +#~ msgid "Can't solve this casting problem exactly; reverting to Word_wrap" +#~ msgstr "Àµ³Î¤Ë¥­¥ã¥¹¥È¤ò²ò·è¤Ç¤­¤Þ¤»¤ó -- Word_wrap ¤ËÉüµ¢¤·¤Þ¤¹" + +#~ msgid "%s elements" +#~ msgstr "%s ¸Ä¤ÎÍ×ÁÇ" + +#~ msgid "Line ... " +#~ msgstr "¹Ô ..." + +#~ msgid "degenerate constraints" +#~ msgstr "À©¸Â¤ò´ËÏÂ" + +#~ msgid "no toplevel translator" +#~ msgstr "ºÇ¾å°Ì¤Î¥È¥é¥ó¥¹¥ì¡¼¥¿¤¬¤¢¤ê¤Þ¤»¤ó" + +#~ msgid "Left spanpoint is right spanpoint" +#~ msgstr "ÈϰϤκ¸Â¦¤¬¡¢±¦Â¦¤Ë¤¢¤ê¤Þ¤¹" + +#~ msgid "Spanner `%s' has equal left and right spanpoints" +#~ msgstr "ÈÏ°Ï»ØÄê»Ò `%s' ¤Îº¸±¦¤ÎÅÀ¤¬Æ±¤¸¤Ç¤¹" + +#~ msgid "spanner with negative length" +#~ msgstr "ÈÏ°Ï»ØÄê»Ò¤¬Éé¤ÎŤµ¤Ç¤¹" + +#~ msgid "I'm too fat; call Oprah" +#~ msgstr "ÂÀ¤¹¤®¤Þ¤¹ -- Oprah ¤ò¸Æ¤ó¤Ç" + +#~ msgid "Solution doesn't satisfy constraints" +#~ msgstr "¤½¤Î²ò·è¤ÏÀ©¸Â¤òËþ¤¿¤·¤Þ¤»¤ó" + +#~ msgid "Improbable distance: %f point, setting to 10 mm" +#~ msgstr "¤¢¤ê¤½¤¦¤Ë¤Ê¤¤µ÷Î¥: %f ¥Ý¥¤¥ó¥È, 10 mm ¤ËÀßÄꤷ¤Þ¤¹" + +#~ msgid "Negative distance, setting to 10 mm" +#~ msgstr "Éé¤ÎÃͤȤʤëµ÷Î¥, 10 mm ¤ËÀßÄꤷ¤Þ¤¹" + +#~ msgid "stem direction set already!" +#~ msgstr "ÉäÈø¤ÎÊý¸þ¤Ï´û¤Ë¥»¥Ã¥È¤µ¤ì¤Æ¤¤¤Þ¤¹!" + +#~ msgid "unequal number of note heads for tie" +#~ msgstr "¥¿¥¤¤ËÂбþ¤¹¤ëÉäƬ¤Î¿ô¤¬¶ÑÅù¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó" + +#~ msgid "cadenza" +#~ msgstr "cadenza" + +#~ msgid "Partial measure must be non-negative" +#~ msgstr "¾®ÀáÉô¤ÏÈóÉé¤Ç¤Ê¤¯¤Æ¤Ï¤Ê¤ê¤Þ¤»¤ó" + +#~ msgid "partial measure too large" +#~ msgstr "¾®ÀáÉô¤¬Â礭¤¹¤®¤Þ¤¹" + +#~ msgid "time signature change not allowed here" +#~ msgstr "¤³¤³¤Ç¤ÏÇï»Òµ­¹æ¤òÊѹ¹¤Ç¤­¤Þ¤»¤ó" + +#~ msgid "Will ignore \\relative for transposed music" +#~ msgstr "žĴ¤µ¤ì¤¿³Ú¶Ê¤Ï \\relative ¤ò̵»ë¤·¤Þ¤¹" + +#~ msgid "Ugh, this measure is too long, breakpoint: %d" +#~ msgstr "¤¦¤°¤Ã¡¢¤³¤Î¾®Àá¤ÏŤ¹¤®¤Þ¤¹¡£¤­¤ë¾ì½ê: %d" + +#~ msgid "Generating stupido solution" +#~ msgstr "Çϼ¯¤²¤¿²ò·è¤òÀ¸À®Ãæ" + +#~ msgid "I don't fit; put me on Montignac" +#~ msgstr "¾å¼ê¤¯¤Ï¤Þ¤ê¤Þ¤»¤ó -- Montignac ¤Î¤È¤³¤í¤ËÃÖ¤¤¤Æ¤¯¤À¤µ¤¤" + +#~ msgid "More than one music block" +#~ msgstr "Ê£¿ô¤Î³Ú¶Ê¥Ö¥í¥Ã¥¯" + +#~ msgid "Need even number of args for shape array" +#~ msgstr "shape ÇÛÎó¤Ø¤Î°ú¿ô¤Ï¶ö¿ô¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó" + +#~ msgid "Can't abbreviate" +#~ msgstr "¾Êά¤Ç¤­¤Þ¤»¤ó" + +#~ msgid "Can't abbreviate tuplet" +#~ msgstr "¥¿¥×¥ì¥Ã¥È¤ò¾Êά¤Ç¤­¤Þ¤»¤ó" + +#~ msgid "assume no tuplets" +#~ msgstr "ÉäÅÀ¤ò̵¤¯¤¹¤è¤¦»î¤ß¤Þ¤¹" diff --git a/po/lilypond.pot b/po/lilypond.pot index e93d45d142..156ac55f37 100644 --- a/po/lilypond.pot +++ b/po/lilypond.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-06-21 16:48+0200\n" +"POT-Creation-Date: 2000-07-24 22:01+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,7 +18,7 @@ msgstr "" msgid "EOF in a string" msgstr "" -#: data-file.cc:116 input.cc:87 midi-parser.cc:100 warn.cc:22 +#: data-file.cc:116 input.cc:85 midi-parser.cc:100 warn.cc:22 msgid "warning: " msgstr "" @@ -46,15 +46,15 @@ msgstr "" msgid "invalid argument `%s' to option `%s'" msgstr "" -#: input.cc:92 warn.cc:8 warn.cc:16 +#: input.cc:90 warn.cc:8 warn.cc:16 msgid "error: " msgstr "" -#: input.cc:98 +#: input.cc:96 msgid "non fatal error: " msgstr "" -#: input.cc:106 source-file.cc:62 source-file.cc:155 +#: input.cc:104 source-file.cc:62 source-file.cc:155 msgid "position unknown" msgstr "" @@ -85,40 +85,40 @@ msgstr "" msgid " (Continuing; cross thumbs)" msgstr "" -#: afm.cc:42 +#: afm.cc:51 #, c-format msgid "can't find character number: %d" msgstr "" -#: afm.cc:57 +#: afm.cc:66 #, c-format msgid "can't find character called: `%s'" msgstr "" -#: afm.cc:87 +#: afm.cc:96 msgid "Error parsing AFM file" msgstr "" -#: all-font-metrics.cc:104 lookup.cc:56 +#: all-font-metrics.cc:149 lookup.cc:80 #, c-format msgid "can't find font: `%s'" msgstr "" -#: all-font-metrics.cc:105 +#: all-font-metrics.cc:150 msgid "Loading default font" msgstr "" -#: all-font-metrics.cc:122 +#: all-font-metrics.cc:167 #, c-format msgid "can't find default font: `%s'" msgstr "" -#: all-font-metrics.cc:123 includable-lexer.cc:49 lookup.cc:57 scores.cc:109 +#: all-font-metrics.cc:168 includable-lexer.cc:50 lookup.cc:81 scores.cc:109 #, c-format msgid "(search path: `%s')" msgstr "" -#: all-font-metrics.cc:124 +#: all-font-metrics.cc:169 msgid "Giving up" msgstr "" @@ -126,39 +126,39 @@ msgstr "" msgid "Can't switch translators, I'm there already" msgstr "" -#: beam-engraver.cc:40 beam-engraver.cc:56 +#: beam-engraver.cc:75 beam-engraver.cc:91 msgid "can't find start of beam" msgstr "" -#: beam-engraver.cc:85 +#: beam-engraver.cc:120 msgid "already have a beam" msgstr "" -#: beam-engraver.cc:141 +#: beam-engraver.cc:177 msgid "unterminated beam" msgstr "" -#: beam-engraver.cc:169 chord-tremolo-engraver.cc:167 +#: beam-engraver.cc:210 chord-tremolo-engraver.cc:172 msgid "stem must have Rhythmic structure" msgstr "" -#: beam-engraver.cc:180 +#: beam-engraver.cc:221 msgid "stem doesn't fit in beam" msgstr "" -#: beam-engraver.cc:181 +#: beam-engraver.cc:222 msgid "beam was started here" msgstr "" -#: beam.cc:90 +#: beam.cc:84 msgid "beam has less than two stems" msgstr "" -#: beam.cc:483 +#: beam.cc:510 msgid "weird beam vertical offset" msgstr "" -#: break-align-item.cc:87 +#: break-align-item.cc:119 #, c-format msgid "unknown spacing pair `%s', `%s'" msgstr "" @@ -182,41 +182,41 @@ msgstr "" msgid "none of these in my family" msgstr "" -#: chord-tremolo-engraver.cc:111 +#: chord-tremolo-engraver.cc:115 msgid "unterminated chord tremolo" msgstr "" -#: chord-tremolo-iterator.cc:41 +#: chord-tremolo-iterator.cc:42 msgid "no one to print a tremolos" msgstr "" -#: chord.cc:151 +#: chord.cc:152 #, c-format msgid "invalid subtraction: not part of chord: %s" msgstr "" -#: chord.cc:375 +#: chord.cc:376 #, c-format msgid "invalid inversion pitch: not part of chord: %s" msgstr "" -#: clef-engraver.cc:166 +#: clef-engraver.cc:167 msgid "unknown clef type" msgstr "" -#: collision.cc:111 +#: collision.cc:118 msgid "Too many clashing notecolumns. Ignoring them." msgstr "" -#: crescendo.cc:69 +#: crescendo.cc:65 msgid "crescendo" msgstr "" -#: crescendo.cc:69 +#: crescendo.cc:65 msgid "too small" msgstr "" -#: cross-staff.cc:19 +#: cross-staff.cc:22 msgid "" "minVerticalAlign != maxVerticalAlign: cross staff spanners may be broken" msgstr "" @@ -233,27 +233,27 @@ msgstr "" msgid "NaN" msgstr "" -#: dynamic-engraver.cc:281 span-dynamic-performer.cc:87 +#: dynamic-engraver.cc:184 span-dynamic-performer.cc:87 msgid "can't find start of (de)crescendo" msgstr "" -#: dynamic-engraver.cc:300 +#: dynamic-engraver.cc:203 msgid "already have a crescendo" msgstr "" -#: dynamic-engraver.cc:301 +#: dynamic-engraver.cc:204 msgid "already have a decrescendo" msgstr "" -#: dynamic-engraver.cc:381 +#: dynamic-engraver.cc:289 msgid "unterminated (de)crescendo" msgstr "" -#: extender-engraver.cc:97 +#: extender-engraver.cc:98 msgid "unterminated extender" msgstr "" -#: extender-engraver.cc:109 +#: extender-engraver.cc:110 msgid "Nothing to connect extender to on the left. Ignoring extender request." msgstr "" @@ -269,25 +269,25 @@ msgstr "" msgid "no Grace context available" msgstr "" -#: grace-position-engraver.cc:93 +#: grace-position-engraver.cc:94 msgid "Unattached grace notes. Attaching to last musical column." msgstr "" -#: hyphen-engraver.cc:91 +#: hyphen-engraver.cc:90 msgid "unterminated hyphen" msgstr "" -#: hyphen-engraver.cc:103 +#: hyphen-engraver.cc:102 msgid "Nothing to connect hyphen to on the left. Ignoring hyphen request." msgstr "" -#: identifier.cc:47 +#: identifier.cc:49 #, c-format msgid "wrong identifier type, expected: `%s'" msgstr "" -#: includable-lexer.cc:47 lily-guile.cc:121 lily-guile.cc:144 -#: midi-score-parser.cc:24 scores.cc:108 scores.cc:114 +#: includable-lexer.cc:48 lily-guile.cc:117 midi-score-parser.cc:24 +#: scores.cc:108 scores.cc:114 #, c-format msgid "can't find file: `%s'" msgstr "" @@ -296,140 +296,144 @@ msgstr "" msgid "FIXME: key change merge" msgstr "" -#: lily-guile.cc:123 lily-guile.cc:146 +#: lily-guile.cc:119 #, c-format msgid "(load path: `%s')" msgstr "" -#: line-of-score.cc:86 +#: line-of-score.cc:96 #, c-format msgid "Element count %d." msgstr "" -#: line-of-score.cc:203 paper-score.cc:70 +#: line-of-score.cc:255 paper-score.cc:79 #, c-format msgid "Element count %d " msgstr "" -#: line-of-score.cc:217 +#: line-of-score.cc:269 msgid "Calculating column positions..." msgstr "" -#: lookup.cc:58 +#: lookup.cc:82 msgid "Aborting" msgstr "" -#: lookup.cc:198 +#: lookup.cc:223 #, c-format msgid "Non-matching braces in text `%s', adding braces" msgstr "" -#: main.cc:71 main.cc:92 +#: lyric-phrasing-engraver.cc:147 +msgid "lyrics found without matching notehead ... aligning on self" +msgstr "" + +#: main.cc:75 main.cc:92 msgid "enable debugging output" msgstr "" -#: main.cc:72 +#: main.cc:76 msgid "EXT" msgstr "" -#: main.cc:72 +#: main.cc:76 msgid "use output format EXT (scm, ps, tex or as)" msgstr "" -#: main.cc:73 main.cc:93 +#: main.cc:77 main.cc:93 msgid "this help" msgstr "" -#: main.cc:74 +#: main.cc:78 msgid "DIR" msgstr "" -#: main.cc:74 +#: main.cc:78 msgid "add DIR to search path" msgstr "" -#: main.cc:75 main.cc:96 +#: main.cc:79 main.cc:96 msgid "FILE" msgstr "" -#: main.cc:75 +#: main.cc:79 msgid "use FILE as init file" msgstr "" -#: main.cc:76 +#: main.cc:80 msgid "write Makefile dependencies for every input file" msgstr "" -#: main.cc:77 +#: main.cc:81 msgid "produce MIDI output only" msgstr "" -#: main.cc:78 +#: main.cc:82 msgid "BASENAME" msgstr "" -#: main.cc:78 +#: main.cc:82 msgid "write output to BASENAME[-x].extension" msgstr "" -#: main.cc:79 +#: main.cc:83 msgid "show all changes in relative syntax" msgstr "" -#: main.cc:80 +#: main.cc:84 msgid "inhibit file output naming and exporting" msgstr "" -#: main.cc:81 main.cc:100 +#: main.cc:85 main.cc:100 msgid "don't timestamp the output" msgstr "" -#: main.cc:82 +#: main.cc:86 msgid "switch on experimental features" msgstr "" -#: main.cc:83 -msgid "ignore mudela version" +#: main.cc:87 main.cc:101 +msgid "print version number" msgstr "" -#: main.cc:84 main.cc:101 -msgid "print version number" +#: main.cc:88 +msgid "verbose" msgstr "" -#: main.cc:85 main.cc:103 +#: main.cc:89 main.cc:103 msgid "show warranty and copyright" msgstr "" -#: main.cc:100 +#: main.cc:105 #, c-format msgid "Usage: %s [OPTION]... [FILE]..." msgstr "" -#: main.cc:102 +#: main.cc:107 msgid "Typeset music and or play MIDI from FILE" msgstr "" -#: main.cc:106 +#: main.cc:111 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:112 main.cc:116 +#: main.cc:116 main.cc:117 msgid "Options:" msgstr "" -#: main.cc:116 +#: main.cc:121 msgid "This binary was compiled with the following options:" msgstr "" -#: main.cc:120 main.cc:135 +#: main.cc:120 main.cc:140 #, c-format msgid "Report bugs to %s" msgstr "" -#: main.cc:53 main.cc:143 +#: main.cc:53 main.cc:148 #, c-format msgid "" "This is free software. It is covered by the GNU General Public License,\n" @@ -437,17 +441,17 @@ msgid "" "certain conditions. Invoke as `%s --warranty' for more information.\n" msgstr "" -#: main.cc:60 main.cc:150 main.cc:162 +#: main.cc:60 main.cc:155 main.cc:167 #, c-format msgid "Copyright (c) %s by" msgstr "" #. GNU GNU? -#: main.cc:160 +#: main.cc:165 msgid "GNU LilyPond -- The GNU Project music typesetter" msgstr "" -#: main.cc:69 main.cc:168 +#: main.cc:69 main.cc:173 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" @@ -464,21 +468,21 @@ msgid "" "USA.\n" msgstr "" -#: midi-item.cc:311 +#: midi-item.cc:310 #, c-format msgid "no such instrument: `%s'" msgstr "" -#: midi-item.cc:366 +#: midi-item.cc:365 #, c-format msgid "unconventional key: flats: %d, sharps: %d" msgstr "" -#: midi-item.cc:413 +#: midi-item.cc:412 msgid "silly duration" msgstr "" -#: midi-item.cc:426 +#: midi-item.cc:425 msgid "silly pitch" msgstr "" @@ -486,11 +490,11 @@ msgstr "" msgid "Error syncing file (disk full?)" msgstr "" -#: music-output-def.cc:50 +#: music-output-def.cc:51 msgid "Interpretation context with empty type" msgstr "" -#: music-output-def.cc:77 +#: music-output-def.cc:78 #, c-format msgid "can't find `%s' context" msgstr "" @@ -510,32 +514,28 @@ msgstr "" msgid "error at EOF: %s" msgstr "" -#: midi-score-parser.cc:94 my-lily-parser.cc:56 +#: midi-score-parser.cc:94 my-lily-parser.cc:55 msgid "Parsing..." msgstr "" -#: my-lily-parser.cc:64 +#: my-lily-parser.cc:63 msgid "Braces don't match" msgstr "" -#: paper-def.cc:85 -msgid "not a real variable" -msgstr "" - -#: paper-def.cc:174 +#: paper-def.cc:149 #, c-format msgid "paper output to %s..." msgstr "" -#: mudela-stream.cc:93 paper-outputter.cc:91 performance.cc:95 +#: mudela-stream.cc:93 paper-outputter.cc:91 performance.cc:97 msgid ", at " msgstr "" -#: paper-score.cc:72 +#: paper-score.cc:82 msgid "Preprocessing elements..." msgstr "" -#: paper-score.cc:97 +#: paper-score.cc:107 msgid "Outputting Score, defined at: " msgstr "" @@ -544,35 +544,35 @@ msgid "Track ... " msgstr "" #. perhaps multiple text events? -#: performance.cc:75 +#: performance.cc:77 msgid "Creator: " msgstr "" -#: performance.cc:90 +#: performance.cc:92 msgid "Automatically generated" msgstr "" -#: performance.cc:104 +#: performance.cc:106 #, c-format msgid "from musical definition: %s" msgstr "" -#: performance.cc:172 +#: performance.cc:174 #, c-format msgid "MIDI output to %s..." msgstr "" -#: piano-pedal-engraver.cc:158 piano-pedal-engraver.cc:170 +#: piano-pedal-engraver.cc:157 piano-pedal-engraver.cc:169 #: piano-pedal-performer.cc:87 #, c-format msgid "can't find start of piano pedal: %s" msgstr "" -#: property-engraver.cc:106 +#: property-engraver.cc:128 msgid "Wrong type for property" msgstr "" -#: repeat-engraver.cc:196 +#: repeat-engraver.cc:253 msgid "No bar engraver found. Ignoring repeats." msgstr "" @@ -591,42 +591,38 @@ msgstr "" msgid "Junking music: `%s'" msgstr "" -#: rest-collision.cc:135 +#: rest-collision.cc:159 msgid "too many colliding rests" msgstr "" -#: rest-collision.cc:139 +#: rest-collision.cc:163 msgid "too many notes for rest collision" msgstr "" -#: score-engraver.cc:139 +#: score-engraver.cc:151 #, c-format msgid "unbound spanner `%s'" msgstr "" -#: score.cc:64 -msgid "no toplevel translator" -msgstr "" - #: score.cc:67 msgid "Interpreting music..." msgstr "" -#: score.cc:79 +#: score.cc:81 msgid "Need music in a score" msgstr "" #. should we? hampers debugging. -#: score.cc:92 +#: score.cc:94 msgid "Errors found/*, not processing score*/" msgstr "" -#: score.cc:97 +#: score.cc:100 #, c-format msgid "elapsed time: %.2f seconds" msgstr "" -#: scores.cc:35 +#: scores.cc:34 #, c-format msgid "Writing dependency file: `%s'..." msgstr "" @@ -635,18 +631,23 @@ msgstr "" msgid "Score contains errors; will not process it" msgstr "" -#: script-engraver.cc:68 +#: scores.cc:124 #, c-format -msgid "Don't know how to interpret articulation `%s'" +msgid "Now processing: `%s'" msgstr "" -#: sequential-music-iterator.cc:83 -msgid "Must stop before this music ends" +#: script-engraver.cc:65 +#, c-format +msgid "Don't know how to interpret articulation `%s'" msgstr "" #. this shouldn't happen, but let's continue anyway. -#: single-malt-grouping-item.cc:51 -msgid "Single_malt_grouping_item: I've been drinking too much" +#: separation-item.cc:48 +msgid "Separation_item: I've been drinking too much" +msgstr "" + +#: sequential-music-iterator.cc:83 +msgid "Must stop before this music ends" msgstr "" #: slur-engraver.cc:82 @@ -662,48 +663,43 @@ msgstr "" msgid "slur" msgstr "" -#: slur.cc:231 +#: slur.cc:48 msgid "Putting slur over rest. Ignoring." msgstr "" -#: slur.cc:312 +#: slur.cc:122 msgid "Slur over rest?" msgstr "" -#: spanner.cc:35 spanner.cc:174 -#, c-format -msgid "Spanner `%s' has equal left and right spanpoints" -msgstr "" - -#: stem-engraver.cc:124 +#: stem-engraver.cc:128 #, c-format msgid "Adding note head to incompatible stem (type = %d)" msgstr "" -#: stem.cc:118 +#: stem.cc:116 msgid "Weird stem size; check for narrow beams" msgstr "" -#: tfm-reader.cc:115 +#: tfm-reader.cc:105 #, c-format msgid "TFM header of `%s' has only %u word(s)" msgstr "" -#: tfm-reader.cc:153 +#: tfm-reader.cc:143 #, c-format msgid "%s: TFM file has %u parameters, which is more than the %u I can handle" msgstr "" -#: tfm.cc:70 +#: tfm.cc:71 #, c-format msgid "can't find ascii character: `%d'" msgstr "" -#: tie-engraver.cc:195 tie-performer.cc:109 +#: tie-engraver.cc:203 tie-performer.cc:109 msgid "No ties were created!" msgstr "" -#: tie.cc:80 +#: tie-engraver.cc:242 msgid "lonely tie" msgstr "" @@ -711,12 +707,12 @@ msgstr "" msgid "no one to print a tuplet start bracket" msgstr "" -#: time-signature-engraver.cc:28 +#: time-signature-engraver.cc:49 msgid "lost in time:" msgstr "" -#: time-signature-engraver.cc:29 translator-group.cc:417 -#: translator-group.cc:426 +#: time-signature-engraver.cc:50 translator-group.cc:419 +#: translator-group.cc:428 #, c-format msgid "can't find: `%s'" msgstr "" @@ -729,103 +725,103 @@ msgstr "" msgid "This is the other timing request" msgstr "" -#: timing-translator.cc:78 +#: timing-translator.cc:79 #, c-format msgid "barcheck failed at: %s" msgstr "" -#: translator-ctors.cc:42 +#: translator-ctors.cc:41 #, c-format msgid "unknown translator: `%s'" msgstr "" -#: translator-group.cc:80 translator-group.cc:93 +#: translator-group.cc:82 translator-group.cc:95 msgid "Program has no such type" msgstr "" -#: translator-group.cc:84 translator-group.cc:99 +#: translator-group.cc:86 translator-group.cc:101 #, c-format msgid "Already contains: `%s'" msgstr "" -#: translator-group.cc:211 +#: translator-group.cc:213 #, c-format msgid "can't find or create `%s' called `%s'" msgstr "" -#: translator-group.cc:323 +#: translator-group.cc:325 #, c-format msgid "can't find or create: `%s'" msgstr "" -#: unfolded-repeat-iterator.cc:145 +#: unfolded-repeat-iterator.cc:146 msgid "no one to print a volta bracket" msgstr "" -#: parser.yy:58 +#: parser.yy:59 #, c-format msgid "Oldest supported input version: %s" msgstr "" -#: parser.yy:418 +#: parser.yy:426 msgid "Need a translator group for a context" msgstr "" -#: parser.yy:433 +#: parser.yy:441 msgid "Wrong type for property value" msgstr "" -#: parser.yy:607 +#: parser.yy:626 msgid "More alternatives than repeats. Junking excess alternatives." msgstr "" -#: parser.yy:652 +#: parser.yy:666 msgid "Second argument must be a symbol" msgstr "" -#: parser.yy:657 +#: parser.yy:671 msgid "First argument must be a procedure taking 1 argument" msgstr "" -#: parser.yy:957 +#: parser.yy:971 msgid "Expecting string as script definition" msgstr "" -#: parser.yy:967 +#: parser.yy:981 msgid "Can't specify direction for this request" msgstr "" -#: parser.yy:1059 +#: parser.yy:1073 #, c-format msgid "Expecting %d arguments" msgstr "" -#: parser.yy:1075 +#: parser.yy:1089 msgid "Must have 2 arguments for duration" msgstr "" -#: parser.yy:1082 parser.yy:1090 parser.yy:1331 +#: parser.yy:1096 parser.yy:1104 parser.yy:1339 msgid "Have to be in Lyric mode for lyrics" msgstr "" -#: parser.yy:1231 parser.yy:1251 +#: parser.yy:1245 parser.yy:1265 #, c-format msgid "not a duration: %d" msgstr "" -#: parser.yy:1260 +#: parser.yy:1274 msgid "Have to be in Note mode for notes" msgstr "" -#: parser.yy:1347 +#: parser.yy:1352 msgid "Have to be in Chord mode for chords" msgstr "" -#: parser.yy:1508 parser.yy:1526 +#: parser.yy:1513 parser.yy:1531 msgid "need integer number arg" msgstr "" -#: parser.yy:1512 +#: parser.yy:1517 msgid "Must be positive integer" msgstr "" @@ -861,16 +857,20 @@ msgstr "" msgid "invalid character: `%c'" msgstr "" -#: lexer.ll:503 +#: lexer.ll:508 #, c-format msgid "unknown escaped string: `\\%s'" msgstr "" -#: lexer.ll:589 +#: lexer.ll:594 #, c-format msgid "incorrect mudela version: %s (%s, %s)" msgstr "" +#: lexer.ll:595 +msgid "Consider converting the input with the convert-mudela script" +msgstr "" + #: main.cc:91 msgid "write exact durations, e.g.: a4*385/384" msgstr "" @@ -1039,6 +1039,5 @@ msgid "% Automatically generated" msgstr "" #: mudela-stream.cc:97 -#, c-format msgid "% from input file: " msgstr "" diff --git a/po/nl.po b/po/nl.po index 3138baa043..d906ebf66d 100644 --- a/po/nl.po +++ b/po/nl.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: lilypond 1.3.59\n" -"POT-Creation-Date: 2000-06-21 16:48+0200\n" +"POT-Creation-Date: 2000-07-24 22:01+0200\n" "PO-Revision-Date: 2000-06-09 02:23+0200\n" "Last-Translator: Jan Nieuwenhuizen \n" "Language-Team: Dutch \n" @@ -27,7 +27,7 @@ msgstr "" msgid "EOF in a string" msgstr "EOF in een string" -#: data-file.cc:116 input.cc:87 midi-parser.cc:100 warn.cc:22 +#: data-file.cc:116 input.cc:85 midi-parser.cc:100 warn.cc:22 msgid "warning: " msgstr "waarschuwing: " @@ -55,15 +55,15 @@ msgstr "onbekende optie: `%s'" msgid "invalid argument `%s' to option `%s'" msgstr "onjuist argument: `%s' voor optie `%s'" -#: input.cc:92 warn.cc:8 warn.cc:16 +#: input.cc:90 warn.cc:8 warn.cc:16 msgid "error: " msgstr "fout: " -#: input.cc:98 +#: input.cc:96 msgid "non fatal error: " msgstr "niet noodlottige fout: " -#: input.cc:106 source-file.cc:62 source-file.cc:155 +#: input.cc:104 source-file.cc:62 source-file.cc:155 msgid "position unknown" msgstr "positie onbekend" @@ -94,40 +94,40 @@ msgstr "programmeerfout: " msgid " (Continuing; cross thumbs)" msgstr " (Ga verder; duim maar)" -#: afm.cc:42 +#: afm.cc:51 #, c-format msgid "can't find character number: %d" msgstr "kan teken niet vinden met nummer: %d" -#: afm.cc:57 +#: afm.cc:66 #, c-format msgid "can't find character called: `%s'" msgstr "kan teken niet vinden genaamd: `%s'" -#: afm.cc:87 +#: afm.cc:96 msgid "Error parsing AFM file" msgstr "Fout bij ontleden AFM bestand" -#: all-font-metrics.cc:104 lookup.cc:56 +#: all-font-metrics.cc:149 lookup.cc:80 #, c-format msgid "can't find font: `%s'" msgstr "kan font niet vinden: `%s'" -#: all-font-metrics.cc:105 +#: all-font-metrics.cc:150 msgid "Loading default font" msgstr "Laad verstek font" -#: all-font-metrics.cc:122 +#: all-font-metrics.cc:167 #, c-format msgid "can't find default font: `%s'" msgstr "kan verstekfont niet vinden: `%s'" -#: all-font-metrics.cc:123 includable-lexer.cc:49 lookup.cc:57 scores.cc:109 +#: all-font-metrics.cc:168 includable-lexer.cc:50 lookup.cc:81 scores.cc:109 #, c-format msgid "(search path: `%s')" msgstr "(zoekpad: `%s')" -#: all-font-metrics.cc:124 +#: all-font-metrics.cc:169 msgid "Giving up" msgstr "Geef op" @@ -135,39 +135,39 @@ msgstr "Geef op" msgid "Can't switch translators, I'm there already" msgstr "Kan niet wisselen van vertaler, ben al hier" -#: beam-engraver.cc:40 beam-engraver.cc:56 +#: beam-engraver.cc:75 beam-engraver.cc:91 msgid "can't find start of beam" msgstr "kan start van waardestreep niet vinden" -#: beam-engraver.cc:85 +#: beam-engraver.cc:120 msgid "already have a beam" msgstr "heb al een waardestreep" -#: beam-engraver.cc:141 +#: beam-engraver.cc:177 msgid "unterminated beam" msgstr "onbeëindigde waardestreep" -#: beam-engraver.cc:169 chord-tremolo-engraver.cc:167 +#: beam-engraver.cc:210 chord-tremolo-engraver.cc:172 msgid "stem must have Rhythmic structure" msgstr "stok moet Ritmische structuur hebben" -#: beam-engraver.cc:180 +#: beam-engraver.cc:221 msgid "stem doesn't fit in beam" msgstr "stok past niet in waardestreep" -#: beam-engraver.cc:181 +#: beam-engraver.cc:222 msgid "beam was started here" msgstr "waardestreep werd hier gestart" -#: beam.cc:90 +#: beam.cc:84 msgid "beam has less than two stems" msgstr "waardestreep heeft minder dan twee stokken" -#: beam.cc:483 +#: beam.cc:510 msgid "weird beam vertical offset" msgstr "rare verticale waardestreep verplaatsing" -#: break-align-item.cc:87 +#: break-align-item.cc:119 #, c-format msgid "unknown spacing pair `%s', `%s'" msgstr "onbekend ruimte paar `%s', `%s'" @@ -191,41 +191,41 @@ msgstr "Ben er zelf een" msgid "none of these in my family" msgstr "geen van deze in mijn gezin" -#: chord-tremolo-engraver.cc:111 +#: chord-tremolo-engraver.cc:115 msgid "unterminated chord tremolo" msgstr "onbeëindigd akkoordtremolo" -#: chord-tremolo-iterator.cc:41 +#: chord-tremolo-iterator.cc:42 msgid "no one to print a tremolos" msgstr "niemand om tremolos af te drukken" -#: chord.cc:151 +#: chord.cc:152 #, c-format msgid "invalid subtraction: not part of chord: %s" msgstr "ongeldige aftrek: maakt geen deel uit van accoord: %s" -#: chord.cc:375 +#: chord.cc:376 #, c-format msgid "invalid inversion pitch: not part of chord: %s" msgstr "ongeldige inversie toon: geen onderdeel van accoord: %s" -#: clef-engraver.cc:166 +#: clef-engraver.cc:167 msgid "unknown clef type" msgstr "onbekend type sleutel" -#: collision.cc:111 +#: collision.cc:118 msgid "Too many clashing notecolumns. Ignoring them." msgstr "Te veel botsende nootkolommen. Negeer ze." -#: crescendo.cc:69 +#: crescendo.cc:65 msgid "crescendo" msgstr "crescendo" -#: crescendo.cc:69 +#: crescendo.cc:65 msgid "too small" msgstr "te klein" -#: cross-staff.cc:19 +#: cross-staff.cc:22 msgid "" "minVerticalAlign != maxVerticalAlign: cross staff spanners may be broken" msgstr "" @@ -244,27 +244,27 @@ msgstr "kan geheugen controle niet zetten!" msgid "NaN" msgstr "NaN" -#: dynamic-engraver.cc:281 span-dynamic-performer.cc:87 +#: dynamic-engraver.cc:184 span-dynamic-performer.cc:87 msgid "can't find start of (de)crescendo" msgstr "kan start van (de)crescendo niet vinden" -#: dynamic-engraver.cc:300 +#: dynamic-engraver.cc:203 msgid "already have a crescendo" msgstr "heb al een crescendo" -#: dynamic-engraver.cc:301 +#: dynamic-engraver.cc:204 msgid "already have a decrescendo" msgstr "heb al een decrescendo" -#: dynamic-engraver.cc:381 +#: dynamic-engraver.cc:289 msgid "unterminated (de)crescendo" msgstr "onbeëindigd (de)crescendo" -#: extender-engraver.cc:97 +#: extender-engraver.cc:98 msgid "unterminated extender" msgstr "onbeëindigde extender" -#: extender-engraver.cc:109 +#: extender-engraver.cc:110 msgid "Nothing to connect extender to on the left. Ignoring extender request." msgstr "" "Niets om extender aan linkerkant aan vast te maken. Negeer extender verzoek." @@ -281,26 +281,26 @@ msgstr "Geen doenbare regelafbreuk gevonden" msgid "no Grace context available" msgstr "geen Grace context voor handen" -#: grace-position-engraver.cc:93 +#: grace-position-engraver.cc:94 msgid "Unattached grace notes. Attaching to last musical column." msgstr "Losse grace noten. Maak ze vast aan vorige muziekale kolom." -#: hyphen-engraver.cc:91 +#: hyphen-engraver.cc:90 msgid "unterminated hyphen" msgstr "onafgesloten waardestreep" -#: hyphen-engraver.cc:103 +#: hyphen-engraver.cc:102 msgid "Nothing to connect hyphen to on the left. Ignoring hyphen request." msgstr "" "Niets om streepje aan linkerkant aan vast te maken. Negeer streepje verzoek." -#: identifier.cc:47 +#: identifier.cc:49 #, c-format msgid "wrong identifier type, expected: `%s'" msgstr "verkeerd type identifier, verwachtte: `%s'" -#: includable-lexer.cc:47 lily-guile.cc:121 lily-guile.cc:144 -#: midi-score-parser.cc:24 scores.cc:108 scores.cc:114 +#: includable-lexer.cc:48 lily-guile.cc:117 midi-score-parser.cc:24 +#: scores.cc:108 scores.cc:114 #, c-format msgid "can't find file: `%s'" msgstr "kan bestand niet vinden: `%s'" @@ -309,120 +309,124 @@ msgstr "kan bestand niet vinden: `%s'" msgid "FIXME: key change merge" msgstr "MAAKME: toonsoort sleutel samenvoeging" -#: lily-guile.cc:123 lily-guile.cc:146 +#: lily-guile.cc:119 #, c-format msgid "(load path: `%s')" msgstr "(zoekpad: `%s')" -#: line-of-score.cc:86 +#: line-of-score.cc:96 #, c-format msgid "Element count %d." msgstr "Aantal elementen: %d." -#: line-of-score.cc:203 paper-score.cc:70 +#: line-of-score.cc:255 paper-score.cc:79 #, c-format msgid "Element count %d " msgstr "Aantal elementen: %d." -#: line-of-score.cc:217 +#: line-of-score.cc:269 msgid "Calculating column positions..." msgstr "Berekenen van kolomposities..." -#: lookup.cc:58 +#: lookup.cc:82 msgid "Aborting" msgstr "Breek af" -#: lookup.cc:198 +#: lookup.cc:223 #, c-format msgid "Non-matching braces in text `%s', adding braces" msgstr "Ongepaarde haakjes in tekst `%s', voeg haakjes toe" -#: main.cc:71 main.cc:92 +#: lyric-phrasing-engraver.cc:147 +msgid "lyrics found without matching notehead ... aligning on self" +msgstr "liedteksten gevonden zonder nootbolletje ... uitlijnen op zelf" + +#: main.cc:75 main.cc:92 msgid "enable debugging output" msgstr "maak ontluis uitvoer mogelijk" -#: main.cc:72 +#: main.cc:76 msgid "EXT" msgstr "EXT" -#: main.cc:72 +#: main.cc:76 msgid "use output format EXT (scm, ps, tex or as)" msgstr "gebruik uitvoer formaat EXT (scm, ps, tex of as)" -#: main.cc:73 main.cc:93 +#: main.cc:77 main.cc:93 msgid "this help" msgstr "deze hulp" -#: main.cc:74 +#: main.cc:78 msgid "DIR" msgstr "DIR" -#: main.cc:74 +#: main.cc:78 msgid "add DIR to search path" msgstr "voeg DIR toe aan zoekpad" -#: main.cc:75 main.cc:96 +#: main.cc:79 main.cc:96 msgid "FILE" msgstr "BESTAND" -#: main.cc:75 +#: main.cc:79 msgid "use FILE as init file" msgstr "gebruik BESTAND als initialisatiebestand" -#: main.cc:76 +#: main.cc:80 msgid "write Makefile dependencies for every input file" msgstr "schrijf Makefile afhankelijkheden voor elk invoerbestand" -#: main.cc:77 +#: main.cc:81 msgid "produce MIDI output only" msgstr "produceer alleen MIDI uitvoer" -#: main.cc:78 +#: main.cc:82 msgid "BASENAME" msgstr "BASISNAAM" -#: main.cc:78 +#: main.cc:82 msgid "write output to BASENAME[-x].extension" msgstr "schrijf uitvoer naar BASISNAAM[-x].extensie" -#: main.cc:79 +#: main.cc:83 msgid "show all changes in relative syntax" msgstr "toon veranderingen voor relatieve mode" -#: main.cc:80 +#: main.cc:84 msgid "inhibit file output naming and exporting" msgstr "verbied naamgeving van uitvoer bestand en exportering" -#: main.cc:81 main.cc:100 +#: main.cc:85 main.cc:100 msgid "don't timestamp the output" msgstr "geen tijdsstempel in de uitvoer" -#: main.cc:82 +#: main.cc:86 msgid "switch on experimental features" msgstr "zet experimentele kunstjes aan" -#: main.cc:83 -msgid "ignore mudela version" -msgstr "negeer mudela versie" - -#: main.cc:84 main.cc:101 +#: main.cc:87 main.cc:101 msgid "print version number" msgstr "druk versienummer af" -#: main.cc:85 main.cc:103 +#: main.cc:88 +msgid "verbose" +msgstr "breedsprakig" + +#: main.cc:89 main.cc:103 msgid "show warranty and copyright" msgstr "toon garantie en auteursrechten" -#: main.cc:100 +#: main.cc:105 #, c-format msgid "Usage: %s [OPTION]... [FILE]..." msgstr "Gebruik: %s [OPTIE]... [BESTAND]..." -#: main.cc:102 +#: main.cc:107 msgid "Typeset music and or play MIDI from FILE" msgstr "Zet muziek en of speel MIDI van BESTAND" -#: main.cc:106 +#: main.cc:111 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" @@ -432,22 +436,22 @@ msgstr "" "uitgaande van een hoog niveau beschrijving bestand. LilyPond \n" "maakt deel uit van het GNU Project.\n" -#: main.cc:112 main.cc:116 +#: main.cc:116 main.cc:117 msgid "Options:" msgstr "Opties:" -#: main.cc:116 +#: main.cc:121 msgid "This binary was compiled with the following options:" msgstr "Dit programma is gecompileerd met de volgende instellingen:" -#: main.cc:120 main.cc:135 +#: main.cc:120 main.cc:140 #, c-format msgid "Report bugs to %s" msgstr "" "Meld luizen in het programma aan %s;\n" "meld onjuistheden in de vertaling aan of " -#: main.cc:53 main.cc:143 +#: main.cc:53 main.cc:148 #, c-format msgid "" "This is free software. It is covered by the GNU General Public License,\n" @@ -459,17 +463,17 @@ msgstr "" "onder bepaalde voorwaarden. Roep aan als `%s --warranty' voor meer\n" "informatie.\n" -#: main.cc:60 main.cc:150 main.cc:162 +#: main.cc:60 main.cc:155 main.cc:167 #, c-format msgid "Copyright (c) %s by" msgstr "Copyright (c) %s " #. GNU GNU? -#: main.cc:160 +#: main.cc:165 msgid "GNU LilyPond -- The GNU Project music typesetter" msgstr "GNU LilyPond -- De Muziekzetter van het GNU Project" -#: main.cc:69 main.cc:168 +#: main.cc:69 main.cc:173 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" @@ -499,21 +503,21 @@ msgstr "" "zoniet, schrijf dan naar de Free Software Foundation, Inc.,\n" "675 Mass Ave, Cambridge, MA 02139, USA.\n" -#: midi-item.cc:311 +#: midi-item.cc:310 #, c-format msgid "no such instrument: `%s'" msgstr "geen dergelijk instrument: `%s'" -#: midi-item.cc:366 +#: midi-item.cc:365 #, c-format msgid "unconventional key: flats: %d, sharps: %d" msgstr "vreemde toonsoort: %d mollen, %d kruizen" -#: midi-item.cc:413 +#: midi-item.cc:412 msgid "silly duration" msgstr "rare duur" -#: midi-item.cc:426 +#: midi-item.cc:425 msgid "silly pitch" msgstr "rare toonhoogte" @@ -521,11 +525,11 @@ msgstr "rare toonhoogte" msgid "Error syncing file (disk full?)" msgstr "Fout by synchroniseren van bestand (disk vol?)" -#: music-output-def.cc:50 +#: music-output-def.cc:51 msgid "Interpretation context with empty type" msgstr "Vertolk context met leeg type" -#: music-output-def.cc:77 +#: music-output-def.cc:78 #, c-format msgid "can't find `%s' context" msgstr "kan `%s' context niet vinden" @@ -545,32 +549,28 @@ msgstr "Identifier naam is een sleutelwoord: `%s'" msgid "error at EOF: %s" msgstr "fout bij EOF: %s" -#: midi-score-parser.cc:94 my-lily-parser.cc:56 +#: midi-score-parser.cc:94 my-lily-parser.cc:55 msgid "Parsing..." msgstr "Ontleden..." -#: my-lily-parser.cc:64 +#: my-lily-parser.cc:63 msgid "Braces don't match" msgstr "Haakjes paren niet" -#: paper-def.cc:85 -msgid "not a real variable" -msgstr "niet een reële veranderlijke" - -#: paper-def.cc:174 +#: paper-def.cc:149 #, c-format msgid "paper output to %s..." msgstr "papier uitvoer naar %s..." -#: mudela-stream.cc:93 paper-outputter.cc:91 performance.cc:95 +#: mudela-stream.cc:93 paper-outputter.cc:91 performance.cc:97 msgid ", at " msgstr ", bij " -#: paper-score.cc:72 +#: paper-score.cc:82 msgid "Preprocessing elements..." msgstr "Voorbewerken van elementen..." -#: paper-score.cc:97 +#: paper-score.cc:107 msgid "Outputting Score, defined at: " msgstr "Uitvoer van Score, gedefinieerd op: " @@ -579,35 +579,35 @@ msgid "Track ... " msgstr "Spoor ... " #. perhaps multiple text events? -#: performance.cc:75 +#: performance.cc:77 msgid "Creator: " msgstr "Schepper: " -#: performance.cc:90 +#: performance.cc:92 msgid "Automatically generated" msgstr "Automatisch gegenerederd" -#: performance.cc:104 +#: performance.cc:106 #, c-format msgid "from musical definition: %s" msgstr "van muzikale definitie: %s" -#: performance.cc:172 +#: performance.cc:174 #, c-format msgid "MIDI output to %s..." msgstr "MIDI uitvoer naar %s..." -#: piano-pedal-engraver.cc:158 piano-pedal-engraver.cc:170 +#: piano-pedal-engraver.cc:157 piano-pedal-engraver.cc:169 #: piano-pedal-performer.cc:87 #, c-format msgid "can't find start of piano pedal: %s" msgstr "kan start van piano pedaal niet vinden: %s" -#: property-engraver.cc:106 +#: property-engraver.cc:128 msgid "Wrong type for property" msgstr "Verkeerd type voor property" -#: repeat-engraver.cc:196 +#: repeat-engraver.cc:253 msgid "No bar engraver found. Ignoring repeats." msgstr "Geen bar engraver gevonden. Negeer herhalingen." @@ -626,43 +626,38 @@ msgstr "Huh? Geen Request: `%s'" msgid "Junking music: `%s'" msgstr "Schroot muziek: `%s'" -#: rest-collision.cc:135 +#: rest-collision.cc:159 msgid "too many colliding rests" msgstr "te veel botsende rusten" -#: rest-collision.cc:139 +#: rest-collision.cc:163 msgid "too many notes for rest collision" msgstr "te veel noten voor bosting met rusten" -#: score-engraver.cc:139 +#: score-engraver.cc:151 #, c-format msgid "unbound spanner `%s'" msgstr "ongebonden spanner `%s'" -#: score.cc:64 -msgid "no toplevel translator" -msgstr "geen hoogste niveau vertaler" - #: score.cc:67 msgid "Interpreting music..." msgstr "Vertolken van muziek..." -#: score.cc:79 +#: score.cc:81 msgid "Need music in a score" msgstr "Heb muziek nodig in een partituur" #. should we? hampers debugging. -#: score.cc:92 +#: score.cc:94 msgid "Errors found/*, not processing score*/" msgstr "Fouten gevonden, /*verwerk partituur niet */" -#: score.cc:97 +#: score.cc:100 #, c-format msgid "elapsed time: %.2f seconds" msgstr "duur: %.2f seconden" -#: scores.cc:35 -#, c-format +#: scores.cc:34 msgid "Writing dependency file: `%s'..." msgstr "Schijven van afhankelijkheden bestand: `%s'..." @@ -670,20 +665,24 @@ msgstr "Schijven van afhankelijkheden bestand: `%s'..." msgid "Score contains errors; will not process it" msgstr "Partituur bevat fouten; zal hem niet verwerken" -#: script-engraver.cc:68 +#: scores.cc:124 +msgid "Now processing: `%s'" +msgstr "Nu wordt verwerkt: `%s'" + +#: script-engraver.cc:65 #, c-format msgid "Don't know how to interpret articulation `%s'" msgstr "Weet niet hoe articulatie te vertolken `%s'" +#. this shouldn't happen, but let's continue anyway. +#: separation-item.cc:48 +msgid "Separation_item: I've been drinking too much" +msgstr "Separation_item: Ik heb te veel gedronken" + #: sequential-music-iterator.cc:83 msgid "Must stop before this music ends" msgstr "Moet stoppen voordat deze muziek ophoudt" -#. this shouldn't happen, but let's continue anyway. -#: single-malt-grouping-item.cc:51 -msgid "Single_malt_grouping_item: I've been drinking too much" -msgstr "Single_malt_grouping_item: Ik heb te veel gedronken" - #: slur-engraver.cc:82 msgid "unterminated slur" msgstr "onbeëindigde bindingsboog" @@ -697,49 +696,44 @@ msgstr "kan niet beide uiteinden vinden van %s" msgid "slur" msgstr "bindingsboog" -#: slur.cc:231 +#: slur.cc:48 msgid "Putting slur over rest. Ignoring." msgstr "Zet bindingsboog over rust. Negeer." -#: slur.cc:312 +#: slur.cc:122 msgid "Slur over rest?" msgstr "Boogje over rust?" -#: spanner.cc:35 spanner.cc:174 -#, c-format -msgid "Spanner `%s' has equal left and right spanpoints" -msgstr "Spanner `%s' heeft gelijke linker en rechter spanpunten" - -#: stem-engraver.cc:124 +#: stem-engraver.cc:128 #, c-format msgid "Adding note head to incompatible stem (type = %d)" msgstr "Voeg noot bolletje toe aan onverenigbare stok (type = %d)" -#: stem.cc:118 +#: stem.cc:116 msgid "Weird stem size; check for narrow beams" msgstr "Vreemde stoklengte; controleer op krappe waardestrepen" -#: tfm-reader.cc:115 +#: tfm-reader.cc:105 #, c-format msgid "TFM header of `%s' has only %u word(s)" msgstr "TFM kop van `%s' heeft slechts %u woord(en)" -#: tfm-reader.cc:153 +#: tfm-reader.cc:143 #, c-format 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:70 +#: tfm.cc:71 #, c-format msgid "can't find ascii character: `%d'" msgstr "kan ascii teken niet vinden: `%d'" -#: tie-engraver.cc:195 tie-performer.cc:109 +#: tie-engraver.cc:203 tie-performer.cc:109 msgid "No ties were created!" msgstr "Geen overbindingen geschapen!" -#: tie.cc:80 +#: tie-engraver.cc:242 msgid "lonely tie" msgstr "eenzame overbinding" @@ -747,12 +741,12 @@ msgstr "eenzame overbinding" msgid "no one to print a tuplet start bracket" msgstr "niemand om een x-ool start haak af te drukken" -#: time-signature-engraver.cc:28 +#: time-signature-engraver.cc:49 msgid "lost in time:" msgstr "verdwaald in de tijd:" -#: time-signature-engraver.cc:29 translator-group.cc:417 -#: translator-group.cc:426 +#: time-signature-engraver.cc:50 translator-group.cc:419 +#: translator-group.cc:428 #, c-format msgid "can't find: `%s'" msgstr "kan niet vinden: `%s'" @@ -765,104 +759,104 @@ msgstr "strijdig timing verzoek" msgid "This is the other timing request" msgstr "Dit is het andere timing verzoek" -#: timing-translator.cc:78 +#: timing-translator.cc:79 #, c-format msgid "barcheck failed at: %s" msgstr "maatstreep controle gefaald op: %s" -#: translator-ctors.cc:42 +#: translator-ctors.cc:41 #, c-format msgid "unknown translator: `%s'" msgstr "onbekende papier varanderlijke: `%s'" -#: translator-group.cc:80 translator-group.cc:93 +#: translator-group.cc:82 translator-group.cc:95 msgid "Program has no such type" msgstr "Programma heeft geen dergelijk type" -#: translator-group.cc:84 translator-group.cc:99 +#: translator-group.cc:86 translator-group.cc:101 #, c-format msgid "Already contains: `%s'" msgstr "Bevat reeds: `%s'" -#: translator-group.cc:211 +#: translator-group.cc:213 #, c-format msgid "can't find or create `%s' called `%s'" msgstr "kan niet vinden of scheppen `%s' genaamd `%s'" -#: translator-group.cc:323 +#: translator-group.cc:325 #, c-format msgid "can't find or create: `%s'" msgstr "kan niet vinden of scheppen: `%s'" -#: unfolded-repeat-iterator.cc:145 +#: unfolded-repeat-iterator.cc:146 msgid "no one to print a volta bracket" msgstr "niemand om een volta haak af te drukken" -#: parser.yy:58 +#: parser.yy:59 #, c-format msgid "Oldest supported input version: %s" msgstr "Oudst ondersteunde invoerversie: %s" -#: parser.yy:418 +#: parser.yy:426 msgid "Need a translator group for a context" msgstr "Heb een translator groep nodig voor een context" -#: parser.yy:433 +#: parser.yy:441 msgid "Wrong type for property value" msgstr "Verkeerd type voor property waarde" -#: parser.yy:607 +#: parser.yy:626 msgid "More alternatives than repeats. Junking excess alternatives." msgstr "" "Meer alternatieven dan herhalingen. Schroot overvloedige alternatieven." -#: parser.yy:652 +#: parser.yy:666 msgid "Second argument must be a symbol" msgstr "Tweede argument moet een symbool zijn" -#: parser.yy:657 +#: parser.yy:671 msgid "First argument must be a procedure taking 1 argument" msgstr "Eerste argument moet een procedure zijn met 1 argument" -#: parser.yy:957 +#: parser.yy:971 msgid "Expecting string as script definition" msgstr "Verwacht string voor script definitie" -#: parser.yy:967 +#: parser.yy:981 msgid "Can't specify direction for this request" msgstr "Kan richting voor dit verzoek niet specificeren" -#: parser.yy:1059 +#: parser.yy:1073 #, c-format msgid "Expecting %d arguments" msgstr "Verwacht %d argumenten" -#: parser.yy:1075 +#: parser.yy:1089 msgid "Must have 2 arguments for duration" msgstr "Moet 2 argumenten hebben voor duur" -#: parser.yy:1082 parser.yy:1090 parser.yy:1331 +#: parser.yy:1096 parser.yy:1104 parser.yy:1339 msgid "Have to be in Lyric mode for lyrics" msgstr "Moet in Lyric modus zijn voor liedteksten" -#: parser.yy:1231 parser.yy:1251 +#: parser.yy:1245 parser.yy:1265 #, c-format msgid "not a duration: %d" msgstr "geen duur: %d" -#: parser.yy:1260 +#: parser.yy:1274 msgid "Have to be in Note mode for notes" msgstr "Moet in Note modus zijn voor noten" -#: parser.yy:1347 +#: parser.yy:1352 msgid "Have to be in Chord mode for chords" msgstr "Moet in Chord modus zijn voor accoorden" -#: parser.yy:1508 parser.yy:1526 +#: parser.yy:1513 parser.yy:1531 msgid "need integer number arg" msgstr "heb integer getal arg nogig" -#: parser.yy:1512 +#: parser.yy:1517 msgid "Must be positive integer" msgstr "Moet positieve integer zijn" @@ -875,6 +869,7 @@ msgid "\\maininput disallowed outside init files" msgstr "\\maininput niet toegestaan buiten init bestanden" #: lexer.ll:196 +#, c-format msgid "wrong or undefined identifier: `%s'" msgstr "verkeerde of ongedefiniëerde identifier: `%s'" @@ -897,16 +892,20 @@ msgstr "Kan Scheme niet evalueren in veilige modus" msgid "invalid character: `%c'" msgstr "ongeldig teken: `%c'" -#: lexer.ll:503 +#: lexer.ll:508 #, c-format msgid "unknown escaped string: `\\%s'" msgstr "onbekende ontsnapte string: `\\%s'" -#: lexer.ll:589 +#: lexer.ll:594 #, c-format msgid "incorrect mudela version: %s (%s, %s)" msgstr "verkeerde mudela versie: %s (%s, %s)" +#: lexer.ll:595 +msgid "Consider converting the input with the convert-mudela script" +msgstr "Overweeg de invoer te converteren met het convert-mudela script" + #: main.cc:91 msgid "write exact durations, e.g.: a4*385/384" msgstr "schrijf exacte duren, bijv.: a4*385/384" @@ -1077,4 +1076,3 @@ msgstr "% Automatisch gegenereerd" #: mudela-stream.cc:97 msgid "% from input file: " msgstr "% van invoerbestand: " - diff --git a/po/ru.po b/po/ru.po index e114030df0..49b8baccbe 100644 --- a/po/ru.po +++ b/po/ru.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-06-09 02:01+0200\n" +"POT-Creation-Date: 2000-07-24 21:55+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: August S.Sigov \n" "Language-Team: Russian \n" @@ -18,11 +18,11 @@ msgstr "" msgid "EOF in a string" msgstr "EOF × ÓÔÒÏËÅ" -#: data-file.cc:116 input.cc:87 midi-parser.cc:100 warn.cc:22 +#: data-file.cc:116 input.cc:85 midi-parser.cc:100 warn.cc:22 msgid "warning: " msgstr "ÐÒÅÄÕÐÒÅÖÄÁÀ: " -#: dstream.cc:184 +#: dstream.cc:187 msgid "not enough fields in Dstream init" msgstr "ÎÅ ÄÏÓÔÁÔÏÞÎÏ ÐÏÌÅÊ × Dstream init" @@ -46,15 +46,15 @@ msgstr " msgid "invalid argument `%s' to option `%s'" msgstr "ÎÅ×ÅÒÎÙÊ ÁÒÇÕÍÅÎÔ `%s' ÄÌÑ ÏÐÃÉÉ `%s'" -#: input.cc:92 warn.cc:8 warn.cc:16 +#: input.cc:90 warn.cc:8 warn.cc:16 msgid "error: " msgstr "ÏÛÉÂËÁ: " -#: input.cc:98 +#: input.cc:96 msgid "non fatal error: " msgstr "ÎÅ ÓÍÅÒÔÅÌØÎÁÑ ÏÛÉÂËÁ: " -#: input.cc:106 source-file.cc:62 source-file.cc:155 +#: input.cc:104 source-file.cc:62 source-file.cc:155 msgid "position unknown" msgstr "ÐÏÌÏÖÅÎÉÅ ÎÅÉÚ×ÅÓÔÎÏ" @@ -63,7 +63,7 @@ msgid "can't map file" msgstr "ÎÅ ÍÏÇÕ ÏÔÏÂÒÁÚÉÔØ ÆÁÊÌ × ÐÁÍÑÔØ" #: mapped-file-storage.cc:87 midi-stream.cc:77 mudela-stream.cc:111 -#: paper-stream.cc:25 scores.cc:38 simple-file-storage.cc:44 text-stream.cc:22 +#: paper-stream.cc:25 scores.cc:37 simple-file-storage.cc:44 text-stream.cc:22 #, c-format msgid "can't open file: `%s'" msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ ÆÁÊÌ: `%s'" @@ -85,40 +85,40 @@ msgstr " msgid " (Continuing; cross thumbs)" msgstr " (ðÒÏÄÏÌÖÁÀ; ÓËÒÅÓÔÉÔÅ ÐÁÌØÃÙ)" -#: afm.cc:42 +#: afm.cc:51 #, c-format msgid "can't find character number: %d" msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÓÉÍ×ÏÌ Ó ÎÏÍÅÒÏÍ: %d" -#: afm.cc:57 +#: afm.cc:66 #, c-format msgid "can't find character called: `%s'" msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÓÉÍ×ÏÌ ÐÏÄ ÎÁÚ×ÁÎÉÅÍ: `%s'" -#: afm.cc:87 +#: afm.cc:96 msgid "Error parsing AFM file" msgstr "ïÛÉÂËÁ ÐÒÉ ÁÎÁÌÉÚÅ ÆÁÊÌÁ AFM" -#: all-font-metrics.cc:104 lookup.cc:56 +#: all-font-metrics.cc:149 lookup.cc:80 #, c-format msgid "can't find font: `%s'" msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÛÒÉÆÔ: `%s'" -#: all-font-metrics.cc:105 +#: all-font-metrics.cc:150 msgid "Loading default font" msgstr "úÁÇÒÕÖÁÀ ÛÒÉÆÔ ÐÏ ÕÍÏÌÞÁÎÉÀ" -#: all-font-metrics.cc:122 +#: all-font-metrics.cc:167 #, c-format msgid "can't find default font: `%s'" msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÛÒÉÆÔ ÐÏ ÕÍÏÌÞÁÎÉÀ: `%s'" -#: all-font-metrics.cc:123 includable-lexer.cc:49 lookup.cc:57 scores.cc:109 +#: all-font-metrics.cc:168 includable-lexer.cc:50 lookup.cc:81 scores.cc:108 #, c-format msgid "(search path: `%s')" msgstr "(ÐÕÔØ ÐÏÉÓËÁ: `%s')" -#: all-font-metrics.cc:124 +#: all-font-metrics.cc:169 msgid "Giving up" msgstr "óÄÁÀÓØ" @@ -126,39 +126,39 @@ msgstr " msgid "Can't switch translators, I'm there already" msgstr "îÅ ÍÏÇÕ ÐÅÒÅËÌÀÞÉÔØ ÐÅÒÅ×ÏÄÞÉËÏ×, Ñ ÕÖÅ ÔÁÍ" -#: beam-engraver.cc:40 beam-engraver.cc:56 +#: beam-engraver.cc:75 beam-engraver.cc:91 msgid "can't find start of beam" msgstr "ÞÔÏ-ÔÏ ÎÅ ÎÁÊÄÕ ÎÁÞÁÌÏ ÇÒÕÐÐÉÒÏ×ËÉ ÛÔÉÌÅÊ" -#: beam-engraver.cc:85 +#: beam-engraver.cc:120 msgid "already have a beam" msgstr "ÕÖÅ ÉÍÅÅÍ ÇÒÕÐÐÕ ÛÔÉÌÅÊ" -#: beam-engraver.cc:141 +#: beam-engraver.cc:177 msgid "unterminated beam" msgstr "ÎÅÚÁËÏÎÞÅÎÎÁÑ ÇÒÕÐÐÉÒÏ×ËÁ ÛÔÉÌÅÊ" -#: beam-engraver.cc:169 chord-tremolo-engraver.cc:167 +#: beam-engraver.cc:210 chord-tremolo-engraver.cc:172 msgid "stem must have Rhythmic structure" msgstr "ÛÔÉÌØ ÄÏÌÖÅÎ ÉÍÅÔØ ÒÉÔÍÏ×ÕÀ ÓÔÒÕËÔÕÒÕ" -#: beam-engraver.cc:180 +#: beam-engraver.cc:221 msgid "stem doesn't fit in beam" msgstr "ÛÔÉÌØ ÎÅ ×ÌÅÚÁÅÔ × ÇÒÕÐÐÉÒÏ×ËÕ" -#: beam-engraver.cc:181 +#: beam-engraver.cc:222 msgid "beam was started here" msgstr "ÇÒÕÐÐÉÒÏ×ËÁ ÎÁÞÉÎÁÌÁÓØ ÚÄÅÓØ" -#: beam.cc:90 +#: beam.cc:84 msgid "beam has less than two stems" msgstr "ÇÒÕÐÐÉÒÏ×ËÁ ÍÅÎÅÅ Ä×ÕÈ ÛÔÉÌÅÊ" -#: beam.cc:483 +#: beam.cc:510 msgid "weird beam vertical offset" msgstr "ÄÉËÏÅ ×ÅÒÔÉËÁÌØÎÏÅ ÓÍÅÝÅÎÉÅ ÇÒÕÐÐÉÒÏ×ËÉ ÛÔÉÌÅÊ" -#: break-align-item.cc:87 +#: break-align-item.cc:119 #, fuzzy, c-format msgid "unknown spacing pair `%s', `%s'" msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ ÐÅÒÅÍÅÎÎÁÑ ÂÕÍÁÇÉ: `%s'" @@ -182,42 +182,42 @@ msgstr " msgid "none of these in my family" msgstr "ÏÎÉ ÍÎÅ ÎÅ ÒÏÄÓÔ×ÅÎÎÉËÉ" -#: chord-tremolo-engraver.cc:111 +#: chord-tremolo-engraver.cc:115 msgid "unterminated chord tremolo" msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ ÔÒÅÍÏÌÏ ÁËËÏÒÄÁ" -#: chord-tremolo-iterator.cc:41 +#: chord-tremolo-iterator.cc:42 #, fuzzy msgid "no one to print a tremolos" msgstr "ÎÅËÏÍÕ ÒÉÓÏ×ÁÔØ ÓËÏÂÕ ÐÏ×ÔÏÒÁ" -#: chord.cc:151 +#: chord.cc:152 #, c-format msgid "invalid subtraction: not part of chord: %s" msgstr "ÎÅ×ÅÒÎÏÅ ×ÙÞÉÔÁÎÉÅ: ÎÅ ÞÁÓÔØ ÁËËÏÒÄÁ: %s" -#: chord.cc:375 +#: chord.cc:376 #, c-format msgid "invalid inversion pitch: not part of chord: %s" msgstr "" -#: clef-engraver.cc:166 +#: clef-engraver.cc:167 msgid "unknown clef type" msgstr "ÎÅÉÚ×ÅÓÔÎÙÊ ÔÉÐ ËÌÀÞÁ" -#: collision.cc:111 +#: collision.cc:118 msgid "Too many clashing notecolumns. Ignoring them." msgstr "óÌÉÛËÏÍ ÍÎÏÇÏ ÐÅÒÅÓÅËÁÀÝÉÈÓÑ ÓÔÏÌÂÃÏ× ÎÏÔ. éÇÎÏÒÉÒÕÀ." -#: crescendo.cc:69 +#: crescendo.cc:65 msgid "crescendo" msgstr "ËÒÅÝÅÎÄÏ" -#: crescendo.cc:69 +#: crescendo.cc:65 msgid "too small" msgstr "ÓÌÉÛËÏÍ ÍÁÌÏ" -#: cross-staff.cc:19 +#: cross-staff.cc:22 msgid "" "minVerticalAlign != maxVerticalAlign: cross staff spanners may be broken" msgstr "" @@ -235,27 +235,27 @@ msgstr " msgid "NaN" msgstr "NaN" -#: dynamic-engraver.cc:281 span-dynamic-performer.cc:87 +#: dynamic-engraver.cc:184 span-dynamic-performer.cc:87 msgid "can't find start of (de)crescendo" msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÎÁÞÁÌÏ (ÄÅ)ËÒÅÝÅÎÄÏ" -#: dynamic-engraver.cc:300 +#: dynamic-engraver.cc:203 msgid "already have a crescendo" msgstr "ËÒÅÝÅÎÄÏ ÕÖÅ ÅÓÔØ" -#: dynamic-engraver.cc:301 +#: dynamic-engraver.cc:204 msgid "already have a decrescendo" msgstr "ÄÅËÒÅÝÅÎÄÏ ÕÖÅ ÅÓÔØ" -#: dynamic-engraver.cc:381 +#: dynamic-engraver.cc:289 msgid "unterminated (de)crescendo" msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ (ÄÅ)ËÒÅÝÅÎÄÏ" -#: extender-engraver.cc:96 +#: extender-engraver.cc:98 msgid "unterminated extender" msgstr "ÎÅÚÁ×ÅÒÛÅÎÎÙÊ ÒÁÓÛÉÒÉÔÅÌØ" -#: extender-engraver.cc:108 +#: extender-engraver.cc:110 msgid "Nothing to connect extender to on the left. Ignoring extender request." msgstr "îÅËÕÄÁ ÐÒÉÓÏÅÄÉÎÉÔØ ÒÁÓÛÉÒÉÔÅÌØ ÓÌÅ×Á. éÇÎÏÒÉÒÕÀ ÚÁÐÒÏÓ ÒÁÓÛÉÒÉÔÅÌÑ." @@ -271,166 +271,153 @@ msgstr " msgid "no Grace context available" msgstr "ÎÅÔ ÄÏÓÔÕÐÎÏÇÏ æÏÒÛÌÁÇ-ËÏÎÔÅËÓÔÁ" -#: grace-position-engraver.cc:93 +#: grace-position-engraver.cc:94 msgid "Unattached grace notes. Attaching to last musical column." msgstr "æÏÒÛÌÁÇ ÂÅÚ ÐÒÉ×ÑÚËÉ. ðÒÉ×ÑÚÙ×ÁÀ Ë ÐÏÓÌÅÄÎÅÍÕ ÍÕÚÙËÁÌØÎÏÍÕ ÓÔÏÌÂÃÕ." -#: hyphen-engraver.cc:59 +#: hyphen-engraver.cc:90 msgid "unterminated hyphen" msgstr "ÐÅÒÅÎÏÓ ÂÅÚ ÏËÏÎÞÁÎÉÑ" -#: hyphen-engraver.cc:71 +#: hyphen-engraver.cc:102 msgid "Nothing to connect hyphen to on the left. Ignoring hyphen request." msgstr "îÅ Ë ÞÅÍÕ ÐÒÉÓÏÅÄÉÎÉÔØ ÐÅÒÅÎÏÓ ÓÌÅ×Á. éÇÎÏÒÉÒÕÀ ÚÁÐÒÏÓ ÐÅÒÅÎÏÓÁ." -#: identifier.cc:44 +#: identifier.cc:49 #, c-format msgid "wrong identifier type, expected: `%s'" msgstr "ÎÅ×ÅÒÎÙÊ ÔÉÐ ÐÅÒÅÍÅÎÎÏÊ, ÏÖÉÄÁÌÓÑ: `%s'" -#: includable-lexer.cc:47 lily-guile.cc:121 lily-guile.cc:144 -#: midi-score-parser.cc:24 scores.cc:108 scores.cc:114 +#: includable-lexer.cc:48 lily-guile.cc:117 midi-score-parser.cc:24 +#: scores.cc:107 scores.cc:113 #, c-format msgid "can't find file: `%s'" msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÆÁÊÌ: `%s'" -#: key-def.cc:31 -msgid "No key name, assuming `C'" -msgstr "îÅÔ ÎÁÚ×ÁÎÉÑ ËÌÀÞÁ, ÐÏÄÒÁÚÕÍÅ×ÁÀ `C'" - -#: key-def.cc:92 -msgid "Don't know how handle empty keys" -msgstr "îÅ ÚÎÁÀ, ÞÔÏ ÄÅÌÁÔØ Ó ÐÕÓÔÙÍÉ ËÌÀÞÁÍÉ" - -#: key-engraver.cc:74 key-performer.cc:65 +#: key-engraver.cc:92 key-performer.cc:54 msgid "FIXME: key change merge" msgstr "éóðòá÷øíåîñ: ÓÌÉÑÎÉÅ ÓÍÅÎÙ ËÌÀÞÁ" -#: lily-guile.cc:123 lily-guile.cc:146 +#: lily-guile.cc:119 #, c-format msgid "(load path: `%s')" msgstr "(ÐÕÔØ ÚÁÇÒÕÚËÉ: `%s')" -#: line-of-score.cc:90 +#: line-of-score.cc:96 #, c-format msgid "Element count %d." msgstr "" -#: line-of-score.cc:207 paper-score.cc:70 +#: line-of-score.cc:255 paper-score.cc:79 #, c-format msgid "Element count %d " msgstr "" -#: line-of-score.cc:221 +#: line-of-score.cc:269 msgid "Calculating column positions..." msgstr "÷ÙÞÉÓÌÑÀ ÐÏÚÉÃÉÉ ÓÔÏÌÂÃÏ×" -#: local-key-engraver.cc:82 -msgid "out of tune:" -msgstr "×ÎÅ ÔÏÎÁÌØÎÏÓÔÉ:" - -#: local-key-engraver.cc:83 time-signature-engraver.cc:29 -#: translator-group.cc:416 translator-group.cc:425 -#, c-format -msgid "can't find: `%s'" -msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ: `%s'" - -#: lookup.cc:58 +#: lookup.cc:82 msgid "Aborting" msgstr "óÏ×ÅÒÛÁÀ ÈÁÒÁËÉÒÉ" -#: lookup.cc:198 +#: lookup.cc:223 #, c-format msgid "Non-matching braces in text `%s', adding braces" msgstr "æÉÇÕÒÎÙÅ ÓËÏÂËÉ × ÔÅËÓÔÅ `%s' ÎÅ ÓÏ×ÐÁÄÁÀÔ, ÄÏÂÁ×ÌÑÀ ÓËÏÂËÉ" -#: main.cc:71 main.cc:92 +#: lyric-phrasing-engraver.cc:147 +msgid "lyrics found without matching notehead ... aligning on self" +msgstr "" + +#: main.cc:75 main.cc:92 msgid "enable debugging output" msgstr "×ËÌÀÞÉÔØ ×Ù×ÏÄ ÏÔÌÁÄÏÞÎÏÊ ÉÎÆÏÒÍÁÃÉÉ" -#: main.cc:72 +#: main.cc:76 msgid "EXT" msgstr "òáóû" -#: main.cc:72 +#: main.cc:76 #, fuzzy msgid "use output format EXT (scm, ps, tex or as)" msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ ×ÙÈÏÄÎÏÊ ÆÏÒÍÁÔ òáóû" -#: main.cc:73 main.cc:93 +#: main.cc:77 main.cc:93 msgid "this help" msgstr "ÜÔÁ ÓÐÒÁ×ËÁ" -#: main.cc:74 +#: main.cc:78 msgid "DIR" msgstr "ëáô" -#: main.cc:74 +#: main.cc:78 msgid "add DIR to search path" msgstr "ÄÏÂÁ×ÉÔØ ëáô Ë ÐÕÔÉ ÐÏÉÓËÁ" -#: main.cc:75 main.cc:96 +#: main.cc:79 main.cc:96 msgid "FILE" msgstr "æáêì" -#: main.cc:75 +#: main.cc:79 msgid "use FILE as init file" msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ æáêì ËÁË ÆÁÊÌ ÉÎÉÃÉÁÌÉÚÁÃÉÉ" -#: main.cc:76 +#: main.cc:80 msgid "write Makefile dependencies for every input file" msgstr "ÚÁÐÉÓÙ×ÁÔØ ÚÁ×ÉÓÉÍÏÓÔÉ Makefile ÄÌÑ ËÁÖÄÏÇÏ ×ÈÏÄÎÏÇÏ ÆÁÊÌÁ" -#: main.cc:77 +#: main.cc:81 msgid "produce MIDI output only" msgstr "ÐÒÏÉÚ×ÏÄÉÔØ ×Ù×ÏÄ ÔÏÌØËÏ MIDI" -#: main.cc:78 +#: main.cc:82 msgid "BASENAME" msgstr "ïóîï÷á" -#: main.cc:78 +#: main.cc:82 msgid "write output to BASENAME[-x].extension" msgstr "ÚÁÐÉÓÙ×ÁÔØ ×Ù×ÏÄ × ïóîï÷á[-x].ÒÁÓÛÉÒÅÎÉÅ" -#: main.cc:79 +#: main.cc:83 msgid "show all changes in relative syntax" msgstr "ÐÏËÁÚÙ×ÁÔØ ×ÓÅ ÉÚÍÅÎÅÎÉÑ × ÏÔÎÏÓÉÔÅÌØÎÏÍ ÓÉÎÔÁËÓÉÓÅ" -#: main.cc:80 +#: main.cc:84 msgid "inhibit file output naming and exporting" msgstr "ÓËÒÙÔØ ÉÍÅÎÏ×ÁÎÉÅ É ÜËÓÐÏÒÔ ×Ù×ÏÄÁ × ÆÁÊÌ" -#: main.cc:81 main.cc:100 +#: main.cc:85 main.cc:100 msgid "don't timestamp the output" msgstr "ÎÅ ÏÔÍÅÞÁÔØ ÄÁÔÕ É ×ÒÅÍÑ ×Ù×ÏÄÁ" -#: main.cc:82 +#: main.cc:86 msgid "switch on experimental features" msgstr "×ËÌÀÞÉÔØ ÜËÓÐÅÒÉÍÅÎÔÁÌØÎÙÅ ×ÏÚÍÏÖÎÏÓÔÉ" -#: main.cc:83 -msgid "ignore mudela version" -msgstr "ÉÇÎÏÒÉÒÏ×ÁÔØ ×ÅÒÓÉÀ mudela" - -#: main.cc:84 main.cc:101 +#: main.cc:87 main.cc:101 msgid "print version number" msgstr "×Ù×ÏÄÉÔØ ÎÏÍÅÒ ×ÅÒÓÉÉ" -#: main.cc:85 main.cc:103 +#: main.cc:88 +#, fuzzy +msgid "verbose" +msgstr "ÂÙÔØ ÂÏÌÔÌÉ×ÙÍ" + +#: main.cc:89 main.cc:103 msgid "show warranty and copyright" msgstr "ÐÏËÁÚÁÔØ ÇÁÒÁÎÔÉÀ É copyright" -#: main.cc:100 +#: main.cc:105 #, c-format msgid "Usage: %s [OPTION]... [FILE]..." msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ïðãéñ]... [æáêì]..." -#: main.cc:102 +#: main.cc:107 msgid "Typeset music and or play MIDI from FILE" msgstr "îÁÂÉÒÁÔØ ÍÕÚÙËÕ É/ÉÌÉ ÐÒÏÉÇÒÙ×ÁÔØ MIDI ÉÚ æáêìÁ" -#: main.cc:106 +#: main.cc:111 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" @@ -440,20 +427,20 @@ msgstr "" "ÎÁ ÂÕÍÁÇÅ, ÉÓÐÏÌØÚÕÑ ×ÙÓÏËÏÕÒÏ×ÎÅ×ÙÊ ÆÁÊÌ ÏÐÉÓÁÎÉÑ ÎÁ ××ÏÄÅ. Lilypond\n" "Ñ×ÌÑÅÔÓÑ ÞÁÓÔØÀ ðÒÏÅËÔÁ GNU.\n" -#: main.cc:112 main.cc:116 +#: main.cc:116 main.cc:117 msgid "Options:" msgstr "ïÐÃÉÉ:" -#: main.cc:116 +#: main.cc:121 msgid "This binary was compiled with the following options:" msgstr "üÔÏÔ ÉÓÐÏÌÎÑÅÍÙÊ ÆÁÊÌ ÂÙÌ ÓÏÂÒÁÎ ÓÏ ÓÌÅÄÕÀÝÉÍÉ ÏÐÃÉÑÍÉ:" -#: main.cc:120 main.cc:135 +#: main.cc:120 main.cc:140 #, c-format msgid "Report bugs to %s" msgstr "óÏÏÂÝÁÊÔÅ Ï ÏÛÉÂËÁÈ ÐÏ %s" -#: main.cc:53 main.cc:143 +#: main.cc:53 main.cc:148 #, c-format msgid "" "This is free software. It is covered by the GNU General Public License,\n" @@ -465,17 +452,17 @@ msgstr "" "ÐÒÉ ÓÏÂÌÀÄÅÎÉÉ ÎÅËÏÔÏÒÙÈ ÕÓÌÏ×ÉÊ. ÷ÙÚÙ×ÁÊÔÅ ËÁË `%s --warranty' ÄÌÑ\n" "ÐÏÌÕÞÅÎÉÑ ÄÏÐÏÌÎÉÔÅÌØÎÏÊ ÉÎÆÏÒÍÁÃÉÉ.\n" -#: main.cc:60 main.cc:150 main.cc:162 +#: main.cc:60 main.cc:155 main.cc:167 #, c-format msgid "Copyright (c) %s by" msgstr "÷ÓÅ ÐÒÁ×Á ÚÁÝÉÝÅÎÙ (c) %s by" #. GNU GNU? -#: main.cc:160 +#: main.cc:165 msgid "GNU LilyPond -- The GNU Project music typesetter" msgstr "GNU LilyPond -- îÁÂÏÒÝÉË ÍÕÚÙËÉ ðÒÏÅËÔÁ GNU" -#: main.cc:69 main.cc:168 +#: main.cc:69 main.cc:173 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" @@ -492,7 +479,7 @@ msgid "" "USA.\n" msgstr "" -#: midi-item.cc:311 +#: midi-item.cc:310 #, c-format msgid "no such instrument: `%s'" msgstr "ÎÅÔ ÔÁËÏÇÏ ÉÎÓÔÒÕÍÅÎÔÁ: `%s'" @@ -502,11 +489,11 @@ msgstr " msgid "unconventional key: flats: %d, sharps: %d" msgstr "ÎÅÓÔÁÎÄÁÒÔÎÙÊ ËÌÀÞ: ÂÅÍÏÌÉ: %d, ÄÉÅÚÙ: %d" -#: midi-item.cc:410 +#: midi-item.cc:412 msgid "silly duration" msgstr "ÇÌÕÐÁÑ ÐÒÏÄÏÌÖÉÔÅÌØÎÏÓÔØ" -#: midi-item.cc:423 +#: midi-item.cc:425 msgid "silly pitch" msgstr "ÇÌÕÐÙÊ ÔÏÎ" @@ -514,11 +501,11 @@ msgstr " msgid "Error syncing file (disk full?)" msgstr "ïÛÉÂËÁ ÓÉÎÈÒÏÎÉÚÁÃÉÉ ÆÁÊÌÁ (ÄÉÓË ÐÅÒÅÐÏÌÎÅÎ?)" -#: music-output-def.cc:57 +#: music-output-def.cc:51 msgid "Interpretation context with empty type" msgstr "" -#: music-output-def.cc:87 +#: music-output-def.cc:78 #, c-format msgid "can't find `%s' context" msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ËÏÎÔÅËÓÔ `%s'" @@ -528,47 +515,38 @@ msgstr " msgid "Transposition by %s makes accidental larger than two" msgstr "" -#: my-lily-lexer.cc:129 +#: my-lily-lexer.cc:118 #, c-format msgid "Identifier name is a keyword: `%s'" msgstr "éÍÑ ËÏÍÁÎÄÙ Ñ×ÌÑÅÔÓÑ ËÌÀÞÅ×ÙÍ ÓÌÏ×ÏÍ: `%s'" -#: my-lily-lexer.cc:148 +#: my-lily-lexer.cc:137 #, c-format msgid "error at EOF: %s" msgstr "ÏÛÍÂËÁ × ËÏÎÃÅ ÆÁÊÌÁ: %s" -#: midi-score-parser.cc:94 my-lily-parser.cc:56 +#: midi-score-parser.cc:94 my-lily-parser.cc:55 msgid "Parsing..." msgstr "òÁÚÂÉÒÁÀ..." -#: my-lily-parser.cc:64 +#: my-lily-parser.cc:63 msgid "Braces don't match" msgstr "æÉÇÕÒÎÙÅ ÓËÏÂËÉ ÎÅ ÓÏ×ÐÁÄÁÀÔ" -#: paper-def.cc:70 -#, c-format -msgid "unknown paper variable: `%s'" -msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ ÐÅÒÅÍÅÎÎÁÑ ÂÕÍÁÇÉ: `%s'" - -#: paper-def.cc:74 -msgid "not a real variable" -msgstr "ÎÅ ÎÁÓÔÏÑÝÁÑ ÐÅÒÅÍÅÎÎÁÑ" - -#: paper-def.cc:165 +#: paper-def.cc:149 #, c-format msgid "paper output to %s..." msgstr "\"ÂÕÍÁÖÎÙÊ\" ×Ù×ÏÄ × %s..." -#: mudela-stream.cc:93 paper-outputter.cc:92 performance.cc:95 +#: mudela-stream.cc:93 paper-outputter.cc:91 performance.cc:97 msgid ", at " msgstr ", ×" -#: paper-score.cc:72 +#: paper-score.cc:82 msgid "Preprocessing elements..." msgstr "ðÒÅÄ×ÁÒÉÔÅÌØÎÏ ÏÂÒÁÂÁÔÙ×ÁÀ ÜÌÅÍÅÎÔÙ..." -#: paper-score.cc:97 +#: paper-score.cc:107 msgid "Outputting Score, defined at: " msgstr "" @@ -577,35 +555,35 @@ msgid "Track ... " msgstr "äÏÒÏÖËÁ ..." #. perhaps multiple text events? -#: performance.cc:75 +#: performance.cc:77 msgid "Creator: " msgstr "óÏÚÄÁÔÅÌØ: " -#: performance.cc:90 +#: performance.cc:92 msgid "Automatically generated" msgstr "á×ÔÏÍÁÔÉÞÅÓËÉ ÓÇÅÎÅÒÉÒÏ×ÁÎÏ" -#: performance.cc:104 +#: performance.cc:106 #, c-format msgid "from musical definition: %s" msgstr "ÉÚ ÍÕÚÙËÁÌØÎÏÊ ÎÏÔÁÃÉÉ %s" -#: performance.cc:172 +#: performance.cc:174 #, c-format msgid "MIDI output to %s..." msgstr "×Ù×ÏÄ MIDI × %s..." -#: piano-pedal-engraver.cc:158 piano-pedal-engraver.cc:170 +#: piano-pedal-engraver.cc:157 piano-pedal-engraver.cc:169 #: piano-pedal-performer.cc:87 #, fuzzy, c-format msgid "can't find start of piano pedal: %s" msgstr "ÞÔÏ-ÔÏ ÎÅ ÎÁÊÄÕ ÎÁÞÁÌÏ ÇÒÕÐÐÉÒÏ×ËÉ ÛÔÉÌÅÊ" -#: property-engraver.cc:106 +#: property-engraver.cc:128 msgid "Wrong type for property" msgstr "îÅ×ÅÒÎÙÊ ÔÉÐ ÄÌÑ Ó×ÏÊÓÔ×Á" -#: repeat-engraver.cc:196 +#: repeat-engraver.cc:253 msgid "No bar engraver found. Ignoring repeats." msgstr "" @@ -624,64 +602,66 @@ msgstr " msgid "Junking music: `%s'" msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÍÕÚÙËÕ: `%s'" -#: rest-collision.cc:135 +#: rest-collision.cc:159 msgid "too many colliding rests" msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ ÎÁÌÅÚÁÀÝÉÈ ÐÁÕÚ" -#: rest-collision.cc:139 +#: rest-collision.cc:163 msgid "too many notes for rest collision" msgstr "" -#: score-engraver.cc:139 +#: score-engraver.cc:151 #, c-format msgid "unbound spanner `%s'" msgstr "" -#: score.cc:64 -msgid "no toplevel translator" -msgstr "" - #: score.cc:67 msgid "Interpreting music..." msgstr "éÎÔÅÒÐÒÅÔÉÒÕÀ ÍÕÚÙËÕ..." -#: score.cc:79 +#: score.cc:81 msgid "Need music in a score" msgstr "" #. should we? hampers debugging. -#: score.cc:92 +#: score.cc:94 msgid "Errors found/*, not processing score*/" msgstr "îÁÊÄÅÎÙ ÏÛÉÂËÉ/*, ÎÅ ÏÂÒÁÂÁÔÙ×ÁÀ ÎÏÔÙ*/" -#: score.cc:97 +#: score.cc:100 #, c-format msgid "elapsed time: %.2f seconds" msgstr "ÚÁÔÒÁÞÅÎÎÏÅ ×ÒÅÍÑ: %.2f ÓÅËÕÎÄ" -#: scores.cc:35 -#, c-format -msgid "Writing dependency file: `%s'..." +#: scores.cc:34 +#, fuzzy, c-format +msgid "Writing dependency file: `%s'...\n" msgstr "úÁÐÉÓÙ×ÁÀ ÆÁÊÌ ÚÁ×ÉÓÉÍÏÓÔÅÊ: `%s'..." -#: scores.cc:79 +#: scores.cc:78 msgid "Score contains errors; will not process it" msgstr "" -#: script-engraver.cc:68 +#: scores.cc:123 #, c-format -msgid "Don't know how to interpret articulation `%s'" +msgid "Now processing: `%s'\n" msgstr "" -#: sequential-music-iterator.cc:83 -msgid "Must stop before this music ends" +#: script-engraver.cc:65 +#, c-format +msgid "Don't know how to interpret articulation `%s'" msgstr "" #. this shouldn't happen, but let's continue anyway. -#: single-malt-grouping-item.cc:51 -msgid "Single_malt_grouping_item: I've been drinking too much" +#: separation-item.cc:48 +#, fuzzy +msgid "Separation_item: I've been drinking too much" msgstr "Single_malt_grouping_item: Ñ ÌÉÛËÏÍ ÍÎÏÇÏ ×ÙÐÉÌ" +#: sequential-music-iterator.cc:83 +msgid "Must stop before this music ends" +msgstr "" + #: slur-engraver.cc:82 msgid "unterminated slur" msgstr "ÎÅÚÁ×ÅÒÛÅÎÎÁÑ ÌÉÇÁ" @@ -695,48 +675,43 @@ msgstr " msgid "slur" msgstr "ÌÉÇÁ" -#: slur.cc:231 +#: slur.cc:48 msgid "Putting slur over rest. Ignoring." msgstr "ìÉÇÁ ÎÁÄ ÐÁÕÚÏÊ. éÇÎÏÒÉÒÕÀ." -#: slur.cc:312 +#: slur.cc:122 msgid "Slur over rest?" msgstr "ìÉÇÁ ÎÁÄ ÐÁÕÚÏÊ?" -#: spanner.cc:35 spanner.cc:174 -#, c-format -msgid "Spanner `%s' has equal left and right spanpoints" -msgstr "" - -#: stem-engraver.cc:124 +#: stem-engraver.cc:128 #, c-format msgid "Adding note head to incompatible stem (type = %d)" msgstr "äÏÂÁ×ÌÑÀ ÎÏÔÕ Ë ÎÅÓÏ×ÍÅÓÔÉÍÏÍÕ ÛÔÉÌÀ (ÔÉÐ = %d)" -#: stem.cc:118 +#: stem.cc:116 msgid "Weird stem size; check for narrow beams" msgstr "" -#: tfm-reader.cc:115 +#: tfm-reader.cc:105 #, c-format msgid "TFM header of `%s' has only %u word(s)" msgstr "" -#: tfm-reader.cc:153 +#: tfm-reader.cc:143 #, c-format msgid "%s: TFM file has %u parameters, which is more than the %u I can handle" msgstr "" -#: tfm.cc:70 +#: tfm.cc:71 #, c-format msgid "can't find ascii character: `%d'" msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÓÉÍ×ÏÌ ASCII: `%d'" -#: tie-engraver.cc:195 tie-performer.cc:109 +#: tie-engraver.cc:203 tie-performer.cc:109 msgid "No ties were created!" msgstr "" -#: tie.cc:80 +#: tie-engraver.cc:242 msgid "lonely tie" msgstr "" @@ -744,10 +719,16 @@ msgstr "" msgid "no one to print a tuplet start bracket" msgstr "" -#: time-signature-engraver.cc:28 +#: time-signature-engraver.cc:49 msgid "lost in time:" msgstr "" +#: time-signature-engraver.cc:50 translator-group.cc:419 +#: translator-group.cc:428 +#, c-format +msgid "can't find: `%s'" +msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ: `%s'" + #: timing-translator.cc:36 msgid "conflicting timing request" msgstr "" @@ -756,90 +737,106 @@ msgstr "" msgid "This is the other timing request" msgstr "" -#: timing-translator.cc:78 +#: timing-translator.cc:79 #, c-format msgid "barcheck failed at: %s" msgstr "" -#: translator-ctors.cc:42 +#: translator-ctors.cc:41 #, c-format msgid "unknown translator: `%s'" msgstr "" -#: translator-group.cc:81 translator-group.cc:94 +#: translator-group.cc:82 translator-group.cc:95 msgid "Program has no such type" msgstr "" -#: translator-group.cc:85 translator-group.cc:100 +#: translator-group.cc:86 translator-group.cc:101 #, c-format msgid "Already contains: `%s'" msgstr "õÖÅ ÓÏÄÅÒÖÉÔ: `%s'" -#: translator-group.cc:210 +#: translator-group.cc:213 #, c-format msgid "can't find or create `%s' called `%s'" msgstr "" -#: translator-group.cc:322 +#: translator-group.cc:325 #, c-format msgid "can't find or create: `%s'" msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÉÌÉ ÓÏÚÄÁÔØ: `%s'" -#: unfolded-repeat-iterator.cc:145 +#: unfolded-repeat-iterator.cc:146 msgid "no one to print a volta bracket" msgstr "" -#: parser.yy:58 +#: parser.yy:59 #, c-format msgid "Oldest supported input version: %s" msgstr "" -#: parser.yy:427 +#: parser.yy:426 msgid "Need a translator group for a context" msgstr "" -#: parser.yy:448 +#: parser.yy:441 msgid "Wrong type for property value" msgstr "" -#: parser.yy:694 +#: parser.yy:626 msgid "More alternatives than repeats. Junking excess alternatives." msgstr "" -#: parser.yy:739 +#: parser.yy:666 msgid "Second argument must be a symbol" msgstr "÷ÔÏÒÏÊ ÁÒÇÕÍÅÎÔ ÄÏÌÖÅÎ ÂÙÔØ ÓÉÍ×ÏÌÏÍ" -#: parser.yy:744 +#: parser.yy:671 msgid "First argument must be a procedure taking 1 argument" msgstr "" -#: parser.yy:1069 +#: parser.yy:971 +msgid "Expecting string as script definition" +msgstr "" + +#: parser.yy:981 msgid "Can't specify direction for this request" msgstr "îÅ ÍÏÇÕ ÕËÁÚÁÔØ ÎÁÐÒÁ×ÌÅÎÉÅ ÄÌÑ ÜÔÏÇÏ ÚÁÐÒÏÓÁ" -#: parser.yy:1170 +#: parser.yy:1073 #, c-format msgid "Expecting %d arguments" msgstr "" -#: parser.yy:1193 parser.yy:1201 parser.yy:1443 +#: parser.yy:1089 +msgid "Must have 2 arguments for duration" +msgstr "" + +#: parser.yy:1096 parser.yy:1104 parser.yy:1339 msgid "Have to be in Lyric mode for lyrics" msgstr "äÏÌÖÅÎ ÂÙÔØ × ìÉÒÉÞÅÓËÏÍ ÒÅÖÉÍÅ ÄÌÑ ÌÉÒÉËÉ" -#: parser.yy:1342 parser.yy:1362 +#: parser.yy:1245 parser.yy:1265 #, c-format msgid "not a duration: %d" msgstr "ÎÅ ÐÒÏÄÏÌÖÉÔÅÌØÎÏÓÔØ: %d" -#: parser.yy:1371 +#: parser.yy:1274 msgid "Have to be in Note mode for notes" msgstr "äÏÌÖÅÎ ÂÙÔØ × îÏÔÎÏÍ ÒÅÖÉÍÅ ÄÌÑ ÎÏÔ" -#: parser.yy:1459 +#: parser.yy:1352 msgid "Have to be in Chord mode for chords" msgstr "äÏÌÖÅÎ ÂÙÔØ × áËËÏÒÄÎÏÍ ÒÅÖÉÍÅ ÄÌÑ ÁËËÏÒÄÏ×" +#: parser.yy:1513 parser.yy:1531 +msgid "need integer number arg" +msgstr "" + +#: parser.yy:1517 +msgid "Must be positive integer" +msgstr "" + #: lexer.ll:158 msgid "EOF found inside a comment" msgstr "ëÏÎÅà ÆÁÊÌÁ ×ÎÕÔÒÉ ËÏÍÍÅÎÔÁÒÉÑ" @@ -848,40 +845,44 @@ msgstr " msgid "\\maininput disallowed outside init files" msgstr "" -#: lexer.ll:202 -#, c-format -msgid "undefined identifier: `%s'" +#: lexer.ll:196 +#, fuzzy, c-format +msgid "wrong or undefined identifier: `%s'" msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ ÍÅÔËÁ/ËÏÍÁÎÄÁ: `%s'" #. backup rule -#: lexer.ll:207 +#: lexer.ll:201 msgid "Missing end quote" msgstr "ïÔÓÕÔÓ×ÕÅÔ ÚÁËÌÀÞÉÔÅÌØÎÁÑ ËÁ×ÙÞËÁ" #. backup rule -#: lexer.ll:229 lexer.ll:233 +#: lexer.ll:223 lexer.ll:227 msgid "white expected" msgstr "× ÔÏ ×ÒÅÍÑ ËÁË ÏÖÉÄÁÌÏÓØ" -#: lexer.ll:241 +#: lexer.ll:235 msgid "Can't evaluate Scheme in safe mode" msgstr "îÅ ÍÏÇÕ ×ÙÐÏÌÎÑÔØ ËÏÄ ÓÈÅÍÙ × ÂÅÚÏÐÁÓÎÏÍ ÒÅÖÉÍÅ" -#: lexer.ll:436 +#: lexer.ll:431 #, c-format msgid "invalid character: `%c'" msgstr "ÎÅ×ÅÒÎÙÊ ÓÉÍ×ÏÌ: `%c'" -#: lexer.ll:494 +#: lexer.ll:508 #, c-format msgid "unknown escaped string: `\\%s'" msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ escape-ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ: `\\%s'" -#: lexer.ll:580 +#: lexer.ll:594 #, c-format msgid "incorrect mudela version: %s (%s, %s)" msgstr "ÎÅ×ÅÒÎÁÑ ×ÅÒÓÉÑ mudela: %s (%s, %s)" +#: lexer.ll:595 +msgid "Consider converting the input with the convert-mudela script" +msgstr "" + #: main.cc:91 msgid "write exact durations, e.g.: a4*385/384" msgstr "" @@ -1054,6 +1055,24 @@ msgstr "% msgid "% from input file: " msgstr "% ÉÚ ×ÈÏÄÎÏÇÏ ÆÁÊÌÁ: " +#~ msgid "No key name, assuming `C'" +#~ msgstr "îÅÔ ÎÁÚ×ÁÎÉÑ ËÌÀÞÁ, ÐÏÄÒÁÚÕÍÅ×ÁÀ `C'" + +#~ msgid "Don't know how handle empty keys" +#~ msgstr "îÅ ÚÎÁÀ, ÞÔÏ ÄÅÌÁÔØ Ó ÐÕÓÔÙÍÉ ËÌÀÞÁÍÉ" + +#~ msgid "out of tune:" +#~ msgstr "×ÎÅ ÔÏÎÁÌØÎÏÓÔÉ:" + +#~ msgid "ignore mudela version" +#~ msgstr "ÉÇÎÏÒÉÒÏ×ÁÔØ ×ÅÒÓÉÀ mudela" + +#~ msgid "unknown paper variable: `%s'" +#~ msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ ÐÅÒÅÍÅÎÎÁÑ ÂÕÍÁÇÉ: `%s'" + +#~ msgid "not a real variable" +#~ msgstr "ÎÅ ÎÁÓÔÏÑÝÁÑ ÐÅÒÅÍÅÎÎÁÑ" + #~ msgid "Don't have that many octaves (%s)" #~ msgstr "îÅÔ ÔÁËÏÇÏ ËÏÌÉÞÅÓÔ×Á ÏËÔÁ× (%s)" diff --git a/scm/lily.scm b/scm/lily.scm index 99f21eb25b..c22f512b8a 100644 --- a/scm/lily.scm +++ b/scm/lily.scm @@ -778,6 +778,8 @@ (define (char i) (func "char" i)) + (define (define-origin a b c ) "") + (define (end-output) (func "end-output")) @@ -819,6 +821,8 @@ (string-append "(define " key " " (arg->string val) ")\n") "")) + (define (no-origin) "") + (define (placebox x y s) (let ((ey (inexact->exact y))) (string-append "(move-to " (number->string (inexact->exact x)) " " @@ -847,6 +851,8 @@ (define (text s) (func "text" s)) + (define (tuplet ht gap dx dy thick dir) "") + (define (volta h w thick vert-start vert-end) ;; urg (string-append @@ -871,6 +877,7 @@ (define beam ,beam) (define bracket ,bracket) (define char ,char) + (define define-origin ,define-origin) ;;(define crescendo ,crescendo) (define bezier-sandwich ,bezier-sandwich) ;;(define dashed-slur ,dashed-slur) @@ -886,6 +893,7 @@ (define lily-def ,lily-def) ;;(define invoke-char ,invoke-char) ;;(define invoke-dim1 ,invoke-dim1) + (define no-origin ,no-origin) (define placebox ,placebox) (define select-font ,select-font) (define start-line ,start-line) @@ -893,10 +901,10 @@ (define stop-line ,stop-line) (define stop-last-line ,stop-line) (define text ,text) - ;;(define tuplet ,tuplet) + (define tuplet ,tuplet) (define volta ,volta) )) - ;;((eq? action-name 'tuplet) tuplet) + ((eq? action-name 'tuplet) tuplet) ;;((eq? action-name 'beam) beam) ;;((eq? action-name 'bezier-sandwich) bezier-sandwich) ;;((eq? action-name 'bracket) bracket) diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4 index 25ba3293eb..6bca70dc77 100644 --- a/stepmake/aclocal.m4 +++ b/stepmake/aclocal.m4 @@ -152,7 +152,7 @@ AC_DEFUN(AC_STEPMAKE_GXX, [ then true else - AC_STEPMAKE_WARN(can\'t find g++ 2.8 or egcs 1.1) + AC_STEPMAKE_WARN(can\'t find g++ 2.8, 2.9 or egcs 1.1) fi ]) @@ -393,6 +393,34 @@ dnl fi AC_STEPMAKE_DATADIR ]) +AC_DEFUN(AC_STEPMAKE_KPATHSEA, [ + + kpathsea_b=yes + AC_ARG_ENABLE(kpathsea, + [ enable-kpathsea use kpathsea lib. Default: on], + [kpathsea_b=$enableval]) + + if test $kpathsea_b = yes; then + AC_HAVE_HEADERS(kpathsea/kpathsea.h) + AC_CHECK_LIB(kpathsea, kpse_find_file) + # urg: kpse_find_tfm is a #define, how to check for this? + # AC_CHECK_LIB(kpathsea, kpse_find_tfm) + # AC_CHECK_FUNCS(kpse_find_file kpse_find_tfm,, AC_STEPMAKE_WARN(Cannot find kpathsea functions. You may have to create TFM files manually.)) + AC_CHECK_FUNCS(kpse_find_file,, AC_STEPMAKE_WARN(Cannot find kpathsea functions. You may have to create TFM files manually.) kpathsea_b=no) + fi + AC_MSG_CHECKING(whether to use kpathsea) + if test $kpathsea_b = yes; then + AC_MSG_RESULT(yes) + KPATHSEA=1 + else + AC_MSG_RESULT(no) + KPATHSEA=0 + fi + + AC_SUBST(KPATHSEA) + AC_DEFINE_UNQUOTED(KPATHSEA, $KPATHSEA) +]) + AC_DEFUN(AC_STEPMAKE_LEXYACC, [ # ugh, automake: we want (and check for) bison AC_PROG_YACC @@ -520,7 +548,7 @@ AC_DEFUN(AC_STEPMAKE_MSGFMT, [ #why has this been dropped? AC_DEFUN(XXAC_STEPMAKE_TEXMF_DIRS, [ AC_ARG_ENABLE(tex-prefix, - [ enable-tex-prefix=DIR set the tex-directory to find TeX subdirectories. (default: PREFIX)], + [ enable-tex-prefix=DIR set the tex-directory to find TeX subdirectories. Default: PREFIX], [TEXPREFIX=$enableval], [TEXPREFIX=auto] ) @@ -554,7 +582,7 @@ AC_DEFUN(XXAC_STEPMAKE_TEXMF_DIRS, [ AC_DEFUN(AC_STEPMAKE_TEXMF_DIRS, [ AC_ARG_ENABLE(tfm-path, - [ enable-tfm-path=PATH set path of tex directories where tfm files live, esp.: cmr10.tfm (default: use kpsewhich)], + [ enable-tfm-path=PATH set path of tex directories where tfm files live, esp.: cmr10.tfm. Default: use kpsewhich], [tfm_path=$enableval], [tfm_path=auto] ) @@ -699,7 +727,7 @@ AC_DEFUN(AC_TEX_PREFIX, [ if test "x$find_texpostfix" = x; then find_texpostfix='/lib/texmf/tex' - AC_STEPMAKE_WARN(Cannot determine the TeX-directory. Please use --enable-tex-prefix) + AC_STEPMAKE_WARN(Cannot determine the TeX-directory. Please use --enable-tex-prefix) fi find_texprefix="$find_root_prefix/$find_texpostfix" @@ -727,7 +755,7 @@ AC_DEFUN(AC_FIND_DIR_IN_PREFIX, [ if test "x$find_dirdir" = x; then find_dirdir="/$3"; - AC_STEPMAKE_WARN(Cannot determine $4 subdirectory. Please set from command-line) + AC_STEPMAKE_WARN(Cannot determine $4 subdirectory. Please set from command-line) true fi $2=$find_dirdir -- 2.39.2